Fix two missing changes after ms GI enum was changed & hint fix (#3319)

* Fix two missing changes after ms GI enum was changed

* Remove unnecessary line break from hint, and fix infinite loop within AutoFormatHintTextString

* Update soh/soh/Enhancements/randomizer/3drando/hints.cpp

4 files changed, 4 insertions, 4 deletions

diff --git a/soh/soh/Enhancements/randomizer/3drando/hints.cpp b/soh/soh/Enhancements/randomizer/3drando/hints.cpp
index 3bdaeee5d..19fdadc7e 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hints.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hints.cpp
@@ -882,7 +882,7 @@ void CreateSheikText() {
   lightArrowHintLoc = Location(lightArrowLocation[0])->GetName();
   Text area = GetHintRegion(Location(lightArrowLocation[0])->GetParentRegionKey())->GetHint().GetText();
   Text temp1 = Text{
-    "I overheard Ganondorf say that he misplaced the %yLight Arrows%w in&%r",
+    "I overheard Ganondorf say that he misplaced the %yLight Arrows%w in %r",
     "J'ai entendu dire que Ganondorf aurait caché les %yFlèches de Lumière%w dans %r",
     ""
   };
diff --git a/soh/soh/Enhancements/randomizer/3drando/item_list.cpp b/soh/soh/Enhancements/randomizer/3drando/item_list.cpp
index c3722ffd0..34e9c779f 100644
--- a/soh/soh/Enhancements/randomizer/3drando/item_list.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/item_list.cpp
@@ -12,7 +12,7 @@ static std::array<Item, KEY_ENUM_MAX> itemTable;
 void ItemTable_Init() {                              // RandomizerGet                              English name                       French                              Spanish                                     Item Type       getItemID       advancement    logic           hint key
     itemTable[NONE]                              = Item(RG_NONE,                              Text{"No Item",                         "Rien",                             "Sin Objeto"},                              ITEMTYPE_EVENT, GI_RUPEE_GREEN,    false,      &noVariable,    NONE);
     itemTable[KOKIRI_SWORD]                      = Item(RG_KOKIRI_SWORD,                      Text{"Kokiri Sword",                    "Épée Kokiri",                      "Espada Kokiri"},                           ITEMTYPE_ITEM,  GI_SWORD_KOKIRI,   true,       &KokiriSword,   KOKIRI_SWORD);
-    itemTable[MASTER_SWORD]                      = Item(RG_MASTER_SWORD,                      Text{"Master Sword",                    "Épée de Legende",                  "Espada Master"},                           ITEMTYPE_ITEM,  0x73,              true,       &MasterSword,   MASTER_SWORD);
+    itemTable[MASTER_SWORD]                      = Item(RG_MASTER_SWORD,                      Text{"Master Sword",                    "Épée de Legende",                  "Espada Master"},                           ITEMTYPE_ITEM,  0xE0,              true,       &MasterSword,   MASTER_SWORD);
     itemTable[GIANTS_KNIFE]                      = Item(RG_GIANTS_KNIFE,                      Text{"Giant's Knife",                   "Lame des Géants",                  "Espada de Biggoron"},                      ITEMTYPE_ITEM,  GI_SWORD_KNIFE,    false,      &noVariable,    GIANTS_KNIFE);
     itemTable[BIGGORON_SWORD]                    = Item(RG_BIGGORON_SWORD,                    Text{"Biggoron's Sword",                "Épée de Biggoron",                 "Espada de Biggoron"},                      ITEMTYPE_ITEM,  GI_SWORD_BGS,      true,       &BiggoronSword, BIGGORON_SWORD);
     itemTable[DEKU_SHIELD]                       = Item(RG_DEKU_SHIELD,                       Text{"Deku Shield",                     "Bouclier Mojo",                    "Escudo deku"},                             ITEMTYPE_ITEM,  GI_SHIELD_DEKU,    false,      &noVariable,    DEKU_SHIELD);
diff --git a/soh/soh/Enhancements/randomizer/3drando/shops.cpp b/soh/soh/Enhancements/randomizer/3drando/shops.cpp
index 4199a9b2c..85fb22c22 100644
--- a/soh/soh/Enhancements/randomizer/3drando/shops.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/shops.cpp
@@ -13,7 +13,7 @@ using namespace Settings;
 
 std::vector<ItemAndPrice> NonShopItems = {};
 
-static std::array<std::vector<Text>, 0xE0> trickNameTable; // Table of trick names for ice traps
+static std::array<std::vector<Text>, 0xE1> trickNameTable; // Table of trick names for ice traps
 bool initTrickNames = false; //Indicates if trick ice trap names have been initialized yet
 
 //Set vanilla shop item locations before potentially shuffling
diff --git a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
index 3bd3dc44d..0011d3a70 100644
--- a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
@@ -639,7 +639,7 @@ std::string AutoFormatHintTextString(std::string unformattedHintTextString) {
       size_t lastPeriod = textStr.rfind('.', lastNewline + lineLength);
       //replace '&' first if it's within the newline range
       if (ampersand < lastNewline + lineLength) {
-        lastNewline = ampersand;
+        lastNewline = ampersand + 1;
       //or move the lastNewline cursor to the next line if a '^' is encountered
       } else if (carrot < lastNewline + lineLength) {
         lastNewline = carrot + 1;