Rename some more item enum entries

include/d/d_item_data.h

@@ -11,8 +11,8 @@ enum ItemTable {
     /* 0x04 */ dItem_RED_RUPEE_e,
     /* 0x05 */ dItem_PURPLE_RUPEE_e,
     /* 0x06 */ dItem_ORANGE_RUPEE_e,
-    /* 0x07 */ KAKERA_HEART,
-    /* 0x08 */ UTUWA_HEART,
+    /* 0x07 */ dItem_HEART_PIECE_e,
+    /* 0x08 */ dItem_HEART_CONTAINER_e,
     /* 0x09 */ S_MAGIC,
     /* 0x0A */ L_MAGIC,
     /* 0x0B */ BOMB_5,
@@ -53,7 +53,7 @@ enum ItemTable {
     /* 0x2E */ BARE_HAND, // Unused
     /* 0x2F */ dItem_HOOKSHOT_e,
     /* 0x30 */ dItem_DELIVERY_BAG_e,
-    /* 0x31 */ BOMB_BAG,
+    /* 0x31 */ dItem_BOMB_BAG_e,
     /* 0x32 */ dItem_FUKU_e,
     /* 0x33 */ dItem_SKULL_HAMMER_e,
     /* 0x34 */ dItem_DEKU_LEAF_e,
@@ -101,14 +101,14 @@ enum ItemTable {
     /* 0x5E */ UNK_BOTTLE_5E, // Unused
     /* 0x5F */ UNK_BOTTLE_5F, // Unused
     /* 0x60 */ UNK_BOTTLE_60, // Unused
-    /* 0x61 */ TRIFORCE1,
-    /* 0x62 */ TRIFORCE2,
-    /* 0x63 */ TRIFORCE3,
-    /* 0x64 */ TRIFORCE4,
-    /* 0x65 */ TRIFORCE5,
-    /* 0x66 */ TRIFORCE6,
-    /* 0x67 */ TRIFORCE7,
-    /* 0x68 */ TRIFORCE8,
+    /* 0x61 */ dItem_TRIFORCE1_e,
+    /* 0x62 */ dItem_TRIFORCE2_e,
+    /* 0x63 */ dItem_TRIFORCE3_e,
+    /* 0x64 */ dItem_TRIFORCE4_e,
+    /* 0x65 */ dItem_TRIFORCE5_e,
+    /* 0x66 */ dItem_TRIFORCE6_e,
+    /* 0x67 */ dItem_TRIFORCE7_e,
+    /* 0x68 */ dItem_TRIFORCE8_e,
     /* 0x69 */ dItem_PEARL_NAYRU_e,
     /* 0x6A */ dItem_PEARL_DIN_e,
     /* 0x6B */ dItem_PEARL_FARORE_e,