Merge e585b76d51 into 4c9063caa7

soh/include/macros.h

@@ -330,10 +330,12 @@ extern GraphicsContext* __gfxCtx;
 #define GANONS_CASTLE_SMALL_KEY_MAX (ResourceMgr_IsSceneMasterQuest(SCENE_INSIDE_GANONS_CASTLE) ? 3 : 2)
 #define TREASURE_GAME_SMALL_KEY_MAX 6
 
-#define DUNGEON_ITEMS_CAN_BE_OUTSIDE_DUNGEON(randomizerSettingsKey) \
+#ifdef __cplusplus
-    (Randomizer_GetSettingValue(randomizerSettingsKey) != RO_DUNGEON_ITEM_LOC_STARTWITH && \
+#define DUNGEON_ITEMS_CAN_BE_OUTSIDE_DUNGEON(rsk) \
-     Randomizer_GetSettingValue(randomizerSettingsKey) != RO_DUNGEON_ITEM_LOC_VANILLA && \
+    (OTRGlobals::Instance->gRandoContext->GetOption(rsk).IsNot(RO_DUNGEON_ITEM_LOC_STARTWITH) && \
-     Randomizer_GetSettingValue(randomizerSettingsKey) != RO_DUNGEON_ITEM_LOC_OWN_DUNGEON)
+    OTRGlobals::Instance->gRandoContext->GetOption(rsk).IsNot(RO_DUNGEON_ITEM_LOC_VANILLA) && \
+    OTRGlobals::Instance->gRandoContext->GetOption(rsk).IsNot(RO_DUNGEON_ITEM_LOC_OWN_DUNGEON))
+#endif
 // #endregion
 
 #endif

soh/soh/Enhancements/InjectItemCounts.cpp

@@ -0,0 +1,80 @@
+#include <soh/OTRGlobals.h>
+
+extern "C" {
+#include "variables.h"
+}
+
+#define RAND_GET_OPTION(rsk) OTRGlobals::Instance->gRandoContext->GetOption(rsk)
+
+void BuildSkulltulaMessage(uint16_t* textId, bool* loadFromMessageTable) {
+    CustomMessage msg =
+        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 "
+                      "Skulltula-Symbole&gesammelt!",
+                      "Vous obtenez un %rSymbole de&Skulltula d'or%w! Vous avez&collecté %r[[gsCount]]%w symboles en "
+                      "tout!",
+                      TEXTBOX_TYPE_BLUE);
+    // The freeze text cannot be manually dismissed and must be auto-dismissed.
+    // This is fine and even wanted when skull tokens are not shuffled, but when
+    // when they are shuffled we don't want to be able to manually dismiss the box.
+    // Otherwise if we get a token from a chest or an NPC we get stuck in the ItemGet
+    // animation until the text box auto-dismisses.
+    // RANDOTODO: Implement a way to determine if an item came from a skulltula and
+    // inject the auto-dismiss control code if it did.
+    if (CVarGetInteger(CVAR_ENHANCEMENT("SkulltulaFreeze"), 0) != 0 &&
+        !(IS_RANDO && RAND_GET_OPTION(RSK_SHUFFLE_TOKENS).IsNot(RO_TOKENSANITY_OFF))) {
+        // Auto dismiss textbox after 0x3C (60) frames (about 3 seconds for OoT)
+        msg = msg + "\x0E\x3C";
+    }
+    int16_t gsCount = gSaveContext.inventory.gsTokens + (IS_RANDO ? 1 : 0);
+    msg.Replace("[[gscount]]", std::to_string(gsCount));
+    msg.AutoFormat(ITEM_SKULL_TOKEN);
+    msg.LoadIntoFont();
+    *loadFromMessageTable = false;
+}
+
+void BuildHeartContainerMessage(uint16_t* textId, bool* loadFromMessageTable) {
+    CustomMessage msg = 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!");
+    msg.Replace("[[heartContainerCount]]", std::to_string(gSaveContext.ship.stats.heartContainers + 1));
+    msg.AutoFormat(ITEM_HEART_CONTAINER);
+    msg.LoadIntoFont();
+    *loadFromMessageTable = false;
+}
+
+void BuildHeartPieceMessage(uint16_t* textId, bool* loadFromMessageTable) {
+    CustomMessage msg =
+        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&Herzteile gesammelt!",
+                      "Vous obtenez un %rQuart de&Coeur%w! Vous en avez collecté&%r[[heartPieceCount]]%w en tout!",
+                      TEXTBOX_TYPE_BLUE);
+    msg.Replace("[[heartPieceCount]]", std::to_string(gSaveContext.ship.stats.heartPieces + 1));
+    msg.AutoFormat(ITEM_HEART_PIECE);
+    msg.LoadIntoFont();
+    *loadFromMessageTable = false;
+}
+
+void InjectItemCounts_Register() {
+    COND_ID_HOOK(OnOpenText, TEXT_GS_FREEZE, CVarGetInteger(CVAR_ENHANCEMENT("InjectItemCounts.GoldSkulltula"), 0),
+                 BuildSkulltulaMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_GS_NO_FREEZE, CVarGetInteger(CVAR_ENHANCEMENT("InjectItemCounts.GoldSkulltula"), 0),
+                 BuildSkulltulaMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_HEART_CONTAINER,
+                 CVarGetInteger(CVAR_ENHANCEMENT("InjectItemCounts.HeartContainer"), 0), BuildHeartContainerMessage);
+    // Heart Pieces don't have documented text IDs after the first one, but
+    // there are 3 more in between TEXT_HEART_PIECE and TEXT_HEART_CONTAINER.
+    COND_ID_HOOK(OnOpenText, TEXT_HEART_PIECE, CVarGetInteger(CVAR_ENHANCEMENT("InjectItemCounts.HeartPiece"), 0),
+                 BuildHeartPieceMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_HEART_PIECE + 1, CVarGetInteger(CVAR_ENHANCEMENT("InjectItemCounts.HeartPiece"), 0),
+                 BuildHeartPieceMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_HEART_PIECE + 2, CVarGetInteger(CVAR_ENHANCEMENT("InjectItemCounts.HeartPiece"), 0),
+                 BuildHeartPieceMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_HEART_PIECE + 3, CVarGetInteger(CVAR_ENHANCEMENT("InjectItemCounts.HeartPiece"), 0),
+                 BuildHeartPieceMessage);
+}
+
+static RegisterShipInitFunc initFunc(InjectItemCounts_Register, { CVAR_ENHANCEMENT("InjectItemCounts.GoldSkulltula"),
+                                                                  CVAR_ENHANCEMENT("InjectItemCounts.HeartContainer"),
+                                                                  CVAR_ENHANCEMENT("InjectItemCounts.HeartPiece") });

soh/soh/Enhancements/Items/BetterBombchuShopping.cpp

@@ -0,0 +1,39 @@
+#include <soh/OTRGlobals.h>
+
+extern "C" {
+#include <variables.h>
+}
+
+// RANDOTODO: Port the rest of the behavior associated with this option here.
+
+void BuildShopDescMessage(uint16_t* textId, bool* loadFromMessageTable) {
+    CustomMessage msg =
+        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",
+                      "\x08%rMissile  10 unités  99 Rubis&%wProfilée comme une souris&mécanique, cette arme est "
+                      "&destructrice!!!\x09\x0A");
+    msg.AutoFormat();
+    msg.LoadIntoFont();
+    *loadFromMessageTable = false;
+}
+
+void BuildShopPromptMessage(uint16_t* textId, bool* loadFromMessageTable) {
+    CustomMessage msg = CustomMessage("\x08Bombchu  10 pieces   99 Rupees\x09&&\x1B%gBuy&Don't buy%w",
+                                      "\x08Krabbelmine  10 Stück  99 Rubine\x09&&\x1B%gKaufen!&Nicht kaufen!%w",
+                                      "\x08Missiles  10 unités   99 Rubis\x09&&\x1B%gAcheter&Ne pas acheter%w");
+    msg.AutoFormat();
+    msg.LoadIntoFont();
+    *loadFromMessageTable = false;
+}
+
+void BetterBombchuShopping_Register() {
+    COND_ID_HOOK(OnOpenText, TEXT_BUY_BOMBCHUS_10_DESC,
+                 IS_RANDO || CVarGetInteger(CVAR_ENHANCEMENT("BetterBombchuShopping"), 0), BuildShopDescMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_BUY_BOMBCHUS_10_PROMPT,
+                 IS_RANDO || CVarGetInteger(CVAR_ENHANCEMENT("BetterBombchuShopping"), 0), BuildShopPromptMessage);
+}
+
+static RegisterShipInitFunc initFunc(BetterBombchuShopping_Register,
+                                     { "IS_RANDO", CVAR_ENHANCEMENT("BetterBombchuShopping") });

soh/soh/Enhancements/NoSkulltulaFreeze.cpp

@@ -0,0 +1,32 @@
+#include <soh/OTRGlobals.h>
+
+extern "C" {
+#include "variables.h"
+}
+
+#define RAND_GET_OPTION(rsk) OTRGlobals::Instance->gRandoContext->GetOption(rsk)
+
+void AutoDismissSkulltulaMessage(uint16_t* textId, bool* loadFromMessageTable) {
+    if (IS_RANDO && RAND_GET_OPTION(RSK_SHUFFLE_TOKENS).IsNot(RO_TOKENSANITY_OFF)) {
+        *loadFromMessageTable = true;
+        return;
+    }
+    *loadFromMessageTable = false;
+    CustomMessage msg = CustomMessage::LoadVanillaMessageTableEntry(TEXT_GS_FREEZE);
+    msg.Replace(CustomMessage::MESSAGE_END(), "\x0E\x3C");
+    msg += CustomMessage::MESSAGE_END();
+    msg.LoadIntoFont();
+}
+
+void NoSkulltulaFreeze_Register() {
+    COND_ID_HOOK(OnOpenText, TEXT_GS_FREEZE,
+                 CVarGetInteger(CVAR_ENHANCEMENT("SkulltulaFreeze"), 0) &&
+                     CVarGetInteger(CVAR_ENHANCEMENT("InjectItemCounts.GoldSkulltula"), 0) == 0,
+                 AutoDismissSkulltulaMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_GS_NO_FREEZE,
+                 CVarGetInteger(CVAR_ENHANCEMENT("SkulltulaFreeze"), 0) &&
+                     CVarGetInteger(CVAR_ENHANCEMENT("InjectItemCounts.GoldSkulltula"), 0) == 0,
+                 AutoDismissSkulltulaMessage);
+}
+
+static RegisterShipInitFunc initFunc(NoSkulltulaFreeze_Register, { CVAR_ENHANCEMENT("SkulltulaFreeze") });

soh/soh/Enhancements/TimeSavers/MarketSneak.cpp

@@ -0,0 +1,23 @@
+#include <soh/OTRGlobals.h>
+
+extern "C" {
+#include <variables.h>
+}
+
+// RANDOTODO: Port the rest of the behavior for this enhancement here.
+
+void BuildNightGuardMessage(uint16_t* textId, bool* loadFromMessageTable) {
+    CustomMessage msg = 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",
+                                      "Tu as l'air de t'ennuyer. Tu veux aller faire un tour?\x1B%gOui&Non%w");
+    msg.AutoFormat();
+    msg.LoadIntoFont();
+    *loadFromMessageTable = false;
+}
+
+void MarketSneak_Register() {
+    COND_ID_HOOK(OnOpenText, TEXT_MARKET_GUARD_NIGHT, CVarGetInteger(CVAR_ENHANCEMENT("MarketSneak"), 0),
+                 BuildNightGuardMessage);
+}
+
+static RegisterShipInitFunc initFunc(MarketSneak_Register, { CVAR_ENHANCEMENT("MarketSneak") });

soh/soh/Enhancements/TimeSavers/QuitFishingAtDoor.cpp

@@ -0,0 +1,27 @@
+#include <soh/OTRGlobals.h>
+
+extern "C" {
+#include <variables.h>
+}
+
+// TODO: Port the rest of the behavior for this enhancement here.
+
+void BuildQuitFishingMessage(uint16_t* textId, bool* loadFromMessageTable) {
+    // TODO: See about loading the vanilla message and manipulating that instead of
+    // a brand new one. Might not be worth it.
+    CustomMessage msg = 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");
+    msg.AutoFormat();
+    msg.LoadIntoFont();
+    *loadFromMessageTable = false;
+}
+
+void QuitFishingAtDoor_Register() {
+    COND_ID_HOOK(OnOpenText, TEXT_FISHERMAN_LEAVE, CVarGetInteger(CVAR_ENHANCEMENT("QuitFishingAtDoor"), 0),
+                 BuildQuitFishingMessage);
+}
+
+static RegisterShipInitFunc initFunc(QuitFishingAtDoor_Register, { CVAR_ENHANCEMENT("QuitFishingAtDoor") });

soh/soh/Enhancements/custom-message/CustomMessageManager.cpp

@@ -6,6 +6,7 @@
 #include <map>
 #include <spdlog/spdlog.h>
 #include <variables.h>
+#include <soh/Enhancements/gameconsole.h>
 
 using namespace std::literals::string_literals;
 
@@ -261,6 +262,40 @@ bool CustomMessage::operator!=(const CustomMessage& operand) const {
     return !operator==(operand);
 }
 
+int CopyStringToCharBuffer(const std::string& inputStr, char* buffer, const int maxBufferSize) {
+    if (!inputStr.empty()) {
+        // Prevent potential horrible overflow due to implicit conversion of maxBufferSize to an unsigned. Prevents
+        // negatives.
+        memset(buffer, 0, std::max<int>(0, maxBufferSize));
+        // Gaurentee that this value will be greater than 0, regardless of passed variables.
+        const int copiedCharLen = std::min<int>(std::max<int>(0, maxBufferSize - 1), inputStr.length());
+        memcpy(buffer, inputStr.c_str(), copiedCharLen);
+        return copiedCharLen;
+    }
+
+    return 0;
+}
+
+void CustomMessage::LoadIntoFont() {
+    MessageContext* msgCtx = &gPlayState->msgCtx;
+    Font* font = &msgCtx->font;
+    char* buffer = font->msgBuf;
+    const int maxBufferSize = sizeof(font->msgBuf);
+    font->charTexBuf[0] = (type << 4) | position;
+    switch (gSaveContext.language) {
+        case LANGUAGE_FRA:
+            msgCtx->msgLength = font->msgLength = CopyStringToCharBuffer(GetFrench(MF_RAW), buffer, maxBufferSize);
+            break;
+        case LANGUAGE_GER:
+            msgCtx->msgLength = font->msgLength = CopyStringToCharBuffer(GetGerman(MF_RAW), buffer, maxBufferSize);
+            break;
+        case LANGUAGE_ENG:
+        default:
+            msgCtx->msgLength = font->msgLength = CopyStringToCharBuffer(GetEnglish(MF_RAW), buffer, maxBufferSize);
+            break;
+    }
+}
+
 void CustomMessage::Replace(std::string&& oldStr, std::string&& newStr) {
     for (std::string& str : messages) {
         size_t position = str.find(oldStr);
@@ -314,6 +349,14 @@ void CustomMessage::AutoFormat() {
     }
 }
 
+void CustomMessage::AutoFormat(ItemID iid) {
+    for (std::string& str : messages) {
+        str.insert(0, ITEM_OBTAINED(iid));
+    }
+    AutoFormat();
+    Replace(WAIT_FOR_INPUT(), WAIT_FOR_INPUT() + ITEM_OBTAINED(iid));
+}
+
 void CustomMessage::Clean() {
     for (std::string& str : messages) {
         CleanString(str);
@@ -369,7 +412,7 @@ static size_t NextLineLength(const std::string* textStr, const size_t lastNewlin
         // Skip over control codes
         if (textStr->at(currentPos) == '%') {
             nextPosJump = 2;
-        } else if (textStr->at(currentPos) == '$') {
+        } else if (textStr->at(currentPos) == '\x13') {
             nextPosJump = 2;
         } else if (textStr->at(currentPos) == '@') {
             nextPosJump = 1;
@@ -495,7 +538,7 @@ void CustomMessage::AutoFormatString(std::string& str) const {
     ReplaceColors(str);
     // insert newlines either manually or when encountering a '&'
     size_t lastNewline = 0;
-    const bool hasIcon = str.find('$', 0) != std::string::npos;
+    const bool hasIcon = str.find('\x13') != std::string::npos;
     size_t lineLength = NextLineLength(&str, lastNewline, hasIcon);
     size_t lineCount = 1;
     size_t yesNo = str.find("\x1B"s[0], lastNewline);
@@ -738,6 +781,10 @@ std::string CustomMessage::PLAYER_NAME() {
     return "\x0F"s;
 }
 
+std::string CustomMessage::TWO_WAY_CHOICE() {
+    return "\x1B"s;
+}
+
 bool CustomMessageManager::InsertCustomMessage(std::string tableID, uint16_t textID, CustomMessage messages) {
     auto foundMessageTable = messageTables.find(tableID);
     if (foundMessageTable == messageTables.end()) {

soh/soh/Enhancements/custom-message/CustomMessageManager.h

@@ -60,6 +60,7 @@ class CustomMessage {
     static std::string POINTS(std::string x); // HIGH_SCORE is also a macro
     static std::string WAIT_FOR_INPUT();
     static std::string PLAYER_NAME();
+    static std::string TWO_WAY_CHOICE();
 
     const std::string GetEnglish(MessageFormat format = MF_FORMATTED) const;
     const std::string GetFrench(MessageFormat format = MF_FORMATTED) const;
@@ -84,6 +85,8 @@ class CustomMessage {
     bool operator==(const std::string& operand) const;
     bool operator!=(const CustomMessage& right) const;
 
+    void LoadIntoFont();
+
     /**
      * @brief Finds an instance of oldStr in each language of the CustomMessage
      * and replaces it with newStr. Typically used for dynamic variable replacement
@@ -165,6 +168,7 @@ class CustomMessage {
      * textboxes, and use it's formatting.
      */
     void AutoFormat();
+    void AutoFormat(ItemID iid);
 
     /**
      * @brief Removes all OoT formatting from the message,

soh/soh/Enhancements/game-interactor/GameInteractor_HookTable.h

@@ -68,3 +68,4 @@ DEFINE_HOOK(OnSetGameLanguage, ());
 DEFINE_HOOK(OnFileDropped, (std::string filePath));
 DEFINE_HOOK(OnAssetAltChange, ());
 DEFINE_HOOK(OnKaleidoUpdate, ());
+DEFINE_HOOK(OnOpenText, (uint16_t * textId, bool* loadFromMessageTable));

soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.cpp

@@ -297,3 +297,11 @@ void GameInteractor_RegisterOnAssetAltChange(void (*fn)(void)) {
 void GameInteractor_ExecuteOnKaleidoUpdate() {
     GameInteractor::Instance->ExecuteHooks<GameInteractor::OnKaleidoUpdate>();
 }
+
+// MARK: Messages
+void GameInteractor_ExecuteOnOpenText(uint16_t* textId, bool* loadFromMessageTable) {
+    LUSLOG_DEBUG("OnOpenText: textId: {}", *textId);
+    GameInteractor::Instance->ExecuteHooks<GameInteractor::OnOpenText>(textId, loadFromMessageTable);
+    GameInteractor::Instance->ExecuteHooksForID<GameInteractor::OnOpenText>(*textId, textId, loadFromMessageTable);
+    GameInteractor::Instance->ExecuteHooksForFilter<GameInteractor::OnOpenText>(textId, loadFromMessageTable);
+}

soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.h

@@ -80,6 +80,9 @@ void GameInteractor_RegisterOnAssetAltChange(void (*fn)(void));
 // Mark: - Pause Menu
 void GameInteractor_ExecuteOnKaleidoUpdate();
 
+// MARK: - Messages
+void GameInteractor_ExecuteOnOpenText(uint16_t* textId, bool* loadFromMessageTable);
+
 #ifdef __cplusplus
 }
 #endif

soh/soh/Enhancements/randomizer/3drando/hint_list.cpp

@@ -2372,11 +2372,6 @@ void StaticData::HintTable_Init() {
                                               /*french*/ "Amène les #Pierres Spirituelles# dans le passé et Zelda te donnera #[[1]]# et t'apprendra #[[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]])#",
-                                                            {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#!",
                                                     /*german*/ "Ein paar junge Gören in der #Waldbühne# lieben es, Masken zu sehen!^"

soh/soh/Enhancements/randomizer/ColoredMapsAndCompasses.cpp

@@ -5,6 +5,7 @@
 #include "z64save.h"
 #include "objects/object_gi_compass/object_gi_compass.h"
 #include "objects/object_gi_map/object_gi_map.h"
+#include "soh/OTRGlobals.h"
 
 extern "C" {
 extern SaveContext gSaveContext;

soh/soh/Enhancements/randomizer/Messages/Goron.cpp

@@ -0,0 +1,108 @@
+/**
+ * Handles the randomized silly messages that the Fire Temple
+ * trapped Gorons have when you free them.
+ */
+#include <soh/OTRGlobals.h>
+
+extern "C" {
+#include <variables.h>
+}
+
+#define NUM_GORON_MESSAGES 9
+static 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 "
+        "adoptiert?",
+        "C'est toi qu'on appelle %g@%w?^Tu es vraiment bizarre pour être&le %rfils du Chef%w. Tu as été adopté?",
+    },
+    {
+        "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.",
+        "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? "
+        "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...",
+    },
+    {
+        // 0x39C7 - ganon laugh
+        "\x12\x39\xC7You fell into my %rtrap!%w&Foolish boy, it was me, Ganondorf!!!^...whoa, where am I?&What "
+        "happened?^Weird.",
+        "\x12\x39\xC7"
+        "Du bist mir in die %rFalle%w gegangen!&Du Narr, ich bin es, %rGanondorf%w!!!^...Huch? Wo bin ich? Was ist "
+        "passiert?^Seltsam...",
+        "\x12\x39\xC7Tu es tombé dans mon %rpiège%w!&Tu croyais que j'étais un Goron mais,&c'était moi! "
+        "%rGanondorf%w!^...Hein? Où suis-je?&Que s'est-il passé?",
+    },
+    {
+        "Thanks, but I don't know if I wanna go&just yet...^Hmm...^...^...^...^...^...maybe I can come back "
+        "later.&Bye bye.",
+        "Danke für die Rettung, aber&eigentlich finde ich es hier ganz&nett...^Hmm...^...^...^...^...^...Naja, ich "
+        "kann ja jederzeit&wiederkommen. Man sieht sich.",
+        "Merci, mais je me sens plus en&sécurité ici...^...^...^...^...^Hmm...^...Tout compte fait, je vais y "
+        "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.",
+      "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..." },
+    {
+        "\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 "
+        "rupees!",
+        "\x13\x1A"
+        "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!",
+    },
+    {
+        "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 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 "
+        "cherches pas.",
+    },
+    {
+        "I dunno why I was thrown in here,&truth be told.&I'm just a %g\"PR\"%w person.",
+        "Wat weiß'n ich, wieso ich hier&eingepfercht wurd. Ich mach&doch nur %g\"Pull&Requests\"%w.",
+        "Je ne sais pas comment on m'a jeté&ici. Il faut croire que je dors comme&une pierre.",
+    },
+};
+
+void BuildGoronMessage(uint16_t* textId, bool* loadFromMessageTable) {
+    uint16_t choice = Random(0, NUM_GORON_MESSAGES);
+    CustomMessage msg = FireTempleGoronMessages[choice];
+    msg.Replace("[[days]]", std::to_string(gSaveContext.totalDays));
+    msg.Replace("[[a_btn]]", std::to_string(gSaveContext.ship.stats.count[COUNT_BUTTON_PRESSES_A]));
+    msg.AutoFormat();
+    msg.LoadIntoFont();
+    *loadFromMessageTable = false;
+}
+
+void RegisterGoronMessages() {
+    COND_ID_HOOK(OnOpenText, TEXT_FIRE_TEMPLE_GORON_OWE_YOU_BIG_TIME, IS_RANDO, BuildGoronMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_FIRE_TEMPLE_GORON_FALLING_DOORS_SECRET, IS_RANDO, BuildGoronMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_FIRE_TEMPLE_GORON_FIRE_SECRET, IS_RANDO, BuildGoronMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_FIRE_TEMPLE_GORON_FLAME_DANCER_SECRET, IS_RANDO, BuildGoronMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_FIRE_TEMPLE_GORON_SWITCH_SECRET, IS_RANDO, BuildGoronMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_FIRE_TEMPLE_GORON_FLAME_DANCER_SECRET, IS_RANDO, BuildGoronMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_FIRE_TEMPLE_GORON_SWITCH_SECRET, IS_RANDO, BuildGoronMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_FIRE_TEMPLE_GORON_OCARINA_SECRET, IS_RANDO, BuildGoronMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_FIRE_TEMPLE_GORON_PILLAR_SECRET, IS_RANDO, BuildGoronMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_FIRE_TEMPLE_GORON_HIDDEN_DOOR_SECRET, IS_RANDO, BuildGoronMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_FIRE_TEMPLE_GORON_SOUNDS_DIFFERENT_SECRET, IS_RANDO, BuildGoronMessage);
+}

soh/soh/Enhancements/randomizer/Messages/GossipStoneHints.cpp

@@ -0,0 +1,57 @@
+/**
+ * This file handles the custom messages for Gossip Stone
+ * hints.
+ */
+#include <soh/OTRGlobals.h>
+
+extern "C" {
+extern PlayState* gPlayState;
+#include <macros.h>
+#include <functions.h>
+#include <variables.h>
+}
+
+#define RAND_GET_OPTION(rsk) OTRGlobals::Instance->gRandoContext->GetOption(rsk)
+
+void BuildHintStoneMessage(uint16_t* textId, bool* loadFromMessageTable) {
+    if ((RAND_GET_OPTION(RSK_GOSSIP_STONE_HINTS).Is(RO_GOSSIP_STONES_NEED_TRUTH) &&
+         Player_GetMask(gPlayState) == PLAYER_MASK_TRUTH) ||
+        (RAND_GET_OPTION(RSK_GOSSIP_STONE_HINTS).Is(RO_GOSSIP_STONES_NEED_STONE) &&
+         CHECK_QUEST_ITEM(QUEST_STONE_OF_AGONY) == 0)) {
+        return;
+    }
+    CustomMessage msg;
+    Actor* stone = GET_PLAYER(gPlayState)->talkActor;
+    RandomizerHint stoneHint = RH_NONE;
+    int16_t hintParams = stone->params & 0xFF;
+
+    if (Rando::StaticData::stoneParamsToHint.contains(hintParams)) {
+        stoneHint = Rando::StaticData::stoneParamsToHint[hintParams];
+    } else if (hintParams == 0x18) {
+        int numOfActorLists = sizeof(gPlayState->actorCtx.actorLists) / sizeof(gPlayState->actorCtx.actorLists[0]);
+        for (int i = 0; i < numOfActorLists; i++) {
+            if (gPlayState->actorCtx.actorLists[i].length) {
+                if (gPlayState->actorCtx.actorLists[i].head->id == 10 &&
+                    Rando::StaticData::grottoChestParamsToHint.contains(
+                        gPlayState->actorCtx.actorLists[i].head->params)) {
+                    stoneHint =
+                        Rando::StaticData::grottoChestParamsToHint[gPlayState->actorCtx.actorLists[i].head->params];
+                }
+            }
+        }
+    }
+    if (stoneHint == RH_NONE) {
+        msg = CustomMessage("INVALID STONE. PARAMS: " + std::to_string(hintParams));
+    } else {
+        msg = OTRGlobals::Instance->gRandoContext->GetHint(stoneHint)->GetHintMessage(MF_AUTO_FORMAT);
+    }
+    msg.LoadIntoFont();
+    *loadFromMessageTable = false;
+}
+
+void RegisterGossipStoneHints() {
+    COND_ID_HOOK(OnOpenText, TEXT_RANDOMIZER_GOSSIP_STONE_HINTS,
+                 RAND_GET_OPTION(RSK_GOSSIP_STONE_HINTS).IsNot(RO_GOSSIP_STONES_NONE), BuildHintStoneMessage);
+}
+
+static RegisterShipInitFunc initFunc(RegisterGossipStoneHints, { "IS_RANDO" });

soh/soh/Enhancements/randomizer/Messages/ItemMessages.cpp

@@ -0,0 +1,509 @@
+// RANDOTODO: Consider putting Ice Traps in their own file.
+/**
+ * This file handles custom messages relating to Items,
+ * such as Get Item messages for non-vanilla items,
+ * Vanilla/MQ hints when collecting Maps, Ice Trap messages,
+ * etc.
+ */
+#include <soh/OTRGlobals.h>
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/custom-message/CustomMessageTypes.h"
+#include "soh/ShipInit.hpp"
+#include <soh/ResourceManagerHelpers.h>
+
+extern "C" {
+#include <variables.h>
+#include <macros.h>
+extern PlayState* gPlayState;
+}
+
+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 or is that just me?",
+    "Yahaha! You found me!",
+    "You'd make 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 your 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#.",
+};
+
+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[83] = {
+    "#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#.",
+    "Je voulais t'offrir un trésor, mais il semble que tu aies eu #froid aux pieds#",
+    "Tu m'as dit que tu voulais livrer #de la glace# à Ganondorf!",
+    "Tu as obtenu la Triforce!&Cet ancien artefact divin peut exaucer n'importe quel... ah non, désolé, c'est juste un "
+    "piège de glace.",
+    "Il est temps de #te rafraîchir#!",
+    "La #Caverne Polaire# te passe le bonjour.",
+    "Chargement de l'objet, veuillez #patienter#...",
+    "Martèle A+B pour ne pas #mourir#.",
+    "Désolé, ton objet est à un autre endroit.", // would be better if it could have the name of the item
+    "Tu espérais que ce soit %gGreg%w.",
+    "Tu veux boire un chocolat chaud?",
+    "Le #froid# ne m'a jamais dérangé, de toute façon.",
+    "J'espère que tu es trop cool pour être #cool#!",
+    "Sois reconnaissant que ce n'est pas le #zéro absolu#.",
+    "Tu savais que le G de ZFG signifie #Glace#?",
+    "Tu as obtenu #L'Âge de Glace (2002)#!",
+    "Maintenant, tu peux lancer un #sort# que tu ne connais pas.",
+    "Que dirais-tu d'un héros #sur glace# ?",
+    "Pas de tunique pour #ça#!",
+    "Je savais que tu étais #partiellement Metroid#!",
+    "Voilà juste la #cerise sur le gâteau#!",
+    "Tu es tellement #cool#, @!",
+    "Tu as trouvé de la #déception#!",
+    "Tu t'es fait #BERNER#!",
+    "Commence à marteler.",
+    "Cet objet va #s'autodétruire# dans 5 secondes...",
+    "Souviens-toi, il pourrait y avoir un léger #inconfort#.",
+    "Dans un monde parfait, les #pièges de glace# comme moi n'existeraient pas, mais ce n'est pas un monde parfait.",
+    "Mon dieu qu'il fait #froid# ici.",
+    "Tu as testé l'objet avec ton #détecteur de glace#, il a bipé.", // would be better if it could have the name of the
+                                                                     // item
+    "Tu as découvert le chemin du zéro. Le #sub-zéro#.",
+    "Mweep... mweep... mweep...",
+    "Gelé, #sac à glace#! Je veux dire #gèle-toi#, racaille!",
+    "Est-ce qu'il fait #frais# ici ou est-ce juste #toi#?",
+    "#Continue#",
+    "QU'EST-CE QU'ELLE VA FAIRE, ME FAIRE UNE #[Glace]#!?",
+    "Tu as rencontré un #terrible destin#, n'est-ce pas?",
+    "Alors comme ça, tu aimes Shining ? Voici comment ça #finit#.",
+    "Petite erreur de trajectoire. #Je gagne#.",
+    "Prends ce #L#, @.",
+    "#Problème de compétence#",
+    "Tout ton chauffage nous appartient.",
+    "Attends une seconde, tu as déjà #cet objet#, non?",
+    "#Gèle#! Tu es entouré !",
+    "Erreur 404 - Objet non #trouvé#.",
+    "Pause hydratation ! Hé, qui a #gelé# mon eau?",
+    "Oups, mauvais #modèle d'objet#.",
+    "Oups! Tu dois mettre l'objet #dans ton inventaire#.",
+    "Tu as fait tomber l'objet, le brisant en #éclats de glace#!", // would be better if it could have the name of the
+                                                                   // item
+    "Tu es le maillon faible @, #au revoir#!",
+    "Ugh... Pourquoi avons-nous même randomisé #cet objet#?",
+    "La #Lune de Givre# se lève...",
+    "Selon toutes les lois connues de la physique et de la biologie, @ ne devrait pas survivre à #être complètement "
+    "enfermé dans la glace#. Les cellules de @ mourraient avant qu'elles ne #dégèlent#. Mais c'est un jeu vidéo, alors "
+    "@ survit... #Probablement#.",
+    "OK, arrête-moi si tu l'as déjà entendue - un joueur et une bouteille de #nitrogène liquide# entrent dans un bar à "
+    "lait...",
+    "Lástima, c'est un #piège de glace#...&&Personne ne s'attend à un #piège de glace espagnol#!",
+    "Mon dieu qu'il fait #GLAGLA# ici.",
+    "C'est bon, @ savait que c'était un #piège#, il l'utilise juste pour prendre des dégâts intentionnellement et "
+    "manipuler la RNG.",
+    "Cet objet n'est #pas disponible# dans votre pays.", // would be better if it could have the name of the item
+    "#Bonne# tentative. #;)#",
+    "Où est mon #Super Costume#?",
+    "#La revanche du Titanic#.",
+};
+
+void BuildIceTrapMessage(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 });
+    }
+
+    msg.AutoFormat();
+}
+
+void BuildTriforcePieceMessage(CustomMessage& msg) {
+    uint8_t current = gSaveContext.ship.quest.data.randomizer.triforcePiecesCollected + 1;
+    uint8_t required = OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_TRIFORCE_HUNT_PIECES_REQUIRED) + 1;
+    uint8_t remaining = required - current;
+    float percentageCollected = (float)current / (float)required;
+
+    if (percentageCollected <= 0.25) {
+        msg = { "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!" };
+    } else if (percentageCollected <= 0.5) {
+        msg = { "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!" };
+    } else if (percentageCollected <= 0.75) {
+        msg = { "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é!" };
+    } else if (percentageCollected < 1.0) {
+        msg = {
+            "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é!"
+        };
+    } else if (current == required) {
+        msg = { "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!" };
+    } else {
+        msg = { "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!" };
+    }
+    msg.Replace("[[current]]", std::to_string(current));
+    msg.Replace("[[remaining]]", std::to_string(remaining));
+    msg.Replace("[[required]]", std::to_string(required));
+    msg.Format();
+}
+
+void BuildCustomItemMessage(Player* player, CustomMessage& msg) {
+    int16_t rgid;
+    msg = CustomMessage("You found [[article]][[color]][[name]]%w!",
+                        "Du erhältst [[article]][[color]][[name]]%w gefunden!",
+                        "Vous avez trouvé [[article]][[color]][[name]]%w!", TEXTBOX_TYPE_BLUE);
+    if (player->getItemEntry.objectId != OBJECT_INVALID) {
+        rgid = player->getItemEntry.getItemId;
+    } else {
+        rgid = player->getItemId;
+    }
+    CustomMessage name =
+        CustomMessage(Rando::StaticData::RetrieveItem(static_cast<RandomizerGet>(rgid)).GetName(), TEXTBOX_TYPE_BLUE);
+    CustomMessage article = CustomMessage(
+        Rando::StaticData::RetrieveItem(static_cast<RandomizerGet>(rgid)).GetArticle(), TEXTBOX_TYPE_BLUE);
+    msg.Replace("[[article]]", article);
+    msg.Replace("[[color]]", Rando::StaticData::RetrieveItem(static_cast<RandomizerGet>(rgid)).GetColor());
+    msg.Replace("[[name]]", name);
+    msg.AutoFormat();
+}
+
+void BuildItemMessage(u16* textId, bool* loadFromMessageTable) {
+    Player* player = GET_PLAYER(gPlayState);
+    CustomMessage msg;
+
+    if (player->getItemEntry.getItemId == RG_ICE_TRAP) {
+        BuildIceTrapMessage(msg);
+    } else if (player->getItemEntry.getItemId == RG_TRIFORCE_PIECE) {
+        BuildTriforcePieceMessage(msg);
+    } else {
+        BuildCustomItemMessage(player, msg);
+    }
+    *loadFromMessageTable = false;
+    msg.LoadIntoFont();
+}
+
+void BuildMapMessage(uint16_t* textId, bool* loadFromMessageTable) {
+    GetItemEntry itemEntry = GET_PLAYER(gPlayState)->getItemEntry;
+    auto ctx = OTRGlobals::Instance->gRandoContext;
+    CustomMessage msg =
+        CustomMessage("You found the %g[[name]]%w! [[typeHint]]", "Du erhältst das %g[[name]]%w! [[typeHint]]",
+                      "Vous ebtenez %g[[name]]%w! [[typeHint]]", TEXTBOX_TYPE_BLUE);
+    int sceneNum;
+    switch (itemEntry.getItemId) {
+        case RG_DEKU_TREE_MAP:
+            sceneNum = SCENE_DEKU_TREE;
+            break;
+        case RG_DODONGOS_CAVERN_MAP:
+            sceneNum = SCENE_DODONGOS_CAVERN;
+            break;
+        case RG_JABU_JABUS_BELLY_MAP:
+            sceneNum = SCENE_JABU_JABU;
+            break;
+        case RG_FOREST_TEMPLE_MAP:
+            sceneNum = SCENE_FOREST_TEMPLE;
+            break;
+        case RG_FIRE_TEMPLE_MAP:
+            sceneNum = SCENE_FIRE_TEMPLE;
+            break;
+        case RG_WATER_TEMPLE_MAP:
+            sceneNum = SCENE_WATER_TEMPLE;
+            break;
+        case RG_SPIRIT_TEMPLE_MAP:
+            sceneNum = SCENE_SPIRIT_TEMPLE;
+            break;
+        case RG_SHADOW_TEMPLE_MAP:
+            sceneNum = SCENE_SHADOW_TEMPLE;
+            break;
+        case RG_BOTTOM_OF_THE_WELL_MAP:
+            sceneNum = SCENE_BOTTOM_OF_THE_WELL;
+            break;
+        case RG_ICE_CAVERN_MAP:
+            sceneNum = SCENE_ICE_CAVERN;
+            break;
+    }
+    if (ctx->GetOption(RSK_MQ_DUNGEON_RANDOM).Is(RO_MQ_DUNGEONS_NONE) ||
+        (ctx->GetOption(RSK_MQ_DUNGEON_RANDOM).Is(RO_MQ_DUNGEONS_SET_NUMBER) &&
+         ctx->GetOption(RSK_MQ_DUNGEON_COUNT).Is(12))) {
+        msg.Replace("[[typeHint]]", "");
+    } else if (ResourceMgr_IsSceneMasterQuest(sceneNum)) {
+        msg.Replace("[[typeHint]]", Rando::StaticData::hintTextTable[RHT_DUNGEON_MASTERFUL].GetHintMessage());
+    } else {
+        msg.Replace("[[typeHint]]", Rando::StaticData::hintTextTable[RHT_DUNGEON_ORDINARY].GetHintMessage());
+    }
+    *loadFromMessageTable = false;
+    msg.LoadIntoFont();
+}
+
+void BuildBossKeyMessage(uint16_t* textId, bool* loadFromMessageTable) {
+    Player* player = GET_PLAYER(gPlayState);
+    if (player->getItemEntry.getItemId == RG_GANONS_CASTLE_BOSS_KEY &&
+        !DUNGEON_ITEMS_CAN_BE_OUTSIDE_DUNGEON(RSK_GANONS_BOSS_KEY)) {
+        return;
+    }
+    if (player->getItemEntry.getItemId != RG_GANONS_CASTLE_BOSS_KEY &&
+        !DUNGEON_ITEMS_CAN_BE_OUTSIDE_DUNGEON(RSK_BOSS_KEYSANITY)) {
+        return;
+    }
+    CustomMessage msg;
+    BuildCustomItemMessage(player, msg);
+    *loadFromMessageTable = false;
+    msg.LoadIntoFont();
+}
+
+void BuildSmallKeyMessage(uint16_t* textId, bool* loadFromMessageTable) {
+    Player* player = GET_PLAYER(gPlayState);
+    if (player->getItemEntry.getItemId == RG_GERUDO_FORTRESS_SMALL_KEY &&
+        OTRGlobals::Instance->gRandoContext->GetOption(RSK_GERUDO_KEYS).Is(RO_GERUDO_KEYS_VANILLA)) {
+        return;
+    }
+    if (player->getItemEntry.getItemId != RG_GERUDO_FORTRESS_SMALL_KEY &&
+        DUNGEON_ITEMS_CAN_BE_OUTSIDE_DUNGEON(RSK_KEYSANITY)) {
+        return;
+    }
+    CustomMessage msg;
+    BuildCustomItemMessage(player, msg);
+    *loadFromMessageTable = false;
+    msg.LoadIntoFont();
+}
+
+void RegisterItemMessages() {
+    COND_ID_HOOK(OnOpenText, TEXT_RANDOMIZER_CUSTOM_ITEM, IS_RANDO, BuildItemMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_ITEM_DUNGEON_MAP, DUNGEON_ITEMS_CAN_BE_OUTSIDE_DUNGEON(RSK_SHUFFLE_MAPANDCOMPASS),
+                 BuildMapMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_ITEM_COMPASS, DUNGEON_ITEMS_CAN_BE_OUTSIDE_DUNGEON(RSK_SHUFFLE_MAPANDCOMPASS),
+                 BuildItemMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_ITEM_KEY_BOSS,
+                 (DUNGEON_ITEMS_CAN_BE_OUTSIDE_DUNGEON(RSK_BOSS_KEYSANITY) ||
+                  DUNGEON_ITEMS_CAN_BE_OUTSIDE_DUNGEON(RSK_GANONS_BOSS_KEY)),
+                 BuildBossKeyMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_ITEM_KEY_SMALL,
+                 (OTRGlobals::Instance->gRandoContext->GetOption(RSK_GERUDO_KEYS).IsNot(RO_GERUDO_KEYS_VANILLA) ||
+                  DUNGEON_ITEMS_CAN_BE_OUTSIDE_DUNGEON(RSK_KEYSANITY)),
+                 BuildSmallKeyMessage);
+}
+
+static RegisterShipInitFunc initFunc(RegisterItemMessages, { "IS_RANDO" });

soh/soh/Enhancements/randomizer/Messages/MerchantMessages.cpp

@@ -0,0 +1,192 @@
+// RANDOTODO: Consider breaking this up into the different actors
+// That speak these hints, like 2Ship does with ActorBehavior
+
+/**
+ * This file handles the custom messages for merchants,
+ * including both shops and one-off merchants (i.e. Medigoron, Bean Guy,
+ * and Carpet Salesman)
+ */
+#include <soh/OTRGlobals.h>
+
+extern "C" {
+extern PlayState* gPlayState;
+#include <macros.h>
+#include <functions.h>
+#include <variables.h>
+#include <overlays/actors/ovl_En_Dns/z_en_dns.h>
+}
+
+#define RAND_GET_OPTION(rsk) OTRGlobals::Instance->gRandoContext->GetOption(rsk)
+#define RAND_GET_ITEM(rc) OTRGlobals::Instance->gRandoContext->GetItemLocation(rc)
+#define RAND_GET_OVERRIDE(rc) OTRGlobals::Instance->gRandoContext->overrides[rc]
+#define NON_BEAN_MERCHANTS                                                            \
+    (RAND_GET_OPTION(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_ALL_BUT_BEANS) || \
+     RAND_GET_OPTION(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_ALL))
+
+void BuildMerchantMessage(CustomMessage& msg, RandomizerCheck rc) {
+    RandomizerGet rgid = RAND_GET_ITEM(rc)->GetPlacedRandomizerGet();
+    uint16_t price = RAND_GET_ITEM(rc)->GetPrice();
+    CustomMessage itemName;
+    std::string color = Rando::StaticData::RetrieveItem(static_cast<RandomizerGet>(rgid)).GetColor();
+    bool mysterious = RAND_GET_OPTION(RSK_MERCHANT_TEXT_HINT).Is(RO_GENERIC_OFF) ||
+                      CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("MysteriousShuffle"), 0);
+    if (mysterious) {
+        itemName = Rando::StaticData::hintTextTable[RHT_MYSTERIOUS_ITEM_CAPITAL].GetHintMessage();
+        color = "%g";
+    } else if (rgid == RG_ICE_TRAP) {
+        rgid = RAND_GET_OVERRIDE(rc).LooksLike();
+        itemName = CustomMessage(RAND_GET_OVERRIDE(rc).GetTrickName());
+        color = "%g";
+    } else {
+        itemName = CustomMessage(Rando::StaticData::RetrieveItem(rgid).GetName());
+    }
+    msg.Replace("[[color]]", color);
+    msg.InsertNames({ itemName, CustomMessage(std::to_string(price)) });
+}
+
+void BuildBeanGuyMessage(uint16_t* textId, bool* loadFromMessageTable) {
+    CustomMessage msg;
+    if (*textId == TEXT_BEAN_SALESMAN_BUY_FOR_100) {
+        msg = CustomMessage(
+            "I never thought I'd say this, but I'm selling the last %rMagic Bean%w.^%y99 Rupees%w, no "
+            "less.\x1B%gYes&No%w",
+            "Ich hätte nie gedacht, daß ich das sage, aber ich verkaufe die letzte^%rWundererbse%w für %y99 "
+            "Rubine%w.\x1B&%gJa&Nein%w",
+            "Je te vends mon dernier %rHaricot&magique%g pour %y99 Rubis%w.\x1B&%gAcheterNe pas acheter%w");
+        msg.Format();
+    } else if (*textId == TEXT_BEAN_SALESMAN_BUY_FOR_10) {
+        msg = CustomMessage("Want to buy [[color]][[1]]%w for %y[[2]] Rupees%w?\x1B%gYes&No%w",
+                            "Möchten Sie [[color]][[1]]%w für %y[[2]] Rubin%w kaufen?\x1B%gJa&Nein%w",
+                            "Voulez-vous acheter [[color]][[1]]%w pour %y[[2]] Rubis%w?\x1B%gOui&Non%w");
+        BuildMerchantMessage(msg, RC_ZR_MAGIC_BEAN_SALESMAN);
+        msg.AutoFormat();
+    }
+    msg.LoadIntoFont();
+    *loadFromMessageTable = false;
+}
+
+void BuildMedigoronMessage(uint16_t* textId, bool* loadFromMessageTable) {
+    CustomMessage msg = CustomMessage("Want to buy [[color]][[1]]%w for %y[[2]] Rupees%w?\x1B%gYes&No%w",
+                                      "Möchten Sie [[color]][[1]]%w für %y[[2]] Rubin%w kaufen?\x1B%gJa&Nein%w",
+                                      "Voulez-vous acheter [[color]][[1]]%w pour %y[[2]] Rubis%w?\x1B%gOui&Non%w");
+    BuildMerchantMessage(msg, RC_GC_MEDIGORON);
+    msg.AutoFormat();
+    msg.LoadIntoFont();
+    *loadFromMessageTable = false;
+}
+
+void BuildGrannyMessage(uint16_t* textId, bool* loadFromMessageTable) {
+    if (!Flags_GetRandomizerInf(RAND_INF_MERCHANTS_GRANNYS_SHOP) &&
+        (RAND_GET_OPTION(RSK_SHUFFLE_ADULT_TRADE).Is(RO_GENERIC_ON) ||
+         INV_CONTENT(ITEM_CLAIM_CHECK) == ITEM_CLAIM_CHECK)) {
+        CustomMessage msg = CustomMessage("Want to buy [[color]][[1]]%w for %y[[2]] Rupees%w?\x1B%gYes&No%w",
+                                          "Möchten Sie [[color]][[1]]%w für %y[[2]] Rubin%w kaufen?\x1B%gJa&Nein%w",
+                                          "Voulez-vous acheter [[color]][[1]]%w pour %y[[2]] Rubis%w?\x1B%gOui&Non%w");
+        BuildMerchantMessage(msg, RC_KAK_GRANNYS_SHOP);
+        msg.AutoFormat();
+        msg.LoadIntoFont();
+        *loadFromMessageTable = false;
+    }
+}
+
+void BuildCarpetGuyMessage(uint16_t* textId, bool* loadFromMessageTable) {
+    CustomMessage msg;
+    if (*textId == TEXT_CARPET_SALESMAN_ARMS_DEALER) {
+        msg = 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!");
+    } else if (!Flags_GetRandomizerInf(RAND_INF_MERCHANTS_CARPET_SALESMAN)) {
+        msg = CustomMessage("Want to buy [[color]][[1]]%w for %y[[2]] Rupees%w?\x1B%gYes&No%w",
+                            "Möchten Sie [[color]][[1]]%w für %y[[2]] Rubin%w kaufen?\x1B%gJa&Nein%w",
+                            "Voulez-vous acheter [[color]][[1]]%w pour %y[[2]] Rubis%w?\x1B%gOui&Non%w");
+        BuildMerchantMessage(msg, RC_WASTELAND_BOMBCHU_SALESMAN);
+    }
+    msg.AutoFormat();
+    msg.LoadIntoFont();
+    *loadFromMessageTable = false;
+}
+
+void BuildCarpetGuyFailToBuyMessage(uint16_t* textId, bool* loadFromMessageTable) {
+    CustomMessage msg =
+        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.");
+    msg.AutoFormat();
+    msg.LoadIntoFont();
+    *loadFromMessageTable = false;
+}
+
+void BuildScrubMessage(uint16_t* textId, bool* loadFromMessageTable) {
+    EnDns* enDns = reinterpret_cast<EnDns*>(GET_PLAYER(gPlayState)->talkActor);
+    RandomizerCheck rc = enDns->sohScrubIdentity.randomizerCheck;
+    uint16_t price = RAND_GET_ITEM(rc)->GetPrice();
+    CustomMessage msg;
+    if (price == 0) {
+        msg = CustomMessage("\x12\x38\x82"
+                            "All right! You win! In return for sparing me, I will give you a [[color]][[1]]%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 [[color]][[1]]%w geben!\x07\x10\xA3",
+                            "\x12\x38\x82"
+                            "J'me rends! Laisse-moi partir et en échange, je te donne un [[color]][[1]]%w! Vas-y "
+                            "prends le!\x07\x10\xA3");
+    } else {
+        msg = CustomMessage(
+            "\x12\x38\x82"
+            "All right! You win! In return for sparing me, I will sell you a [[color]][[1]]%w! %y[[2]] Rupees%w it "
+            "is!\x07\x10\xA3",
+            "\x12\x38\x82"
+            "Ich gebe auf! Ich verkaufe Dir einen [[color]][[1]]%w für %y[[2]] Rubine%w!\x07\x10\xA3",
+            "\x12\x38\x82"
+            "J'abandonne! Tu veux bien m'acheter un [[color]][[1]]%w? Ça fera %y[[2]] Rubis%w!\x07\x10\xA3");
+    }
+    BuildMerchantMessage(msg, rc);
+    msg.AutoFormat();
+    msg.LoadIntoFont();
+    *loadFromMessageTable = false;
+}
+
+void BuildShopMessage(uint16_t* textId, bool* loadFromMessageTable) {
+    CustomMessage msg;
+    RandomizerCheck rc;
+    // 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)
+    if (*textId >= TEXT_SHOP_ITEM_RANDOM && *textId < TEXT_SHOP_ITEM_RANDOM_CONFIRM) {
+        rc = OTRGlobals::Instance->gRandomizer->GetCheckFromRandomizerInf(
+            static_cast<RandomizerInf>((*textId - TEXT_SHOP_ITEM_RANDOM) + RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_1));
+        msg =
+            CustomMessage("\x08[[color]][[1]]%w  %y[[2]]_Rupees%w&Special deal! %rONE LEFT%w!\x0A\x02",
+                          "\x08[[color]][[1]]%w  %y[[2]]_Rubine%w&Sonderangebot! %rNUR NOCH EINES VERFÜGBAR%w!\x0A\x02",
+                          "\x08[[color]][[1]]%w  %y[[2]]_Rubis%w&Offre spéciale! %rDERNIER EN STOCK%w!\x0A\x02");
+    } else if (*textId >= TEXT_SHOP_ITEM_RANDOM_CONFIRM && *textId <= TEXT_SHOP_ITEM_RANDOM_CONFIRM_END) {
+        rc = OTRGlobals::Instance->gRandomizer->GetCheckFromRandomizerInf(
+            static_cast<RandomizerInf>((*textId - TEXT_SHOP_ITEM_RANDOM_CONFIRM) + RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_1));
+        msg = CustomMessage("\x08[[color]][[1]]%w  %y[[2]]_Rupees%w\x09\x1B%gBuy&Don't buy%w\x09\x02",
+                            "\x08[[color]][[1]]%w  %y[[2]]_Rubine%w\x09\x1B%gKaufen&Nicht kaufen%w\x09\x02",
+                            "\x08[[color]][[1]]%w  %y[[2]]_Rubis%w\x09\x1B%gAcheter&Ne pas acheter%w\x09\x02");
+    } else {
+        return;
+    }
+    BuildMerchantMessage(msg, rc);
+    msg.AutoFormat();
+    msg.LoadIntoFont();
+    *loadFromMessageTable = false;
+}
+
+void RegisterMerchantMessages() {
+    COND_ID_HOOK(OnOpenText, TEXT_BEAN_SALESMAN_BUY_FOR_10,
+                 (RAND_GET_OPTION(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_BEANS_ONLY) ||
+                  RAND_GET_OPTION(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_ALL)),
+                 BuildBeanGuyMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_BEAN_SALESMAN_BUY_FOR_100, IS_RANDO, BuildBeanGuyMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_MEDIGORON, NON_BEAN_MERCHANTS, BuildMedigoronMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_GRANNYS_SHOP, NON_BEAN_MERCHANTS, BuildGrannyMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_CARPET_SALESMAN_1, NON_BEAN_MERCHANTS, BuildCarpetGuyMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_CARPET_SALESMAN_ARMS_DEALER, NON_BEAN_MERCHANTS, BuildCarpetGuyMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_SCRUB_RANDOM, IS_RANDO, BuildScrubMessage);
+    COND_HOOK(OnOpenText, RAND_GET_OPTION(RSK_SHOPSANITY).IsNot(RO_SHOPSANITY_OFF), BuildShopMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_CARPET_SALESMAN_CUSTOM_FAIL_TO_BUY, IS_RANDO, BuildCarpetGuyFailToBuyMessage);
+}
+
+static RegisterShipInitFunc initFunc(RegisterMerchantMessages, { "IS_RANDO" });

soh/soh/Enhancements/randomizer/Messages/Miscellaneous.cpp

@@ -0,0 +1,48 @@
+// RANDOTODO: Consider breaking these up by actor similar
+// to how 2Ship does ActorBehavior stuff.
+/**
+ * This file is intended to handle some rando-specific
+ * text changes that don't really fit anywhere else.
+ */
+
+#include <soh/OTRGlobals.h>
+
+extern "C" {
+#include <variables.h>
+}
+
+void BuildWaterSwitchMessage(uint16_t* textId, bool* loadFromMessageTable) {
+    CustomMessage msg;
+    if (*textId == TEXT_LAKE_HYLIA_WATER_SWITCH_NAVI) {
+        msg = 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.");
+    } else if (*textId == TEXT_LAKE_HYLIA_WATER_SWITCH_SIGN) {
+        msg = CustomMessage("Water level control system.&Keep away!", "Wasserstand Kontrollsystem&Finger weg!",
+                            "Système de contrôle du niveau&d'eau.&Ne pas toucher!");
+    }
+    msg.AutoFormat();
+    msg.LoadIntoFont();
+    *loadFromMessageTable = false;
+}
+
+void BuildShootingGalleryNoBowMessage(uint16_t* textId, bool* loadFromMessageTable) {
+    CustomMessage msg =
+        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.");
+    msg.AutoFormat();
+    msg.LoadIntoFont();
+    *loadFromMessageTable = false;
+}
+
+void RegisterMiscellaneousMessages() {
+    COND_ID_HOOK(OnOpenText, TEXT_LAKE_HYLIA_WATER_SWITCH_NAVI, IS_RANDO, BuildWaterSwitchMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_LAKE_HYLIA_WATER_SWITCH_SIGN, IS_RANDO, BuildWaterSwitchMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_SHOOTING_GALLERY_MAN_COME_BACK_WITH_BOW, IS_RANDO, BuildShootingGalleryNoBowMessage);
+}
+
+static RegisterShipInitFunc initFunc(RegisterMiscellaneousMessages, { "IS_RANDO" });

soh/soh/Enhancements/randomizer/Messages/Navi.cpp

@@ -0,0 +1,181 @@
+/**
+ * This file is responsible for the messages
+ * for the Rando-Relevant Navi Hints enhancement.
+ */
+#include <soh/OTRGlobals.h>
+
+extern "C" {
+#include <variables.h>
+}
+
+#define NUM_NAVI_MESSAGES 18
+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!",
+      "%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!",
+      "%cParfois, tu peux utiliser la %rMasse&des Titans %cau lieu de tes bombes!" },
+
+    { "%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..." },
+
+    { "%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?",
+      "%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 "
+      "%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?",
+      "%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 "
+      "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&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!",
+      "%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 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!" },
+
+    { "%cEven an adult can't push large&blocks without some %wextra&strength%c!",
+      "%cSelbst ein Erwachsener kann ohne&etwas %wzusätzliche Kraft %ckeine&großen Blöcke verschieben!",
+      "%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 %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? 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 "
+      "%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 "
+      "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 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 "
+      "%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 "
+      "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!" }
+};
+
+void BuildNaviMessage(uint16_t* textId, bool* loadFromMessageTable) {
+    CustomMessage msg = NaviMessages[Random(0, NUM_NAVI_MESSAGES)];
+    msg.AutoFormat();
+    msg.LoadIntoFont();
+    *loadFromMessageTable = false;
+}
+
+void RegisterNaviMessages() {
+    COND_ID_HOOK(OnOpenText, TEXT_NAVI_DEKU_TREE_SUMMONS,
+                 IS_RANDO && CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("RandoRelevantNavi"), 1), BuildNaviMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_NAVI_CMON_BE_BRAVE,
+                 IS_RANDO && CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("RandoRelevantNavi"), 1), BuildNaviMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_NAVI_VISIT_THE_PRINCESS,
+                 IS_RANDO && CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("RandoRelevantNavi"), 1), BuildNaviMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_NAVI_FIND_MALONS_FATHER,
+                 IS_RANDO && CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("RandoRelevantNavi"), 1), BuildNaviMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_NAVI_FIND_THE_PRINCESS,
+                 IS_RANDO && CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("RandoRelevantNavi"), 1), BuildNaviMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_NAVI_WHAT_WOULD_SARIA_SAY,
+                 IS_RANDO && CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("RandoRelevantNavi"), 1), BuildNaviMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_NAVI_IMPA_SAID_DEATH_MOUNTAIN,
+                 IS_RANDO && CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("RandoRelevantNavi"), 1), BuildNaviMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_NAVI_USE_BOMB_FLOWER,
+                 IS_RANDO && CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("RandoRelevantNavi"), 1), BuildNaviMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_NAVI_FAIRY_LIVES_ON_DEATH_MOUNTAIN,
+                 IS_RANDO && CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("RandoRelevantNavi"), 1), BuildNaviMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_NAVI_SARIA_KNOWS_ABOUT_STONES,
+                 IS_RANDO && CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("RandoRelevantNavi"), 1), BuildNaviMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_NAVI_RUTO_INSIDE_JABUS_BELLY,
+                 IS_RANDO && CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("RandoRelevantNavi"), 1), BuildNaviMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_NAVI_COLLECTED_THREE_STONES,
+                 IS_RANDO && CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("RandoRelevantNavi"), 1), BuildNaviMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_NAVI_THREW_SOMETHING_IN_MOAT,
+                 IS_RANDO && CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("RandoRelevantNavi"), 1), BuildNaviMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_NAVI_CHECK_TEMPLE_OF_TIME,
+                 IS_RANDO && CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("RandoRelevantNavi"), 1), BuildNaviMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_NAVI_SHOULD_WE_BELIEVE_SHEIK,
+                 IS_RANDO && CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("RandoRelevantNavi"), 1), BuildNaviMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_NAVI_WHATS_GOING_ON_IN_FOREST,
+                 IS_RANDO && CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("RandoRelevantNavi"), 1), BuildNaviMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_NAVI_CLOUD_OVER_DEATH_MOUNTAIN,
+                 IS_RANDO && CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("RandoRelevantNavi"), 1), BuildNaviMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_NAVI_ARTIC_WIND_IS_BLOWING,
+                 IS_RANDO && CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("RandoRelevantNavi"), 1), BuildNaviMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_NAVI_IRON_BOOTS_WEIGH_A_TON,
+                 IS_RANDO && CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("RandoRelevantNavi"), 1), BuildNaviMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_NAVI_LOOK_FOR_SOMONE_WHO_KNOWS,
+                 IS_RANDO && CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("RandoRelevantNavi"), 1), BuildNaviMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_NAVI_IT_CAME_OUT_OF_THE_WELL,
+                 IS_RANDO && CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("RandoRelevantNavi"), 1), BuildNaviMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_NAVI_WHO_BUILT_THE_SPIRIT_TEMPLE,
+                 IS_RANDO && CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("RandoRelevantNavi"), 1), BuildNaviMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_NAVI_HAVE_YOU_EVER_PLAYED_NOCTURNE,
+                 IS_RANDO && CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("RandoRelevantNavi"), 1), BuildNaviMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_NAVI_WHERE_GANONDORF_WAS_BORN,
+                 IS_RANDO && CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("RandoRelevantNavi"), 1), BuildNaviMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_NAVI_EQUIP_THE_SILVER_GAUNTLETS,
+                 IS_RANDO && CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("RandoRelevantNavi"), 1), BuildNaviMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_NAVI_WHO_IS_WAITING_FOR_US,
+                 IS_RANDO && CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("RandoRelevantNavi"), 1), BuildNaviMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_NAVI_SAVE_PRINCESS_ZELDA,
+                 IS_RANDO && CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("RandoRelevantNavi"), 1), BuildNaviMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_NAVI_TRY_TO_KEEP_MOVING,
+                 IS_RANDO && CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("RandoRelevantNavi"), 1), BuildNaviMessage);
+}
+
+static RegisterShipInitFunc initFunc(RegisterNaviMessages, { CVAR_RANDOMIZER_ENHANCEMENT("RandoRelevantNavi") });

soh/soh/Enhancements/randomizer/Messages/Rupees.cpp

@@ -0,0 +1,255 @@
+/**
+ * This file is for handling the Randomize Rupee Names
+ * enhancement
+ */
+#include <soh/OTRGlobals.h>
+
+extern "C" {
+#include "variables.h"
+}
+
+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[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[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"
+};
+
+void BuildRupeeMessage(uint16_t* textId, bool* loadFromMessageTable) {
+    CustomMessage msg = CustomMessage(
+        "You found [[color]][[amount]] [[rupee]]\x05\x00!", "Du hast [[color]][[amount]] [[rupee]]\x05\x00 gefunden!",
+        "Vous obtenez [[color]][[amount]] [[rupee]]\x05\x00!", TEXTBOX_TYPE_BLACK, TEXTBOX_POS_BOTTOM);
+    std::string color;
+    std::string amount;
+    CustomMessage rupee = CustomMessage(RandomElement(englishRupeeNames), RandomElement(germanRupeeNames),
+                                        RandomElement(frenchRupeeNames));
+    switch (*textId) {
+        case TEXT_BLUE_RUPEE:
+            color = "\x05\x03";
+            amount = "5";
+            break;
+        case TEXT_RED_RUPEE:
+            color = "\x05\x01";
+            amount = "20";
+            break;
+        case TEXT_PURPLE_RUPEE:
+            color = "\x05\x05";
+            amount = "50";
+            break;
+        case TEXT_HUGE_RUPEE:
+            color = "\x05\x06";
+            amount = "200";
+            break;
+        default:
+            assert(!"This should not be reachable");
+            return;
+    }
+    msg.Replace("[[color]]", color);
+    msg.Replace("[[amount]]", amount);
+    msg.Replace("[[rupee]]", rupee);
+    msg.AutoFormat();
+    msg.LoadIntoFont();
+    *loadFromMessageTable = false;
+}
+
+void RegisterRandomRupeeNames() {
+    COND_ID_HOOK(OnOpenText, TEXT_BLUE_RUPEE,
+                 IS_RANDO && CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("RandomizeRupeeNames"), 1), BuildRupeeMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_RED_RUPEE,
+                 IS_RANDO && CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("RandomizeRupeeNames"), 1), BuildRupeeMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_PURPLE_RUPEE,
+                 IS_RANDO && CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("RandomizeRupeeNames"), 1), BuildRupeeMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_HUGE_RUPEE,
+                 IS_RANDO && CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("RandomizeRupeeNames"), 1), BuildRupeeMessage);
+}
+
+static RegisterShipInitFunc initFunc(RegisterRandomRupeeNames, { CVAR_RANDOMIZER_ENHANCEMENT("RandomizeRupeeNames") });

soh/soh/Enhancements/randomizer/Messages/StaticHints.cpp

@@ -0,0 +1,471 @@
+// RANDOTODO: Consider breaking this up into the different actors
+// That speak these hints, like 2Ship does with ActorBehavior
+
+/**
+ * File for registering hooks for "Static" hints, i.e. hints that
+ * are always given by a specific NPC and/or for a specific item.
+ */
+#include <soh/OTRGlobals.h>
+
+extern "C" {
+extern PlayState* gPlayState;
+#include <macros.h>
+#include <functions.h>
+#include <variables.h>
+}
+
+#define RAND_GET_OPTION(rsk) OTRGlobals::Instance->gRandoContext->GetOption(rsk)
+#define RAND_GET_HINT(rh) OTRGlobals::Instance->gRandoContext->GetHint(rh)
+#define RAND_GET_ITEM_LOC(rc) OTRGlobals::Instance->gRandoContext->GetItemLocation(rc)
+#define ANY_SKULLTULA_HINTS                                                                   \
+    RAND_GET_OPTION(RSK_KAK_10_SKULLS_HINT) || RAND_GET_OPTION(RSK_KAK_20_SKULLS_HINT) ||     \
+        RAND_GET_OPTION(RSK_KAK_30_SKULLS_HINT) || RAND_GET_OPTION(RSK_KAK_40_SKULLS_HINT) || \
+        RAND_GET_OPTION(RSK_KAK_50_SKULLS_HINT)
+
+void BuildGanondorfHint(uint16_t* textId, bool* loadFromMessageTable) {
+    CustomMessage msg;
+    if (RAND_GET_OPTION(RSK_SHUFFLE_MASTER_SWORD) && !CHECK_OWNED_EQUIP(EQUIP_TYPE_SWORD, EQUIP_INV_SWORD_MASTER)) {
+        if (INV_CONTENT(ITEM_ARROW_LIGHT) == ITEM_ARROW_LIGHT) {
+            msg = RAND_GET_HINT(RH_GANONDORF_HINT)->GetHintMessage(MF_AUTO_FORMAT, 1);
+        } else {
+            msg = RAND_GET_HINT(RH_GANONDORF_HINT)->GetHintMessage(MF_AUTO_FORMAT, 2);
+        }
+    } else {
+        if (INV_CONTENT(ITEM_ARROW_LIGHT) == ITEM_ARROW_LIGHT) {
+            msg = RAND_GET_HINT(RH_GANONDORF_JOKE)->GetHintMessage(MF_AUTO_FORMAT);
+        } else {
+            msg = RAND_GET_HINT(RH_GANONDORF_HINT)->GetHintMessage(MF_AUTO_FORMAT, 0);
+        }
+    }
+    msg.AutoFormat();
+    msg.LoadIntoFont();
+    *loadFromMessageTable = false;
+}
+
+void BuildSheikMessage(uint16_t* textId, bool* loadFromMessageTable) {
+    CustomMessage msg;
+    switch (gPlayState->sceneNum) {
+        case SCENE_TEMPLE_OF_TIME:
+            if (RAND_GET_OPTION(RSK_OOT_HINT) && !RAND_GET_ITEM_LOC(RC_SONG_FROM_OCARINA_OF_TIME)->HasObtained()) {
+                msg = RAND_GET_HINT(RH_OOT_HINT)->GetHintMessage(MF_RAW);
+            } else if (!CHECK_DUNGEON_ITEM(DUNGEON_KEY_BOSS, SCENE_GANONS_TOWER)) {
+                msg = 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 Verlies%w hast.",
+                    "Retrouve-moi au %gChâteau de Ganon%w une fois que tu auras obtenu la %rclé de son repaire%w.");
+            } else {
+                msg = 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 (RAND_GET_OPTION(RSK_SHEIK_LA_HINT) && INV_CONTENT(ITEM_ARROW_LIGHT) != ITEM_ARROW_LIGHT) {
+                msg = RAND_GET_HINT(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)) {
+                msg = 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 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) &&
+                       !RAND_GET_OPTION(RSK_TRIAL_COUNT).Is(0)) {
+                msg = 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.",
+                    "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.",
+                    "@, tu as peut-être ce qu'il te faut pour vaincre %rle Malin%w, mais les barrières sont toujours "
+                    "actives.^Termine les épreuves restantes pour les détruire.");
+            } else {
+                msg = 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;
+    }
+    msg.AutoFormat();
+    msg.LoadIntoFont();
+    *loadFromMessageTable = false;
+}
+
+void BuildChildAltarMessage(uint16_t* textId, bool* loadFromMessageTable) {
+    CustomMessage msg = RAND_GET_HINT(RH_ALTAR_CHILD)->GetHintMessage();
+    msg.AutoFormat();
+    msg.LoadIntoFont();
+    *loadFromMessageTable = false;
+}
+
+void BuildAdultAltarMessage(uint16_t* textId, bool* loadFromMessageTable) {
+    CustomMessage msg = RAND_GET_HINT(RH_ALTAR_ADULT)->GetHintMessage();
+    msg.AutoFormat();
+    msg.LoadIntoFont();
+    *loadFromMessageTable = false;
+}
+
+void BuildSkulltulaPeopleMessage(uint16_t* textId, bool* loadFromMessageTable) {
+    uint8_t count = 0;
+    RandomizerCheck rc = RC_UNKNOWN_CHECK;
+    int16_t actorParams = GET_PLAYER(gPlayState)->talkActor->params;
+    if (actorParams == 1 && RAND_GET_OPTION(RSK_KAK_10_SKULLS_HINT)) {
+        rc = RC_KAK_10_GOLD_SKULLTULA_REWARD;
+        count = 10;
+    } else if (actorParams == 2 && RAND_GET_OPTION(RSK_KAK_20_SKULLS_HINT)) {
+        rc = RC_KAK_20_GOLD_SKULLTULA_REWARD;
+        count = 20;
+    } else if (actorParams == 3 && RAND_GET_OPTION(RSK_KAK_30_SKULLS_HINT)) {
+        rc = RC_KAK_30_GOLD_SKULLTULA_REWARD;
+        count = 30;
+    } else if (actorParams == 4 && RAND_GET_OPTION(RSK_KAK_40_SKULLS_HINT)) {
+        rc = RC_KAK_40_GOLD_SKULLTULA_REWARD;
+        count = 40;
+    } else if (actorParams == 5 && RAND_GET_OPTION(RSK_KAK_50_SKULLS_HINT)) {
+        rc = RC_KAK_50_GOLD_SKULLTULA_REWARD;
+        count = 50;
+    } else {
+        return;
+    }
+    Rando::Item& item = Rando::StaticData::RetrieveItem(RAND_GET_ITEM_LOC(rc)->GetPlacedRandomizerGet());
+    CustomMessage msg = CustomMessage("Yeaaarrgh! I'm cursed!!^Please save me by destroying %y[[d]] Spiders of the "
+                                      "Curse%w and I will give you my [[color]][[1]]%w!",
+                                      /*german*/
+                                      "Yeaaarrgh! Ich bin verflucht!^Bitte rette mich, indem Du %y[[d]] Skulltulas%w "
+                                      "zerstörst und ich werde Dir dafür [[color]][[1]]%w geben!",
+                                      /*french*/
+                                      "Yeaaarrgh! Je suis maudit!^Détruit encore %y[[d]] Araignées de la Malédiction%w "
+                                      "et j'aurai quelque chose à te donner! [[color]]([[1]])%w");
+    msg.InsertNumber(count);
+    msg.Replace("[[color]]", item.GetColor());
+    msg.InsertNames({ item.GetName() });
+    msg.AutoFormat();
+    msg.LoadIntoFont();
+    *loadFromMessageTable = false;
+}
+
+void Build100SkullsHintMessage(uint16_t* textId, bool* loadFromMessageTable) {
+    CustomMessage msg = CustomMessage("Yeaaarrgh! I'm cursed!!^Please save me by destroying %y100 Spiders of the "
+                                      "Curse%w and I will give you my [[color]][[1]]%w!",
+                                      /*german*/
+                                      "Yeaaarrgh! Ich bin verflucht!^Bitte rette mich, indem Du %y100 Skulltulas%w "
+                                      "zerstörst und ich werde Dir dafür [[color]][[1]]%w geben!",
+                                      /*french*/
+                                      "Yeaaarrgh! Je suis maudit!^Détruit encore %y100 Araignées de la Malédiction%w "
+                                      "et j'aurai quelque chose à te donner! [[color]]([[1]])%w");
+    msg.Replace("[[color]]", Rando::StaticData::RetrieveItem(
+                                 RAND_GET_ITEM_LOC(RC_KAK_100_GOLD_SKULLTULA_REWARD)->GetPlacedRandomizerGet())
+                                 .GetColor());
+    msg.InsertNames(
+        { Rando::StaticData::RetrieveItem(RAND_GET_ITEM_LOC(RC_KAK_100_GOLD_SKULLTULA_REWARD)->GetPlacedRandomizerGet())
+              .GetName() });
+    msg.AutoFormat();
+    msg.LoadIntoFont();
+    *loadFromMessageTable = false;
+}
+
+void BuildDampesDiaryMessage(uint16_t* textId, bool* loadFromMessageTable) {
+    CustomMessage msg = RAND_GET_HINT(RH_DAMPES_DIARY)->GetHintMessage(MF_AUTO_FORMAT);
+    msg.LoadIntoFont();
+    *loadFromMessageTable = false;
+}
+
+void BuildGregHintMessage(uint16_t* textId, bool* loadFromMessageTable) {
+    if (gPlayState->sceneNum == SCENE_TREASURE_BOX_SHOP) {
+        CustomMessage msg = RAND_GET_HINT(RH_GREG_RUPEE)->GetHintMessage(MF_AUTO_FORMAT);
+        msg.LoadIntoFont();
+        *loadFromMessageTable = false;
+    }
+}
+
+void BuildMysteriousWarpMessage() {
+    CustomMessage msg = CustomMessage(
+        "Warp to&%ra mysterious place?%w&" + CustomMessage::TWO_WAY_CHOICE() + "%gOK&No%w",
+        "Zu&%reinem mysteriösen Ort%w?&" + CustomMessage::TWO_WAY_CHOICE() + "%gOK&No%w",
+        "Se téléporter vers&%run endroit mystérieux%w?&" + CustomMessage::TWO_WAY_CHOICE() + "%rOK!&Non%w");
+    msg.LoadIntoFont();
+}
+
+void BuildMinuetWarpMessage(uint16_t* textId, bool* loadFromMessageTable) {
+    if (RAND_GET_OPTION(RSK_WARP_SONG_HINTS).Is(RO_GENERIC_OFF)) {
+        BuildMysteriousWarpMessage();
+        *loadFromMessageTable = false;
+        return;
+    }
+    CustomMessage msg = RAND_GET_HINT(RH_MINUET_WARP_LOC)->GetHintMessage(MF_AUTO_FORMAT);
+    msg.LoadIntoFont();
+    *loadFromMessageTable = false;
+}
+
+void BuildBoleroWarpMessage(uint16_t* textId, bool* loadFromMessageTable) {
+    if (RAND_GET_OPTION(RSK_WARP_SONG_HINTS).Is(RO_GENERIC_OFF)) {
+        BuildMysteriousWarpMessage();
+        *loadFromMessageTable = false;
+        return;
+    }
+    CustomMessage msg = RAND_GET_HINT(RH_BOLERO_WARP_LOC)->GetHintMessage(MF_AUTO_FORMAT);
+    msg.LoadIntoFont();
+    *loadFromMessageTable = false;
+}
+
+void BuildSerenadeWarpMessage(uint16_t* textId, bool* loadFromMessageTable) {
+    if (RAND_GET_OPTION(RSK_WARP_SONG_HINTS).Is(RO_GENERIC_OFF)) {
+        BuildMysteriousWarpMessage();
+        *loadFromMessageTable = false;
+        return;
+    }
+    CustomMessage msg = RAND_GET_HINT(RH_SERENADE_WARP_LOC)->GetHintMessage(MF_AUTO_FORMAT);
+    msg.LoadIntoFont();
+    *loadFromMessageTable = false;
+}
+
+void BuildRequiemWarpMessage(uint16_t* textId, bool* loadFromMessageTable) {
+    if (RAND_GET_OPTION(RSK_WARP_SONG_HINTS).Is(RO_GENERIC_OFF)) {
+        BuildMysteriousWarpMessage();
+        *loadFromMessageTable = false;
+        return;
+    }
+    CustomMessage msg = RAND_GET_HINT(RH_REQUIEM_WARP_LOC)->GetHintMessage(MF_AUTO_FORMAT);
+    msg.LoadIntoFont();
+    *loadFromMessageTable = false;
+}
+
+void BuildNocturneWarpMessage(uint16_t* textId, bool* loadFromMessageTable) {
+    if (RAND_GET_OPTION(RSK_WARP_SONG_HINTS).Is(RO_GENERIC_OFF)) {
+        BuildMysteriousWarpMessage();
+        *loadFromMessageTable = false;
+        return;
+    }
+    CustomMessage msg = RAND_GET_HINT(RH_NOCTURNE_WARP_LOC)->GetHintMessage(MF_AUTO_FORMAT);
+    msg.LoadIntoFont();
+    *loadFromMessageTable = false;
+}
+
+void BuildPreludeWarpMessage(uint16_t* textId, bool* loadFromMessageTable) {
+    if (RAND_GET_OPTION(RSK_WARP_SONG_HINTS).Is(RO_GENERIC_OFF)) {
+        BuildMysteriousWarpMessage();
+        *loadFromMessageTable = false;
+        return;
+    }
+    CustomMessage msg = RAND_GET_HINT(RH_PRELUDE_WARP_LOC)->GetHintMessage(MF_AUTO_FORMAT);
+    msg.LoadIntoFont();
+    *loadFromMessageTable = false;
+}
+
+void BuildFrogsHintMessage(uint16_t* textId, bool* loadFromMessageTable) {
+    CustomMessage msg = RAND_GET_HINT(RH_FROGS_HINT)->GetHintMessage(MF_AUTO_FORMAT);
+    msg.LoadIntoFont();
+    *loadFromMessageTable = false;
+}
+
+void BuildLoachHintMessage(uint16_t* textId, bool* loadFromMessageTable) {
+    CustomMessage msg = RAND_GET_HINT(RH_LOACH_HINT)->GetHintMessage(MF_AUTO_FORMAT);
+    msg.LoadIntoFont();
+    *loadFromMessageTable = false;
+}
+
+void BuildFishingPoleHintMessage(uint16_t* textId, bool* loadFromMessageTable) {
+    if (Flags_GetRandomizerInf(RAND_INF_FISHING_POLE_FOUND)) {
+        return;
+    }
+    CustomMessage msg = 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!",
+        "Désolé, mais l'étang est fermé.&J'ai perdu ma bonne %rCanne à Pêche%w...&Impossible de pêcher sans elle!");
+    if (RAND_GET_OPTION(RSK_FISHING_POLE_HINT)) {
+        msg = msg + RAND_GET_HINT(RH_FISHING_POLE)->GetHintMessage();
+    }
+    if (*textId == TEXT_FISHING_POND_START_MET) {
+        msg = CustomMessage("Hey, mister! I remember you!&It's been a long time!^",
+                            "Hallo, mein Herr! Ich erinnere mich an Sie!&Lang ist's her!",
+                            "Hé, monsieur! Je me souviens de toi!&Ça fait longtemps!") +
+              msg;
+    }
+    msg.AutoFormat();
+    msg.LoadIntoFont();
+    *loadFromMessageTable = false;
+}
+
+void BuildSariaMessage(uint16_t* textId, bool* loadFromMessageTable) {
+    CustomMessage msg;
+    if (*textId == TEXT_SARIA_SFM) {
+        msg = RAND_GET_HINT(RH_SARIA_HINT)->GetHintMessage(MF_AUTO_FORMAT, 0);
+    } else {
+        msg = RAND_GET_HINT(RH_SARIA_HINT)->GetHintMessage(MF_AUTO_FORMAT, 1);
+    }
+    msg.LoadIntoFont();
+    *loadFromMessageTable = false;
+}
+
+void BuildBiggoronHintMessage(uint16_t* textId, bool* loadFromMessageTable) {
+    CustomMessage msg = RAND_GET_HINT(RH_BIGGORON_HINT)->GetHintMessage(MF_AUTO_FORMAT);
+    msg.LoadIntoFont();
+    *loadFromMessageTable = false;
+}
+
+void BuildBigPoesHintMessage(uint16_t* textId, bool* loadFromMessageTable) {
+    CustomMessage msg = RAND_GET_HINT(RH_BIGGORON_HINT)->GetHintMessage(MF_AUTO_FORMAT);
+    msg.LoadIntoFont();
+    *loadFromMessageTable = false;
+}
+
+void BuildChickensHintMessage(uint16_t* textId, bool* loadFromMessageTable) {
+    CustomMessage msg = RAND_GET_HINT(RH_CHICKENS_HINT)->GetHintMessage(MF_AUTO_FORMAT);
+    msg.LoadIntoFont();
+    *loadFromMessageTable = false;
+}
+
+void BuildMalonHintMessage(uint16_t* textId, bool* loadFromMessageTable) {
+    CustomMessage msg;
+    int id;
+    if (*textId == TEXT_MALON_EVERYONE_TURNING_EVIL || *textId == TEXT_MALON_I_SING_THIS_SONG) {
+        id = 0;
+    } else if (*textId == TEXT_MALON_HOW_IS_EPONA_DOING) {
+        id = 1;
+    } else if (*textId == TEXT_MALON_OBSTICLE_COURSE) {
+        id = 2;
+    } else if (*textId == TEXT_MALON_INGO_MUST_HAVE_BEEN_TEMPTED) {
+        id = 3;
+    } else {
+        assert(!"This should not be reachable");
+        return;
+    }
+    msg = RAND_GET_HINT(RH_MALON_HINT)->GetHintMessage(MF_AUTO_FORMAT, id);
+    msg.LoadIntoFont();
+    *loadFromMessageTable = false;
+}
+
+void BuildHorsebackArcheryMessage(uint16_t* textId, bool* loadFromMessageTable) {
+    CustomMessage msg;
+    int id;
+    if (*textId == TEXT_GF_HBA_SIGN) {
+        id = 0;
+    } else if (*textId == TEXT_HBA_NOT_ON_HORSE) {
+        id = 1;
+    } else if (*textId == TEXT_HBA_INITIAL_EXPLAINATION) {
+        id = 2;
+    } else if (*textId == TEXT_HBA_ALREADY_HAVE_1000) {
+        id = 3;
+    } else {
+        assert(!"This should not be reachable");
+        return;
+    }
+    msg = RAND_GET_HINT(RH_HBA_HINT)->GetHintMessage(MF_AUTO_FORMAT, id);
+    msg.LoadIntoFont();
+    *loadFromMessageTable = false;
+}
+
+void BuildMaskShopSignMessage(uint16_t* textId, bool* loadFromMessageTable) {
+    CustomMessage msg = RAND_GET_HINT(RH_MASK_SHOP_HINT)->GetHintMessage(MF_AUTO_FORMAT);
+    msg.LoadIntoFont();
+    *loadFromMessageTable = false;
+}
+
+void RegisterStaticHints() {
+    // Ganondorf
+    COND_ID_HOOK(OnOpenText, TEXT_GANONDORF, RAND_GET_OPTION(RSK_GANONDORF_HINT), BuildGanondorfHint);
+    // Sheik
+    COND_ID_HOOK(OnOpenText, TEXT_SHEIK_NEED_HOOK, IS_RANDO, BuildSheikMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_SHEIK_HAVE_HOOK, IS_RANDO, BuildSheikMessage);
+    // Altar
+    COND_ID_HOOK(OnOpenText, TEXT_ALTAR_CHILD, IS_RANDO, BuildChildAltarMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_ALTAR_ADULT, IS_RANDO, BuildAdultAltarMessage);
+    // Skulltula
+    COND_ID_HOOK(OnOpenText, TEXT_SKULLTULA_PEOPLE_IM_CURSED, ANY_SKULLTULA_HINTS, BuildSkulltulaPeopleMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_SKULLTULA_PEOPLE_MAKE_YOU_VERY_RICH, RAND_GET_OPTION(RSK_KAK_100_SKULLS_HINT),
+                 Build100SkullsHintMessage);
+    // Dampe's Diary
+    COND_ID_HOOK(OnOpenText, TEXT_DAMPES_DIARY, RAND_GET_OPTION(RSK_DAMPES_DIARY_HINT), BuildDampesDiaryMessage);
+    // Chest Game
+    COND_ID_HOOK(OnOpenText, TEXT_CHEST_GAME_PROCEED, RAND_GET_OPTION(RSK_GREG_HINT), BuildGregHintMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_CHEST_GAME_REAL_GAMBLER, RAND_GET_OPTION(RSK_GREG_HINT), BuildGregHintMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_CHEST_GAME_THANKS_A_LOT, RAND_GET_OPTION(RSK_GREG_HINT), BuildGregHintMessage);
+    // Warp
+    COND_ID_HOOK(OnOpenText, TEXT_WARP_MINUET_OF_FOREST, RAND_GET_OPTION(RSK_WARP_SONG_HINTS), BuildMinuetWarpMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_WARP_BOLERO_OF_FIRE, RAND_GET_OPTION(RSK_WARP_SONG_HINTS), BuildBoleroWarpMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_WARP_SERENADE_OF_WATER, RAND_GET_OPTION(RSK_WARP_SONG_HINTS),
+                 BuildSerenadeWarpMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_WARP_REQUIEM_OF_SPIRIT, RAND_GET_OPTION(RSK_WARP_SONG_HINTS),
+                 BuildRequiemWarpMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_WARP_NOCTURNE_OF_SHADOW, RAND_GET_OPTION(RSK_WARP_SONG_HINTS),
+                 BuildNocturneWarpMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_WARP_PRELUDE_OF_LIGHT, RAND_GET_OPTION(RSK_WARP_SONG_HINTS), BuildPreludeWarpMessage);
+    // Frogs
+    COND_ID_HOOK(OnOpenText, TEXT_FROGS_UNDERWATER, RAND_GET_OPTION(RSK_FROGS_HINT), BuildFrogsHintMessage);
+    // Loach
+    COND_ID_HOOK(OnOpenText, TEXT_FISHING_CLOUDY, RAND_GET_OPTION(RSK_LOACH_HINT), BuildLoachHintMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_FISHING_TRY_ANOTHER_LURE, RAND_GET_OPTION(RSK_LOACH_HINT), BuildLoachHintMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_FISHING_SECRETS, RAND_GET_OPTION(RSK_LOACH_HINT), BuildLoachHintMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_FISHING_GOOD_FISHERMAN, RAND_GET_OPTION(RSK_LOACH_HINT), BuildLoachHintMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_FISHING_DIFFERENT_POND, RAND_GET_OPTION(RSK_LOACH_HINT), BuildLoachHintMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_FISHING_SCRATCHING, RAND_GET_OPTION(RSK_LOACH_HINT), BuildLoachHintMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_FISHING_TRY_ANOTHER_LURE_WITH_SINKING_LURE, RAND_GET_OPTION(RSK_LOACH_HINT),
+                 BuildLoachHintMessage);
+    // Fishing Pole
+    COND_ID_HOOK(OnOpenText, TEXT_FISHING_POND_START, RAND_GET_OPTION(RSK_SHUFFLE_FISHING_POLE),
+                 BuildFishingPoleHintMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_FISHING_POND_START_MET, RAND_GET_OPTION(RSK_SHUFFLE_FISHING_POLE),
+                 BuildFishingPoleHintMessage);
+    // Saria
+    COND_ID_HOOK(OnOpenText, TEXT_SARIA_SFM, RAND_GET_OPTION(RSK_SARIA_HINT), BuildSariaMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_SARIAS_SONG_FACE_TO_FACE, RAND_GET_OPTION(RSK_SARIA_HINT), BuildSariaMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_SARIAS_SONG_FOREST_SOUNDS, RAND_GET_OPTION(RSK_SARIA_HINT), BuildSariaMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_SARIAS_SONG_MR_DARUNIA, RAND_GET_OPTION(RSK_SARIA_HINT), BuildSariaMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_SARIAS_SONG_SPIRITUAL_WATER, RAND_GET_OPTION(RSK_SARIA_HINT), BuildSariaMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_SARIAS_SONG_SPIRITUAL_FIRE, RAND_GET_OPTION(RSK_SARIA_HINT), BuildSariaMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_SARIAS_SONG_DREAD_CASTLE, RAND_GET_OPTION(RSK_SARIA_HINT), BuildSariaMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_SARIAS_SONG_DIFFERENT_OCARINA, RAND_GET_OPTION(RSK_SARIA_HINT), BuildSariaMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_SARIAS_SONG_EYES_DARKNESS_STORM, RAND_GET_OPTION(RSK_SARIA_HINT), BuildSariaMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_SARIAS_SONG_DESERT_GODDESS, RAND_GET_OPTION(RSK_SARIA_HINT), BuildSariaMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_SARIAS_SONG_TEMPLES, RAND_GET_OPTION(RSK_SARIA_HINT), BuildSariaMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_SARIAS_SONG_FOREST_TEMPLE, RAND_GET_OPTION(RSK_SARIA_HINT), BuildSariaMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_SARIAS_SONG_GLAD_NOW, RAND_GET_OPTION(RSK_SARIA_HINT), BuildSariaMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_SARIAS_SONG_IMPRISON_GANONDORF, RAND_GET_OPTION(RSK_SARIA_HINT), BuildSariaMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_SARIAS_SONG_CHANNELING_POWER, RAND_GET_OPTION(RSK_SARIA_HINT), BuildSariaMessage);
+    // Biggoron
+    COND_ID_HOOK(OnOpenText, TEXT_BIGGORON_BETTER_AT_SMITHING, RAND_GET_OPTION(RSK_BIGGORON_HINT),
+                 BuildBiggoronHintMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_BIGGORON_WAITING_FOR_YOU, RAND_GET_OPTION(RSK_BIGGORON_HINT),
+                 BuildBiggoronHintMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_BIGGORON_RETURN_AFTER_A_FEW_DAYS, RAND_GET_OPTION(RSK_BIGGORON_HINT),
+                 BuildBiggoronHintMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_BIGGORON_I_MAAAADE_THISSSS, RAND_GET_OPTION(RSK_BIGGORON_HINT),
+                 BuildBiggoronHintMessage);
+    // Big Poes
+    COND_ID_HOOK(OnOpenText, TEXT_GHOST_SHOP_EXPLAINATION, RAND_GET_OPTION(RSK_BIG_POES_HINT), BuildBigPoesHintMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_GHOST_SHOP_CARD_HAS_POINTS, RAND_GET_OPTION(RSK_BIG_POES_HINT),
+                 BuildBigPoesHintMessage);
+    // Anju
+    COND_ID_HOOK(OnOpenText, TEXT_ANJU_PLEASE_BRING_MY_CUCCOS_BACK, RAND_GET_OPTION(RSK_CHICKENS_HINT),
+                 BuildChickensHintMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_ANJU_PLEASE_BRING_4_CUCCOS, RAND_GET_OPTION(RSK_CHICKENS_HINT),
+                 BuildChickensHintMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_ANJU_PLEASE_BRING_3_CUCCOS, RAND_GET_OPTION(RSK_CHICKENS_HINT),
+                 BuildChickensHintMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_ANJU_PLEASE_BRING_2_CUCCOS, RAND_GET_OPTION(RSK_CHICKENS_HINT),
+                 BuildChickensHintMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_ANJU_PLEASE_BRING_1_CUCCO, RAND_GET_OPTION(RSK_CHICKENS_HINT),
+                 BuildChickensHintMessage);
+    // Malon
+    COND_ID_HOOK(OnOpenText, TEXT_MALON_EVERYONE_TURNING_EVIL, RAND_GET_OPTION(RSK_MALON_HINT), BuildMalonHintMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_MALON_I_SING_THIS_SONG, RAND_GET_OPTION(RSK_MALON_HINT), BuildMalonHintMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_MALON_HOW_IS_EPONA_DOING, RAND_GET_OPTION(RSK_MALON_HINT), BuildMalonHintMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_MALON_OBSTICLE_COURSE, RAND_GET_OPTION(RSK_MALON_HINT), BuildMalonHintMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_MALON_INGO_MUST_HAVE_BEEN_TEMPTED, RAND_GET_OPTION(RSK_MALON_HINT),
+                 BuildMalonHintMessage);
+    // Horseback Archery
+    COND_ID_HOOK(OnOpenText, TEXT_GF_HBA_SIGN, RAND_GET_OPTION(RSK_HBA_HINT), BuildHorsebackArcheryMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_HBA_NOT_ON_HORSE, RAND_GET_OPTION(RSK_HBA_HINT), BuildHorsebackArcheryMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_HBA_INITIAL_EXPLAINATION, RAND_GET_OPTION(RSK_HBA_HINT),
+                 BuildHorsebackArcheryMessage);
+    COND_ID_HOOK(OnOpenText, TEXT_HBA_ALREADY_HAVE_1000, RAND_GET_OPTION(RSK_HBA_HINT), BuildHorsebackArcheryMessage);
+    // Mask Shop Sign
+    COND_ID_HOOK(OnOpenText, TEXT_MASK_SHOP_SIGN, RAND_GET_OPTION(RSK_MASK_SHOP_HINT), BuildMaskShopSignMessage);
+}
+
+static RegisterShipInitFunc initFunc(RegisterStaticHints, { "IS_RANDO" });

soh/soh/Enhancements/randomizer/hint.cpp

@@ -523,7 +523,7 @@ const HintText Hint::GetItemHintText(uint8_t slot, bool mysterious) const {
                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();
+        return HintText(ctx->GetItemLocation(hintedCheck)->GetPlacedItem().GetName());
     }
 }
 

soh/soh/Enhancements/randomizer/item.cpp

@@ -18,10 +18,11 @@ Item::Item()
 Item::Item(const RandomizerGet randomizerGet_, Text name_, const ItemType type_, const int16_t getItemId_,
            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 int16_t chestAnimation_, const GetItemCategory category_, const uint16_t modIndex_, Text article_,
-           const bool progressive_, const uint16_t price_)
+           const std::string color_, const bool progressive_, const uint16_t price_)
     : randomizerGet(randomizerGet_), name(std::move(name_)), type(type_), getItemId(getItemId_),
-      advancement(advancement_), logicVal(logicVal_), hintKey(hintKey_), progressive(progressive_), price(price_) {
+      advancement(advancement_), logicVal(logicVal_), hintKey(hintKey_), article(std::move(article_)),
+      color(std::move(color_)), 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_,
@@ -36,10 +37,11 @@ Item::Item(const RandomizerGet randomizerGet_, Text name_, const ItemType type_,
 }
 
 Item::Item(const RandomizerGet randomizerGet_, Text name_, const ItemType type_, const int16_t getItemId_,
-           const bool advancement_, LogicVal logicVal_, const RandomizerHintTextKey hintKey_, const bool progressive_,
+           const bool advancement_, LogicVal logicVal_, const RandomizerHintTextKey hintKey_, Text article_,
-           const uint16_t price_)
+           const std::string color_, const bool progressive_, const uint16_t price_)
     : randomizerGet(randomizerGet_), name(std::move(name_)), type(type_), getItemId(getItemId_),
-      advancement(advancement_), logicVal(logicVal_), hintKey(hintKey_), progressive(progressive_), price(price_) {
+      advancement(advancement_), logicVal(logicVal_), hintKey(hintKey_), article(std::move(article_)),
+      color(std::move(color_)), progressive(progressive_), price(price_) {
 }
 
 Item::~Item() = default;
@@ -60,6 +62,14 @@ const Text& Item::GetName() const {
     return name;
 }
 
+const Text& Item::GetArticle() const {
+    return article;
+}
+
+const std::string& Item::GetColor() const {
+    return color;
+}
+
 bool Item::IsAdvancement() const {
     return advancement;
 }

soh/soh/Enhancements/randomizer/item.h

@@ -33,15 +33,18 @@ class Item {
     Item(RandomizerGet randomizerGet_, Text name_, ItemType type_, int16_t getItemId_, bool advancement_,
          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);
+         Text article_ = {}, std::string color_ = "%g", bool progressive_ = false, uint16_t price_ = 0);
     Item(RandomizerGet randomizerGet_, Text name_, ItemType type_, int16_t getItemId_, bool advancement_,
-         LogicVal logicVal_, RandomizerHintTextKey hintKey_, bool progressive_ = false, uint16_t price_ = 0);
+         LogicVal logicVal_, RandomizerHintTextKey hintKey_, Text article_ = {}, std::string color_ = "%g",
+         bool progressive_ = false, uint16_t price_ = 0);
     ~Item();
 
     void ApplyEffect() const;
     void UndoEffect() const;
 
     const Text& GetName() const;
+    const Text& GetArticle() const;
+    const std::string& GetColor() const;
     bool IsAdvancement() const;
     int GetItemID() const;
     ItemType GetItemType() const;
@@ -69,6 +72,8 @@ class Item {
     bool advancement;
     LogicVal logicVal;
     RandomizerHintTextKey hintKey;
+    Text article;
+    std::string color;
     bool progressive;
     uint16_t price;
     bool playthrough = false;

soh/soh/Enhancements/randomizer/item_list.cpp

@@ -16,254 +16,243 @@ void Rando::StaticData::InitItemTable() {
     // clang-format off
     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_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, {"the ", "das ", "le "});
-    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] =                        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, {"the ", "das ", "le "});
     itemTable[RG_MASTER_SWORD].SetCustomDrawFunc(Randomizer_DrawMasterSword);
-    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_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, {"the ", "das ", "le "});
-    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_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, {"the ", "das ", "le "});
-    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_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, {"a ", "einen ", "un "});
-    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_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, {"a ", "einen ", "un "});
-    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_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, {"the ", "den ", "le "});
-    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_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, {"a ", "eine ", "une "});
-    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_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, {"a ", "eine ", "une "});
-    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_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, {"the ", "die ", "les "});
-    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_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, {"the ", "die ", "les "});
-    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_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, {"the ", "den ", "le "});
-    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_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, {"the ", "die ", "la "});
-    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_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, {"the ", "den ", "le "});
-    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_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, {"the ", "den ", "la "});
     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_FIRE_ARROWS] =                         Item(RG_FIRE_ARROWS,                      Text{ "Fire Arrows", "Flèches 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_ICE_ARROWS] =                          Item(RG_ICE_ARROWS,                       Text{ "Ice Arrows", "Flèches de Glace", "Eispfeile" },                                                                                  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_LIGHT_ARROWS] =                        Item(RG_LIGHT_ARROWS,                     Text{ "Light Arrows", "Flèches de Lumière", "Lichtpfeile" },                                                                            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_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, {"the ", "die ", "la "});
-    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] =                          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, {"a ", "eine ", "un "});
-    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_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, {"the ", "das ", "le "});
     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_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, {"the ", "das ", "le "});
     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_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, {"the ", "das ", "le "});
     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_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, {"the ", "den ", "le "});
-    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_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, {"the ", "den ", "la "});
-    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_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, {"the ", "die ", "la "});
-    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_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, {"the ", "das ", "le "});
-    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_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, {"the ", "das ", "la "});
-    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_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, {"the ", "den ", "la "});
-    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_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, {"the ", "die ", "les "});
-    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);
+    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, {"the ", "den ", "le "});
     // 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, {"a ", "ein ", "un "});
     // 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_HOOKSHOT] =                Item(RG_PROGRESSIVE_HOOKSHOT,             Text{ "Progressive Hookshot", "Grappin (prog.)", "Progressiver Fanghaken" },                                                         ITEMTYPE_ITEM,              0x80,                 true,  LOGIC_PROGRESSIVE_HOOKSHOT,         RHT_PROGRESSIVE_HOOKSHOT, {"a ", "einen ", " un"}, "%g", 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_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, {"a ", "ein ", "une "}, "%g", 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_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, {"a ", "eine ", "un "}, "%g", 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_BOW] =                     Item(RG_PROGRESSIVE_BOW,                  Text{ "Progressive Bow", "Arc (prog.)", "Progressiver Bogen" },                                                                      ITEMTYPE_ITEM,              0x83,                 true,  LOGIC_PROGRESSIVE_BOW,              RHT_PROGRESSIVE_BOW, {"a ", "einen ", "un "}, "%g", 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_SLINGSHOT] =               Item(RG_PROGRESSIVE_SLINGSHOT,            Text{ "Progressive Slingshot", "Lance-Pierre (prog.)", "Progressive Steinschleuder" },                                               ITEMTYPE_ITEM,              0x84,                 true,  LOGIC_PROGRESSIVE_BULLET_BAG,       RHT_PROGRESSIVE_SLINGSHOT, {"a ", "eine ", "un "}, "%g", 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_WALLET] =                  Item(RG_PROGRESSIVE_WALLET,               Text{ "Progressive Wallet", "Bourse (prog.)", "Progressive Geldbörse" },                                                             ITEMTYPE_ITEM,              0x85,                 true,  LOGIC_PROGRESSIVE_WALLET,           RHT_PROGRESSIVE_WALLET, {"a ", "ein ", "un "}, "%g", 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_SCALE] =                   Item(RG_PROGRESSIVE_SCALE,                Text{ "Progressive Scale", "Écaille (prog.)", "Progressive Schuppe" },                                                               ITEMTYPE_ITEM,              0x86,                 true,  LOGIC_PROGRESSIVE_SCALE,            RHT_PROGRESSIVE_SCALE, {"a ", "eine ", "une "}, "%g", 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_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, {"a ", "eine ", "une "}, "%g", 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_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, {"a ", "eine ", "un "}, "%g", 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, 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, {"a ", "einen ", "un "}, "%g", 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_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, {"a ", "ein ", "un "}, "%g", 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_OCARINA] =                 Item(RG_PROGRESSIVE_OCARINA,              Text{ "Progressive Ocarina", "Ocarina (prog.)", "Progressive Okarina" },                                                             ITEMTYPE_ITEM,              0x8B,                 true,  LOGIC_PROGRESSIVE_OCARINA,          RHT_PROGRESSIVE_OCARINA, {"a ", "eine ", "un "}, "%g", 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);
+    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, {"a ", "ein ", "une "}, "%g", 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_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, {"an ", "eine ", "une "});
-    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_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, {"a ", "eine ", "une "});
-    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_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, {"a ", "eine ", "une "});
-    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_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, {"a ", "eine ", "une "});
-    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_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, {"a ", "eine ", "une "});
-    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_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, {"a ", "eine ", "une "});
-    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_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, {"a ", "eine ", "une "});
-    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_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, {"a ", "eine ", "une "});
-    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_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, {"a ", "eine ", "une "});
-    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_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, {"a ", "eine ", "une "});
-    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_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, {"a ", "einen ", "un "});
-    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_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, {"a ", "einen ", "un "});
     // 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", "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_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, {"the ", "das ", "la "});
-    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_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, {"the ", "das ", "le "});
-    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_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, {"the ", "das ", "le "});
-    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_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, {"the ", "den ", "le "});
-    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_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, {"the ", "die ", "la "});
-    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_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, {"the ", "die ", "le "});
-    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_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, {"the ", "das ", "le "});
-    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);
+    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, {"the ", "das ", "le "});
     // 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_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, {"the", " die ", "la "}, "%g");
-    itemTable[RG_DEKU_TREE_MAP].SetCustomDrawFunc(Randomizer_DrawMap);
+    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, {"the ", "die ", "la "}, "%r");
-    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, {"the ", "die ", "la "}, "%b");
-    itemTable[RG_DODONGOS_CAVERN_MAP].SetCustomDrawFunc(Randomizer_DrawMap);
+    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, {"the ", "die ", "la "}, "%g");
-    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_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, {"the ", "die ", "la "}, "%r");
-    itemTable[RG_JABU_JABUS_BELLY_MAP].SetCustomDrawFunc(Randomizer_DrawMap);
+    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, {"the ", "die ", "la "}, "%b");
-    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_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, {"the ", "die ", "la "}, "%y");
-    itemTable[RG_FOREST_TEMPLE_MAP].SetCustomDrawFunc(Randomizer_DrawMap);
+    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, {"the ", "die ", "la "}, "%p");
-    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_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, {"the ", "die ", "la "}, "%p");
-    itemTable[RG_FIRE_TEMPLE_MAP].SetCustomDrawFunc(Randomizer_DrawMap);
+    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, {"the ", "die ", "la "}, "%c");
-    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_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, {"the ", "den ", "la "}, "%g");
-    itemTable[RG_WATER_TEMPLE_MAP].SetCustomDrawFunc(Randomizer_DrawMap);
-    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_SPIRIT_TEMPLE_MAP].SetCustomDrawFunc(Randomizer_DrawMap);
-    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_SHADOW_TEMPLE_MAP].SetCustomDrawFunc(Randomizer_DrawMap);
-    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_BOTTOM_OF_THE_WELL_MAP].SetCustomDrawFunc(Randomizer_DrawMap);
-    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_ICE_CAVERN_MAP].SetCustomDrawFunc(Randomizer_DrawMap);
-    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", "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] =             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, {"the ", "den ", "la "}, "%r");
     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", "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] =            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, {"the ", "den ", "la "}, "%b");
     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", "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] =               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, {"the ", "den ", "la "}, "%g");
     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", "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] =                 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, {"the ", "den ", "la "}, "%r");
     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", "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] =                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, {"the ", "den ", "la "}, "%b");
     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", "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] =               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, {"the ", "den ", "la "}, "%y");
     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", "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] =               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, {"the ", "den ", "la "}, "%p");
     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", "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] =          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, {"the ", "den ", "la "}, "%p");
     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", "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] =                  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, {"the ", "den ", "la "}, "%c");
     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", "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] =              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, {"the ", "den ", "la "}, "%g");
     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", "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] =                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, {"the ", "den ", "la "}, "%r");
     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", "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] =               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, {"the ", "den ", "la "}, "b");
     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", "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] =              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, {"the ", "den ", "la "}, "%y");
     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", "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] =              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, {"the ", "den ", "la "}, "%p");
     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", "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] =              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, {"the ", "den ", "la "}, "%r");
     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", "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] =             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, {"a ", "einen ", "une "}, "%g");
     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", "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] =               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, {"a ", "einen ", "une "}, "%r");
     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", "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] =              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, {"a ", "einen ", "une "}, "%b");
     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", "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] =             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, {"a ", "einen ", "une "}, "%y");
     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", "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] =             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, {"a ", "einen ", "une "}, "%p");
     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", "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] =        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, {"a ", "einen ", "une "}, "%p");
     itemTable[RG_BOTTOM_OF_THE_WELL_SMALL_KEY].SetCustomDrawFunc(Randomizer_DrawSmallKey);
-    itemTable[RG_GERUDO_TRAINING_GROUND_SMALL_KEY] =   Item(RG_GERUDO_TRAINING_GROUND_SMALL_KEY,  Text{ "Training Ground Small Key", "Petite Clé du Gymnase Gerudo", "Kleiner Schlüssel für das Gerudo-Trainingsgelände" },            ITEMTYPE_SMALLKEY,          0xB5,                 true,  LOGIC_GERUDO_TRAINING_GROUND_KEYS, RHT_GERUDO_TRAINING_GROUND_SMALL_KEY, RG_GERUDO_TRAINING_GROUND_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_GROUND_SMALL_KEY] =   Item(RG_GERUDO_TRAINING_GROUND_SMALL_KEY,  Text{ "Training Ground Small Key", "Petite Clé du Gymnase Gerudo", "Kleiner Schlüssel für das Gerudo-Trainingsgelände" },            ITEMTYPE_SMALLKEY,          0xB5,                 true,  LOGIC_GERUDO_TRAINING_GROUND_KEYS, RHT_GERUDO_TRAINING_GROUND_SMALL_KEY, RG_GERUDO_TRAINING_GROUND_SMALL_KEY, OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER, {"a ", "einen ", "une "}, "%y");
     itemTable[RG_GERUDO_TRAINING_GROUND_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", "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] =           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, {"a ", "einen ", "une "}, "%y");
     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", "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] =             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, {"a ", "einen ", "une "}, "%r");
     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);
+    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, {"a ", "einen ", "une "});
-    itemTable[RG_TREASURE_GAME_SMALL_KEY].SetCustomDrawFunc(Randomizer_DrawSmallKey);
+    itemTable[RG_GUARD_HOUSE_KEY] =                     Item(RG_GUARD_HOUSE_KEY,                  Text{ "Guard House Key", "Clé de la Maison des Gardes", "Schlüssel für das Haus der Wachen" },                                                                  ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_GUARD_HOUSE_KEY,              RHT_OVERWORLD_KEY,                     RG_GUARD_HOUSE_KEY,                   OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER, {"the ", "den ", "la "});
-    itemTable[RG_GUARD_HOUSE_KEY] =                     Item(RG_GUARD_HOUSE_KEY,                  Text{ "Guard House Key", "Clé de la Maison des Gardes", "Schlüssel für das Haus der Wachen" },                                                                  ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_GUARD_HOUSE_KEY,              RHT_OVERWORLD_KEY,                     RG_GUARD_HOUSE_KEY,                   OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_GUARD_HOUSE_KEY].SetCustomDrawFunc(Randomizer_DrawOverworldKey);
-    itemTable[RG_MARKET_BAZAAR_KEY] =                   Item(RG_MARKET_BAZAAR_KEY,                Text{ "Market Bazaar Key", "Clé du Bazar de la Place du Marché", "Schlüssel für den Basar des Marktes" },                                                              ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_MARKET_BAZAAR_KEY,            RHT_OVERWORLD_KEY,                     RG_MARKET_BAZAAR_KEY,                 OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_MARKET_BAZAAR_KEY] =                   Item(RG_MARKET_BAZAAR_KEY,                Text{ "Market Bazaar Key", "Clé du Bazar de la Place du Marché", "Schlüssel für den Basar des Marktes" },                                                              ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_MARKET_BAZAAR_KEY,            RHT_OVERWORLD_KEY,                     RG_MARKET_BAZAAR_KEY,                 OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER, {"the ", "den ", "la "});
     itemTable[RG_MARKET_BAZAAR_KEY].SetCustomDrawFunc(Randomizer_DrawOverworldKey);
-    itemTable[RG_MARKET_POTION_SHOP_KEY] =              Item(RG_MARKET_POTION_SHOP_KEY,           Text{ "Market Potion Shop Key", "Clé du Magasin de Potions de la Place du Marché", "Schlüssel für den Magie-Laden des Marktes" },                                                   ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_MARKET_POTION_SHOP_KEY,       RHT_OVERWORLD_KEY,                     RG_MARKET_POTION_SHOP_KEY,            OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_MARKET_POTION_SHOP_KEY] =              Item(RG_MARKET_POTION_SHOP_KEY,           Text{ "Market Potion Shop Key", "Clé du Magasin de Potions de la Place du Marché", "Schlüssel für den Magie-Laden des Marktes" },                                                   ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_MARKET_POTION_SHOP_KEY,       RHT_OVERWORLD_KEY,                     RG_MARKET_POTION_SHOP_KEY,            OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER, {"the ", "den ", "la "});
     itemTable[RG_MARKET_POTION_SHOP_KEY].SetCustomDrawFunc(Randomizer_DrawOverworldKey);
-    itemTable[RG_MASK_SHOP_KEY] =                       Item(RG_MASK_SHOP_KEY,                    Text{ "Mask Shop Key", "Clé de la Foire aux Masques", "Schlüssel für den Maskenladen" },                                                                        ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_MASK_SHOP_KEY,                RHT_OVERWORLD_KEY,                     RG_MASK_SHOP_KEY,                     OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_MASK_SHOP_KEY] =                       Item(RG_MASK_SHOP_KEY,                    Text{ "Mask Shop Key", "Clé de la Foire aux Masques", "Schlüssel für den Maskenladen" },                                                                        ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_MASK_SHOP_KEY,                RHT_OVERWORLD_KEY,                     RG_MASK_SHOP_KEY,                     OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER, {"the ", "den ", "la "});
     itemTable[RG_MASK_SHOP_KEY].SetCustomDrawFunc(Randomizer_DrawOverworldKey);
-    itemTable[RG_MARKET_SHOOTING_GALLERY_KEY] =         Item(RG_MARKET_SHOOTING_GALLERY_KEY,      Text{ "Market Shooting Gallery Key", "Clé du Stand de Tir de la Place du Marché", "Schlüssel für die Schießbude des Marktes" },                                               ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_MARKET_SHOOTING_GALLERY_KEY,  RHT_OVERWORLD_KEY,                     RG_MARKET_SHOOTING_GALLERY_KEY,       OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_MARKET_SHOOTING_GALLERY_KEY] =         Item(RG_MARKET_SHOOTING_GALLERY_KEY,      Text{ "Market Shooting Gallery Key", "Clé du Stand de Tir de la Place du Marché", "Schlüssel für die Schießbude des Marktes" },                                               ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_MARKET_SHOOTING_GALLERY_KEY,  RHT_OVERWORLD_KEY,                     RG_MARKET_SHOOTING_GALLERY_KEY,       OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER, {"the ", "den ", "la "});
     itemTable[RG_MARKET_SHOOTING_GALLERY_KEY].SetCustomDrawFunc(Randomizer_DrawOverworldKey);
-    itemTable[RG_BOMBCHU_BOWLING_KEY] =                 Item(RG_BOMBCHU_BOWLING_KEY,              Text{ "Bombchu Bowling Alley Key", "Clé du Bowling Teigneux", "Schlüssel für die Minenbowlingbahn" },                                                       ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_BOMBCHU_BOWLING_KEY,          RHT_OVERWORLD_KEY,                     RG_BOMBCHU_BOWLING_KEY,               OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_BOMBCHU_BOWLING_KEY] =                 Item(RG_BOMBCHU_BOWLING_KEY,              Text{ "Bombchu Bowling Alley Key", "Clé du Bowling Teigneux", "Schlüssel für die Minenbowlingbahn" },                                                       ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_BOMBCHU_BOWLING_KEY,          RHT_OVERWORLD_KEY,                     RG_BOMBCHU_BOWLING_KEY,               OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER, {"the ", "den ", "la "});
     itemTable[RG_BOMBCHU_BOWLING_KEY].SetCustomDrawFunc(Randomizer_DrawOverworldKey);
-    itemTable[RG_TREASURE_CHEST_GAME_BUILDING_KEY] =    Item(RG_TREASURE_CHEST_GAME_BUILDING_KEY, Text{ "Treasure Chest Game Building Key", "Clé de la Chasse au Trésor", "Schlüssel für das Haus des Schatzkisten-Pokers" },                                    ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_TREASURE_CHEST_GAME_BUILDING_KEY,RHT_OVERWORLD_KEY,                  RG_TREASURE_CHEST_GAME_BUILDING_KEY,  OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_TREASURE_CHEST_GAME_BUILDING_KEY] =    Item(RG_TREASURE_CHEST_GAME_BUILDING_KEY, Text{ "Treasure Chest Game Building Key", "Clé de la Chasse au Trésor", "Schlüssel für das Haus des Schatzkisten-Pokers" },                                    ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_TREASURE_CHEST_GAME_BUILDING_KEY,RHT_OVERWORLD_KEY,                  RG_TREASURE_CHEST_GAME_BUILDING_KEY,  OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER, {"the ", "den ", "la "});
     itemTable[RG_TREASURE_CHEST_GAME_BUILDING_KEY].SetCustomDrawFunc(Randomizer_DrawOverworldKey);
-    itemTable[RG_BOMBCHU_SHOP_KEY] =                    Item(RG_BOMBCHU_SHOP_KEY,                 Text{ "Bombchu Shop Key", "Clé du Magasin de Missiles", "Schlüssel für den Krabbelminenladen" },                                                               ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_BOMBCHU_SHOP_KEY,             RHT_OVERWORLD_KEY,                     RG_BOMBCHU_SHOP_KEY,                  OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_BOMBCHU_SHOP_KEY] =                    Item(RG_BOMBCHU_SHOP_KEY,                 Text{ "Bombchu Shop Key", "Clé du Magasin de Missiles", "Schlüssel für den Krabbelminenladen" },                                                               ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_BOMBCHU_SHOP_KEY,             RHT_OVERWORLD_KEY,                     RG_BOMBCHU_SHOP_KEY,                  OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER, {"the ", "den ", "la "});
     itemTable[RG_BOMBCHU_SHOP_KEY].SetCustomDrawFunc(Randomizer_DrawOverworldKey);
     itemTable[RG_RICHARDS_HOUSE_KEY] =                  Item(RG_RICHARDS_HOUSE_KEY,               Text{ "Richard's House Key", "Clé de la Maison de Kiki", "Schlüssel für das Haus von Richard" },                                                             ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_RICHARDS_HOUSE_KEY,           RHT_OVERWORLD_KEY,                     RG_RICHARDS_HOUSE_KEY,                OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_RICHARDS_HOUSE_KEY].SetCustomDrawFunc(Randomizer_DrawOverworldKey);
-    itemTable[RG_ALLEY_HOUSE_KEY] =                     Item(RG_ALLEY_HOUSE_KEY,                  Text{ "Alley House Key", "Clé de la Maison de la Ruelle", "Schlüssel für das Gassenhaus" },                                                                       ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_ALLEY_HOUSE_KEY,              RHT_OVERWORLD_KEY,                     RG_ALLEY_HOUSE_KEY,                   OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_ALLEY_HOUSE_KEY] =                     Item(RG_ALLEY_HOUSE_KEY,                  Text{ "Alley House Key", "Clé de la Maison de la Ruelle", "Schlüssel für das Gäßchenhaus" },                                                                      ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_ALLEY_HOUSE_KEY,              RHT_OVERWORLD_KEY,                     RG_ALLEY_HOUSE_KEY,                   OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER, {"the ", "den ", "la "});
     itemTable[RG_ALLEY_HOUSE_KEY].SetCustomDrawFunc(Randomizer_DrawOverworldKey);
-    itemTable[RG_KAK_BAZAAR_KEY] =                      Item(RG_KAK_BAZAAR_KEY,                   Text{ "Kakariko Bazaar Key", "Clé du Bazar de Cocorico", "Schlüssel für den Basar von Kakariko" },                                                           ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_KAK_BAZAAR_KEY,               RHT_OVERWORLD_KEY,                     RG_KAK_BAZAAR_KEY,                    OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_KAK_BAZAAR_KEY] =                      Item(RG_KAK_BAZAAR_KEY,                   Text{ "Kakariko Bazaar Key", "Clé du Bazar de Cocorico", "Schlüssel für den Basar von Kakariko" },                                                           ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_KAK_BAZAAR_KEY,               RHT_OVERWORLD_KEY,                     RG_KAK_BAZAAR_KEY,                    OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER, {"the ", "den ", "la "});
     itemTable[RG_KAK_BAZAAR_KEY].SetCustomDrawFunc(Randomizer_DrawOverworldKey);
-    itemTable[RG_KAK_POTION_SHOP_KEY] =                 Item(RG_KAK_POTION_SHOP_KEY,              Text{ "Kakariko Potion Shop Key", "Clé du Magasin de Potions de Cocorico", "Schlüssel für den Magie-Laden von Kakariko" },                                                ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_KAK_POTION_SHOP_KEY,          RHT_OVERWORLD_KEY,                     RG_KAK_POTION_SHOP_KEY,               OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_KAK_POTION_SHOP_KEY] =                 Item(RG_KAK_POTION_SHOP_KEY,              Text{ "Kakariko Potion Shop Key", "Clé du Magasin de Potions de Cocorico", "Schlüssel für den Magie-Laden von Kakariko" },                                                ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_KAK_POTION_SHOP_KEY,          RHT_OVERWORLD_KEY,                     RG_KAK_POTION_SHOP_KEY,               OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER, {"the ", "den ", "la "});
     itemTable[RG_KAK_POTION_SHOP_KEY].SetCustomDrawFunc(Randomizer_DrawOverworldKey);
-    itemTable[RG_BOSS_HOUSE_KEY] =                      Item(RG_BOSS_HOUSE_KEY,                   Text{ "Boss's House Key", "Clé de la Maison du Chef des Ouvriers", "Schlüssel für das Haus des Chefs" },                                                                  ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_BOSS_HOUSE_KEY,               RHT_OVERWORLD_KEY,                     RG_BOSS_HOUSE_KEY,                    OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_BOSS_HOUSE_KEY] =                      Item(RG_BOSS_HOUSE_KEY,                   Text{ "Boss's House Key", "Clé de la Maison du Chef des Ouvriers", "Schlüssel für das Haus des Chefs" },                                                                  ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_BOSS_HOUSE_KEY,               RHT_OVERWORLD_KEY,                     RG_BOSS_HOUSE_KEY,                    OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER, {"the ", "den ", "la "});
     itemTable[RG_BOSS_HOUSE_KEY].SetCustomDrawFunc(Randomizer_DrawOverworldKey);
     itemTable[RG_GRANNYS_POTION_SHOP_KEY] =             Item(RG_GRANNYS_POTION_SHOP_KEY,          Text{ "Granny's Potion Shop Key", "Clé de l'Apothicaire", "Schlüssel für Asas Hexenladen" },                                                             ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_GRANNYS_POTION_SHOP_KEY,      RHT_OVERWORLD_KEY,                     RG_GRANNYS_POTION_SHOP_KEY,           OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_GRANNYS_POTION_SHOP_KEY].SetCustomDrawFunc(Randomizer_DrawOverworldKey);
-    itemTable[RG_SKULLTULA_HOUSE_KEY] =                 Item(RG_SKULLTULA_HOUSE_KEY,              Text{ "Skulltula House Key", "Clé de la Maison des Araignées", "Schlüssel für das Skulltula-Haus" },                                                               ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_SKULLTULA_HOUSE_KEY,          RHT_OVERWORLD_KEY,                     RG_SKULLTULA_HOUSE_KEY,               OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_SKULLTULA_HOUSE_KEY] =                 Item(RG_SKULLTULA_HOUSE_KEY,              Text{ "Skulltula House Key", "Clé de la Maison des Araignées", "Schlüssel für das Skulltula-Haus" },                                                               ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_SKULLTULA_HOUSE_KEY,          RHT_OVERWORLD_KEY,                     RG_SKULLTULA_HOUSE_KEY,               OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER, {"the ", "den ", "la "});
     itemTable[RG_SKULLTULA_HOUSE_KEY].SetCustomDrawFunc(Randomizer_DrawOverworldKey);
     itemTable[RG_IMPAS_HOUSE_KEY] =                     Item(RG_IMPAS_HOUSE_KEY,                  Text{ "Impa's House Key", "Clé de la Maison d'Impa", "Schlüssel für das Haus von Impa" },                                                                   ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_IMPAS_HOUSE_KEY,              RHT_OVERWORLD_KEY,                     RG_IMPAS_HOUSE_KEY,                   OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_IMPAS_HOUSE_KEY].SetCustomDrawFunc(Randomizer_DrawOverworldKey);
-    itemTable[RG_WINDMILL_KEY] =                        Item(RG_WINDMILL_KEY,                     Text{ "Windmill Key", "Clé du Moulin", "Schlüssel für die Windmühle" },                                                                           ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_WINDMILL_KEY,                 RHT_OVERWORLD_KEY,                     RG_WINDMILL_KEY,                      OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_WINDMILL_KEY] =                        Item(RG_WINDMILL_KEY,                     Text{ "Windmill Key", "Clé du Moulin", "Schlüssel für die Windmühle" },                                                                           ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_WINDMILL_KEY,                 RHT_OVERWORLD_KEY,                     RG_WINDMILL_KEY,                      OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER, {"the ", "den ", "la "});
     itemTable[RG_WINDMILL_KEY].SetCustomDrawFunc(Randomizer_DrawOverworldKey);
-    itemTable[RG_KAK_SHOOTING_GALLERY_KEY] =            Item(RG_KAK_SHOOTING_GALLERY_KEY,         Text{ "Kakariko Shooting Gallery Key", "Clé du Stand de Tir de Cocorico", "Schlüssel für die Schießbude von Kakariko" },                                            ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_KAK_SHOOTING_GALLERY_KEY,     RHT_OVERWORLD_KEY,                     RG_KAK_SHOOTING_GALLERY_KEY,          OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_KAK_SHOOTING_GALLERY_KEY] =            Item(RG_KAK_SHOOTING_GALLERY_KEY,         Text{ "Kakariko Shooting Gallery Key", "Clé du Stand de Tir de Cocorico", "Schlüssel für die Schießbude von Kakariko" },                                            ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_KAK_SHOOTING_GALLERY_KEY,     RHT_OVERWORLD_KEY,                     RG_KAK_SHOOTING_GALLERY_KEY,          OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER, {"the ", "den ", "la "});
     itemTable[RG_KAK_SHOOTING_GALLERY_KEY].SetCustomDrawFunc(Randomizer_DrawOverworldKey);
     itemTable[RG_DAMPES_HUT_KEY] =                      Item(RG_DAMPES_HUT_KEY,                   Text{ "Dampe's Hut Key", "Clé de la Cabane d'Igor", "Schlüssel für die Hütte von Boris" },                                                                  ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_DAMPES_HUT_KEY,               RHT_OVERWORLD_KEY,                     RG_DAMPES_HUT_KEY,                    OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_DAMPES_HUT_KEY].SetCustomDrawFunc(Randomizer_DrawOverworldKey);
     itemTable[RG_TALONS_HOUSE_KEY] =                    Item(RG_TALONS_HOUSE_KEY,                 Text{ "Talon's House Key", "Clé de la Maison de Talon", "Schlüssel für das Haus von Talon" },                                                                 ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_TALONS_HOUSE_KEY,             RHT_OVERWORLD_KEY,                     RG_TALONS_HOUSE_KEY,                  OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
     itemTable[RG_TALONS_HOUSE_KEY].SetCustomDrawFunc(Randomizer_DrawOverworldKey);
-    itemTable[RG_STABLES_KEY] =                         Item(RG_STABLES_KEY,                      Text{ "Stables Key", "Clé des Écuries", "Schlüssel für die Ställe" },                                                                               ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_STABLES_KEY,                  RHT_OVERWORLD_KEY,                     RG_STABLES_KEY,                       OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_STABLES_KEY] =                         Item(RG_STABLES_KEY,                      Text{ "Stables Key", "Clé des Écuries", "Schlüssel für die Ställe" },                                                                               ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_STABLES_KEY,                  RHT_OVERWORLD_KEY,                     RG_STABLES_KEY,                       OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER, {"the ", "den ", "la "});
     itemTable[RG_STABLES_KEY].SetCustomDrawFunc(Randomizer_DrawOverworldKey);
-    itemTable[RG_BACK_TOWER_KEY] =                      Item(RG_BACK_TOWER_KEY,                   Text{ "Back Tower Key", "Clé du Silo", "Schlüssel für den hinteren Turm" },                                                                     ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_BACK_TOWER_KEY,               RHT_OVERWORLD_KEY,                     RG_BACK_TOWER_KEY,                    OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_BACK_TOWER_KEY] =                      Item(RG_BACK_TOWER_KEY,                   Text{ "Back Tower Key", "Clé du Silo", "Schlüssel für den hinteren Turm" },                                                                     ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_BACK_TOWER_KEY,               RHT_OVERWORLD_KEY,                     RG_BACK_TOWER_KEY,                    OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER, {"the ", "den ", "la "});
     itemTable[RG_BACK_TOWER_KEY].SetCustomDrawFunc(Randomizer_DrawOverworldKey);
-    itemTable[RG_HYLIA_LAB_KEY] =                       Item(RG_HYLIA_LAB_KEY,                    Text{ "Hylia Laboratory Key", "Clé du Laboratoire du Lac Hylia", "Schlüssel für das Hylia-Labor" },                                                                 ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_HYLIA_LAB_KEY,                RHT_OVERWORLD_KEY,                     RG_HYLIA_LAB_KEY,                     OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_HYLIA_LAB_KEY] =                       Item(RG_HYLIA_LAB_KEY,                    Text{ "Hylia Laboratory Key", "Clé du Laboratoire du Lac Hylia", "Schlüssel für das Hylia-Labor" },                                                                 ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_HYLIA_LAB_KEY,                RHT_OVERWORLD_KEY,                     RG_HYLIA_LAB_KEY,                     OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER, {"the ", "den ", "la "});
     itemTable[RG_HYLIA_LAB_KEY].SetCustomDrawFunc(Randomizer_DrawOverworldKey);
-    itemTable[RG_FISHING_HOLE_KEY] =                    Item(RG_FISHING_HOLE_KEY,                 Text{ "Fishing Hole Key", "Clé de l'Étang", "Schlüssel für den Fischweiher" },                                                                     ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_FISHING_HOLE_KEY,             RHT_OVERWORLD_KEY,                     RG_FISHING_HOLE_KEY,                  OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_FISHING_HOLE_KEY] =                    Item(RG_FISHING_HOLE_KEY,                 Text{ "Fishing Hole Key", "Clé de l'Étang", "Schlüssel für den Fischweiher" },                                                                     ITEMTYPE_ITEM,              GI_DOOR_KEY,          true,  LOGIC_FISHING_HOLE_KEY,             RHT_OVERWORLD_KEY,                     RG_FISHING_HOLE_KEY,                  OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER, {"the ", "den ", "la "});
     itemTable[RG_FISHING_HOLE_KEY].SetCustomDrawFunc(Randomizer_DrawOverworldKey);
     // 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", "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] =              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, {"the ", "den ", "le "}, "%g");
     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", "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] =                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, {"the ", "den ", "le "}, "%r");
     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", "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] =               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, {"the ", "den ", "le "}, "%b");
     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", "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] =              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, {"the ", "den ", "le "}, "%y");
     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] =              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, {"the ", "den ", "le "}, "%p");
     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", "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] =         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, {"the ", "den ", "le "}, "%p");
     itemTable[RG_BOTTOM_OF_THE_WELL_KEY_RING].SetCustomDrawFunc(Randomizer_DrawKeyRing);
-    itemTable[RG_GERUDO_TRAINING_GROUND_KEY_RING] =    Item(RG_GERUDO_TRAINING_GROUND_KEY_RING,   Text{ "Training Ground Key Ring", "Trousseau du Gymnase Gerudo", "Schlüsselbund für das Gerudo-Trainingsgelände" },                  ITEMTYPE_SMALLKEY,          0xDB,                 true,  LOGIC_GERUDO_TRAINING_GROUND_KEYS, RHT_GERUDO_TRAINING_GROUND_KEY_RING,  RG_GERUDO_TRAINING_GROUND_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_GROUND_KEY_RING] =    Item(RG_GERUDO_TRAINING_GROUND_KEY_RING,   Text{ "Training Ground Key Ring", "Trousseau du Gymnase Gerudo", "Schlüsselbund für das Gerudo-Trainingsgelände" },                 ITEMTYPE_SMALLKEY,          0xDB,                 true,  LOGIC_GERUDO_TRAINING_GROUND_KEYS, RHT_GERUDO_TRAINING_GROUND_KEY_RING,  RG_GERUDO_TRAINING_GROUND_KEY_RING,  OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER, {"the ", "den ", "le "}, "%y");
     itemTable[RG_GERUDO_TRAINING_GROUND_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", "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] =            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, {"the ", "den ", "le "}, "%y");
     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", "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] =              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, {"the ", "den ", "le "}, "%r");
     itemTable[RG_GANONS_CASTLE_KEY_RING].SetCustomDrawFunc(Randomizer_DrawKeyRing);
-    itemTable[RG_TREASURE_GAME_KEY_RING] =              Item(RG_TREASURE_GAME_KEY_RING,           Text{ "Chest Game Key Ring", "Trousseau du jeu la Chasse-aux-Trésors", "Schlüsselbund für das Truhenspiel" },                        ITEMTYPE_SMALLKEY,          0xDE,                 true,  LOGIC_TREASURE_GAME_KEYS,           RHT_TREASURE_GAME_KEY_RING,            RG_TREASURE_GAME_KEY_RING,            OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER);
+    itemTable[RG_TREASURE_GAME_KEY_RING] =              Item(RG_TREASURE_GAME_KEY_RING,           Text{ "Chest Game Key Ring", "Trousseau du jeu la Chasse-aux-Trésors", "Schlüsselbund für das Truhenspiel" },                        ITEMTYPE_SMALLKEY,          0xDE,                 true,  LOGIC_TREASURE_GAME_KEYS,           RHT_TREASURE_GAME_KEY_RING,            RG_TREASURE_GAME_KEY_RING,            OBJECT_GI_KEY,           GID_KEY_SMALL,       TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER, {"the ", "den ", "le "});
     itemTable[RG_TREASURE_GAME_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_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, {"the ", "den ", "le "}, "%g");
-    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_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, {"the ", "den ", "le "}, "%r");
-    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_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, {"the ", "den ", " le"}, "%b");
-    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_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, {"the ", "das ", "le "}, "%g");
-    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_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, {"the ", "das ", "le "}, "%r");
-    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_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, {"the ", "das ", "le "}, "%b");
-    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_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, {"the ", "das ", "le "}, "%y");
-    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_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, {"the ", "das ", "le "}, "%p");
-    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);
+    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, {"the ", "das ", "le "}, "%y");
     // 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_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, {"a ", "ein ", "un "});
-    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_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, {"a ", "eine ", "une "});
     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_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, {"a ", "eine ", "une "});
-    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_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, {"a ", "eine ", "une "});
-    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_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, {"a ", "eine ", "une "});
-    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_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, {"a ", "eine ", "une "});
-    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_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, {"a ", "ein ", "un "});
-    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_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, {"a ", "einen ", "un "});
     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);
+    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, {"a ", "einen ", "un "});
     // 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);
@@ -278,132 +267,132 @@ void Rando::StaticData::InitItemTable() {
     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_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, {"a ", "einen ", "un "});
-    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_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, {"a ", "eine ", "une "});
-    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_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, {"a ", "eine ", "une "});
-    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);
+    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, {"a ", "eine ", "une "});
     // 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 (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_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, {"the ", "das ", "le "});
     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-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_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, {}, "%g", 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_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, {}, "%g", 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_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, {}, "%g", 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_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, {}, "%g", 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_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, {}, "%g", 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_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, {}, "%g", 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_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, {}, "%g", 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_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, {}, "%g", 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_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, {}, "%g", 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_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, {}, "%g", 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_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, {}, "%g", 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_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, {}, "%g", 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_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, {}, "%g", 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_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, {}, "%g", 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_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, {}, "%g", 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_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, {}, "%g", false, 10);
-    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_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, {}, "%g", 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_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, {}, "%g", 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_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, {}, "%g", 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_SOLD_OUT] =                            Item(RG_SOLD_OUT,                         Text{ "Sold Out", "Rupture de stock", "Ausverkauft" },                                                                               ITEMTYPE_SHOP,              RG_SOLD_OUT,          false, LOGIC_NONE,                         RHT_NONE, {}, "%g", 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_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, {}, "%g", 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_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, {}, "%g", 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_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, {}, "%g", 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_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, {}, "%g", 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_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, {}, "%g", 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_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, {}, "%g", 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_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, {}, "%g", 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_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, {}, "%g", 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_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, {}, "%g", 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_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, {}, "%g", false, 50);
     // Misc.
-    itemTable[RG_GOHMA_SOUL] =                          Item(RG_GOHMA_SOUL,                       Text{ "Gohma's Soul", "Âme de Gohma", "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] =                          Item(RG_GOHMA_SOUL,                       Text{ "Gohma's Soul", "Âme de Gohma", "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, {}, "%g");
     itemTable[RG_GOHMA_SOUL].SetCustomDrawFunc(Randomizer_DrawBossSoul);
-    itemTable[RG_KING_DODONGO_SOUL] =                   Item(RG_KING_DODONGO_SOUL,                Text{ "King Dodongo's Soul", "Âme du Roi Dodongo", "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] =                   Item(RG_KING_DODONGO_SOUL,                Text{ "King Dodongo's Soul", "Âme du Roi Dodongo", "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, {}, "%r");
     itemTable[RG_KING_DODONGO_SOUL].SetCustomDrawFunc(Randomizer_DrawBossSoul);
-    itemTable[RG_BARINADE_SOUL] =                       Item(RG_BARINADE_SOUL,                    Text{ "Barinade's Soul", "Âme de Barinade", "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] =                       Item(RG_BARINADE_SOUL,                    Text{ "Barinade's Soul", "Âme de Barinade", "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, {}, "%b");
     itemTable[RG_BARINADE_SOUL].SetCustomDrawFunc(Randomizer_DrawBossSoul);
-    itemTable[RG_PHANTOM_GANON_SOUL] =                  Item(RG_PHANTOM_GANON_SOUL,               Text{ "Phantom Ganon's Soul", "Âme de Ganon Spectral", "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] =                  Item(RG_PHANTOM_GANON_SOUL,               Text{ "Phantom Ganon's Soul", "Âme de Ganon Spectral", "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, {}, "%g");
     itemTable[RG_PHANTOM_GANON_SOUL].SetCustomDrawFunc(Randomizer_DrawBossSoul);
-    itemTable[RG_VOLVAGIA_SOUL] =                       Item(RG_VOLVAGIA_SOUL,                    Text{ "Volvagia's Soul", "Âme de Volcania", "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] =                       Item(RG_VOLVAGIA_SOUL,                    Text{ "Volvagia's Soul", "Âme de Vulcania", "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, {}, "%r");
     itemTable[RG_VOLVAGIA_SOUL].SetCustomDrawFunc(Randomizer_DrawBossSoul);
-    itemTable[RG_MORPHA_SOUL] =                         Item(RG_MORPHA_SOUL,                      Text{ "Morpha's Soul", "Âme de Morpha", "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] =                         Item(RG_MORPHA_SOUL,                      Text{ "Morpha's Soul", "Âme de Morpha", "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, {}, "%b");
     itemTable[RG_MORPHA_SOUL].SetCustomDrawFunc(Randomizer_DrawBossSoul);
-    itemTable[RG_BONGO_BONGO_SOUL] =                    Item(RG_BONGO_BONGO_SOUL,                 Text{ "Bongo Bongo's Soul", "Âme de Bongo Bongo", "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] =                    Item(RG_BONGO_BONGO_SOUL,                 Text{ "Bongo Bongo's Soul", "Âme de Bongo Bongo", "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, {}, "%p");
     itemTable[RG_BONGO_BONGO_SOUL].SetCustomDrawFunc(Randomizer_DrawBossSoul);
-    itemTable[RG_TWINROVA_SOUL] =                       Item(RG_TWINROVA_SOUL,                    Text{ "Twinrova's Soul", "Âme du Duo Maléfique", "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] =                       Item(RG_TWINROVA_SOUL,                    Text{ "Twinrova's Soul", "Âme du Duo Maléfique", "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, {}, "%y");
     itemTable[RG_TWINROVA_SOUL].SetCustomDrawFunc(Randomizer_DrawBossSoul);
-    itemTable[RG_GANON_SOUL] =                          Item(RG_GANON_SOUL,                       Text{ "Ganon's Soul", "Âme de Ganon", "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] =                          Item(RG_GANON_SOUL,                       Text{ "Ganon's Soul", "Âme de Ganon", "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, {}, "%r");
     itemTable[RG_GANON_SOUL].SetCustomDrawFunc(Randomizer_DrawBossSoul);
-    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] =                        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, {"the ", "das ", "le "});
     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", "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] =                    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, {"the ", "den ", "le "});
     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", "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] =                 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, {"the ", "den ", "le "});
     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", "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] =               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, {"the ", "den ", "le "});
     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", "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] =               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, {"the ", "den ", "le "});
     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", "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] =              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, {"the ", "den ", "le "});
     itemTable[RG_OCARINA_C_RIGHT_BUTTON].SetCustomDrawFunc(Randomizer_DrawOcarinaButton);
 
-    itemTable[RG_BRONZE_SCALE] =                        Item(RG_BRONZE_SCALE,                     Text{ "Bronze Scale", "Écaille de Bronze", "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] =                        Item(RG_BRONZE_SCALE,                     Text{ "Bronze Scale", "Écaille de Bronze", "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, {"the ", "die ", "le "});
     itemTable[RG_BRONZE_SCALE].SetCustomDrawFunc(Randomizer_DrawBronzeScale);
 
-    itemTable[RG_BOMBCHU_BAG] =                         Item(RG_BOMBCHU_BAG,                      Text{ "Bombchu Bag", "Sac de Missiles Teigneux", "Krabbelminentasche" },                                                             ITEMTYPE_ITEM,              RG_BOMBCHU_BAG,       true,  LOGIC_BOMBCHUS,                     RHT_BOMBCHU_BAG,                       RG_BOMBCHU_BAG,                       OBJECT_GI_BOMB_2,       GID_BOMBCHU,          TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR, MOD_RANDOMIZER);
+    itemTable[RG_BOMBCHU_BAG] =                         Item(RG_BOMBCHU_BAG,                      Text{ "Bombchu Bag", "!!!", "!!!" },                                                                                                 ITEMTYPE_ITEM,              RG_BOMBCHU_BAG,       true,  LOGIC_BOMBCHUS,                     RHT_BOMBCHU_BAG,                       RG_BOMBCHU_BAG,                       OBJECT_GI_BOMB_2,       GID_BOMBCHU,          TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR, MOD_RANDOMIZER, {"a ", "eine ", "un "});
     itemTable[RG_BOMBCHU_BAG].SetCustomDrawFunc(Randomizer_DrawBombchuBag);
 
-    itemTable[RG_QUIVER_INF] =                          Item(RG_QUIVER_INF,                       Text{ "Infinite Quiver", "Carquois Infini", "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_QUIVER_INF] =                          Item(RG_QUIVER_INF,                       Text{ "Infinite Quiver", "Carquois Infini", "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, {"the ", "den ", "le "});
-    itemTable[RG_BOMB_BAG_INF] =                        Item(RG_BOMB_BAG_INF,                     Text{ "Infinite Bomb Bag", "Sac de Bombes Infini", "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_BOMB_BAG_INF] =                        Item(RG_BOMB_BAG_INF,                     Text{ "Infinite Bomb Bag", "Sac de Bombes Infini", "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, {"the ", "die ", "le "});
-    itemTable[RG_BULLET_BAG_INF] =                      Item(RG_BULLET_BAG_INF,                   Text{ "Infinite Bullet Bag", "Sac de Graines Infinis", "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_BULLET_BAG_INF] =                      Item(RG_BULLET_BAG_INF,                   Text{ "Infinite Bullet Bag", "Sac de Graines Infinis", "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, {"the ", "die ", "le "});
-    itemTable[RG_STICK_UPGRADE_INF] =                   Item(RG_STICK_UPGRADE_INF,                Text{ "Infinite Stick Capacity", "Bâtons Mojo Infinis", "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_STICK_UPGRADE_INF] =                   Item(RG_STICK_UPGRADE_INF,                Text{ "Infinite Stick Capacity", "Bâtons Mojo Infinis", "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, {"the ", "die ", "la "});
-    itemTable[RG_NUT_UPGRADE_INF] =                     Item(RG_NUT_UPGRADE_INF,                  Text{ "Infinite Nut Capacity", "Noix Mojo Infinies", "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_NUT_UPGRADE_INF] =                     Item(RG_NUT_UPGRADE_INF,                  Text{ "Infinite Nut Capacity", "Noix Mojo Infinies", "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, {"the ", "die ", "la "});
-    itemTable[RG_MAGIC_INF] =                           Item(RG_MAGIC_INF,                        Text{ "Infinite Magic Meter", "Magie Infinie", "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_MAGIC_INF] =                           Item(RG_MAGIC_INF,                        Text{ "Infinite Magic Meter", "Magie Infinie", "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, {"the ", "die ", "le "});
-    itemTable[RG_BOMBCHU_INF] =                         Item(RG_BOMBCHU_INF,                      Text{ "Infinite Bombchus", "Missiles Teigneux Infinis", "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_BOMBCHU_INF] =                         Item(RG_BOMBCHU_INF,                      Text{ "Infinite Bombchus", "Missiles Teigneux Infinis", "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, {"the ", "den ", "les "});
     itemTable[RG_BOMBCHU_INF].SetCustomDrawFunc(Randomizer_DrawBombchuBag);
-    itemTable[RG_WALLET_INF] =                          Item(RG_WALLET_INF,                       Text{ "Infinite Wallet", "Bourse Infinie", "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_WALLET_INF] =                          Item(RG_WALLET_INF,                       Text{ "Infinite Wallet", "Bourse Infinie", "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, {"the ", "die ", "le "});
 
-    itemTable[RG_SKELETON_KEY] =                        Item(RG_SKELETON_KEY,                     Text{ "Skeleton Key", "Clé Squelette", "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] =                        Item(RG_SKELETON_KEY,                     Text{ "Skeleton Key", "Clé Squelette", "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, {"the ", "den ", "la "});
     itemTable[RG_SKELETON_KEY].SetCustomDrawFunc(Randomizer_DrawSkeletonKey);
 
-    itemTable[RG_DEKU_STICK_BAG] =                      Item(RG_DEKU_STICK_BAG,                   Text{ "Deku Stick Bag", "Sac de Bâton Mojo", "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_STICK_BAG] =                      Item(RG_DEKU_STICK_BAG,                   Text{ "Deku Stick Bag", "Sac de Bâton Mojo", "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, {"a ", "eine ", "un "});
 
-    itemTable[RG_DEKU_NUT_BAG] =                        Item(RG_DEKU_NUT_BAG,                     Text{ "Deku Nut Bag", "Sac de Noix Mojo", "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_DEKU_NUT_BAG] =                        Item(RG_DEKU_NUT_BAG,                     Text{ "Deku Nut Bag", "Sac de Noix Mojo", "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, {"a ", "eine ", "un "});
 
-    itemTable[RG_TRIFORCE] =                            Item(RG_TRIFORCE,                         Text{ "Triforce", "Triforce", "Triforce" },                                                                                          ITEMTYPE_EVENT,             RG_TRIFORCE,          false, LOGIC_NONE,                         RHT_NONE);
+    itemTable[RG_TRIFORCE] =                            Item(RG_TRIFORCE,                         Text{ "Triforce", "Triforce", "Triforce" },                                                                                          ITEMTYPE_EVENT,             RG_TRIFORCE,          false, LOGIC_NONE,                         RHT_NONE, {"the ", "die ", "la "});
     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_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, {"the ", "den ", "le "});
-    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_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, {"the ", "den ", "le "});
-    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_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, {"the ", "die ", "la "});
-    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_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, {"the ", "die ", "le "});
-    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_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, {"the ", "die ", "le "});
-    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_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, {"the ", "die ", "le "});
-    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_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, {"the ", "die ", "le "});
-    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_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, {"the ", "den ", "le "});
-    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_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, {"the ", "den ", "le "});
-    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_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, {"the ", "den ", "le "});
-    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_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, {"the ", "die ", "le "});
-    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_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, {"the ", "den ", "le "});
-    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_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, {"the ", "den ", "le "});
-    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_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, {"the ", "das ", "le "});
-    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_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, {"the ", "die ", "les "});
-    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_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, {"the ", "die ", "les "});
-    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_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, {"the ", "die ", "le "});
-    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_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, {"the ", "die ", "le "});
-    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_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, {"the ", "die ", "le "});
-    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_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, {"the ", "die ", "le "});
-    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_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, {"the ", "die ", "le "});
-    itemTable[RG_CHILD_WALLET] =                        Item(RG_CHILD_WALLET,                     Text{ "Child Wallet", "Petite Bourse", "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_CHILD_WALLET] =                        Item(RG_CHILD_WALLET,                     Text{ "Child Wallet", "Petite Bourse", "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, {"the ", "die ", "le "});
     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_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, {"the ", "das ", "le "});
-    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_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, {"the ", "das ", "le "});
-    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);
+    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, {"a ", "ein ", "un "});
 
     // clang-format on
 

soh/soh/Enhancements/randomizer/randomizer.h

@@ -18,9 +18,6 @@
 #include "soh/Enhancements/randomizer/fishsanity.h"
 
 #define MAX_SEED_STRING_SIZE 1024
-#define NUM_TRIFORCE_PIECE_MESSAGES 6
-#define NUM_NAVI_MESSAGES 18
-#define NUM_GORON_MESSAGES 9
 
 class Randomizer {
   private:
@@ -29,20 +26,8 @@ class Randomizer {
   public:
     Randomizer();
     ~Randomizer();
-
-    static const std::string getItemMessageTableID;
-    static const std::string hintMessageTableID;
-    static const std::string merchantMessageTableID;
-    static const std::string rupeeMessageTableID;
-    static const std::string triforcePieceMessageTableID;
-    static const std::string NaviRandoMessageTableID;
-    static const std::string IceTrapRandoMessageTableID;
-    static const std::string randoMiscHintsTableID;
-
     static Sprite* GetSeedTexture(uint8_t index);
     bool SpoilerFileExists(const char* spoilerFileName);
-    void LoadMerchantMessages();
-    void LoadHintMessages();
     bool IsTrialRequired(s32 trialFlag);
     u8 GetRandoSettingValue(RandomizerSettingKey randoSettingKey);
     RandomizerCheck GetCheckFromRandomizerInf(RandomizerInf randomizerInf);
@@ -63,17 +48,7 @@ class Randomizer {
                                   bool checkObtainability = true);
     ItemObtainability GetItemObtainabilityFromRandomizerCheck(RandomizerCheck randomizerCheck);
     ItemObtainability GetItemObtainabilityFromRandomizerGet(RandomizerGet randomizerCheck);
-    CustomMessage GetSheikMessage(s16 scene, u16 originalTextId);
-    CustomMessage GetFishingPondOwnerMessage(u16 originalTextId);
-    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);
-    static void CreateCustomMessages();
-    static CustomMessage GetRupeeMessage(u16 rupeeTextId);
-    static CustomMessage GetIceTrapMessage();
-    static CustomMessage GetTriforcePieceMessage();
 };
 
 #ifdef __cplusplus

soh/soh/Enhancements/randomizer/randomizerTypes.h

@@ -4092,12 +4092,6 @@ typedef enum {
     RH_BIGGORON_HINT,
     RH_FROGS_HINT,
     RH_OOT_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_MASK_SHOP_HINT,
     RH_MAX,
 } RandomizerHint;
@@ -5365,7 +5359,6 @@ typedef enum {
     RHT_BIGGORON_HINT,
     RHT_FROGS_HINT,
     RHT_OOT_HINT,
-    RHT_SKULLS_HINT,
     RHT_MASK_SHOP_HINT,
     // Shuffle Pots
     RHT_POT_KOKIRI_FOREST,

soh/soh/Enhancements/randomizer/static_data.cpp

@@ -86,12 +86,6 @@ std::unordered_map<uint32_t, CustomMessage> StaticData::hintNames = {
     { 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") },
-    { 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_MASK_SHOP_HINT, CustomMessage("Mask Shop Hint") },
 };
 
@@ -203,12 +197,6 @@ std::unordered_map<RandomizerHint, StaticHintInfo> StaticData::staticHintInfoMap
   {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)},
-  {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_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})}
 
     // clang-format on

soh/soh/OTRGlobals.cpp

@@ -1741,20 +1741,6 @@ std::wstring StringToU16(const std::string& s) {
     return utf16;
 }
 
-int CopyStringToCharBuffer(const std::string& inputStr, char* buffer, const int maxBufferSize) {
-    if (!inputStr.empty()) {
-        // Prevent potential horrible overflow due to implicit conversion of maxBufferSize to an unsigned. Prevents
-        // negatives.
-        memset(buffer, 0, std::max<int>(0, maxBufferSize));
-        // Gaurentee that this value will be greater than 0, regardless of passed variables.
-        const int copiedCharLen = std::min<int>(std::max<int>(0, maxBufferSize - 1), inputStr.length());
-        memcpy(buffer, inputStr.c_str(), copiedCharLen);
-        return copiedCharLen;
-    }
-
-    return 0;
-}
-
 extern "C" void OTRGfxPrint(const char* str, void* printer, void (*printImpl)(void*, char)) {
     const std::vector<uint32_t> hira1 = {
         u'を', u'ぁ', u'ぃ', u'ぅ', u'ぇ', u'ぉ', u'ゃ', u'ゅ', u'ょ', u'っ', u'-',  u'あ', u'い',
@@ -2038,14 +2024,6 @@ extern "C" void Randomizer_ParseSpoiler(const char* fileLoc) {
     OTRGlobals::Instance->gRandoContext->ParseSpoiler(fileLoc);
 }
 
-extern "C" void Randomizer_LoadHintMessages() {
-    OTRGlobals::Instance->gRandomizer->LoadHintMessages();
-}
-
-extern "C" void Randomizer_LoadMerchantMessages() {
-    OTRGlobals::Instance->gRandomizer->LoadMerchantMessages();
-}
-
 extern "C" bool Randomizer_IsTrialRequired(s32 trialFlag) {
     return OTRGlobals::Instance->gRandomizer->IsTrialRequired(trialFlag);
 }
@@ -2152,346 +2130,6 @@ extern "C" void Randomizer_ShowRandomizerMenu() {
     SohGui::ShowRandomizerSettingsMenu();
 }
 
-CustomMessage Randomizer_GetCustomGetItemMessage(Player* player) {
-    s16 giid;
-    if (player->getItemEntry.objectId != OBJECT_INVALID) {
-        giid = player->getItemEntry.getItemId;
-    } else {
-        giid = player->getItemId;
-    }
-    const CustomMessage getItemText =
-        CustomMessageManager::Instance->RetrieveMessage(Randomizer::getItemMessageTableID, giid);
-    return getItemText;
-}
-
-extern "C" int CustomMessage_RetrieveIfExists(PlayState* play) {
-    MessageContext* msgCtx = &play->msgCtx;
-    uint16_t textId = msgCtx->textId;
-    Font* font = &msgCtx->font;
-    char* buffer = font->msgBuf;
-    const int maxBufferSize = sizeof(font->msgBuf);
-    CustomMessage messageEntry;
-    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) {
-                messageEntry = Randomizer::GetIceTrapMessage();
-            } else if (player->getItemEntry.getItemId == RG_TRIFORCE_PIECE) {
-                messageEntry = Randomizer::GetTriforcePieceMessage();
-            } else {
-                messageEntry = Randomizer_GetCustomGetItemMessage(player);
-            }
-        } else if (textId == TEXT_ITEM_DUNGEON_MAP || textId == TEXT_ITEM_COMPASS) {
-            if (DUNGEON_ITEMS_CAN_BE_OUTSIDE_DUNGEON(RSK_SHUFFLE_MAPANDCOMPASS)) {
-                if (textId == TEXT_ITEM_DUNGEON_MAP) {
-                    messageEntry =
-                        OTRGlobals::Instance->gRandomizer->GetMapGetItemMessageWithHint(player->getItemEntry);
-                } else {
-                    messageEntry = Randomizer_GetCustomGetItemMessage(player);
-                }
-            }
-        } else if (textId == TEXT_ITEM_KEY_BOSS) {
-            if (player->getItemEntry.getItemId == RG_GANONS_CASTLE_BOSS_KEY) {
-                if (DUNGEON_ITEMS_CAN_BE_OUTSIDE_DUNGEON(RSK_GANONS_BOSS_KEY)) {
-                    messageEntry = Randomizer_GetCustomGetItemMessage(player);
-                }
-            } else {
-                if (DUNGEON_ITEMS_CAN_BE_OUTSIDE_DUNGEON(RSK_BOSS_KEYSANITY)) {
-                    messageEntry = Randomizer_GetCustomGetItemMessage(player);
-                }
-            }
-        } else if (textId == TEXT_ITEM_KEY_SMALL) {
-            if (player->getItemEntry.getItemId == RG_GERUDO_FORTRESS_SMALL_KEY) {
-                if (Randomizer_GetSettingValue(RSK_GERUDO_KEYS) != RO_GERUDO_KEYS_VANILLA) {
-                    messageEntry = Randomizer_GetCustomGetItemMessage(player);
-                }
-            } else {
-                if (DUNGEON_ITEMS_CAN_BE_OUTSIDE_DUNGEON(RSK_KEYSANITY)) {
-                    messageEntry = Randomizer_GetCustomGetItemMessage(player);
-                }
-            }
-        } else if (textId == TEXT_RANDOMIZER_GOSSIP_STONE_HINTS &&
-                   Randomizer_GetSettingValue(RSK_GOSSIP_STONE_HINTS) != RO_GOSSIP_STONES_NONE &&
-                   (Randomizer_GetSettingValue(RSK_GOSSIP_STONE_HINTS) == RO_GOSSIP_STONES_NEED_NOTHING ||
-                    (Randomizer_GetSettingValue(RSK_GOSSIP_STONE_HINTS) == RO_GOSSIP_STONES_NEED_TRUTH &&
-                     Player_GetMask(play) == PLAYER_MASK_TRUTH) ||
-                    (Randomizer_GetSettingValue(RSK_GOSSIP_STONE_HINTS) == RO_GOSSIP_STONES_NEED_STONE &&
-                     CHECK_QUEST_ITEM(QUEST_STONE_OF_AGONY)))) {
-
-            Actor* stone = GET_PLAYER(play)->talkActor;
-            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 &&
-                            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];
-                        }
-                    }
-                }
-            }
-            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) ? ctx->GetHint(RH_ALTAR_ADULT)->GetHintMessage()
-                                           : ctx->GetHint(RH_ALTAR_CHILD)->GetHintMessage(MF_AUTO_FORMAT);
-        } else if (textId == 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);
-            // 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_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);
-        } else if (textId == TEXT_SCRUB_RANDOM) {
-            EnDns* enDns = (EnDns*)GET_PLAYER(play)->talkActor;
-            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)) {
-            messageEntry = Randomizer::GetRupeeMessage(textId);
-            // 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, MF_FORMATTED);
-        } 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, MF_AUTO_FORMAT);
-        } 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 = 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 && 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) &&
-                   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_ARMS_DEALER) {
-            messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::merchantMessageTableID, textId,
-                                                                           MF_AUTO_FORMAT);
-        } else if (textId == TEXT_SKULLTULA_PEOPLE_IM_CURSED) {
-            actorParams = GET_PLAYER(play)->talkActor->params;
-            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 (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, MF_FORMATTED);
-        } else if (textId == TEXT_LAKE_HYLIA_WATER_SWITCH_NAVI || textId == TEXT_LAKE_HYLIA_WATER_SWITCH_SIGN) {
-            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, 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);
-            messageEntry = OTRGlobals::Instance->gRandomizer->GetGoronMessage(choice);
-        } else if (textId == TEXT_FROGS_UNDERWATER && ctx->GetOption(RSK_FROGS_HINT)) {
-            messageEntry = ctx->GetHint(RH_FROGS_HINT)->GetHintMessage(MF_AUTO_FORMAT);
-        } 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);
-        } 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);
-        } else if (textId == TEXT_CARPET_SALESMAN_CUSTOM_FAIL_TO_BUY) {
-            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);
-        }
-    }
-    if (textId == TEXT_GS_NO_FREEZE || textId == TEXT_GS_FREEZE) {
-        if (CVarGetInteger(CVAR_ENHANCEMENT("InjectItemCounts.GoldSkulltula"), 0) != 0) {
-            // The freeze text cannot be manually dismissed and must be auto-dismissed.
-            // This is fine and even wanted when skull tokens are not shuffled, but when
-            // when they are shuffled we want to be able to manually dismiss the box.
-            // Otherwise if we get a token from a chest or an NPC we get stuck in the ItemGet
-            // animation until the text box auto-dismisses.
-            // RANDOTODO: Implement a way to determine if an item came from a skulltula and
-            // inject the auto-dismiss control code if it did.
-            if (CVarGetInteger(CVAR_ENHANCEMENT("SkulltulaFreeze"), 0) != 0 &&
-                !(IS_RANDO && Randomizer_GetSettingValue(RSK_SHUFFLE_TOKENS) != RO_TOKENSANITY_OFF)) {
-                textId = TEXT_GS_NO_FREEZE;
-            } else {
-                textId = TEXT_GS_FREEZE;
-            }
-            // 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, MF_FORMATTED);
-            messageEntry.Replace("[[gsCount]]", std::to_string(gsCount));
-        } else if (CVarGetInteger(CVAR_ENHANCEMENT("SkulltulaFreeze"), 0) != 0 &&
-                   (!IS_RANDO || Randomizer_GetSettingValue(RSK_SHUFFLE_TOKENS) == RO_TOKENSANITY_OFF)) {
-            messageEntry = CustomMessage::LoadVanillaMessageTableEntry(TEXT_GS_FREEZE);
-            messageEntry.Replace(CustomMessage::MESSAGE_END(), "\x0E\x3C");
-            messageEntry += CustomMessage::MESSAGE_END();
-        }
-    } 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, MF_FORMATTED);
-    } else if (textId == TEXT_HEART_CONTAINER &&
-               CVarGetInteger(CVAR_ENHANCEMENT("InjectItemCounts.HeartContainer"), 0)) {
-        messageEntry =
-            CustomMessageManager::Instance->RetrieveMessage(customMessageTableID, TEXT_HEART_CONTAINER, MF_FORMATTED);
-        messageEntry.Replace("[[heartContainerCount]]", std::to_string(gSaveContext.ship.stats.heartContainers + 1));
-    } else if (textId >= TEXT_HEART_PIECE && textId < TEXT_HEART_CONTAINER &&
-               CVarGetInteger(CVAR_ENHANCEMENT("InjectItemCounts.HeartPiece"), 0)) {
-        messageEntry =
-            CustomMessageManager::Instance->RetrieveMessage(customMessageTableID, TEXT_HEART_PIECE, MF_FORMATTED);
-        messageEntry.Replace("[[heartPieceCount]]", std::to_string(gSaveContext.ship.stats.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,
-                                                                       MF_FORMATTED);
-    }
-    if (textId == TEXT_FISHERMAN_LEAVE && CVarGetInteger(CVAR_ENHANCEMENT("QuitFishingAtDoor"), 0)) {
-        messageEntry =
-            CustomMessageManager::Instance->RetrieveMessage(customMessageTableID, TEXT_FISHERMAN_LEAVE, MF_FORMATTED);
-    }
-    font->charTexBuf[0] = (messageEntry.GetTextBoxType() << 4) | messageEntry.GetTextBoxPosition();
-    switch (gSaveContext.language) {
-        case LANGUAGE_FRA:
-            return msgCtx->msgLength = font->msgLength =
-                       CopyStringToCharBuffer(messageEntry.GetFrench(MF_RAW), buffer, maxBufferSize);
-        case LANGUAGE_GER:
-            return msgCtx->msgLength = font->msgLength =
-                       CopyStringToCharBuffer(messageEntry.GetGerman(MF_RAW), buffer, maxBufferSize);
-        case LANGUAGE_ENG:
-        default:
-            return msgCtx->msgLength = font->msgLength =
-                       CopyStringToCharBuffer(messageEntry.GetEnglish(MF_RAW), buffer, maxBufferSize);
-    }
-    return false;
-}
-
 extern "C" void Overlay_DisplayText(float duration, const char* text) {
     Ship::Context::GetInstance()->GetWindow()->GetGui()->GetGameOverlay()->TextDrawNotification(duration, true, text);
 }

soh/soh/OTRGlobals.h

@@ -30,7 +30,6 @@ struct ExtensionEntry {
 extern std::unordered_map<std::string, ExtensionEntry> ExtensionCache;
 #include "Enhancements/randomizer/settings.h"
 
-const std::string customMessageTableID = "BaseGameOverrides";
 const std::string appShortName = "soh";
 
 #ifdef __WIIU__
@@ -133,8 +132,6 @@ 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();
 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,
@@ -151,7 +148,6 @@ uint8_t Randomizer_IsSpoilerLoaded();
 void Randomizer_SetSpoilerLoaded(bool spoilerLoaded);
 uint8_t Randomizer_GenerateRandomizer();
 void Randomizer_ShowRandomizerMenu();
-int CustomMessage_RetrieveIfExists(PlayState* play);
 void Overlay_DisplayText(float duration, const char* text);
 void Overlay_DisplayText_Seconds(int seconds, const char* text);
 GetItemEntry ItemTable_Retrieve(int16_t getItemID);

soh/soh/z_message_OTR.cpp

@@ -111,65 +111,4 @@ extern "C" void OTRMessage_Init() {
         // Assert staff credits start at the first credits ID
         assert(sStaffMessageEntryTablePtr[0].textId == 0x0500);
     }
-
-    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 "
-                      "Skulltula-Symbole&gesammelt!\x0E\x3C",
-                      "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 "
-            "Skulltula-Symbole&gesammelt!",
-            "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_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 "
-                      "Distanzwaffe&einsetzen kannst!\x09\x0A",
-                      "\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_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",
-                      "\x08Missiles  10 unités   99 Rubis\x09&&\x1B%gAcheter&Ne pas acheter%w"));
-    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!"));
-    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&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",
-                      "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",
-                      "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 #experienced owner#.^"
-                      "Come back when you have had #Bombchus# of your own.",
-                      { QM_RED, QM_GREEN }));
 }

soh/src/code/z_message_PAL.c

@@ -2713,6 +2713,9 @@ void Message_OpenText(PlayState* play, u16 textId) {
     Font* font = &msgCtx->font;
     s16 textBoxType;
 
+    bool loadFromMessageTable = true;
+    GameInteractor_ExecuteOnOpenText(&textId, &loadFromMessageTable);
+
     sDisplayNextMessageAsEnglish = false;
 
     if (msgCtx->msgMode == MSGMODE_NONE) {
@@ -2783,7 +2786,7 @@ void Message_OpenText(PlayState* play, u16 textId) {
     }
 
     // RANDOTODO: Use this for ice trap messages
-    if (CustomMessage_RetrieveIfExists(play)) {
+    if (!loadFromMessageTable) {
         osSyncPrintf("Found custom message");
         if (gSaveContext.language == LANGUAGE_JPN) {
             sDisplayNextMessageAsEnglish = true;

soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c

@@ -3347,9 +3347,6 @@ void FileChoose_LoadGame(GameState* thisx) {
 
     this->state.running = false;
 
-    Randomizer_LoadHintMessages();
-    Randomizer_LoadMerchantMessages();
-
     gSaveContext.respawn[0].entranceIndex = ENTR_LOAD_OPENING;
     gSaveContext.respawnFlag = 0;
     gSaveContext.seqId = (u8)NA_BGM_DISABLED;