d_item (#18)

* item_funcs ok

* item_getcheck_func ok

* remove unnecessary asm file

* execItemGet / checkItemGet ok, add enums for readability

* fix return types

1 files changed, 40 insertions, 39 deletions

diff --git a/src/d/d_save/d_save.cpp b/src/d/d_save/d_save.cpp
index f831b6abd0..ef2faccd09 100644
--- a/src/d/d_save/d_save.cpp
+++ b/src/d/d_save/d_save.cpp
@@ -1,11 +1,12 @@
 #include "d/d_save/d_save/d_save.h"
+#include "d/d_com/d_com_inf_game/d_com_inf_game.h"
 #include "global.h"
 
 u8 dSv_item_rename(u8 item_id) {
     switch (item_id) {
-        case LANTERN_OIL_2: return LANTERN_OIL;
-        case RED_POTION_2: return RED_POTION;
-        case LANTERN_OIL_3: return LANTERN_OIL_4;
+        case OIL_BOTTLE_2: return OIL_BOTTLE;
+        case RED_BOTTLE_2: return RED_BOTTLE;
+        case OIL2: return OIL;
         default: return item_id;
     }
 }
@@ -28,7 +29,7 @@ void dSv_player_status_a_c::init() {
         this->equipment[i] = 0;
     }
 
-    this->equipment[0] = ORDON_CLOTHES;
+    this->equipment[0] = WEARS_CASUAL;
     this->equipment[1] = NO_ITEM;
     this->equipment[2] = NO_ITEM;
     this->equipment[3] = NO_ITEM;
@@ -259,32 +260,32 @@ u8 dSv_player_item_c::getItem(int param_1, bool param_2) const {
                     IVar1 = items[current_select_item_index];
                     current_select_item_index = dComIfGs_getMixItemIndex(select_item_index);
                     IVar2 = items[current_select_item_index];
-                    if (((IVar1 == HEROS_BOW) && (IVar2 == REGULAR_BOMBS)) ||
-                        ((IVar2 == HEROS_BOW && (IVar1 == REGULAR_BOMBS)))) {
+                    if (((IVar1 == BOW) && (IVar2 == NORMAL_BOMB)) ||
+                        ((IVar2 == BOW && (IVar1 == NORMAL_BOMB)))) {
                         return 0x59;
                     }
-                    if (((IVar1 == HEROS_BOW) && (IVar2 == WATER_BOMBS)) ||
-                        ((IVar2 == HEROS_BOW && (IVar1 == WATER_BOMBS)))) {
+                    if (((IVar1 == BOW) && (IVar2 == WATER_BOMB)) ||
+                        ((IVar2 == BOW && (IVar1 == WATER_BOMB)))) {
                         return 0x59;
                     }
-                    if (((IVar1 == HEROS_BOW) && (IVar2 == BOMBLINGS)) ||
-                        ((IVar2 == HEROS_BOW && (IVar1 == BOMBLINGS)))) {
+                    if (((IVar1 == BOW) && (IVar2 == POKE_BOMB)) ||
+                        ((IVar2 == BOW && (IVar1 == POKE_BOMB)))) {
                         return 0x59;
                     }
-                    if (((IVar1 == HEROS_BOW) && (IVar2 == HAWKEYE)) ||
-                        ((IVar2 == HEROS_BOW && (IVar1 == HAWKEYE)))) {
+                    if (((IVar1 == BOW) && (IVar2 == HAWK_EYE)) ||
+                        ((IVar2 == BOW && (IVar1 == HAWK_EYE)))) {
                         return 0x5a;
                     }
-                    if (((IVar1 == FISHING_ROD) && (IVar2 == BEE_LARVA)) ||
-                        ((IVar2 == FISHING_ROD && (IVar1 == BEE_LARVA)))) {
+                    if (((IVar1 == FISHING_ROD_1) && (IVar2 == BEE_CHILD)) ||
+                        ((IVar2 == FISHING_ROD_1 && (IVar1 == BEE_CHILD)))) {
                         return 0x5b;
                     }
-                    if (((IVar1 == FISHING_ROD) && (IVar2 == ZORAS_JEWEL)) ||
-                        ((IVar2 == FISHING_ROD && (IVar1 == ZORAS_JEWEL)))) {
+                    if (((IVar1 == FISHING_ROD_1) && (IVar2 == ZORAS_JEWEL)) ||
+                        ((IVar2 == FISHING_ROD_1 && (IVar1 == ZORAS_JEWEL)))) {
                         return 0x5c;
                     }
-                    if (((IVar1 == FISHING_ROD) && (IVar2 == WORM)) ||
-                        ((IVar2 == FISHING_ROD && (IVar1 == WORM)))) {
+                    if (((IVar1 == FISHING_ROD_1) && (IVar2 == WORM)) ||
+                        ((IVar2 == FISHING_ROD_1 && (IVar1 == WORM)))) {
                         return 0x5d;
                     }
                     if (((select_item_index == 0x3) &&
@@ -449,11 +450,11 @@ asm void dSv_player_item_c::setBombBagItemIn(u8, u8, u8, bool) {
 }
 
 void dSv_player_item_c::setEmptyBombBagItemIn(u8 param_1,bool param_2) {
-    setBombBagItemIn(EMPTY_BOMBBAG,param_1,param_2);
+    setBombBagItemIn(BOMB_BAG_LV1,param_1,param_2);
 }
 
 void dSv_player_item_c::setEmptyBombBagItemIn(u8 param_1,u8 param_2, bool param_3) {
-    setBombBagItemIn(EMPTY_BOMBBAG,param_1,param_2,param_3);
+    setBombBagItemIn(BOMB_BAG_LV1,param_1,param_2,param_3);
 }
 
 // this is a few instructions off
@@ -505,16 +506,16 @@ void dSv_player_item_c::setRodTypeLevelUp(void) {
     int current_fishing_rod_item_id = this->items[0x14];
 
     switch (current_fishing_rod_item_id) {
-        case ROD_BEE_LARVA: {
-            this->items[0x14] = ROD_CORAL_EARRING_BEE_LARVA;
+        case BEE_ROD: {
+            this->items[0x14] = JEWEL_BEE_ROD;
             break;
         }
-        case ROD_WORM: {
-            this->items[0x14] = ROD_CORAL_EARRING_WORM; 
+        case WORM_ROD: {
+            this->items[0x14] = JEWEL_WORM_ROD; 
             break;
         }
-        case FISHING_ROD: {
-            this->items[0x14] = ROD_CORAL_EARRING;
+        case FISHING_ROD_1: {
+            this->items[0x14] = JEWEL_ROD;
             break;
         }
     }
@@ -528,16 +529,16 @@ void dSv_player_item_c::setRodTypeLevelUp(void) {
 #ifdef NONMATCHING
 void dSv_player_item_c::setBaitItem(u8 param_1) {
     switch (param_1) {
-        case BEE_LARVA: {
-            isFirstBit(61) ? this->items[0x14] = ROD_CORAL_EARRING_BEE_LARVA : this->items[0x14] = ROD_BEE_LARVA;
+        case BEE_CHILD: {
+            isFirstBit(61) ? this->items[0x14] = JEWEL_BEE_ROD : this->items[0x14] = BEE_ROD;
             break;
         }
         case WORM: {
-            isFirstBit(61) ? this->items[0x14] = ROD_CORAL_EARRING_WORM : this->items[0x14] = ROD_WORM;
+            isFirstBit(61) ? this->items[0x14] = JEWEL_WORM_ROD : this->items[0x14] = WORM_ROD;
             break;
         }
         case NO_ITEM: {
-            isFirstBit(61) ? this->items[0x14] = ROD_CORAL_EARRING : this->items[0x14] = FISHING_ROD;
+            isFirstBit(61) ? this->items[0x14] = JEWEL_ROD : this->items[0x14] = FISHING_ROD_1;
             break;
         }
     }
@@ -645,17 +646,17 @@ void dSv_player_item_max_c::init(void) {
     for (int i = 0; i < 7; i++) {
         this->item_capacities[i] = 30;
     }
-    setBombNum(REGULAR_BOMBS,30);
-    setBombNum(WATER_BOMBS,15);
-    setBombNum(BOMBLINGS,10);
+    setBombNum(NORMAL_BOMB,30);
+    setBombNum(WATER_BOMB,15);
+    setBombNum(POKE_BOMB,10);
     this->item_capacities[7] = 0;
 }
 
 void dSv_player_item_max_c::setBombNum(u8 bomb_id,u8 bomb_max) {
     switch (bomb_id) {
-        case REGULAR_BOMBS: this->item_capacities[1] = bomb_max; return;
-        case WATER_BOMBS: this->item_capacities[2] = bomb_max; return;
-        case BOMBLINGS: this->item_capacities[6] = bomb_max; return;
+        case NORMAL_BOMB: this->item_capacities[1] = bomb_max; return;
+        case WATER_BOMB: this->item_capacities[2] = bomb_max; return;
+        case POKE_BOMB: this->item_capacities[6] = bomb_max; return;
     }
 }
 
@@ -670,9 +671,9 @@ u8 dSv_player_item_max_c::getBombNum(u8 param_1) const {
     }
 
     switch (param_1) {
-        case WATER_BOMBS: return (u8)(this->bomb_bags_ammo_max[0x1] * iVar3);
-        case REGULAR_BOMBS: return (u8)(this->bomb_bags_ammo_max[0x1] * iVar3);
-        case BOMBLINGS: return (u8)(this->unk_ammo_max[0x2] * iVar3);
+        case WATER_BOMB: return (u8)(this->bomb_bags_ammo_max[0x1] * iVar3);
+        case NORMAL_BOMB: return (u8)(this->bomb_bags_ammo_max[0x1] * iVar3);
+        case POKE_BOMB: return (u8)(this->unk_ammo_max[0x2] * iVar3);
         default: return 0;
     }
 }