d_item (#18)

* item_funcs ok

* item_getcheck_func ok

* remove unnecessary asm file

* execItemGet / checkItemGet ok, add enums for readability

* fix return types

5 files changed, 1806 insertions, 40 deletions

diff --git a/src/d/d_com/d_com_inf_game.cpp b/src/d/d_com/d_com_inf_game.cpp
index e4889f8ba5..2038bb021c 100644
--- a/src/d/d_com/d_com_inf_game.cpp
+++ b/src/d/d_com/d_com_inf_game.cpp
@@ -1,4 +1,5 @@
 #include "d/d_com/d_com_inf_game/d_com_inf_game.h"
+#include "d/d_item/d_item/d_item.h"
 #include "global.h"
 
 asm void dComIfG_play_c::ct(void) {
diff --git a/src/d/d_file/d_file_sel_info.cpp b/src/d/d_file/d_file_sel_info.cpp
index c1b72743df..7aaae896f0 100644
--- a/src/d/d_file/d_file_sel_info.cpp
+++ b/src/d/d_file/d_file_sel_info.cpp
@@ -1,4 +1,5 @@
 #include "d/d_file/d_file_sel_info/d_file_sel_info.h"
+#include "d/d_com/d_com_inf_game/d_com_inf_game.h"
 #include "global.h"
 
 asm dFile_info_c::dFile_info_c(JKRArchive*,u8) {
diff --git a/src/d/d_item/d_item.cpp b/src/d/d_item/d_item.cpp
index 4bf93c8658..1211adbd8f 100644
--- a/src/d/d_item/d_item.cpp
+++ b/src/d/d_item/d_item.cpp
@@ -1 +1,1763 @@
-// ok
+#include "global.h"
+#include "d/d_item/d_item/d_item.h"
+#include "d/d_com/d_com_inf_game/d_com_inf_game.h"
+
+void execItemGet(u8 item_id){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().onFirstBit(item_id);
+    item_func_ptr[item_id]();
+}
+
+int checkItemGet(u8 item_id, int param_2) {
+    int uVar2 = item_getcheck_func_ptr[item_id]();
+    if (uVar2 == -1) {
+        uVar2 = param_2;
+    }
+    return uVar2;
+}
+
+void item_func_HEART(void){
+    g_dComIfG_gameInfo.give_item.hearts += lbl_80452BD8;
+    g_dComIfG_gameInfo.unk35[0xBE] = 0;
+}
+
+void item_func_GREEN_RUPEE(void){
+    g_dComIfG_gameInfo.give_item.rupees += 1;
+}
+
+void item_func_BLUE_RUPEE(void){
+    g_dComIfG_gameInfo.give_item.rupees += 5;
+}
+
+void item_func_YELLOW_RUPEE(void){
+    g_dComIfG_gameInfo.give_item.rupees += 10;
+}
+
+void item_func_RED_RUPEE(void){
+    g_dComIfG_gameInfo.give_item.rupees += 20;
+}
+
+void item_func_PURPLE_RUPEE(void){
+    g_dComIfG_gameInfo.give_item.rupees += 50;
+}
+
+void item_func_ORANGE_RUPEE(void){
+    g_dComIfG_gameInfo.give_item.rupees += 100;
+}
+
+void item_func_SILVER_RUPEE(void){
+    g_dComIfG_gameInfo.give_item.rupees += 200;
+}
+
+void item_func_S_MAGIC(void){
+    g_dComIfG_gameInfo.give_item.magic += 4;
+}
+
+void item_func_L_MAGIC(void){
+    g_dComIfG_gameInfo.give_item.magic += 8;
+}
+
+void item_func_BOMB_5(void){
+    addBombCount(NORMAL_BOMB, 5);
+}
+
+void item_func_BOMB_10(void){
+    addBombCount(NORMAL_BOMB, 10);
+}
+
+void item_func_BOMB_20(void){
+    addBombCount(NORMAL_BOMB, 20);
+}
+
+void item_func_BOMB_30(void){
+    addBombCount(NORMAL_BOMB, 30);
+}
+
+void item_func_ARROW_10(void){
+    g_dComIfG_gameInfo.give_item.arrows += 10;
+}
+
+void item_func_ARROW_20(void){
+    g_dComIfG_gameInfo.give_item.arrows += 20;
+}
+
+void item_func_ARROW_30(void){
+    g_dComIfG_gameInfo.give_item.arrows += 30;
+}
+
+void item_func_ARROW_1(void){
+    g_dComIfG_gameInfo.give_item.arrows += 1;
+}
+
+void item_func_PACHINKO_SHOT(void){
+    g_dComIfG_gameInfo.give_item.seeds += 50;
+}
+
+void item_func_WATER_BOMB_5(void){
+    addBombCount(WATER_BOMB, 5);
+}
+
+void item_func_WATER_BOMB_10(void){
+    addBombCount(WATER_BOMB, 10);
+}
+
+void item_func_WATER_BOMB_20(void){
+    addBombCount(WATER_BOMB, 15);
+}
+
+void item_func_WATER_BOMB_30(void){
+    addBombCount(WATER_BOMB, 3);
+}
+
+void item_func_BOMB_INSECT_5(void){
+    addBombCount(POKE_BOMB, 5);
+}
+
+void item_func_BOMB_INSECT_10(void){
+    addBombCount(POKE_BOMB, 10);
+}
+
+void item_func_BOMB_INSECT_20(void){
+    addBombCount(POKE_BOMB, 3);
+}
+
+void item_func_BOMB_INSECT_30(void){
+    return;
+}
+
+void item_func_RECOVER_FAILY(void){
+    g_dComIfG_gameInfo.give_item.hearts += lbl_80452BDC;
+    g_dComIfG_gameInfo.unk35[0xBE] = 0;
+}
+
+void item_func_TRIPLE_HEART(void){
+    return;
+}
+
+void item_func_SMALL_KEY(void){
+    g_dComIfG_gameInfo.give_item.small_keys += 1;
+}
+
+void item_func_KAKERA_HEART(void){
+    g_dComIfG_gameInfo.give_item.kakera_heart += 1;
+}
+
+asm void item_func_UTUWA_HEART(void){
+    nofralloc
+    #include "d/d_item/d_item/asm/func_800982B4.s"
+}
+
+void item_func_MAP(void){
+    g_dComIfG_gameInfo.memory.getTempFlags().onDungeonItem(MAP_FLAG);
+}
+
+void item_func_COMPUS(void){
+    g_dComIfG_gameInfo.memory.getTempFlags().onDungeonItem(COMPASS_FLAG);
+}
+
+void item_func_DUNGEON_EXIT(void){
+    g_dComIfG_gameInfo.memory.getTempFlags().onDungeonItem(OOCCOO_NOTE_FLAG);
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setItem(18,DUNGEON_EXIT);
+}
+
+void item_func_BOSS_KEY(void){
+    g_dComIfG_gameInfo.memory.getTempFlags().onDungeonItem(BOSS_KEY_FLAG);
+}
+
+void item_func_DUNGEON_BACK(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setItem(18,DUNGEON_BACK);
+}
+
+void item_func_SWORD(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerCollect().setCollect(SWORD_BITFIELD,ORDON_SWORD_FLAG);
+    dComIfGs_setSelectEquipSword(40);
+}
+
+void item_func_MASTER_SWORD(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerCollect().setCollect(SWORD_BITFIELD,MASTER_SWORD_FLAG);
+    dComIfGs_setSelectEquipSword(41);
+}
+
+void item_func_WOOD_SHIELD(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerCollect().setCollect(SHIELD_BITFIELD,ORDON_SHIELD_FLAG);
+    dComIfGs_setSelectEquipShield(42);
+}
+
+void item_func_SHIELD(void){
+    return;
+}
+
+void item_func_HYLIA_SHIELD(void){
+    return;
+}
+
+void item_func_TKS_LETTER(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setItem(18,TKS_LETTER);
+}
+
+void item_func_WEAR_CASUAL(void){
+    dComIfGs_setSelectEquipClothes(WEARS_CASUAL);
+}
+
+void item_func_WEAR_KOKIRI(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerCollect().setCollect(0,0);
+    dComIfGs_setSelectEquipClothes(WEAR_KOKIRI);
+}
+
+void item_func_ARMOR(void){
+    return;
+}
+
+void item_func_WEAR_ZORA(void){
+    return;
+}
+
+void item_func_MAGIC_LV1(void){
+    g_dComIfG_gameInfo.give_item.magic += 16;
+    g_dComIfG_gameInfo.give_item.magic_lv += 16;
+}
+
+void item_func_DUNGEON_EXIT_2(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setItem(18,DUNGEON_EXIT);
+}
+
+void item_func_WALLET_LV1(void){
+    g_dComIfG_gameInfo.save_file.setPlayerStatusAWallet(WALLET);
+}
+
+void item_func_WALLET_LV2(void){
+    g_dComIfG_gameInfo.save_file.setPlayerStatusAWallet(BIG_WALLET);
+}
+
+void item_func_WALLET_LV3(void){
+    g_dComIfG_gameInfo.save_file.setPlayerStatusAWallet(GIANT_WALLET);
+}
+
+void item_func_ZORAS_JEWEL(void){
+    int checkFishingRod;
+
+    checkFishingRod = item_getcheck_func_FISHING_ROD_1();
+    if(checkFishingRod != 0){
+        g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setRodTypeLevelUp();   
+    }
+    else{
+        g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setItem(20,ZORAS_JEWEL);
+    }
+}
+
+void item_func_HAWK_EYE(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setItem(5,HAWK_EYE);
+}
+
+#ifdef NONMATCHING
+void item_func_WOOD_STICK(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerCollect().setCollect(SWORD_BITFIELD,WOODEN_SWORD_FLAG);
+    dComIfGs_setSelectEquipSword(WOOD_STICK);
+    //needs to be a onSwitch call here
+}
+#else
+asm void item_func_WOOD_STICK(void) {
+    nofralloc
+    #include "d/d_item/d_item/asm/func_800986C4.s"
+}
+#endif
+
+void item_func_BOOMERANG(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setItem(0,BOOMERANG);
+}
+
+void item_func_SPINNER(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setItem(2,SPINNER);
+}
+
+void item_func_IRONBALL(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setItem(6,IRONBALL);
+}
+
+// li r0, 0x1e instruction in wrong place
+#ifdef NONMATCHING
+void item_func_BOW(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setItem(4,BOW);
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItemRecord().setBowAmount(30);
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItemMax().setBowCapacity(30);
+}
+#else
+asm void item_func_BOW(void) {
+    nofralloc
+    #include "d/d_item/d_item/asm/func_800987B4.s"
+}
+#endif
+
+void item_func_HOOKSHOT(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setItem(9,HOOKSHOT);
+}
+
+void item_func_HVY_BOOTS(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setItem(3,HVY_BOOTS);
+}
+
+void item_func_COPY_ROD(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setItem(8,COPY_ROD);
+}
+
+void item_func_W_HOOKSHOT(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setItem(9,NO_ITEM);
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setItem(10,W_HOOKSHOT);
+}
+
+void item_func_KANTERA(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().setPlayerStatusAOil(21600);
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setItem(1,KANTERA);
+}
+
+void item_func_LIGHT_SWORD(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerCollect().setCollect(SWORD_BITFIELD,LIGHT_SWORD_FLAG);
+    dMeter2Info_setSword(LIGHT_SWORD,0);
+}
+
+void item_func_FISHING_ROD_1(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setItem(20,FISHING_ROD_1);
+}
+
+void item_func_PACHINKO(void){
+    g_dComIfG_gameInfo.give_item.seeds += 50;
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setItem(23,PACHINKO);
+}
+
+void item_func_COPY_ROD_2(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setItem(8,COPY_ROD);
+}
+
+void item_func_BOMB_BAG_LV2(void){
+    return;
+}
+
+void item_func_BOMB_BAG_LV1(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setEmptyBombBag(NORMAL_BOMB,30);
+}
+
+void item_func_BOMB_IN_BAG(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setEmptyBombBag(NORMAL_BOMB,30);
+}
+
+void item_func_LIGHT_ARROW(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setItem(4,LIGHT_ARROW);
+}
+
+// li r0, 0x3C instruction in wrong place
+#ifdef NONMATCHING
+void item_func_ARROW_LV1(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItemRecord().setBowAmount(60);
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItemMax().setBowCapacity(60);
+}
+#else
+asm void item_func_ARROW_LV1(void) {
+    nofralloc
+    #include "d/d_item/d_item/asm/func_80098AB0.s"
+}
+#endif
+
+// li r0, 0x3C instruction in wrong place
+#ifdef NONMATCHING
+void item_func_ARROW_LV2(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItemRecord().setBowAmount(60);
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItemMax().setBowCapacity(60);
+}
+#else
+asm void item_func_ARROW_LV2(void) {
+    nofralloc
+    #include "d/d_item/d_item/asm/func_80098AB0.s" // didnt bother splitting as its exactly the same as LV1
+}
+#endif
+
+// li r0, 0x64 instruction in wrong place
+#ifdef NONMATCHING
+void item_func_ARROW_LV3(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItemRecord().setBowAmount(100);
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItemMax().setBowCapacity(100);
+}
+#else
+asm void item_func_ARROW_LV3(void) {
+    nofralloc
+    #include "d/d_item/d_item/asm/func_80098AE0.s"
+}
+#endif
+
+void item_func_LURE_ROD(void){
+    return;
+}
+
+void item_func_BOMB_ARROW(void){
+    return;
+}
+
+void item_func_HAWK_ARROW(void){
+    return;
+}
+
+void item_func_BEE_ROD(void){
+    return;
+}
+
+void item_func_JEWEL_ROD(void){
+    return;
+}
+
+void item_func_WORM_ROD(void){
+    return;
+}
+
+void item_func_JEWEL_BEE_ROD(void){
+    return;
+}
+
+void item_func_JEWEL_WORM_ROD(void){
+    return;
+}
+
+void item_func_EMPTY_BOTTLE(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setEmptyBottle();
+}
+
+void item_func_RED_BOTTLE(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setEmptyBottleItemIn(RED_BOTTLE);
+}
+
+void item_func_GREEN_BOTTLE(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setEmptyBottleItemIn(GREEN_BOTTLE);
+}
+
+void item_func_BLUE_BOTTLE(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setEmptyBottleItemIn(BLUE_BOTTLE);
+}
+
+void item_func_MILK_BOTTLE(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setEmptyBottleItemIn(MILK_BOTTLE);
+}
+
+void item_func_HALF_MILK_BOTTLE(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setEmptyBottle(HALF_MILK_BOTTLE);
+}
+
+void item_func_OIL_BOTTLE(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setEmptyBottleItemIn(OIL_BOTTLE);
+}
+
+void item_func_WATER_BOTTLE(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setEmptyBottleItemIn(WATER_BOTTLE);
+}
+
+void item_func_OIL_BOTTLE2(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setEmptyBottleItemIn(OIL_BOTTLE);
+}
+
+void item_func_RED_BOTTLE2(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setEmptyBottleItemIn(RED_BOTTLE);
+}
+
+void item_func_UGLY_SOUP(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setEmptyBottleItemIn(UGLY_SOUP);
+}
+
+void item_func_HOT_SPRING(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setEmptyBottleItemIn(HOT_SPRING);
+}
+
+void item_func_FAIRY_BOTTLE(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setEmptyBottleItemIn(FAIRY);
+}
+
+void item_func_HOT_SPRING2(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setEmptyBottleItemIn(HOT_SPRING);
+}
+
+void item_func_OIL2(void){
+    return;
+}
+
+void item_func_OIL(void){
+    return;
+}
+
+void item_func_NORMAL_BOMB(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setEmptyBombBag(NORMAL_BOMB,60);
+}
+
+void item_func_WATER_BOMB(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setEmptyBombBag();
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setEmptyBombBagItemIn(WATER_BOMB,1);
+}
+
+void item_func_POKE_BOMB(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setEmptyBombBag();
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setEmptyBombBagItemIn(POKE_BOMB,1);
+}
+
+void item_func_FAIRY_DROP(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setEmptyBottleItemIn(FAIRY_DROP);
+}
+
+void item_func_WORM(void){
+    return;
+}
+
+void item_func_DROP_BOTTLE(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setEmptyBottle(FAIRY_DROP);
+}
+
+asm void item_func_BEE_CHILD(void) {
+    nofralloc
+    #include "d/d_item/d_item/asm/func_80098EE4.s"
+}
+
+void item_func_CHUCHU_RARE(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setEmptyBottleItemIn(CHUCHU_RARE);
+}
+
+void item_func_CHUCHU_RED(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setEmptyBottleItemIn(CHUCHU_RED);
+}
+
+void item_func_CHUCHU_BLUE(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setEmptyBottleItemIn(CHUCHU_BLUE);
+}
+
+void item_func_CHUCHU_GREEN(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setEmptyBottleItemIn(CHUCHU_GREEN);
+}
+
+void item_func_CHUCHU_YELLOW(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setEmptyBottleItemIn(CHUCHU_YELLOW);
+}
+
+void item_func_CHUCHU_PURPLE(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setEmptyBottleItemIn(CHUCHU_PURPLE);
+}
+
+void item_func_LV1_SOUP(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setEmptyBottleItemIn(LV1_SOUP);
+}
+
+void item_func_LV2_SOUP(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setEmptyBottleItemIn(LV2_SOUP);
+}
+
+void item_func_LV3_SOUP(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setEmptyBottleItemIn(LV3_SOUP);
+}
+
+void item_func_LETTER(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setItem(21,LETTER);
+}
+
+void item_func_BILL(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setItem(21,BILL);
+}
+
+void item_func_WOOD_STATUE(void){
+    g_dComIfG_gameInfo.save_file.getEventFlags().onEventBit(lbl_803A7288.unk566);
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setItem(21,WOOD_STATUE);
+}
+
+void item_func_IRIAS_PENDANT(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setItem(21,IRIAS_PENDANT);
+}
+
+void item_func_HORSE_FLUTE(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setItem(21,HORSE_FLUTE);
+}
+
+void item_func_RAFRELS_MEMO(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setItem(19,RAFRELS_MEMO);
+}
+
+void item_func_ASHS_SCRIBBLING(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setItem(19,ASHS_SCRIBBLING);
+}
+
+void item_func_CHUCHU_YELLOW2(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setEmptyBottleItemIn(CHUCHU_YELLOW);
+}
+
+void item_func_OIL_BOTTLE3(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setEmptyBottle(OIL_BOTTLE);
+}
+
+void item_func_SHOP_BEE_CHILD(void){
+    item_func_BEE_CHILD();
+}
+
+void item_func_CHUCHU_BLACK(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setEmptyBottleItemIn(CHUCHU_BLACK);
+}
+
+void item_func_LIGHT_DROP(void){
+    return;
+}
+
+void item_func_DROP_CONTAINER(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getLightDrop().onLightDropGetFlag(FARON_VESSEL);
+}
+
+void item_func_DROP_CONTAINER02(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getLightDrop().onLightDropGetFlag(ELDIN_VESSEL);
+}
+
+void item_func_DROP_CONTAINER03(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getLightDrop().onLightDropGetFlag(LANAYRU_VESSEL);
+}
+
+void item_func_FILLED_CONTAINER(void){
+    return;
+}
+
+void item_func_MIRROR_PIECE_2(void){
+    return;
+}
+
+void item_func_MIRROR_PIECE_3(void){
+    return;
+}
+
+void item_func_MIRROR_PIECE_4(void){
+    return;
+}
+
+void item_func_SMELL_YELIA_POUCH(void){
+    return;
+}
+
+void item_func_SMELL_PUMPKIN(void){
+    return;
+}
+
+void item_func_SMELL_POH(void){
+    return;
+}
+
+void item_func_SMELL_FISH(void){
+    return;
+}
+
+void item_func_SMELL_CHILDREN(void){
+    return;
+}
+
+void item_func_SMELL_MEDICINE(void){
+    return;
+}
+
+void item_func_M_BEETLE(void){
+    return;
+}
+
+void item_func_F_BEETLE(void){
+    return;
+}
+
+void item_func_M_BUTTERFLY(void){
+    return;
+}
+
+void item_func_F_BUTTERFLY(void){
+    return;
+}
+
+void item_func_M_STAG_BEETLE(void){
+    return;
+}
+
+void item_func_F_STAG_BEETLE(void){
+    return;
+}
+
+void item_func_M_GRASSHOPPER(void){
+    return;
+}
+
+void item_func_F_GRASSHOPPER(void){
+    return;
+}
+
+void item_func_M_NANAFUSHI(void){
+    return;
+}
+
+void item_func_F_NANAFUSHI(void){
+    return;
+}
+
+void item_func_M_DANGOMUSHI(void){
+    return;
+}
+
+void item_func_F_DANGOMUSHI(void){
+    return;
+}
+
+void item_func_M_MANTIS(void){
+    return;
+}
+
+void item_func_F_MANTIS(void){
+    return;
+}
+
+void item_func_M_LADYBUG(void){
+    return;
+}
+
+void item_func_F_LADYBUG(void){
+    return;
+}
+
+void item_func_M_SNAIL(void){
+    return;
+}
+
+void item_func_F_SNAIL(void){
+    return;
+}
+
+void item_func_M_DRAGONFLY(void){
+    return;
+}
+
+void item_func_F_DRAGONFLY(void){
+    return;
+}
+
+void item_func_M_ANT(void){
+    return;
+}
+
+void item_func_F_ANT(void){
+    return;
+}
+
+void item_func_M_MAYFLY(void){
+    return;
+}
+
+void item_func_F_MAYFLY(void){
+    return;
+}
+
+void item_func_POU_SPIRIT(void){
+    return;
+}
+
+void item_func_ANCIENT_DOCUMENT(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setItem(22,ANCIENT_DOCUMENT);
+}
+
+void item_func_AIR_LETTER(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setItem(22,AIR_LETTER);
+}
+
+void item_func_ANCIENT_DOCUMENT2(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setItem(22,ANCIENT_DOCUMENT2);
+}
+
+void item_func_LV7_DUNGEON_EXIT(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().setItem(18,LV7_DUNGEON_EXIT);
+}
+
+void item_func_LINKS_SAVINGS(void){
+    g_dComIfG_gameInfo.give_item.rupees += 50;
+}
+
+void item_func_SMALL_KEY2(void){
+    g_dComIfG_gameInfo.give_item.small_keys += 1;
+}
+
+void item_func_POU_FIRE1(void){
+    return;
+}
+
+void item_func_POU_FIRE2(void){
+    return;
+}
+
+void item_func_POU_FIRE3(void){
+    return;
+}
+
+void item_func_POU_FIRE4(void){
+    return;
+}
+
+void item_func_BOSSRIDER_KEY(void){
+    return;
+}
+
+void item_func_TOMATO_PUREE(void){
+    return;
+}
+
+void item_func_TASTE(void){
+    return;
+}
+
+void item_func_LV5_BOSS_KEY(void){
+    g_dComIfG_gameInfo.memory.getTempFlags().onDungeonItem(BOSS_KEY_FLAG);
+}
+
+void item_func_SURFBOARD(void){
+    return;
+}
+
+void item_func_KANTERA2(void){
+    return;
+}
+
+void item_func_L2_KEY_PIECES1(void){
+    return;
+}
+
+void item_func_L2_KEY_PIECES2(void){
+    return;
+}
+
+void item_func_L2_KEY_PIECES3(void){
+    return;
+}
+
+void item_func_KEY_OF_CARAVAN(void){
+    return;
+}
+
+void item_func_LV2_BOSS_KEY(void){
+    g_dComIfG_gameInfo.memory.getTempFlags().onDungeonItem(BOSS_KEY_FLAG);
+}
+
+void item_func_KEY_OF_FILONE(void){
+    g_dComIfG_gameInfo.give_item.small_keys += 1;
+}
+
+void item_func_noentry(void){
+    return;
+}
+
+int item_getcheck_func_noentry(void){
+    return -1;
+}
+
+int item_getcheck_func_HEART(void){
+    return -1;
+}
+
+void item_getcheck_func_GREEN_RUPEE(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(GREEN_RUPEE);
+}
+
+void item_getcheck_func_BLUE_RUPEE(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(BLUE_RUPEE);
+}
+
+void item_getcheck_func_YELLOW_RUPEE(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(YELLOW_RUPEE);
+}
+
+void item_getcheck_func_RED_RUPEE(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(RED_RUPEE);
+}
+
+void item_getcheck_func_PURPLE_RUPEE(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(PURPLE_RUPEE);
+}
+
+void item_getcheck_func_ORANGE_RUPEE(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(ORANGE_RUPEE);
+}
+
+void item_getcheck_func_SILVER_RUPEE(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(SILVER_RUPEE);
+}
+
+int item_getcheck_func_S_MAGIC(void){
+    return -1;
+}
+
+int item_getcheck_func_L_MAGIC(void){
+    return -1;
+}
+
+void item_getcheck_func_BOMB_5(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(BOMB_5);
+}
+
+void item_getcheck_func_BOMB_10(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(BOMB_10);
+}
+
+void item_getcheck_func_BOMB_20(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(BOMB_20);
+}
+
+void item_getcheck_func_BOMB_30(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(BOMB_30);
+}
+
+void item_getcheck_func_ARROW_10(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(ARROW_10);
+}
+
+void item_getcheck_func_ARROW_20(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(ARROW_20);
+}
+
+void item_getcheck_func_ARROW_30(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(ARROW_30);
+}
+
+void item_getcheck_func_ARROW_1(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(ARROW_1);
+}
+
+void item_getcheck_func_PACHINKO_SHOT(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(PACHINKO_SHOT);
+}
+
+int item_getcheck_func_WATER_BOMB_5(void){
+    return -1;
+}
+
+int item_getcheck_func_WATER_BOMB_10(void){
+    return -1;
+}
+
+int item_getcheck_func_WATER_BOMB_20(void){
+    return -1;
+}
+
+int item_getcheck_func_WATER_BOMB_30(void){
+    return -1;
+}
+
+int item_getcheck_func_BOMB_INSECT_5(void){
+    return -1;
+}
+
+void item_getcheck_func_BOMB_INSECT_10(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(BOMB_INSECT_10);
+}
+
+void item_getcheck_func_BOMB_INSECT_20(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(BOMB_INSECT_20);
+}
+
+void item_getcheck_func_BOMB_INSECT_30(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(BOMB_INSECT_30);
+}
+
+int item_getcheck_func_RECOVER_FAILY(void){
+    return -1;
+}
+
+int item_getcheck_func_TRIPLE_HEART(void){
+    return -1;
+}
+
+int item_getcheck_func_SMALL_KEY(void){
+    return -1;
+}
+
+int item_getcheck_func_KAKERA_HEART(void){
+    return -1;
+}
+
+int item_getcheck_func_UTUWA_HEART(void){
+    return -1;
+}
+
+bool item_getcheck_func_MAP(void){
+    return g_dComIfG_gameInfo.memory.getTempFlags().isDungeonItem(MAP_FLAG);
+}
+
+int item_getcheck_func_COMPUS(void){
+    return -1;
+}
+
+asm int item_getcheck_func_DUNGEON_EXIT(void){
+    nofralloc
+    #include "d/d_item/d_item/asm/func_80099A70.s"
+}
+
+bool item_getcheck_func_BOSS_KEY(void){
+    return g_dComIfG_gameInfo.memory.getTempFlags().isDungeonItem(BOSS_KEY_FLAG);
+}
+
+asm int item_getcheck_func_DUNGEON_BACK(void){
+    nofralloc
+    #include "d/d_item/d_item/asm/func_80099AE4.s"
+}
+
+void item_getcheck_func_SWORD(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerCollect().isCollect(SWORD_BITFIELD,ORDON_SWORD_FLAG);
+}
+
+void item_getcheck_func_MASTER_SWORD(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerCollect().isCollect(SWORD_BITFIELD,MASTER_SWORD_FLAG);
+}
+
+void item_getcheck_func_WOOD_SHIELD(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(WOOD_SHIELD);
+}
+
+void item_getcheck_func_SHIELD(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(SHIELD);
+}
+
+void item_getcheck_func_HYLIA_SHIELD(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(HYLIA_SHIELD);
+}
+
+asm int item_getcheck_func_TKS_LETTER(void){
+    nofralloc
+    #include "d/d_item/d_item/asm/func_80099C20.s"
+}
+
+void item_getcheck_func_WEAR_CASUAL(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(WEARS_CASUAL);
+}
+
+void item_getcheck_func_WEAR_KOKIRI(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerCollect().isCollect(CLOTHING_BITFIELD,HEROS_CLOTHES_FLAG);
+}
+
+void item_getcheck_func_ARMOR(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(ARMOR);
+}
+
+void item_getcheck_func_WEAR_ZORA(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(WEAR_ZORA);
+}
+
+int item_getcheck_func_MAGIC_LV1(void){
+    return -1;
+}
+
+asm int item_getcheck_func_DUNGEON_EXIT_2(void){
+    nofralloc
+    #include "d/d_item/d_item/asm/func_80099D30.s"
+}
+
+int item_getcheck_func_WALLET_LV1(void){
+    return -1;
+}
+
+int item_getcheck_func_WALLET_LV2(void){
+    return -1;
+}
+
+int item_getcheck_func_WALLET_LV3(void){
+    return -1;
+}
+
+asm int item_getcheck_func_ZORAS_JEWEL(void){
+    nofralloc
+    #include "d/d_item/d_item/asm/func_80099D8C.s"
+}
+
+void item_getcheck_func_HAWK_EYE(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(HAWK_EYE);
+}
+
+void item_getcheck_func_WOOD_STICK(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(WOOD_STICK);
+}
+
+asm int item_getcheck_func_BOOMERANG(void){
+    nofralloc
+    #include "d/d_item/d_item/asm/func_80099E30.s"
+}
+
+asm int item_getcheck_func_SPINNER(void){
+    nofralloc
+    #include "d/d_item/d_item/asm/func_80099E74.s"
+}
+
+asm int item_getcheck_func_IRONBALL(void){
+    nofralloc
+    #include "d/d_item/d_item/asm/func_80099EB8.s"
+}
+
+asm int item_getcheck_func_BOW(void){
+    nofralloc
+    #include "d/d_item/d_item/asm/func_80099EFC.s"
+}
+
+asm int item_getcheck_func_HOOKSHOT(void){
+    nofralloc
+    #include "d/d_item/d_item/asm/func_80099F40.s"
+}
+
+asm int item_getcheck_func_HVY_BOOTS(void){
+    nofralloc
+    #include "d/d_item/d_item/asm/func_80099F84.s"
+}
+
+asm int item_getcheck_func_COPY_ROD(void){
+    nofralloc
+    #include "d/d_item/d_item/asm/func_80099FC8.s"
+}
+
+asm int item_getcheck_func_W_HOOKSHOT(void){
+    nofralloc
+    #include "d/d_item/d_item/asm/func_8009A00C.s"
+}
+
+asm int item_getcheck_func_KANTERA(void){
+    nofralloc
+    #include "d/d_item/d_item/asm/func_8009A050.s"
+}
+
+void item_getcheck_func_LIGHT_SWORD(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerCollect().isCollect(SWORD_BITFIELD,LIGHT_SWORD_FLAG);
+}
+
+asm int item_getcheck_func_FISHING_ROD_1(void){
+    nofralloc
+    #include "d/d_item/d_item/asm/func_8009A0C8.s"
+}
+
+asm int item_getcheck_func_PACHINKO(void){
+    nofralloc
+    #include "d/d_item/d_item/asm/func_8009A1FC.s"
+}
+
+int item_getcheck_func_COPY_ROD_2(void){
+    return -1;
+}
+
+void item_getcheck_func_BOMB_BAG_LV2(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(BOMB_BAG_LV2);
+}
+
+void item_getcheck_func_BOMB_BAG_LV1(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(BOMB_BAG_LV1);
+}
+
+void item_getcheck_func_BOMB_IN_BAG(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(BOMB_IN_BAG);
+}
+
+void item_getcheck_func_LIGHT_ARROW(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(LIGHT_ARROW);
+}
+
+asm int item_getcheck_func_ARROW_LV1(void) {
+    nofralloc
+    #include "d/d_item/d_item/asm/func_8009A308.s"
+}
+
+asm int item_getcheck_func_ARROW_LV2(void) {
+    nofralloc
+    #include "d/d_item/d_item/asm/func_8009A378.s"
+}
+
+asm int item_getcheck_func_ARROW_LV3(void) {
+    nofralloc
+    #include "d/d_item/d_item/asm/func_8009A3E8.s"
+}
+
+int item_getcheck_func_LURE_ROD(void){
+    return -1;
+}
+
+int item_getcheck_func_BOMB_ARROW(void){
+    return -1;
+}
+
+int item_getcheck_func_HAWK_ARROW(void){
+    return -1;
+}
+
+void item_getcheck_func_BEE_ROD(void){
+    item_getcheck_func_FISHING_ROD_1();
+}
+
+void item_getcheck_func_JEWEL_ROD(void){
+    item_getcheck_func_FISHING_ROD_1();
+}
+
+void item_getcheck_func_WORM_ROD(void){
+    item_getcheck_func_FISHING_ROD_1();
+}
+
+void item_getcheck_func_JEWEL_BEE_ROD(void){
+    item_getcheck_func_FISHING_ROD_1();
+}
+
+void item_getcheck_func_JEWEL_WORM_ROD(void){
+    item_getcheck_func_FISHING_ROD_1();
+}
+
+int item_getcheck_func_EMPTY_BOTTLE(void){
+    u8 bottle_check;
+
+    bottle_check = g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().checkBottle(EMPTY_BOTTLE);
+    return bottle_check;
+}
+
+int item_getcheck_func_RED_BOTTLE(void){
+    u8 bottle_check;
+
+    bottle_check = g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().checkBottle(RED_BOTTLE);
+    return bottle_check;
+}
+
+int item_getcheck_func_GREEN_BOTTLE(void){
+    u8 bottle_check;
+
+    bottle_check = g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().checkBottle(GREEN_BOTTLE);
+    return bottle_check;
+}
+
+int item_getcheck_func_BLUE_BOTTLE(void){
+    u8 bottle_check;
+
+    bottle_check = g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().checkBottle(BLUE_BOTTLE);
+    return bottle_check;
+}
+
+int item_getcheck_func_MILK_BOTTLE(void){
+    u8 bottle_check;
+
+    bottle_check = g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().checkBottle(MILK_BOTTLE);
+    return bottle_check;
+}
+
+int item_getcheck_func_HALF_MILK_BOTTLE(void){
+    u8 bottle_check;
+
+    bottle_check = g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().checkBottle(HALF_MILK_BOTTLE);
+    return bottle_check;
+}
+
+int item_getcheck_func_OIL_BOTTLE(void){
+    u8 bottle_check;
+
+    bottle_check = g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().checkBottle(OIL_BOTTLE);
+    return bottle_check;
+}
+
+int item_getcheck_func_WATER_BOTTLE(void){
+    u8 bottle_check;
+
+    bottle_check = g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().checkBottle(WATER_BOTTLE);
+    return bottle_check;
+}
+
+int item_getcheck_func_OIL_BOTTLE2(void){
+    u8 bottle_check;
+
+    bottle_check = g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().checkBottle(OIL_BOTTLE_2);
+    return bottle_check;
+}
+
+int item_getcheck_func_RED_BOTTLE2(void){
+    u8 bottle_check;
+
+    bottle_check = g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().checkBottle(RED_BOTTLE_2);
+    return bottle_check;
+}
+
+int item_getcheck_func_UGLY_SOUP(void){
+    u8 bottle_check;
+
+    bottle_check = g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().checkBottle(UGLY_SOUP);
+    return bottle_check;
+}
+
+int item_getcheck_func_HOT_SPRING(void){
+    u8 bottle_check;
+
+    bottle_check = g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().checkBottle(HOT_SPRING);
+    return bottle_check;
+}
+
+int item_getcheck_func_FAIRY_BOTTLE(void){
+    u8 bottle_check;
+
+    bottle_check = g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().checkBottle(FAIRY);
+    return bottle_check;
+}
+
+int item_getcheck_func_HOT_SPRING2(void){
+    u8 bottle_check;
+
+    bottle_check = g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().checkBottle(HOT_SPRING);
+    return bottle_check;
+}
+
+int item_getcheck_func_OIL2(void){
+    u8 bottle_check;
+
+    bottle_check = g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().checkBottle(OIL2);
+    return bottle_check;
+}
+
+int item_getcheck_func_OIL(void){
+    u8 bottle_check;
+
+    bottle_check = g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().checkBottle(OIL);
+    return bottle_check;
+}
+
+void item_getcheck_func_NORMAL_BOMB(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(NORMAL_BOMB);
+}
+
+void item_getcheck_func_WATER_BOMB(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(WATER_BOMB);
+}
+
+void item_getcheck_func_POKE_BOMB(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(POKE_BOMB);
+}
+
+int item_getcheck_func_FAIRY_DROP(void){
+    u8 bottle_check;
+
+    bottle_check = g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().checkBottle(FAIRY_DROP);
+    return bottle_check;
+}
+
+int item_getcheck_func_WORM(void){
+    u8 bottle_check;
+
+    bottle_check = g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().checkBottle(WORM);
+    return bottle_check;
+}
+
+void item_getcheck_func_DROP_BOTTLE(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(DROP_BOTTLE);
+}
+
+int item_getcheck_func_BEE_CHILD(void) {
+    return -1;
+}
+
+int item_getcheck_func_CHUCHU_RARE(void){
+    u8 bottle_check;
+
+    bottle_check = g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().checkBottle(CHUCHU_RARE);
+    return bottle_check;
+}
+
+int item_getcheck_func_CHUCHU_RED(void){
+    u8 bottle_check;
+
+    bottle_check = g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().checkBottle(CHUCHU_RED);
+    return bottle_check;
+}
+
+int item_getcheck_func_CHUCHU_BLUE(void){
+    u8 bottle_check;
+
+    bottle_check = g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().checkBottle(CHUCHU_BLUE);
+    return bottle_check;
+}
+
+int item_getcheck_func_CHUCHU_GREEN(void){
+    u8 bottle_check;
+
+    bottle_check = g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().checkBottle(CHUCHU_GREEN);
+    return bottle_check;
+}
+
+int item_getcheck_func_CHUCHU_YELLOW(void){
+    u8 bottle_check;
+
+    bottle_check = g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().checkBottle(CHUCHU_YELLOW);
+    return bottle_check;
+}
+
+int item_getcheck_func_CHUCHU_PURPLE(void){
+    u8 bottle_check;
+
+    bottle_check = g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().checkBottle(CHUCHU_PURPLE);
+    return bottle_check;
+}
+
+void item_getcheck_func_LV1_SOUP(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(LV1_SOUP);
+}
+
+void item_getcheck_func_LV2_SOUP(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(LV2_SOUP);
+}
+
+void item_getcheck_func_LV3_SOUP(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(LV3_SOUP);
+}
+
+asm int item_getcheck_func_LETTER(void) {
+    nofralloc
+    #include "d/d_item/d_item/asm/func_8009AB48.s"
+}
+
+asm int item_getcheck_func_BILL(void) {
+    nofralloc
+    #include "d/d_item/d_item/asm/func_8009AB8C.s"
+}
+
+asm int item_getcheck_func_WOOD_STATUE(void) {
+    nofralloc
+    #include "d/d_item/d_item/asm/func_8009ABD0.s"
+}
+
+asm int item_getcheck_func_IRIAS_PENDANT(void) {
+    nofralloc
+    #include "d/d_item/d_item/asm/func_8009AC14.s"
+}
+
+asm int item_getcheck_func_HORSE_FLUTE(void) {
+    nofralloc
+    #include "d/d_item/d_item/asm/func_8009AC58.s"
+}
+
+asm int item_getcheck_func_RAFRELS_MEMO(void) {
+    nofralloc
+    #include "d/d_item/d_item/asm/func_8009AC9C.s"
+}
+
+asm int item_getcheck_func_ASHS_SCRIBBLING(void) {
+    nofralloc
+    #include "d/d_item/d_item/asm/func_8009ACE0.s"
+}
+
+int item_getcheck_func_CHUCHU_YELLOW2(void){
+    u8 bottle_check;
+
+    bottle_check = g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().checkBottle(CHUCHU_YELLOW2);
+    return bottle_check;
+}
+
+int item_getcheck_func_OIL_BOTTLE3(void){
+    return -1;
+}
+
+int item_getcheck_func_SHOP_BEE_CHILD(void){
+    return -1;
+}
+
+int item_getcheck_func_CHUCHU_BLACK(void){
+    u8 bottle_check;
+
+    bottle_check = g_dComIfG_gameInfo.save_file.getPlayer().getPlayerItem().checkBottle(CHUCHU_BLACK);
+    return bottle_check;
+}
+
+void item_getcheck_func_LIGHT_DROP(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(LIGHT_DROP);
+}
+
+void item_getcheck_func_DROP_CONTAINER(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getLightDrop().isLightDropGetFlag(FARON_VESSEL);
+}
+
+void item_getcheck_func_DROP_CONTAINER02(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getLightDrop().isLightDropGetFlag(ELDIN_VESSEL);
+}
+
+void item_getcheck_func_DROP_CONTAINER03(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getLightDrop().isLightDropGetFlag(LANAYRU_VESSEL);
+}
+
+int item_getcheck_func_FILLED_CONTAINER(void){
+    return -1;
+}
+
+int item_getcheck_func_MIRROR_PIECE_2(void){
+    return -1;
+}
+
+int item_getcheck_func_MIRROR_PIECE_3(void){
+    return -1;
+}
+
+int item_getcheck_func_MIRROR_PIECE_4(void){
+    return -1;
+}
+
+asm int item_getcheck_func_SMELL_YELIA_POUCH(void) {
+    nofralloc
+    #include "d/d_item/d_item/asm/func_8009AE7C.s"
+}
+
+int item_getcheck_func_SMELL_PUMPKIN(void){
+    return -1;
+}
+
+asm int item_getcheck_func_SMELL_POH(void) {
+    nofralloc
+    #include "d/d_item/d_item/asm/func_8009AEA0.s"
+}
+
+asm int item_getcheck_func_SMELL_FISH(void) {
+    nofralloc
+    #include "d/d_item/d_item/asm/func_8009AEBC.s"
+}
+
+asm int item_getcheck_func_SMELL_CHILDREN(void) {
+    nofralloc
+    #include "d/d_item/d_item/asm/func_8009AED8.s"
+}
+
+asm int item_getcheck_func_SMELL_MEDICINE(void) {
+    nofralloc
+    #include "d/d_item/d_item/asm/func_8009AEF4.s"
+}
+
+void item_getcheck_func_M_BEETLE(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(M_BEETLE);
+}
+
+void item_getcheck_func_F_BEETLE(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(F_BEETLE);
+}
+
+void item_getcheck_func_M_BUTTERFLY(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(M_BUTTERFLY);
+}
+
+void item_getcheck_func_F_BUTTERFLY(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(F_BUTTERFLY);
+}
+
+void item_getcheck_func_M_STAG_BEETLE(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(M_STAG_BEETLE);
+}
+
+void item_getcheck_func_F_STAG_BEETLE(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(F_STAG_BEETLE);
+}
+
+void item_getcheck_func_M_GRASSHOPPER(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(M_GRASSHOPPER);
+}
+
+void item_getcheck_func_F_GRASSHOPPER(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(F_GRASSHOPPER);
+}
+
+void item_getcheck_func_M_NANAFUSHI(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(M_NANAFUSHI);
+}
+
+void item_getcheck_func_F_NANAFUSHI(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(F_NANAFUSHI);
+}
+
+void item_getcheck_func_M_DANGOMUSHI(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(M_DANGOMUSHI);
+}
+
+void item_getcheck_func_F_DANGOMUSHI(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(F_DANGOMUSHI);
+}
+
+void item_getcheck_func_M_MANTIS(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(M_MANTIS);
+}
+
+void item_getcheck_func_F_MANTIS(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(F_MANTIS);
+}
+
+void item_getcheck_func_M_LADYBUG(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(M_LADYBUG);
+}
+
+void item_getcheck_func_F_LADYBUG(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(F_LADYBUG);
+}
+
+void item_getcheck_func_M_SNAIL(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(M_SNAIL);
+}
+
+void item_getcheck_func_F_SNAIL(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(F_SNAIL);
+}
+
+void item_getcheck_func_M_DRAGONFLY(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(M_DRAGONFLY);
+}
+
+void item_getcheck_func_F_DRAGONFLY(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(F_DRAGONFLY);
+}
+
+void item_getcheck_func_M_ANT(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(M_ANT);
+}
+
+void item_getcheck_func_F_ANT(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(F_ANT);
+}
+
+void item_getcheck_func_M_MAYFLY(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(M_MAYFLY);
+}
+
+void item_getcheck_func_F_MAYFLY(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(F_MAYFLY);
+}
+
+int item_getcheck_func_POU_SPIRIT(void){
+    return g_dComIfG_gameInfo.save_file.getPlayer().getPlayerCollect().getPoeCount();
+}
+
+asm int item_getcheck_func_ANCIENT_DOCUMENT(void) {
+    nofralloc
+    #include "d/d_item/d_item/asm/func_8009B3A0.s"
+}
+
+asm int item_getcheck_func_AIR_LETTER(void) {
+    nofralloc
+    #include "d/d_item/d_item/asm/func_8009B3E4.s"
+}
+
+asm int item_getcheck_func_ANCIENT_DOCUMENT2(void) {
+    nofralloc
+    #include "d/d_item/d_item/asm/func_8009B428.s"
+}
+
+asm int item_getcheck_func_LV7_DUNGEON_EXIT(void) {
+    nofralloc
+    #include "d/d_item/d_item/asm/func_8009B46C.s"
+}
+
+int item_getcheck_func_LINKS_SAVINGS(void){
+    return -1;
+}
+
+int item_getcheck_func_SMALL_KEY2(void){
+    return -1;
+}
+
+int item_getcheck_func_POU_FIRE1(void){
+    return -1;
+}
+
+int item_getcheck_func_POU_FIRE2(void){
+    return -1;
+}
+
+int item_getcheck_func_POU_FIRE3(void){
+    return -1;
+}
+
+int item_getcheck_func_POU_FIRE4(void){
+    return -1;
+}
+
+int item_getcheck_func_BOSSRIDER_KEY(void){
+    return -1;
+}
+
+void item_getcheck_func_TOMATO_PUREE(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(TOMATO_PUREE);
+}
+
+void item_getcheck_func_TASTE(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(TASTE);
+}
+
+void item_getcheck_func_LV5_BOSS_KEY(void){
+    g_dComIfG_gameInfo.memory.getTempFlags().isDungeonItem(BOSS_KEY_FLAG);
+}
+
+int item_getcheck_func_SURFBOARD(void){
+    return -1;
+}
+
+int item_getcheck_func_KANTERA2(void){
+    return -1;
+}
+
+void item_getcheck_func_L2_KEY_PIECES1(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(L2_KEY_PIECES1);
+}
+
+void item_getcheck_func_L2_KEY_PIECES2(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(L2_KEY_PIECES2);
+}
+
+void item_getcheck_func_L2_KEY_PIECES3(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(L2_KEY_PIECES3);
+}
+
+void item_getcheck_func_KEY_OF_CARAVAN(void){
+    g_dComIfG_gameInfo.save_file.getPlayer().getPlayerGetItem().isFirstBit(KEY_OF_CARAVAN);
+}
+
+void item_getcheck_func_LV2_BOSS_KEY(void){
+    g_dComIfG_gameInfo.memory.getTempFlags().isDungeonItem(BOSS_KEY_FLAG);
+}
+
+int item_getcheck_func_KEY_OF_FILONE(void){
+    return g_dComIfG_gameInfo.memory.getTempFlags().getSmallKeys();
+}
+
+asm bool isBomb(u8 param1){
+    nofralloc
+    #include "d/d_item/d_item/asm/func_8009B688.s"
+}
+
+bool isArrow(u8 param1){
+    bool is_arrow;
+
+    is_arrow = false;
+    if(param1 == ARROW_1 || (u8)(param1 - ARROW_10) <= 1 || param1 == ARROW_30){
+        is_arrow = true;
+    }
+
+    return is_arrow;
+}
+
+asm bool isBottleItem(u8 param1){
+    nofralloc
+    #include "d/d_item/d_item/asm/func_8009B708.s"
+}
+
+bool isHeart(u8 param1) {
+    bool is_heart;
+
+    is_heart = false;
+    if(param1 == HEART || param1 == TRIPLE_HEART){
+        is_heart = true;
+    }
+    return is_heart;
+}
+
+//close
+#ifdef NONMATCHING
+bool isInsect(u8 param1) {
+    bool is_insect;
+
+    is_insect = false;
+    if(param1 < noentry53 && param1 < M_BEETLE){
+        is_insect = true;
+    }
+    return is_insect;
+}
+#else
+asm bool isInsect(u8 param1){
+    nofralloc
+    #include "d/d_item/d_item/asm/func_8009B79C.s"
+}
+#endif
+
+asm u32 check_itemno(int param1){
+    nofralloc
+    #include "d/d_item/d_item/asm/func_8009B7C4.s"
+}
+
+asm void addBombCount(u8 param1, u8 param2){
+    nofralloc
+    #include "d/d_item/d_item/asm/func_8009B940.s"
+}
\ No newline at end of file
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;
     }
 }
diff --git a/src/d/d_save/d_save_HIO.cpp b/src/d/d_save/d_save_HIO.cpp
index 27b43d0399..f5c7f1e294 100644
--- a/src/d/d_save/d_save_HIO.cpp
+++ b/src/d/d_save/d_save_HIO.cpp
@@ -1,4 +1,5 @@
 #include "d/d_save/d_save_HIO/d_save_HIO.h"
+#include "d/d_com/d_com_inf_game/d_com_inf_game.h"
 #include "global.h"
 
 #ifdef NONMATCHING