`item_name_static` documented and `ItemId` updates (#1304)

* WIP

* map static

* finish english names

* jpn

* revert map name

* name prefix

* boss to big

* more comments

* item enums

* more items

* more

* PR Suggestions

* PR Suggestion

9 files changed, 514 insertions, 297 deletions

diff --git a/src/code/code_8012EC80.c b/src/code/code_8012EC80.c
index 37039a05d..dc334c93e 100644
--- a/src/code/code_8012EC80.c
+++ b/src/code/code_8012EC80.c
@@ -98,7 +98,7 @@ u32 gGsFlagsShift[] = {
 };
 
 TexturePtr gItemIcons[] = {
-    gItemIconOcarinaOfTimeTex,       // ITEM_OCARINA
+    gItemIconOcarinaOfTimeTex,       // ITEM_OCARINA_OF_TIME
     gItemIconBowTex,                 // ITEM_BOW
     gItemIconFireArrowTex,           // ITEM_ARROW_FIRE
     gItemIconIceArrowTex,            // ITEM_ARROW_ICE
@@ -106,13 +106,13 @@ TexturePtr gItemIcons[] = {
     gItemIconFairyOcarinaTex,        // ITEM_OCARINA_FAIRY
     gItemIconBombTex,                // ITEM_BOMB
     gItemIconBombchuTex,             // ITEM_BOMBCHU
-    gItemIconDekuStickTex,           // ITEM_STICK
-    gItemIconDekuNutTex,             // ITEM_NUT
+    gItemIconDekuStickTex,           // ITEM_DEKU_STICK
+    gItemIconDekuNutTex,             // ITEM_DEKU_NUT
     gItemIconMagicBeansTex,          // ITEM_MAGIC_BEANS
     gItemIconSlingshotTex,           // ITEM_SLINGSHOT
     gItemIconPowderKegTex,           // ITEM_POWDER_KEG
-    gItemIconPictoBoxTex,            // ITEM_PICTO_BOX
-    gItemIconLensofTruthTex,         // ITEM_LENS
+    gItemIconPictographBoxTex,       // ITEM_PICTOGRAPH_BOX
+    gItemIconLensofTruthTex,         // ITEM_LENS_OF_TRUTH
     gItemIconHookshotTex,            // ITEM_HOOKSHOT
     gItemIconGreatFairysSwordTex,    // ITEM_SWORD_GREAT_FAIRY
     gItemIconLongshotTex,            // ITEM_LONGSHOT
@@ -172,9 +172,9 @@ TexturePtr gItemIcons[] = {
     gItemIconBlastMaskTex,           // ITEM_MASK_BLAST
     gItemIconMaskOfScentsTex,        // ITEM_MASK_SCENTS
     gItemIconGiantsMaskTex,          // ITEM_MASK_GIANT
-    gItemIconBowFireTex,             // ITEM_BOW_ARROW_FIRE
-    gItemIconBowIceTex,              // ITEM_BOW_ARROW_ICE
-    gItemIconBowLightTex,            // ITEM_BOW_ARROW_LIGHT
+    gItemIconBowFireTex,             // ITEM_BOW_FIRE
+    gItemIconBowIceTex,              // ITEM_BOW_ICE
+    gItemIconBowLightTex,            // ITEM_BOW_LIGHT
     gItemIconKokiriSwordTex,         // ITEM_SWORD_KOKIRI
     gItemIconRazorSwordTex,          // ITEM_SWORD_RAZOR
     gItemIconGildedSwordTex,         // ITEM_SWORD_GILDED
@@ -219,8 +219,8 @@ TexturePtr gItemIcons[] = {
     gQuestIconCompassTex,            // ITEM_DUNGEON_MAP
     gQuestIconGoldSkulltula2Tex,     // ITEM_STRAY_FAIRIES
     gQuestIconSmallKeyTex,           // ITEM_KEY_SMALL
-    gQuestIconSmallMagicJarTex,      // ITEM_MAGIC_SMALL
-    gQuestIconBigMagicJarTex,        // ITEM_MAGIC_LARGE
+    gQuestIconSmallMagicJarTex,      // ITEM_MAGIC_JAR_SMALL
+    gQuestIconBigMagicJarTex,        // ITEM_MAGIC_JAR_BIG
     gItemIconHeartPiece1Tex,         // ITEM_HEART_PIECE_2
     gItemIconHeartPiece2Tex,         // ITEM_INVALID_1
     gItemIconHeartPiece3Tex,         // ITEM_INVALID_2
@@ -233,7 +233,7 @@ TexturePtr gItemIcons[] = {
 
 // Used to map item IDs to inventory slots
 u8 gItemSlots[] = {
-    SLOT_OCARINA,            // ITEM_OCARINA
+    SLOT_OCARINA,            // ITEM_OCARINA_OF_TIME
     SLOT_BOW,                // ITEM_BOW
     SLOT_ARROW_FIRE,         // ITEM_ARROW_FIRE
     SLOT_ARROW_ICE,          // ITEM_ARROW_ICE
@@ -241,13 +241,13 @@ u8 gItemSlots[] = {
     SLOT_TRADE_DEED,         // ITEM_OCARINA_FAIRY
     SLOT_BOMB,               // ITEM_BOMB
     SLOT_BOMBCHU,            // ITEM_BOMBCHU
-    SLOT_STICK,              // ITEM_STICK
-    SLOT_NUT,                // ITEM_NUT
+    SLOT_DEKU_STICK,         // ITEM_DEKU_STICK
+    SLOT_DEKU_NUT,           // ITEM_DEKU_NUT
     SLOT_MAGIC_BEANS,        // ITEM_MAGIC_BEANS
     SLOT_TRADE_KEY_MAMA,     // ITEM_SLINGSHOT
     SLOT_POWDER_KEG,         // ITEM_POWDER_KEG
-    SLOT_PICTO_BOX,          // ITEM_PICTO_BOX
-    SLOT_LENS,               // ITEM_LENS
+    SLOT_PICTOGRAPH_BOX,     // ITEM_PICTOGRAPH_BOX
+    SLOT_LENS_OF_TRUTH,      // ITEM_LENS_OF_TRUTH
     SLOT_HOOKSHOT,           // ITEM_HOOKSHOT
     SLOT_SWORD_GREAT_FAIRY,  // ITEM_SWORD_GREAT_FAIRY
     SLOT_BOTTLE_1,           // ITEM_LONGSHOT
@@ -307,13 +307,13 @@ u8 gItemSlots[] = {
     SLOT_MASK_BLAST,         // ITEM_MASK_BLAST
     SLOT_MASK_SCENTS,        // ITEM_MASK_SCENTS
     SLOT_MASK_GIANT,         // ITEM_MASK_GIANT
-    SLOT_BOW,                // ITEM_BOW_ARROW_FIRE
-    SLOT_BOW,                // ITEM_BOW_ARROW_ICE
-    SLOT_BOW,                // ITEM_BOW_ARROW_LIGHT
+    SLOT_BOW,                // ITEM_BOW_FIRE
+    SLOT_BOW,                // ITEM_BOW_ICE
+    SLOT_BOW,                // ITEM_BOW_LIGHT
 };
 
 s16 gItemPrices[] = {
-    0,   // ITEM_OCARINA
+    0,   // ITEM_OCARINA_OF_TIME
     0,   // ITEM_BOW
     0,   // ITEM_ARROW_FIRE
     0,   // ITEM_ARROW_ICE
@@ -321,13 +321,13 @@ s16 gItemPrices[] = {
     0,   // ITEM_OCARINA_FAIRY
     0,   // ITEM_BOMB
     0,   // ITEM_BOMBCHU
-    0,   // ITEM_STICK
-    0,   // ITEM_NUT
+    0,   // ITEM_DEKU_STICK
+    0,   // ITEM_DEKU_NUT
     0,   // ITEM_MAGIC_BEANS
     0,   // ITEM_SLINGSHOT
     0,   // ITEM_POWDER_KEG
-    0,   // ITEM_PICTO_BOX
-    0,   // ITEM_LENS
+    0,   // ITEM_PICTOGRAPH_BOX
+    0,   // ITEM_LENS_OF_TRUTH
     0,   // ITEM_HOOKSHOT
     0,   // ITEM_SWORD_GREAT_FAIRY
     0,   // ITEM_LONGSHOT
diff --git a/src/code/z_draw.c b/src/code/z_draw.c
index 43b9c35b5..2a56e0ba5 100644
--- a/src/code/z_draw.c
+++ b/src/code/z_draw.c
@@ -154,7 +154,7 @@ static DrawItemTableEntry sDrawItemTable[] = {
     { GetItem_DrawOpa01, { gGiBremenMaskDL, gGiBremenMaskEmptyDL } },
     // GID_MASK_ALL_NIGHT, OBJECT_GI_MASK06
     { GetItem_DrawOpa0Xlu1, { gGiAllNightMaskEyesDL, gGiAllNightMaskFaceDL } },
-    // GID_NUTS, OBJECT_GI_NUTS
+    // GID_DEKU_NUTS, OBJECT_GI_NUTS
     { GetItem_DrawDekuNuts, { gGiNutDL } },
     // GID_HEART_CONTAINER, OBJECT_GI_HEARTS
     { GetItem_DrawXlu01, { gGiHeartBorderDL, gGiHeartContainerDL } },
@@ -172,13 +172,13 @@ static DrawItemTableEntry sDrawItemTable[] = {
     { GetItem_DrawUpgrades, { gGiBombBagDL, gGiBombBag30BagColorDL, gGiBombBag30RingColorDL, gGiBombBagRingDL } },
     // GID_BOMB_BAG_40, OBJECT_GI_BOMBPOUCH
     { GetItem_DrawUpgrades, { gGiBombBagDL, gGiBombBag40BagColorDL, gGiBombBag40RingColorDL, gGiBombBagRingDL } },
-    // GID_STICK, OBJECT_GI_STICK
+    // GID_DEKU_STICK, OBJECT_GI_STICK
     { GetItem_DrawOpa0, { gGiStickDL } },
     // GID_DUNGEON_MAP, OBJECT_GI_MAP
     { GetItem_DrawOpa0, { gGiDungeonMapDL } },
-    // GID_MAGIC_SMALL, OBJECT_GI_MAGICPOT
+    // GID_MAGIC_JAR_SMALL, OBJECT_GI_MAGICPOT
     { GetItem_DrawOpa0, { gGiMagicJarSmallDL } },
-    // GID_MAGIC_LARGE, OBJECT_GI_MAGICPOT
+    // GID_MAGIC_JAR_BIG, OBJECT_GI_MAGICPOT
     { GetItem_DrawOpa0, { gGiMagicJarLargeDL } },
     // GID_BOMB, OBJECT_GI_BOMB_1
     { GetItem_DrawOpa0, { gGiBombDL } },
@@ -367,7 +367,7 @@ static DrawItemTableEntry sDrawItemTable[] = {
     { GetItem_DrawOpa01, { gGiGiantMaskEmptyDL, gGiGiantMaskDL } },
     // GID_CHATEAU, OBJECT_GI_BOTTLE_21
     { GetItem_DrawOpa0Xlu1, { gGiChateauRomaniBottleEmptyDL, gGiChateauRomaniBottleDL } },
-    // GID_PICTO_BOX, OBJECT_GI_CAMERA
+    // GID_PICTOGRAPH_BOX, OBJECT_GI_CAMERA
     { GetItem_DrawOpa0Xlu1, { gGiPictoBoxFrameDL, gGiPictoBoxBodyAndLensDL } },
     // GID_MASK_FIERCE_DEITY, OBJECT_GI_MASK03
     { GetItem_DrawOpa01, { gGiFierceDeityMaskFaceDL, gGiFierceDeityMaskHairAndHatDL } },
diff --git a/src/code/z_elf_message.c b/src/code/z_elf_message.c
index 75112a6b5..a7e97c3bd 100644
--- a/src/code/z_elf_message.c
+++ b/src/code/z_elf_message.c
@@ -13,7 +13,7 @@
  * Gets the relevant text ID for Tatl hints in first cycle.
  */
 u16 QuestHint_GetTatlTextId(PlayState* play) {
-    if (INV_CONTENT(ITEM_OCARINA) == ITEM_OCARINA) {
+    if (INV_CONTENT(ITEM_OCARINA_OF_TIME) == ITEM_OCARINA_OF_TIME) {
         return 0;
     }
 
diff --git a/src/code/z_en_item00.c b/src/code/z_en_item00.c
index 6d26060d7..a13499f46 100644
--- a/src/code/z_en_item00.c
+++ b/src/code/z_en_item00.c
@@ -146,17 +146,17 @@ void EnItem00_Init(Actor* thisx, PlayState* play) {
 
         case ITEM00_BOMBS_A:
         case ITEM00_BOMBS_B:
-        case ITEM00_NUTS_1:
-        case ITEM00_STICK:
-        case ITEM00_MAGIC_SMALL:
-        case ITEM00_NUTS_10:
+        case ITEM00_DEKU_NUTS_1:
+        case ITEM00_DEKU_STICK:
+        case ITEM00_MAGIC_JAR_SMALL:
+        case ITEM00_DEKU_NUTS_10:
         case ITEM00_BOMBS_0:
             Actor_SetScale(thisx, 0.03f);
             this->unk154 = 0.03f;
             shadowOffset = 320.0f;
             break;
 
-        case ITEM00_MAGIC_LARGE:
+        case ITEM00_MAGIC_JAR_BIG:
             Actor_SetScale(thisx, 4.5f * 0.01f);
             this->unk154 = 4.5f * 0.01f;
             shadowOffset = 320.0f;
@@ -276,24 +276,24 @@ void EnItem00_Init(Actor* thisx, PlayState* play) {
             Item_Give(play, ITEM_ARROWS_50);
             break;
 
-        case ITEM00_MAGIC_LARGE:
-            Item_Give(play, ITEM_MAGIC_LARGE);
+        case ITEM00_MAGIC_JAR_BIG:
+            Item_Give(play, ITEM_MAGIC_JAR_BIG);
             break;
 
-        case ITEM00_MAGIC_SMALL:
-            Item_Give(play, ITEM_MAGIC_SMALL);
+        case ITEM00_MAGIC_JAR_SMALL:
+            Item_Give(play, ITEM_MAGIC_JAR_SMALL);
             break;
 
         case ITEM00_SMALL_KEY:
             Item_Give(play, ITEM_KEY_SMALL);
             break;
 
-        case ITEM00_NUTS_1:
-            getItemId = GI_NUTS_1;
+        case ITEM00_DEKU_NUTS_1:
+            getItemId = GI_DEKU_NUTS_1;
             break;
 
-        case ITEM00_NUTS_10:
-            getItemId = GI_NUTS_10;
+        case ITEM00_DEKU_NUTS_10:
+            getItemId = GI_DEKU_NUTS_10;
             break;
 
         default:
@@ -328,7 +328,7 @@ void func_800A640C(EnItem00* this, PlayState* play) {
         ((this->actor.params == ITEM00_RECOVERY_HEART) && (this->unk152 < 0)) ||
         (this->actor.params == ITEM00_HEART_PIECE) || (this->actor.params == ITEM00_HEART_CONTAINER)) {
         this->actor.shape.rot.y = this->actor.shape.rot.y + 960;
-    } else if ((this->actor.params >= ITEM00_SHIELD_HERO) && (this->actor.params != ITEM00_NUTS_10) &&
+    } else if ((this->actor.params >= ITEM00_SHIELD_HERO) && (this->actor.params != ITEM00_DEKU_NUTS_10) &&
                (this->actor.params < ITEM00_BOMBS_0)) {
         if (this->unk152 == -1) {
             if (!Math_SmoothStepToS(&this->actor.shape.rot.x, this->actor.world.rot.x - 0x4000, 2, 3000, 1500)) {
@@ -423,7 +423,7 @@ void func_800A6780(EnItem00* this, PlayState* play) {
 
     if (this->actor.params <= ITEM00_RUPEE_RED) {
         this->actor.shape.rot.y += 0x3C0;
-    } else if ((this->actor.params >= ITEM00_SHIELD_HERO) && (this->actor.params != ITEM00_NUTS_10) &&
+    } else if ((this->actor.params >= ITEM00_SHIELD_HERO) && (this->actor.params != ITEM00_DEKU_NUTS_10) &&
                (this->actor.params != ITEM00_BOMBS_0)) {
         this->actor.world.rot.x -= 0x2BC;
         this->actor.shape.rot.y += 0x190;
@@ -570,16 +570,16 @@ void EnItem00_Update(Actor* thisx, PlayState* play) {
             Item_Give(play, ITEM_RUPEE_HUGE);
             break;
 
-        case ITEM00_STICK:
-            getItemId = GI_STICKS_1;
+        case ITEM00_DEKU_STICK:
+            getItemId = GI_DEKU_STICKS_1;
             break;
 
-        case ITEM00_NUTS_1:
-            getItemId = GI_NUTS_1;
+        case ITEM00_DEKU_NUTS_1:
+            getItemId = GI_DEKU_NUTS_1;
             break;
 
-        case ITEM00_NUTS_10:
-            getItemId = GI_NUTS_10;
+        case ITEM00_DEKU_NUTS_10:
+            getItemId = GI_DEKU_NUTS_10;
             break;
 
         case ITEM00_RECOVERY_HEART:
@@ -624,12 +624,12 @@ void EnItem00_Update(Actor* thisx, PlayState* play) {
             getItemId = GI_HEART_CONTAINER;
             break;
 
-        case ITEM00_MAGIC_LARGE:
-            Item_Give(play, ITEM_MAGIC_LARGE);
+        case ITEM00_MAGIC_JAR_BIG:
+            Item_Give(play, ITEM_MAGIC_JAR_BIG);
             break;
 
-        case ITEM00_MAGIC_SMALL:
-            Item_Give(play, ITEM_MAGIC_SMALL);
+        case ITEM00_MAGIC_JAR_SMALL:
+            Item_Give(play, ITEM_MAGIC_JAR_SMALL);
             break;
 
         case ITEM00_SHIELD_HERO:
@@ -743,12 +743,12 @@ void EnItem00_Draw(Actor* thisx, PlayState* play) {
             case ITEM00_ARROWS_40:
             case ITEM00_ARROWS_50:
             case ITEM00_BOMBS_B:
-            case ITEM00_NUTS_1:
-            case ITEM00_STICK:
-            case ITEM00_MAGIC_LARGE:
-            case ITEM00_MAGIC_SMALL:
+            case ITEM00_DEKU_NUTS_1:
+            case ITEM00_DEKU_STICK:
+            case ITEM00_MAGIC_JAR_BIG:
+            case ITEM00_MAGIC_JAR_SMALL:
             case ITEM00_SMALL_KEY:
-            case ITEM00_NUTS_10:
+            case ITEM00_DEKU_NUTS_10:
             case ITEM00_BOMBS_0:
                 EnItem00_DrawSprite(this, play);
                 break;
@@ -825,7 +825,7 @@ void EnItem00_DrawSprite(EnItem00* this, PlayState* play) {
 
     POLY_OPA_DISP = Play_SetFog(play, POLY_OPA_DISP);
 
-    if (this->actor.params == ITEM00_NUTS_10) {
+    if (this->actor.params == ITEM00_DEKU_NUTS_10) {
         texIndex = 6;
     } else if (this->actor.params == ITEM00_BOMBS_0) {
         texIndex = 1;
@@ -886,7 +886,7 @@ s16 func_800A7650(s16 dropId) {
         (((dropId == ITEM00_ARROWS_10) || (dropId == ITEM00_ARROWS_30) || (dropId == ITEM00_ARROWS_40) ||
           (dropId == ITEM00_ARROWS_50)) &&
          (INV_CONTENT(ITEM_BOW) == ITEM_NONE)) ||
-        (((dropId == ITEM00_MAGIC_LARGE) || (dropId == ITEM00_MAGIC_SMALL)) &&
+        (((dropId == ITEM00_MAGIC_JAR_BIG) || (dropId == ITEM00_MAGIC_JAR_SMALL)) &&
          (gSaveContext.save.saveInfo.playerData.magicLevel == 0))) {
         return ITEM00_NO_DROP;
     }
@@ -1024,61 +1024,278 @@ Actor* Item_DropCollectible2(PlayState* play, Vec3f* spawnPos, s32 params) {
 }
 
 u8 sDropTable[DROP_TABLE_SIZE * DROP_TABLE_NUMBER] = {
-    ITEM00_RUPEE_GREEN,    ITEM00_RUPEE_GREEN,    ITEM00_RUPEE_BLUE,     ITEM00_NO_DROP,        ITEM00_NO_DROP,
-    ITEM00_MASK,           ITEM00_MASK,           ITEM00_NO_DROP,        ITEM00_NO_DROP,        ITEM00_BOMBS_A,
-    ITEM00_MAGIC_SMALL,    ITEM00_NO_DROP,        ITEM00_NO_DROP,        ITEM00_NO_DROP,        ITEM00_RECOVERY_HEART,
-    ITEM00_FLEXIBLE,       ITEM00_RUPEE_GREEN,    ITEM00_NO_DROP,        ITEM00_NO_DROP,        ITEM00_NO_DROP,
-    ITEM00_NO_DROP,        ITEM00_MASK,           ITEM00_MASK,           ITEM00_NO_DROP,        ITEM00_NO_DROP,
-    ITEM00_NO_DROP,        ITEM00_MAGIC_SMALL,    ITEM00_NO_DROP,        ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART,
-    ITEM00_RECOVERY_HEART, ITEM00_FLEXIBLE,       ITEM00_RUPEE_GREEN,    ITEM00_RUPEE_GREEN,    ITEM00_NO_DROP,
-    ITEM00_NO_DROP,        ITEM00_NO_DROP,        ITEM00_MASK,           ITEM00_MASK,           ITEM00_NO_DROP,
-    ITEM00_NO_DROP,        ITEM00_BOMBS_A,        ITEM00_MAGIC_SMALL,    ITEM00_MAGIC_LARGE,    ITEM00_MAGIC_LARGE,
-    ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_FLEXIBLE,       ITEM00_RUPEE_GREEN,    ITEM00_NO_DROP,
-    ITEM00_RUPEE_BLUE,     ITEM00_RUPEE_RED,      ITEM00_NO_DROP,        ITEM00_MASK,           ITEM00_MASK,
-    ITEM00_NO_DROP,        ITEM00_NO_DROP,        ITEM00_BOMBS_A,        ITEM00_MAGIC_SMALL,    ITEM00_NO_DROP,
-    ITEM00_NO_DROP,        ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_FLEXIBLE,       ITEM00_MASK,
-    ITEM00_MASK,           ITEM00_MASK,           ITEM00_MASK,           ITEM00_NO_DROP,        ITEM00_NO_DROP,
-    ITEM00_NO_DROP,        ITEM00_NO_DROP,        ITEM00_NO_DROP,        ITEM00_NO_DROP,        ITEM00_NO_DROP,
-    ITEM00_NO_DROP,        ITEM00_NO_DROP,        ITEM00_NO_DROP,        ITEM00_NO_DROP,        ITEM00_NO_DROP,
-    ITEM00_NO_DROP,        ITEM00_NO_DROP,        ITEM00_NO_DROP,        ITEM00_NO_DROP,        ITEM00_NO_DROP,
-    ITEM00_NO_DROP,        ITEM00_NO_DROP,        ITEM00_NO_DROP,        ITEM00_NO_DROP,        ITEM00_NO_DROP,
-    ITEM00_NO_DROP,        ITEM00_NO_DROP,        ITEM00_NO_DROP,        ITEM00_NO_DROP,        ITEM00_NO_DROP,
-    ITEM00_NO_DROP,        ITEM00_NO_DROP,        ITEM00_NO_DROP,        ITEM00_NO_DROP,        ITEM00_NO_DROP,
-    ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART,
-    ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART,
-    ITEM00_RECOVERY_HEART, ITEM00_FLEXIBLE,       ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART,
-    ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART,
-    ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART,
-    ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_RUPEE_GREEN,    ITEM00_RUPEE_GREEN,
-    ITEM00_RUPEE_GREEN,    ITEM00_RUPEE_BLUE,     ITEM00_RUPEE_BLUE,     ITEM00_NO_DROP,        ITEM00_NO_DROP,
-    ITEM00_NO_DROP,        ITEM00_NO_DROP,        ITEM00_NO_DROP,        ITEM00_NO_DROP,        ITEM00_NO_DROP,
-    ITEM00_NO_DROP,        ITEM00_NO_DROP,        ITEM00_NO_DROP,        ITEM00_NO_DROP,        ITEM00_RUPEE_BLUE,
-    ITEM00_RUPEE_BLUE,     ITEM00_RUPEE_BLUE,     ITEM00_RUPEE_BLUE,     ITEM00_RUPEE_BLUE,     ITEM00_RUPEE_BLUE,
-    ITEM00_RUPEE_BLUE,     ITEM00_RUPEE_BLUE,     ITEM00_RUPEE_BLUE,     ITEM00_RUPEE_RED,      ITEM00_RUPEE_RED,
-    ITEM00_RUPEE_RED,      ITEM00_RUPEE_RED,      ITEM00_RUPEE_RED,      ITEM00_RUPEE_RED,      ITEM00_RUPEE_RED,
-    ITEM00_ARROWS_10,      ITEM00_ARROWS_10,      ITEM00_ARROWS_10,      ITEM00_ARROWS_10,      ITEM00_ARROWS_10,
-    ITEM00_ARROWS_10,      ITEM00_ARROWS_10,      ITEM00_ARROWS_10,      ITEM00_ARROWS_10,      ITEM00_ARROWS_10,
-    ITEM00_ARROWS_30,      ITEM00_ARROWS_30,      ITEM00_MAGIC_SMALL,    ITEM00_MAGIC_SMALL,    ITEM00_MAGIC_LARGE,
-    ITEM00_MAGIC_LARGE,    ITEM00_NO_DROP,        ITEM00_NO_DROP,        ITEM00_NO_DROP,        ITEM00_NO_DROP,
-    ITEM00_NO_DROP,        ITEM00_NO_DROP,        ITEM00_NO_DROP,        ITEM00_BOMBS_A,        ITEM00_BOMBS_A,
-    ITEM00_BOMBS_A,        ITEM00_BOMBS_A,        ITEM00_BOMBS_A,        ITEM00_BOMBS_A,        ITEM00_BOMBS_A,
-    ITEM00_BOMBS_A,        ITEM00_BOMBS_A,        ITEM00_NO_DROP,        ITEM00_NO_DROP,        ITEM00_NO_DROP,
-    ITEM00_NO_DROP,        ITEM00_NO_DROP,        ITEM00_NO_DROP,        ITEM00_NO_DROP,        ITEM00_NO_DROP,
-    ITEM00_MAGIC_SMALL,    ITEM00_MAGIC_SMALL,    ITEM00_MAGIC_SMALL,    ITEM00_MAGIC_SMALL,    ITEM00_MAGIC_SMALL,
-    ITEM00_MAGIC_SMALL,    ITEM00_MAGIC_LARGE,    ITEM00_MAGIC_LARGE,    ITEM00_MAGIC_SMALL,    ITEM00_MAGIC_SMALL,
-    ITEM00_MAGIC_SMALL,    ITEM00_MAGIC_SMALL,    ITEM00_MAGIC_SMALL,    ITEM00_MAGIC_SMALL,    ITEM00_MAGIC_SMALL,
-    ITEM00_MAGIC_SMALL,    ITEM00_MAGIC_SMALL,    ITEM00_MAGIC_SMALL,    ITEM00_MAGIC_LARGE,    ITEM00_MAGIC_LARGE,
-    ITEM00_MAGIC_LARGE,    ITEM00_MAGIC_LARGE,    ITEM00_MAGIC_LARGE,    ITEM00_MAGIC_LARGE,    ITEM00_NO_DROP,
-    ITEM00_NO_DROP,        ITEM00_NO_DROP,        ITEM00_NO_DROP,        ITEM00_NUTS_1,         ITEM00_NUTS_1,
-    ITEM00_NO_DROP,        ITEM00_ARROWS_10,      ITEM00_ARROWS_10,      ITEM00_ARROWS_10,      ITEM00_STICK,
-    ITEM00_STICK,          ITEM00_NO_DROP,        ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_FLEXIBLE,
-    ITEM00_RUPEE_GREEN,    ITEM00_RUPEE_BLUE,     ITEM00_RUPEE_BLUE,     ITEM00_RUPEE_RED,      ITEM00_NO_DROP,
-    ITEM00_ARROWS_10,      ITEM00_ARROWS_10,      ITEM00_ARROWS_30,      ITEM00_BOMBS_A,        ITEM00_NO_DROP,
-    ITEM00_STICK,          ITEM00_MAGIC_SMALL,    ITEM00_MAGIC_LARGE,    ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART,
-    ITEM00_FLEXIBLE,       ITEM00_RUPEE_GREEN,    ITEM00_RECOVERY_HEART, ITEM00_RECOVERY_HEART, ITEM00_MAGIC_SMALL,
-    ITEM00_MASK,           ITEM00_NO_DROP,        ITEM00_NO_DROP,        ITEM00_NO_DROP,        ITEM00_NO_DROP,
-    ITEM00_NO_DROP,        ITEM00_NO_DROP,        ITEM00_NO_DROP,        ITEM00_NO_DROP,        ITEM00_NO_DROP,
-    ITEM00_NO_DROP,        ITEM00_NO_DROP,
+    ITEM00_RUPEE_GREEN,
+    ITEM00_RUPEE_GREEN,
+    ITEM00_RUPEE_BLUE,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_MASK,
+    ITEM00_MASK,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_BOMBS_A,
+    ITEM00_MAGIC_JAR_SMALL,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_RECOVERY_HEART,
+    ITEM00_FLEXIBLE,
+    ITEM00_RUPEE_GREEN,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_MASK,
+    ITEM00_MASK,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_MAGIC_JAR_SMALL,
+    ITEM00_NO_DROP,
+    ITEM00_RECOVERY_HEART,
+    ITEM00_RECOVERY_HEART,
+    ITEM00_RECOVERY_HEART,
+    ITEM00_FLEXIBLE,
+    ITEM00_RUPEE_GREEN,
+    ITEM00_RUPEE_GREEN,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_MASK,
+    ITEM00_MASK,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_BOMBS_A,
+    ITEM00_MAGIC_JAR_SMALL,
+    ITEM00_MAGIC_JAR_BIG,
+    ITEM00_MAGIC_JAR_BIG,
+    ITEM00_RECOVERY_HEART,
+    ITEM00_RECOVERY_HEART,
+    ITEM00_FLEXIBLE,
+    ITEM00_RUPEE_GREEN,
+    ITEM00_NO_DROP,
+    ITEM00_RUPEE_BLUE,
+    ITEM00_RUPEE_RED,
+    ITEM00_NO_DROP,
+    ITEM00_MASK,
+    ITEM00_MASK,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_BOMBS_A,
+    ITEM00_MAGIC_JAR_SMALL,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_RECOVERY_HEART,
+    ITEM00_RECOVERY_HEART,
+    ITEM00_FLEXIBLE,
+    ITEM00_MASK,
+    ITEM00_MASK,
+    ITEM00_MASK,
+    ITEM00_MASK,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_RECOVERY_HEART,
+    ITEM00_RECOVERY_HEART,
+    ITEM00_RECOVERY_HEART,
+    ITEM00_RECOVERY_HEART,
+    ITEM00_RECOVERY_HEART,
+    ITEM00_RECOVERY_HEART,
+    ITEM00_RECOVERY_HEART,
+    ITEM00_RECOVERY_HEART,
+    ITEM00_RECOVERY_HEART,
+    ITEM00_RECOVERY_HEART,
+    ITEM00_RECOVERY_HEART,
+    ITEM00_FLEXIBLE,
+    ITEM00_RECOVERY_HEART,
+    ITEM00_RECOVERY_HEART,
+    ITEM00_RECOVERY_HEART,
+    ITEM00_RECOVERY_HEART,
+    ITEM00_RECOVERY_HEART,
+    ITEM00_RECOVERY_HEART,
+    ITEM00_RECOVERY_HEART,
+    ITEM00_RECOVERY_HEART,
+    ITEM00_RECOVERY_HEART,
+    ITEM00_RECOVERY_HEART,
+    ITEM00_RECOVERY_HEART,
+    ITEM00_RECOVERY_HEART,
+    ITEM00_RECOVERY_HEART,
+    ITEM00_RECOVERY_HEART,
+    ITEM00_RECOVERY_HEART,
+    ITEM00_RECOVERY_HEART,
+    ITEM00_RUPEE_GREEN,
+    ITEM00_RUPEE_GREEN,
+    ITEM00_RUPEE_GREEN,
+    ITEM00_RUPEE_BLUE,
+    ITEM00_RUPEE_BLUE,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_RUPEE_BLUE,
+    ITEM00_RUPEE_BLUE,
+    ITEM00_RUPEE_BLUE,
+    ITEM00_RUPEE_BLUE,
+    ITEM00_RUPEE_BLUE,
+    ITEM00_RUPEE_BLUE,
+    ITEM00_RUPEE_BLUE,
+    ITEM00_RUPEE_BLUE,
+    ITEM00_RUPEE_BLUE,
+    ITEM00_RUPEE_RED,
+    ITEM00_RUPEE_RED,
+    ITEM00_RUPEE_RED,
+    ITEM00_RUPEE_RED,
+    ITEM00_RUPEE_RED,
+    ITEM00_RUPEE_RED,
+    ITEM00_RUPEE_RED,
+    ITEM00_ARROWS_10,
+    ITEM00_ARROWS_10,
+    ITEM00_ARROWS_10,
+    ITEM00_ARROWS_10,
+    ITEM00_ARROWS_10,
+    ITEM00_ARROWS_10,
+    ITEM00_ARROWS_10,
+    ITEM00_ARROWS_10,
+    ITEM00_ARROWS_10,
+    ITEM00_ARROWS_10,
+    ITEM00_ARROWS_30,
+    ITEM00_ARROWS_30,
+    ITEM00_MAGIC_JAR_SMALL,
+    ITEM00_MAGIC_JAR_SMALL,
+    ITEM00_MAGIC_JAR_BIG,
+    ITEM00_MAGIC_JAR_BIG,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_BOMBS_A,
+    ITEM00_BOMBS_A,
+    ITEM00_BOMBS_A,
+    ITEM00_BOMBS_A,
+    ITEM00_BOMBS_A,
+    ITEM00_BOMBS_A,
+    ITEM00_BOMBS_A,
+    ITEM00_BOMBS_A,
+    ITEM00_BOMBS_A,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_MAGIC_JAR_SMALL,
+    ITEM00_MAGIC_JAR_SMALL,
+    ITEM00_MAGIC_JAR_SMALL,
+    ITEM00_MAGIC_JAR_SMALL,
+    ITEM00_MAGIC_JAR_SMALL,
+    ITEM00_MAGIC_JAR_SMALL,
+    ITEM00_MAGIC_JAR_BIG,
+    ITEM00_MAGIC_JAR_BIG,
+    ITEM00_MAGIC_JAR_SMALL,
+    ITEM00_MAGIC_JAR_SMALL,
+    ITEM00_MAGIC_JAR_SMALL,
+    ITEM00_MAGIC_JAR_SMALL,
+    ITEM00_MAGIC_JAR_SMALL,
+    ITEM00_MAGIC_JAR_SMALL,
+    ITEM00_MAGIC_JAR_SMALL,
+    ITEM00_MAGIC_JAR_SMALL,
+    ITEM00_MAGIC_JAR_SMALL,
+    ITEM00_MAGIC_JAR_SMALL,
+    ITEM00_MAGIC_JAR_BIG,
+    ITEM00_MAGIC_JAR_BIG,
+    ITEM00_MAGIC_JAR_BIG,
+    ITEM00_MAGIC_JAR_BIG,
+    ITEM00_MAGIC_JAR_BIG,
+    ITEM00_MAGIC_JAR_BIG,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_DEKU_NUTS_1,
+    ITEM00_DEKU_NUTS_1,
+    ITEM00_NO_DROP,
+    ITEM00_ARROWS_10,
+    ITEM00_ARROWS_10,
+    ITEM00_ARROWS_10,
+    ITEM00_DEKU_STICK,
+    ITEM00_DEKU_STICK,
+    ITEM00_NO_DROP,
+    ITEM00_RECOVERY_HEART,
+    ITEM00_RECOVERY_HEART,
+    ITEM00_FLEXIBLE,
+    ITEM00_RUPEE_GREEN,
+    ITEM00_RUPEE_BLUE,
+    ITEM00_RUPEE_BLUE,
+    ITEM00_RUPEE_RED,
+    ITEM00_NO_DROP,
+    ITEM00_ARROWS_10,
+    ITEM00_ARROWS_10,
+    ITEM00_ARROWS_30,
+    ITEM00_BOMBS_A,
+    ITEM00_NO_DROP,
+    ITEM00_DEKU_STICK,
+    ITEM00_MAGIC_JAR_SMALL,
+    ITEM00_MAGIC_JAR_BIG,
+    ITEM00_RECOVERY_HEART,
+    ITEM00_RECOVERY_HEART,
+    ITEM00_FLEXIBLE,
+    ITEM00_RUPEE_GREEN,
+    ITEM00_RECOVERY_HEART,
+    ITEM00_RECOVERY_HEART,
+    ITEM00_MAGIC_JAR_SMALL,
+    ITEM00_MASK,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
+    ITEM00_NO_DROP,
 };
 
 u8 sDropTableAmounts[DROP_TABLE_SIZE * DROP_TABLE_NUMBER] = {
@@ -1122,7 +1339,7 @@ void Item_DropCollectibleRandom(PlayState* play, Actor* fromActor, Vec3f* spawnP
                     dropId = ITEM00_RECOVERY_HEART;
                     break;
                 case PLAYER_FORM_GORON:
-                    dropId = ITEM00_MAGIC_SMALL;
+                    dropId = ITEM00_MAGIC_JAR_SMALL;
                     break;
                 default:
                     dropId = ITEM00_RUPEE_GREEN;
@@ -1169,13 +1386,13 @@ void Item_DropCollectibleRandom(PlayState* play, Actor* fromActor, Vec3f* spawnP
             } else if ((gSaveContext.save.saveInfo.playerData.magicLevel != 0) &&
                        (gSaveContext.save.saveInfo.playerData.magic == 0)) {
                 params = 0xD0;
-                dropId = ITEM00_MAGIC_LARGE;
+                dropId = ITEM00_MAGIC_JAR_BIG;
                 dropQuantity = 1;
             } else if ((gSaveContext.save.saveInfo.playerData.magicLevel != 0) &&
                        ((gSaveContext.save.saveInfo.playerData.magicLevel >> 1) >=
                         gSaveContext.save.saveInfo.playerData.magic)) {
                 params = 0xD0;
-                dropId = ITEM00_MAGIC_LARGE;
+                dropId = ITEM00_MAGIC_JAR_BIG;
                 dropQuantity = 1;
             } else if (AMMO(ITEM_BOW) < 6) {
                 params = 0xA0;
@@ -1230,10 +1447,10 @@ void Item_DropCollectibleRandom(PlayState* play, Actor* fromActor, Vec3f* spawnP
 s32 D_801AE194[32] = {
     ITEM00_NO_DROP,        ITEM00_RUPEE_GREEN, ITEM00_RUPEE_BLUE,  ITEM00_NO_DROP,         ITEM00_RUPEE_RED,
     ITEM00_RUPEE_PURPLE,   ITEM00_NO_DROP,     ITEM00_RUPEE_HUGE,  ITEM00_COMPASS,         ITEM00_MUSHROOM_CLOUD,
-    ITEM00_RECOVERY_HEART, ITEM00_3_HEARTS,    ITEM00_HEART_PIECE, ITEM00_HEART_CONTAINER, ITEM00_MAGIC_SMALL,
-    ITEM00_MAGIC_LARGE,    ITEM00_FLEXIBLE,    ITEM00_BIG_FAIRY,   ITEM00_NO_DROP,         ITEM00_NUTS_10,
+    ITEM00_RECOVERY_HEART, ITEM00_3_HEARTS,    ITEM00_HEART_PIECE, ITEM00_HEART_CONTAINER, ITEM00_MAGIC_JAR_SMALL,
+    ITEM00_MAGIC_JAR_BIG,  ITEM00_FLEXIBLE,    ITEM00_BIG_FAIRY,   ITEM00_NO_DROP,         ITEM00_DEKU_NUTS_10,
     ITEM00_NO_DROP,        ITEM00_BOMBS_A,     ITEM00_NO_DROP,     ITEM00_NO_DROP,         ITEM00_NO_DROP,
-    ITEM00_STICK,          ITEM00_NO_DROP,     ITEM00_NO_DROP,     ITEM00_NO_DROP,         ITEM00_NO_DROP,
+    ITEM00_DEKU_STICK,     ITEM00_NO_DROP,     ITEM00_NO_DROP,     ITEM00_NO_DROP,         ITEM00_NO_DROP,
     ITEM00_ARROWS_10,      ITEM00_ARROWS_30,
 };
 
diff --git a/src/code/z_fireobj.c b/src/code/z_fireobj.c
index 98d14874b..9c69fb6a0 100644
--- a/src/code/z_fireobj.c
+++ b/src/code/z_fireobj.c
@@ -112,7 +112,7 @@ void FireObj_UpdateStateTransitions(PlayState* play, FireObj* fire) {
         (waterY - fire->position.y > 6500.0f * fire->yScale)) {
         FireObj_SetState(fire, fire->dynamicSizeStep, FIRE_STATE_NOT_LIT);
     }
-    if ((fire->flags & FIRE_FLAG_INTERACT_STICK) && (player->heldItemAction == PLAYER_IA_STICK)) {
+    if ((fire->flags & FIRE_FLAG_INTERACT_STICK) && (player->heldItemAction == PLAYER_IA_DEKU_STICK)) {
         Math_Vec3f_Diff(&player->meleeWeaponInfo[0].tip, &fire->position, &dist);
         if (Math3D_LengthSquared(&dist) < SQ(20.0f)) {
             sp40 = true;
diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c
index 8cec0a5b7..a79071603 100644
--- a/src/code/z_parameter.c
+++ b/src/code/z_parameter.c
@@ -104,25 +104,25 @@ s16 sMagicBorderRatio = 2;
 s16 sMagicBorderStep = 1;
 
 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_10
-    ITEM_BOW,     // ITEM_ARROWS_30
-    ITEM_BOW,     // ITEM_ARROWS_40
-    ITEM_BOMBCHU, // ITEM_ARROWS_50 !@bug this data is missing an ITEM_BOW, offsetting the rest by 1
-    ITEM_BOMBCHU, // ITEM_BOMBCHUS_20
-    ITEM_BOMBCHU, // ITEM_BOMBCHUS_10
-    ITEM_BOMBCHU, // ITEM_BOMBCHUS_1
-    ITEM_STICK,   // ITEM_BOMBCHUS_5
-    ITEM_STICK,   // ITEM_STICK_UPGRADE_20
-    ITEM_NUT,     // ITEM_STICK_UPGRADE_30
-    ITEM_NUT,     // ITEM_NUT_UPGRADE_30
+    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_10
+    ITEM_BOW,        // ITEM_ARROWS_30
+    ITEM_BOW,        // ITEM_ARROWS_40
+    ITEM_BOMBCHU,    // ITEM_ARROWS_50 !@bug this data is missing an ITEM_BOW, offsetting the rest by 1
+    ITEM_BOMBCHU,    // ITEM_BOMBCHUS_20
+    ITEM_BOMBCHU,    // ITEM_BOMBCHUS_10
+    ITEM_BOMBCHU,    // ITEM_BOMBCHUS_1
+    ITEM_DEKU_STICK, // ITEM_BOMBCHUS_5
+    ITEM_DEKU_STICK, // ITEM_DEKU_STICK_UPGRADE_20
+    ITEM_DEKU_NUT,   // ITEM_DEKU_STICK_UPGRADE_30
+    ITEM_DEKU_NUT,   // ITEM_DEKU_NUT_UPGRADE_30
 };
 
 s16 sEnvHazard = PLAYER_ENV_HAZARD_NONE;
@@ -1707,7 +1707,7 @@ void Interface_UpdateButtonsPart2(PlayState* play) {
     if (CHECK_EVENTINF(EVENTINF_41)) {
         // Related to swamp boat (non-minigame)?
         for (i = EQUIP_SLOT_C_LEFT; i <= EQUIP_SLOT_C_RIGHT; i++) {
-            if ((GET_CUR_FORM_BTN_ITEM(i) != ITEM_PICTO_BOX) || (msgCtx->msgMode != 0)) {
+            if ((GET_CUR_FORM_BTN_ITEM(i) != ITEM_PICTOGRAPH_BOX) || (msgCtx->msgMode != 0)) {
                 if (gSaveContext.buttonStatus[i] == BTN_ENABLED) {
                     restoreHudVisibility = true;
                 }
@@ -1792,8 +1792,8 @@ void Interface_UpdateButtonsPart2(PlayState* play) {
     } else if (CHECK_EVENTINF(EVENTINF_34)) {
         // Deku playground minigame
         if (player->stateFlags3 & PLAYER_STATE3_1000000) {
-            if (gSaveContext.save.saveInfo.inventory.items[SLOT_NUT] == ITEM_NUT) {
-                BUTTON_ITEM_EQUIP(CUR_FORM, EQUIP_SLOT_B) = ITEM_NUT;
+            if (gSaveContext.save.saveInfo.inventory.items[SLOT_DEKU_NUT] == ITEM_DEKU_NUT) {
+                BUTTON_ITEM_EQUIP(CUR_FORM, EQUIP_SLOT_B) = ITEM_DEKU_NUT;
                 Interface_LoadItemIconImpl(play, EQUIP_SLOT_B);
             } else {
                 gSaveContext.buttonStatus[EQUIP_SLOT_B] = BTN_DISABLED;
@@ -1820,9 +1820,9 @@ void Interface_UpdateButtonsPart2(PlayState* play) {
         }
     } else if (player->stateFlags3 & PLAYER_STATE3_1000000) {
         // Nuts on B (from flying as Deku Link)
-        if (gSaveContext.save.saveInfo.inventory.items[SLOT_NUT] == ITEM_NUT) {
-            if (BUTTON_ITEM_EQUIP(CUR_FORM, EQUIP_SLOT_B) != ITEM_NUT) {
-                BUTTON_ITEM_EQUIP(CUR_FORM, EQUIP_SLOT_B) = ITEM_NUT;
+        if (gSaveContext.save.saveInfo.inventory.items[SLOT_DEKU_NUT] == ITEM_DEKU_NUT) {
+            if (BUTTON_ITEM_EQUIP(CUR_FORM, EQUIP_SLOT_B) != ITEM_DEKU_NUT) {
+                BUTTON_ITEM_EQUIP(CUR_FORM, EQUIP_SLOT_B) = ITEM_DEKU_NUT;
                 Interface_LoadItemIconImpl(play, EQUIP_SLOT_B);
                 gSaveContext.buttonStatus[EQUIP_SLOT_B] = BTN_ENABLED;
                 restoreHudVisibility = true;
@@ -1838,7 +1838,7 @@ void Interface_UpdateButtonsPart2(PlayState* play) {
             gSaveContext.buttonStatus[EQUIP_SLOT_C_RIGHT] = BTN_DISABLED;
         }
     } else if (!gSaveContext.save.saveInfo.playerData.isMagicAcquired && (CUR_FORM == PLAYER_FORM_DEKU) &&
-               (BUTTON_ITEM_EQUIP(CUR_FORM, EQUIP_SLOT_B) == ITEM_NUT)) {
+               (BUTTON_ITEM_EQUIP(CUR_FORM, EQUIP_SLOT_B) == ITEM_DEKU_NUT)) {
         // Nuts on B (as Deku Link)
         BUTTON_ITEM_EQUIP(CUR_FORM, EQUIP_SLOT_B) = ITEM_FD;
         gSaveContext.buttonStatus[EQUIP_SLOT_B] = BTN_DISABLED;
@@ -1909,7 +1909,7 @@ void Interface_UpdateButtonsPart2(PlayState* play) {
     } else if (player->stateFlags1 & PLAYER_STATE1_200000) {
         // First person view
         for (i = EQUIP_SLOT_C_LEFT; i <= EQUIP_SLOT_C_RIGHT; i++) {
-            if (GET_CUR_FORM_BTN_ITEM(i) != ITEM_LENS) {
+            if (GET_CUR_FORM_BTN_ITEM(i) != ITEM_LENS_OF_TRUTH) {
                 if (gSaveContext.buttonStatus[i] == BTN_ENABLED) {
                     restoreHudVisibility = true;
                 }
@@ -2077,7 +2077,7 @@ void Interface_UpdateButtonsPart2(PlayState* play) {
                              (GET_CUR_FORM_BTN_ITEM(i) <= ITEM_PENDANT_OF_MEMORIES)) ||
                             ((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_BOTTLE) &&
                              (GET_CUR_FORM_BTN_ITEM(i) <= ITEM_OBABA_DRINK)) ||
-                            (GET_CUR_FORM_BTN_ITEM(i) == ITEM_OCARINA)) {
+                            (GET_CUR_FORM_BTN_ITEM(i) == ITEM_OCARINA_OF_TIME)) {
                             if (gSaveContext.buttonStatus[i] == BTN_ENABLED) {
                                 restoreHudVisibility = true;
                             }
@@ -2088,7 +2088,7 @@ void Interface_UpdateButtonsPart2(PlayState* play) {
                              (GET_CUR_FORM_BTN_ITEM(i) <= ITEM_PENDANT_OF_MEMORIES)) ||
                             ((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_BOTTLE) &&
                              (GET_CUR_FORM_BTN_ITEM(i) <= ITEM_OBABA_DRINK)) ||
-                            (GET_CUR_FORM_BTN_ITEM(i) == ITEM_OCARINA)) {
+                            (GET_CUR_FORM_BTN_ITEM(i) == ITEM_OCARINA_OF_TIME)) {
                             if (gSaveContext.buttonStatus[i] == BTN_DISABLED) {
                                 restoreHudVisibility = true;
                             }
@@ -2115,14 +2115,14 @@ void Interface_UpdateButtonsPart2(PlayState* play) {
                     }
 
                     if (interfaceCtx->restrictions.pictoBox != 0) {
-                        if (GET_CUR_FORM_BTN_ITEM(i) == ITEM_PICTO_BOX) {
+                        if (GET_CUR_FORM_BTN_ITEM(i) == ITEM_PICTOGRAPH_BOX) {
                             if (!gSaveContext.buttonStatus[i]) { // == BTN_ENABLED
                                 restoreHudVisibility = true;
                             }
                             gSaveContext.buttonStatus[i] = BTN_DISABLED;
                         }
                     } else if (interfaceCtx->restrictions.pictoBox == 0) {
-                        if (GET_CUR_FORM_BTN_ITEM(i) == ITEM_PICTO_BOX) {
+                        if (GET_CUR_FORM_BTN_ITEM(i) == ITEM_PICTOGRAPH_BOX) {
                             if (gSaveContext.buttonStatus[i] == BTN_DISABLED) {
                                 restoreHudVisibility = true;
                             }
@@ -2135,10 +2135,10 @@ void Interface_UpdateButtonsPart2(PlayState* play) {
                               (GET_CUR_FORM_BTN_ITEM(i) <= ITEM_PENDANT_OF_MEMORIES)) &&
                             !((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_BOTTLE) &&
                               (GET_CUR_FORM_BTN_ITEM(i) <= ITEM_OBABA_DRINK)) &&
-                            (GET_CUR_FORM_BTN_ITEM(i) != ITEM_OCARINA) &&
+                            (GET_CUR_FORM_BTN_ITEM(i) != ITEM_OCARINA_OF_TIME) &&
                             !((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_MASK_DEKU) &&
                               (GET_CUR_FORM_BTN_ITEM(i) <= ITEM_MASK_GIANT)) &&
-                            (GET_CUR_FORM_BTN_ITEM(i) != ITEM_PICTO_BOX)) {
+                            (GET_CUR_FORM_BTN_ITEM(i) != ITEM_PICTOGRAPH_BOX)) {
 
                             if ((gSaveContext.buttonStatus[i] == BTN_ENABLED)) {
                                 restoreHudVisibility = true;
@@ -2150,10 +2150,10 @@ void Interface_UpdateButtonsPart2(PlayState* play) {
                               (GET_CUR_FORM_BTN_ITEM(i) <= ITEM_PENDANT_OF_MEMORIES)) &&
                             !((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_BOTTLE) &&
                               (GET_CUR_FORM_BTN_ITEM(i) <= ITEM_OBABA_DRINK)) &&
-                            (GET_CUR_FORM_BTN_ITEM(i) != ITEM_OCARINA) &&
+                            (GET_CUR_FORM_BTN_ITEM(i) != ITEM_OCARINA_OF_TIME) &&
                             !((GET_CUR_FORM_BTN_ITEM(i) >= ITEM_MASK_DEKU) &&
                               (GET_CUR_FORM_BTN_ITEM(i) <= ITEM_MASK_GIANT)) &&
-                            (GET_CUR_FORM_BTN_ITEM(i) != ITEM_PICTO_BOX)) {
+                            (GET_CUR_FORM_BTN_ITEM(i) != ITEM_PICTOGRAPH_BOX)) {
 
                             if ((gSaveContext.buttonStatus[i] == BTN_DISABLED)) {
                                 restoreHudVisibility = true;
@@ -2517,8 +2517,8 @@ u8 Item_Give(PlayState* play, u8 item) {
     u8 slot;
 
     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]);
     }
 
     if (item == ITEM_SKULL_TOKEN) {
@@ -2642,84 +2642,84 @@ u8 Item_Give(PlayState* play, u8 item) {
         Inventory_ChangeUpgrade(UPG_WALLET, 2);
         return ITEM_NONE;
 
-    } else if (item == ITEM_STICK_UPGRADE_20) {
-        if (INV_CONTENT(ITEM_STICK) != ITEM_STICK) {
-            INV_CONTENT(ITEM_STICK) = ITEM_STICK;
+    } else if (item == ITEM_DEKU_STICK_UPGRADE_20) {
+        if (INV_CONTENT(ITEM_DEKU_STICK) != ITEM_DEKU_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) {
-        if (INV_CONTENT(ITEM_STICK) != ITEM_STICK) {
-            INV_CONTENT(ITEM_STICK) = ITEM_STICK;
+    } else if (item == ITEM_DEKU_STICK_UPGRADE_30) {
+        if (INV_CONTENT(ITEM_DEKU_STICK) != ITEM_DEKU_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) {
-        if (INV_CONTENT(ITEM_NUT) != ITEM_NUT) {
-            INV_CONTENT(ITEM_NUT) = ITEM_NUT;
+    } else if (item == ITEM_DEKU_NUT_UPGRADE_30) {
+        if (INV_CONTENT(ITEM_DEKU_NUT) != ITEM_DEKU_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) {
-        if (INV_CONTENT(ITEM_NUT) != ITEM_NUT) {
-            INV_CONTENT(ITEM_NUT) = ITEM_NUT;
+    } else if (item == ITEM_DEKU_NUT_UPGRADE_40) {
+        if (INV_CONTENT(ITEM_DEKU_NUT) != ITEM_DEKU_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_STICK) {
-        if (INV_CONTENT(ITEM_STICK) != ITEM_STICK) {
-            Inventory_ChangeUpgrade(UPG_STICKS, 1);
-            AMMO(ITEM_STICK) = 1;
+    } else if (item == ITEM_DEKU_STICK) {
+        if (INV_CONTENT(ITEM_DEKU_STICK) != ITEM_DEKU_STICK) {
+            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)) {
-        if (INV_CONTENT(ITEM_STICK) != ITEM_STICK) {
-            Inventory_ChangeUpgrade(UPG_STICKS, 1);
-            AMMO(ITEM_STICK) = sAmmoRefillCounts[item - ITEM_STICKS_5];
+    } else if ((item == ITEM_DEKU_STICKS_5) || (item == ITEM_DEKU_STICKS_10)) {
+        if (INV_CONTENT(ITEM_DEKU_STICK) != ITEM_DEKU_STICK) {
+            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;
+        item = ITEM_DEKU_STICK;
 
-    } else if (item == ITEM_NUT) {
-        if (INV_CONTENT(ITEM_NUT) != ITEM_NUT) {
-            Inventory_ChangeUpgrade(UPG_NUTS, 1);
-            AMMO(ITEM_NUT) = 1;
+    } else if (item == ITEM_DEKU_NUT) {
+        if (INV_CONTENT(ITEM_DEKU_NUT) != ITEM_DEKU_NUT) {
+            Inventory_ChangeUpgrade(UPG_DEKU_NUTS, 1);
+            AMMO(ITEM_DEKU_NUT) = 1;
         } 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)) {
-        if (INV_CONTENT(ITEM_NUT) != ITEM_NUT) {
-            Inventory_ChangeUpgrade(UPG_NUTS, 1);
-            AMMO(ITEM_NUT) += sAmmoRefillCounts[item - ITEM_NUTS_5];
+    } else if ((item == ITEM_DEKU_NUTS_5) || (item == ITEM_DEKU_NUTS_10)) {
+        if (INV_CONTENT(ITEM_DEKU_NUT) != ITEM_DEKU_NUT) {
+            Inventory_ChangeUpgrade(UPG_DEKU_NUTS, 1);
+            AMMO(ITEM_DEKU_NUT) += 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_POWDER_KEG) {
         if (INV_CONTENT(ITEM_POWDER_KEG) != ITEM_POWDER_KEG) {
@@ -2782,8 +2782,8 @@ u8 Item_Give(PlayState* play, u8 item) {
         }
         return ITEM_BOW;
 
-    } else if (item == ITEM_OCARINA) {
-        INV_CONTENT(ITEM_OCARINA) = ITEM_OCARINA;
+    } else if (item == ITEM_OCARINA_OF_TIME) {
+        INV_CONTENT(ITEM_OCARINA_OF_TIME) = ITEM_OCARINA_OF_TIME;
         return ITEM_NONE;
 
     } else if (item == ITEM_MAGIC_BEANS) {
@@ -2805,7 +2805,7 @@ u8 Item_Give(PlayState* play, u8 item) {
         Health_ChangeBy(play, 0x10);
         return item;
 
-    } else if (item == ITEM_MAGIC_SMALL) {
+    } else if (item == ITEM_MAGIC_JAR_SMALL) {
         Magic_Add(play, MAGIC_NORMAL_METER / 2);
         if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_12_80)) {
             SET_WEEKEVENTREG(WEEKEVENTREG_12_80);
@@ -2813,7 +2813,7 @@ u8 Item_Give(PlayState* play, u8 item) {
         }
         return item;
 
-    } else if (item == ITEM_MAGIC_LARGE) {
+    } else if (item == ITEM_MAGIC_JAR_BIG) {
         Magic_Add(play, MAGIC_NORMAL_METER);
         if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_12_80)) {
             SET_WEEKEVENTREG(WEEKEVENTREG_12_80);
@@ -2941,8 +2941,8 @@ u8 Item_CheckObtainabilityImpl(u8 item) {
     u8 bottleSlot;
 
     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]);
     }
 
     if (item == ITEM_SKULL_TOKEN) {
@@ -2969,8 +2969,8 @@ u8 Item_CheckObtainabilityImpl(u8 item) {
     } else if (item == ITEM_KEY_SMALL) {
         return ITEM_NONE;
 
-    } else if ((item == ITEM_OCARINA) || (item == ITEM_BOMBCHU) || (item == ITEM_HOOKSHOT) || (item == ITEM_LENS) ||
-               (item == ITEM_SWORD_GREAT_FAIRY) || (item == ITEM_PICTO_BOX)) {
+    } else if ((item == ITEM_OCARINA_OF_TIME) || (item == ITEM_BOMBCHU) || (item == ITEM_HOOKSHOT) ||
+               (item == ITEM_LENS_OF_TRUTH) || (item == ITEM_SWORD_GREAT_FAIRY) || (item == ITEM_PICTOGRAPH_BOX)) {
         if (INV_CONTENT(item) == ITEM_NONE) {
             return ITEM_NONE;
         }
@@ -3004,7 +3004,7 @@ u8 Item_CheckObtainabilityImpl(u8 item) {
         }
         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)) {
@@ -3025,7 +3025,7 @@ u8 Item_CheckObtainabilityImpl(u8 item) {
     } 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)) {
         if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_12_80)) {
             return ITEM_NONE;
         }
@@ -3295,22 +3295,22 @@ void Rupees_ChangeBy(s16 rupeeChange) {
 }
 
 void Inventory_ChangeAmmo(s16 item, s16 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) {
@@ -3665,9 +3665,9 @@ void Magic_Update(PlayState* play) {
                 if ((gSaveContext.save.saveInfo.playerData.magic == 0) ||
                     ((Player_GetEnvironmentalHazard(play) >= PLAYER_ENV_HAZARD_UNDERWATER_FLOOR) &&
                      (Player_GetEnvironmentalHazard(play) <= PLAYER_ENV_HAZARD_UNDERWATER_FREE)) ||
-                    ((BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_LEFT) != ITEM_LENS) &&
-                     (BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_DOWN) != ITEM_LENS) &&
-                     (BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_RIGHT) != ITEM_LENS)) ||
+                    ((BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_LEFT) != ITEM_LENS_OF_TRUTH) &&
+                     (BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_DOWN) != ITEM_LENS_OF_TRUTH) &&
+                     (BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_RIGHT) != ITEM_LENS_OF_TRUTH)) ||
                     !play->actorCtx.lensActive) {
                     // Deactivate Lens of Truth and set magic state to idle
                     play->actorCtx.lensActive = false;
@@ -4010,17 +4010,17 @@ void Interface_DrawAmmoCount(PlayState* play, s16 button, s16 alpha) {
 
     i = ((void)0, GET_CUR_FORM_BTN_ITEM(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_BOMBCHU) || (i == ITEM_POWDER_KEG) ||
-        (i == ITEM_MAGIC_BEANS) || (i == ITEM_PICTO_BOX)) {
+    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_BOMBCHU) || (i == ITEM_POWDER_KEG) ||
+        (i == ITEM_MAGIC_BEANS) || (i == ITEM_PICTOGRAPH_BOX)) {
 
-        if ((i >= ITEM_BOW_ARROW_FIRE) && (i <= ITEM_BOW_ARROW_LIGHT)) {
+        if ((i >= ITEM_BOW_FIRE) && (i <= ITEM_BOW_LIGHT)) {
             i = ITEM_BOW;
         }
 
         ammo = AMMO(i);
 
-        if (i == ITEM_PICTO_BOX) {
+        if (i == ITEM_PICTOGRAPH_BOX) {
             if (!CHECK_QUEST_ITEM(QUEST_PICTOGRAPH)) {
                 ammo = 0;
             } else {
@@ -4036,10 +4036,10 @@ void Interface_DrawAmmoCount(PlayState* play, s16 button, s16 alpha) {
             ammo = play->unk_1887C - 1;
         } else if (((i == ITEM_BOW) && (AMMO(i) == CUR_CAPACITY(UPG_QUIVER))) ||
                    ((i == ITEM_BOMB) && (AMMO(i) == CUR_CAPACITY(UPG_BOMB_BAG))) ||
-                   ((i == ITEM_STICK) && (AMMO(i) == CUR_CAPACITY(UPG_STICKS))) ||
-                   ((i == ITEM_NUT) && (AMMO(i) == CUR_CAPACITY(UPG_NUTS))) ||
+                   ((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(i) == CUR_CAPACITY(UPG_BOMB_BAG))) ||
-                   ((i == ITEM_POWDER_KEG) && (ammo == 1)) || ((i == ITEM_PICTO_BOX) && (ammo == 1)) ||
+                   ((i == ITEM_POWDER_KEG) && (ammo == 1)) || ((i == ITEM_PICTOGRAPH_BOX) && (ammo == 1)) ||
                    ((i == ITEM_MAGIC_BEANS) && (ammo == 20))) {
             gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 120, 255, 0, alpha);
         }
@@ -4090,7 +4090,7 @@ void Interface_DrawBButtonIcons(PlayState* play) {
                  ((BUTTON_ITEM_EQUIP(CUR_FORM, EQUIP_SLOT_B) < ITEM_SWORD_KOKIRI) ||
                   (BUTTON_ITEM_EQUIP(CUR_FORM, EQUIP_SLOT_B) > ITEM_SWORD_GILDED)) &&
                  BUTTON_ITEM_EQUIP(CUR_FORM, EQUIP_SLOT_B) != ITEM_NONE) &&
-                (BUTTON_ITEM_EQUIP(CUR_FORM, EQUIP_SLOT_B) != ITEM_NUT))) {
+                (BUTTON_ITEM_EQUIP(CUR_FORM, EQUIP_SLOT_B) != ITEM_DEKU_NUT))) {
         if ((player->transformation == PLAYER_FORM_FIERCE_DEITY) || (player->transformation == PLAYER_FORM_HUMAN)) {
             if (BUTTON_ITEM_EQUIP(CUR_FORM, EQUIP_SLOT_B) != ITEM_NONE) {
                 Interface_DrawItemIconTexture(play, interfaceCtx->iconItemSegment, EQUIP_SLOT_B);
@@ -6950,7 +6950,7 @@ void Interface_Update(PlayState* play) {
             gSaveContext.magicFillTarget = gSaveContext.save.saveInfo.playerData.magic;
             gSaveContext.save.saveInfo.playerData.magic = 0;
             gSaveContext.magicState = MAGIC_STATE_STEP_CAPACITY;
-            BUTTON_ITEM_EQUIP(PLAYER_FORM_DEKU, EQUIP_SLOT_B) = ITEM_NUT;
+            BUTTON_ITEM_EQUIP(PLAYER_FORM_DEKU, EQUIP_SLOT_B) = ITEM_DEKU_NUT;
         }
 
         Magic_Update(play);
diff --git a/src/code/z_play.c b/src/code/z_play.c
index ac9c1eacc..a97cf9f8e 100644
--- a/src/code/z_play.c
+++ b/src/code/z_play.c
@@ -2149,7 +2149,7 @@ void Play_Init(GameState* thisx) {
         }
 
         // "First cycle" Termina Field
-        if (INV_CONTENT(ITEM_OCARINA) != ITEM_OCARINA) {
+        if (INV_CONTENT(ITEM_OCARINA_OF_TIME) != ITEM_OCARINA_OF_TIME) {
             if ((scene == ENTR_SCENE_TERMINA_FIELD) &&
                 (((void)0, gSaveContext.save.entrance) != ENTRANCE(TERMINA_FIELD, 10))) {
                 gSaveContext.nextCutsceneIndex = 0xFFF4;
diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c
index e30dec3f1..d87905117 100644
--- a/src/code/z_player_lib.c
+++ b/src/code/z_player_lib.c
@@ -655,12 +655,12 @@ PlayerItemAction func_80123810(PlayState* play) {
 u8 sActionModelGroups[PLAYER_IA_MAX] = {
     PLAYER_MODELGROUP_DEFAULT,        // PLAYER_IA_NONE
     PLAYER_MODELGROUP_13,             // PLAYER_IA_LAST_USED
-    PLAYER_MODELGROUP_STICK,          // PLAYER_IA_FISHING_ROD
+    PLAYER_MODELGROUP_DEKU_STICK,     // PLAYER_IA_FISHING_ROD
     PLAYER_MODELGROUP_ONE_HAND_SWORD, // PLAYER_IA_SWORD_KOKIRI
     PLAYER_MODELGROUP_ONE_HAND_SWORD, // PLAYER_IA_SWORD_RAZOR
     PLAYER_MODELGROUP_ONE_HAND_SWORD, // PLAYER_IA_SWORD_GILDED
     PLAYER_MODELGROUP_TWO_HAND_SWORD, // PLAYER_IA_SWORD_TWO_HANDED
-    PLAYER_MODELGROUP_STICK,          // PLAYER_IA_STICK
+    PLAYER_MODELGROUP_DEKU_STICK,     // PLAYER_IA_DEKU_STICK
     PLAYER_MODELGROUP_ZORA_FINS,      // PLAYER_IA_ZORA_FINS
     PLAYER_MODELGROUP_BOW,            // PLAYER_IA_BOW
     PLAYER_MODELGROUP_BOW,            // PLAYER_IA_BOW_FIRE
@@ -671,8 +671,8 @@ u8 sActionModelGroups[PLAYER_IA_MAX] = {
     PLAYER_MODELGROUP_EXPLOSIVES,     // PLAYER_IA_POWDER_KEG
     PLAYER_MODELGROUP_EXPLOSIVES,     // PLAYER_IA_BOMBCHU
     PLAYER_MODELGROUP_8,              // PLAYER_IA_11
-    PLAYER_MODELGROUP_DEFAULT,        // PLAYER_IA_NUT
-    PLAYER_MODELGROUP_DEFAULT,        // PLAYER_IA_PICTO_BOX
+    PLAYER_MODELGROUP_DEFAULT,        // PLAYER_IA_DEKU_NUT
+    PLAYER_MODELGROUP_DEFAULT,        // PLAYER_IA_PICTOGRAPH_BOX
     PLAYER_MODELGROUP_INSTRUMENT,     // PLAYER_IA_OCARINA
     PLAYER_MODELGROUP_BOTTLE,         // PLAYER_IA_BOTTLE_EMPTY
     PLAYER_MODELGROUP_BOTTLE,         // PLAYER_IA_BOTTLE_FISH
@@ -735,7 +735,7 @@ u8 sActionModelGroups[PLAYER_IA_MAX] = {
     PLAYER_MODELGROUP_DEFAULT,        // PLAYER_IA_MASK_GORON
     PLAYER_MODELGROUP_DEFAULT,        // PLAYER_IA_MASK_ZORA
     PLAYER_MODELGROUP_DEFAULT,        // PLAYER_IA_MASK_DEKU
-    PLAYER_MODELGROUP_DEFAULT,        // PLAYER_IA_LENS
+    PLAYER_MODELGROUP_DEFAULT,        // PLAYER_IA_LENS_OF_TRUTH
 };
 
 PlayerModelGroup Player_ActionToModelGroup(Player* player, PlayerItemAction itemAction) {
@@ -808,7 +808,7 @@ PlayerModelIndices gPlayerModelTypes[PLAYER_MODELGROUP_MAX] = {
     /* PLAYER_MODELGROUP_HOOKSHOT */
     { PLAYER_ANIMTYPE_4, PLAYER_MODELTYPE_LH_OPEN, PLAYER_MODELTYPE_RH_HOOKSHOT, PLAYER_MODELTYPE_SHEATH_14,
       PLAYER_MODELTYPE_WAIST },
-    /* PLAYER_MODELGROUP_STICK */
+    /* PLAYER_MODELGROUP_DEKU_STICK */
     { PLAYER_ANIMTYPE_3, PLAYER_MODELTYPE_LH_CLOSED, PLAYER_MODELTYPE_RH_CLOSED, PLAYER_MODELTYPE_SHEATH_14,
       PLAYER_MODELTYPE_WAIST },
     /* PLAYER_MODELGROUP_INSTRUMENT */
@@ -1367,7 +1367,7 @@ s32 Player_IsBurningStickInRange(PlayState* play, Vec3f* pos, f32 xzRange, f32 y
     Vec3f diff;
     s32 pad;
 
-    if ((player->heldItemAction == PLAYER_IA_STICK) && (player->unk_B28 != 0)) {
+    if ((player->heldItemAction == PLAYER_IA_DEKU_STICK) && (player->unk_B28 != 0)) {
         Math_Vec3f_Diff(&player->meleeWeaponInfo[0].tip, pos, &diff);
         return (SQXZ(diff) <= SQ(xzRange)) && (0.0f <= diff.y) && (diff.y <= yRange);
     }
@@ -1446,7 +1446,7 @@ PlayerMeleeWeapon Player_GetMeleeWeaponHeld(Player* player) {
 
 s32 Player_IsHoldingTwoHandedWeapon(Player* player) {
     // Relies on the itemActions for two-handed weapons being contiguous.
-    if ((player->heldItemAction >= PLAYER_IA_SWORD_TWO_HANDED) && (player->heldItemAction <= PLAYER_IA_STICK)) {
+    if ((player->heldItemAction >= PLAYER_IA_SWORD_TWO_HANDED) && (player->heldItemAction <= PLAYER_IA_DEKU_STICK)) {
         return true;
     }
 
@@ -3291,7 +3291,7 @@ s32 func_80128640(PlayState* play, Player* player, Gfx* dlist) {
             CLOSE_DISPS(play->state.gfxCtx);
         }
 
-    } else if (player->itemAction == PLAYER_IA_STICK) {
+    } else if (player->itemAction == PLAYER_IA_DEKU_STICK) {
         OPEN_DISPS(play->state.gfxCtx);
 
         Matrix_Push();
@@ -3415,17 +3415,17 @@ void Player_PostLimbDrawGameplay(PlayState* play, s32 limbIndex, Gfx** dList1, G
                     3000.0f, // PLAYER_MELEEWEAPON_SWORD_RAZOR
                     4000.0f, // PLAYER_MELEEWEAPON_SWORD_GILDED
                     5500.0f, // PLAYER_MELEEWEAPON_SWORD_TWO_HANDED
-                    -1.0f,   // PLAYER_MELEEWEAPON_STICK
+                    -1.0f,   // PLAYER_MELEEWEAPON_DEKU_STICK
                     2500.0f, // PLAYER_MELEEWEAPON_ZORA_FINS
                 };
 
                 if ((player->transformation == PLAYER_FORM_FIERCE_DEITY) ||
                     ((player->transformation != PLAYER_FORM_ZORA) &&
-                     ((player->itemAction == PLAYER_IA_STICK) ||
+                     ((player->itemAction == PLAYER_IA_DEKU_STICK) ||
                       ((player->meleeWeaponState != PLAYER_MELEE_WEAPON_STATE_0) &&
                        (player->meleeWeaponAnimation != PLAYER_MWA_GORON_PUNCH_RIGHT) &&
                        (player->meleeWeaponAnimation != PLAYER_MWA_GORON_PUNCH_BUTT))))) {
-                    if (player->itemAction == PLAYER_IA_STICK) {
+                    if (player->itemAction == PLAYER_IA_DEKU_STICK) {
                         D_801C0994->x = player->unk_B0C * 5000.0f;
                     } else {
                         D_801C0994->x = sMeleeWeaponLengths[Player_GetMeleeWeaponHeld(player)];
diff --git a/src/code/z_sram_NES.c b/src/code/z_sram_NES.c
index 5efb43896..33276f717 100644
--- a/src/code/z_sram_NES.c
+++ b/src/code/z_sram_NES.c
@@ -267,30 +267,30 @@ u32 gSramSlotOffsets[] = {
 };
 
 u8 gAmmoItems[] = {
-    ITEM_NONE,        // SLOT_OCARINA
-    ITEM_BOW,         // SLOT_BOW
-    ITEM_NONE,        // SLOT_ARROW_FIRE
-    ITEM_NONE,        // SLOT_ARROW_ICE
-    ITEM_NONE,        // SLOT_ARROW_LIGHT
-    ITEM_NONE,        // SLOT_TRADE_DEED
-    ITEM_BOMB,        // SLOT_BOMB
-    ITEM_BOMBCHU,     // SLOT_BOMBCHU
-    ITEM_STICK,       // SLOT_STICK
-    ITEM_NUT,         // SLOT_NUT
-    ITEM_MAGIC_BEANS, // SLOT_MAGIC_BEANS
-    ITEM_NONE,        // SLOT_TRADE_KEY_MAMA
-    ITEM_POWDER_KEG,  // SLOT_POWDER_KEG
-    ITEM_PICTO_BOX,   // SLOT_PICTO_BOX
-    ITEM_NONE,        // SLOT_LENS
-    ITEM_NONE,        // SLOT_HOOKSHOT
-    ITEM_NONE,        // SLOT_SWORD_GREAT_FAIRY
-    ITEM_NONE,        // SLOT_TRADE_COUPLE
-    ITEM_NONE,        // SLOT_BOTTLE_1
-    ITEM_NONE,        // SLOT_BOTTLE_2
-    ITEM_NONE,        // SLOT_BOTTLE_3
-    ITEM_NONE,        // SLOT_BOTTLE_4
-    ITEM_NONE,        // SLOT_BOTTLE_5
-    ITEM_NONE,        // SLOT_BOTTLE_6
+    ITEM_NONE,           // SLOT_OCARINA
+    ITEM_BOW,            // SLOT_BOW
+    ITEM_NONE,           // SLOT_ARROW_FIRE
+    ITEM_NONE,           // SLOT_ARROW_ICE
+    ITEM_NONE,           // SLOT_ARROW_LIGHT
+    ITEM_NONE,           // SLOT_TRADE_DEED
+    ITEM_BOMB,           // SLOT_BOMB
+    ITEM_BOMBCHU,        // SLOT_BOMBCHU
+    ITEM_DEKU_STICK,     // SLOT_DEKU_STICK
+    ITEM_DEKU_NUT,       // SLOT_DEKU_NUT
+    ITEM_MAGIC_BEANS,    // SLOT_MAGIC_BEANS
+    ITEM_NONE,           // SLOT_TRADE_KEY_MAMA
+    ITEM_POWDER_KEG,     // SLOT_POWDER_KEG
+    ITEM_PICTOGRAPH_BOX, // SLOT_PICTOGRAPH_BOX
+    ITEM_NONE,           // SLOT_LENS_OF_TRUTH
+    ITEM_NONE,           // SLOT_HOOKSHOT
+    ITEM_NONE,           // SLOT_SWORD_GREAT_FAIRY
+    ITEM_NONE,           // SLOT_TRADE_COUPLE
+    ITEM_NONE,           // SLOT_BOTTLE_1
+    ITEM_NONE,           // SLOT_BOTTLE_2
+    ITEM_NONE,           // SLOT_BOTTLE_3
+    ITEM_NONE,           // SLOT_BOTTLE_4
+    ITEM_NONE,           // SLOT_BOTTLE_5
+    ITEM_NONE,           // SLOT_BOTTLE_6
 };
 
 // Stores flash start page number
@@ -506,14 +506,14 @@ void Sram_SaveEndOfCycle(PlayState* play) {
             SET_EVENTINF(EVENTINF_THREEDAYRESET_LOST_BOMB_AMMO);
         }
     }
-    if (INV_CONTENT(ITEM_NUT) == ITEM_NUT) {
-        item = INV_CONTENT(ITEM_NUT);
+    if (INV_CONTENT(ITEM_DEKU_NUT) == ITEM_DEKU_NUT) {
+        item = INV_CONTENT(ITEM_DEKU_NUT);
         if (AMMO(item) != 0) {
             SET_EVENTINF(EVENTINF_THREEDAYRESET_LOST_NUT_AMMO);
         }
     }
-    if (INV_CONTENT(ITEM_STICK) == ITEM_STICK) {
-        item = INV_CONTENT(ITEM_STICK);
+    if (INV_CONTENT(ITEM_DEKU_STICK) == ITEM_DEKU_STICK) {
+        item = INV_CONTENT(ITEM_DEKU_STICK);
         if (AMMO(item) != 0) {
             SET_EVENTINF(EVENTINF_THREEDAYRESET_LOST_STICK_AMMO);
         }
@@ -527,7 +527,7 @@ void Sram_SaveEndOfCycle(PlayState* play) {
 
     for (i = 0; i < ARRAY_COUNT(gAmmoItems); i++) {
         if (gAmmoItems[i] != ITEM_NONE) {
-            if ((gSaveContext.save.saveInfo.inventory.items[i] != ITEM_NONE) && (i != SLOT_PICTO_BOX)) {
+            if ((gSaveContext.save.saveInfo.inventory.items[i] != ITEM_NONE) && (i != SLOT_PICTOGRAPH_BOX)) {
                 item = gSaveContext.save.saveInfo.inventory.items[i];
                 AMMO(item) = 0;
             }
@@ -607,7 +607,7 @@ void Sram_SaveEndOfCycle(PlayState* play) {
     Inventory_DeleteItem(ITEM_LONGSHOT, SLOT_TRADE_COUPLE);
 
     for (j = EQUIP_SLOT_C_LEFT; j <= EQUIP_SLOT_C_RIGHT; j++) {
-        if (GET_CUR_FORM_BTN_ITEM(j) >= ITEM_MOONS_TEAR && GET_CUR_FORM_BTN_ITEM(j) <= ITEM_PENDANT_OF_MEMORIES) {
+        if ((GET_CUR_FORM_BTN_ITEM(j) >= ITEM_MOONS_TEAR) && (GET_CUR_FORM_BTN_ITEM(j) <= ITEM_PENDANT_OF_MEMORIES)) {
             SET_CUR_FORM_BTN_ITEM(j, ITEM_NONE);
             Interface_LoadItemIconImpl(play, j);
         }
@@ -884,10 +884,10 @@ SavePlayerData sSaveDebugPlayerData = {
 
 ItemEquips sSaveDebugItemEquips = {
     {
-        { ITEM_SWORD_KOKIRI, ITEM_BOW, ITEM_POTION_RED, ITEM_OCARINA },
-        { ITEM_SWORD_KOKIRI, ITEM_BOW, ITEM_MASK_GORON, ITEM_OCARINA },
-        { ITEM_SWORD_KOKIRI, ITEM_BOW, ITEM_MASK_ZORA, ITEM_OCARINA },
-        { ITEM_NUT, ITEM_NUT, ITEM_MASK_DEKU, ITEM_OCARINA },
+        { ITEM_SWORD_KOKIRI, ITEM_BOW, ITEM_POTION_RED, ITEM_OCARINA_OF_TIME },
+        { ITEM_SWORD_KOKIRI, ITEM_BOW, ITEM_MASK_GORON, ITEM_OCARINA_OF_TIME },
+        { ITEM_SWORD_KOKIRI, ITEM_BOW, ITEM_MASK_ZORA, ITEM_OCARINA_OF_TIME },
+        { ITEM_DEKU_NUT, ITEM_DEKU_NUT, ITEM_MASK_DEKU, ITEM_OCARINA_OF_TIME },
     },
     {
         { SLOT_OCARINA, SLOT_BOW, SLOT_BOTTLE_2, SLOT_OCARINA },
@@ -901,7 +901,7 @@ ItemEquips sSaveDebugItemEquips = {
 Inventory sSaveDebugInventory = {
     // items
     {
-        ITEM_OCARINA,
+        ITEM_OCARINA_OF_TIME,
         ITEM_BOW,
         ITEM_ARROW_FIRE,
         ITEM_ARROW_ICE,
@@ -909,13 +909,13 @@ Inventory sSaveDebugInventory = {
         ITEM_MOONS_TEAR,
         ITEM_BOMB,
         ITEM_BOMBCHU,
-        ITEM_STICK,
-        ITEM_NUT,
+        ITEM_DEKU_STICK,
+        ITEM_DEKU_NUT,
         ITEM_MAGIC_BEANS,
         ITEM_ROOM_KEY,
         ITEM_POWDER_KEG,
-        ITEM_PICTO_BOX,
-        ITEM_LENS,
+        ITEM_PICTOGRAPH_BOX,
+        ITEM_LENS_OF_TRUTH,
         ITEM_HOOKSHOT,
         ITEM_SWORD_GREAT_FAIRY,
         ITEM_LETTER_TO_KAFEI,