various fixes / matches (#2052)

* some fixes in d/s, d_item, d_shop

* fix for dKankyo_DayProc weak generation

* d_cc_uty fix

* some d_name / d_com_inf_game / f_op_actor_mng matches

* fix some player inline virtuals

* remove asm

1 files changed, 292 insertions, 753 deletions

diff --git a/src/d/d_item.cpp b/src/d/d_item.cpp
index 406df67a52..c386a4f418 100644
--- a/src/d/d_item.cpp
+++ b/src/d/d_item.cpp
@@ -1,460 +1,11 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d/d_item
-//
+/**
+ * d_item.cpp
+ * Item Get Handling
+ */
 
 #include "d/d_item.h"
 #include "d/com/d_com_inf_game.h"
 #include "d/meter/d_meter2_info.h"
-#include "dolphin/types.h"
-
-//
-// Types:
-//
-
-struct dEnemyItem_c {
-    static u8 mData[4 + 4 /* padding */];
-};
-
-//
-// Forward References:
-//
-
-extern "C" void execItemGet__FUc();
-extern "C" void checkItemGet__FUci();
-extern "C" static void item_func_HEART__Fv();
-extern "C" static void item_func_GREEN_RUPEE__Fv();
-extern "C" static void item_func_BLUE_RUPEE__Fv();
-extern "C" static void item_func_YELLOW_RUPEE__Fv();
-extern "C" static void item_func_RED_RUPEE__Fv();
-extern "C" static void item_func_PURPLE_RUPEE__Fv();
-extern "C" static void item_func_ORANGE_RUPEE__Fv();
-extern "C" static void item_func_SILVER_RUPEE__Fv();
-extern "C" static void item_func_S_MAGIC__Fv();
-extern "C" static void item_func_L_MAGIC__Fv();
-extern "C" static void item_func_BOMB_5__Fv();
-extern "C" static void item_func_BOMB_10__Fv();
-extern "C" static void item_func_BOMB_20__Fv();
-extern "C" static void item_func_BOMB_30__Fv();
-extern "C" static void item_func_ARROW_10__Fv();
-extern "C" static void item_func_ARROW_20__Fv();
-extern "C" static void item_func_ARROW_30__Fv();
-extern "C" static void item_func_ARROW_1__Fv();
-extern "C" static void item_func_PACHINKO_SHOT__Fv();
-extern "C" static void item_func_WATER_BOMB_5__Fv();
-extern "C" static void item_func_WATER_BOMB_10__Fv();
-extern "C" static void item_func_WATER_BOMB_20__Fv();
-extern "C" static void item_func_WATER_BOMB_30__Fv();
-extern "C" static void item_func_BOMB_INSECT_5__Fv();
-extern "C" static void item_func_BOMB_INSECT_10__Fv();
-extern "C" static void item_func_BOMB_INSECT_20__Fv();
-extern "C" static void item_func_BOMB_INSECT_30__Fv();
-extern "C" static void item_func_RECOVER_FAILY__Fv();
-extern "C" static void item_func_TRIPLE_HEART__Fv();
-extern "C" static void item_func_SMALL_KEY__Fv();
-extern "C" static void item_func_KAKERA_HEART__Fv();
-extern "C" static void item_func_UTUWA_HEART__Fv();
-extern "C" static void item_func_MAP__Fv();
-extern "C" static void item_func_COMPUS__Fv();
-extern "C" static void item_func_DUNGEON_EXIT__Fv();
-extern "C" static void item_func_BOSS_KEY__Fv();
-extern "C" static void item_func_DUNGEON_BACK__Fv();
-extern "C" static void item_func_SWORD__Fv();
-extern "C" static void item_func_MASTER_SWORD__Fv();
-extern "C" static void item_func_WOOD_SHIELD__Fv();
-extern "C" static void item_func_SHIELD__Fv();
-extern "C" static void item_func_HYLIA_SHIELD__Fv();
-extern "C" static void item_func_TKS_LETTER__Fv();
-extern "C" static void item_func_WEAR_CASUAL__Fv();
-extern "C" static void item_func_WEAR_KOKIRI__Fv();
-extern "C" static void item_func_ARMOR__Fv();
-extern "C" static void item_func_WEAR_ZORA__Fv();
-extern "C" static void item_func_MAGIC_LV1__Fv();
-extern "C" static void item_func_DUNGEON_EXIT_2__Fv();
-extern "C" static void item_func_WALLET_LV1__Fv();
-extern "C" static void item_func_WALLET_LV2__Fv();
-extern "C" static void item_func_WALLET_LV3__Fv();
-extern "C" static void item_func_ZORAS_JEWEL__Fv();
-extern "C" static void item_func_HAWK_EYE__Fv();
-extern "C" static void item_func_WOOD_STICK__Fv();
-extern "C" static void item_func_BOOMERANG__Fv();
-extern "C" static void item_func_SPINNER__Fv();
-extern "C" static void item_func_IRONBALL__Fv();
-extern "C" static void item_func_BOW__Fv();
-extern "C" static void item_func_HOOKSHOT__Fv();
-extern "C" static void item_func_HVY_BOOTS__Fv();
-extern "C" static void item_func_COPY_ROD__Fv();
-extern "C" static void item_func_W_HOOKSHOT__Fv();
-extern "C" static void item_func_KANTERA__Fv();
-extern "C" static void item_func_LIGHT_SWORD__Fv();
-extern "C" static void item_func_FISHING_ROD_1__Fv();
-extern "C" static void item_func_PACHINKO__Fv();
-extern "C" static void item_func_COPY_ROD_2__Fv();
-extern "C" static void item_func_BOMB_BAG_LV2__Fv();
-extern "C" static void item_func_BOMB_BAG_LV1__Fv();
-extern "C" static void item_func_BOMB_IN_BAG__Fv();
-extern "C" static void item_func_LIGHT_ARROW__Fv();
-extern "C" static void item_func_ARROW_LV1__Fv();
-extern "C" static void item_func_ARROW_LV2__Fv();
-extern "C" static void item_func_ARROW_LV3__Fv();
-extern "C" static void item_func_LURE_ROD__Fv();
-extern "C" static void item_func_BOMB_ARROW__Fv();
-extern "C" static void item_func_HAWK_ARROW__Fv();
-extern "C" static void item_func_BEE_ROD__Fv();
-extern "C" static void item_func_JEWEL_ROD__Fv();
-extern "C" static void item_func_WORM_ROD__Fv();
-extern "C" static void item_func_JEWEL_BEE_ROD__Fv();
-extern "C" static void item_func_JEWEL_WORM_ROD__Fv();
-extern "C" static void item_func_EMPTY_BOTTLE__Fv();
-extern "C" static void item_func_RED_BOTTLE__Fv();
-extern "C" static void item_func_GREEN_BOTTLE__Fv();
-extern "C" static void item_func_BLUE_BOTTLE__Fv();
-extern "C" static void item_func_MILK_BOTTLE__Fv();
-extern "C" static void item_func_HALF_MILK_BOTTLE__Fv();
-extern "C" static void item_func_OIL_BOTTLE__Fv();
-extern "C" static void item_func_WATER_BOTTLE__Fv();
-extern "C" static void item_func_OIL_BOTTLE2__Fv();
-extern "C" static void item_func_RED_BOTTLE2__Fv();
-extern "C" static void item_func_UGLY_SOUP__Fv();
-extern "C" static void item_func_HOT_SPRING__Fv();
-extern "C" static void item_func_FAIRY_BOTTLE__Fv();
-extern "C" static void item_func_HOT_SPRING2__Fv();
-extern "C" static void item_func_OIL2__Fv();
-extern "C" static void item_func_OIL__Fv();
-extern "C" static void item_func_NORMAL_BOMB__Fv();
-extern "C" static void item_func_WATER_BOMB__Fv();
-extern "C" static void item_func_POKE_BOMB__Fv();
-extern "C" static void item_func_FAIRY_DROP__Fv();
-extern "C" static void item_func_WORM__Fv();
-extern "C" static void item_func_DROP_BOTTLE__Fv();
-extern "C" static void item_func_BEE_CHILD__Fv();
-extern "C" static void item_func_CHUCHU_RARE__Fv();
-extern "C" static void item_func_CHUCHU_RED__Fv();
-extern "C" static void item_func_CHUCHU_BLUE__Fv();
-extern "C" static void item_func_CHUCHU_GREEN__Fv();
-extern "C" static void item_func_CHUCHU_YELLOW__Fv();
-extern "C" static void item_func_CHUCHU_PURPLE__Fv();
-extern "C" static void item_func_LV1_SOUP__Fv();
-extern "C" static void item_func_LV2_SOUP__Fv();
-extern "C" static void item_func_LV3_SOUP__Fv();
-extern "C" static void item_func_LETTER__Fv();
-extern "C" static void item_func_BILL__Fv();
-extern "C" static void item_func_WOOD_STATUE__Fv();
-extern "C" static void item_func_IRIAS_PENDANT__Fv();
-extern "C" static void item_func_HORSE_FLUTE__Fv();
-extern "C" static void item_func_RAFRELS_MEMO__Fv();
-extern "C" static void item_func_ASHS_SCRIBBLING__Fv();
-extern "C" static void item_func_CHUCHU_YELLOW2__Fv();
-extern "C" static void item_func_OIL_BOTTLE3__Fv();
-extern "C" static void item_func_SHOP_BEE_CHILD__Fv();
-extern "C" static void item_func_CHUCHU_BLACK__Fv();
-extern "C" static void item_func_LIGHT_DROP__Fv();
-extern "C" static void item_func_DROP_CONTAINER__Fv();
-extern "C" static void item_func_DROP_CONTAINER02__Fv();
-extern "C" static void item_func_DROP_CONTAINER03__Fv();
-extern "C" static void item_func_FILLED_CONTAINER__Fv();
-extern "C" static void item_func_MIRROR_PIECE_2__Fv();
-extern "C" static void item_func_MIRROR_PIECE_3__Fv();
-extern "C" static void item_func_MIRROR_PIECE_4__Fv();
-extern "C" static void item_func_SMELL_YELIA_POUCH__Fv();
-extern "C" static void item_func_SMELL_PUMPKIN__Fv();
-extern "C" static void item_func_SMELL_POH__Fv();
-extern "C" static void item_func_SMELL_FISH__Fv();
-extern "C" static void item_func_SMELL_CHILDREN__Fv();
-extern "C" static void item_func_SMELL_MEDICINE__Fv();
-extern "C" static void item_func_M_BEETLE__Fv();
-extern "C" static void item_func_F_BEETLE__Fv();
-extern "C" static void item_func_M_BUTTERFLY__Fv();
-extern "C" static void item_func_F_BUTTERFLY__Fv();
-extern "C" static void item_func_M_STAG_BEETLE__Fv();
-extern "C" static void item_func_F_STAG_BEETLE__Fv();
-extern "C" static void item_func_M_GRASSHOPPER__Fv();
-extern "C" static void item_func_F_GRASSHOPPER__Fv();
-extern "C" static void item_func_M_NANAFUSHI__Fv();
-extern "C" static void item_func_F_NANAFUSHI__Fv();
-extern "C" static void item_func_M_DANGOMUSHI__Fv();
-extern "C" static void item_func_F_DANGOMUSHI__Fv();
-extern "C" static void item_func_M_MANTIS__Fv();
-extern "C" static void item_func_F_MANTIS__Fv();
-extern "C" static void item_func_M_LADYBUG__Fv();
-extern "C" static void item_func_F_LADYBUG__Fv();
-extern "C" static void item_func_M_SNAIL__Fv();
-extern "C" static void item_func_F_SNAIL__Fv();
-extern "C" static void item_func_M_DRAGONFLY__Fv();
-extern "C" static void item_func_F_DRAGONFLY__Fv();
-extern "C" static void item_func_M_ANT__Fv();
-extern "C" static void item_func_F_ANT__Fv();
-extern "C" static void item_func_M_MAYFLY__Fv();
-extern "C" static void item_func_F_MAYFLY__Fv();
-extern "C" static void item_func_POU_SPIRIT__Fv();
-extern "C" static void item_func_ANCIENT_DOCUMENT__Fv();
-extern "C" static void item_func_AIR_LETTER__Fv();
-extern "C" static void item_func_ANCIENT_DOCUMENT2__Fv();
-extern "C" static void item_func_LV7_DUNGEON_EXIT__Fv();
-extern "C" static void item_func_LINKS_SAVINGS__Fv();
-extern "C" static void item_func_SMALL_KEY2__Fv();
-extern "C" static void item_func_POU_FIRE1__Fv();
-extern "C" static void item_func_POU_FIRE2__Fv();
-extern "C" static void item_func_POU_FIRE3__Fv();
-extern "C" static void item_func_POU_FIRE4__Fv();
-extern "C" static void item_func_BOSSRIDER_KEY__Fv();
-extern "C" static void item_func_TOMATO_PUREE__Fv();
-extern "C" static void item_func_TASTE__Fv();
-extern "C" static void item_func_LV5_BOSS_KEY__Fv();
-extern "C" static void item_func_SURFBOARD__Fv();
-extern "C" static void item_func_KANTERA2__Fv();
-extern "C" static void item_func_L2_KEY_PIECES1__Fv();
-extern "C" static void item_func_L2_KEY_PIECES2__Fv();
-extern "C" static void item_func_L2_KEY_PIECES3__Fv();
-extern "C" static void item_func_KEY_OF_CARAVAN__Fv();
-extern "C" static void item_func_LV2_BOSS_KEY__Fv();
-extern "C" static void item_func_KEY_OF_FILONE__Fv();
-extern "C" static void item_func_noentry__Fv();
-extern "C" static s32 item_getcheck_func_noentry__Fv();
-extern "C" static s32 item_getcheck_func_HEART__Fv();
-extern "C" static void item_getcheck_func_GREEN_RUPEE__Fv();
-extern "C" static void item_getcheck_func_BLUE_RUPEE__Fv();
-extern "C" static void item_getcheck_func_YELLOW_RUPEE__Fv();
-extern "C" static void item_getcheck_func_RED_RUPEE__Fv();
-extern "C" static void item_getcheck_func_PURPLE_RUPEE__Fv();
-extern "C" static void item_getcheck_func_ORANGE_RUPEE__Fv();
-extern "C" static void item_getcheck_func_SILVER_RUPEE__Fv();
-extern "C" static s32 item_getcheck_func_S_MAGIC__Fv();
-extern "C" static s32 item_getcheck_func_L_MAGIC__Fv();
-extern "C" static void item_getcheck_func_BOMB_5__Fv();
-extern "C" static void item_getcheck_func_BOMB_10__Fv();
-extern "C" static void item_getcheck_func_BOMB_20__Fv();
-extern "C" static void item_getcheck_func_BOMB_30__Fv();
-extern "C" static void item_getcheck_func_ARROW_10__Fv();
-extern "C" static void item_getcheck_func_ARROW_20__Fv();
-extern "C" static void item_getcheck_func_ARROW_30__Fv();
-extern "C" static void item_getcheck_func_ARROW_1__Fv();
-extern "C" static void item_getcheck_func_PACHINKO_SHOT__Fv();
-extern "C" static s32 item_getcheck_func_WATER_BOMB_5__Fv();
-extern "C" static s32 item_getcheck_func_WATER_BOMB_10__Fv();
-extern "C" static s32 item_getcheck_func_WATER_BOMB_20__Fv();
-extern "C" static s32 item_getcheck_func_WATER_BOMB_30__Fv();
-extern "C" static s32 item_getcheck_func_BOMB_INSECT_5__Fv();
-extern "C" static void item_getcheck_func_BOMB_INSECT_10__Fv();
-extern "C" static void item_getcheck_func_BOMB_INSECT_20__Fv();
-extern "C" static void item_getcheck_func_BOMB_INSECT_30__Fv();
-extern "C" static s32 item_getcheck_func_RECOVER_FAILY__Fv();
-extern "C" static s32 item_getcheck_func_TRIPLE_HEART__Fv();
-extern "C" static s32 item_getcheck_func_SMALL_KEY__Fv();
-extern "C" static s32 item_getcheck_func_KAKERA_HEART__Fv();
-extern "C" static s32 item_getcheck_func_UTUWA_HEART__Fv();
-extern "C" static void item_getcheck_func_MAP__Fv();
-extern "C" static s32 item_getcheck_func_COMPUS__Fv();
-extern "C" static void item_getcheck_func_DUNGEON_EXIT__Fv();
-extern "C" static void item_getcheck_func_BOSS_KEY__Fv();
-extern "C" static void item_getcheck_func_DUNGEON_BACK__Fv();
-extern "C" static void item_getcheck_func_SWORD__Fv();
-extern "C" static void item_getcheck_func_MASTER_SWORD__Fv();
-extern "C" static void item_getcheck_func_WOOD_SHIELD__Fv();
-extern "C" static void item_getcheck_func_SHIELD__Fv();
-extern "C" static void item_getcheck_func_HYLIA_SHIELD__Fv();
-extern "C" static void item_getcheck_func_TKS_LETTER__Fv();
-extern "C" static void item_getcheck_func_WEAR_CASUAL__Fv();
-extern "C" static void item_getcheck_func_WEAR_KOKIRI__Fv();
-extern "C" static void item_getcheck_func_ARMOR__Fv();
-extern "C" static void item_getcheck_func_WEAR_ZORA__Fv();
-extern "C" static s32 item_getcheck_func_MAGIC_LV1__Fv();
-extern "C" static void item_getcheck_func_DUNGEON_EXIT_2__Fv();
-extern "C" static s32 item_getcheck_func_WALLET_LV1__Fv();
-extern "C" static s32 item_getcheck_func_WALLET_LV2__Fv();
-extern "C" static s32 item_getcheck_func_WALLET_LV3__Fv();
-extern "C" static void item_getcheck_func_ZORAS_JEWEL__Fv();
-extern "C" static void item_getcheck_func_HAWK_EYE__Fv();
-extern "C" static void item_getcheck_func_WOOD_STICK__Fv();
-extern "C" static void item_getcheck_func_BOOMERANG__Fv();
-extern "C" static void item_getcheck_func_SPINNER__Fv();
-extern "C" static void item_getcheck_func_IRONBALL__Fv();
-extern "C" static void item_getcheck_func_BOW__Fv();
-extern "C" static void item_getcheck_func_HOOKSHOT__Fv();
-extern "C" static void item_getcheck_func_HVY_BOOTS__Fv();
-extern "C" static void item_getcheck_func_COPY_ROD__Fv();
-extern "C" static void item_getcheck_func_W_HOOKSHOT__Fv();
-extern "C" static void item_getcheck_func_KANTERA__Fv();
-extern "C" static void item_getcheck_func_LIGHT_SWORD__Fv();
-extern "C" static int item_getcheck_func_FISHING_ROD_1__Fv();
-extern "C" static void item_getcheck_func_PACHINKO__Fv();
-extern "C" static s32 item_getcheck_func_COPY_ROD_2__Fv();
-extern "C" static void item_getcheck_func_BOMB_BAG_LV2__Fv();
-extern "C" static void item_getcheck_func_BOMB_BAG_LV1__Fv();
-extern "C" static void item_getcheck_func_BOMB_IN_BAG__Fv();
-extern "C" static void item_getcheck_func_LIGHT_ARROW__Fv();
-extern "C" static void item_getcheck_func_ARROW_LV1__Fv();
-extern "C" static void item_getcheck_func_ARROW_LV2__Fv();
-extern "C" static void item_getcheck_func_ARROW_LV3__Fv();
-extern "C" static s32 item_getcheck_func_LURE_ROD__Fv();
-extern "C" static s32 item_getcheck_func_BOMB_ARROW__Fv();
-extern "C" static s32 item_getcheck_func_HAWK_ARROW__Fv();
-extern "C" static void item_getcheck_func_BEE_ROD__Fv();
-extern "C" static void item_getcheck_func_JEWEL_ROD__Fv();
-extern "C" static void item_getcheck_func_WORM_ROD__Fv();
-extern "C" static void item_getcheck_func_JEWEL_BEE_ROD__Fv();
-extern "C" static void item_getcheck_func_JEWEL_WORM_ROD__Fv();
-extern "C" static void item_getcheck_func_EMPTY_BOTTLE__Fv();
-extern "C" static void item_getcheck_func_RED_BOTTLE__Fv();
-extern "C" static void item_getcheck_func_GREEN_BOTTLE__Fv();
-extern "C" static void item_getcheck_func_BLUE_BOTTLE__Fv();
-extern "C" static void item_getcheck_func_MILK_BOTTLE__Fv();
-extern "C" static void item_getcheck_func_HALF_MILK_BOTTLE__Fv();
-extern "C" static void item_getcheck_func_OIL_BOTTLE__Fv();
-extern "C" static void item_getcheck_func_WATER_BOTTLE__Fv();
-extern "C" static void item_getcheck_func_OIL_BOTTLE2__Fv();
-extern "C" static void item_getcheck_func_RED_BOTTLE2__Fv();
-extern "C" static void item_getcheck_func_UGLY_SOUP__Fv();
-extern "C" static void item_getcheck_func_HOT_SPRING__Fv();
-extern "C" static void item_getcheck_func_FAIRY_BOTTLE__Fv();
-extern "C" static void item_getcheck_func_HOT_SPRING2__Fv();
-extern "C" static void item_getcheck_func_OIL2__Fv();
-extern "C" static void item_getcheck_func_OIL__Fv();
-extern "C" static void item_getcheck_func_NORMAL_BOMB__Fv();
-extern "C" static void item_getcheck_func_WATER_BOMB__Fv();
-extern "C" static void item_getcheck_func_POKE_BOMB__Fv();
-extern "C" static void item_getcheck_func_FAIRY_DROP__Fv();
-extern "C" static void item_getcheck_func_WORM__Fv();
-extern "C" static void item_getcheck_func_DROP_BOTTLE__Fv();
-extern "C" static s32 item_getcheck_func_BEE_CHILD__Fv();
-extern "C" static void item_getcheck_func_CHUCHU_RARE__Fv();
-extern "C" static void item_getcheck_func_CHUCHU_RED__Fv();
-extern "C" static void item_getcheck_func_CHUCHU_BLUE__Fv();
-extern "C" static void item_getcheck_func_CHUCHU_GREEN__Fv();
-extern "C" static void item_getcheck_func_CHUCHU_YELLOW__Fv();
-extern "C" static void item_getcheck_func_CHUCHU_PURPLE__Fv();
-extern "C" static void item_getcheck_func_LV1_SOUP__Fv();
-extern "C" static void item_getcheck_func_LV2_SOUP__Fv();
-extern "C" static void item_getcheck_func_LV3_SOUP__Fv();
-extern "C" static void item_getcheck_func_LETTER__Fv();
-extern "C" static void item_getcheck_func_BILL__Fv();
-extern "C" static void item_getcheck_func_WOOD_STATUE__Fv();
-extern "C" static void item_getcheck_func_IRIAS_PENDANT__Fv();
-extern "C" static void item_getcheck_func_HORSE_FLUTE__Fv();
-extern "C" static void item_getcheck_func_RAFRELS_MEMO__Fv();
-extern "C" static void item_getcheck_func_ASHS_SCRIBBLING__Fv();
-extern "C" static void item_getcheck_func_CHUCHU_YELLOW2__Fv();
-extern "C" static s32 item_getcheck_func_OIL_BOTTLE3__Fv();
-extern "C" static s32 item_getcheck_func_SHOP_BEE_CHILD__Fv();
-extern "C" static void item_getcheck_func_CHUCHU_BLACK__Fv();
-extern "C" static void item_getcheck_func_LIGHT_DROP__Fv();
-extern "C" static void item_getcheck_func_DROP_CONTAINER__Fv();
-extern "C" static void item_getcheck_func_DROP_CONTAINER02__Fv();
-extern "C" static void item_getcheck_func_DROP_CONTAINER03__Fv();
-extern "C" static s32 item_getcheck_func_FILLED_CONTAINER__Fv();
-extern "C" static s32 item_getcheck_func_MIRROR_PIECE_2__Fv();
-extern "C" static s32 item_getcheck_func_MIRROR_PIECE_3__Fv();
-extern "C" static s32 item_getcheck_func_MIRROR_PIECE_4__Fv();
-extern "C" static void item_getcheck_func_SMELL_YELIA_POUCH__Fv();
-extern "C" static s32 item_getcheck_func_SMELL_PUMPKIN__Fv();
-extern "C" static void item_getcheck_func_SMELL_POH__Fv();
-extern "C" static void item_getcheck_func_SMELL_FISH__Fv();
-extern "C" static void item_getcheck_func_SMELL_CHILDREN__Fv();
-extern "C" static void item_getcheck_func_SMELL_MEDICINE__Fv();
-extern "C" static void item_getcheck_func_M_BEETLE__Fv();
-extern "C" static void item_getcheck_func_F_BEETLE__Fv();
-extern "C" static void item_getcheck_func_M_BUTTERFLY__Fv();
-extern "C" static void item_getcheck_func_F_BUTTERFLY__Fv();
-extern "C" static void item_getcheck_func_M_STAG_BEETLE__Fv();
-extern "C" static void item_getcheck_func_F_STAG_BEETLE__Fv();
-extern "C" static void item_getcheck_func_M_GRASSHOPPER__Fv();
-extern "C" static void item_getcheck_func_F_GRASSHOPPER__Fv();
-extern "C" static void item_getcheck_func_M_NANAFUSHI__Fv();
-extern "C" static void item_getcheck_func_F_NANAFUSHI__Fv();
-extern "C" static void item_getcheck_func_M_DANGOMUSHI__Fv();
-extern "C" static void item_getcheck_func_F_DANGOMUSHI__Fv();
-extern "C" static void item_getcheck_func_M_MANTIS__Fv();
-extern "C" static void item_getcheck_func_F_MANTIS__Fv();
-extern "C" static void item_getcheck_func_M_LADYBUG__Fv();
-extern "C" static void item_getcheck_func_F_LADYBUG__Fv();
-extern "C" static void item_getcheck_func_M_SNAIL__Fv();
-extern "C" static void item_getcheck_func_F_SNAIL__Fv();
-extern "C" static void item_getcheck_func_M_DRAGONFLY__Fv();
-extern "C" static void item_getcheck_func_F_DRAGONFLY__Fv();
-extern "C" static void item_getcheck_func_M_ANT__Fv();
-extern "C" static void item_getcheck_func_F_ANT__Fv();
-extern "C" static void item_getcheck_func_M_MAYFLY__Fv();
-extern "C" static void item_getcheck_func_F_MAYFLY__Fv();
-extern "C" static void item_getcheck_func_POU_SPIRIT__Fv();
-extern "C" static void item_getcheck_func_ANCIENT_DOCUMENT__Fv();
-extern "C" static void item_getcheck_func_AIR_LETTER__Fv();
-extern "C" static void item_getcheck_func_ANCIENT_DOCUMENT2__Fv();
-extern "C" static void item_getcheck_func_LV7_DUNGEON_EXIT__Fv();
-extern "C" static s32 item_getcheck_func_LINKS_SAVINGS__Fv();
-extern "C" static s32 item_getcheck_func_SMALL_KEY2__Fv();
-extern "C" static s32 item_getcheck_func_POU_FIRE1__Fv();
-extern "C" static s32 item_getcheck_func_POU_FIRE2__Fv();
-extern "C" static s32 item_getcheck_func_POU_FIRE3__Fv();
-extern "C" static s32 item_getcheck_func_POU_FIRE4__Fv();
-extern "C" static s32 item_getcheck_func_BOSSRIDER_KEY__Fv();
-extern "C" static void item_getcheck_func_TOMATO_PUREE__Fv();
-extern "C" static void item_getcheck_func_TASTE__Fv();
-extern "C" static void item_getcheck_func_LV5_BOSS_KEY__Fv();
-extern "C" static s32 item_getcheck_func_SURFBOARD__Fv();
-extern "C" static s32 item_getcheck_func_KANTERA2__Fv();
-extern "C" static void item_getcheck_func_L2_KEY_PIECES1__Fv();
-extern "C" static void item_getcheck_func_L2_KEY_PIECES2__Fv();
-extern "C" static void item_getcheck_func_L2_KEY_PIECES3__Fv();
-extern "C" static void item_getcheck_func_KEY_OF_CARAVAN__Fv();
-extern "C" static void item_getcheck_func_LV2_BOSS_KEY__Fv();
-extern "C" static void item_getcheck_func_KEY_OF_FILONE__Fv();
-extern "C" bool isBomb__FUc(u8);
-extern "C" bool isArrow__FUc(u8);
-extern "C" void isBottleItem__FUc();
-extern "C" void isHeart__FUc();
-extern "C" void isInsect__FUc();
-extern "C" void check_itemno__Fi();
-extern "C" static void addBombCount__FUcUc(u8, u8);
-extern "C" extern char const* const d_d_item__stringBase0;
-extern "C" u8 mData__12dEnemyItem_c[4 + 4 /* padding */];
-
-//
-// External References:
-//
-
-extern "C" void setItemBombNumCount__14dComIfG_play_cFUcs();
-extern "C" void getLayerNo__14dComIfG_play_cFi();
-extern "C" u16 dComIfGs_getMaxLifeGauge__Fv();
-extern "C" void dComIfGs_setSelectEquipClothes__FUc(u8);
-extern "C" void dComIfGs_setSelectEquipSword__FUc(u8);
-extern "C" void dComIfGs_setSelectEquipShield__FUc(u8);
-extern "C" void isMagicFlag__21dSv_player_status_a_cCFUc();
-extern "C" void setItem__17dSv_player_item_cFiUc();
-extern "C" void getItem__17dSv_player_item_cCFib();
-extern "C" void setEmptyBottleItemIn__17dSv_player_item_cFUc();
-extern "C" void setEmptyBottle__17dSv_player_item_cFv();
-extern "C" void setEmptyBottle__17dSv_player_item_cFUc();
-extern "C" void checkBottle__17dSv_player_item_cFUc();
-extern "C" void setEmptyBombBagItemIn__17dSv_player_item_cFUcb();
-extern "C" void setEmptyBombBagItemIn__17dSv_player_item_cFUcUcb();
-extern "C" void setEmptyBombBag__17dSv_player_item_cFv();
-extern "C" void setEmptyBombBag__17dSv_player_item_cFUcUc();
-extern "C" void setRodTypeLevelUp__17dSv_player_item_cFv();
-extern "C" void onFirstBit__21dSv_player_get_item_cFUc();
-extern "C" void isFirstBit__21dSv_player_get_item_cCFUc();
-extern "C" void getBombNum__24dSv_player_item_record_cCFUc();
-extern "C" void setBottleNum__24dSv_player_item_record_cFUcUc();
-extern "C" void getBombNum__21dSv_player_item_max_cCFUc();
-extern "C" void setCollect__20dSv_player_collect_cFiUc();
-extern "C" void isCollect__20dSv_player_collect_cCFiUc();
-extern "C" void onLightDropGetFlag__16dSv_light_drop_cFUc();
-extern "C" void isLightDropGetFlag__16dSv_light_drop_cCFUc();
-extern "C" void onDungeonItem__12dSv_memBit_cFi();
-extern "C" void isDungeonItem__12dSv_memBit_cCFi();
-extern "C" void onEventBit__11dSv_event_cFUs();
-extern "C" void onSwitch__10dSv_info_cFii();
-extern "C" void dMeter2Info_setSword__FUcb(u8, bool);
-extern "C" void _savegpr_20();
-extern "C" void _savegpr_26();
-extern "C" void _savegpr_29();
-extern "C" void _restgpr_20();
-extern "C" void _restgpr_26();
-extern "C" void _restgpr_29();
-extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
-
-//
-// Declarations:
-//
 
 static void (*item_func_ptr[256])() = {
     item_func_HEART,
@@ -715,16 +266,16 @@ static void (*item_func_ptr[256])() = {
     item_func_noentry,
 };
 
-inline void getItemFunc(u8 i_no) {
-    dComIfGs_onItemFirstBit(i_no);
-    item_func_ptr[i_no]();
+inline void getItemFunc(u8 i_itemNo) {
+    dComIfGs_onItemFirstBit(i_itemNo);
+    item_func_ptr[i_itemNo]();
 }
 
-void execItemGet(u8 item_id) {
-    getItemFunc(item_id);
+void execItemGet(u8 i_itemNo) {
+    getItemFunc(i_itemNo);
 }
 
-static s32 (*item_getcheck_func_ptr[256])() = {
+static int (*item_getcheck_func_ptr[256])() = {
     item_getcheck_func_HEART,
     item_getcheck_func_GREEN_RUPEE,
     item_getcheck_func_BLUE_RUPEE,
@@ -983,18 +534,18 @@ static s32 (*item_getcheck_func_ptr[256])() = {
     item_getcheck_func_noentry,
 };
 
-inline s32 getCheckItemFunc(u8 i_no) {
-    return item_getcheck_func_ptr[i_no]();
+inline int getCheckItemFunc(u8 i_itemNo) {
+    return item_getcheck_func_ptr[i_itemNo]();
 }
 
-s32 checkItemGet(u8 item_id, int param_2) {
-    s32 checkItem = getCheckItemFunc(item_id);
+int checkItemGet(u8 i_itemNo, int i_default) {
+    int result = getCheckItemFunc(i_itemNo);
 
-    if (checkItem == -1) {
-        checkItem = param_2;
+    if (result == -1) {
+        result = i_default;
     }
-    
-    return checkItem;
+
+    return result;
 }
 
 void item_func_HEART() {
@@ -1151,17 +702,17 @@ void item_func_DUNGEON_BACK() {
 
 void item_func_SWORD() {
     dComIfGs_setCollectSword(COLLECT_ORDON_SWORD);
-    dComIfGs_setSelectEquipSword__FUc(SWORD);
+    dComIfGs_setSelectEquipSword(SWORD);
 }
 
 void item_func_MASTER_SWORD() {
     dComIfGs_setCollectSword(COLLECT_MASTER_SWORD);
-    dComIfGs_setSelectEquipSword__FUc(MASTER_SWORD);
+    dComIfGs_setSelectEquipSword(MASTER_SWORD);
 }
 
 void item_func_WOOD_SHIELD() {
     dComIfGs_setCollectShield(COLLECT_WOODEN_SHIELD);
-    dComIfGs_setSelectEquipShield__FUc(WOOD_SHIELD);
+    dComIfGs_setSelectEquipShield(WOOD_SHIELD);
 }
 
 void item_func_SHIELD() {}
@@ -1207,10 +758,7 @@ void item_func_WALLET_LV3() {
 }
 
 void item_func_ZORAS_JEWEL() {
-    int checkFishingRod;
-
-    checkFishingRod = item_getcheck_func_FISHING_ROD_1();
-    if (checkFishingRod != 0) {
+    if (item_getcheck_func_FISHING_ROD_1()) {
         dComIfGs_setRodTypeLevelUp();
     } else {
         dComIfGs_setItem(SLOT_20, ZORAS_JEWEL);
@@ -1667,779 +1215,783 @@ void item_func_KEY_OF_FILONE() {
 
 void item_func_noentry() {}
 
-s32 item_getcheck_func_noentry() {
+int item_getcheck_func_noentry() {
     return -1;
 }
 
-s32 item_getcheck_func_HEART() {
+int item_getcheck_func_HEART() {
     return -1;
 }
 
-s32 item_getcheck_func_GREEN_RUPEE() {
+int item_getcheck_func_GREEN_RUPEE() {
     return i_dComIfGs_isItemFirstBit(GREEN_RUPEE);
 }
 
-s32 item_getcheck_func_BLUE_RUPEE() {
+int item_getcheck_func_BLUE_RUPEE() {
     return i_dComIfGs_isItemFirstBit(BLUE_RUPEE);
 }
 
-s32 item_getcheck_func_YELLOW_RUPEE() {
+int item_getcheck_func_YELLOW_RUPEE() {
     return i_dComIfGs_isItemFirstBit(YELLOW_RUPEE);
 }
 
-s32 item_getcheck_func_RED_RUPEE() {
+int item_getcheck_func_RED_RUPEE() {
     return i_dComIfGs_isItemFirstBit(RED_RUPEE);
 }
 
-s32 item_getcheck_func_PURPLE_RUPEE() {
+int item_getcheck_func_PURPLE_RUPEE() {
     return i_dComIfGs_isItemFirstBit(PURPLE_RUPEE);
 }
 
-s32 item_getcheck_func_ORANGE_RUPEE() {
+int item_getcheck_func_ORANGE_RUPEE() {
     return i_dComIfGs_isItemFirstBit(ORANGE_RUPEE);
 }
 
-s32 item_getcheck_func_SILVER_RUPEE() {
+int item_getcheck_func_SILVER_RUPEE() {
     return i_dComIfGs_isItemFirstBit(SILVER_RUPEE);
 }
 
-s32 item_getcheck_func_S_MAGIC() {
+int item_getcheck_func_S_MAGIC() {
     return -1;
 }
 
-s32 item_getcheck_func_L_MAGIC() {
+int item_getcheck_func_L_MAGIC() {
     return -1;
 }
 
-s32 item_getcheck_func_BOMB_5() {
+int item_getcheck_func_BOMB_5() {
     return i_dComIfGs_isItemFirstBit(BOMB_5);
 }
 
-s32 item_getcheck_func_BOMB_10() {
+int item_getcheck_func_BOMB_10() {
     return i_dComIfGs_isItemFirstBit(BOMB_10);
 }
 
-s32 item_getcheck_func_BOMB_20() {
+int item_getcheck_func_BOMB_20() {
     return i_dComIfGs_isItemFirstBit(BOMB_20);
 }
 
-s32 item_getcheck_func_BOMB_30() {
+int item_getcheck_func_BOMB_30() {
     return i_dComIfGs_isItemFirstBit(BOMB_30);
 }
 
-s32 item_getcheck_func_ARROW_10() {
+int item_getcheck_func_ARROW_10() {
     return i_dComIfGs_isItemFirstBit(ARROW_10);
 }
 
-s32 item_getcheck_func_ARROW_20() {
+int item_getcheck_func_ARROW_20() {
     return i_dComIfGs_isItemFirstBit(ARROW_20);
 }
 
-s32 item_getcheck_func_ARROW_30() {
+int item_getcheck_func_ARROW_30() {
     return i_dComIfGs_isItemFirstBit(ARROW_30);
 }
 
-s32 item_getcheck_func_ARROW_1() {
+int item_getcheck_func_ARROW_1() {
     return i_dComIfGs_isItemFirstBit(ARROW_1);
 }
 
-s32 item_getcheck_func_PACHINKO_SHOT() {
+int item_getcheck_func_PACHINKO_SHOT() {
     return i_dComIfGs_isItemFirstBit(PACHINKO_SHOT);
 }
 
-s32 item_getcheck_func_WATER_BOMB_5() {
+int item_getcheck_func_WATER_BOMB_5() {
     return -1;
 }
 
-s32 item_getcheck_func_WATER_BOMB_10() {
+int item_getcheck_func_WATER_BOMB_10() {
     return -1;
 }
 
-s32 item_getcheck_func_WATER_BOMB_20() {
+int item_getcheck_func_WATER_BOMB_20() {
     return -1;
 }
 
-s32 item_getcheck_func_WATER_BOMB_30() {
+int item_getcheck_func_WATER_BOMB_30() {
     return -1;
 }
 
-s32 item_getcheck_func_BOMB_INSECT_5() {
+int item_getcheck_func_BOMB_INSECT_5() {
     return -1;
 }
 
-s32 item_getcheck_func_BOMB_INSECT_10() {
+int item_getcheck_func_BOMB_INSECT_10() {
     return i_dComIfGs_isItemFirstBit(BOMB_INSECT_10);
 }
 
-s32 item_getcheck_func_BOMB_INSECT_20() {
+int item_getcheck_func_BOMB_INSECT_20() {
     return i_dComIfGs_isItemFirstBit(BOMB_INSECT_20);
 }
 
-s32 item_getcheck_func_BOMB_INSECT_30() {
+int item_getcheck_func_BOMB_INSECT_30() {
     return i_dComIfGs_isItemFirstBit(BOMB_INSECT_30);
 }
 
-s32 item_getcheck_func_RECOVER_FAILY() {
+int item_getcheck_func_RECOVER_FAILY() {
     return -1;
 }
 
-s32 item_getcheck_func_TRIPLE_HEART() {
+int item_getcheck_func_TRIPLE_HEART() {
     return -1;
 }
 
-s32 item_getcheck_func_SMALL_KEY() {
+int item_getcheck_func_SMALL_KEY() {
     return -1;
 }
 
-s32 item_getcheck_func_KAKERA_HEART() {
+int item_getcheck_func_KAKERA_HEART() {
     return -1;
 }
 
-s32 item_getcheck_func_UTUWA_HEART() {
+int item_getcheck_func_UTUWA_HEART() {
     return -1;
 }
 
-s32 item_getcheck_func_MAP() {
+int item_getcheck_func_MAP() {
     return dComIfGs_isDungeonItemMap();
 }
 
-s32 item_getcheck_func_COMPUS() {
+int item_getcheck_func_COMPUS() {
     return -1;
 }
 
-s32 item_getcheck_func_DUNGEON_EXIT() {
-    return dComIfGs_getItem(SLOT_18, true) == DUNGEON_EXIT ? 1 : 0;
+int item_getcheck_func_DUNGEON_EXIT() {
+    return dComIfGs_getItem(SLOT_18, true) == DUNGEON_EXIT ? TRUE : FALSE;
 }
 
-s32 item_getcheck_func_BOSS_KEY() {
+int item_getcheck_func_BOSS_KEY() {
     return dComIfGs_isDungeonItemBossKey();
 }
 
-s32 item_getcheck_func_DUNGEON_BACK() {
-    return dComIfGs_getItem(SLOT_18, true) == DUNGEON_BACK ? 1 : 0;
+int item_getcheck_func_DUNGEON_BACK() {
+    return dComIfGs_getItem(SLOT_18, true) == DUNGEON_BACK ? TRUE : FALSE;
 }
 
-s32 item_getcheck_func_SWORD() {
+int item_getcheck_func_SWORD() {
     return dComIfGs_isCollectSword(COLLECT_ORDON_SWORD);
 }
 
-s32 item_getcheck_func_MASTER_SWORD() {
+int item_getcheck_func_MASTER_SWORD() {
     return dComIfGs_isCollectSword(COLLECT_MASTER_SWORD);
 }
 
-s32 item_getcheck_func_WOOD_SHIELD() {
+int item_getcheck_func_WOOD_SHIELD() {
     return i_dComIfGs_isItemFirstBit(WOOD_SHIELD);
 }
 
-s32 item_getcheck_func_SHIELD() {
+int item_getcheck_func_SHIELD() {
     return i_dComIfGs_isItemFirstBit(SHIELD);
 }
 
-s32 item_getcheck_func_HYLIA_SHIELD() {
+int item_getcheck_func_HYLIA_SHIELD() {
     return i_dComIfGs_isItemFirstBit(HYLIA_SHIELD);
 }
 
-s32 item_getcheck_func_TKS_LETTER() {
-    return dComIfGs_getItem(SLOT_18, true) == TKS_LETTER ? 1 : 0;
+int item_getcheck_func_TKS_LETTER() {
+    return dComIfGs_getItem(SLOT_18, true) == TKS_LETTER ? TRUE : FALSE;
 }
 
-s32 item_getcheck_func_WEAR_CASUAL() {
+int item_getcheck_func_WEAR_CASUAL() {
     return i_dComIfGs_isItemFirstBit(WEAR_CASUAL);
 }
 
-s32 item_getcheck_func_WEAR_KOKIRI() {
+int item_getcheck_func_WEAR_KOKIRI() {
     return dComIfGs_isCollectClothing(KOKIRI_CLOTHES_FLAG);
 }
 
-s32 item_getcheck_func_ARMOR() {
+int item_getcheck_func_ARMOR() {
     return i_dComIfGs_isItemFirstBit(ARMOR);
 }
 
-s32 item_getcheck_func_WEAR_ZORA() {
+int item_getcheck_func_WEAR_ZORA() {
     return i_dComIfGs_isItemFirstBit(WEAR_ZORA);
 }
 
-s32 item_getcheck_func_MAGIC_LV1() {
+int item_getcheck_func_MAGIC_LV1() {
     return -1;
 }
 
-s32 item_getcheck_func_DUNGEON_EXIT_2() {
-    return dComIfGs_getItem(SLOT_18, true) == DUNGEON_EXIT ? 1 : 0;
+int item_getcheck_func_DUNGEON_EXIT_2() {
+    return dComIfGs_getItem(SLOT_18, true) == DUNGEON_EXIT ? TRUE : FALSE;
 }
 
-s32 item_getcheck_func_WALLET_LV1() {
+int item_getcheck_func_WALLET_LV1() {
     return -1;
 }
 
-s32 item_getcheck_func_WALLET_LV2() {
+int item_getcheck_func_WALLET_LV2() {
     return -1;
 }
 
-s32 item_getcheck_func_WALLET_LV3() {
+int item_getcheck_func_WALLET_LV3() {
     return -1;
 }
 
-s32 item_getcheck_func_ZORAS_JEWEL() {
-    return dComIfGs_getItem(SLOT_20, true) == ZORAS_JEWEL ? 1 : 0;
+int item_getcheck_func_ZORAS_JEWEL() {
+    return dComIfGs_getItem(SLOT_20, true) == ZORAS_JEWEL ? TRUE : FALSE;
 }
 
-s32 item_getcheck_func_HAWK_EYE() {
+int item_getcheck_func_HAWK_EYE() {
     return i_dComIfGs_isItemFirstBit(HAWK_EYE);
 }
 
-s32 item_getcheck_func_WOOD_STICK() {
+int item_getcheck_func_WOOD_STICK() {
     return i_dComIfGs_isItemFirstBit(WOOD_STICK);
 }
 
-s32 item_getcheck_func_BOOMERANG() {
-    return dComIfGs_getItem(SLOT_0, true) == BOOMERANG ? 1 : 0;
+int item_getcheck_func_BOOMERANG() {
+    return dComIfGs_getItem(SLOT_0, true) == BOOMERANG ? TRUE : FALSE;
 }
 
-s32 item_getcheck_func_SPINNER() {
-    return dComIfGs_getItem(SLOT_2, true) == SPINNER ? 1 : 0;
+int item_getcheck_func_SPINNER() {
+    return dComIfGs_getItem(SLOT_2, true) == SPINNER ? TRUE : FALSE;
 }
 
-s32 item_getcheck_func_IRONBALL() {
-    return dComIfGs_getItem(SLOT_6, true) == IRONBALL ? 1 : 0;
+int item_getcheck_func_IRONBALL() {
+    return dComIfGs_getItem(SLOT_6, true) == IRONBALL ? TRUE : FALSE;
 }
 
-s32 item_getcheck_func_BOW() {
-    return dComIfGs_getItem(SLOT_4, false) == BOW ? 1 : 0;
+int item_getcheck_func_BOW() {
+    return dComIfGs_getItem(SLOT_4, false) == BOW ? TRUE : FALSE;
 }
 
-s32 item_getcheck_func_HOOKSHOT() {
-    return dComIfGs_getItem(SLOT_9, true) == HOOKSHOT ? 1 : 0;
+int item_getcheck_func_HOOKSHOT() {
+    return dComIfGs_getItem(SLOT_9, true) == HOOKSHOT ? TRUE : FALSE;
 }
 
-s32 item_getcheck_func_HVY_BOOTS() {
-    return dComIfGs_getItem(SLOT_3, true) == HVY_BOOTS ? 1 : 0;
+int item_getcheck_func_HVY_BOOTS() {
+    return dComIfGs_getItem(SLOT_3, true) == HVY_BOOTS ? TRUE : FALSE;
 }
 
-s32 item_getcheck_func_COPY_ROD() {
-    return dComIfGs_getItem(SLOT_8, true) == COPY_ROD ? 1 : 0;
+int item_getcheck_func_COPY_ROD() {
+    return dComIfGs_getItem(SLOT_8, true) == COPY_ROD ? TRUE : FALSE;
 }
 
-s32 item_getcheck_func_W_HOOKSHOT() {
-    return dComIfGs_getItem(SLOT_10, true) == W_HOOKSHOT ? 1 : 0;
+int item_getcheck_func_W_HOOKSHOT() {
+    return dComIfGs_getItem(SLOT_10, true) == W_HOOKSHOT ? TRUE : FALSE;
 }
 
-s32 item_getcheck_func_KANTERA() {
-    return dComIfGs_getItem(SLOT_1, true) == KANTERA ? 1 : 0;
+int item_getcheck_func_KANTERA() {
+    return dComIfGs_getItem(SLOT_1, true) == KANTERA ? TRUE : FALSE;
 }
 
-s32 item_getcheck_func_LIGHT_SWORD() {
+int item_getcheck_func_LIGHT_SWORD() {
     return dComIfGs_isCollectSword(COLLECT_LIGHT_SWORD);
 }
 
 /* 8009A0C8-8009A1FC 094A08 0134+00 7/6 0/0 0/0 .text item_getcheck_func_FISHING_ROD_1__Fv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm s32 item_getcheck_func_FISHING_ROD_1() {
-    nofralloc
-#include "asm/d/d_item/item_getcheck_func_FISHING_ROD_1__Fv.s"
+int item_getcheck_func_FISHING_ROD_1() {
+    return (dComIfGs_getItem(SLOT_20, true) == FISHING_ROD_1 ||
+            dComIfGs_getItem(SLOT_20, true) == BEE_ROD ||
+            dComIfGs_getItem(SLOT_20, true) == WORM_ROD ||
+            dComIfGs_getItem(SLOT_20, true) == JEWEL_ROD ||
+            dComIfGs_getItem(SLOT_20, true) == JEWEL_BEE_ROD ||
+            dComIfGs_getItem(SLOT_20, true) == JEWEL_WORM_ROD) ?
+               TRUE :
+               FALSE;
 }
-#pragma pop
 
-s32 item_getcheck_func_PACHINKO() {
-    return dComIfGs_getItem(SLOT_23, true) == PACHINKO ? 1 : 0;
+int item_getcheck_func_PACHINKO() {
+    return dComIfGs_getItem(SLOT_23, true) == PACHINKO ? TRUE : FALSE;
 }
 
-s32 item_getcheck_func_COPY_ROD_2() {
+int item_getcheck_func_COPY_ROD_2() {
     return -1;
 }
 
-s32 item_getcheck_func_BOMB_BAG_LV2() {
+int item_getcheck_func_BOMB_BAG_LV2() {
     return i_dComIfGs_isItemFirstBit(BOMB_BAG_LV2);
 }
 
-s32 item_getcheck_func_BOMB_BAG_LV1() {
+int item_getcheck_func_BOMB_BAG_LV1() {
     return i_dComIfGs_isItemFirstBit(BOMB_BAG_LV1);
 }
 
-s32 item_getcheck_func_BOMB_IN_BAG() {
+int item_getcheck_func_BOMB_IN_BAG() {
     return i_dComIfGs_isItemFirstBit(BOMB_IN_BAG);
 }
 
-s32 item_getcheck_func_LIGHT_ARROW() {
+int item_getcheck_func_LIGHT_ARROW() {
     return i_dComIfGs_isItemFirstBit(LIGHT_ARROW);
 }
 
-s32 item_getcheck_func_ARROW_LV1() {
-    return (dComIfGs_getItem(SLOT_4, false) == BOW && dComIfGs_getArrowMax() >= 30) ? 1 : 0;
+int item_getcheck_func_ARROW_LV1() {
+    return (dComIfGs_getItem(SLOT_4, false) == BOW && dComIfGs_getArrowMax() >= 30) ? TRUE : FALSE;
 }
 
-s32 item_getcheck_func_ARROW_LV2() {
-    return (dComIfGs_getItem(SLOT_4, false) == BOW && dComIfGs_getArrowMax() >= 60) ? 1 : 0;
+int item_getcheck_func_ARROW_LV2() {
+    return (dComIfGs_getItem(SLOT_4, false) == BOW && dComIfGs_getArrowMax() >= 60) ? TRUE : FALSE;
 }
 
-s32 item_getcheck_func_ARROW_LV3() {
-    return (dComIfGs_getItem(SLOT_4, false) == BOW && dComIfGs_getArrowMax() >= 100) ? 1 : 0;
+int item_getcheck_func_ARROW_LV3() {
+    return (dComIfGs_getItem(SLOT_4, false) == BOW && dComIfGs_getArrowMax() >= 100) ? TRUE : FALSE;
 }
 
-s32 item_getcheck_func_LURE_ROD() {
+int item_getcheck_func_LURE_ROD() {
     return -1;
 }
 
-s32 item_getcheck_func_BOMB_ARROW() {
+int item_getcheck_func_BOMB_ARROW() {
     return -1;
 }
 
-s32 item_getcheck_func_HAWK_ARROW() {
+int item_getcheck_func_HAWK_ARROW() {
     return -1;
 }
 
-s32 item_getcheck_func_BEE_ROD() {
+int item_getcheck_func_BEE_ROD() {
     return item_getcheck_func_FISHING_ROD_1();
 }
 
-s32 item_getcheck_func_JEWEL_ROD() {
+int item_getcheck_func_JEWEL_ROD() {
     return item_getcheck_func_FISHING_ROD_1();
 }
 
-s32 item_getcheck_func_WORM_ROD() {
+int item_getcheck_func_WORM_ROD() {
     return item_getcheck_func_FISHING_ROD_1();
 }
 
-s32 item_getcheck_func_JEWEL_BEE_ROD() {
+int item_getcheck_func_JEWEL_BEE_ROD() {
     return item_getcheck_func_FISHING_ROD_1();
 }
 
-s32 item_getcheck_func_JEWEL_WORM_ROD() {
+int item_getcheck_func_JEWEL_WORM_ROD() {
     return item_getcheck_func_FISHING_ROD_1();
 }
 
-s32 item_getcheck_func_EMPTY_BOTTLE() {
+int item_getcheck_func_EMPTY_BOTTLE() {
     return dComIfGs_checkBottle(EMPTY_BOTTLE);
 }
 
-s32 item_getcheck_func_RED_BOTTLE() {
+int item_getcheck_func_RED_BOTTLE() {
     return dComIfGs_checkBottle(RED_BOTTLE);
 }
 
-s32 item_getcheck_func_GREEN_BOTTLE() {
+int item_getcheck_func_GREEN_BOTTLE() {
     return dComIfGs_checkBottle(GREEN_BOTTLE);
 }
 
-s32 item_getcheck_func_BLUE_BOTTLE() {
+int item_getcheck_func_BLUE_BOTTLE() {
     return dComIfGs_checkBottle(BLUE_BOTTLE);
 }
 
-s32 item_getcheck_func_MILK_BOTTLE() {
+int item_getcheck_func_MILK_BOTTLE() {
     return dComIfGs_checkBottle(MILK_BOTTLE);
 }
 
-s32 item_getcheck_func_HALF_MILK_BOTTLE() {
+int item_getcheck_func_HALF_MILK_BOTTLE() {
     return dComIfGs_checkBottle(HALF_MILK_BOTTLE);
 }
 
-s32 item_getcheck_func_OIL_BOTTLE() {
+int item_getcheck_func_OIL_BOTTLE() {
     return dComIfGs_checkBottle(OIL_BOTTLE);
 }
 
-s32 item_getcheck_func_WATER_BOTTLE() {
+int item_getcheck_func_WATER_BOTTLE() {
     return dComIfGs_checkBottle(WATER_BOTTLE);
 }
 
-s32 item_getcheck_func_OIL_BOTTLE2() {
+int item_getcheck_func_OIL_BOTTLE2() {
     return dComIfGs_checkBottle(OIL_BOTTLE_2);
 }
 
-s32 item_getcheck_func_RED_BOTTLE2() {
+int item_getcheck_func_RED_BOTTLE2() {
     return dComIfGs_checkBottle(RED_BOTTLE_2);
 }
 
-s32 item_getcheck_func_UGLY_SOUP() {
+int item_getcheck_func_UGLY_SOUP() {
     return dComIfGs_checkBottle(UGLY_SOUP);
 }
 
-s32 item_getcheck_func_HOT_SPRING() {
+int item_getcheck_func_HOT_SPRING() {
     return dComIfGs_checkBottle(HOT_SPRING);
 }
 
-s32 item_getcheck_func_FAIRY_BOTTLE() {
+int item_getcheck_func_FAIRY_BOTTLE() {
     return dComIfGs_checkBottle(FAIRY);
 }
 
-s32 item_getcheck_func_HOT_SPRING2() {
+int item_getcheck_func_HOT_SPRING2() {
     return dComIfGs_checkBottle(HOT_SPRING);
 }
 
-s32 item_getcheck_func_OIL2() {
+int item_getcheck_func_OIL2() {
     return dComIfGs_checkBottle(OIL2);
 }
 
-s32 item_getcheck_func_OIL() {
+int item_getcheck_func_OIL() {
     return dComIfGs_checkBottle(OIL);
 }
 
-s32 item_getcheck_func_NORMAL_BOMB() {
+int item_getcheck_func_NORMAL_BOMB() {
     return i_dComIfGs_isItemFirstBit(NORMAL_BOMB);
 }
 
-s32 item_getcheck_func_WATER_BOMB() {
+int item_getcheck_func_WATER_BOMB() {
     return i_dComIfGs_isItemFirstBit(WATER_BOMB);
 }
 
-s32 item_getcheck_func_POKE_BOMB() {
+int item_getcheck_func_POKE_BOMB() {
     return i_dComIfGs_isItemFirstBit(POKE_BOMB);
 }
 
-s32 item_getcheck_func_FAIRY_DROP() {
+int item_getcheck_func_FAIRY_DROP() {
     return dComIfGs_checkBottle(FAIRY_DROP);
 }
 
-s32 item_getcheck_func_WORM() {
+int item_getcheck_func_WORM() {
     return dComIfGs_checkBottle(WORM);
 }
 
-s32 item_getcheck_func_DROP_BOTTLE() {
+int item_getcheck_func_DROP_BOTTLE() {
     return i_dComIfGs_isItemFirstBit(DROP_BOTTLE);
 }
 
-s32 item_getcheck_func_BEE_CHILD() {
+int item_getcheck_func_BEE_CHILD() {
     return -1;
 }
 
-s32 item_getcheck_func_CHUCHU_RARE() {
+int item_getcheck_func_CHUCHU_RARE() {
     return dComIfGs_checkBottle(CHUCHU_RARE);
 }
 
-s32 item_getcheck_func_CHUCHU_RED() {
+int item_getcheck_func_CHUCHU_RED() {
     return dComIfGs_checkBottle(CHUCHU_RED);
 }
 
-s32 item_getcheck_func_CHUCHU_BLUE() {
+int item_getcheck_func_CHUCHU_BLUE() {
     return dComIfGs_checkBottle(CHUCHU_BLUE);
 }
 
-s32 item_getcheck_func_CHUCHU_GREEN() {
+int item_getcheck_func_CHUCHU_GREEN() {
     return dComIfGs_checkBottle(CHUCHU_GREEN);
 }
 
-s32 item_getcheck_func_CHUCHU_YELLOW() {
+int item_getcheck_func_CHUCHU_YELLOW() {
     return dComIfGs_checkBottle(CHUCHU_YELLOW);
 }
 
-s32 item_getcheck_func_CHUCHU_PURPLE() {
+int item_getcheck_func_CHUCHU_PURPLE() {
     return dComIfGs_checkBottle(CHUCHU_PURPLE);
 }
 
-s32 item_getcheck_func_LV1_SOUP() {
+int item_getcheck_func_LV1_SOUP() {
     return i_dComIfGs_isItemFirstBit(LV1_SOUP);
 }
 
-s32 item_getcheck_func_LV2_SOUP() {
+int item_getcheck_func_LV2_SOUP() {
     return i_dComIfGs_isItemFirstBit(LV2_SOUP);
 }
 
-s32 item_getcheck_func_LV3_SOUP() {
+int item_getcheck_func_LV3_SOUP() {
     return i_dComIfGs_isItemFirstBit(LV3_SOUP);
 }
 
-s32 item_getcheck_func_LETTER() {
-    return dComIfGs_getItem(SLOT_21, true) == LETTER ? 1 : 0;
+int item_getcheck_func_LETTER() {
+    return dComIfGs_getItem(SLOT_21, true) == LETTER ? TRUE : FALSE;
 }
 
-s32 item_getcheck_func_BILL() {
-    return dComIfGs_getItem(SLOT_21, true) == BILL ? 1 : 0;
+int item_getcheck_func_BILL() {
+    return dComIfGs_getItem(SLOT_21, true) == BILL ? TRUE : FALSE;
 }
 
-s32 item_getcheck_func_WOOD_STATUE() {
-    return dComIfGs_getItem(SLOT_21, true) == WOOD_STATUE ? 1 : 0;
+int item_getcheck_func_WOOD_STATUE() {
+    return dComIfGs_getItem(SLOT_21, true) == WOOD_STATUE ? TRUE : FALSE;
 }
 
-s32 item_getcheck_func_IRIAS_PENDANT() {
-    return dComIfGs_getItem(SLOT_21, true) == IRIAS_PENDANT ? 1 : 0;
+int item_getcheck_func_IRIAS_PENDANT() {
+    return dComIfGs_getItem(SLOT_21, true) == IRIAS_PENDANT ? TRUE : FALSE;
 }
 
-s32 item_getcheck_func_HORSE_FLUTE() {
-    return dComIfGs_getItem(SLOT_22, true) == HORSE_FLUTE ? 1 : 0;
+int item_getcheck_func_HORSE_FLUTE() {
+    return dComIfGs_getItem(SLOT_22, true) == HORSE_FLUTE ? TRUE : FALSE;
 }
 
-s32 item_getcheck_func_RAFRELS_MEMO() {
-    return dComIfGs_getItem(SLOT_19, true) == RAFRELS_MEMO ? 1 : 0;
+int item_getcheck_func_RAFRELS_MEMO() {
+    return dComIfGs_getItem(SLOT_19, true) == RAFRELS_MEMO ? TRUE : FALSE;
 }
 
-s32 item_getcheck_func_ASHS_SCRIBBLING() {
-    return dComIfGs_getItem(SLOT_19, true) == ASHS_SCRIBBLING ? 1 : 0;
+int item_getcheck_func_ASHS_SCRIBBLING() {
+    return dComIfGs_getItem(SLOT_19, true) == ASHS_SCRIBBLING ? TRUE : FALSE;
 }
 
-s32 item_getcheck_func_CHUCHU_YELLOW2() {
+int item_getcheck_func_CHUCHU_YELLOW2() {
     return dComIfGs_checkBottle(CHUCHU_YELLOW2);
 }
 
-s32 item_getcheck_func_OIL_BOTTLE3() {
+int item_getcheck_func_OIL_BOTTLE3() {
     return -1;
 }
 
-s32 item_getcheck_func_SHOP_BEE_CHILD() {
+int item_getcheck_func_SHOP_BEE_CHILD() {
     return -1;
 }
 
-s32 item_getcheck_func_CHUCHU_BLACK() {
+int item_getcheck_func_CHUCHU_BLACK() {
     return dComIfGs_checkBottle(CHUCHU_BLACK);
 }
 
-s32 item_getcheck_func_LIGHT_DROP() {
+int item_getcheck_func_LIGHT_DROP() {
     return i_dComIfGs_isItemFirstBit(LIGHT_DROP);
 }
 
-s32 item_getcheck_func_DROP_CONTAINER() {
+int item_getcheck_func_DROP_CONTAINER() {
     return dComIfGs_isLightDropGetFlag(FARON_VESSEL);
 }
 
-s32 item_getcheck_func_DROP_CONTAINER02() {
+int item_getcheck_func_DROP_CONTAINER02() {
     return dComIfGs_isLightDropGetFlag(ELDIN_VESSEL);
 }
 
-s32 item_getcheck_func_DROP_CONTAINER03() {
+int item_getcheck_func_DROP_CONTAINER03() {
     return dComIfGs_isLightDropGetFlag(LANAYRU_VESSEL);
 }
 
-s32 item_getcheck_func_FILLED_CONTAINER() {
+int item_getcheck_func_FILLED_CONTAINER() {
     return -1;
 }
 
-s32 item_getcheck_func_MIRROR_PIECE_2() {
+int item_getcheck_func_MIRROR_PIECE_2() {
     return -1;
 }
 
-s32 item_getcheck_func_MIRROR_PIECE_3() {
+int item_getcheck_func_MIRROR_PIECE_3() {
     return -1;
 }
 
-s32 item_getcheck_func_MIRROR_PIECE_4() {
+int item_getcheck_func_MIRROR_PIECE_4() {
     return -1;
 }
 
-s32 item_getcheck_func_SMELL_YELIA_POUCH() {
-    return dComIfGs_getCollectSmell() == SMELL_YELIA_POUCH ? 1 : 0;
+int item_getcheck_func_SMELL_YELIA_POUCH() {
+    return dComIfGs_getCollectSmell() == SMELL_YELIA_POUCH ? TRUE : FALSE;
 }
 
-s32 item_getcheck_func_SMELL_PUMPKIN() {
+int item_getcheck_func_SMELL_PUMPKIN() {
     return -1;
 }
 
-s32 item_getcheck_func_SMELL_POH() {
-    return dComIfGs_getCollectSmell() == SMELL_POH ? 1 : 0;
+int item_getcheck_func_SMELL_POH() {
+    return dComIfGs_getCollectSmell() == SMELL_POH ? TRUE : FALSE;
 }
 
-s32 item_getcheck_func_SMELL_FISH() {
-    return dComIfGs_getCollectSmell() == SMELL_FISH ? 1 : 0;
+int item_getcheck_func_SMELL_FISH() {
+    return dComIfGs_getCollectSmell() == SMELL_FISH ? TRUE : FALSE;
 }
 
-s32 item_getcheck_func_SMELL_CHILDREN() {
-    return dComIfGs_getCollectSmell() == SMELL_CHILDREN ? 1 : 0;
+int item_getcheck_func_SMELL_CHILDREN() {
+    return dComIfGs_getCollectSmell() == SMELL_CHILDREN ? TRUE : FALSE;
 }
 
-s32 item_getcheck_func_SMELL_MEDICINE() {
-    return dComIfGs_getCollectSmell() == SMELL_MEDICINE ? 1 : 0;
+int item_getcheck_func_SMELL_MEDICINE() {
+    return dComIfGs_getCollectSmell() == SMELL_MEDICINE ? TRUE : FALSE;
 }
 
-s32 item_getcheck_func_M_BEETLE() {
+int item_getcheck_func_M_BEETLE() {
     return i_dComIfGs_isItemFirstBit(M_BEETLE);
 }
 
-s32 item_getcheck_func_F_BEETLE() {
+int item_getcheck_func_F_BEETLE() {
     return i_dComIfGs_isItemFirstBit(F_BEETLE);
 }
 
-s32 item_getcheck_func_M_BUTTERFLY() {
+int item_getcheck_func_M_BUTTERFLY() {
     return i_dComIfGs_isItemFirstBit(M_BUTTERFLY);
 }
 
-s32 item_getcheck_func_F_BUTTERFLY() {
+int item_getcheck_func_F_BUTTERFLY() {
     return i_dComIfGs_isItemFirstBit(F_BUTTERFLY);
 }
 
-s32 item_getcheck_func_M_STAG_BEETLE() {
+int item_getcheck_func_M_STAG_BEETLE() {
     return i_dComIfGs_isItemFirstBit(M_STAG_BEETLE);
 }
 
-s32 item_getcheck_func_F_STAG_BEETLE() {
+int item_getcheck_func_F_STAG_BEETLE() {
     return i_dComIfGs_isItemFirstBit(F_STAG_BEETLE);
 }
 
-s32 item_getcheck_func_M_GRASSHOPPER() {
+int item_getcheck_func_M_GRASSHOPPER() {
     return i_dComIfGs_isItemFirstBit(M_GRASSHOPPER);
 }
 
-s32 item_getcheck_func_F_GRASSHOPPER() {
+int item_getcheck_func_F_GRASSHOPPER() {
     return i_dComIfGs_isItemFirstBit(F_GRASSHOPPER);
 }
 
-s32 item_getcheck_func_M_NANAFUSHI() {
+int item_getcheck_func_M_NANAFUSHI() {
     return i_dComIfGs_isItemFirstBit(M_NANAFUSHI);
 }
 
-s32 item_getcheck_func_F_NANAFUSHI() {
+int item_getcheck_func_F_NANAFUSHI() {
     return i_dComIfGs_isItemFirstBit(F_NANAFUSHI);
 }
 
-s32 item_getcheck_func_M_DANGOMUSHI() {
+int item_getcheck_func_M_DANGOMUSHI() {
     return i_dComIfGs_isItemFirstBit(M_DANGOMUSHI);
 }
 
-s32 item_getcheck_func_F_DANGOMUSHI() {
+int item_getcheck_func_F_DANGOMUSHI() {
     return i_dComIfGs_isItemFirstBit(F_DANGOMUSHI);
 }
 
-s32 item_getcheck_func_M_MANTIS() {
+int item_getcheck_func_M_MANTIS() {
     return i_dComIfGs_isItemFirstBit(M_MANTIS);
 }
 
-s32 item_getcheck_func_F_MANTIS() {
+int item_getcheck_func_F_MANTIS() {
     return i_dComIfGs_isItemFirstBit(F_MANTIS);
 }
 
-s32 item_getcheck_func_M_LADYBUG() {
+int item_getcheck_func_M_LADYBUG() {
     return i_dComIfGs_isItemFirstBit(M_LADYBUG);
 }
 
-s32 item_getcheck_func_F_LADYBUG() {
+int item_getcheck_func_F_LADYBUG() {
     return i_dComIfGs_isItemFirstBit(F_LADYBUG);
 }
 
-s32 item_getcheck_func_M_SNAIL() {
+int item_getcheck_func_M_SNAIL() {
     return i_dComIfGs_isItemFirstBit(M_SNAIL);
 }
 
-s32 item_getcheck_func_F_SNAIL() {
+int item_getcheck_func_F_SNAIL() {
     return i_dComIfGs_isItemFirstBit(F_SNAIL);
 }
 
-s32 item_getcheck_func_M_DRAGONFLY() {
+int item_getcheck_func_M_DRAGONFLY() {
     return i_dComIfGs_isItemFirstBit(M_DRAGONFLY);
 }
 
-s32 item_getcheck_func_F_DRAGONFLY() {
+int item_getcheck_func_F_DRAGONFLY() {
     return i_dComIfGs_isItemFirstBit(F_DRAGONFLY);
 }
 
-s32 item_getcheck_func_M_ANT() {
+int item_getcheck_func_M_ANT() {
     return i_dComIfGs_isItemFirstBit(M_ANT);
 }
 
-s32 item_getcheck_func_F_ANT() {
+int item_getcheck_func_F_ANT() {
     return i_dComIfGs_isItemFirstBit(F_ANT);
 }
 
-s32 item_getcheck_func_M_MAYFLY() {
+int item_getcheck_func_M_MAYFLY() {
     return i_dComIfGs_isItemFirstBit(M_MAYFLY);
 }
 
-s32 item_getcheck_func_F_MAYFLY() {
+int item_getcheck_func_F_MAYFLY() {
     return i_dComIfGs_isItemFirstBit(F_MAYFLY);
 }
 
-s32 item_getcheck_func_POU_SPIRIT() {
+int item_getcheck_func_POU_SPIRIT() {
     return dComIfGs_getPohSpiritNum();
 }
 
-s32 item_getcheck_func_ANCIENT_DOCUMENT() {
-    return dComIfGs_getItem(SLOT_22, true) == ANCIENT_DOCUMENT ? 1 : 0;
+int item_getcheck_func_ANCIENT_DOCUMENT() {
+    return dComIfGs_getItem(SLOT_22, true) == ANCIENT_DOCUMENT ? TRUE : FALSE;
 }
 
-s32 item_getcheck_func_AIR_LETTER() {
-    return dComIfGs_getItem(SLOT_22, true) == AIR_LETTER ? 1 : 0;
+int item_getcheck_func_AIR_LETTER() {
+    return dComIfGs_getItem(SLOT_22, true) == AIR_LETTER ? TRUE : FALSE;
 }
 
-s32 item_getcheck_func_ANCIENT_DOCUMENT2() {
-    return dComIfGs_getItem(SLOT_22, true) == ANCIENT_DOCUMENT2 ? 1 : 0;
+int item_getcheck_func_ANCIENT_DOCUMENT2() {
+    return dComIfGs_getItem(SLOT_22, true) == ANCIENT_DOCUMENT2 ? TRUE : FALSE;
 }
 
-s32 item_getcheck_func_LV7_DUNGEON_EXIT() {
-    return dComIfGs_getItem(SLOT_18, true) == LV7_DUNGEON_EXIT ? 1 : 0;
+int item_getcheck_func_LV7_DUNGEON_EXIT() {
+    return dComIfGs_getItem(SLOT_18, true) == LV7_DUNGEON_EXIT ? TRUE : FALSE;
 }
 
-s32 item_getcheck_func_LINKS_SAVINGS() {
+int item_getcheck_func_LINKS_SAVINGS() {
     return -1;
 }
 
-s32 item_getcheck_func_SMALL_KEY2() {
+int item_getcheck_func_SMALL_KEY2() {
     return -1;
 }
 
-s32 item_getcheck_func_POU_FIRE1() {
+int item_getcheck_func_POU_FIRE1() {
     return -1;
 }
 
-s32 item_getcheck_func_POU_FIRE2() {
+int item_getcheck_func_POU_FIRE2() {
     return -1;
 }
 
-s32 item_getcheck_func_POU_FIRE3() {
+int item_getcheck_func_POU_FIRE3() {
     return -1;
 }
 
-s32 item_getcheck_func_POU_FIRE4() {
+int item_getcheck_func_POU_FIRE4() {
     return -1;
 }
 
-s32 item_getcheck_func_BOSSRIDER_KEY() {
+int item_getcheck_func_BOSSRIDER_KEY() {
     return -1;
 }
 
-s32 item_getcheck_func_TOMATO_PUREE() {
+int item_getcheck_func_TOMATO_PUREE() {
     return i_dComIfGs_isItemFirstBit(TOMATO_PUREE);
 }
 
-s32 item_getcheck_func_TASTE() {
+int item_getcheck_func_TASTE() {
     return i_dComIfGs_isItemFirstBit(TASTE);
 }
 
-s32 item_getcheck_func_LV5_BOSS_KEY() {
+int item_getcheck_func_LV5_BOSS_KEY() {
     return dComIfGs_isDungeonItemBossKey();
 }
 
-s32 item_getcheck_func_SURFBOARD() {
+int item_getcheck_func_SURFBOARD() {
     return -1;
 }
 
-s32 item_getcheck_func_KANTERA2() {
+int item_getcheck_func_KANTERA2() {
     return -1;
 }
 
-s32 item_getcheck_func_L2_KEY_PIECES1() {
+int item_getcheck_func_L2_KEY_PIECES1() {
     return i_dComIfGs_isItemFirstBit(L2_KEY_PIECES1);
 }
 
-s32 item_getcheck_func_L2_KEY_PIECES2() {
+int item_getcheck_func_L2_KEY_PIECES2() {
     return i_dComIfGs_isItemFirstBit(L2_KEY_PIECES2);
 }
 
-s32 item_getcheck_func_L2_KEY_PIECES3() {
+int item_getcheck_func_L2_KEY_PIECES3() {
     return i_dComIfGs_isItemFirstBit(L2_KEY_PIECES3);
 }
 
-s32 item_getcheck_func_KEY_OF_CARAVAN() {
+int item_getcheck_func_KEY_OF_CARAVAN() {
     return i_dComIfGs_isItemFirstBit(KEY_OF_CARAVAN);
 }
 
-s32 item_getcheck_func_LV2_BOSS_KEY() {
+int item_getcheck_func_LV2_BOSS_KEY() {
     return dComIfGs_isDungeonItemBossKey();
 }
 
-s32 item_getcheck_func_KEY_OF_FILONE() {
+int item_getcheck_func_KEY_OF_FILONE() {
     return dComIfGs_getKeyNum();
 }
 
-s32 isBomb(u8 item_no) {
-    s32 is_bomb = false;
+int isBomb(u8 i_itemNo) {
+    int is_bomb = false;
 
-    if (item_no == BOMB_5 || item_no == BOMB_10 || item_no == BOMB_20 || item_no == BOMB_30 ||
-        item_no == NORMAL_BOMB | item_no == WATER_BOMB || item_no == POKE_BOMB) {
+    if (i_itemNo == BOMB_5 || i_itemNo == BOMB_10 || i_itemNo == BOMB_20 || i_itemNo == BOMB_30 ||
+        i_itemNo == NORMAL_BOMB | i_itemNo == WATER_BOMB || i_itemNo == POKE_BOMB)
+    {
         is_bomb = true;
     }
 
     return is_bomb;
 }
 
-s32 isArrow(u8 item_no) {
-    s32 is_arrow = false;
+int isArrow(u8 i_itemNo) {
+    int is_arrow = false;
 
-    if (item_no == ARROW_1 || item_no == ARROW_10 || item_no == ARROW_20 || item_no == ARROW_30) {
+    if (i_itemNo == ARROW_1 || i_itemNo == ARROW_10 || i_itemNo == ARROW_20 || i_itemNo == ARROW_30)
+    {
         is_arrow = true;
     }
 
@@ -2447,8 +1999,8 @@ s32 isArrow(u8 item_no) {
 }
 
 /* 8009B708-8009B77C 096048 0074+00 0/0 4/4 1/1 .text            isBottleItem__FUc */
-BOOL isBottleItem(u8 item_no) {
-    switch (item_no) {
+BOOL isBottleItem(u8 i_itemNo) {
+    switch (i_itemNo) {
     case OIL_BOTTLE3:
     case EMPTY_BOTTLE:
     case RED_BOTTLE:
@@ -2486,20 +2038,20 @@ BOOL isBottleItem(u8 item_no) {
     }
 }
 
-BOOL isHeart(u8 item_no) {
+BOOL isHeart(u8 i_itemNo) {
     BOOL is_heart = false;
 
-    if (item_no == HEART || item_no == TRIPLE_HEART) {
+    if (i_itemNo == HEART || i_itemNo == TRIPLE_HEART) {
         is_heart = true;
     }
 
     return is_heart;
 }
 
-bool isInsect(u8 item_no) {
+bool isInsect(u8 i_itemNo) {
     bool is_insect = false;
 
-    switch (item_no) {
+    switch (i_itemNo) {
     case M_BEETLE:
     case F_BEETLE:
     case M_BUTTERFLY:
@@ -2530,55 +2082,53 @@ bool isInsect(u8 item_no) {
     return is_insect;
 }
 
-u8 check_itemno(int i_itemId) {
-    if (!dComIfGs_isGetMagicUseFlag() && (i_itemId == S_MAGIC || i_itemId == L_MAGIC)) {
+u8 check_itemno(int i_itemNo) {
+    if (!dComIfGs_isGetMagicUseFlag() && (i_itemNo == S_MAGIC || i_itemNo == L_MAGIC)) {
         return GREEN_RUPEE;
     }
 
-    if (i_itemId == ARROW_1) {
+    if (i_itemNo == ARROW_1) {
         if (!i_dComIfGs_isItemFirstBit(BOW)) {
             return GREEN_RUPEE;
         }
     } else {
-        if (isArrow(i_itemId)) {
+        if (isArrow(i_itemNo)) {
             if (!i_dComIfGs_isItemFirstBit(BOW)) {
                 return GREEN_RUPEE;
             }
 
             if (g_dComIfG_gameInfo.play.getLayerNo(0) == 0xD ||
-                g_dComIfG_gameInfo.play.getLayerNo(0) == 0xE) {
-                const char* tmp = dComIfGp_getStartStageName();
+                g_dComIfG_gameInfo.play.getLayerNo(0) == 0xE)
+            {
+                const char* stage_name = dComIfGp_getStartStageName();
                 // D_MN08: Palace of Twilight
-                if (strncmp(tmp, "D_MN08", 6)) {
+                if (strncmp(stage_name, "D_MN08", 6)) {
                     return GREEN_RUPEE;
                 }
             }
         }
     }
 
-    if (!i_dComIfGs_isItemFirstBit(BOMB_BAG_LV1) && isBomb(i_itemId)) {
+    if (!i_dComIfGs_isItemFirstBit(BOMB_BAG_LV1) && isBomb(i_itemNo)) {
         return GREEN_RUPEE;
     } else {
-        if (i_itemId == TRIPLE_HEART) {
-            i_itemId = HEART;
+        if (i_itemNo == TRIPLE_HEART) {
+            i_itemNo = HEART;
         }
-        if (!checkItemGet(PACHINKO, 1) && i_itemId == PACHINKO_SHOT) {
-            i_itemId = GREEN_RUPEE;
+        if (!checkItemGet(PACHINKO, 1) && i_itemNo == PACHINKO_SHOT) {
+            i_itemNo = GREEN_RUPEE;
         }
-        if (i_itemId == S_MAGIC || i_itemId == L_MAGIC) {
-            i_itemId = GREEN_RUPEE;
+        if (i_itemNo == S_MAGIC || i_itemNo == L_MAGIC) {
+            i_itemNo = GREEN_RUPEE;
         }
     }
-    return i_itemId;
+    return i_itemNo;
 }
 
 /* 8009B940-8009BBD8 096280 0298+00 11/11 0/0 0/0 .text            addBombCount__FUcUc */
-#ifdef NONMATCHING
 int addBombCount(u8 i_bombType, u8 i_addNum) {
     u8 bombType[3];
-    s32 bombNum[3];
-    s32 var_r22;
-    s32 bombIdx;
+    int bombNum[3];
 
     for (u8 i = 0; i < 3; i++) {
         bombType[i] = dComIfGs_getItem(i + SLOT_15, false);
@@ -2593,9 +2143,9 @@ int addBombCount(u8 i_bombType, u8 i_addNum) {
     }
 
     for (u8 i = 0; i < 3; i++) {
-        bombIdx = -1;
-        var_r22 = -1;
-    
+        int bombIdx = -1;
+        int var_r22 = -1;
+
         for (u8 j = 0; j < 3; j++) {
             if (bombNum[j] == 0) {
                 bombIdx = j;
@@ -2604,13 +2154,15 @@ int addBombCount(u8 i_bombType, u8 i_addNum) {
         }
 
         for (u8 k = 0; k < 3; k++) {
-            if (bombNum[k] > 0 && bombNum[k] > var_r22 && bombNum[k] != dComIfGs_getBombMax(bombType[k])) {
+            if (bombNum[k] > 0 && bombNum[k] > var_r22 &&
+                bombNum[k] != dComIfGs_getBombMax(bombType[k]))
+            {
                 bombIdx = k;
                 var_r22 = bombNum[k];
             }
         }
 
-        if (bombIdx == -1) {  // issue here?
+        if (bombIdx == -1) {
             return i_addNum;
         } else if (var_r22 == 0) {
             if (dComIfGs_getBombMax(i_bombType) >= i_addNum) {
@@ -2635,19 +2187,6 @@ int addBombCount(u8 i_bombType, u8 i_addNum) {
 
     return i_addNum;
 }
-#else
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm int addBombCount(u8 param_0, u8 param_1) {
-    nofralloc
-#include "asm/d/d_item/addBombCount__FUcUc.s"
-}
-#pragma pop
-#endif
 
-/* ############################################################################################## */
 /* 80450F90-80450F98 000490 0004+04 0/0 2/2 0/0 .sbss            mData__12dEnemyItem_c */
-u8 dEnemyItem_c::mData[4 + 4 /* padding */];
-
-/* 8037B0D0-8037B0D0 007730 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
+u8* dEnemyItem_c::mData;