Fix minor text issues. (#51)

Fix chest content matching breaking chests and having them draw in ground.
Z3DR · Feb 20, 2024 · 3b1f71a · 3b1f71a
1 parent 944f4d5
commit 3b1f71a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Z3DR b/Z3DR
diff --git a/source/item_list.cpp b/source/item_list.cpp
@@ -13,7 +13,7 @@ void ItemTable_Init() {    //repeatable denotes that an item in a vanilla playth
     itemTable[TEST] = Item();
     itemTable[NONE]                              = Item(false,     false,          &noVariable,                  Text{"No Item",                         "Rien",                                             "Sin Objeto" },                                        NONE,                  (u32)GetItemID::GI_NONE,                ITEMTYPE_EVENT);
     itemTable[KOKIRI_SWORD]                      = Item(true ,     false,          &KokiriSword,                 Text{"Kokiri Sword",                    "Épée Kokiri",                                      "Espada Kokiri" },                                     KOKIRI_SWORD,          (u32)GetItemID::GI_KOKIRI_SWORD,        ITEMTYPE_ITEM );
-	itemTable[GREAT_FAIRYS_SWORD]                = Item(true ,     false,          &GreatFairySword,             Text{"Great Fairys Sword",              "Grande Épée de Fees",                              "Espada de la Gran Hada"},                             GREAT_FAIRYS_SWORD,    (u32)GetItemID::GI_GREAT_FAIRY_SWORD,   ITEMTYPE_GFAIRY );
+	itemTable[GREAT_FAIRYS_SWORD]                = Item(true ,     false,          &GreatFairySword,             Text{"Great Fairy's Sword",             "Grande Épée de Fees",                              "Espada de la Gran Hada"},                             GREAT_FAIRYS_SWORD,    (u32)GetItemID::GI_GREAT_FAIRY_SWORD,   ITEMTYPE_GFAIRY );
     itemTable[HEROS_SHIELD]                      = Item(false,     true,           &HerosShield,                 Text{"Heros Shield",                    "Bouclier du Heros",                                "Escudo del Heroe"},                                   HEROS_SHIELD,          (u32)GetItemID::GI_SHIELD_HERO,         ITEMTYPE_ITEM );
     itemTable[DEKU_STICK]                        = Item(true ,     true,           &DekuStick,                   Text{"Deku Stick",                      "Bâton Mojo",                                       "palos deku" },                                        DEKU_STICK,            (u32)GetItemID::GI_STICKS_1,            ITEMTYPE_ITEM );
     itemTable[LAND_TITLE]                        = Item(true,      true,           &LandTitle,                   Text{"Land Title Deed",				 "Titre de propriete fonciere",                      "Escritura de propiedad de la Tierra" },               LAND_TITLE,            (u32)GetItemID::GI_TOWN_TITLE_DEED,     ITEMTYPE_TRADE );
@@ -57,7 +57,7 @@ void ItemTable_Init() {    //repeatable denotes that an item in a vanilla playth
     itemTable[KAFEIS_MASK]                       = Item(true,      false,          &KafeisMask,                  Text{"Kafei's Mask",                    "Masque de Kafei",                                  "Máscara de Kafei"},                                   KAFEIS_MASK,           (u32)GetItemID::GI_MASK_KAFEIS,         ITEMTYPE_MASK );
     itemTable[COUPLES_MASK]                      = Item(true,      false,          &CouplesMask,                 Text{"Couple's Mask",                   "Masque de couple",                                 "Máscara de pareja"},                                  COUPLES_MASK,          (u32)GetItemID::GI_MASK_COUPLES,        ITEMTYPE_MASK );
     itemTable[KAMAROS_MASK]                      = Item(true,      false,          &KamarosMask,                 Text{"Kamaro's Mask",                   "Masque de Kamaro",                                 "Máscara de Kamaro"},                                  KAMAROS_MASK,          (u32)GetItemID::GI_MASK_KAMARAOS,       ITEMTYPE_MASK );
-    itemTable[GIBDOS_MASK]                       = Item(true,      false,          &GibdosMask,                  Text{"Gibdo's Mask",                    "Masque Gibdo",                                     "Máscara de Gibdo"},                                   GIBDOS_MASK,           (u32)GetItemID::GI_MASK_GIBDO,          ITEMTYPE_MASK );
+    itemTable[GIBDOS_MASK]                       = Item(true,      false,          &GibdosMask,                  Text{"Gibdo Mask",                      "Masque Gibdo",                                     "Máscara de Gibdo"},                                   GIBDOS_MASK,           (u32)GetItemID::GI_MASK_GIBDO,          ITEMTYPE_MASK );
     itemTable[GAROS_MASK]                        = Item(true,      false,          &GarosMask,                   Text{"Garo's Mask",                     "Masque de Garo",                                   "Máscara de Garo"},                                    GAROS_MASK,            (u32)GetItemID::GI_MASK_GARO,           ITEMTYPE_MASK );
     itemTable[CAPTAINS_HAT]                      = Item(true,      false,          &CaptainsHat,                 Text{"Captain's Hat",                   "Chapeau de capitaine",                             "Sombrero de Capitan"},                                CAPTAINS_HAT,          (u32)GetItemID::GI_MASK_CAPTAINS_HAT,   ITEMTYPE_MASK );
     itemTable[GIANTS_MASK]                       = Item(true,      false,          &GiantsMask,                  Text{"Giant's Mask",                    "Masque de geant",                                  "Máscara de gigante"},                                 GIANTS_MASK,           (u32)GetItemID::GI_MASK_GIANTS,         ITEMTYPE_MASK );
+1 −1		code/include/rnd/chest.h
+3 −6		code/source/asm/hooks.s
+0 −1		code/source/asm/patches.s
+3 −3		code/source/main.cpp
+29 −10		code/source/rnd/chest.cpp
+5 −5		code/source/rnd/item_override.cpp