Started cleaning up the itemNo enum

23 files changed, 409 insertions, 409 deletions

diff --git a/src/d/actor/d_a_agb.cpp b/src/d/actor/d_a_agb.cpp
index 199d4962..b9d51205 100644
--- a/src/d/actor/d_a_agb.cpp
+++ b/src/d/actor/d_a_agb.cpp
@@ -1019,7 +1019,7 @@ void daAgb_c::GbaItemUse() {
                 temp_r29 |= 0x10000;
             }
 
-            if (dComIfGs_getItem(12) != NO_ITEM && dComIfGs_getArrowNum() < dComIfGs_getArrowMax())
+            if (dComIfGs_getItem(12) != dItem_NONE_e && dComIfGs_getArrowNum() < dComIfGs_getArrowMax())
             {
                 temp_r29 |= 0x100;
             }
diff --git a/src/d/actor/d_a_agbsw0.cpp b/src/d/actor/d_a_agbsw0.cpp
index 70d307de..6160c7f1 100644
--- a/src/d/actor/d_a_agbsw0.cpp
+++ b/src/d/actor/d_a_agbsw0.cpp
@@ -96,7 +96,7 @@ BOOL daAgbsw0_c::draw() {
             }
         }
         else if(behavior == 0xD) {
-            if(!dComIfGs_checkGetItem(HUMMER) || dComIfGs_isEventBit(0x2D01)) {
+            if(!dComIfGs_checkGetItem(dItem_SKULL_HAMMER_e) || dComIfGs_isEventBit(0x2D01)) {
                 return true;
             }
         }
@@ -741,7 +741,7 @@ BOOL daAgbsw0_c::ExeSubM2() {
         return true;
     }
     else {
-        if(!dComIfGs_checkGetItem(HUMMER)) {
+        if(!dComIfGs_checkGetItem(dItem_SKULL_HAMMER_e)) {
             return true;
         }
         else {
@@ -847,7 +847,7 @@ u32 daAgbsw0_c::TriforceCheck(daAgb_c* agb)
     if(!dComIfGs_isGetCollectMap(1)) {
         return 0x309;
     }
-    if(!dComIfGs_isGetCollectMap(2) && dComIfGs_checkGetItem(HUMMER)) {
+    if(!dComIfGs_isGetCollectMap(2) && dComIfGs_checkGetItem(dItem_SKULL_HAMMER_e)) {
         if(dComIfGs_checkGetItem(COTTAGE_PAPER)) {
 #if VERSION == VERSION_JPN
             s8 roomNo = dComIfGp_roomControl_getStayNo();
@@ -857,13 +857,13 @@ u32 daAgbsw0_c::TriforceCheck(daAgb_c* agb)
             return roomNo == 0x21 ? 0x30A : 0x30B;
         }
         else {
-            u8 num = dComIfGs_checkGetItemNum(PENDANT);
+            u8 num = dComIfGs_checkGetItemNum(dItem_JOY_PENDANT_e);
             return num >= 0x14 ? 0x30C : 0x30D;
         }
     }
     if(!dComIfGs_isGetCollectMap(3)) {
         if(dComIfGs_checkGetItem(ESA_BAG)) {
-            if(dComIfGs_checkBaitItem(ANIMAL_ESA)) {
+            if(dComIfGs_checkBaitItem(dItem_HYOI_PEAR_e)) {
 #if VERSION == VERSION_JPN
                 s8 roomNo = dComIfGp_roomControl_getStayNo();
 #else
@@ -878,7 +878,7 @@ u32 daAgbsw0_c::TriforceCheck(daAgb_c* agb)
 
         return 0x30E;
     }
-    if(!dComIfGs_isGetCollectMap(4) && dComIfGs_checkGetItem(HOOKSHOT)) {
+    if(!dComIfGs_isGetCollectMap(4) && dComIfGs_checkGetItem(dItem_HOOKSHOT_e)) {
         if(dComIfGs_isOpenCollectMap(0x24)) {
             s32 hour = dKy_getdaytime_hour();
             if(hour < 6 || hour >= 0x13) {
@@ -972,7 +972,7 @@ u32 daAgbsw0_c::TriforceCheck(daAgb_c* agb)
         }
     }
     if(!dComIfGs_isCollect(2, 0)) {
-        if(dComIfGs_checkGetItem(MAGIC_ARROW)) {
+        if(dComIfGs_checkGetItem(dItem_MAGIC_ARROW_e)) {
             return 0x328;
         }
         else {
@@ -996,7 +996,7 @@ u32 daAgbsw0_c::TriforceCheck(daAgb_c* agb)
 #endif
         return roomNo == 0x1F ? 0x327 : 0x326;
     }
-    if(dComIfGs_checkGetItem(HOOKSHOT)) {
+    if(dComIfGs_checkGetItem(dItem_HOOKSHOT_e)) {
 #if VERSION == VERSION_JPN
         s8 roomNo = dComIfGp_roomControl_getStayNo();
 #else
@@ -1475,7 +1475,7 @@ BOOL daAgbsw0_c::ExeSubD() {
                     if(itemNo != RECOVER_FAIRY) {
                         current.pos.y += mScale.y / 2;
                     }
-                    if(0 <= itemNo && itemNo < 0x1F && itemNo != KAKERA_HEART && itemNo != UTUWA_HEART && itemNo != SMALL_KEY) {
+                    if(0 <= itemNo && itemNo < 0x1F && itemNo != KAKERA_HEART && itemNo != UTUWA_HEART && itemNo != dItem_SMALL_KEY_e) {
                         s8 roomNo = fopAcM_GetHomeRoomNo(this);
                         f32 rnd = cM_rndF(10.0f) + 40.0f;
                         fopAcM_fastCreateItem(&current.pos, itemNo, roomNo, NULL, NULL, 0.0f, rnd, -7.0f);
@@ -1738,25 +1738,25 @@ BOOL daAgbsw0_c::MoveCheck(s16 param_1) {
 
             break;
         case 0x11:
-            if(dComIfGp_getSelectItem(0) != BOW && dComIfGp_getSelectItem(1) != BOW && dComIfGp_getSelectItem(2) != BOW) {
+            if(dComIfGp_getSelectItem(0) != dItem_BOW_e && dComIfGp_getSelectItem(1) != dItem_BOW_e && dComIfGp_getSelectItem(2) != dItem_BOW_e) {
                 return 0;
             }
 
             break;
         case 0x12:
-            if(dComIfGp_getSelectItem(0) != BOOMERANG && dComIfGp_getSelectItem(1) != BOOMERANG && dComIfGp_getSelectItem(2) != BOOMERANG) {
+            if(dComIfGp_getSelectItem(0) != dItem_BOOMERANG_e && dComIfGp_getSelectItem(1) != dItem_BOOMERANG_e && dComIfGp_getSelectItem(2) != dItem_BOOMERANG_e) {
                 return 0;
             }
 
             break;
         case 0x13:
-            if(dComIfGp_getSelectItem(0) != DEKU_LEAF && dComIfGp_getSelectItem(1) != DEKU_LEAF && dComIfGp_getSelectItem(2) != DEKU_LEAF) {
+            if(dComIfGp_getSelectItem(0) != dItem_DEKU_LEAF_e && dComIfGp_getSelectItem(1) != dItem_DEKU_LEAF_e && dComIfGp_getSelectItem(2) != dItem_DEKU_LEAF_e) {
                 return 0;
             }
 
             break;
         case 0x14:
-            if(dComIfGp_getSelectItem(0) != ROPE && dComIfGp_getSelectItem(1) != ROPE && dComIfGp_getSelectItem(2) != ROPE) {
+            if(dComIfGp_getSelectItem(0) != dItem_GRAPPLING_HOOK_e && dComIfGp_getSelectItem(1) != dItem_GRAPPLING_HOOK_e && dComIfGp_getSelectItem(2) != dItem_GRAPPLING_HOOK_e) {
                 return 0;
             }
 
@@ -1768,13 +1768,13 @@ BOOL daAgbsw0_c::MoveCheck(s16 param_1) {
 
             break;
         case 0x16:
-            if(dComIfGp_getSelectItem(0) != HOOKSHOT && dComIfGp_getSelectItem(1) != HOOKSHOT && dComIfGp_getSelectItem(2) != HOOKSHOT) {
+            if(dComIfGp_getSelectItem(0) != dItem_HOOKSHOT_e && dComIfGp_getSelectItem(1) != dItem_HOOKSHOT_e && dComIfGp_getSelectItem(2) != dItem_HOOKSHOT_e) {
                 return 0;
             }
 
             break;
         case 0x17:
-            if(dComIfGs_checkGetItem(DRGN_SHIELD)) {
+            if(dComIfGs_checkGetItem(dItem_MAGIC_ARMOR_e)) {
                 return 0;
             }
 
@@ -1792,7 +1792,7 @@ BOOL daAgbsw0_c::MoveCheck(s16 param_1) {
 
             break;
         case 0x1A:
-            if(dComIfGs_getItem(12) != NO_ITEM && dComIfGs_getArrowNum() < dComIfGs_getArrowMax()) {
+            if(dComIfGs_getItem(12) != dItem_NONE_e && dComIfGs_getArrowNum() < dComIfGs_getArrowMax()) {
                 return 0;
             }
 
@@ -1816,7 +1816,7 @@ BOOL daAgbsw0_c::MoveCheck(s16 param_1) {
 
             break;
         case 0x1E:
-            if(dComIfGs_getItem(12) != NO_ITEM && dComIfGs_getArrowNum() == 0) {
+            if(dComIfGs_getItem(12) != dItem_NONE_e && dComIfGs_getArrowNum() == 0) {
                 return 0;
             }
 
@@ -1828,7 +1828,7 @@ BOOL daAgbsw0_c::MoveCheck(s16 param_1) {
 
             break;
         case 0x20:
-            if(dComIfGs_isEventBit(0x1708) && dComIfGs_getItem(12) != NO_ITEM && dComIfGs_getArrowNum() == 0) {
+            if(dComIfGs_isEventBit(0x1708) && dComIfGs_getItem(12) != dItem_NONE_e && dComIfGs_getArrowNum() == 0) {
                 return 0;
             }
 
@@ -1869,9 +1869,9 @@ BOOL daAgbsw0_c::MoveCheck(s16 param_1) {
             break;
         case 0x26:
             if (dComIfGp_checkPlayerStatus0(0, daPyStts0_SHIP_RIDE_e) &&
-                dComIfGp_getSelectItem(0) != ROPE &&
-                dComIfGp_getSelectItem(1) != ROPE &&
-                dComIfGp_getSelectItem(2) != ROPE)
+                dComIfGp_getSelectItem(0) != dItem_GRAPPLING_HOOK_e &&
+                dComIfGp_getSelectItem(1) != dItem_GRAPPLING_HOOK_e &&
+                dComIfGp_getSelectItem(2) != dItem_GRAPPLING_HOOK_e)
             {
                 return 0;
             }
@@ -1890,13 +1890,13 @@ BOOL daAgbsw0_c::MoveCheck(s16 param_1) {
 
             break;
         case 0x29:
-            if(dComIfGs_checkGetItem(ROPE)) {
+            if(dComIfGs_checkGetItem(dItem_GRAPPLING_HOOK_e)) {
                 return 0;
             }
 
             break;
         case 0x2A:
-            if(dComIfGs_checkGetItem(BOOMERANG)) {
+            if(dComIfGs_checkGetItem(dItem_BOOMERANG_e)) {
                 return 0;
             }
 
@@ -1908,7 +1908,7 @@ BOOL daAgbsw0_c::MoveCheck(s16 param_1) {
 
             break;
         case 0x2C:
-            if(dComIfGs_getItem(12) != NO_ITEM) {
+            if(dComIfGs_getItem(12) != dItem_NONE_e) {
                 return 0;
             }
 
@@ -2104,13 +2104,13 @@ BOOL daAgbsw0_c::MoveCheck(s16 param_1) {
 
             break;
         case 0x4C:
-            if(dComIfGs_checkGetItem(HUMMER)) {
+            if(dComIfGs_checkGetItem(dItem_SKULL_HAMMER_e)) {
                 return 0;
             }
 
             break;
         case 0x4D:
-            if(!dComIfGs_checkGetItem(HUMMER)) {
+            if(!dComIfGs_checkGetItem(dItem_SKULL_HAMMER_e)) {
                 return 0;
             }
 
@@ -2140,13 +2140,13 @@ BOOL daAgbsw0_c::MoveCheck(s16 param_1) {
 
             break;
         case 0x52:
-            if(dComIfGs_checkGetItem(HOOKSHOT)) {
+            if(dComIfGs_checkGetItem(dItem_HOOKSHOT_e)) {
                 return 0;
             }
 
             break;
         case 0x53:
-            if(!dComIfGs_checkGetItem(HOOKSHOT)) {
+            if(!dComIfGs_checkGetItem(dItem_HOOKSHOT_e)) {
                 return 0;
             }
 
@@ -2176,7 +2176,7 @@ BOOL daAgbsw0_c::MoveCheck(s16 param_1) {
 
             break;
         case 0x58:
-            if(!dComIfGs_checkGetItem(HVY_BOOTS)) {
+            if(!dComIfGs_checkGetItem(dItem_IRON_BOOTS_e)) {
                 return 0;
             }
 
@@ -2426,7 +2426,7 @@ BOOL daAgbsw0_c::MoveCheck(s16 param_1) {
 
             break;
         case 0x7E:
-            if(dComIfGs_checkGetItem(HUMMER) && !dComIfGs_isEventBit(0x2D01)) {
+            if(dComIfGs_checkGetItem(dItem_SKULL_HAMMER_e) && !dComIfGs_isEventBit(0x2D01)) {
                 return 0;
             }
 
diff --git a/src/d/actor/d_a_am.cpp b/src/d/actor/d_a_am.cpp
index c46df343..f065b8fc 100644
--- a/src/d/actor/d_a_am.cpp
+++ b/src/d/actor/d_a_am.cpp
@@ -951,7 +951,7 @@ static void action_itai_move(am_class* i_this) {
 
 /* 000034F4-000039A4       .text daAM_Execute__FP8am_class */
 static BOOL daAM_Execute(am_class* i_this) {
-    fopAcM_setGbaName(i_this, BOW, 0xC, 0x2A);
+    fopAcM_setGbaName(i_this, dItem_BOW_e, 0xC, 0x2A);
 
     if (enemy_ice(&i_this->mEnemyIce)) {
         i_this->mpMorf->getModel()->setBaseTRMtx(mDoMtx_stack_c::get());
diff --git a/src/d/actor/d_a_am2.cpp b/src/d/actor/d_a_am2.cpp
index 89876a1f..b4e2cd12 100644
--- a/src/d/actor/d_a_am2.cpp
+++ b/src/d/actor/d_a_am2.cpp
@@ -1101,7 +1101,7 @@ static BOOL daAM2_Execute(am2_class* i_this) {
         }
     }
 
-    fopAcM_setGbaName(i_this, BOW, 0xB, 0x29);
+    fopAcM_setGbaName(i_this, dItem_BOW_e, 0xB, 0x29);
 
     if (enemy_ice(&i_this->mEnemyIce)) {
         i_this->mpMorf->getModel()->setBaseTRMtx(mDoMtx_stack_c::get());
diff --git a/src/d/actor/d_a_arrow.cpp b/src/d/actor/d_a_arrow.cpp
index e457af61..e9591302 100644
--- a/src/d/actor/d_a_arrow.cpp
+++ b/src/d/actor/d_a_arrow.cpp
@@ -451,19 +451,19 @@ daArrow_c* daArrow_c::changeArrowType() {
     daArrow_c* ret = this;
     
     if (mArrowType == TYPE_NORMAL) {
-        if (dComIfGs_getMagic() < 1 || !(dComIfGs_getItem(0xC) == MAGIC_ARROW || dComIfGs_getItem(0xC) == LIGHT_ARROW)) {
+        if (dComIfGs_getMagic() < 1 || !(dComIfGs_getItem(0xC) == dItem_MAGIC_ARROW_e || dComIfGs_getItem(0xC) == dItem_LIGHT_ARROW_e)) {
             mArrowType = TYPE_NORMAL;
         } else {
             mArrowType = TYPE_FIRE;
         }
     } else if (mArrowType == TYPE_FIRE) {
-        if (dComIfGs_getMagic() < 1 || !(dComIfGs_getItem(0xC) == MAGIC_ARROW || dComIfGs_getItem(0xC) == LIGHT_ARROW)) {
+        if (dComIfGs_getMagic() < 1 || !(dComIfGs_getItem(0xC) == dItem_MAGIC_ARROW_e || dComIfGs_getItem(0xC) == dItem_LIGHT_ARROW_e)) {
             mArrowType = TYPE_NORMAL;
         } else {
             mArrowType = TYPE_ICE;
         }
     } else if (mArrowType == TYPE_ICE) {
-        if (dComIfGs_getMagic() < 2 || dComIfGs_getItem(0xC) != LIGHT_ARROW) {
+        if (dComIfGs_getMagic() < 2 || dComIfGs_getItem(0xC) != dItem_LIGHT_ARROW_e) {
             mArrowType = TYPE_NORMAL;
         } else {
             mArrowType = TYPE_LIGHT;
@@ -496,18 +496,18 @@ void daArrow_c::changeArrowTypeNotReady() {
         if (dComIfGs_getMagic() < 1) {
             return;
         }
-        if (dComIfGs_getItem(0xC) == MAGIC_ARROW || dComIfGs_getItem(0xC) == LIGHT_ARROW) {
+        if (dComIfGs_getItem(0xC) == dItem_MAGIC_ARROW_e || dComIfGs_getItem(0xC) == dItem_LIGHT_ARROW_e) {
             m_keep_type = TYPE_FIRE;
         }
     } else if (m_keep_type == TYPE_FIRE) {
         if (dComIfGs_getMagic() < 1) {
             return;
         }
-        if (dComIfGs_getItem(0xC) == MAGIC_ARROW || dComIfGs_getItem(0xC) == LIGHT_ARROW) {
+        if (dComIfGs_getItem(0xC) == dItem_MAGIC_ARROW_e || dComIfGs_getItem(0xC) == dItem_LIGHT_ARROW_e) {
             m_keep_type = TYPE_ICE;
         }
     } else if (m_keep_type == TYPE_ICE) {
-        if (dComIfGs_getMagic() >= 2 && dComIfGs_getItem(0xC) == LIGHT_ARROW) {
+        if (dComIfGs_getMagic() >= 2 && dComIfGs_getItem(0xC) == dItem_LIGHT_ARROW_e) {
             m_keep_type = TYPE_LIGHT;
         } else {
             m_keep_type = TYPE_NORMAL;
diff --git a/src/d/actor/d_a_demo_item.cpp b/src/d/actor/d_a_demo_item.cpp
index 86f0ac97..360299f1 100644
--- a/src/d/actor/d_a_demo_item.cpp
+++ b/src/d/actor/d_a_demo_item.cpp
@@ -19,262 +19,262 @@ static u8 dummy[0x4C]; // TODO
 const int daDitem_c::m_rot_time = 8*30;
 
 u8 daDitem_c::m_effect_type[0x100] = {
-    /* HEART            */ 0x04,
-    /* GREEN_RUPEE      */ 0x03,
-    /* BLUE_RUPEE       */ 0x03,
-    /* YELLOW_RUPEE     */ 0x03,
-    /* RED_RUPEE        */ 0x03,
-    /* PURPLE_RUPEE     */ 0x03,
-    /* ORANGE_RUPEE     */ 0x03,
-    /* KAKERA_HEART     */ 0x00,
-    /* UTUWA_HEART      */ 0x00,
-    /* S_MAGIC          */ 0x04,
-    /* L_MAGIC          */ 0x04,
-    /* BOMB_5           */ 0x04,
-    /* BOMB_10          */ 0x04,
-    /* BOMB_20          */ 0x04,
-    /* BOMB_30          */ 0x04,
-    /* SILVER_RUPEE     */ 0x03,
-    /* ARROW_10         */ 0x04,
-    /* ARROW_20         */ 0x04,
-    /* ARROW_30         */ 0x04,
-    /* noentry19        */ 0x04,
-    /* noentry20        */ 0x04,
-    /* SMALL_KEY        */ 0x02,
-    /* RECOVER_FAIRY    */ 0x04,
-    /* noentry23        */ 0x04,
-    /* noentry24        */ 0x04,
-    /* noentry25        */ 0x04,
-    /* SUB_DUN_RUPEE    */ 0x03,
-    /* noentry27        */ 0x04,
-    /* noentry28        */ 0x04,
-    /* noentry29        */ 0x04,
-    /* TRIPLE_HEART     */ 0x04,
-    /* PENDANT          */ 0x01,
-    /* TELESCOPE        */ 0x00,
-    /* TNCL_WHITSL      */ 0x00,
-    /* WIND_TACT        */ 0x00,
-    /* CAMERA           */ 0x00,
-    /* EMONO_BAG        */ 0x00,
-    /* ROPE             */ 0x00,
-    /* CAMERA2          */ 0x00,
-    /* BOW              */ 0x00,
-    /* PWR_GROOVE       */ 0x00,
-    /* HVY_BOOTS        */ 0x00,
-    /* DRGN_SHIELD      */ 0x00,
-    /* WATER_BOOTS      */ 0x04,
-    /* ESA_BAG          */ 0x00,
-    /* BOOMERANG        */ 0x00,
-    /* BARE_HAND        */ 0x04,
-    /* HOOKSHOT         */ 0x00,
-    /* WARASHIBE_BAG    */ 0x00,
-    /* BOMB_BAG         */ 0x00,
-    /* FUKU             */ 0x03,
-    /* HUMMER           */ 0x00,
-    /* DEKU_LEAF        */ 0x00,
-    /* MAGIC_ARROW      */ 0x00,
-    /* LIGHT_ARROW      */ 0x00,
-    /* noentry55        */ 0x04,
-    /* SWORD            */ 0x00,
-    /* MASTER_SWORD     */ 0x00,
-    /* LV3_SWORD        */ 0x04,
-    /* SHIELD           */ 0x00,
-    /* MIRROR_SHIELD    */ 0x00,
-    /* DROPPED_SWORD    */ 0x00,
-    /* MASTER_SWORD_EX  */ 0x04,
-    /* KAKERA_HEART2    */ 0x01,
-    /* noentry64        */ 0x04,
-    /* noentry65        */ 0x04,
-    /* PIRATES_OMAMORI  */ 0x00,
-    /* HEROS_OMAMORI    */ 0x00,
-    /* GRASS_BALL       */ 0x04,
-    /* SKULL_NECKLACE   */ 0x01,
-    /* BOKOBABA_SEED    */ 0x01,
-    /* GOLDEN_FEATHER   */ 0x01,
-    /* BOKO_BELT        */ 0x01,
-    /* RED_JELLY        */ 0x01,
-    /* GREEN_JELLY      */ 0x01,
-    /* BLUE_JELLY       */ 0x01,
-    /* MAP              */ 0x01,
-    /* COMPASS          */ 0x01,
-    /* BOSS_KEY         */ 0x00,
-    /* EMPTY_BSHIP      */ 0x04,
-    /* EMPTY_BOTTLE     */ 0x00,
-    /* RED_BOTTLE       */ 0x02,
-    /* GREEN_BOTTLE     */ 0x02,
-    /* BLUE_BOTTLE      */ 0x02,
-    /* BOTTLESHIP       */ 0x00,
-    /* SOUP_BOTTLE      */ 0x00,
-    /* BIN_IN_WATER     */ 0x02,
-    /* FAIRY_BOTTLE     */ 0x02,
-    /* FIREFLY_BOTTLE   */ 0x00,
-    /* FWATER_BOTTLE    */ 0x02,
-    /* UNK_BOTTLE_5A    */ 0x04,
-    /* UNK_BOTTLE_5B    */ 0x04,
-    /* UNK_BOTTLE_5C    */ 0x04,
-    /* UNK_BOTTLE_5D    */ 0x04,
-    /* UNK_BOTTLE_5E    */ 0x04,
-    /* UNK_BOTTLE_5F    */ 0x04,
-    /* UNK_BOTTLE_60    */ 0x04,
-    /* TRIFORCE1        */ 0x00,
-    /* TRIFORCE2        */ 0x00,
-    /* TRIFORCE3        */ 0x00,
-    /* TRIFORCE4        */ 0x00,
-    /* TRIFORCE5        */ 0x00,
-    /* TRIFORCE6        */ 0x00,
-    /* TRIFORCE7        */ 0x00,
-    /* TRIFORCE8        */ 0x00,
-    /* PEARL1           */ 0x00,
-    /* PEARL2           */ 0x00,
-    /* PEARL3           */ 0x00,
-    /* KNOWLEDGE_TF     */ 0x04,
-    /* TACT_SONG1       */ 0x04,
-    /* TACT_SONG2       */ 0x04,
-    /* TACT_SONG3       */ 0x04,
-    /* TACT_SONG4       */ 0x04,
-    /* TACT_SONG5       */ 0x04,
-    /* TACT_SONG6       */ 0x04,
-    /* noentry115       */ 0x04,
-    /* noentry116       */ 0x04,
-    /* noentry117       */ 0x04,
-    /* noentry118       */ 0x04,
-    /* noentry119       */ 0x04,
-    /* NORMAL_SAIL      */ 0x00,
-    /* TRIFORCE_MAP1    */ 0x00,
-    /* TRIFORCE_MAP2    */ 0x00,
-    /* TRIFORCE_MAP3    */ 0x00,
-    /* TRIFORCE_MAP4    */ 0x00,
-    /* TRIFORCE_MAP5    */ 0x00,
-    /* TRIFORCE_MAP6    */ 0x00,
-    /* TRIFORCE_MAP7    */ 0x00,
-    /* TRIFORCE_MAP8    */ 0x00,
-    /* noentry129       */ 0x04,
-    /* BIRD_ESA_5       */ 0x02,
-    /* ANIMAL_ESA       */ 0x02,
-    /* ESA1             */ 0x04,
-    /* ESA2             */ 0x04,
-    /* ESA3             */ 0x04,
-    /* ESA4             */ 0x04,
-    /* ESA5             */ 0x04,
-    /* MAGIC_BEAN       */ 0x04,
-    /* BIRD_ESA_10      */ 0x04,
-    /* noentry139       */ 0x04,
-    /* FLOWER_1         */ 0x02,
-    /* FLOWER_2         */ 0x02,
-    /* FLOWER_3         */ 0x02,
-    /* HEROS_FLAG       */ 0x02,
-    /* TAIRYO_FLAG      */ 0x02,
-    /* SALES_FLAG       */ 0x02,
-    /* WIND_FLAG        */ 0x02,
-    /* RED_FLAG         */ 0x02,
-    /* FOSSIL_HEAD      */ 0x02,
-    /* WATER_STATUE     */ 0x02,
-    /* POSTMAN_STATUE   */ 0x02,
-    /* PRESIDENT_STATUE */ 0x02,
-    /* LETTER00         */ 0x02,
-    /* MAGIC_SEED       */ 0x02,
-    /* MAGYS_LETTER     */ 0x02,
-    /* MO_LETTER        */ 0x02,
-    /* COTTAGE_PAPER    */ 0x00,
-    /* KAISEN_PRESENT1  */ 0x02,
-    /* KAISEN_PRESENT2  */ 0x02,
-    /* SALVAGE_ITEM1    */ 0x00,
-    /* SALVAGE_ITEM2    */ 0x04,
-    /* SALVAGE_ITEM3    */ 0x04,
-    /* XXX_039          */ 0x04,
-    /* TINGLE_STATUE1   */ 0x00,
-    /* TINGLE_STATUE2   */ 0x00,
-    /* TINGLE_STATUE3   */ 0x00,
-    /* TINGLE_STATUE4   */ 0x00,
-    /* TINGLE_STATUE5   */ 0x00,
-    /* TINGLE_STATUE6   */ 0x00,
-    /* noentry169       */ 0x04,
-    /* HURRICANE_SPIN   */ 0x04,
-    /* MAX_RUPEE_UP1    */ 0x00,
-    /* MAX_RUPEE_UP2    */ 0x00,
-    /* MAX_BOMB_UP1     */ 0x00,
-    /* MAX_BOMB_UP2     */ 0x00,
-    /* MAX_ARROW_UP1    */ 0x00,
-    /* MAX_ARROW_UP2    */ 0x00,
-    /* MAGIC_POWER      */ 0x04,
-    /* MAX_MP_UP1       */ 0x04,
-    /* TINCLE_RUPEE1    */ 0x03,
-    /* TINCLE_RUPEE2    */ 0x03,
-    /* TINCLE_RUPEE3    */ 0x03,
-    /* TINCLE_RUPEE4    */ 0x03,
-    /* TINCLE_RUPEE5    */ 0x03,
-    /* TINCLE_RUPEE6    */ 0x03,
-    /* LITHOGRAPH1      */ 0x04,
-    /* LITHOGRAPH2      */ 0x04,
-    /* LITHOGRAPH3      */ 0x04,
-    /* LITHOGRAPH4      */ 0x04,
-    /* LITHOGRAPH5      */ 0x04,
-    /* LITHOGRAPH6      */ 0x04,
-    /* COLLECT_MAP_64   */ 0x04,
-    /* COLLECT_MAP_63   */ 0x04,
-    /* COLLECT_MAP_62   */ 0x04,
-    /* COLLECT_MAP_61   */ 0x00,
-    /* COLLECT_MAP_60   */ 0x00,
-    /* COLLECT_MAP_59   */ 0x00,
-    /* COLLECT_MAP_58   */ 0x00,
-    /* COLLECT_MAP_57   */ 0x00,
-    /* COLLECT_MAP_56   */ 0x00,
-    /* COLLECT_MAP_55   */ 0x00,
-    /* COLLECT_MAP_54   */ 0x00,
-    /* COLLECT_MAP_53   */ 0x00,
-    /* COLLECT_MAP_52   */ 0x00,
-    /* COLLECT_MAP_51   */ 0x00,
-    /* COLLECT_MAP_50   */ 0x00,
-    /* COLLECT_MAP_49   */ 0x00,
-    /* COLLECT_MAP_48   */ 0x00,
-    /* COLLECT_MAP_47   */ 0x00,
-    /* COLLECT_MAP_46   */ 0x00,
-    /* COLLECT_MAP_45   */ 0x00,
-    /* COLLECT_MAP_44   */ 0x00,
-    /* COLLECT_MAP_43   */ 0x00,
-    /* COLLECT_MAP_42   */ 0x00,
-    /* COLLECT_MAP_41   */ 0x00,
-    /* COLLECT_MAP_40   */ 0x00,
-    /* COLLECT_MAP_39   */ 0x00,
-    /* COLLECT_MAP_38   */ 0x00,
-    /* COLLECT_MAP_37   */ 0x00,
-    /* COLLECT_MAP_36   */ 0x00,
-    /* COLLECT_MAP_35   */ 0x00,
-    /* COLLECT_MAP_34   */ 0x00,
-    /* COLLECT_MAP_33   */ 0x00,
-    /* COLLECT_MAP_32   */ 0x00,
-    /* COLLECT_MAP_31   */ 0x00,
-    /* COLLECT_MAP_30   */ 0x00,
-    /* COLLECT_MAP_29   */ 0x00,
-    /* COLLECT_MAP_28   */ 0x00,
-    /* COLLECT_MAP_27   */ 0x00,
-    /* COLLECT_MAP_26   */ 0x00,
-    /* COLLECT_MAP_25   */ 0x00,
-    /* COLLECT_MAP_24   */ 0x00,
-    /* COLLECT_MAP_23   */ 0x00,
-    /* COLLECT_MAP_22   */ 0x00,
-    /* COLLECT_MAP_21   */ 0x00,
-    /* COLLECT_MAP_20   */ 0x00,
-    /* COLLECT_MAP_19   */ 0x00,
-    /* COLLECT_MAP_18   */ 0x00,
-    /* COLLECT_MAP_17   */ 0x00,
-    /* COLLECT_MAP_16   */ 0x00,
-    /* COLLECT_MAP_15   */ 0x00,
-    /* COLLECT_MAP_14   */ 0x00,
-    /* COLLECT_MAP_13   */ 0x00,
-    /* COLLECT_MAP_12   */ 0x00,
-    /* COLLECT_MAP_11   */ 0x00,
-    /* COLLECT_MAP_10   */ 0x00,
-    /* COLLECT_MAP_09   */ 0x00,
-    /* COLLECT_MAP_08   */ 0x00,
-    /* COLLECT_MAP_07   */ 0x00,
-    /* COLLECT_MAP_06   */ 0x00,
-    /* COLLECT_MAP_05   */ 0x00,
-    /* COLLECT_MAP_04   */ 0x00,
-    /* COLLECT_MAP_03   */ 0x00,
-    /* COLLECT_MAP_02   */ 0x00,
-    /* COLLECT_MAP_01   */ 0x00,
-    /* NO_ITEM          */ 0x04,
+    0x04, // dItem_HEART_e
+    0x03, // dItem_GREEN_RUPEE_e
+    0x03, // dItem_BLUE_RUPEE_e
+    0x03, // dItem_YELLOW_RUPEE_e
+    0x03, // dItem_RED_RUPEE_e
+    0x03, // dItem_PURPLE_RUPEE_e
+    0x03, // dItem_ORANGE_RUPEE_e
+    0x00, // KAKERA_HEART
+    0x00, // UTUWA_HEART
+    0x04, // S_MAGIC
+    0x04, // L_MAGIC
+    0x04, // BOMB_5
+    0x04, // BOMB_10
+    0x04, // BOMB_20
+    0x04, // BOMB_30
+    0x03, // dItem_SILVER_RUPEE_e
+    0x04, // ARROW_10
+    0x04, // ARROW_20
+    0x04, // ARROW_30
+    0x04, // noentry19
+    0x04, // noentry20
+    0x02, // dItem_SMALL_KEY_e
+    0x04, // RECOVER_FAIRY
+    0x04, // noentry23
+    0x04, // noentry24
+    0x04, // noentry25
+    0x03, // SUB_DUN_RUPEE
+    0x04, // noentry27
+    0x04, // noentry28
+    0x04, // noentry29
+    0x04, // dItem_TRIPLE_HEART_e
+    0x01, // dItem_JOY_PENDANT_e
+    0x00, // dItem_TELESCOPE_e
+    0x00, // dItem_TINGLE_TUNER_e
+    0x00, // dItem_WIND_WAKER_e
+    0x00, // CAMERA
+    0x00, // EMONO_BAG
+    0x00, // dItem_GRAPPLING_HOOK_e
+    0x00, // CAMERA2
+    0x00, // dItem_BOW_e
+    0x00, // PWR_GROOVE
+    0x00, // dItem_IRON_BOOTS_e
+    0x00, // dItem_MAGIC_ARMOR_e
+    0x04, // WATER_BOOTS
+    0x00, // ESA_BAG
+    0x00, // dItem_BOOMERANG_e
+    0x04, // BARE_HAND
+    0x00, // dItem_HOOKSHOT_e
+    0x00, // dItem_DELIVERY_BAG_e
+    0x00, // BOMB_BAG
+    0x03, // dItem_FUKU_e
+    0x00, // dItem_SKULL_HAMMER_e
+    0x00, // dItem_DEKU_LEAF_e
+    0x00, // dItem_MAGIC_ARROW_e
+    0x00, // dItem_LIGHT_ARROW_e
+    0x04, // dItem_NEW_FUKU_e
+    0x00, // SWORD
+    0x00, // MASTER_SWORD
+    0x04, // LV3_SWORD
+    0x00, // SHIELD
+    0x00, // MIRROR_SHIELD
+    0x00, // DROPPED_SWORD
+    0x04, // MASTER_SWORD_EX
+    0x01, // KAKERA_HEART2
+    0x04, // noentry64
+    0x04, // noentry65
+    0x00, // PIRATES_OMAMORI
+    0x00, // HEROS_OMAMORI
+    0x04, // GRASS_BALL
+    0x01, // SKULL_NECKLACE
+    0x01, // BOKOBABA_SEED
+    0x01, // GOLDEN_FEATHER
+    0x01, // BOKO_BELT
+    0x01, // RED_JELLY
+    0x01, // GREEN_JELLY
+    0x01, // BLUE_JELLY
+    0x01, // dItem_MAP_e
+    0x01, // dItem_COMPASS_e
+    0x00, // dItem_BOSS_KEY_e
+    0x04, // EMPTY_BSHIP
+    0x00, // EMPTY_BOTTLE
+    0x02, // RED_BOTTLE
+    0x02, // GREEN_BOTTLE
+    0x02, // BLUE_BOTTLE
+    0x00, // dItem_HALF_SOUP_BOTTLE_e
+    0x00, // dItem_SOUP_BOTTLE_e
+    0x02, // BIN_IN_WATER
+    0x02, // FAIRY_BOTTLE
+    0x00, // FIREFLY_BOTTLE
+    0x02, // FWATER_BOTTLE
+    0x04, // UNK_BOTTLE_5A
+    0x04, // UNK_BOTTLE_5B
+    0x04, // UNK_BOTTLE_5C
+    0x04, // UNK_BOTTLE_5D
+    0x04, // UNK_BOTTLE_5E
+    0x04, // UNK_BOTTLE_5F
+    0x04, // UNK_BOTTLE_60
+    0x00, // TRIFORCE1
+    0x00, // TRIFORCE2
+    0x00, // TRIFORCE3
+    0x00, // TRIFORCE4
+    0x00, // TRIFORCE5
+    0x00, // TRIFORCE6
+    0x00, // TRIFORCE7
+    0x00, // TRIFORCE8
+    0x00, // dItem_PEARL_NAYRU_e
+    0x00, // dItem_PEARL_DIN_e
+    0x00, // dItem_PEARL_FARORE_e
+    0x04, // KNOWLEDGE_TF
+    0x04, // TACT_SONG1
+    0x04, // TACT_SONG2
+    0x04, // TACT_SONG3
+    0x04, // TACT_SONG4
+    0x04, // TACT_SONG5
+    0x04, // TACT_SONG6
+    0x04, // noentry115
+    0x04, // noentry116
+    0x04, // noentry117
+    0x04, // noentry118
+    0x04, // noentry119
+    0x00, // NORMAL_SAIL
+    0x00, // TRIFORCE_MAP1
+    0x00, // TRIFORCE_MAP2
+    0x00, // TRIFORCE_MAP3
+    0x00, // TRIFORCE_MAP4
+    0x00, // TRIFORCE_MAP5
+    0x00, // TRIFORCE_MAP6
+    0x00, // TRIFORCE_MAP7
+    0x00, // TRIFORCE_MAP8
+    0x04, // noentry129
+    0x02, // BIRD_ESA_5
+    0x02, // dItem_HYOI_PEAR_e
+    0x04, // ESA1
+    0x04, // ESA2
+    0x04, // ESA3
+    0x04, // ESA4
+    0x04, // ESA5
+    0x04, // MAGIC_BEAN
+    0x04, // BIRD_ESA_10
+    0x04, // noentry139
+    0x02, // FLOWER_1
+    0x02, // FLOWER_2
+    0x02, // FLOWER_3
+    0x02, // HEROS_FLAG
+    0x02, // TAIRYO_FLAG
+    0x02, // SALES_FLAG
+    0x02, // WIND_FLAG
+    0x02, // RED_FLAG
+    0x02, // FOSSIL_HEAD
+    0x02, // WATER_STATUE
+    0x02, // POSTMAN_STATUE
+    0x02, // PRESIDENT_STATUE
+    0x02, // dItem_FATHER_LETTER_e
+    0x02, // dItem_NOTE_TO_MOM_e
+    0x02, // MAGYS_LETTER
+    0x02, // MO_LETTER
+    0x00, // COTTAGE_PAPER
+    0x02, // KAISEN_PRESENT1
+    0x02, // KAISEN_PRESENT2
+    0x00, // SALVAGE_ITEM1
+    0x04, // SALVAGE_ITEM2
+    0x04, // SALVAGE_ITEM3
+    0x04, // XXX_039
+    0x00, // TINGLE_STATUE1
+    0x00, // TINGLE_STATUE2
+    0x00, // TINGLE_STATUE3
+    0x00, // TINGLE_STATUE4
+    0x00, // TINGLE_STATUE5
+    0x00, // TINGLE_STATUE6
+    0x04, // noentry169
+    0x04, // dItem_HURRICANE_SPIN_e
+    0x00, // MAX_RUPEE_UP1
+    0x00, // MAX_RUPEE_UP2
+    0x00, // MAX_BOMB_UP1
+    0x00, // MAX_BOMB_UP2
+    0x00, // MAX_ARROW_UP1
+    0x00, // MAX_ARROW_UP2
+    0x04, // MAGIC_POWER
+    0x04, // MAX_MP_UP1
+    0x03, // TINCLE_RUPEE1
+    0x03, // TINCLE_RUPEE2
+    0x03, // TINCLE_RUPEE3
+    0x03, // TINCLE_RUPEE4
+    0x03, // TINCLE_RUPEE5
+    0x03, // TINCLE_RUPEE6
+    0x04, // LITHOGRAPH1
+    0x04, // LITHOGRAPH2
+    0x04, // LITHOGRAPH3
+    0x04, // LITHOGRAPH4
+    0x04, // LITHOGRAPH5
+    0x04, // LITHOGRAPH6
+    0x04, // COLLECT_MAP_64
+    0x04, // COLLECT_MAP_63
+    0x04, // COLLECT_MAP_62
+    0x00, // COLLECT_MAP_61
+    0x00, // COLLECT_MAP_60
+    0x00, // COLLECT_MAP_59
+    0x00, // COLLECT_MAP_58
+    0x00, // COLLECT_MAP_57
+    0x00, // COLLECT_MAP_56
+    0x00, // COLLECT_MAP_55
+    0x00, // COLLECT_MAP_54
+    0x00, // COLLECT_MAP_53
+    0x00, // COLLECT_MAP_52
+    0x00, // COLLECT_MAP_51
+    0x00, // COLLECT_MAP_50
+    0x00, // COLLECT_MAP_49
+    0x00, // COLLECT_MAP_48
+    0x00, // COLLECT_MAP_47
+    0x00, // COLLECT_MAP_46
+    0x00, // COLLECT_MAP_45
+    0x00, // COLLECT_MAP_44
+    0x00, // COLLECT_MAP_43
+    0x00, // COLLECT_MAP_42
+    0x00, // COLLECT_MAP_41
+    0x00, // COLLECT_MAP_40
+    0x00, // COLLECT_MAP_39
+    0x00, // COLLECT_MAP_38
+    0x00, // COLLECT_MAP_37
+    0x00, // COLLECT_MAP_36
+    0x00, // COLLECT_MAP_35
+    0x00, // COLLECT_MAP_34
+    0x00, // COLLECT_MAP_33
+    0x00, // COLLECT_MAP_32
+    0x00, // COLLECT_MAP_31
+    0x00, // COLLECT_MAP_30
+    0x00, // COLLECT_MAP_29
+    0x00, // COLLECT_MAP_28
+    0x00, // COLLECT_MAP_27
+    0x00, // COLLECT_MAP_26
+    0x00, // COLLECT_MAP_25
+    0x00, // COLLECT_MAP_24
+    0x00, // COLLECT_MAP_23
+    0x00, // COLLECT_MAP_22
+    0x00, // COLLECT_MAP_21
+    0x00, // COLLECT_MAP_20
+    0x00, // COLLECT_MAP_19
+    0x00, // COLLECT_MAP_18
+    0x00, // COLLECT_MAP_17
+    0x00, // COLLECT_MAP_16
+    0x00, // COLLECT_MAP_15
+    0x00, // COLLECT_MAP_14
+    0x00, // COLLECT_MAP_13
+    0x00, // COLLECT_MAP_12
+    0x00, // COLLECT_MAP_11
+    0x00, // COLLECT_MAP_10
+    0x00, // COLLECT_MAP_09
+    0x00, // COLLECT_MAP_08
+    0x00, // COLLECT_MAP_07
+    0x00, // COLLECT_MAP_06
+    0x00, // COLLECT_MAP_05
+    0x00, // COLLECT_MAP_04
+    0x00, // COLLECT_MAP_03
+    0x00, // COLLECT_MAP_02
+    0x00, // COLLECT_MAP_01
+    0x04, // dItem_NONE_e
 };
 
 /* 000000EC-00000320       .text setParticle__9daDitem_cFv */
@@ -382,8 +382,8 @@ void daDitem_c::anim_control() {
     case RED_BOTTLE:
     case GREEN_BOTTLE:
     case BLUE_BOTTLE:
-    case BOTTLESHIP:
-    case SOUP_BOTTLE:
+    case dItem_HALF_SOUP_BOTTLE_e:
+    case dItem_SOUP_BOTTLE_e:
     case BIN_IN_WATER:
     case FAIRY_BOTTLE:
     case FIREFLY_BOTTLE:
@@ -427,7 +427,7 @@ void daDitem_c::set_mtx() {
 
 /* 00000880-000008F0       .text settingBeforeDraw__9daDitem_cFv */
 void daDitem_c::settingBeforeDraw() {
-    if (isBomb(m_itemNo) || m_itemNo == BOMB_BAG || m_itemNo == HUMMER || m_itemNo == SMALL_KEY) {
+    if (isBomb(m_itemNo) || m_itemNo == BOMB_BAG || m_itemNo == dItem_SKULL_HAMMER_e || m_itemNo == dItem_SMALL_KEY_e) {
         dDlst_texSpecmapST(&mEyePos, &mTevStr, mpModel->getModelData(), 1.0f);
     }
 }
@@ -459,7 +459,7 @@ s32 daDitem_c::create() {
     
     char* arcName = dItem_data::getArcname(m_itemNo);
     if (dItem_data::getBmdIdx(m_itemNo) == -1 || arcName == NULL) {
-        m_itemNo = GREEN_RUPEE;
+        m_itemNo = dItem_GREEN_RUPEE_e;
     }
     
     s32 phase_state = dComIfG_resLoad(&mPhs, dItem_data::getArcname(m_itemNo));
diff --git a/src/d/actor/d_a_disappear.cpp b/src/d/actor/d_a_disappear.cpp
index bad64fc7..9bb81a01 100644
--- a/src/d/actor/d_a_disappear.cpp
+++ b/src/d/actor/d_a_disappear.cpp
@@ -33,7 +33,7 @@ static BOOL daDisappear_Execute(disappear_class* i_this) {
                     // Special type for Keese (ki) spawned in the Puppet Ganon fight.
                     if (health < 0x0D) {
                         static u32 ki_item_d[] = {
-                            HEART,
+                            dItem_HEART_e,
                             L_MAGIC,
                             ARROW_10,
                         };
diff --git a/src/d/actor/d_a_ib.cpp b/src/d/actor/d_a_ib.cpp
index e45585c5..373e7092 100644
--- a/src/d/actor/d_a_ib.cpp
+++ b/src/d/actor/d_a_ib.cpp
@@ -138,11 +138,11 @@ BOOL daIball_c::createItem() {
             itemBitNo = daIball_prm::getItemBitNo(this);
             if ((itemBitNo == 0x1F || itemBitNo == 0xFF || itemBitNo == -1) || fopAcM_isItemForIb(itemBitNo, items[i], current.roomNo)) {
                 itemBitNo = -1;
-                items[i] = YELLOW_RUPEE;
+                items[i] = dItem_YELLOW_RUPEE_e;
             }
         } else if (isNonSavedEmono(items[i])) {
             if (daIball_prm::getItemBitNo(this) != 0) {
-                items[i] = YELLOW_RUPEE;
+                items[i] = dItem_YELLOW_RUPEE_e;
             }
             itemBitNo = -1;
         }
diff --git a/src/d/actor/d_a_item.cpp b/src/d/actor/d_a_item.cpp
index 6323aa18..3c052af3 100644
--- a/src/d/actor/d_a_item.cpp
+++ b/src/d/actor/d_a_item.cpp
@@ -49,8 +49,8 @@ float daItem_c::getYOffset() {
     case GREEN_JELLY:
     case BLUE_JELLY:
         return 0.0f;
-    case SMALL_KEY:
-    case BOSS_KEY:
+    case dItem_SMALL_KEY_e:
+    case dItem_BOSS_KEY_e:
         return 0.0f;
     case SHIELD:
         return 23.0f;
@@ -61,15 +61,15 @@ float daItem_c::getYOffset() {
     case KAKERA_HEART:
     case UTUWA_HEART:
         return 0.0f;
-    case GREEN_RUPEE:
-    case BLUE_RUPEE:
-    case YELLOW_RUPEE:
-    case RED_RUPEE:
-    case PURPLE_RUPEE:
-    case ORANGE_RUPEE:
-    case SILVER_RUPEE:
+    case dItem_GREEN_RUPEE_e:
+    case dItem_BLUE_RUPEE_e:
+    case dItem_YELLOW_RUPEE_e:
+    case dItem_RED_RUPEE_e:
+    case dItem_PURPLE_RUPEE_e:
+    case dItem_ORANGE_RUPEE_e:
+    case dItem_SILVER_RUPEE_e:
         return 0.0f;
-    case HEART:
+    case dItem_HEART_e:
         return 0.0f;
     default:
         return 0.0f;
@@ -168,7 +168,7 @@ void daItem_c::CreateInit() {
     
     show();
     
-    if (dItem_data::checkSpecialEffect(m_itemNo) && (m_itemNo != SMALL_KEY || (m_itemNo == SMALL_KEY && checkFlag(FLAG_UNK02)))) {
+    if (dItem_data::checkSpecialEffect(m_itemNo) && (m_itemNo != dItem_SMALL_KEY_e || (m_itemNo == dItem_SMALL_KEY_e && checkFlag(FLAG_UNK02)))) {
         u16 particleID = dItem_data::getSpecialEffect(m_itemNo);
         dComIfGp_particle_set(particleID, &current.pos, NULL, NULL, 0xFF, &mPtclFollowCb);
     }
@@ -582,35 +582,35 @@ void daItem_c::itemGetExecute() {
     mItemStatus = STATUS_INIT_NORMAL;
     
     switch (m_itemNo) {
-    case HEART:
+    case dItem_HEART_e:
         mDoAud_seStart(JA_SE_HEART_PIECE);
         execItemGet(m_itemNo);
         break;
-    case GREEN_RUPEE:
+    case dItem_GREEN_RUPEE_e:
         mDoAud_seStart(JA_SE_LUPY_GET);
         execItemGet(m_itemNo);
         break;
-    case BLUE_RUPEE:
+    case dItem_BLUE_RUPEE_e:
         mDoAud_seStart(JA_SE_BLUE_LUPY_GET);
         execItemGet(m_itemNo);
         break;
-    case YELLOW_RUPEE:
+    case dItem_YELLOW_RUPEE_e:
         mDoAud_seStart(JA_SE_BLUE_LUPY_GET);
         execItemGet(m_itemNo);
         break;
-    case RED_RUPEE:
+    case dItem_RED_RUPEE_e:
         mDoAud_seStart(JA_SE_RED_LUPY_GET);
         execItemGet(m_itemNo);
         break;
-    case PURPLE_RUPEE:
+    case dItem_PURPLE_RUPEE_e:
         mDoAud_seStart(JA_SE_RED_LUPY_GET);
         execItemGet(m_itemNo);
         break;
-    case ORANGE_RUPEE:
+    case dItem_ORANGE_RUPEE_e:
         mDoAud_seStart(JA_SE_RED_LUPY_GET);
         execItemGet(m_itemNo);
         break;
-    case SILVER_RUPEE:
+    case dItem_SILVER_RUPEE_e:
         mDoAud_seStart(JA_SE_RED_LUPY_GET);
         execItemGet(m_itemNo);
         break;
@@ -640,14 +640,14 @@ void daItem_c::itemGetExecute() {
         mDoAud_seStart(JA_SE_CONSUMP_ITEM_GET);
         execItemGet(m_itemNo);
         break;
-    case SMALL_KEY:
+    case dItem_SMALL_KEY_e:
         mItemStatus = STATUS_INIT_GET_DEMO;
         break;
-    case TRIPLE_HEART:
+    case dItem_TRIPLE_HEART_e:
         mDoAud_seStart(JA_SE_HEART_PIECE);
         execItemGet(m_itemNo);
         break;
-    case PENDANT:
+    case dItem_JOY_PENDANT_e:
         mDoAud_seStart(JA_SE_SPOILS_GET);
         if (!dComIfGs_isGetItemBeast(7)) {
             mItemStatus = STATUS_INIT_GET_DEMO;
@@ -656,7 +656,7 @@ void daItem_c::itemGetExecute() {
             execItemGet(m_itemNo);
         }
         break;
-    case DEKU_LEAF:
+    case dItem_DEKU_LEAF_e:
         mItemStatus = STATUS_INIT_GET_DEMO;
         break;
     case SWORD:
@@ -748,7 +748,7 @@ void daItem_c::itemGetExecute() {
             execItemGet(m_itemNo);
         }
         break;
-    case ANIMAL_ESA:
+    case dItem_HYOI_PEAR_e:
         mDoAud_seStart(JA_SE_ESA_GET);
         if (!dComIfGs_isGetItemBait(1)) {
             mItemStatus = STATUS_INIT_GET_DEMO;
@@ -1132,12 +1132,12 @@ void daItem_c::set_bound_se() {
     }
     
     switch (m_itemNo) {
-    case GREEN_RUPEE:
-    case BLUE_RUPEE:
-    case YELLOW_RUPEE:
-    case RED_RUPEE:
-    case PURPLE_RUPEE:
-    case ORANGE_RUPEE:
+    case dItem_GREEN_RUPEE_e:
+    case dItem_BLUE_RUPEE_e:
+    case dItem_YELLOW_RUPEE_e:
+    case dItem_RED_RUPEE_e:
+    case dItem_PURPLE_RUPEE_e:
+    case dItem_ORANGE_RUPEE_e:
         fopAcM_seStart(this, JA_SE_OBJ_LUPY_BOUND, temp);
         break;
     case S_MAGIC:
@@ -1147,8 +1147,8 @@ void daItem_c::set_bound_se() {
     case ARROW_10:
     case ARROW_20:
     case ARROW_30:
-    case MAGIC_ARROW:
-    case LIGHT_ARROW:
+    case dItem_MAGIC_ARROW_e:
+    case dItem_LIGHT_ARROW_e:
         fopAcM_seStart(this, JA_SE_CM_BST_ARROW_BOUND, temp);
         break;
     case KAKERA_HEART:
@@ -1237,7 +1237,7 @@ void daItem_c::mode_water_init() {
     
     cXyz scale;
     f32 temp = dItem_data::getShadowSize(m_itemNo);
-    f32 temp3 = temp / dItem_data::getShadowSize(GREEN_RUPEE);
+    f32 temp3 = temp / dItem_data::getShadowSize(dItem_GREEN_RUPEE_e);
     temp3 *= mScale.x;
     scale.setall(temp3);
     
@@ -1253,8 +1253,8 @@ void daItem_c::mode_wait() {
     }
     
     switch (m_itemNo) {
-    case HEART:
-    case TRIPLE_HEART:
+    case dItem_HEART_e:
+    case dItem_TRIPLE_HEART_e:
         itemActionForHeart();
         break;
     case KAKERA_HEART:
@@ -1266,16 +1266,16 @@ void daItem_c::mode_wait() {
     case ARROW_10:
     case ARROW_20:
     case ARROW_30:
-    case MAGIC_ARROW:
-    case LIGHT_ARROW:
+    case dItem_MAGIC_ARROW_e:
+    case dItem_LIGHT_ARROW_e:
         itemActionForArrow();
         break;
-    case SMALL_KEY:
+    case dItem_SMALL_KEY_e:
         itemActionForKey();
         break;
     case S_MAGIC:
     case L_MAGIC:
-    case PENDANT:
+    case dItem_JOY_PENDANT_e:
     case SKULL_NECKLACE:
     case BOKOBABA_SEED:
     case GOLDEN_FEATHER:
diff --git a/src/d/actor/d_a_itembase.cpp b/src/d/actor/d_a_itembase.cpp
index 5263084e..9ff07d42 100644
--- a/src/d/actor/d_a_itembase.cpp
+++ b/src/d/actor/d_a_itembase.cpp
@@ -165,7 +165,7 @@ void daItemBase_c::settingBeforeDraw() {
         mpModel->getModelData()->getJointNodePointer(0)->setMtxCalc(NULL);
     }
     
-    if (m_itemNo == BOMB_BAG || m_itemNo == HUMMER || m_itemNo == SMALL_KEY) {
+    if (m_itemNo == BOMB_BAG || m_itemNo == dItem_SKULL_HAMMER_e || m_itemNo == dItem_SMALL_KEY_e) {
         dDlst_texSpecmapST(&mEyePos, &mTevStr, mpModel->getModelData(), 1.0f);
     }
 }
diff --git a/src/d/actor/d_a_npc_btsw2.cpp b/src/d/actor/d_a_npc_btsw2.cpp
index d0acac76..c9145647 100644
--- a/src/d/actor/d_a_npc_btsw2.cpp
+++ b/src/d/actor/d_a_npc_btsw2.cpp
@@ -598,7 +598,7 @@ BOOL daNpc_Btsw2_c::wait_action(void*) {
 s32 daNpc_Btsw2_c::_create() {
     fopAcM_SetupActor(this, daNpc_Btsw2_c);
     
-    if (dComIfGs_getEventReg(0xC203) == 3 || !checkItemGet(PEARL2, TRUE)) {
+    if (dComIfGs_getEventReg(0xC203) == 3 || !checkItemGet(dItem_PEARL_DIN_e, TRUE)) {
         return cPhs_ERROR_e;
     }
     
diff --git a/src/d/actor/d_a_npc_ji1.cpp b/src/d/actor/d_a_npc_ji1.cpp
index 313f2dec..2ec3f21e 100644
--- a/src/d/actor/d_a_npc_ji1.cpp
+++ b/src/d/actor/d_a_npc_ji1.cpp
@@ -941,16 +941,16 @@ void daNpc_Ji1_c::createItem() {
         itemNo = SWORD;
     }
     else if(field_0xD7B == 1) {
-        itemNo = HURRICANE_SPIN;
+        itemNo = dItem_HURRICANE_SPIN_e;
     }
     else if(dComIfGs_getEventReg(0xD003) == 1) {
-        itemNo = PURPLE_RUPEE;
+        itemNo = dItem_PURPLE_RUPEE_e;
     }
     else if(dComIfGs_getEventReg(0xD003) == 2) {
-        itemNo = ORANGE_RUPEE;
+        itemNo = dItem_ORANGE_RUPEE_e;
     }
     else if(field_0xD70 >= l_HIO.field_0x60[3] && dComIfGs_isEventBit(0xF10)) {
-        itemNo = SILVER_RUPEE;
+        itemNo = dItem_SILVER_RUPEE_e;
     }
     else {
         itemNo = KAKERA_HEART;
diff --git a/src/d/actor/d_a_npc_kamome.cpp b/src/d/actor/d_a_npc_kamome.cpp
index bca8d27f..226b3f98 100644
--- a/src/d/actor/d_a_npc_kamome.cpp
+++ b/src/d/actor/d_a_npc_kamome.cpp
@@ -101,7 +101,7 @@ static s16 daNpc_kam_XyCheckCB(void* i_this, int equippedItemIdx) {
 
 /* 00000260-000002A4       .text XyCheckCB__11daNpc_kam_cFi */
 s16 daNpc_kam_c::XyCheckCB(int equippedItemIdx) {
-    if (dComIfGp_getSelectItem(equippedItemIdx) == ANIMAL_ESA) {
+    if (dComIfGp_getSelectItem(equippedItemIdx) == dItem_HYOI_PEAR_e) {
         return callDemoStartCheck();
     } else {
         return FALSE;
diff --git a/src/d/actor/d_a_npc_md.cpp b/src/d/actor/d_a_npc_md.cpp
index 8d53ace3..ab5a4b6b 100644
--- a/src/d/actor/d_a_npc_md.cpp
+++ b/src/d/actor/d_a_npc_md.cpp
@@ -331,7 +331,7 @@ static s16 daNpc_Md_XyCheckCB(void* i_this, int param_1) {
 s16 daNpc_Md_c::XyCheckCB(int equippedItemIdx) {
     u8 selectItemNo = dComIfGp_getSelectItem(equippedItemIdx);
     if (m3138 == 3) {
-        if (selectItemNo == WIND_TACT) {
+        if (selectItemNo == dItem_WIND_WAKER_e) {
             return TRUE;
         }
         if (selectItemNo == GOLDEN_FEATHER) {
@@ -358,7 +358,7 @@ static s16 daNpc_Md_XyEventCB(void* i_this, int param_1) {
 /* 0000081C-00000864       .text XyEventCB__10daNpc_Md_cFi */
 s16 daNpc_Md_c::XyEventCB(int equippedItemIdx) {
     u8 selectItemNo = dComIfGp_getSelectItem(equippedItemIdx);
-    if (selectItemNo == WIND_TACT) {
+    if (selectItemNo == dItem_WIND_WAKER_e) {
         offDefaultTalkXY();
         return mEventIdxTable[5];
     } else if (selectItemNo == GOLDEN_FEATHER) {
diff --git a/src/d/actor/d_a_obj_mknjd.cpp b/src/d/actor/d_a_obj_mknjd.cpp
index 4397636f..601378ad 100644
--- a/src/d/actor/d_a_obj_mknjd.cpp
+++ b/src/d/actor/d_a_obj_mknjd.cpp
@@ -160,7 +160,7 @@ static s16 daObjMknjD_XyEventCB(void* i_this, int i_param2) {
 
 /* 000002F0-00000314       .text XyCheckCB__Q210daObjMknjD5Act_cFi */
 s16 daObjMknjD::Act_c::XyCheckCB(int i_itemIdx) {
-    return dComIfGp_getSelectItem(i_itemIdx) == WIND_TACT ? 1 : 0;
+    return dComIfGp_getSelectItem(i_itemIdx) == dItem_WIND_WAKER_e ? 1 : 0;
 }
 
 /* 00000314-0000031C       .text XyEventCB__Q210daObjMknjD5Act_cFi */
diff --git a/src/d/actor/d_a_obj_toripost.cpp b/src/d/actor/d_a_obj_toripost.cpp
index 35149b45..6a97465a 100644
--- a/src/d/actor/d_a_obj_toripost.cpp
+++ b/src/d/actor/d_a_obj_toripost.cpp
@@ -22,19 +22,19 @@ extern dScnPly_reg_HIO_c g_regHIO;
 const char daObjTpost_c::m_arc_name[] = "Toripost";
 
 const daObjTpost_c__letter_data daObjTpost_c::m_letter[] = {
-    {false, 0x1AAF, KAKERA_HEART,    dSv_evtBit_c::LETTER_BAITOS_MOM},
-    {false, 0x0CF9, KAKERA_HEART,    dSv_evtBit_c::LETTER_KOMALIS_FATHER},
-    {false, 0x0CFA, COLLECT_MAP_60,  dSv_evtBit_c::LETTER_BOMBS_AD},
-    {false, 0x0CFC, RED_RUPEE,       dSv_evtBit_c::LETTER_ORCA},
-    {false, 0x0805, RED_RUPEE,       dSv_evtBit_c::LETTER_GRANDMA},
-    {false, 0x0CFD, GREEN_RUPEE,     dSv_evtBit_c::LETTER_ROCK_SPIRE_SHOP_AD},
-    {true,  0x0DB6, COLLECT_MAP_52,  dSv_evtBit_c::LETTER_TINGLE},
-    {false, 0x1148, RED_RUPEE,       dSv_evtBit_c::LETTER_ARYLL},
-    {false, 0x1AAF, KAKERA_HEART,    dSv_evtBit_c::LETTER_BAITOS_MOM},
-    {true,  0x0F76, KAISEN_PRESENT1, dSv_evtBit_c::LETTER_SILVER_MEMBERSHIP},
-    {false, 0x19A6, KAKERA_HEART2,   dSv_evtBit_c::LETTER_HOSKITS_GIRLFRIEND},
-    {true,  0x0CFB, RED_RUPEE,       dSv_evtBit_c::LETTER_BAITO},
-    {true,  0x0F77, KAISEN_PRESENT2, dSv_evtBit_c::LETTER_GOLD_MEMBERSHIP}
+    {false, 0x1AAF, KAKERA_HEART,        dSv_evtBit_c::LETTER_BAITOS_MOM},
+    {false, 0x0CF9, KAKERA_HEART,        dSv_evtBit_c::LETTER_KOMALIS_FATHER},
+    {false, 0x0CFA, COLLECT_MAP_60,      dSv_evtBit_c::LETTER_BOMBS_AD},
+    {false, 0x0CFC, dItem_RED_RUPEE_e,   dSv_evtBit_c::LETTER_ORCA},
+    {false, 0x0805, dItem_RED_RUPEE_e,   dSv_evtBit_c::LETTER_GRANDMA},
+    {false, 0x0CFD, dItem_GREEN_RUPEE_e, dSv_evtBit_c::LETTER_ROCK_SPIRE_SHOP_AD},
+    {true,  0x0DB6, COLLECT_MAP_52,      dSv_evtBit_c::LETTER_TINGLE},
+    {false, 0x1148, dItem_RED_RUPEE_e,   dSv_evtBit_c::LETTER_ARYLL},
+    {false, 0x1AAF, KAKERA_HEART,        dSv_evtBit_c::LETTER_BAITOS_MOM},
+    {true,  0x0F76, KAISEN_PRESENT1,     dSv_evtBit_c::LETTER_SILVER_MEMBERSHIP},
+    {false, 0x19A6, KAKERA_HEART2,       dSv_evtBit_c::LETTER_HOSKITS_GIRLFRIEND},
+    {true,  0x0CFB, dItem_RED_RUPEE_e,   dSv_evtBit_c::LETTER_BAITO},
+    {true,  0x0F77, KAISEN_PRESENT2,     dSv_evtBit_c::LETTER_GOLD_MEMBERSHIP},
 };
 
 const dCcD_SrcCyl daObjTpost_c::m_cyl_src = {
@@ -216,7 +216,7 @@ void daObjTpost_c::deliverLetter() {
         case MAGYS_LETTER:
             dComIfGs_onEventBit(0x1220);
             break;
-        case MAGIC_SEED:
+        case dItem_NOTE_TO_MOM_e:
             dLetter_send(dSv_evtBit_c::LETTER_BAITOS_MOM);
             break;
     }
@@ -324,7 +324,7 @@ int daObjTpost_c::getMsgXY() {
     cXyz scale(2.0f, 2.0f, 2.0f);
 
     switch(mPreItemNo) {
-        case MAGIC_SEED:
+        case dItem_NOTE_TO_MOM_e:
         case MAGYS_LETTER:
             msgId = 0xCE8;
             col.r = g_regHIO.mChild[12].mShortRegs[0] + 0x80;
@@ -335,7 +335,7 @@ int daObjTpost_c::getMsgXY() {
             dComIfGp_particle_set(0x57, &pos, &shape_angle, &scale, 0xFF, NULL, -1, &col);
             
             break;
-        case LETTER00:
+        case dItem_FATHER_LETTER_e:
         case MO_LETTER:
             setAnm(3, false);
             field_0x8EA = 1;
diff --git a/src/d/actor/d_a_player_food.inc b/src/d/actor/d_a_player_food.inc
index 940bbc97..258c8cd2 100644
--- a/src/d/actor/d_a_player_food.inc
+++ b/src/d/actor/d_a_player_food.inc
@@ -19,13 +19,13 @@
 
 /* 80154334-801543A0       .text setHyoiModel__9daPy_lk_cFv */
 void daPy_lk_c::setHyoiModel() {
-    if (mHeldItemType == ANIMAL_ESA) {
+    if (mHeldItemType == dItem_HYOI_PEAR_e) {
         return;
     }
     JKRHeap* oldHeap = setItemHeap();
     initModel(&mpHeldItemModel, LINK_BDL_HYOINOMI, 0x13000022);
     mDoExt_setCurrentHeap(oldHeap);
-    mHeldItemType = ANIMAL_ESA;
+    mHeldItemType = dItem_HYOI_PEAR_e;
 }
 
 /* 801543A0-801546F4       .text procFoodThrow_init__9daPy_lk_cFv */
@@ -151,7 +151,7 @@ BOOL daPy_lk_c::procFoodThrow() {
 BOOL daPy_lk_c::procFoodSet_init() {
     if (mCurProc == daPyProc_FOOD_SET_e) {
         if (mDemo.getParam0() == 1) {
-            if (mHeldItemType == ANIMAL_ESA) {
+            if (mHeldItemType == dItem_HYOI_PEAR_e) {
                 u8 btnIdx = dComIfGp_event_getTalkXYBtn();
                 if (btnIdx == 1) {
                     dComIfGs_setEquipBottleItemEmpty(0);
diff --git a/src/d/actor/d_a_player_main.cpp b/src/d/actor/d_a_player_main.cpp
index e6011871..0f9173a3 100644
--- a/src/d/actor/d_a_player_main.cpp
+++ b/src/d/actor/d_a_player_main.cpp
@@ -1012,7 +1012,7 @@ BOOL daPy_lk_c::draw() {
                 entryDLSetLight(mpEquippedSwordModel, mNoResetFlg1 & daPyFlg1_FREEZE_STATE);
             }
         }
-        if (dComIfGs_getSelectEquip(1) != NO_ITEM && !checkCaughtShapeHide() && !checkDemoShieldNoDraw()) {
+        if (dComIfGs_getSelectEquip(1) != dItem_NONE_e && !checkCaughtShapeHide() && !checkDemoShieldNoDraw()) {
             entryDLSetLight(mpEquippedShieldModel, mNoResetFlg1 & daPyFlg1_FREEZE_STATE);
         }
         dComIfGd_setList();
@@ -1024,7 +1024,7 @@ BOOL daPy_lk_c::draw() {
         }
         if (mpHeldItemModel && !checkCaughtShapeHide() && !checkDemoSwordNoDraw(0)) {
             if (!checkBowItem(mHeldItemType) || !checkPlayerGuard()) {
-                if (mHeldItemType == HOOKSHOT) {
+                if (mHeldItemType == dItem_HOOKSHOT_e) {
                     if (mActorKeepEquip.getActor()) {
                         daHookshot_c* hookshot = (daHookshot_c*)mActorKeepEquip.getActor();
                         mpHeldItemModel->setAnmMtx(4, hookshot->getMtxTop());
@@ -1380,9 +1380,9 @@ void daPy_lk_c::deleteEquipItem(BOOL param_1) {
         fopAcM_delete(equipActor);
     }
     
-    if ((mHeldItemType == ROPE && checkRopeAnime()) ||
-        (mHeldItemType == BOOMERANG && checkBoomerangAnime()) ||
-        (mHeldItemType == HOOKSHOT && checkHookshotReadyAnime()) ||
+    if ((mHeldItemType == dItem_GRAPPLING_HOOK_e && checkRopeAnime()) ||
+        (mHeldItemType == dItem_BOOMERANG_e && checkBoomerangAnime()) ||
+        (mHeldItemType == dItem_HOOKSHOT_e && checkHookshotReadyAnime()) ||
         (checkBowItem(mHeldItemType) && checkBowAnime())
     ) {
         resetActAnimeUpper(UPPER_MOVE2_e, -1.0f);
@@ -1450,14 +1450,14 @@ void daPy_lk_c::returnKeepItemData() {
 
 /* 8010C8D4-8010CB70       .text makeItemType__9daPy_lk_cFv */
 void daPy_lk_c::makeItemType() {
-    if (mHeldItemType == ROPE) {
+    if (mHeldItemType == dItem_GRAPPLING_HOOK_e) {
         fopAc_ac_c* rope = (fopAc_ac_c*)fopAcM_fastCreate(PROC_HIMO2, 0, &current.pos);
         mActorKeepEquip.setData(rope);
-    } else if (mHeldItemType == HOOKSHOT) {
+    } else if (mHeldItemType == dItem_HOOKSHOT_e) {
         fopAc_ac_c* hookshot = (fopAc_ac_c*)fopAcM_fastCreate(PROC_HOOKSHOT, 0, &current.pos);
         mActorKeepEquip.setData(hookshot);
         setHookshotModel();
-    } else if (mHeldItemType == BOOMERANG) {
+    } else if (mHeldItemType == dItem_BOOMERANG_e) {
         fopAc_ac_c* boomerang = (fopAc_ac_c*)fopAcM_fastCreate(PROC_BOOMERANG, 0, &current.pos);
         mActorKeepEquip.setData(boomerang);
         return;
@@ -1476,23 +1476,23 @@ void daPy_lk_c::makeItemType() {
     } else if (checkBowItem(mHeldItemType)) {
         setBowModel();
         return;
-    } else if (mHeldItemType == TELESCOPE) {
+    } else if (mHeldItemType == dItem_TELESCOPE_e) {
         setScopeModel();
         return;
     } else if (checkPhotoBoxItem(mHeldItemType)) {
         setPhotoBoxModel();
         return;
-    } else if (mHeldItemType == TNCL_WHITSL) {
+    } else if (mHeldItemType == dItem_TINGLE_TUNER_e) {
         setTinkleCeiverModel();
         return;
-    } else if (mHeldItemType == DEKU_LEAF) {
+    } else if (mHeldItemType == dItem_DEKU_LEAF_e) {
         setSmallFanModel();
         return;
-    } else if (mHeldItemType == WIND_TACT) {
-        mHeldItemType = NO_ITEM;
+    } else if (mHeldItemType == dItem_WIND_WAKER_e) {
+        mHeldItemType = dItem_NONE_e;
         setTactModel();
         return;
-    } else if (mHeldItemType == HUMMER) {
+    } else if (mHeldItemType == dItem_SKULL_HAMMER_e) {
         setHammerModel();
         return;
     } else if (mHeldItemType == EMPTY_BOTTLE) {
@@ -1568,11 +1568,11 @@ BOOL daPy_lk_c::checkItemChangeFromButton() {
                 }
             }
         } else {
-            if (checkEquipDragonShield() && checkSetItemTrigger(DRGN_SHIELD, 0)) {
+            if (checkEquipDragonShield() && checkSetItemTrigger(dItem_MAGIC_ARMOR_e, 0)) {
                 offNoResetFlg1(daPyFlg1_EQUIP_DRAGON_SHIELD);
             } else if (mAcch.ChkGroundHit() && !daPy_lk_c::checkPlayerFly()) {
-                if (checkEquipHeavyBoots() && checkSetItemTrigger(HVY_BOOTS, 0)) {
-                    return procBootsEquip_init(HVY_BOOTS);
+                if (checkEquipHeavyBoots() && checkSetItemTrigger(dItem_IRON_BOOTS_e, 0)) {
+                    return procBootsEquip_init(dItem_IRON_BOOTS_e);
                 } else if (checkSetItemTrigger(0x105, 0)) {
                     return procBottleDrink_init(dComIfGp_getSelectItem(mLastUsedItemButtonIdx));
                 } else if (checkSetItemTrigger(FAIRY_BOTTLE, 0)) {
@@ -1983,7 +1983,7 @@ BOOL daPy_lk_c::checkBottleItem(int itemNo) const {
 
 /* 80111F7C-80111FEC       .text checkDrinkBottleItem__9daPy_lk_cCFi */
 BOOL daPy_lk_c::checkDrinkBottleItem(int itemNo) const {
-    return itemNo == RED_BOTTLE || itemNo == GREEN_BOTTLE || itemNo == BLUE_BOTTLE || itemNo == SOUP_BOTTLE || itemNo == BOTTLESHIP;
+    return itemNo == RED_BOTTLE || itemNo == GREEN_BOTTLE || itemNo == BLUE_BOTTLE || itemNo == dItem_SOUP_BOTTLE_e || itemNo == dItem_HALF_SOUP_BOTTLE_e;
 }
 
 /* 80111FEC-8011201C       .text checkOpenBottleItem__9daPy_lk_cCFi */
@@ -1993,7 +1993,7 @@ BOOL daPy_lk_c::checkOpenBottleItem(int itemNo) const {
 
 /* 8011201C-80112044       .text checkBowItem__9daPy_lk_cCFi */
 BOOL daPy_lk_c::checkBowItem(int itemNo) const {
-    return itemNo == BOW || itemNo == MAGIC_ARROW || itemNo == LIGHT_ARROW;
+    return itemNo == dItem_BOW_e || itemNo == dItem_MAGIC_ARROW_e || itemNo == dItem_LIGHT_ARROW_e;
 }
 
 /* 80112044-80112064       .text checkPhotoBoxItem__9daPy_lk_cCFi */
@@ -2061,7 +2061,7 @@ BOOL daPy_lk_c::commonProcInit(daPy_PROC proc) {
         deleteEquipItem(FALSE);
         mMaxFallSpeed = daPy_HIO_autoJump_c0::m.field_0x10;
         setSmallFanModel();
-        mHeldItemType = DEKU_LEAF;
+        mHeldItemType = dItem_DEKU_LEAF_e;
         m35F0 = m3688.y;
         m3730 = cXyz::Zero;
         m34E0 = 0;
@@ -2191,7 +2191,7 @@ BOOL daPy_lk_c::commonProcInit(daPy_PROC proc) {
     
     m35EC = 0.0f;
     
-    if (mHeldItemType == HUMMER) {
+    if (mHeldItemType == dItem_SKULL_HAMMER_e) {
         mSwordAnim.changeBckOnly(getItemAnimeResource(0x97));
     } else if (checkBowItem(mHeldItemType) && !checkBowAnime()) {
         mSwordAnim.changeBckOnly(getItemAnimeResource(0xD));
@@ -3122,15 +3122,15 @@ BOOL daPy_lk_c::execute() {
     }
     
     if (checkEquipHeavyBoots() &&
-        dComIfGp_getSelectItem(0) != HVY_BOOTS &&
-        dComIfGp_getSelectItem(1) != HVY_BOOTS &&
-        dComIfGp_getSelectItem(2) != HVY_BOOTS
+        dComIfGp_getSelectItem(0) != dItem_IRON_BOOTS_e &&
+        dComIfGp_getSelectItem(1) != dItem_IRON_BOOTS_e &&
+        dComIfGp_getSelectItem(2) != dItem_IRON_BOOTS_e
     ) {
         offNoResetFlg0(daPyFlg0_EQUIP_HEAVY_BOOTS);
     } else if (checkEquipDragonShield() &&
-        dComIfGp_getSelectItem(0) != DRGN_SHIELD &&
-        dComIfGp_getSelectItem(1) != DRGN_SHIELD &&
-        dComIfGp_getSelectItem(2) != DRGN_SHIELD
+        dComIfGp_getSelectItem(0) != dItem_MAGIC_ARMOR_e &&
+        dComIfGp_getSelectItem(1) != dItem_MAGIC_ARMOR_e &&
+        dComIfGp_getSelectItem(2) != dItem_MAGIC_ARMOR_e
     ) {
         offNoResetFlg1(daPyFlg1_EQUIP_DRAGON_SHIELD);
     }
@@ -3246,7 +3246,7 @@ BOOL daPy_lk_c::execute() {
     setDemoData();
     setStickData();
     
-    if (mHeldItemType == ROPE &&
+    if (mHeldItemType == dItem_GRAPPLING_HOOK_e &&
         (mCurProc == daPyProc_ROPE_SUBJECT_e || mCurProc == daPyProc_ROPE_MOVE_e) &&
         mActorKeepEquip.getActor() != NULL && fopAcM_GetParam(mActorKeepEquip.getActor()) == 2
     ) {
@@ -3502,7 +3502,7 @@ BOOL daPy_lk_c::execute() {
         daBoko_c* boko = static_cast<daBoko_c*>(mActorKeepEquip.getActor());
         boko->getTopPos(&mSwordTopPos);
         boko->getBlurRootPos(&m36C4);
-    } else if (mHeldItemType == HUMMER) {
+    } else if (mHeldItemType == dItem_SKULL_HAMMER_e) {
         cMtx_multVec(mpHeldItemModel->getBaseTRMtx(), &hammer_top, &mSwordTopPos);
         cMtx_multVec(mpHeldItemModel->getBaseTRMtx(), &hammer_root, &m36C4);
     } else if (mHeldItemType == 0x103) {
@@ -4517,11 +4517,11 @@ const daPy_anmIndex_c* daPy_lk_c::getAnmData(daPy_ANM anm) const {
         if (anm < (s32)ARRAY_SIZE(mBokoAnmIndexTable)) {
             return &mBokoAnmIndexTable[anm];
         }
-    } else if (mHeldItemType == HUMMER) {
+    } else if (mHeldItemType == dItem_SKULL_HAMMER_e) {
         if (anm < (s32)ARRAY_SIZE(mHammerAnmIndexTable)) {
             return &mHammerAnmIndexTable[anm];
         }
-    } else if (mHeldItemType == BOOMERANG || mHeldItemType == DEKU_LEAF || mHeldItemType == TELESCOPE) {
+    } else if (mHeldItemType == dItem_BOOMERANG_e || mHeldItemType == dItem_DEKU_LEAF_e || mHeldItemType == dItem_TELESCOPE_e) {
         if (anm == ANM_DASH) {
             return &mSwordAnmIndexTable[anm];
         }
diff --git a/src/d/actor/d_a_player_sword.inc b/src/d/actor/d_a_player_sword.inc
index 8b9020b4..b0ff02e0 100644
--- a/src/d/actor/d_a_player_sword.inc
+++ b/src/d/actor/d_a_player_sword.inc
@@ -233,7 +233,7 @@ void daPy_lk_c::setJumpCutAtParam() {
             m35FC = daPy_HIO_cut_c0::m.field_0x58;
         }
         setAtParam(AT_TYPE_SWORD, atp, dCcG_At_Spl_UNK1, dCcD_SE_UNK1, G_AT_MARK_BIG_HIT, 0xA, radius);
-    } else if (mHeldItemType == HUMMER) {
+    } else if (mHeldItemType == dItem_SKULL_HAMMER_e) {
         setAtParam(AT_TYPE_SKULL_HAMMER, 4, dCcG_At_Spl_UNK1, dCcD_SE_UNK5, G_AT_MARK_NORMAL_HIT, 0x13, 50.0f);
     } else if (mActorKeepEquip.getActor()) {
         setEnemyWeaponAtParam(TRUE);
diff --git a/src/d/actor/d_a_player_tact.inc b/src/d/actor/d_a_player_tact.inc
index c5d5a870..4e246d69 100644
--- a/src/d/actor/d_a_player_tact.inc
+++ b/src/d/actor/d_a_player_tact.inc
@@ -30,11 +30,11 @@ u32 daPy_lk_c::getDayNightParamData() {
 
 /* 8014D7D4-8014D8AC       .text setTactModel__9daPy_lk_cFv */
 void daPy_lk_c::setTactModel() {
-    if (mHeldItemType == WIND_TACT)
+    if (mHeldItemType == dItem_WIND_WAKER_e)
         return;
     
     deleteEquipItem(FALSE);
-    mHeldItemType = WIND_TACT;
+    mHeldItemType = dItem_WIND_WAKER_e;
     JKRHeap* oldHeap = setItemHeap();
     
     J3DModelData* modelData = initModel(&mpHeldItemModel, LINK_BDL_TAKT, 0x37221222);
@@ -124,7 +124,7 @@ void daPy_lk_c::setTactZev(unsigned int tactZevPartnerPID, int r30, char* r31) {
 
 /* 8014DA78-8014DACC       .text getTactTopPos__9daPy_lk_cFP4cXyz */
 BOOL daPy_lk_c::getTactTopPos(cXyz* out) {
-    if (mHeldItemType != WIND_TACT || mpHeldItemModel == NULL) {
+    if (mHeldItemType != dItem_WIND_WAKER_e || mpHeldItemModel == NULL) {
         return FALSE;
     } else {
         MTXMultVec(mpHeldItemModel->getBaseTRMtx(), &l_tact_top, out);
diff --git a/src/d/actor/d_a_shop_item.cpp b/src/d/actor/d_a_shop_item.cpp
index 195e642d..46bdaf7c 100644
--- a/src/d/actor/d_a_shop_item.cpp
+++ b/src/d/actor/d_a_shop_item.cpp
@@ -202,7 +202,7 @@ bool daShopItem_c::_draw() {
 
 /* 00000694-0000070C       .text settingBeforeDraw__12daShopItem_cFv */
 void daShopItem_c::settingBeforeDraw() {
-    if(isBomb(m_itemNo) || (m_itemNo == BOMB_BAG) || (m_itemNo == HUMMER) || m_itemNo == SMALL_KEY || m_itemNo == PRESIDENT_STATUE) {
+    if(isBomb(m_itemNo) || (m_itemNo == BOMB_BAG) || (m_itemNo == dItem_SKULL_HAMMER_e) || m_itemNo == dItem_SMALL_KEY_e || m_itemNo == PRESIDENT_STATUE) {
         dDlst_texSpecmapST(&mEyePos, &mTevStr, mpModel->getModelData(), 1.0f);
     }
 }
@@ -232,7 +232,7 @@ int daShopItem_c::_create() {
     
     const char* arcName = getShopArcname();
     if (getShopBmdIdx() == -1 || arcName == 0) {
-        m_itemNo = GREEN_RUPEE;
+        m_itemNo = dItem_GREEN_RUPEE_e;
     }
 
     arcName = getShopArcname();
diff --git a/src/d/actor/d_a_spc_item01.cpp b/src/d/actor/d_a_spc_item01.cpp
index 85642586..eaad3adb 100644
--- a/src/d/actor/d_a_spc_item01.cpp
+++ b/src/d/actor/d_a_spc_item01.cpp
@@ -176,7 +176,7 @@ void daSpcItem01_c::move() {
     switch (m_itemNo) {
     case SHIELD:
         break;
-    case PENDANT:
+    case dItem_JOY_PENDANT_e:
         if (mAcch.ChkGroundLanding()) {
             speed.x = 0.0f;
             speed.y = 0.0f;
diff --git a/src/d/actor/d_a_tag_ret.cpp b/src/d/actor/d_a_tag_ret.cpp
index 75ecda3c..e74e7058 100644
--- a/src/d/actor/d_a_tag_ret.cpp
+++ b/src/d/actor/d_a_tag_ret.cpp
@@ -47,7 +47,7 @@ namespace daTagRet {
     s32 Act_c::_create() {
         fopAcM_SetupActor(this, daTagRet::Act_c);
 
-        if (checkItemGet(PEARL3, TRUE)) {
+        if (checkItemGet(dItem_PEARL_FARORE_e, TRUE)) {
             return cPhs_UNK3_e;
         }