Update item names (#1376)

* Reevaluate item names (`ItemID` enum)

* format

* Carry `ItemID` changes to `ExchangeItemID`

* format

* Add item enum comments on items to slots array

* Rename slots according to current item enum names

* Add item enum comments on items to PlayerItemAction array

* Rename PlayerItemAction enum names according to current item enum names

* gi, gid names...

* `QUEST_GERUDO_CARD` -> `QUEST_GERUDOS_CARD`

* `DUNGEON_KEY_BOSS` -> `DUNGEON_BOSS_KEY`

* `UPG_` sticks/nuts : +deku

* Fixed remove array enum comments in `sDebugSaveEquips`

* "magic beans" -> "magic bean" (singular)

* cucco -> chicken (the one from weird egg, "alarm clock bird" from literal japanese translation)

7 files changed, 317 insertions, 317 deletions

diff --git a/src/code/code_80097A00.c b/src/code/code_80097A00.c
index 9b7e2cf99..8b9e76f1b 100644
--- a/src/code/code_80097A00.c
+++ b/src/code/code_80097A00.c
@@ -31,8 +31,8 @@ u32 gUpgradeMasks[UPG_MAX] = {
     0x00000E00, // UPG_SCALE
     0x00003000, // UPG_WALLET
     0x0001C000, // UPG_BULLET_BAG
-    0x000E0000, // UPG_STICKS
-    0x00700000, // UPG_NUTS
+    0x000E0000, // UPG_DEKU_STICKS
+    0x00700000, // UPG_DEKU_NUTS
 };
 u32 gUpgradeNegMasks[UPG_MAX] = {
     ~0x00000007, // UPG_QUIVER
@@ -41,8 +41,8 @@ u32 gUpgradeNegMasks[UPG_MAX] = {
     ~0x00000E00, // UPG_SCALE
     ~0x00003000, // UPG_WALLET
     ~0x0001C000, // UPG_BULLET_BAG
-    ~0x000E0000, // UPG_STICKS
-    ~0x00700000, // UPG_NUTS
+    ~0x000E0000, // UPG_DEKU_STICKS
+    ~0x00700000, // UPG_DEKU_NUTS
 };
 
 u8 gEquipShifts[EQUIP_TYPE_MAX] = {
@@ -59,8 +59,8 @@ u8 gUpgradeShifts[UPG_MAX] = {
     9,  // UPG_SCALE
     12, // UPG_WALLET
     14, // UPG_BULLET_BAG
-    17, // UPG_STICKS
-    20, // UPG_NUTS
+    17, // UPG_DEKU_STICKS
+    20, // UPG_DEKU_NUTS
 };
 
 u16 gUpgradeCapacities[UPG_MAX][4] = {
@@ -70,8 +70,8 @@ u16 gUpgradeCapacities[UPG_MAX][4] = {
     { 0, 0, 0, 0 },        // UPG_SCALE (unused)
     { 99, 200, 500, 500 }, // UPG_WALLET
     { 0, 30, 40, 50 },     // UPG_BULLET_BAG
-    { 0, 10, 20, 30 },     // UPG_STICKS
-    { 0, 20, 30, 40 },     // UPG_NUTS
+    { 0, 10, 20, 30 },     // UPG_DEKU_STICKS
+    { 0, 20, 30, 40 },     // UPG_DEKU_NUTS
 };
 
 u32 gGsFlagsMasks[] = { 0x000000FF, 0x0000FF00, 0x00FF0000, 0xFF000000 };
@@ -212,62 +212,62 @@ void* gItemIcons[] = {
 
 // Used to map item IDs to inventory slots
 u8 gItemSlots[] = {
-    SLOT_STICK,        // ITEM_STICK
-    SLOT_NUT,          // ITEM_NUT
-    SLOT_BOMB,         // ITEM_BOMB
-    SLOT_BOW,          // ITEM_BOW
-    SLOT_ARROW_FIRE,   // ITEM_ARROW_FIRE
-    SLOT_DINS_FIRE,    // ITEM_DINS_FIRE
-    SLOT_SLINGSHOT,    // ITEM_SLINGSHOT
-    SLOT_OCARINA,      // ITEM_OCARINA_FAIRY
-    SLOT_OCARINA,      // ITEM_OCARINA_TIME
-    SLOT_BOMBCHU,      // ITEM_BOMBCHU
-    SLOT_HOOKSHOT,     // ITEM_HOOKSHOT
-    SLOT_HOOKSHOT,     // ITEM_LONGSHOT
-    SLOT_ARROW_ICE,    // ITEM_ARROW_ICE
-    SLOT_FARORES_WIND, // ITEM_FARORES_WIND
-    SLOT_BOOMERANG,    // ITEM_BOOMERANG
-    SLOT_LENS,         // ITEM_LENS
-    SLOT_BEAN,         // ITEM_BEAN
-    SLOT_HAMMER,       // ITEM_HAMMER
-    SLOT_ARROW_LIGHT,  // ITEM_ARROW_LIGHT
-    SLOT_NAYRUS_LOVE,  // ITEM_NAYRUS_LOVE
-    SLOT_BOTTLE_1,     // ITEM_BOTTLE
-    SLOT_BOTTLE_1,     // ITEM_POTION_RED
-    SLOT_BOTTLE_1,     // ITEM_POTION_GREEN
-    SLOT_BOTTLE_1,     // ITEM_POTION_BLUE
-    SLOT_BOTTLE_1,     // ITEM_FAIRY
-    SLOT_BOTTLE_1,     // ITEM_FISH
-    SLOT_BOTTLE_1,     // ITEM_MILK_BOTTLE
-    SLOT_BOTTLE_1,     // ITEM_LETTER_RUTO
-    SLOT_BOTTLE_1,     // ITEM_BLUE_FIRE
-    SLOT_BOTTLE_1,     // ITEM_BUG
-    SLOT_BOTTLE_1,     // ITEM_BIG_POE
-    SLOT_BOTTLE_1,     // ITEM_MILK_HALF
-    SLOT_BOTTLE_1,     // ITEM_POE
-    SLOT_TRADE_CHILD,  // ITEM_WEIRD_EGG
-    SLOT_TRADE_CHILD,  // ITEM_CHICKEN
-    SLOT_TRADE_CHILD,  // ITEM_LETTER_ZELDA
-    SLOT_TRADE_CHILD,  // ITEM_MASK_KEATON
-    SLOT_TRADE_CHILD,  // ITEM_MASK_SKULL
-    SLOT_TRADE_CHILD,  // ITEM_MASK_SPOOKY
-    SLOT_TRADE_CHILD,  // ITEM_MASK_BUNNY
-    SLOT_TRADE_CHILD,  // ITEM_MASK_GORON
-    SLOT_TRADE_CHILD,  // ITEM_MASK_ZORA
-    SLOT_TRADE_CHILD,  // ITEM_MASK_GERUDO
-    SLOT_TRADE_CHILD,  // ITEM_MASK_TRUTH
-    SLOT_TRADE_CHILD,  // ITEM_SOLD_OUT
-    SLOT_TRADE_ADULT,  // ITEM_POCKET_EGG
-    SLOT_TRADE_ADULT,  // ITEM_POCKET_CUCCO
-    SLOT_TRADE_ADULT,  // ITEM_COJIRO
-    SLOT_TRADE_ADULT,  // ITEM_ODD_MUSHROOM
-    SLOT_TRADE_ADULT,  // ITEM_ODD_POTION
-    SLOT_TRADE_ADULT,  // ITEM_SAW
-    SLOT_TRADE_ADULT,  // ITEM_SWORD_BROKEN
-    SLOT_TRADE_ADULT,  // ITEM_PRESCRIPTION
-    SLOT_TRADE_ADULT,  // ITEM_FROG
-    SLOT_TRADE_ADULT,  // ITEM_EYEDROPS
-    SLOT_TRADE_ADULT,  // ITEM_CLAIM_CHECK
+    SLOT_DEKU_STICK,    // ITEM_DEKU_STICK
+    SLOT_DEKU_NUT,      // ITEM_DEKU_NUT
+    SLOT_BOMB,          // ITEM_BOMB
+    SLOT_BOW,           // ITEM_BOW
+    SLOT_ARROW_FIRE,    // ITEM_ARROW_FIRE
+    SLOT_DINS_FIRE,     // ITEM_DINS_FIRE
+    SLOT_SLINGSHOT,     // ITEM_SLINGSHOT
+    SLOT_OCARINA,       // ITEM_OCARINA_FAIRY
+    SLOT_OCARINA,       // ITEM_OCARINA_OF_TIME
+    SLOT_BOMBCHU,       // ITEM_BOMBCHU
+    SLOT_HOOKSHOT,      // ITEM_HOOKSHOT
+    SLOT_HOOKSHOT,      // ITEM_LONGSHOT
+    SLOT_ARROW_ICE,     // ITEM_ARROW_ICE
+    SLOT_FARORES_WIND,  // ITEM_FARORES_WIND
+    SLOT_BOOMERANG,     // ITEM_BOOMERANG
+    SLOT_LENS_OF_TRUTH, // ITEM_LENS_OF_TRUTH
+    SLOT_MAGIC_BEAN,    // ITEM_MAGIC_BEAN
+    SLOT_HAMMER,        // ITEM_HAMMER
+    SLOT_ARROW_LIGHT,   // ITEM_ARROW_LIGHT
+    SLOT_NAYRUS_LOVE,   // ITEM_NAYRUS_LOVE
+    SLOT_BOTTLE_1,      // ITEM_BOTTLE_EMPTY
+    SLOT_BOTTLE_1,      // ITEM_BOTTLE_POTION_RED
+    SLOT_BOTTLE_1,      // ITEM_BOTTLE_POTION_GREEN
+    SLOT_BOTTLE_1,      // ITEM_BOTTLE_POTION_BLUE
+    SLOT_BOTTLE_1,      // ITEM_BOTTLE_FAIRY
+    SLOT_BOTTLE_1,      // ITEM_BOTTLE_FISH
+    SLOT_BOTTLE_1,      // ITEM_BOTTLE_MILK_FULL
+    SLOT_BOTTLE_1,      // ITEM_BOTTLE_RUTOS_LETTER
+    SLOT_BOTTLE_1,      // ITEM_BOTTLE_BLUE_FIRE
+    SLOT_BOTTLE_1,      // ITEM_BOTTLE_BUG
+    SLOT_BOTTLE_1,      // ITEM_BOTTLE_BIG_POE
+    SLOT_BOTTLE_1,      // ITEM_BOTTLE_MILK_HALF
+    SLOT_BOTTLE_1,      // ITEM_BOTTLE_POE
+    SLOT_TRADE_CHILD,   // ITEM_WEIRD_EGG
+    SLOT_TRADE_CHILD,   // ITEM_CHICKEN
+    SLOT_TRADE_CHILD,   // ITEM_ZELDAS_LETTER
+    SLOT_TRADE_CHILD,   // ITEM_MASK_KEATON
+    SLOT_TRADE_CHILD,   // ITEM_MASK_SKULL
+    SLOT_TRADE_CHILD,   // ITEM_MASK_SPOOKY
+    SLOT_TRADE_CHILD,   // ITEM_MASK_BUNNY_HOOD
+    SLOT_TRADE_CHILD,   // ITEM_MASK_GORON
+    SLOT_TRADE_CHILD,   // ITEM_MASK_ZORA
+    SLOT_TRADE_CHILD,   // ITEM_MASK_GERUDO
+    SLOT_TRADE_CHILD,   // ITEM_MASK_TRUTH
+    SLOT_TRADE_CHILD,   // ITEM_SOLD_OUT
+    SLOT_TRADE_ADULT,   // ITEM_POCKET_EGG
+    SLOT_TRADE_ADULT,   // ITEM_POCKET_CUCCO
+    SLOT_TRADE_ADULT,   // ITEM_COJIRO
+    SLOT_TRADE_ADULT,   // ITEM_ODD_MUSHROOM
+    SLOT_TRADE_ADULT,   // ITEM_ODD_POTION
+    SLOT_TRADE_ADULT,   // ITEM_POACHERS_SAW
+    SLOT_TRADE_ADULT,   // ITEM_BROKEN_GORONS_SWORD
+    SLOT_TRADE_ADULT,   // ITEM_PRESCRIPTION
+    SLOT_TRADE_ADULT,   // ITEM_EYEBALL_FROG
+    SLOT_TRADE_ADULT,   // ITEM_EYE_DROPS
+    SLOT_TRADE_ADULT,   // ITEM_CLAIM_CHECK
 };
 
 void Inventory_ChangeEquipment(s16 equipment, u16 value) {
diff --git a/src/code/z_elf_message.c b/src/code/z_elf_message.c
index abb3cfef6..a07e5d0c6 100644
--- a/src/code/z_elf_message.c
+++ b/src/code/z_elf_message.c
@@ -39,7 +39,7 @@ u32 QuestHint_CheckCondition(QuestHintCmd* hintCmd) {
 
         case (QUEST_HINT_CONDITION_DUNGEON_ITEM << 1):
             return ((hintCmd->byte0 & 1) == 1) ==
-                   (CHECK_DUNGEON_ITEM(hintCmd->byte1 - ITEM_KEY_BOSS, gSaveContext.mapIndex) != 0);
+                   (CHECK_DUNGEON_ITEM(hintCmd->byte1 - ITEM_DUNGEON_BOSS_KEY, gSaveContext.mapIndex) != 0);
 
         case (QUEST_HINT_CONDITION_ITEM << 1):
             return ((hintCmd->byte0 & 1) == 1) == (hintCmd->byte3 == INV_CONTENT(hintCmd->byte1));
diff --git a/src/code/z_en_item00.c b/src/code/z_en_item00.c
index 4ebbf016a..9a6ee6e09 100644
--- a/src/code/z_en_item00.c
+++ b/src/code/z_en_item00.c
@@ -314,31 +314,31 @@ void EnItem00_Init(Actor* thisx, PlayState* play) {
             Item_Give(play, ITEM_BOW);
             break;
         case ITEM00_ARROWS_SMALL:
-            Item_Give(play, ITEM_ARROWS_SMALL);
+            Item_Give(play, ITEM_ARROWS_5);
             break;
         case ITEM00_ARROWS_MEDIUM:
-            Item_Give(play, ITEM_ARROWS_MEDIUM);
+            Item_Give(play, ITEM_ARROWS_10);
             break;
         case ITEM00_ARROWS_LARGE:
-            Item_Give(play, ITEM_ARROWS_LARGE);
+            Item_Give(play, ITEM_ARROWS_30);
             break;
         case ITEM00_MAGIC_LARGE:
-            getItemId = GI_MAGIC_SMALL;
+            getItemId = GI_MAGIC_JAR_SMALL;
             break;
         case ITEM00_MAGIC_SMALL:
-            getItemId = GI_MAGIC_LARGE;
+            getItemId = GI_MAGIC_JAR_LARGE;
             break;
         case ITEM00_SMALL_KEY:
-            Item_Give(play, ITEM_KEY_SMALL);
+            Item_Give(play, ITEM_SMALL_KEY);
             break;
         case ITEM00_SEEDS:
-            getItemId = GI_SEEDS_5;
+            getItemId = GI_DEKU_SEEDS_5;
             break;
         case ITEM00_NUTS:
-            getItemId = GI_NUTS_5;
+            getItemId = GI_DEKU_NUTS_5;
             break;
         case ITEM00_STICK:
-            getItemId = GI_STICKS_1;
+            getItemId = GI_DEKU_STICKS_1;
             break;
         case ITEM00_HEART_PIECE:
         case ITEM00_HEART_CONTAINER:
@@ -632,10 +632,10 @@ void EnItem00_Update(Actor* thisx, PlayState* play) {
             Item_Give(play, ITEM_RUPEE_GOLD);
             break;
         case ITEM00_STICK:
-            getItemId = GI_STICKS_1;
+            getItemId = GI_DEKU_STICKS_1;
             break;
         case ITEM00_NUTS:
-            getItemId = GI_NUTS_5;
+            getItemId = GI_DEKU_NUTS_5;
             break;
         case ITEM00_RECOVERY_HEART:
             Item_Give(play, ITEM_RECOVERY_HEART);
@@ -651,19 +651,19 @@ void EnItem00_Update(Actor* thisx, PlayState* play) {
             Item_Give(play, ITEM_BOW);
             break;
         case ITEM00_ARROWS_SMALL:
-            Item_Give(play, ITEM_ARROWS_SMALL);
+            Item_Give(play, ITEM_ARROWS_5);
             break;
         case ITEM00_ARROWS_MEDIUM:
-            Item_Give(play, ITEM_ARROWS_MEDIUM);
+            Item_Give(play, ITEM_ARROWS_10);
             break;
         case ITEM00_ARROWS_LARGE:
-            Item_Give(play, ITEM_ARROWS_LARGE);
+            Item_Give(play, ITEM_ARROWS_30);
             break;
         case ITEM00_SEEDS:
-            getItemId = GI_SEEDS_5;
+            getItemId = GI_DEKU_SEEDS_5;
             break;
         case ITEM00_SMALL_KEY:
-            getItemId = GI_KEY_SMALL;
+            getItemId = GI_SMALL_KEY;
             break;
         case ITEM00_HEART_PIECE:
             getItemId = GI_HEART_PIECE;
@@ -672,10 +672,10 @@ void EnItem00_Update(Actor* thisx, PlayState* play) {
             getItemId = GI_HEART_CONTAINER;
             break;
         case ITEM00_MAGIC_LARGE:
-            getItemId = GI_MAGIC_LARGE;
+            getItemId = GI_MAGIC_JAR_LARGE;
             break;
         case ITEM00_MAGIC_SMALL:
-            getItemId = GI_MAGIC_SMALL;
+            getItemId = GI_MAGIC_JAR_SMALL;
             break;
         case ITEM00_SHIELD_DEKU:
             getItemId = GI_SHIELD_DEKU;
diff --git a/src/code/z_game_over.c b/src/code/z_game_over.c
index 5f72a5aa8..733888f5e 100644
--- a/src/code/z_game_over.c
+++ b/src/code/z_game_over.c
@@ -50,8 +50,8 @@ void GameOver_Update(PlayState* play) {
             // restore "temporary B" to the B Button if not a sword item
             if (gSaveContext.equips.buttonItems[0] != ITEM_SWORD_KOKIRI &&
                 gSaveContext.equips.buttonItems[0] != ITEM_SWORD_MASTER &&
-                gSaveContext.equips.buttonItems[0] != ITEM_SWORD_BGS &&
-                gSaveContext.equips.buttonItems[0] != ITEM_SWORD_KNIFE) {
+                gSaveContext.equips.buttonItems[0] != ITEM_SWORD_BIGGORON &&
+                gSaveContext.equips.buttonItems[0] != ITEM_GIANTS_KNIFE) {
 
                 if (gSaveContext.buttonStatus[0] != BTN_ENABLED) {
                     gSaveContext.equips.buttonItems[0] = gSaveContext.buttonStatus[0];
diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c
index 9f1d3c517..1d4e90a90 100644
--- a/src/code/z_parameter.c
+++ b/src/code/z_parameter.c
@@ -126,7 +126,7 @@ static u16 sHBAScoreDigits[] = { 0, 0, 0, 0 };
 static u16 sCUpInvisible = 0;
 static u16 sCUpTimer = 0;
 
-s16 gSpoilingItems[] = { ITEM_ODD_MUSHROOM, ITEM_FROG, ITEM_EYEDROPS };
+s16 gSpoilingItems[] = { ITEM_ODD_MUSHROOM, ITEM_EYEBALL_FROG, ITEM_EYE_DROPS };
 s16 gSpoilingItemReverts[] = { ITEM_COJIRO, ITEM_PRESCRIPTION, ITEM_PRESCRIPTION };
 
 static s16 sMagicBorderR = 255;
@@ -134,24 +134,24 @@ static s16 sMagicBorderG = 255;
 static s16 sMagicBorderB = 255;
 
 static s16 sExtraItemBases[] = {
-    ITEM_STICK,   // ITEM_STICKS_5
-    ITEM_STICK,   // ITEM_STICKS_10
-    ITEM_NUT,     // ITEM_NUTS_5
-    ITEM_NUT,     // ITEM_NUTS_10
-    ITEM_BOMB,    // ITEM_BOMBS_5
-    ITEM_BOMB,    // ITEM_BOMBS_10
-    ITEM_BOMB,    // ITEM_BOMBS_20
-    ITEM_BOMB,    // ITEM_BOMBS_30
-    ITEM_BOW,     // ITEM_ARROWS_SMALL
-    ITEM_BOW,     // ITEM_ARROWS_MEDIUM
-    ITEM_BOW,     // ITEM_ARROWS_LARGE
-    ITEM_SEEDS,   // ITEM_SEEDS_30
-    ITEM_BOMBCHU, // ITEM_BOMBCHUS_5
-    ITEM_BOMBCHU, // ITEM_BOMBCHUS_20
-    ITEM_STICK,   // ITEM_STICK_UPGRADE_20
-    ITEM_STICK,   // ITEM_STICK_UPGRADE_30
-    ITEM_NUT,     // ITEM_NUT_UPGRADE_30
-    ITEM_NUT,     // ITEM_NUT_UPGRADE_40
+    ITEM_DEKU_STICK, // ITEM_DEKU_STICKS_5
+    ITEM_DEKU_STICK, // ITEM_DEKU_STICKS_10
+    ITEM_DEKU_NUT,   // ITEM_DEKU_NUTS_5
+    ITEM_DEKU_NUT,   // ITEM_DEKU_NUTS_10
+    ITEM_BOMB,       // ITEM_BOMBS_5
+    ITEM_BOMB,       // ITEM_BOMBS_10
+    ITEM_BOMB,       // ITEM_BOMBS_20
+    ITEM_BOMB,       // ITEM_BOMBS_30
+    ITEM_BOW,        // ITEM_ARROWS_5
+    ITEM_BOW,        // ITEM_ARROWS_10
+    ITEM_BOW,        // ITEM_ARROWS_30
+    ITEM_DEKU_SEEDS, // ITEM_DEKU_SEEDS_30
+    ITEM_BOMBCHU,    // ITEM_BOMBCHUS_5
+    ITEM_BOMBCHU,    // ITEM_BOMBCHUS_20
+    ITEM_DEKU_STICK, // ITEM_DEKU_STICK_UPGRADE_20
+    ITEM_DEKU_STICK, // ITEM_DEKU_STICK_UPGRADE_30
+    ITEM_DEKU_NUT,   // ITEM_DEKU_NUT_UPGRADE_30
+    ITEM_DEKU_NUT,   // ITEM_DEKU_NUT_UPGRADE_40
 };
 
 static s16 D_80125A58 = 0;
@@ -785,8 +785,8 @@ void func_80083108(PlayState* play) {
 
                         if ((gSaveContext.equips.buttonItems[0] != ITEM_SWORD_KOKIRI) &&
                             (gSaveContext.equips.buttonItems[0] != ITEM_SWORD_MASTER) &&
-                            (gSaveContext.equips.buttonItems[0] != ITEM_SWORD_BGS) &&
-                            (gSaveContext.equips.buttonItems[0] != ITEM_SWORD_KNIFE)) {
+                            (gSaveContext.equips.buttonItems[0] != ITEM_SWORD_BIGGORON) &&
+                            (gSaveContext.equips.buttonItems[0] != ITEM_GIANTS_KNIFE)) {
                             gSaveContext.equips.buttonItems[0] = gSaveContext.buttonStatus[0];
                         } else {
                             gSaveContext.buttonStatus[0] = gSaveContext.equips.buttonItems[0];
@@ -802,7 +802,7 @@ void func_80083108(PlayState* play) {
 
                 for (i = 1; i < 4; i++) {
                     if ((gSaveContext.equips.buttonItems[i] != ITEM_OCARINA_FAIRY) &&
-                        (gSaveContext.equips.buttonItems[i] != ITEM_OCARINA_TIME)) {
+                        (gSaveContext.equips.buttonItems[i] != ITEM_OCARINA_OF_TIME)) {
                         if (gSaveContext.buttonStatus[i] == BTN_ENABLED) {
                             sp28 = true;
                         }
@@ -872,8 +872,8 @@ void func_80083108(PlayState* play) {
 
                 if (interfaceCtx->restrictions.bottles != 0) {
                     for (i = 1; i < 4; i++) {
-                        if ((gSaveContext.equips.buttonItems[i] >= ITEM_BOTTLE) &&
-                            (gSaveContext.equips.buttonItems[i] <= ITEM_POE)) {
+                        if ((gSaveContext.equips.buttonItems[i] >= ITEM_BOTTLE_EMPTY) &&
+                            (gSaveContext.equips.buttonItems[i] <= ITEM_BOTTLE_POE)) {
                             if (gSaveContext.buttonStatus[i] == BTN_ENABLED) {
                                 sp28 = true;
                             }
@@ -883,8 +883,8 @@ void func_80083108(PlayState* play) {
                     }
                 } else if (interfaceCtx->restrictions.bottles == 0) {
                     for (i = 1; i < 4; i++) {
-                        if ((gSaveContext.equips.buttonItems[i] >= ITEM_BOTTLE) &&
-                            (gSaveContext.equips.buttonItems[i] <= ITEM_POE)) {
+                        if ((gSaveContext.equips.buttonItems[i] >= ITEM_BOTTLE_EMPTY) &&
+                            (gSaveContext.equips.buttonItems[i] <= ITEM_BOTTLE_POE)) {
                             if (gSaveContext.buttonStatus[i] == BTN_DISABLED) {
                                 sp28 = true;
                             }
@@ -945,7 +945,7 @@ void func_80083108(PlayState* play) {
                 if (interfaceCtx->restrictions.ocarina != 0) {
                     for (i = 1; i < 4; i++) {
                         if ((gSaveContext.equips.buttonItems[i] == ITEM_OCARINA_FAIRY) ||
-                            (gSaveContext.equips.buttonItems[i] == ITEM_OCARINA_TIME)) {
+                            (gSaveContext.equips.buttonItems[i] == ITEM_OCARINA_OF_TIME)) {
                             if (gSaveContext.buttonStatus[i] == BTN_ENABLED) {
                                 sp28 = true;
                             }
@@ -956,7 +956,7 @@ void func_80083108(PlayState* play) {
                 } else if (interfaceCtx->restrictions.ocarina == 0) {
                     for (i = 1; i < 4; i++) {
                         if ((gSaveContext.equips.buttonItems[i] == ITEM_OCARINA_FAIRY) ||
-                            (gSaveContext.equips.buttonItems[i] == ITEM_OCARINA_TIME)) {
+                            (gSaveContext.equips.buttonItems[i] == ITEM_OCARINA_OF_TIME)) {
                             if (gSaveContext.buttonStatus[i] == BTN_DISABLED) {
                                 sp28 = true;
                             }
@@ -1016,13 +1016,13 @@ void func_80083108(PlayState* play) {
                 if (interfaceCtx->restrictions.all != 0) {
                     for (i = 1; i < 4; i++) {
                         if ((gSaveContext.equips.buttonItems[i] != ITEM_OCARINA_FAIRY) &&
-                            (gSaveContext.equips.buttonItems[i] != ITEM_OCARINA_TIME) &&
-                            !((gSaveContext.equips.buttonItems[i] >= ITEM_BOTTLE) &&
-                              (gSaveContext.equips.buttonItems[i] <= ITEM_POE)) &&
+                            (gSaveContext.equips.buttonItems[i] != ITEM_OCARINA_OF_TIME) &&
+                            !((gSaveContext.equips.buttonItems[i] >= ITEM_BOTTLE_EMPTY) &&
+                              (gSaveContext.equips.buttonItems[i] <= ITEM_BOTTLE_POE)) &&
                             !((gSaveContext.equips.buttonItems[i] >= ITEM_WEIRD_EGG) &&
                               (gSaveContext.equips.buttonItems[i] <= ITEM_CLAIM_CHECK))) {
                             if ((play->sceneId != SCENE_TAKARAYA) ||
-                                (gSaveContext.equips.buttonItems[i] != ITEM_LENS)) {
+                                (gSaveContext.equips.buttonItems[i] != ITEM_LENS_OF_TRUTH)) {
                                 if (gSaveContext.buttonStatus[i] == BTN_ENABLED) {
                                     sp28 = true;
                                 }
@@ -1045,9 +1045,9 @@ void func_80083108(PlayState* play) {
                             (gSaveContext.equips.buttonItems[i] != ITEM_FARORES_WIND) &&
                             (gSaveContext.equips.buttonItems[i] != ITEM_NAYRUS_LOVE) &&
                             (gSaveContext.equips.buttonItems[i] != ITEM_OCARINA_FAIRY) &&
-                            (gSaveContext.equips.buttonItems[i] != ITEM_OCARINA_TIME) &&
-                            !((gSaveContext.equips.buttonItems[i] >= ITEM_BOTTLE) &&
-                              (gSaveContext.equips.buttonItems[i] <= ITEM_POE)) &&
+                            (gSaveContext.equips.buttonItems[i] != ITEM_OCARINA_OF_TIME) &&
+                            !((gSaveContext.equips.buttonItems[i] >= ITEM_BOTTLE_EMPTY) &&
+                              (gSaveContext.equips.buttonItems[i] <= ITEM_BOTTLE_POE)) &&
                             !((gSaveContext.equips.buttonItems[i] >= ITEM_WEIRD_EGG) &&
                               (gSaveContext.equips.buttonItems[i] <= ITEM_CLAIM_CHECK))) {
                             if (gSaveContext.buttonStatus[i] == BTN_DISABLED) {
@@ -1171,9 +1171,9 @@ void Inventory_SwapAgeEquipment(void) {
         if (gSaveContext.adultEquips.buttonItems[0] == ITEM_NONE) {
             gSaveContext.equips.buttonItems[0] = ITEM_SWORD_MASTER;
 
-            if (gSaveContext.inventory.items[SLOT_NUT] != ITEM_NONE) {
-                gSaveContext.equips.buttonItems[1] = ITEM_NUT;
-                gSaveContext.equips.cButtonSlots[0] = SLOT_NUT;
+            if (gSaveContext.inventory.items[SLOT_DEKU_NUT] != ITEM_NONE) {
+                gSaveContext.equips.buttonItems[1] = ITEM_DEKU_NUT;
+                gSaveContext.equips.cButtonSlots[0] = SLOT_DEKU_NUT;
             } else {
                 gSaveContext.equips.buttonItems[1] = gSaveContext.equips.cButtonSlots[0] = ITEM_NONE;
             }
@@ -1194,8 +1194,8 @@ void Inventory_SwapAgeEquipment(void) {
                     gSaveContext.equips.cButtonSlots[i - 1] = gSaveContext.adultEquips.cButtonSlots[i - 1];
                 }
 
-                if (((gSaveContext.equips.buttonItems[i] >= ITEM_BOTTLE) &&
-                     (gSaveContext.equips.buttonItems[i] <= ITEM_POE)) ||
+                if (((gSaveContext.equips.buttonItems[i] >= ITEM_BOTTLE_EMPTY) &&
+                     (gSaveContext.equips.buttonItems[i] <= ITEM_BOTTLE_POE)) ||
                     ((gSaveContext.equips.buttonItems[i] >= ITEM_WEIRD_EGG) &&
                      (gSaveContext.equips.buttonItems[i] <= ITEM_CLAIM_CHECK))) {
                     osSyncPrintf("Register_Item_Pt(%d)=%d\n", i, gSaveContext.equips.cButtonSlots[i - 1]);
@@ -1225,8 +1225,8 @@ void Inventory_SwapAgeEquipment(void) {
                     gSaveContext.equips.cButtonSlots[i - 1] = gSaveContext.childEquips.cButtonSlots[i - 1];
                 }
 
-                if (((gSaveContext.equips.buttonItems[i] >= ITEM_BOTTLE) &&
-                     (gSaveContext.equips.buttonItems[i] <= ITEM_POE)) ||
+                if (((gSaveContext.equips.buttonItems[i] >= ITEM_BOTTLE_EMPTY) &&
+                     (gSaveContext.equips.buttonItems[i] <= ITEM_BOTTLE_POE)) ||
                     ((gSaveContext.equips.buttonItems[i] >= ITEM_WEIRD_EGG) &&
                      (gSaveContext.equips.buttonItems[i] <= ITEM_CLAIM_CHECK))) {
                     osSyncPrintf("Register_Item_Pt(%d)=%d\n", i, gSaveContext.equips.cButtonSlots[i - 1]);
@@ -1264,9 +1264,9 @@ void func_800849EC(PlayState* play) {
     gSaveContext.inventory.equipment ^= OWNED_EQUIP_FLAG_ALT(EQUIP_TYPE_SWORD, EQUIP_INV_SWORD_BROKENGIANTKNIFE);
 
     if (CHECK_OWNED_EQUIP_ALT(EQUIP_TYPE_SWORD, EQUIP_INV_SWORD_BROKENGIANTKNIFE)) {
-        gSaveContext.equips.buttonItems[0] = ITEM_SWORD_KNIFE;
+        gSaveContext.equips.buttonItems[0] = ITEM_GIANTS_KNIFE;
     } else {
-        gSaveContext.equips.buttonItems[0] = ITEM_SWORD_BGS;
+        gSaveContext.equips.buttonItems[0] = ITEM_SWORD_BIGGORON;
     }
 
     Interface_LoadItemIcon1(play, 0);
@@ -1334,8 +1334,8 @@ u8 Item_Give(PlayState* play, u8 item) {
     s16 temp;
 
     slot = SLOT(item);
-    if (item >= ITEM_STICKS_5) {
-        slot = SLOT(sExtraItemBases[item - ITEM_STICKS_5]);
+    if (item >= ITEM_DEKU_STICKS_5) {
+        slot = SLOT(sExtraItemBases[item - ITEM_DEKU_STICKS_5]);
     }
 
     osSyncPrintf(VT_FGCOL(YELLOW));
@@ -1373,7 +1373,7 @@ u8 Item_Give(PlayState* play, u8 item) {
         osSyncPrintf(VT_RST);
 
         return ITEM_NONE;
-    } else if ((item == ITEM_STONE_OF_AGONY) || (item == ITEM_GERUDO_CARD)) {
+    } else if ((item == ITEM_STONE_OF_AGONY) || (item == ITEM_GERUDOS_CARD)) {
         gSaveContext.inventory.questItems |= gBitFlags[item - ITEM_STONE_OF_AGONY + QUEST_STONE_OF_AGONY];
 
         osSyncPrintf(VT_FGCOL(YELLOW));
@@ -1391,11 +1391,11 @@ u8 Item_Give(PlayState* play, u8 item) {
         osSyncPrintf(VT_RST);
 
         return ITEM_NONE;
-    } else if ((item >= ITEM_SWORD_KOKIRI) && (item <= ITEM_SWORD_BGS)) {
+    } else if ((item >= ITEM_SWORD_KOKIRI) && (item <= ITEM_SWORD_BIGGORON)) {
         gSaveContext.inventory.equipment |=
             OWNED_EQUIP_FLAG(EQUIP_TYPE_SWORD, item - ITEM_SWORD_KOKIRI + EQUIP_INV_SWORD_KOKIRI);
 
-        if (item == ITEM_SWORD_BGS) {
+        if (item == ITEM_SWORD_BIGGORON) {
             gSaveContext.swordHealth = 8;
 
             if (ALL_EQUIP_VALUE(EQUIP_TYPE_SWORD) ==
@@ -1403,8 +1403,8 @@ u8 Item_Give(PlayState* play, u8 item) {
                  (1 << EQUIP_INV_SWORD_BROKENGIANTKNIFE))) {
                 gSaveContext.inventory.equipment ^=
                     OWNED_EQUIP_FLAG_ALT(EQUIP_TYPE_SWORD, EQUIP_INV_SWORD_BROKENGIANTKNIFE);
-                if (gSaveContext.equips.buttonItems[0] == ITEM_SWORD_KNIFE) {
-                    gSaveContext.equips.buttonItems[0] = ITEM_SWORD_BGS;
+                if (gSaveContext.equips.buttonItems[0] == ITEM_GIANTS_KNIFE) {
+                    gSaveContext.equips.buttonItems[0] = ITEM_SWORD_BIGGORON;
                     Interface_LoadItemIcon1(play, 0);
                 }
             }
@@ -1425,10 +1425,10 @@ u8 Item_Give(PlayState* play, u8 item) {
     } else if ((item >= ITEM_BOOTS_KOKIRI) && (item <= ITEM_BOOTS_HOVER)) {
         gSaveContext.inventory.equipment |= OWNED_EQUIP_FLAG(EQUIP_TYPE_BOOTS, item - ITEM_BOOTS_KOKIRI);
         return ITEM_NONE;
-    } else if ((item == ITEM_KEY_BOSS) || (item == ITEM_COMPASS) || (item == ITEM_DUNGEON_MAP)) {
-        gSaveContext.inventory.dungeonItems[gSaveContext.mapIndex] |= gBitFlags[item - ITEM_KEY_BOSS];
+    } else if ((item == ITEM_DUNGEON_BOSS_KEY) || (item == ITEM_DUNGEON_COMPASS) || (item == ITEM_DUNGEON_MAP)) {
+        gSaveContext.inventory.dungeonItems[gSaveContext.mapIndex] |= gBitFlags[item - ITEM_DUNGEON_BOSS_KEY];
         return ITEM_NONE;
-    } else if (item == ITEM_KEY_SMALL) {
+    } else if (item == ITEM_SMALL_KEY) {
         if (gSaveContext.inventory.dungeonKeys[gSaveContext.mapIndex] < 0) {
             gSaveContext.inventory.dungeonKeys[gSaveContext.mapIndex] = 1;
             return ITEM_NONE;
@@ -1484,13 +1484,13 @@ u8 Item_Give(PlayState* play, u8 item) {
         Inventory_ChangeUpgrade(UPG_BOMB_BAG, 3);
         AMMO(ITEM_BOMB) = CAPACITY(UPG_BOMB_BAG, 3);
         return ITEM_NONE;
-    } else if (item == ITEM_BRACELET) {
+    } else if (item == ITEM_STRENGTH_GORONS_BRACELET) {
         Inventory_ChangeUpgrade(UPG_STRENGTH, 1);
         return ITEM_NONE;
-    } else if (item == ITEM_GAUNTLETS_SILVER) {
+    } else if (item == ITEM_STRENGTH_SILVER_GAUNTLETS) {
         Inventory_ChangeUpgrade(UPG_STRENGTH, 2);
         return ITEM_NONE;
-    } else if (item == ITEM_GAUNTLETS_GOLD) {
+    } else if (item == ITEM_STRENGTH_GOLD_GAUNTLETS) {
         Inventory_ChangeUpgrade(UPG_STRENGTH, 3);
         return ITEM_NONE;
     } else if (item == ITEM_SCALE_SILVER) {
@@ -1499,39 +1499,39 @@ u8 Item_Give(PlayState* play, u8 item) {
     } else if (item == ITEM_SCALE_GOLDEN) {
         Inventory_ChangeUpgrade(UPG_SCALE, 2);
         return ITEM_NONE;
-    } else if (item == ITEM_WALLET_ADULT) {
+    } else if (item == ITEM_ADULTS_WALLET) {
         Inventory_ChangeUpgrade(UPG_WALLET, 1);
         return ITEM_NONE;
-    } else if (item == ITEM_WALLET_GIANT) {
+    } else if (item == ITEM_GIANTS_WALLET) {
         Inventory_ChangeUpgrade(UPG_WALLET, 2);
         return ITEM_NONE;
-    } else if (item == ITEM_STICK_UPGRADE_20) {
+    } else if (item == ITEM_DEKU_STICK_UPGRADE_20) {
         if (gSaveContext.inventory.items[slot] == ITEM_NONE) {
-            INV_CONTENT(ITEM_STICK) = ITEM_STICK;
+            INV_CONTENT(ITEM_DEKU_STICK) = ITEM_DEKU_STICK;
         }
-        Inventory_ChangeUpgrade(UPG_STICKS, 2);
-        AMMO(ITEM_STICK) = CAPACITY(UPG_STICKS, 2);
+        Inventory_ChangeUpgrade(UPG_DEKU_STICKS, 2);
+        AMMO(ITEM_DEKU_STICK) = CAPACITY(UPG_DEKU_STICKS, 2);
         return ITEM_NONE;
-    } else if (item == ITEM_STICK_UPGRADE_30) {
+    } else if (item == ITEM_DEKU_STICK_UPGRADE_30) {
         if (gSaveContext.inventory.items[slot] == ITEM_NONE) {
-            INV_CONTENT(ITEM_STICK) = ITEM_STICK;
+            INV_CONTENT(ITEM_DEKU_STICK) = ITEM_DEKU_STICK;
         }
-        Inventory_ChangeUpgrade(UPG_STICKS, 3);
-        AMMO(ITEM_STICK) = CAPACITY(UPG_STICKS, 3);
+        Inventory_ChangeUpgrade(UPG_DEKU_STICKS, 3);
+        AMMO(ITEM_DEKU_STICK) = CAPACITY(UPG_DEKU_STICKS, 3);
         return ITEM_NONE;
-    } else if (item == ITEM_NUT_UPGRADE_30) {
+    } else if (item == ITEM_DEKU_NUT_UPGRADE_30) {
         if (gSaveContext.inventory.items[slot] == ITEM_NONE) {
-            INV_CONTENT(ITEM_NUT) = ITEM_NUT;
+            INV_CONTENT(ITEM_DEKU_NUT) = ITEM_DEKU_NUT;
         }
-        Inventory_ChangeUpgrade(UPG_NUTS, 2);
-        AMMO(ITEM_NUT) = CAPACITY(UPG_NUTS, 2);
+        Inventory_ChangeUpgrade(UPG_DEKU_NUTS, 2);
+        AMMO(ITEM_DEKU_NUT) = CAPACITY(UPG_DEKU_NUTS, 2);
         return ITEM_NONE;
-    } else if (item == ITEM_NUT_UPGRADE_40) {
+    } else if (item == ITEM_DEKU_NUT_UPGRADE_40) {
         if (gSaveContext.inventory.items[slot] == ITEM_NONE) {
-            INV_CONTENT(ITEM_NUT) = ITEM_NUT;
+            INV_CONTENT(ITEM_DEKU_NUT) = ITEM_DEKU_NUT;
         }
-        Inventory_ChangeUpgrade(UPG_NUTS, 3);
-        AMMO(ITEM_NUT) = CAPACITY(UPG_NUTS, 3);
+        Inventory_ChangeUpgrade(UPG_DEKU_NUTS, 3);
+        AMMO(ITEM_DEKU_NUT) = CAPACITY(UPG_DEKU_NUTS, 3);
         return ITEM_NONE;
     } else if (item == ITEM_LONGSHOT) {
         INV_CONTENT(item) = item;
@@ -1542,51 +1542,51 @@ u8 Item_Give(PlayState* play, u8 item) {
             }
         }
         return ITEM_NONE;
-    } else if (item == ITEM_STICK) {
+    } else if (item == ITEM_DEKU_STICK) {
         if (gSaveContext.inventory.items[slot] == ITEM_NONE) {
-            Inventory_ChangeUpgrade(UPG_STICKS, 1);
-            AMMO(ITEM_STICK) = 1;
+            Inventory_ChangeUpgrade(UPG_DEKU_STICKS, 1);
+            AMMO(ITEM_DEKU_STICK) = 1;
         } else {
-            AMMO(ITEM_STICK)++;
-            if (AMMO(ITEM_STICK) > CUR_CAPACITY(UPG_STICKS)) {
-                AMMO(ITEM_STICK) = CUR_CAPACITY(UPG_STICKS);
+            AMMO(ITEM_DEKU_STICK)++;
+            if (AMMO(ITEM_DEKU_STICK) > CUR_CAPACITY(UPG_DEKU_STICKS)) {
+                AMMO(ITEM_DEKU_STICK) = CUR_CAPACITY(UPG_DEKU_STICKS);
             }
         }
-    } else if ((item == ITEM_STICKS_5) || (item == ITEM_STICKS_10)) {
+    } else if ((item == ITEM_DEKU_STICKS_5) || (item == ITEM_DEKU_STICKS_10)) {
         if (gSaveContext.inventory.items[slot] == ITEM_NONE) {
-            Inventory_ChangeUpgrade(UPG_STICKS, 1);
-            AMMO(ITEM_STICK) = sAmmoRefillCounts[item - ITEM_STICKS_5];
+            Inventory_ChangeUpgrade(UPG_DEKU_STICKS, 1);
+            AMMO(ITEM_DEKU_STICK) = sAmmoRefillCounts[item - ITEM_DEKU_STICKS_5];
         } else {
-            AMMO(ITEM_STICK) += sAmmoRefillCounts[item - ITEM_STICKS_5];
-            if (AMMO(ITEM_STICK) > CUR_CAPACITY(UPG_STICKS)) {
-                AMMO(ITEM_STICK) = CUR_CAPACITY(UPG_STICKS);
+            AMMO(ITEM_DEKU_STICK) += sAmmoRefillCounts[item - ITEM_DEKU_STICKS_5];
+            if (AMMO(ITEM_DEKU_STICK) > CUR_CAPACITY(UPG_DEKU_STICKS)) {
+                AMMO(ITEM_DEKU_STICK) = CUR_CAPACITY(UPG_DEKU_STICKS);
             }
         }
-        item = ITEM_STICK;
-    } else if (item == ITEM_NUT) {
+        item = ITEM_DEKU_STICK;
+    } else if (item == ITEM_DEKU_NUT) {
         if (gSaveContext.inventory.items[slot] == ITEM_NONE) {
-            Inventory_ChangeUpgrade(UPG_NUTS, 1);
-            AMMO(ITEM_NUT) = ITEM_NUT;
+            Inventory_ChangeUpgrade(UPG_DEKU_NUTS, 1);
+            AMMO(ITEM_DEKU_NUT) = ITEM_DEKU_NUT;
         } else {
-            AMMO(ITEM_NUT)++;
-            if (AMMO(ITEM_NUT) > CUR_CAPACITY(UPG_NUTS)) {
-                AMMO(ITEM_NUT) = CUR_CAPACITY(UPG_NUTS);
+            AMMO(ITEM_DEKU_NUT)++;
+            if (AMMO(ITEM_DEKU_NUT) > CUR_CAPACITY(UPG_DEKU_NUTS)) {
+                AMMO(ITEM_DEKU_NUT) = CUR_CAPACITY(UPG_DEKU_NUTS);
             }
         }
-    } else if ((item == ITEM_NUTS_5) || (item == ITEM_NUTS_10)) {
+    } else if ((item == ITEM_DEKU_NUTS_5) || (item == ITEM_DEKU_NUTS_10)) {
         if (gSaveContext.inventory.items[slot] == ITEM_NONE) {
-            Inventory_ChangeUpgrade(UPG_NUTS, 1);
-            AMMO(ITEM_NUT) += sAmmoRefillCounts[item - ITEM_NUTS_5];
+            Inventory_ChangeUpgrade(UPG_DEKU_NUTS, 1);
+            AMMO(ITEM_DEKU_NUT) += sAmmoRefillCounts[item - ITEM_DEKU_NUTS_5];
             // "Deku Nuts %d(%d)=%d BS_count=%d"
-            osSyncPrintf("デクの実 %d(%d)=%d  BS_count=%d\n", item, ITEM_NUTS_5, item - ITEM_NUTS_5,
-                         sAmmoRefillCounts[item - ITEM_NUTS_5]);
+            osSyncPrintf("デクの実 %d(%d)=%d  BS_count=%d\n", item, ITEM_DEKU_NUTS_5, item - ITEM_DEKU_NUTS_5,
+                         sAmmoRefillCounts[item - ITEM_DEKU_NUTS_5]);
         } else {
-            AMMO(ITEM_NUT) += sAmmoRefillCounts[item - ITEM_NUTS_5];
-            if (AMMO(ITEM_NUT) > CUR_CAPACITY(UPG_NUTS)) {
-                AMMO(ITEM_NUT) = CUR_CAPACITY(UPG_NUTS);
+            AMMO(ITEM_DEKU_NUT) += sAmmoRefillCounts[item - ITEM_DEKU_NUTS_5];
+            if (AMMO(ITEM_DEKU_NUT) > CUR_CAPACITY(UPG_DEKU_NUTS)) {
+                AMMO(ITEM_DEKU_NUT) = CUR_CAPACITY(UPG_DEKU_NUTS);
             }
         }
-        item = ITEM_NUT;
+        item = ITEM_DEKU_NUT;
     } else if (item == ITEM_BOMB) {
         // "Bomb  Bomb  Bomb  Bomb Bomb   Bomb Bomb"
         osSyncPrintf(" 爆弾  爆弾  爆弾  爆弾 爆弾   爆弾 爆弾 \n");
@@ -1623,8 +1623,8 @@ u8 Item_Give(PlayState* play, u8 item) {
             }
             return ITEM_NONE;
         }
-    } else if ((item >= ITEM_ARROWS_SMALL) && (item <= ITEM_ARROWS_LARGE)) {
-        AMMO(ITEM_BOW) += sArrowRefillCounts[item - ITEM_ARROWS_SMALL];
+    } else if ((item >= ITEM_ARROWS_5) && (item <= ITEM_ARROWS_30)) {
+        AMMO(ITEM_BOW) += sArrowRefillCounts[item - ITEM_ARROWS_5];
 
         if ((AMMO(ITEM_BOW) >= CUR_CAPACITY(UPG_QUIVER)) || (AMMO(ITEM_BOW) < 0)) {
             AMMO(ITEM_BOW) = CUR_CAPACITY(UPG_QUIVER);
@@ -1638,7 +1638,7 @@ u8 Item_Give(PlayState* play, u8 item) {
         INV_CONTENT(ITEM_SLINGSHOT) = ITEM_SLINGSHOT;
         AMMO(ITEM_SLINGSHOT) = 30;
         return ITEM_NONE;
-    } else if (item == ITEM_SEEDS) {
+    } else if (item == ITEM_DEKU_SEEDS) {
         AMMO(ITEM_SLINGSHOT) += 5;
 
         if (AMMO(ITEM_SLINGSHOT) >= CUR_CAPACITY(UPG_BULLET_BAG)) {
@@ -1650,8 +1650,8 @@ u8 Item_Give(PlayState* play, u8 item) {
             return ITEM_NONE;
         }
 
-        return ITEM_SEEDS;
-    } else if (item == ITEM_SEEDS_30) {
+        return ITEM_DEKU_SEEDS;
+    } else if (item == ITEM_DEKU_SEEDS_30) {
         AMMO(ITEM_SLINGSHOT) += 30;
 
         if (AMMO(ITEM_SLINGSHOT) >= CUR_CAPACITY(UPG_BULLET_BAG)) {
@@ -1663,26 +1663,26 @@ u8 Item_Give(PlayState* play, u8 item) {
             return ITEM_NONE;
         }
 
-        return ITEM_SEEDS;
+        return ITEM_DEKU_SEEDS;
     } else if (item == ITEM_OCARINA_FAIRY) {
         INV_CONTENT(ITEM_OCARINA_FAIRY) = ITEM_OCARINA_FAIRY;
         return ITEM_NONE;
-    } else if (item == ITEM_OCARINA_TIME) {
-        INV_CONTENT(ITEM_OCARINA_TIME) = ITEM_OCARINA_TIME;
+    } else if (item == ITEM_OCARINA_OF_TIME) {
+        INV_CONTENT(ITEM_OCARINA_OF_TIME) = ITEM_OCARINA_OF_TIME;
         for (i = 1; i < 4; i++) {
             if (gSaveContext.equips.buttonItems[i] == ITEM_OCARINA_FAIRY) {
-                gSaveContext.equips.buttonItems[i] = ITEM_OCARINA_TIME;
+                gSaveContext.equips.buttonItems[i] = ITEM_OCARINA_OF_TIME;
                 Interface_LoadItemIcon1(play, i);
             }
         }
         return ITEM_NONE;
-    } else if (item == ITEM_BEAN) {
+    } else if (item == ITEM_MAGIC_BEAN) {
         if (gSaveContext.inventory.items[slot] == ITEM_NONE) {
             INV_CONTENT(item) = item;
-            AMMO(ITEM_BEAN) = 1;
+            AMMO(ITEM_MAGIC_BEAN) = 1;
             BEANS_BOUGHT = 1;
         } else {
-            AMMO(ITEM_BEAN)++;
+            AMMO(ITEM_MAGIC_BEAN)++;
             BEANS_BOUGHT++;
         }
         return ITEM_NONE;
@@ -1697,7 +1697,7 @@ u8 Item_Give(PlayState* play, u8 item) {
         osSyncPrintf("回復ハート回復ハート回復ハート\n"); // "Recovery Heart"
         Health_ChangeBy(play, 0x10);
         return item;
-    } else if (item == ITEM_MAGIC_SMALL) {
+    } else if (item == ITEM_MAGIC_JAR_SMALL) {
         if (gSaveContext.magicState != MAGIC_STATE_ADD) {
             // This function is only used to store the magicState.
             // Setting the state to FILL gets immediately overwritten in Magic_RequestChange.
@@ -1713,7 +1713,7 @@ u8 Item_Give(PlayState* play, u8 item) {
         }
 
         return item;
-    } else if (item == ITEM_MAGIC_LARGE) {
+    } else if (item == ITEM_MAGIC_JAR_BIG) {
         if (gSaveContext.magicState != MAGIC_STATE_ADD) {
             // This function is only used to store the magicState.
             // Setting the state to FILL gets immediately overwritten in Magic_RequestChange.
@@ -1732,7 +1732,7 @@ u8 Item_Give(PlayState* play, u8 item) {
     } else if ((item >= ITEM_RUPEE_GREEN) && (item <= ITEM_INVALID_8)) {
         Rupees_ChangeBy(sRupeeRefillCounts[item - ITEM_RUPEE_GREEN]);
         return ITEM_NONE;
-    } else if (item == ITEM_BOTTLE) {
+    } else if (item == ITEM_BOTTLE_EMPTY) {
         temp = SLOT(item);
 
         for (i = 0; i < 4; i++) {
@@ -1741,17 +1741,17 @@ u8 Item_Give(PlayState* play, u8 item) {
                 return ITEM_NONE;
             }
         }
-    } else if (((item >= ITEM_POTION_RED) && (item <= ITEM_POE)) || (item == ITEM_MILK)) {
+    } else if (((item >= ITEM_BOTTLE_POTION_RED) && (item <= ITEM_BOTTLE_POE)) || (item == ITEM_MILK)) {
         temp = SLOT(item);
 
-        if ((item != ITEM_MILK_BOTTLE) && (item != ITEM_LETTER_RUTO)) {
+        if ((item != ITEM_BOTTLE_MILK_FULL) && (item != ITEM_BOTTLE_RUTOS_LETTER)) {
             if (item == ITEM_MILK) {
-                item = ITEM_MILK_BOTTLE;
+                item = ITEM_BOTTLE_MILK_FULL;
                 temp = SLOT(item);
             }
 
             for (i = 0; i < 4; i++) {
-                if (gSaveContext.inventory.items[temp + i] == ITEM_BOTTLE) {
+                if (gSaveContext.inventory.items[temp + i] == ITEM_BOTTLE_EMPTY) {
                     // "Item_Pt(1)=%d Item_Pt(2)=%d Item_Pt(3)=%d   Empty Bottle=%d   Content=%d"
                     osSyncPrintf("Item_Pt(1)=%d Item_Pt(2)=%d Item_Pt(3)=%d   空瓶=%d   中味=%d\n",
                                  gSaveContext.equips.cButtonSlots[0], gSaveContext.equips.cButtonSlots[1],
@@ -1784,7 +1784,7 @@ u8 Item_Give(PlayState* play, u8 item) {
             }
         }
     } else if ((item >= ITEM_WEIRD_EGG) && (item <= ITEM_CLAIM_CHECK)) {
-        if (item == ITEM_SAW) {
+        if (item == ITEM_POACHERS_SAW) {
             SET_ITEMGETINF(ITEMGETINF_1F);
         }
 
@@ -1820,8 +1820,8 @@ u8 Item_CheckObtainability(u8 item) {
     s16 slot = SLOT(item);
     s32 temp;
 
-    if (item >= ITEM_STICKS_5) {
-        slot = SLOT(sExtraItemBases[item - ITEM_STICKS_5]);
+    if (item >= ITEM_DEKU_STICKS_5) {
+        slot = SLOT(sExtraItemBases[item - ITEM_DEKU_STICKS_5]);
     }
 
     osSyncPrintf(VT_FGCOL(GREEN));
@@ -1832,8 +1832,8 @@ u8 Item_CheckObtainability(u8 item) {
         return ITEM_NONE;
     } else if ((item >= ITEM_KOKIRI_EMERALD) && (item <= ITEM_SKULL_TOKEN)) {
         return ITEM_NONE;
-    } else if ((item >= ITEM_SWORD_KOKIRI) && (item <= ITEM_SWORD_BGS)) {
-        if (item == ITEM_SWORD_BGS) {
+    } else if ((item >= ITEM_SWORD_KOKIRI) && (item <= ITEM_SWORD_BIGGORON)) {
+        if (item == ITEM_SWORD_BIGGORON) {
             return ITEM_NONE;
         } else if (CHECK_OWNED_EQUIP(EQUIP_TYPE_SWORD, item - ITEM_SWORD_KOKIRI + EQUIP_INV_SWORD_KOKIRI)) {
             return item;
@@ -1858,9 +1858,9 @@ u8 Item_CheckObtainability(u8 item) {
         } else {
             return ITEM_NONE;
         }
-    } else if ((item == ITEM_KEY_BOSS) || (item == ITEM_COMPASS) || (item == ITEM_DUNGEON_MAP)) {
+    } else if ((item == ITEM_DUNGEON_BOSS_KEY) || (item == ITEM_DUNGEON_COMPASS) || (item == ITEM_DUNGEON_MAP)) {
         return ITEM_NONE;
-    } else if (item == ITEM_KEY_SMALL) {
+    } else if (item == ITEM_SMALL_KEY) {
         return ITEM_NONE;
     } else if ((item >= ITEM_SLINGSHOT) && (item <= ITEM_BOMBCHU)) {
         return ITEM_NONE;
@@ -1882,19 +1882,19 @@ u8 Item_CheckObtainability(u8 item) {
         } else {
             return 0;
         }
-    } else if ((item >= ITEM_STICK_UPGRADE_20) && (item <= ITEM_NUT_UPGRADE_40)) {
+    } else if ((item >= ITEM_DEKU_STICK_UPGRADE_20) && (item <= ITEM_DEKU_NUT_UPGRADE_40)) {
         return ITEM_NONE;
-    } else if ((item >= ITEM_BOMB_BAG_30) && (item <= ITEM_WALLET_GIANT)) {
+    } else if ((item >= ITEM_BOMB_BAG_30) && (item <= ITEM_GIANTS_WALLET)) {
         return ITEM_NONE;
     } else if (item == ITEM_LONGSHOT) {
         return ITEM_NONE;
-    } else if ((item == ITEM_SEEDS) || (item == ITEM_SEEDS_30)) {
+    } else if ((item == ITEM_DEKU_SEEDS) || (item == ITEM_DEKU_SEEDS_30)) {
         if (!GET_ITEMGETINF(ITEMGETINF_13)) {
             return ITEM_NONE;
         } else {
-            return ITEM_SEEDS;
+            return ITEM_DEKU_SEEDS;
         }
-    } else if (item == ITEM_BEAN) {
+    } else if (item == ITEM_MAGIC_BEAN) {
         return ITEM_NONE;
     } else if ((item == ITEM_HEART_PIECE_2) || (item == ITEM_HEART_PIECE)) {
         return ITEM_NONE;
@@ -1902,7 +1902,7 @@ u8 Item_CheckObtainability(u8 item) {
         return ITEM_NONE;
     } else if (item == ITEM_RECOVERY_HEART) {
         return ITEM_RECOVERY_HEART;
-    } else if ((item == ITEM_MAGIC_SMALL) || (item == ITEM_MAGIC_LARGE)) {
+    } else if ((item == ITEM_MAGIC_JAR_SMALL) || (item == ITEM_MAGIC_JAR_BIG)) {
         // "Magic Pot Get_Inf_Table( 25, 0x0100)=%d"
         osSyncPrintf("魔法の壷 Get_Inf_Table( 25, 0x0100)=%d\n", GET_INFTABLE(INFTABLE_198));
         if (!GET_INFTABLE(INFTABLE_198)) {
@@ -1912,19 +1912,19 @@ u8 Item_CheckObtainability(u8 item) {
         }
     } else if ((item >= ITEM_RUPEE_GREEN) && (item <= ITEM_INVALID_8)) {
         return ITEM_NONE;
-    } else if (item == ITEM_BOTTLE) {
+    } else if (item == ITEM_BOTTLE_EMPTY) {
         return ITEM_NONE;
-    } else if (((item >= ITEM_POTION_RED) && (item <= ITEM_POE)) || (item == ITEM_MILK)) {
+    } else if (((item >= ITEM_BOTTLE_POTION_RED) && (item <= ITEM_BOTTLE_POE)) || (item == ITEM_MILK)) {
         temp = SLOT(item);
 
-        if ((item != ITEM_MILK_BOTTLE) && (item != ITEM_LETTER_RUTO)) {
+        if ((item != ITEM_BOTTLE_MILK_FULL) && (item != ITEM_BOTTLE_RUTOS_LETTER)) {
             if (item == ITEM_MILK) {
-                item = ITEM_MILK_BOTTLE;
+                item = ITEM_BOTTLE_MILK_FULL;
                 temp = SLOT(item);
             }
 
             for (i = 0; i < 4; i++) {
-                if (gSaveContext.inventory.items[temp + i] == ITEM_BOTTLE) {
+                if (gSaveContext.inventory.items[temp + i] == ITEM_BOTTLE_EMPTY) {
                     return ITEM_NONE;
                 }
             }
@@ -1945,7 +1945,7 @@ u8 Item_CheckObtainability(u8 item) {
 void Inventory_DeleteItem(u16 item, u16 invSlot) {
     s16 i;
 
-    if (item == ITEM_BEAN) {
+    if (item == ITEM_MAGIC_BEAN) {
         BEANS_BOUGHT = 0;
     }
 
@@ -1985,13 +1985,13 @@ s32 Inventory_ReplaceItem(PlayState* play, u16 oldItem, u16 newItem) {
 s32 Inventory_HasEmptyBottle(void) {
     u8* items = gSaveContext.inventory.items;
 
-    if (items[SLOT_BOTTLE_1] == ITEM_BOTTLE) {
+    if (items[SLOT_BOTTLE_1] == ITEM_BOTTLE_EMPTY) {
         return true;
-    } else if (items[SLOT_BOTTLE_2] == ITEM_BOTTLE) {
+    } else if (items[SLOT_BOTTLE_2] == ITEM_BOTTLE_EMPTY) {
         return true;
-    } else if (items[SLOT_BOTTLE_3] == ITEM_BOTTLE) {
+    } else if (items[SLOT_BOTTLE_3] == ITEM_BOTTLE_EMPTY) {
         return true;
-    } else if (items[SLOT_BOTTLE_4] == ITEM_BOTTLE) {
+    } else if (items[SLOT_BOTTLE_4] == ITEM_BOTTLE_EMPTY) {
         return true;
     } else {
         return false;
@@ -2020,9 +2020,9 @@ void Inventory_UpdateBottleItem(PlayState* play, u8 item, u8 button) {
                  gSaveContext.inventory.items[gSaveContext.equips.cButtonSlots[button - 1]]);
 
     // Special case to only empty half of a Lon Lon Milk Bottle
-    if ((gSaveContext.inventory.items[gSaveContext.equips.cButtonSlots[button - 1]] == ITEM_MILK_BOTTLE) &&
-        (item == ITEM_BOTTLE)) {
-        item = ITEM_MILK_HALF;
+    if ((gSaveContext.inventory.items[gSaveContext.equips.cButtonSlots[button - 1]] == ITEM_BOTTLE_MILK_FULL) &&
+        (item == ITEM_BOTTLE_EMPTY)) {
+        item = ITEM_BOTTLE_MILK_HALF;
     }
 
     gSaveContext.inventory.items[gSaveContext.equips.cButtonSlots[button - 1]] = item;
@@ -2035,15 +2035,15 @@ void Inventory_UpdateBottleItem(PlayState* play, u8 item, u8 button) {
 }
 
 s32 Inventory_ConsumeFairy(PlayState* play) {
-    s32 bottleSlot = SLOT(ITEM_FAIRY);
+    s32 bottleSlot = SLOT(ITEM_BOTTLE_FAIRY);
     s16 i;
     s16 j;
 
     for (i = 0; i < 4; i++) {
-        if (gSaveContext.inventory.items[bottleSlot + i] == ITEM_FAIRY) {
+        if (gSaveContext.inventory.items[bottleSlot + i] == ITEM_BOTTLE_FAIRY) {
             for (j = 1; j < 4; j++) {
-                if (gSaveContext.equips.buttonItems[j] == ITEM_FAIRY) {
-                    gSaveContext.equips.buttonItems[j] = ITEM_BOTTLE;
+                if (gSaveContext.equips.buttonItems[j] == ITEM_BOTTLE_FAIRY) {
+                    gSaveContext.equips.buttonItems[j] = ITEM_BOTTLE_EMPTY;
                     Interface_LoadItemIcon1(play, j);
                     i = 0;
                     bottleSlot = gSaveContext.equips.cButtonSlots[j - 1];
@@ -2051,7 +2051,7 @@ s32 Inventory_ConsumeFairy(PlayState* play) {
                 }
             }
             osSyncPrintf("妖精使用＝%d\n", bottleSlot); // "Fairy Usage＝%d"
-            gSaveContext.inventory.items[bottleSlot + i] = ITEM_BOTTLE;
+            gSaveContext.inventory.items[bottleSlot + i] = ITEM_BOTTLE_EMPTY;
             return true;
         }
     }
@@ -2219,21 +2219,21 @@ void Inventory_ChangeAmmo(s16 item, s16 ammoChange) {
     // "Item = (%d)    Amount = (%d + %d)"
     osSyncPrintf("アイテム = (%d)    数 = (%d + %d)  ", item, AMMO(item), ammoChange);
 
-    if (item == ITEM_STICK) {
-        AMMO(ITEM_STICK) += ammoChange;
+    if (item == ITEM_DEKU_STICK) {
+        AMMO(ITEM_DEKU_STICK) += ammoChange;
 
-        if (AMMO(ITEM_STICK) >= CUR_CAPACITY(UPG_STICKS)) {
-            AMMO(ITEM_STICK) = CUR_CAPACITY(UPG_STICKS);
-        } else if (AMMO(ITEM_STICK) < 0) {
-            AMMO(ITEM_STICK) = 0;
+        if (AMMO(ITEM_DEKU_STICK) >= CUR_CAPACITY(UPG_DEKU_STICKS)) {
+            AMMO(ITEM_DEKU_STICK) = CUR_CAPACITY(UPG_DEKU_STICKS);
+        } else if (AMMO(ITEM_DEKU_STICK) < 0) {
+            AMMO(ITEM_DEKU_STICK) = 0;
         }
-    } else if (item == ITEM_NUT) {
-        AMMO(ITEM_NUT) += ammoChange;
+    } else if (item == ITEM_DEKU_NUT) {
+        AMMO(ITEM_DEKU_NUT) += ammoChange;
 
-        if (AMMO(ITEM_NUT) >= CUR_CAPACITY(UPG_NUTS)) {
-            AMMO(ITEM_NUT) = CUR_CAPACITY(UPG_NUTS);
-        } else if (AMMO(ITEM_NUT) < 0) {
-            AMMO(ITEM_NUT) = 0;
+        if (AMMO(ITEM_DEKU_NUT) >= CUR_CAPACITY(UPG_DEKU_NUTS)) {
+            AMMO(ITEM_DEKU_NUT) = CUR_CAPACITY(UPG_DEKU_NUTS);
+        } else if (AMMO(ITEM_DEKU_NUT) < 0) {
+            AMMO(ITEM_DEKU_NUT) = 0;
         }
     } else if (item == ITEM_BOMBCHU) {
         AMMO(ITEM_BOMBCHU) += ammoChange;
@@ -2251,7 +2251,7 @@ void Inventory_ChangeAmmo(s16 item, s16 ammoChange) {
         } else if (AMMO(ITEM_BOW) < 0) {
             AMMO(ITEM_BOW) = 0;
         }
-    } else if ((item == ITEM_SLINGSHOT) || (item == ITEM_SEEDS)) {
+    } else if ((item == ITEM_SLINGSHOT) || (item == ITEM_DEKU_SEEDS)) {
         AMMO(ITEM_SLINGSHOT) += ammoChange;
 
         if (AMMO(ITEM_SLINGSHOT) >= CUR_CAPACITY(UPG_BULLET_BAG)) {
@@ -2267,8 +2267,8 @@ void Inventory_ChangeAmmo(s16 item, s16 ammoChange) {
         } else if (AMMO(ITEM_BOMB) < 0) {
             AMMO(ITEM_BOMB) = 0;
         }
-    } else if (item == ITEM_BEAN) {
-        AMMO(ITEM_BEAN) += ammoChange;
+    } else if (item == ITEM_MAGIC_BEAN) {
+        AMMO(ITEM_MAGIC_BEAN) += ammoChange;
     }
 
     osSyncPrintf("合計 = (%d)\n", AMMO(item)); // "Total = (%d)"
@@ -2524,9 +2524,9 @@ void Magic_Update(PlayState* play) {
                 (play->gameOverCtx.state == GAMEOVER_INACTIVE) && (play->transitionTrigger == TRANS_TRIGGER_OFF) &&
                 (play->transitionMode == TRANS_MODE_OFF) && !Play_InCsMode(play)) {
                 if ((gSaveContext.magic == 0) || ((func_8008F2F8(play) >= 2) && (func_8008F2F8(play) < 5)) ||
-                    ((gSaveContext.equips.buttonItems[1] != ITEM_LENS) &&
-                     (gSaveContext.equips.buttonItems[2] != ITEM_LENS) &&
-                     (gSaveContext.equips.buttonItems[3] != ITEM_LENS)) ||
+                    ((gSaveContext.equips.buttonItems[1] != ITEM_LENS_OF_TRUTH) &&
+                     (gSaveContext.equips.buttonItems[2] != ITEM_LENS_OF_TRUTH) &&
+                     (gSaveContext.equips.buttonItems[3] != ITEM_LENS_OF_TRUTH)) ||
                     !play->actorCtx.lensActive) {
                     // Force lens off and set magic meter state to idle
                     play->actorCtx.lensActive = false;
@@ -2881,11 +2881,11 @@ void Interface_DrawAmmoCount(PlayState* play, s16 button, s16 alpha) {
 
     i = gSaveContext.equips.buttonItems[button];
 
-    if ((i == ITEM_STICK) || (i == ITEM_NUT) || (i == ITEM_BOMB) || (i == ITEM_BOW) ||
-        ((i >= ITEM_BOW_ARROW_FIRE) && (i <= ITEM_BOW_ARROW_LIGHT)) || (i == ITEM_SLINGSHOT) || (i == ITEM_BOMBCHU) ||
-        (i == ITEM_BEAN)) {
+    if ((i == ITEM_DEKU_STICK) || (i == ITEM_DEKU_NUT) || (i == ITEM_BOMB) || (i == ITEM_BOW) ||
+        ((i >= ITEM_BOW_FIRE) && (i <= ITEM_BOW_LIGHT)) || (i == ITEM_SLINGSHOT) || (i == ITEM_BOMBCHU) ||
+        (i == ITEM_MAGIC_BEAN)) {
 
-        if ((i >= ITEM_BOW_ARROW_FIRE) && (i <= ITEM_BOW_ARROW_LIGHT)) {
+        if ((i >= ITEM_BOW_FIRE) && (i <= ITEM_BOW_LIGHT)) {
             i = ITEM_BOW;
         }
 
@@ -2905,9 +2905,9 @@ void Interface_DrawAmmoCount(PlayState* play, s16 button, s16 alpha) {
         } else if (((i == ITEM_BOW) && (AMMO(i) == CUR_CAPACITY(UPG_QUIVER))) ||
                    ((i == ITEM_BOMB) && (AMMO(i) == CUR_CAPACITY(UPG_BOMB_BAG))) ||
                    ((i == ITEM_SLINGSHOT) && (AMMO(i) == CUR_CAPACITY(UPG_BULLET_BAG))) ||
-                   ((i == ITEM_STICK) && (AMMO(i) == CUR_CAPACITY(UPG_STICKS))) ||
-                   ((i == ITEM_NUT) && (AMMO(i) == CUR_CAPACITY(UPG_NUTS))) || ((i == ITEM_BOMBCHU) && (ammo == 50)) ||
-                   ((i == ITEM_BEAN) && (ammo == 15))) {
+                   ((i == ITEM_DEKU_STICK) && (AMMO(i) == CUR_CAPACITY(UPG_DEKU_STICKS))) ||
+                   ((i == ITEM_DEKU_NUT) && (AMMO(i) == CUR_CAPACITY(UPG_DEKU_NUTS))) ||
+                   ((i == ITEM_BOMBCHU) && (ammo == 50)) || ((i == ITEM_MAGIC_BEAN) && (ammo == 15))) {
             gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 120, 255, 0, alpha);
         }
 
@@ -3438,8 +3438,8 @@ void Interface_Draw(PlayState* play) {
 
             if ((gSaveContext.equips.buttonItems[0] != ITEM_SWORD_KOKIRI) &&
                 (gSaveContext.equips.buttonItems[0] != ITEM_SWORD_MASTER) &&
-                (gSaveContext.equips.buttonItems[0] != ITEM_SWORD_BGS) &&
-                (gSaveContext.equips.buttonItems[0] != ITEM_SWORD_KNIFE)) {
+                (gSaveContext.equips.buttonItems[0] != ITEM_SWORD_BIGGORON) &&
+                (gSaveContext.equips.buttonItems[0] != ITEM_GIANTS_KNIFE)) {
                 if (gSaveContext.buttonStatus[0] != BTN_ENABLED) {
                     gSaveContext.equips.buttonItems[0] = gSaveContext.buttonStatus[0];
                 } else {
diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c
index 8a3ab9563..363139972 100644
--- a/src/code/z_player_lib.c
+++ b/src/code/z_player_lib.c
@@ -32,7 +32,7 @@ u8 sActionModelGroups[PLAYER_IA_MAX] = {
     PLAYER_MODELGROUP_SWORD,         // PLAYER_IA_SWORD_MASTER
     PLAYER_MODELGROUP_SWORD,         // PLAYER_IA_SWORD_KOKIRI
     PLAYER_MODELGROUP_BGS,           // PLAYER_IA_SWORD_BGS
-    PLAYER_MODELGROUP_10,            // PLAYER_IA_STICK
+    PLAYER_MODELGROUP_10,            // PLAYER_IA_DEKU_STICK
     PLAYER_MODELGROUP_HAMMER,        // PLAYER_IA_HAMMER
     PLAYER_MODELGROUP_BOW_SLINGSHOT, // PLAYER_IA_BOW
     PLAYER_MODELGROUP_BOW_SLINGSHOT, // PLAYER_IA_BOW_FIRE
@@ -53,33 +53,33 @@ u8 sActionModelGroups[PLAYER_IA_MAX] = {
     PLAYER_MODELGROUP_DEFAULT,       // PLAYER_IA_FARORES_WIND
     PLAYER_MODELGROUP_DEFAULT,       // PLAYER_IA_NAYRUS_LOVE
     PLAYER_MODELGROUP_DEFAULT,       // PLAYER_IA_DINS_FIRE
-    PLAYER_MODELGROUP_DEFAULT,       // PLAYER_IA_NUT
+    PLAYER_MODELGROUP_DEFAULT,       // PLAYER_IA_DEKU_NUT
     PLAYER_MODELGROUP_OCARINA,       // PLAYER_IA_OCARINA_FAIRY
-    PLAYER_MODELGROUP_OOT,           // PLAYER_IA_OCARINA_TIME
+    PLAYER_MODELGROUP_OOT,           // PLAYER_IA_OCARINA_OF_TIME
     PLAYER_MODELGROUP_BOTTLE,        // PLAYER_IA_BOTTLE
     PLAYER_MODELGROUP_BOTTLE,        // PLAYER_IA_BOTTLE_FISH
     PLAYER_MODELGROUP_BOTTLE,        // PLAYER_IA_BOTTLE_FIRE
     PLAYER_MODELGROUP_BOTTLE,        // PLAYER_IA_BOTTLE_BUG
     PLAYER_MODELGROUP_BOTTLE,        // PLAYER_IA_BOTTLE_POE
     PLAYER_MODELGROUP_BOTTLE,        // PLAYER_IA_BOTTLE_BIG_POE
-    PLAYER_MODELGROUP_BOTTLE,        // PLAYER_IA_BOTTLE_LETTER
+    PLAYER_MODELGROUP_BOTTLE,        // PLAYER_IA_BOTTLE_RUTOS_LETTER
     PLAYER_MODELGROUP_BOTTLE,        // PLAYER_IA_BOTTLE_POTION_RED
     PLAYER_MODELGROUP_BOTTLE,        // PLAYER_IA_BOTTLE_POTION_BLUE
     PLAYER_MODELGROUP_BOTTLE,        // PLAYER_IA_BOTTLE_POTION_GREEN
-    PLAYER_MODELGROUP_BOTTLE,        // PLAYER_IA_BOTTLE_MILK
+    PLAYER_MODELGROUP_BOTTLE,        // PLAYER_IA_BOTTLE_MILK_FULL
     PLAYER_MODELGROUP_BOTTLE,        // PLAYER_IA_BOTTLE_MILK_HALF
     PLAYER_MODELGROUP_BOTTLE,        // PLAYER_IA_BOTTLE_FAIRY
-    PLAYER_MODELGROUP_DEFAULT,       // PLAYER_IA_LETTER_ZELDA
+    PLAYER_MODELGROUP_DEFAULT,       // PLAYER_IA_ZELDAS_LETTER
     PLAYER_MODELGROUP_DEFAULT,       // PLAYER_IA_WEIRD_EGG
     PLAYER_MODELGROUP_DEFAULT,       // PLAYER_IA_CHICKEN
-    PLAYER_MODELGROUP_DEFAULT,       // PLAYER_IA_BEAN
+    PLAYER_MODELGROUP_DEFAULT,       // PLAYER_IA_MAGIC_BEAN
     PLAYER_MODELGROUP_DEFAULT,       // PLAYER_IA_POCKET_EGG
     PLAYER_MODELGROUP_DEFAULT,       // PLAYER_IA_POCKET_CUCCO
     PLAYER_MODELGROUP_DEFAULT,       // PLAYER_IA_COJIRO
     PLAYER_MODELGROUP_DEFAULT,       // PLAYER_IA_ODD_MUSHROOM
     PLAYER_MODELGROUP_DEFAULT,       // PLAYER_IA_ODD_POTION
-    PLAYER_MODELGROUP_DEFAULT,       // PLAYER_IA_SAW
-    PLAYER_MODELGROUP_DEFAULT,       // PLAYER_IA_SWORD_BROKEN
+    PLAYER_MODELGROUP_DEFAULT,       // PLAYER_IA_POACHERS_SAW
+    PLAYER_MODELGROUP_DEFAULT,       // PLAYER_IA_BROKEN_GORONS_SWORD
     PLAYER_MODELGROUP_DEFAULT,       // PLAYER_IA_PRESCRIPTION
     PLAYER_MODELGROUP_DEFAULT,       // PLAYER_IA_FROG
     PLAYER_MODELGROUP_DEFAULT,       // PLAYER_IA_EYEDROPS
@@ -87,12 +87,12 @@ u8 sActionModelGroups[PLAYER_IA_MAX] = {
     PLAYER_MODELGROUP_DEFAULT,       // PLAYER_IA_MASK_KEATON
     PLAYER_MODELGROUP_DEFAULT,       // PLAYER_IA_MASK_SKULL
     PLAYER_MODELGROUP_DEFAULT,       // PLAYER_IA_MASK_SPOOKY
-    PLAYER_MODELGROUP_DEFAULT,       // PLAYER_IA_MASK_BUNNY
+    PLAYER_MODELGROUP_DEFAULT,       // PLAYER_IA_MASK_BUNNY_HOOD
     PLAYER_MODELGROUP_DEFAULT,       // PLAYER_IA_MASK_GORON
     PLAYER_MODELGROUP_DEFAULT,       // PLAYER_IA_MASK_ZORA
     PLAYER_MODELGROUP_DEFAULT,       // PLAYER_IA_MASK_GERUDO
     PLAYER_MODELGROUP_DEFAULT,       // PLAYER_IA_MASK_TRUTH
-    PLAYER_MODELGROUP_DEFAULT,       // PLAYER_IA_LENS
+    PLAYER_MODELGROUP_DEFAULT,       // PLAYER_IA_LENS_OF_TRUTH
 };
 
 TextTriggerEntry sTextTriggers[] = {
@@ -590,7 +590,7 @@ void Player_SetEquipmentData(PlayState* play, Player* this) {
 void Player_UpdateBottleHeld(PlayState* play, Player* this, s32 item, s32 itemAction) {
     Inventory_UpdateBottleItem(play, item, this->heldItemButton);
 
-    if (item != ITEM_BOTTLE) {
+    if (item != ITEM_BOTTLE_EMPTY) {
         this->heldItemId = item;
         this->heldItemAction = itemAction;
     }
@@ -644,7 +644,7 @@ s32 Player_IsBurningStickInRange(PlayState* play, Vec3f* pos, f32 xzRange, f32 y
     Vec3f diff;
     s32 pad;
 
-    if ((this->heldItemAction == PLAYER_IA_STICK) && (this->unk_860 != 0)) {
+    if ((this->heldItemAction == PLAYER_IA_DEKU_STICK) && (this->unk_860 != 0)) {
         Math_Vec3f_Diff(&this->meleeWeaponInfo[0].tip, pos, &diff);
         return ((SQ(diff.x) + SQ(diff.z)) <= SQ(xzRange)) && (0.0f <= diff.y) && (diff.y <= yRange);
     } else {
@@ -1450,7 +1450,7 @@ void Player_PostLimbDrawGameplay(PlayState* play, s32 limbIndex, Gfx** dList, Ve
 
         Math_Vec3f_Copy(&this->leftHandPos, sCurBodyPartPos);
 
-        if (this->itemAction == PLAYER_IA_STICK) {
+        if (this->itemAction == PLAYER_IA_DEKU_STICK) {
             Vec3f sp124[3];
 
             OPEN_DISPS(play->state.gfxCtx, "../z_player_lib.c", 2633);
diff --git a/src/code/z_sram.c b/src/code/z_sram.c
index d11f2b4ca..57ea86058 100644
--- a/src/code/z_sram.c
+++ b/src/code/z_sram.c
@@ -138,8 +138,8 @@ static ItemEquips sNewSaveEquips = {
 static Inventory sNewSaveInventory = {
     // items
     {
-        ITEM_NONE, // SLOT_STICK
-        ITEM_NONE, // SLOT_NUT
+        ITEM_NONE, // SLOT_DEKU_STICK
+        ITEM_NONE, // SLOT_DEKU_NUT
         ITEM_NONE, // SLOT_BOMB
         ITEM_NONE, // SLOT_BOW
         ITEM_NONE, // SLOT_ARROW_FIRE
@@ -151,8 +151,8 @@ static Inventory sNewSaveInventory = {
         ITEM_NONE, // SLOT_ARROW_ICE
         ITEM_NONE, // SLOT_FARORES_WIND
         ITEM_NONE, // SLOT_BOOMERANG
-        ITEM_NONE, // SLOT_LENS
-        ITEM_NONE, // SLOT_BEAN
+        ITEM_NONE, // SLOT_LENS_OF_TRUTH
+        ITEM_NONE, // SLOT_MAGIC_BEAN
         ITEM_NONE, // SLOT_HAMMER
         ITEM_NONE, // SLOT_ARROW_LIGHT
         ITEM_NONE, // SLOT_NAYRUS_LOVE
@@ -165,8 +165,8 @@ static Inventory sNewSaveInventory = {
     },
     // ammo
     {
-        0, // SLOT_STICK
-        0, // SLOT_NUT
+        0, // SLOT_DEKU_STICK
+        0, // SLOT_DEKU_NUT
         0, // SLOT_BOMB
         0, // SLOT_BOW
         0, // SLOT_ARROW_FIRE
@@ -178,8 +178,8 @@ static Inventory sNewSaveInventory = {
         0, // SLOT_ARROW_ICE
         0, // SLOT_FARORES_WIND
         0, // SLOT_BOOMERANG
-        0, // SLOT_LENS
-        0, // SLOT_BEAN
+        0, // SLOT_LENS_OF_TRUTH
+        0, // SLOT_MAGIC_BEAN
         0, // SLOT_HAMMER
     },
     // equipment
@@ -268,35 +268,35 @@ static ItemEquips sDebugSaveEquips = {
 static Inventory sDebugSaveInventory = {
     // items
     {
-        ITEM_STICK,         // SLOT_STICK
-        ITEM_NUT,           // SLOT_NUT
-        ITEM_BOMB,          // SLOT_BOMB
-        ITEM_BOW,           // SLOT_BOW
-        ITEM_ARROW_FIRE,    // SLOT_ARROW_FIRE
-        ITEM_DINS_FIRE,     // SLOT_DINS_FIRE
-        ITEM_SLINGSHOT,     // SLOT_SLINGSHOT
-        ITEM_OCARINA_FAIRY, // SLOT_OCARINA
-        ITEM_BOMBCHU,       // SLOT_BOMBCHU
-        ITEM_HOOKSHOT,      // SLOT_HOOKSHOT
-        ITEM_ARROW_ICE,     // SLOT_ARROW_ICE
-        ITEM_FARORES_WIND,  // SLOT_FARORES_WIND
-        ITEM_BOOMERANG,     // SLOT_BOOMERANG
-        ITEM_LENS,          // SLOT_LENS
-        ITEM_BEAN,          // SLOT_BEAN
-        ITEM_HAMMER,        // SLOT_HAMMER
-        ITEM_ARROW_LIGHT,   // SLOT_ARROW_LIGHT
-        ITEM_NAYRUS_LOVE,   // SLOT_NAYRUS_LOVE
-        ITEM_BOTTLE,        // SLOT_BOTTLE_1
-        ITEM_POTION_RED,    // SLOT_BOTTLE_2
-        ITEM_POTION_GREEN,  // SLOT_BOTTLE_3
-        ITEM_POTION_BLUE,   // SLOT_BOTTLE_4
-        ITEM_POCKET_EGG,    // SLOT_TRADE_ADULT
-        ITEM_WEIRD_EGG,     // SLOT_TRADE_CHILD
+        ITEM_DEKU_STICK,          // SLOT_DEKU_STICK
+        ITEM_DEKU_NUT,            // SLOT_DEKU_NUT
+        ITEM_BOMB,                // SLOT_BOMB
+        ITEM_BOW,                 // SLOT_BOW
+        ITEM_ARROW_FIRE,          // SLOT_ARROW_FIRE
+        ITEM_DINS_FIRE,           // SLOT_DINS_FIRE
+        ITEM_SLINGSHOT,           // SLOT_SLINGSHOT
+        ITEM_OCARINA_FAIRY,       // SLOT_OCARINA
+        ITEM_BOMBCHU,             // SLOT_BOMBCHU
+        ITEM_HOOKSHOT,            // SLOT_HOOKSHOT
+        ITEM_ARROW_ICE,           // SLOT_ARROW_ICE
+        ITEM_FARORES_WIND,        // SLOT_FARORES_WIND
+        ITEM_BOOMERANG,           // SLOT_BOOMERANG
+        ITEM_LENS_OF_TRUTH,       // SLOT_LENS_OF_TRUTH
+        ITEM_MAGIC_BEAN,          // SLOT_MAGIC_BEAN
+        ITEM_HAMMER,              // SLOT_HAMMER
+        ITEM_ARROW_LIGHT,         // SLOT_ARROW_LIGHT
+        ITEM_NAYRUS_LOVE,         // SLOT_NAYRUS_LOVE
+        ITEM_BOTTLE_EMPTY,        // SLOT_BOTTLE_1
+        ITEM_BOTTLE_POTION_RED,   // SLOT_BOTTLE_2
+        ITEM_BOTTLE_POTION_GREEN, // SLOT_BOTTLE_3
+        ITEM_BOTTLE_POTION_BLUE,  // SLOT_BOTTLE_4
+        ITEM_POCKET_EGG,          // SLOT_TRADE_ADULT
+        ITEM_WEIRD_EGG,           // SLOT_TRADE_CHILD
     },
     // ammo
     {
-        50, // SLOT_STICK
-        50, // SLOT_NUT
+        50, // SLOT_DEKU_STICK
+        50, // SLOT_DEKU_NUT
         10, // SLOT_BOMB
         30, // SLOT_BOW
         1,  // SLOT_ARROW_FIRE
@@ -308,8 +308,8 @@ static Inventory sDebugSaveInventory = {
         1,  // SLOT_ARROW_ICE
         1,  // SLOT_FARORES_WIND
         1,  // SLOT_BOOMERANG
-        1,  // SLOT_LENS
-        1,  // SLOT_BEAN
+        1,  // SLOT_LENS_OF_TRUTH
+        1,  // SLOT_MAGIC_BEAN
         1   // SLOT_HAMMER
     },
     // equipment
@@ -534,10 +534,10 @@ void Sram_OpenSave(SramContext* sramCtx) {
         i = gSaveContext.eventChkInf[EVENTCHKINF_40_INDEX] & ~EVENTCHKINF_40_MASK;
         gSaveContext.eventChkInf[EVENTCHKINF_40_INDEX] = i;
 
-        INV_CONTENT(ITEM_LETTER_ZELDA) = ITEM_CHICKEN;
+        INV_CONTENT(ITEM_ZELDAS_LETTER) = ITEM_CHICKEN;
 
         for (j = 1; j < 4; j++) {
-            if (gSaveContext.equips.buttonItems[j] == ITEM_LETTER_ZELDA) {
+            if (gSaveContext.equips.buttonItems[j] == ITEM_ZELDAS_LETTER) {
                 gSaveContext.equips.buttonItems[j] = ITEM_CHICKEN;
             }
         }