diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-01-17 20:58:43 -0500 |
|---|---|---|
| committer | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-01-17 20:58:43 -0500 |
| commit | e8adc6c9e540a8df0efdf2b0c22737ebc0481055 (patch) | |
| tree | fc6cafc90e676ba194c40f3153a2081033564843 /src/d | |
| parent | c609b6780c28f05dd78d55adfafaf3352cdb71a6 (diff) | |
Rename more item enums
Diffstat (limited to 'src/d')
27 files changed, 796 insertions, 796 deletions
diff --git a/src/d/actor/d_a_agb.cpp b/src/d/actor/d_a_agb.cpp index 616fc796..9a584c43 100644 --- a/src/d/actor/d_a_agb.cpp +++ b/src/d/actor/d_a_agb.cpp @@ -994,7 +994,7 @@ void daAgb_c::GbaItemUse() { field_0x65c = 30; break; case 7: - if (dComIfGs_checkGetItem(ESA_BAG)) { + if (dComIfGs_checkGetItem(dItem_BAIT_BAG_e)) { if (dComIfGs_checkBaitItemEmpty()) { temp_r29 |= 0x1000000; } @@ -1064,7 +1064,7 @@ void daAgb_c::Shopping() { } } else { if (dComIfGs_checkBaitItemEmpty()) { - dComIfGs_setBaitItem(BIRD_ESA_5); + dComIfGs_setBaitItem(dItem_BIRD_BAIT_5_e); } else { itemBuy.U8.field_0x1 = 2; return; diff --git a/src/d/actor/d_a_agbsw0.cpp b/src/d/actor/d_a_agbsw0.cpp index d743af9b..9dabafa1 100644 --- a/src/d/actor/d_a_agbsw0.cpp +++ b/src/d/actor/d_a_agbsw0.cpp @@ -915,7 +915,7 @@ u32 daAgbsw0_c::TriforceCheck(daAgb_c* agb) } } if(!dComIfGs_isGetCollectMap(3)) { - if(dComIfGs_checkGetItem(ESA_BAG)) { + if(dComIfGs_checkGetItem(dItem_BAIT_BAG_e)) { if(dComIfGs_checkBaitItem(dItem_HYOI_PEAR_e)) { #if VERSION == VERSION_JPN s8 roomNo = dComIfGp_roomControl_getStayNo(); @@ -1259,7 +1259,7 @@ BOOL daAgbsw0_c::ExeSubR() { itemNo = 0; } - if(itemNo != RECOVER_FAIRY) { + if(itemNo != dItem_RECOVER_FAIRY_e) { current.pos.y += scale.y / 2.0f; } @@ -1524,7 +1524,7 @@ BOOL daAgbsw0_c::ExeSubD() { } else if(field_0x299 == 2 && fopAcM_isSwitch(this, getSw1())) { s32 itemNo = getParamNo(); - if(itemNo != RECOVER_FAIRY) { + if(itemNo != dItem_RECOVER_FAIRY_e) { current.pos.y += scale.y / 2; } if(0 <= itemNo && itemNo < 0x1F && itemNo != dItem_HEART_PIECE_e && itemNo != dItem_HEART_CONTAINER_e && itemNo != dItem_SMALL_KEY_e) { @@ -2193,13 +2193,13 @@ BOOL daAgbsw0_c::MoveCheck(s16 conditionNo) { break; case 0x4E: - if(dComIfGs_checkGetItem(MIRROR_SHIELD)) { + if(dComIfGs_checkGetItem(dItem_MIRROR_SHIELD_e)) { return FALSE; } break; case 0x4F: - if(!dComIfGs_checkGetItem(MIRROR_SHIELD)) { + if(!dComIfGs_checkGetItem(dItem_MIRROR_SHIELD_e)) { return FALSE; } @@ -2259,25 +2259,25 @@ BOOL daAgbsw0_c::MoveCheck(s16 conditionNo) { break; case 0x59: - if(dComIfGs_checkGetItem(LV3_SWORD) || dComIfGs_checkGetItem(MASTER_SWORD_EX)) { + if(dComIfGs_checkGetItem(dItem_MASTER_SWORD_2_e) || dComIfGs_checkGetItem(dItem_MASTER_SWORD_3_e)) { return FALSE; } break; case 0x5A: - if(!dComIfGs_checkGetItem(LV3_SWORD) && !dComIfGs_checkGetItem(MASTER_SWORD_EX)) { + if(!dComIfGs_checkGetItem(dItem_MASTER_SWORD_2_e) && !dComIfGs_checkGetItem(dItem_MASTER_SWORD_3_e)) { return FALSE; } break; case 0x5B: - if(dComIfGs_checkGetItem(MASTER_SWORD_EX)) { + if(dComIfGs_checkGetItem(dItem_MASTER_SWORD_3_e)) { return FALSE; } break; case 0x5C: - if(!dComIfGs_checkGetItem(MASTER_SWORD_EX)) { + if(!dComIfGs_checkGetItem(dItem_MASTER_SWORD_3_e)) { return FALSE; } diff --git a/src/d/actor/d_a_arrow.cpp b/src/d/actor/d_a_arrow.cpp index 7cd98724..2fb2739f 100644 --- a/src/d/actor/d_a_arrow.cpp +++ b/src/d/actor/d_a_arrow.cpp @@ -993,7 +993,7 @@ BOOL daArrow_c::procStop_BG() { if (mCoSph.ChkCoHit()) { dComIfGp_setItemArrowNumCount(1); - fopAcM_createItemForSimpleDemo(¤t.pos, ARROW_10, -1, NULL, NULL, 0.0f, 0.0f); + fopAcM_createItemForSimpleDemo(¤t.pos, dItem_ARROW_10_e, -1, NULL, NULL, 0.0f, 0.0f); mDoAud_seStart(JA_SE_CONSUMP_ITEM_GET); fopAcM_delete(this); return TRUE; diff --git a/src/d/actor/d_a_auction.cpp b/src/d/actor/d_a_auction.cpp index 6ef597d9..3492a41d 100644 --- a/src/d/actor/d_a_auction.cpp +++ b/src/d/actor/d_a_auction.cpp @@ -50,8 +50,8 @@ static daAuction_HIO_c l_HIO; static daAuction_c::ItemData l_item_dat[] = { {dItem_JOY_PENDANT_e, 0x1D10, 40, 0x0F01}, - {COLLECT_MAP_27, 0x1D11, 5, 0x1080}, - {COLLECT_MAP_18, 0x1D12, 60, 0x1040}, + {dItem_COLLECT_MAP_27_e, 0x1D11, 5, 0x1080}, + {dItem_COLLECT_MAP_18_e, 0x1D12, 60, 0x1040}, {dItem_HEART_PIECE_e, 0x1D13, 80, 0x1020}, }; diff --git a/src/d/actor/d_a_bk.cpp b/src/d/actor/d_a_bk.cpp index dc40beab..5aaca9f7 100644 --- a/src/d/actor/d_a_bk.cpp +++ b/src/d/actor/d_a_bk.cpp @@ -1183,7 +1183,7 @@ static void jyunkai(bk_class* i_this) { static void* ken_s_sub(void* param_1, void*) { if (fopAc_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_ITEM) { daItem_c* item = (daItem_c*)param_1; - if (item->getItemNo() == DROPPED_SWORD) { + if (item->getItemNo() == dItem_DROPPED_SWORD_e) { return param_1; } } diff --git a/src/d/actor/d_a_demo_item.cpp b/src/d/actor/d_a_demo_item.cpp index 870bcbd6..1a9c9ec5 100644 --- a/src/d/actor/d_a_demo_item.cpp +++ b/src/d/actor/d_a_demo_item.cpp @@ -28,24 +28,24 @@ u8 daDitem_c::m_effect_type[0x100] = { 0x03, // dItem_ORANGE_RUPEE_e 0x00, // dItem_HEART_PIECE_e 0x00, // dItem_HEART_CONTAINER_e - 0x04, // S_MAGIC - 0x04, // L_MAGIC - 0x04, // BOMB_5 - 0x04, // BOMB_10 - 0x04, // BOMB_20 - 0x04, // BOMB_30 + 0x04, // dItem_SMALL_MAGIC_e + 0x04, // dItem_LARGE_MAGIC_e + 0x04, // dItem_BOMB_5_e + 0x04, // dItem_BOMB_10_e + 0x04, // dItem_BOMB_20_e + 0x04, // dItem_BOMB_30_e 0x03, // dItem_SILVER_RUPEE_e - 0x04, // ARROW_10 - 0x04, // ARROW_20 - 0x04, // ARROW_30 + 0x04, // dItem_ARROW_10_e + 0x04, // dItem_ARROW_20_e + 0x04, // dItem_ARROW_30_e 0x04, // noentry19 0x04, // noentry20 0x02, // dItem_SMALL_KEY_e - 0x04, // RECOVER_FAIRY + 0x04, // dItem_RECOVER_FAIRY_e 0x04, // noentry23 0x04, // noentry24 0x04, // noentry25 - 0x03, // SUB_DUN_RUPEE + 0x03, // dItem_SUB_DUN_RUPEE_e 0x04, // noentry27 0x04, // noentry28 0x04, // noentry29 @@ -55,15 +55,15 @@ u8 daDitem_c::m_effect_type[0x100] = { 0x00, // dItem_TINGLE_TUNER_e 0x00, // dItem_WIND_WAKER_e 0x00, // CAMERA - 0x00, // EMONO_BAG + 0x00, // dItem_SPOILS_BAG_e 0x00, // dItem_GRAPPLING_HOOK_e 0x00, // CAMERA2 0x00, // dItem_BOW_e - 0x00, // PWR_GROOVE + 0x00, // dItem_POWER_BRACELETS_e 0x00, // dItem_IRON_BOOTS_e 0x00, // dItem_MAGIC_ARMOR_e 0x04, // WATER_BOOTS - 0x00, // ESA_BAG + 0x00, // dItem_BAIT_BAG_e 0x00, // dItem_BOOMERANG_e 0x04, // BARE_HAND 0x00, // dItem_HOOKSHOT_e @@ -75,40 +75,40 @@ u8 daDitem_c::m_effect_type[0x100] = { 0x00, // dItem_MAGIC_ARROW_e 0x00, // dItem_LIGHT_ARROW_e 0x04, // dItem_NEW_FUKU_e - 0x00, // SWORD - 0x00, // MASTER_SWORD - 0x04, // LV3_SWORD - 0x00, // SHIELD - 0x00, // MIRROR_SHIELD - 0x00, // DROPPED_SWORD - 0x04, // MASTER_SWORD_EX + 0x00, // dItem_SWORD_e + 0x00, // dItem_MASTER_SWORD_1_e + 0x04, // dItem_MASTER_SWORD_2_e + 0x00, // dItem_SHIELD_e + 0x00, // dItem_MIRROR_SHIELD_e + 0x00, // dItem_DROPPED_SWORD_e + 0x04, // dItem_MASTER_SWORD_3_e 0x01, // KAKERA_HEART2 0x04, // noentry64 0x04, // noentry65 - 0x00, // PIRATES_OMAMORI - 0x00, // HEROS_OMAMORI + 0x00, // dItem_PIRATES_CHARM_e + 0x00, // dItem_HEROS_CHARM_e 0x04, // GRASS_BALL - 0x01, // SKULL_NECKLACE - 0x01, // BOKOBABA_SEED - 0x01, // GOLDEN_FEATHER + 0x01, // dItem_SKULL_NECKLACE_e + 0x01, // dItem_BOKOBABA_SEED_e + 0x01, // dItem_GOLDEN_FEATHER_e 0x01, // BOKO_BELT - 0x01, // RED_JELLY - 0x01, // GREEN_JELLY - 0x01, // BLUE_JELLY + 0x01, // dItem_RED_JELLY_e + 0x01, // dItem_GREEN_JELLY_e + 0x01, // dItem_BLUE_JELLY_e 0x01, // dItem_MAP_e 0x01, // dItem_COMPASS_e 0x00, // dItem_BOSS_KEY_e 0x04, // EMPTY_BSHIP - 0x00, // EMPTY_BOTTLE - 0x02, // RED_BOTTLE - 0x02, // GREEN_BOTTLE - 0x02, // BLUE_BOTTLE + 0x00, // dItem_EMPTY_BOTTLE_e + 0x02, // dItem_RED_POTION_e + 0x02, // dItem_GREEN_POTION_e + 0x02, // dItem_BLUE_POTION_e 0x00, // dItem_HALF_SOUP_BOTTLE_e 0x00, // dItem_SOUP_BOTTLE_e - 0x02, // BIN_IN_WATER - 0x02, // FAIRY_BOTTLE - 0x00, // FIREFLY_BOTTLE - 0x02, // FWATER_BOTTLE + 0x02, // dItem_WATER_BOTTLE_e + 0x02, // dItem_FAIRY_BOTTLE_e + 0x00, // dItem_FIREFLY_BOTTLE_e + 0x02, // dItem_FOREST_WATER_e 0x04, // UNK_BOTTLE_5A 0x04, // UNK_BOTTLE_5B 0x04, // UNK_BOTTLE_5C @@ -149,7 +149,7 @@ u8 daDitem_c::m_effect_type[0x100] = { 0x00, // TRIFORCE_MAP7 0x00, // TRIFORCE_MAP8 0x04, // noentry129 - 0x02, // BIRD_ESA_5 + 0x02, // dItem_BIRD_BAIT_5_e 0x02, // dItem_HYOI_PEAR_e 0x04, // ESA1 0x04, // ESA2 @@ -190,14 +190,14 @@ u8 daDitem_c::m_effect_type[0x100] = { 0x00, // TINGLE_STATUE6 0x04, // noentry169 0x04, // dItem_HURRICANE_SPIN_e - 0x00, // MAX_RUPEE_UP1 - 0x00, // MAX_RUPEE_UP2 - 0x00, // MAX_BOMB_UP1 - 0x00, // MAX_BOMB_UP2 - 0x00, // MAX_ARROW_UP1 - 0x00, // MAX_ARROW_UP2 - 0x04, // MAGIC_POWER - 0x04, // MAX_MP_UP1 + 0x00, // dItem_MAX_RUPEE_UP1_e + 0x00, // dItem_MAX_RUPEE_UP2_e + 0x00, // dItem_MAX_BOMB_UP1_e + 0x00, // dItem_MAX_BOMB_UP2_e + 0x00, // dItem_MAX_ARROW_UP1_e + 0x00, // dItem_MAX_ARROW_UP2_e + 0x04, // dItem_MAGIC_POWER_e + 0x04, // dItem_MAX_MP_UP1_e 0x03, // TINCLE_RUPEE1 0x03, // TINCLE_RUPEE2 0x03, // TINCLE_RUPEE3 @@ -210,70 +210,70 @@ u8 daDitem_c::m_effect_type[0x100] = { 0x04, // LITHOGRAPH4 0x04, // LITHOGRAPH5 0x04, // LITHOGRAPH6 - 0x04, // COLLECT_MAP_64 - 0x04, // COLLECT_MAP_63 - 0x04, // COLLECT_MAP_62 - 0x00, // COLLECT_MAP_61 - 0x00, // COLLECT_MAP_60 - 0x00, // COLLECT_MAP_59 - 0x00, // COLLECT_MAP_58 - 0x00, // COLLECT_MAP_57 - 0x00, // COLLECT_MAP_56 - 0x00, // COLLECT_MAP_55 - 0x00, // COLLECT_MAP_54 - 0x00, // COLLECT_MAP_53 - 0x00, // COLLECT_MAP_52 - 0x00, // COLLECT_MAP_51 - 0x00, // COLLECT_MAP_50 - 0x00, // COLLECT_MAP_49 - 0x00, // COLLECT_MAP_48 - 0x00, // COLLECT_MAP_47 - 0x00, // COLLECT_MAP_46 - 0x00, // COLLECT_MAP_45 - 0x00, // COLLECT_MAP_44 - 0x00, // COLLECT_MAP_43 - 0x00, // COLLECT_MAP_42 - 0x00, // COLLECT_MAP_41 - 0x00, // COLLECT_MAP_40 - 0x00, // COLLECT_MAP_39 - 0x00, // COLLECT_MAP_38 - 0x00, // COLLECT_MAP_37 - 0x00, // COLLECT_MAP_36 - 0x00, // COLLECT_MAP_35 - 0x00, // COLLECT_MAP_34 - 0x00, // COLLECT_MAP_33 - 0x00, // COLLECT_MAP_32 - 0x00, // COLLECT_MAP_31 - 0x00, // COLLECT_MAP_30 - 0x00, // COLLECT_MAP_29 - 0x00, // COLLECT_MAP_28 - 0x00, // COLLECT_MAP_27 - 0x00, // COLLECT_MAP_26 - 0x00, // COLLECT_MAP_25 - 0x00, // COLLECT_MAP_24 - 0x00, // COLLECT_MAP_23 - 0x00, // COLLECT_MAP_22 - 0x00, // COLLECT_MAP_21 - 0x00, // COLLECT_MAP_20 - 0x00, // COLLECT_MAP_19 - 0x00, // COLLECT_MAP_18 - 0x00, // COLLECT_MAP_17 - 0x00, // COLLECT_MAP_16 - 0x00, // COLLECT_MAP_15 - 0x00, // COLLECT_MAP_14 - 0x00, // COLLECT_MAP_13 - 0x00, // COLLECT_MAP_12 - 0x00, // COLLECT_MAP_11 - 0x00, // COLLECT_MAP_10 - 0x00, // COLLECT_MAP_09 - 0x00, // COLLECT_MAP_08 - 0x00, // COLLECT_MAP_07 - 0x00, // COLLECT_MAP_06 - 0x00, // COLLECT_MAP_05 - 0x00, // COLLECT_MAP_04 - 0x00, // COLLECT_MAP_03 - 0x00, // COLLECT_MAP_02 - 0x00, // COLLECT_MAP_01 + 0x04, // dItem_COLLECT_MAP_64_e + 0x04, // dItem_COLLECT_MAP_63_e + 0x04, // dItem_COLLECT_MAP_62_e + 0x00, // dItem_COLLECT_MAP_61_e + 0x00, // dItem_COLLECT_MAP_60_e + 0x00, // dItem_COLLECT_MAP_59_e + 0x00, // dItem_COLLECT_MAP_58_e + 0x00, // dItem_COLLECT_MAP_57_e + 0x00, // dItem_COLLECT_MAP_56_e + 0x00, // dItem_COLLECT_MAP_55_e + 0x00, // dItem_COLLECT_MAP_54_e + 0x00, // dItem_COLLECT_MAP_53_e + 0x00, // dItem_COLLECT_MAP_52_e + 0x00, // dItem_COLLECT_MAP_51_e + 0x00, // dItem_COLLECT_MAP_50_e + 0x00, // dItem_COLLECT_MAP_49_e + 0x00, // dItem_COLLECT_MAP_48_e + 0x00, // dItem_COLLECT_MAP_47_e + 0x00, // dItem_COLLECT_MAP_46_e + 0x00, // dItem_COLLECT_MAP_45_e + 0x00, // dItem_COLLECT_MAP_44_e + 0x00, // dItem_COLLECT_MAP_43_e + 0x00, // dItem_COLLECT_MAP_42_e + 0x00, // dItem_COLLECT_MAP_41_e + 0x00, // dItem_COLLECT_MAP_40_e + 0x00, // dItem_COLLECT_MAP_39_e + 0x00, // dItem_COLLECT_MAP_38_e + 0x00, // dItem_COLLECT_MAP_37_e + 0x00, // dItem_COLLECT_MAP_36_e + 0x00, // dItem_COLLECT_MAP_35_e + 0x00, // dItem_COLLECT_MAP_34_e + 0x00, // dItem_COLLECT_MAP_33_e + 0x00, // dItem_COLLECT_MAP_32_e + 0x00, // dItem_COLLECT_MAP_31_e + 0x00, // dItem_COLLECT_MAP_30_e + 0x00, // dItem_COLLECT_MAP_29_e + 0x00, // dItem_COLLECT_MAP_28_e + 0x00, // dItem_COLLECT_MAP_27_e + 0x00, // dItem_COLLECT_MAP_26_e + 0x00, // dItem_COLLECT_MAP_25_e + 0x00, // dItem_COLLECT_MAP_24_e + 0x00, // dItem_COLLECT_MAP_23_e + 0x00, // dItem_COLLECT_MAP_22_e + 0x00, // dItem_COLLECT_MAP_21_e + 0x00, // dItem_COLLECT_MAP_20_e + 0x00, // dItem_COLLECT_MAP_19_e + 0x00, // dItem_COLLECT_MAP_18_e + 0x00, // dItem_COLLECT_MAP_17_e + 0x00, // dItem_COLLECT_MAP_16_e + 0x00, // dItem_COLLECT_MAP_15_e + 0x00, // dItem_COLLECT_MAP_14_e + 0x00, // dItem_COLLECT_MAP_13_e + 0x00, // dItem_COLLECT_MAP_12_e + 0x00, // dItem_COLLECT_MAP_11_e + 0x00, // dItem_COLLECT_MAP_10_e + 0x00, // dItem_COLLECT_MAP_09_e + 0x00, // dItem_COLLECT_MAP_08_e + 0x00, // dItem_COLLECT_MAP_07_e + 0x00, // dItem_COLLECT_MAP_06_e + 0x00, // dItem_COLLECT_MAP_05_e + 0x00, // dItem_COLLECT_MAP_04_e + 0x00, // dItem_COLLECT_MAP_03_e + 0x00, // dItem_COLLECT_MAP_02_e + 0x00, // dItem_COLLECT_MAP_01_e 0x04, // dItem_NONE_e }; @@ -378,16 +378,16 @@ void daDitem_c::set_pos() { void daDitem_c::anim_control() { switch (m_itemNo) { case EMPTY_BSHIP: - case EMPTY_BOTTLE: - case RED_BOTTLE: - case GREEN_BOTTLE: - case BLUE_BOTTLE: + case dItem_EMPTY_BOTTLE_e: + case dItem_RED_POTION_e: + case dItem_GREEN_POTION_e: + case dItem_BLUE_POTION_e: case dItem_HALF_SOUP_BOTTLE_e: case dItem_SOUP_BOTTLE_e: - case BIN_IN_WATER: - case FAIRY_BOTTLE: - case FIREFLY_BOTTLE: - case FWATER_BOTTLE: + case dItem_WATER_BOTTLE_e: + case dItem_FAIRY_BOTTLE_e: + case dItem_FIREFLY_BOTTLE_e: + case dItem_FOREST_WATER_e: case UNK_BOTTLE_5A: case UNK_BOTTLE_5B: case UNK_BOTTLE_5C: diff --git a/src/d/actor/d_a_disappear.cpp b/src/d/actor/d_a_disappear.cpp index 6ceca7f5..9bc308a9 100644 --- a/src/d/actor/d_a_disappear.cpp +++ b/src/d/actor/d_a_disappear.cpp @@ -32,8 +32,8 @@ static BOOL daDisappear_Execute(disappear_class* i_this) { // This also seems to be used by several other enemies, such as Molgera's spawn. static u32 ki_item_d[] = { dItem_HEART_e, - L_MAGIC, - ARROW_10, + dItem_LARGE_MAGIC_e, + dItem_ARROW_10_e, }; if (dropType < daDisItem_HEART_e + (int)ARRAY_SIZE(ki_item_d)) { fopAcM_createItem(&i_this->current.pos, ki_item_d[dropType - daDisItem_HEART_e], -1, -1, daItemType_0_e, NULL, daItemAct_4_e); diff --git a/src/d/actor/d_a_item.cpp b/src/d/actor/d_a_item.cpp index 573dfdd6..5855c598 100644 --- a/src/d/actor/d_a_item.cpp +++ b/src/d/actor/d_a_item.cpp @@ -36,24 +36,24 @@ float daItem_c::getYOffset() { switch (m_itemNo) { case BOKO_BELT: return 0.0f; - case SKULL_NECKLACE: + case dItem_SKULL_NECKLACE_e: return 0.0f; - case BOKOBABA_SEED: + case dItem_BOKOBABA_SEED_e: return 0.0f; - case GOLDEN_FEATHER: + case dItem_GOLDEN_FEATHER_e: return 0.0f; - case RED_JELLY: - case GREEN_JELLY: - case BLUE_JELLY: + case dItem_RED_JELLY_e: + case dItem_GREEN_JELLY_e: + case dItem_BLUE_JELLY_e: return 0.0f; case dItem_SMALL_KEY_e: case dItem_BOSS_KEY_e: return 0.0f; - case SHIELD: + case dItem_SHIELD_e: return 23.0f; - case SWORD: + case dItem_SWORD_e: return 20.0f; - case DROPPED_SWORD: + case dItem_DROPPED_SWORD_e: return 10.0f; case dItem_HEART_PIECE_e: case dItem_HEART_CONTAINER_e: @@ -172,10 +172,10 @@ void daItem_c::CreateInit() { } switch (m_itemNo) { - case BOMB_5: - case BOMB_10: - case BOMB_20: - case BOMB_30: + case dItem_BOMB_5_e: + case dItem_BOMB_10_e: + case dItem_BOMB_20_e: + case dItem_BOMB_30_e: mScaleTarget.setall(0.6f); break; default: @@ -195,11 +195,11 @@ void daItem_c::CreateInit() { initAction(); switch (m_itemNo) { - case SWORD: - case SHIELD: + case dItem_SWORD_e: + case dItem_SHIELD_e: fopAcM_OnStatus(this, fopAcStts_UNK4000_e); break; - case DROPPED_SWORD: + case dItem_DROPPED_SWORD_e: current.angle.x = 0x4000; break; } @@ -224,7 +224,7 @@ s32 daItem_c::_daItem_create() { } mItemBitNo = daItem_prm::getItemBitNo(this); - if (m_itemNo != BLUE_JELLY) { // Blue Chu Jelly uses mItemBitNo as if it was a switch. + if (m_itemNo != dItem_BLUE_JELLY_e) { // Blue Chu Jelly uses mItemBitNo as if it was a switch. mItemBitNo &= 0x7F; if (fopAcM_isItem(this, mItemBitNo) && mItemBitNo != 0x7F) { // Already picked up, don't create the item again. @@ -618,21 +618,21 @@ void daItem_c::itemGetExecute() { mDoAud_seStart(JA_SE_HEART_PIECE); mItemStatus = STATUS_INIT_GET_DEMO; break; - case S_MAGIC: + case dItem_SMALL_MAGIC_e: mDoAud_seStart(JA_SE_MAGIC_POT_GET_S); execItemGet(m_itemNo); break; - case L_MAGIC: + case dItem_LARGE_MAGIC_e: mDoAud_seStart(JA_SE_MAGIC_POT_GET_L); execItemGet(m_itemNo); break; - case BOMB_5: - case BOMB_10: - case BOMB_20: - case BOMB_30: - case ARROW_10: - case ARROW_20: - case ARROW_30: + case dItem_BOMB_5_e: + case dItem_BOMB_10_e: + case dItem_BOMB_20_e: + case dItem_BOMB_30_e: + case dItem_ARROW_10_e: + case dItem_ARROW_20_e: + case dItem_ARROW_30_e: mDoAud_seStart(JA_SE_CONSUMP_ITEM_GET); execItemGet(m_itemNo); break; @@ -655,26 +655,26 @@ void daItem_c::itemGetExecute() { case dItem_DEKU_LEAF_e: mItemStatus = STATUS_INIT_GET_DEMO; break; - case SWORD: { + case dItem_SWORD_e: { daItem_c* item = (daItem_c*)fopAcM_SearchByName(PROC_ITEM); - if (item && item->m_itemNo == SHIELD) { + if (item && item->m_itemNo == dItem_SHIELD_e) { item->itemGetExecute(); } mItemStatus = STATUS_INIT_GET_DEMO; break; } - case SHIELD: { + case dItem_SHIELD_e: { daItem_c* item = (daItem_c*)fopAcM_SearchByName(PROC_ITEM); - if (item && item->m_itemNo == SWORD) { + if (item && item->m_itemNo == dItem_SWORD_e) { item->itemGetExecute(); } mItemStatus = STATUS_INIT_GET_DEMO; break; } - case DROPPED_SWORD: + case dItem_DROPPED_SWORD_e: mItemStatus = STATUS_INIT_GET_DEMO; break; - case SKULL_NECKLACE: + case dItem_SKULL_NECKLACE_e: mDoAud_seStart(JA_SE_SPOILS_GET); if (!dComIfGs_isGetItemBeast(0)) { mItemStatus = STATUS_INIT_GET_DEMO; @@ -683,7 +683,7 @@ void daItem_c::itemGetExecute() { execItemGet(m_itemNo); } break; - case BOKOBABA_SEED: + case dItem_BOKOBABA_SEED_e: mDoAud_seStart(JA_SE_SPOILS_GET); if (!dComIfGs_isGetItemBeast(1)) { mItemStatus = STATUS_INIT_GET_DEMO; @@ -692,7 +692,7 @@ void daItem_c::itemGetExecute() { execItemGet(m_itemNo); } break; - case GOLDEN_FEATHER: + case dItem_GOLDEN_FEATHER_e: mDoAud_seStart(JA_SE_SPOILS_GET); if (!dComIfGs_isGetItemBeast(2)) { mItemStatus = STATUS_INIT_GET_DEMO; @@ -710,7 +710,7 @@ void daItem_c::itemGetExecute() { execItemGet(m_itemNo); } break; - case RED_JELLY: + case dItem_RED_JELLY_e: mDoAud_seStart(JA_SE_SPOILS_GET); if (!dComIfGs_isGetItemBeast(4)) { mItemStatus = STATUS_INIT_GET_DEMO; @@ -719,7 +719,7 @@ void daItem_c::itemGetExecute() { execItemGet(m_itemNo); } break; - case GREEN_JELLY: + case dItem_GREEN_JELLY_e: mDoAud_seStart(JA_SE_SPOILS_GET); if (!dComIfGs_isGetItemBeast(5)) { mItemStatus = STATUS_INIT_GET_DEMO; @@ -728,7 +728,7 @@ void daItem_c::itemGetExecute() { execItemGet(m_itemNo); } break; - case BLUE_JELLY: + case dItem_BLUE_JELLY_e: mDoAud_seStart(JA_SE_SPOILS_GET); if (!dComIfGs_isGetItemBeast(6)) { mItemStatus = STATUS_INIT_GET_DEMO; @@ -737,7 +737,7 @@ void daItem_c::itemGetExecute() { execItemGet(m_itemNo); } break; - case BIRD_ESA_5: + case dItem_BIRD_BAIT_5_e: mDoAud_seStart(JA_SE_ESA_GET); if (!dComIfGs_isGetItemBait(0)) { mItemStatus = STATUS_INIT_GET_DEMO; @@ -979,11 +979,11 @@ BOOL daItem_c::itemActionForSword() { f32 temp = field_0x650 * 0.9f; fopAcM_SetSpeed(this, 0.0f, -temp, 0.0f); - if (m_itemNo == SWORD) { + if (m_itemNo == dItem_SWORD_e) { if (m_get_timer > 15) { fopAcM_seStart(this, JA_SE_OBJ_LNK_SWORD_FALL, 0); } - } else if (m_itemNo == SHIELD) { + } else if (m_itemNo == dItem_SHIELD_e) { if (m_get_timer > 15) { fopAcM_seStart(this, JA_SE_OBJ_LNK_SHIELD_FALL, 0); } @@ -1135,13 +1135,13 @@ void daItem_c::set_bound_se() { case dItem_ORANGE_RUPEE_e: fopAcM_seStart(this, JA_SE_OBJ_LUPY_BOUND, temp); break; - case S_MAGIC: - case L_MAGIC: + case dItem_SMALL_MAGIC_e: + case dItem_LARGE_MAGIC_e: fopAcM_seStart(this, JA_SE_OBJ_M_POT_BOUND, temp); break; - case ARROW_10: - case ARROW_20: - case ARROW_30: + case dItem_ARROW_10_e: + case dItem_ARROW_20_e: + case dItem_ARROW_30_e: case dItem_MAGIC_ARROW_e: case dItem_LIGHT_ARROW_e: fopAcM_seStart(this, JA_SE_CM_BST_ARROW_BOUND, temp); @@ -1150,10 +1150,10 @@ void daItem_c::set_bound_se() { case dItem_HEART_CONTAINER_e: fopAcM_seStart(this, JA_SE_CM_BST_HEART_BOUND, temp); break; - case BOMB_5: - case BOMB_10: - case BOMB_20: - case BOMB_30: + case dItem_BOMB_5_e: + case dItem_BOMB_10_e: + case dItem_BOMB_20_e: + case dItem_BOMB_30_e: fopAcM_seStart(this, JA_SE_CM_BST_BOMB_BOUND, temp); break; } @@ -1254,13 +1254,13 @@ void daItem_c::mode_wait() { break; case dItem_HEART_PIECE_e: case dItem_HEART_CONTAINER_e: - case BOMB_5: - case BOMB_10: - case BOMB_20: - case BOMB_30: - case ARROW_10: - case ARROW_20: - case ARROW_30: + case dItem_BOMB_5_e: + case dItem_BOMB_10_e: + case dItem_BOMB_20_e: + case dItem_BOMB_30_e: + case dItem_ARROW_10_e: + case dItem_ARROW_20_e: + case dItem_ARROW_30_e: case dItem_MAGIC_ARROW_e: case dItem_LIGHT_ARROW_e: itemActionForArrow(); @@ -1268,21 +1268,21 @@ void daItem_c::mode_wait() { case dItem_SMALL_KEY_e: itemActionForKey(); break; - case S_MAGIC: - case L_MAGIC: + case dItem_SMALL_MAGIC_e: + case dItem_LARGE_MAGIC_e: case dItem_JOY_PENDANT_e: - case SKULL_NECKLACE: - case BOKOBABA_SEED: - case GOLDEN_FEATHER: + case dItem_SKULL_NECKLACE_e: + case dItem_BOKOBABA_SEED_e: + case dItem_GOLDEN_FEATHER_e: case BOKO_BELT: - case RED_JELLY: - case GREEN_JELLY: - case BLUE_JELLY: + case dItem_RED_JELLY_e: + case dItem_GREEN_JELLY_e: + case dItem_BLUE_JELLY_e: itemActionForEmono(); break; - case SWORD: - case SHIELD: - case DROPPED_SWORD: + case dItem_SWORD_e: + case dItem_SHIELD_e: + case dItem_DROPPED_SWORD_e: itemActionForSword(); break; default: diff --git a/src/d/actor/d_a_itembase.cpp b/src/d/actor/d_a_itembase.cpp index 04a7a89d..b1e99fd8 100644 --- a/src/d/actor/d_a_itembase.cpp +++ b/src/d/actor/d_a_itembase.cpp @@ -39,12 +39,12 @@ BOOL daItemBase_c::CreateItemHeap(const char* resName, s16 resIdx, s16 btkAnm1, } switch (m_itemNo) { - case ARROW_30: + case dItem_ARROW_30_e: mpModelArrow[0] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000002); if (!mpModelArrow[0]) { return FALSE; } - case ARROW_20: + case dItem_ARROW_20_e: mpModelArrow[1] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000002); if (!mpModelArrow[1]) { return FALSE; diff --git a/src/d/actor/d_a_mmusic.cpp b/src/d/actor/d_a_mmusic.cpp index 956d207f..de0a7d41 100644 --- a/src/d/actor/d_a_mmusic.cpp +++ b/src/d/actor/d_a_mmusic.cpp @@ -40,7 +40,7 @@ BOOL daMmusic::Act_c::Macore_is_playing() { dComIfGs_isEventBit(0x2910) || dComIfGs_isEventBit(0x2e02) || dComIfGs_isEventBit(0x1610) || - !dComIfGs_checkGetItem(LV3_SWORD)) + !dComIfGs_checkGetItem(dItem_MASTER_SWORD_2_e)) return FALSE; return TRUE; diff --git a/src/d/actor/d_a_nh.cpp b/src/d/actor/d_a_nh.cpp index 7006f8c1..e5446286 100644 --- a/src/d/actor/d_a_nh.cpp +++ b/src/d/actor/d_a_nh.cpp @@ -204,7 +204,7 @@ BOOL daNh_c::checkBinCatch() { } dComIfGp_getAttention().CatchRequest( - this, FIREFLY_BOTTLE, + this, dItem_FIREFLY_BOTTLE_e, l_HIO.prm.field_0x08, l_HIO.prm.field_0x0c, l_HIO.prm.field_0x10, l_HIO.prm.field_0x3c, 1 diff --git a/src/d/actor/d_a_npc_bs1.cpp b/src/d/actor/d_a_npc_bs1.cpp index 3e1adc25..11a1b131 100644 --- a/src/d/actor/d_a_npc_bs1.cpp +++ b/src/d/actor/d_a_npc_bs1.cpp @@ -362,25 +362,25 @@ void daNpc_Bs1_c::checkOrder() { static u32 daNpc_Bs1_getBuyItemMax(int i_itemCost, int i_itemNo) { int beastIdx; switch (i_itemNo) { - case BOKOBABA_SEED: + case dItem_BOKOBABA_SEED_e: beastIdx = 1; break; - case SKULL_NECKLACE: + case dItem_SKULL_NECKLACE_e: beastIdx = 0; break; - case RED_JELLY: + case dItem_RED_JELLY_e: beastIdx = 4; break; - case GREEN_JELLY: + case dItem_GREEN_JELLY_e: beastIdx = 5; break; - case BLUE_JELLY: + case dItem_BLUE_JELLY_e: beastIdx = 6; break; case dItem_JOY_PENDANT_e: beastIdx = 7; break; - case GOLDEN_FEATHER: + case dItem_GOLDEN_FEATHER_e: beastIdx = 2; break; default: @@ -828,7 +828,7 @@ u16 daNpc_Bs1_c::next_msgStatus(u32* pMsgNo) { fopAcM_seStart(this, JA_SE_SHOP_BOUGHT, 0); mShopItems.hideSelectItem(); dComIfGp_setItemRupeeCount(-rupee); - if(mShopItems.getSelectItemNo() == ESA_BAG) { + if(mShopItems.getSelectItemNo() == dItem_BAIT_BAG_e) { mShopItems.SoldOutItem(mShopItems.mSelectedItemIdx); m76C[mShopItems.mSelectedItemIdx] = 1; } @@ -891,18 +891,18 @@ u16 daNpc_Bs1_c::next_msgStatus(u32* pMsgNo) { mShopItems.hideSelectItem(); dComIfGp_setItemRupeeCount(-rupee); u8 itemNo = mShopItems.getSelectItemNo(); - if(itemNo == EMPTY_BOTTLE || itemNo == dItem_HEART_PIECE_e || itemNo == COLLECT_MAP_30) { + if(itemNo == dItem_EMPTY_BOTTLE_e || itemNo == dItem_HEART_PIECE_e || itemNo == dItem_COLLECT_MAP_30_e) { mShopItems.SoldOutItem(mShopItems.mSelectedItemIdx); m76C[mShopItems.mSelectedItemIdx] = 1; switch(itemNo) { - case EMPTY_BOTTLE: + case dItem_EMPTY_BOTTLE_e: dComIfGs_onEventBit(0x2020); break; case dItem_HEART_PIECE_e: dComIfGs_onEventBit(0x2010); break; - case COLLECT_MAP_30: + case dItem_COLLECT_MAP_30_e: dComIfGs_onEventBit(0x2008); break; } @@ -988,25 +988,25 @@ u32 daNpc_Bs1_c::getMsg() { if(isEmono(itemNo)) { m840 = itemNo; switch(itemNo) { - case BOKOBABA_SEED: + case dItem_BOKOBABA_SEED_e: msgNo = 0xF78; break; - case SKULL_NECKLACE: + case dItem_SKULL_NECKLACE_e: msgNo = 0xF80; break; - case RED_JELLY: + case dItem_RED_JELLY_e: msgNo = 0xF85; break; - case GREEN_JELLY: + case dItem_GREEN_JELLY_e: msgNo = 0xF8A; break; - case BLUE_JELLY: + case dItem_BLUE_JELLY_e: msgNo = 0xF8F; break; case dItem_JOY_PENDANT_e: msgNo = 0xF94; break; - case GOLDEN_FEATHER: + case dItem_GOLDEN_FEATHER_e: msgNo = 0xF99; break; default: @@ -1470,7 +1470,7 @@ void daNpc_Bs1_c::createShopList() { for(int i = 0; i < 3; i++) { u8 itemNo = pDataSet[i]->mpItemData->mItemNo; int idx = i; - if((itemNo == ESA_BAG && dComIfGs_checkGetItem(itemNo)) || (itemNo == dItem_HYOI_PEAR_e && dComIfGs_checkGetItem(dItem_BOMB_BAG_e))) { + if((itemNo == dItem_BAIT_BAG_e && dComIfGs_checkGetItem(itemNo)) || (itemNo == dItem_HYOI_PEAR_e && dComIfGs_checkGetItem(dItem_BOMB_BAG_e))) { itemNo = pDataSet[i + 3][0].mpItemData->mItemNo; idx += 3; } diff --git a/src/d/actor/d_a_npc_ji1.cpp b/src/d/actor/d_a_npc_ji1.cpp index 3f15dbf6..27dd0eb5 100644 --- a/src/d/actor/d_a_npc_ji1.cpp +++ b/src/d/actor/d_a_npc_ji1.cpp @@ -1242,7 +1242,7 @@ void daNpc_Ji1_c::createItem() { u8 itemNo; if(field_0xD7C) { - itemNo = SWORD; + itemNo = dItem_SWORD_e; } else if(field_0xD7B == 1) { itemNo = dItem_HURRICANE_SPIN_e; @@ -2588,15 +2588,15 @@ BOOL daNpc_Ji1_c::battleAction(void*) { if(field_0xC78 == 0) { u8 icon; switch(dComIfGs_getSelectEquip(0)) { - case SWORD: + case dItem_SWORD_e: icon = 1; break; icon = 2; break; - case LV3_SWORD: + case dItem_MASTER_SWORD_2_e: icon = 2; break; - case MASTER_SWORD: + case dItem_MASTER_SWORD_1_e: default: icon = 2; break; diff --git a/src/d/actor/d_a_npc_md.cpp b/src/d/actor/d_a_npc_md.cpp index 8cf6de85..d8e1fbc6 100644 --- a/src/d/actor/d_a_npc_md.cpp +++ b/src/d/actor/d_a_npc_md.cpp @@ -329,17 +329,17 @@ s16 daNpc_Md_c::XyCheckCB(int i_itemBtn) { if (selectItemNo == dItem_WIND_WAKER_e) { return TRUE; } - if (selectItemNo == GOLDEN_FEATHER) { + if (selectItemNo == dItem_GOLDEN_FEATHER_e) { if (!dComIfGs_isEventBit(0x2E40) || (dComIfGs_isEventBit(0x2E40) && m_seaTalk)) { return TRUE; } } } else if (isTypeM_Dai() || isTypeEdaichi()) { - if (selectItemNo == GOLDEN_FEATHER && !dComIfGs_isEventBit(0x3B80)) { + if (selectItemNo == dItem_GOLDEN_FEATHER_e && !dComIfGs_isEventBit(0x3B80)) { return TRUE; } } - if (selectItemNo == GOLDEN_FEATHER) { + if (selectItemNo == dItem_GOLDEN_FEATHER_e) { dComIfGs_onEventBit(0x2C08); } return FALSE; @@ -356,7 +356,7 @@ s16 daNpc_Md_c::XyEventCB(int i_itemBtn) { if (selectItemNo == dItem_WIND_WAKER_e) { offDefaultTalkXY(); return mEventIdxTable[5]; - } else if (selectItemNo == GOLDEN_FEATHER) { + } else if (selectItemNo == dItem_GOLDEN_FEATHER_e) { onDefaultTalkXY(); } return -1; diff --git a/src/d/actor/d_a_npc_nz.cpp b/src/d/actor/d_a_npc_nz.cpp index e69578e2..abf596dc 100644 --- a/src/d/actor/d_a_npc_nz.cpp +++ b/src/d/actor/d_a_npc_nz.cpp @@ -206,7 +206,7 @@ daNpc_Nz_HIO_c::daNpc_Nz_HIO_c() { static s16 daNpc_Nz_XyCheckCB(void* i_actor, int i_itemBtn) { daNpc_Nz_c* i_this = static_cast<daNpc_Nz_c*>(i_actor); - if(dComIfGp_getSelectItem(i_itemBtn) == BIRD_ESA_5) { + if(dComIfGp_getSelectItem(i_itemBtn) == dItem_BIRD_BAIT_5_e) { f32 temp2 = l_HIO.field_0x20; daPy_py_c* player = daPy_getPlayerActorClass(); cXyz temp(player->current.pos); @@ -394,22 +394,22 @@ void daNpc_Nz_c::setMtx() { cXyz temp3 = temp + temp2; switch(field_0x908) { - case BIRD_ESA_5: + case dItem_BIRD_BAIT_5_e: temp4 = -15.0f; break; case dItem_HYOI_PEAR_e: temp4 = -5.0f; break; - case RED_BOTTLE: - case BLUE_BOTTLE: + case dItem_RED_POTION_e: + case dItem_BLUE_POTION_e: temp4 = -5.0f; break; - case BOMB_10: - case BOMB_30: + case dItem_BOMB_10_e: + case dItem_BOMB_30_e: temp4 = -15.0f; break; - case ARROW_10: - case ARROW_30: + case dItem_ARROW_10_e: + case dItem_ARROW_30_e: temp4 = -10.0f; break; } @@ -496,7 +496,7 @@ static u32 daNpcNz_getShopBoughtMsg(u8 itemNo) { return 0x3405; } - if((itemNo == RED_BOTTLE || itemNo == BLUE_BOTTLE) && !dComIfGs_checkEmptyBottle()) { + if((itemNo == dItem_RED_POTION_e || itemNo == dItem_BLUE_POTION_e) && !dComIfGs_checkEmptyBottle()) { return 0x3406; } @@ -508,7 +508,7 @@ static u32 daNpcNz_getShopBoughtMsg(u8 itemNo) { return 0x3407; } - if((itemNo == BIRD_ESA_5 || itemNo == dItem_HYOI_PEAR_e) && !dComIfGs_checkBaitItemEmpty()) { + if((itemNo == dItem_BIRD_BAIT_5_e || itemNo == dItem_HYOI_PEAR_e) && !dComIfGs_checkBaitItemEmpty()) { return 0x3407; } @@ -594,20 +594,20 @@ u16 daNpc_Nz_c::next_msgStatus(u32* pMsgNo) { const u8 itemArr1[4][2] = { { - BIRD_ESA_5, + dItem_BIRD_BAIT_5_e, dItem_HYOI_PEAR_e }, { - RED_BOTTLE, - BLUE_BOTTLE + dItem_RED_POTION_e, + dItem_BLUE_POTION_e }, { - BOMB_10, - BOMB_30 + dItem_BOMB_10_e, + dItem_BOMB_30_e }, { - ARROW_10, - ARROW_30 + dItem_ARROW_10_e, + dItem_ARROW_30_e } }; diff --git a/src/d/actor/d_a_npc_people.cpp b/src/d/actor/d_a_npc_people.cpp index b7e04163..7bef9a33 100644 --- a/src/d/actor/d_a_npc_people.cpp +++ b/src/d/actor/d_a_npc_people.cpp @@ -3713,11 +3713,11 @@ static u32 l_msg_ug2_out_area[] = { static int l_get_item_no[] = { dItem_HEART_PIECE_e, - COLLECT_MAP_20, - COLLECT_MAP_16, + dItem_COLLECT_MAP_20_e, + dItem_COLLECT_MAP_16_e, dItem_HEART_PIECE_e, dItem_HEART_PIECE_e, - COLLECT_MAP_15, + dItem_COLLECT_MAP_15_e, }; struct PsoData { @@ -4116,7 +4116,7 @@ static s32 phase_1(daNpcPeople_c* i_this) { switch(i_this->getNpcNo()) { case 0x6: if(strcmp(dComIfGp_getStartStageName(), "Ocmera") == 0) { - if(dComIfGs_checkGetItem(COLLECT_MAP_20) || arg0 != dComIfGp_getStartStagePoint()) { + if(dComIfGs_checkGetItem(dItem_COLLECT_MAP_20_e) || arg0 != dComIfGp_getStartStagePoint()) { return cPhs_STOP_e; } @@ -4417,7 +4417,7 @@ s32 daNpcPeople_c::createInit() { m_jnt.setParam(mpNpcDat->field_0x04, mpNpcDat->field_0x06, mpNpcDat->field_0x0C, mpNpcDat->field_0x0E, mpNpcDat->field_0x00, mpNpcDat->field_0x02, mpNpcDat->field_0x08, mpNpcDat->field_0x0A, mpNpcDat->field_0x10); if(mNpcType == 0xB && !mbIsNight) { - dComIfGs_checkGetItem(COLLECT_MAP_15); + dComIfGs_checkGetItem(dItem_COLLECT_MAP_15_e); } m79D = mpNpcDat->field_0x5A; @@ -4640,7 +4640,7 @@ bool daNpcPeople_c::_execute() { break; case 0xB: - if(!dComIfGs_checkGetItem(COLLECT_MAP_15) && (m795 & 0x3)) { + if(!dComIfGs_checkGetItem(dItem_COLLECT_MAP_15_e) && (m795 & 0x3)) { m795 &= ~0x3; u8 rand = getRand(8); if(rand == m794) { @@ -6457,7 +6457,7 @@ u16 daNpcPeople_c::next_msgStatus(u32* pMsgNo) { break; case 0x11: if(mpCurrMsg->mSelectNum == 0) { - if(dComIfGs_checkGetItemNum(SKULL_NECKLACE) < 3) { + if(dComIfGs_checkGetItemNum(dItem_SKULL_NECKLACE_e) < 3) { m734 = l_msg_xy_sa5_yes_ng; } else { @@ -6562,7 +6562,7 @@ u32 daNpcPeople_c::getMsg() { else if(!isColor()) { m734 = l_msg_xy_ub4_no_color; } - else if(!dComIfGs_checkGetItem(COLLECT_MAP_16)) { + else if(!dComIfGs_checkGetItem(dItem_COLLECT_MAP_16_e)) { m734 = l_msg_xy_ub4_get_item; dComIfGs_onEventBit(0x2504); } @@ -6628,7 +6628,7 @@ u32 daNpcPeople_c::getMsg() { msgNo = 0x2D63; break; case 0x10: - if(itemNo != SKULL_NECKLACE) { + if(itemNo != dItem_SKULL_NECKLACE_e) { m734 = l_msg_xy_sa5_no_skull_necklace; } else if(!dComIfGs_isEventBit(0x2620)) { @@ -6897,7 +6897,7 @@ u32 daNpcPeople_c::getMsg() { else if(!dComIfGs_isEventBit(0x2310)) { m734 = l_msg_um3_no_nazo_talk; } - else if(dComIfGs_checkGetItem(COLLECT_MAP_15)) { + else if(dComIfGs_checkGetItem(dItem_COLLECT_MAP_15_e)) { m734 = l_msg_um3_map15; } else { @@ -6911,7 +6911,7 @@ u32 daNpcPeople_c::getMsg() { else if(!dComIfGs_isEventBit(0x2308)) { m734 = l_msg_um3_no_look_moon; } - else if(dComIfGs_checkGetItem(COLLECT_MAP_15) && dComIfGs_isEventBit(0x2280)) { + else if(dComIfGs_checkGetItem(dItem_COLLECT_MAP_15_e) && dComIfGs_isEventBit(0x2280)) { m734 = l_msg_um3_map15_n; } else { @@ -7720,7 +7720,7 @@ void daNpcPeople_c::setWaitAnm() { if(mNpcType == 5 && m789 != 0) { setAnmTbl(l_npc_anm_wait, 0); } - else if(mNpcType == 0xB && !mbIsNight && dComIfGs_checkGetItem(COLLECT_MAP_15)) { + else if(mNpcType == 0xB && !mbIsNight && dComIfGs_checkGetItem(dItem_COLLECT_MAP_15_e)) { setAnmTbl(l_npc_anm_um3_wait3, 1); } else if(mNpcType == 8 && m793 == 1) { @@ -7771,7 +7771,7 @@ s16 daNpcPeople_c::XyCheckCB(int i_itemBtn) { break; case 0xB: - if(!mbIsNight && isPhoto(itemNo) && dComIfGs_isEventBit(0x2310) && !dComIfGs_checkGetItem(COLLECT_MAP_15)) { + if(!mbIsNight && isPhoto(itemNo) && dComIfGs_isEventBit(0x2310) && !dComIfGs_checkGetItem(dItem_COLLECT_MAP_15_e)) { return true; } @@ -7810,7 +7810,7 @@ s16 daNpcPeople_c::XyEventCB(int i_itemBtn) { break; case 0x10: - if(itemNo == SKULL_NECKLACE) { + if(itemNo == dItem_SKULL_NECKLACE_e) { ret = m766[0]; m79C = 0; @@ -8008,7 +8008,7 @@ BOOL daNpcPeople_c::chkEndEvent() { /* 000090D0-00009100 .text is1GetMap20__13daNpcPeople_cFv */ BOOL daNpcPeople_c::is1GetMap20() { - return dComIfGs_checkGetItem(COLLECT_MAP_20) ? TRUE : FALSE; + return dComIfGs_checkGetItem(dItem_COLLECT_MAP_20_e) ? TRUE : FALSE; } /* 00009100-00009144 .text is1DayGetMap20__13daNpcPeople_cFv */ diff --git a/src/d/actor/d_a_obj_barrier.cpp b/src/d/actor/d_a_obj_barrier.cpp index 1a751bd3..d0c16fc7 100644 --- a/src/d/actor/d_a_obj_barrier.cpp +++ b/src/d/actor/d_a_obj_barrier.cpp @@ -230,7 +230,7 @@ void daObjBarrier_c::break_start_wait_proc() { daPy_py_c* player_p = (daPy_py_c*)daPy_getPlayerActorClass(); if ((player_p->current.pos - current.pos).absXZ() >= 8800.0f && - dComIfGs_getSelectEquip(0) == MASTER_SWORD_EX) + dComIfGs_getSelectEquip(0) == dItem_MASTER_SWORD_3_e) { switch (player_p->getCutType()) { case 1: diff --git a/src/d/actor/d_a_obj_toripost.cpp b/src/d/actor/d_a_obj_toripost.cpp index eab2cb52..05da7094 100644 --- a/src/d/actor/d_a_obj_toripost.cpp +++ b/src/d/actor/d_a_obj_toripost.cpp @@ -25,19 +25,19 @@ extern dScnPly_reg_HIO_c g_regHIO; const char daObjTpost_c::m_arc_name[] = "Toripost"; const daObjTpost_c__letter_data daObjTpost_c::m_letter[] = { - {false, 0x1AAF, dItem_HEART_PIECE_e, dSv_evtBit_c::LETTER_BAITOS_MOM}, - {false, 0x0CF9, dItem_HEART_PIECE_e, dSv_evtBit_c::LETTER_KOMALIS_FATHER}, - {false, 0x0CFA, COLLECT_MAP_60, dSv_evtBit_c::LETTER_BOMBS_AD}, - {false, 0x0CFC, dItem_RED_RUPEE_e, dSv_evtBit_c::LETTER_ORCA}, - {false, 0x0805, dItem_RED_RUPEE_e, dSv_evtBit_c::LETTER_GRANDMA}, - {false, 0x0CFD, dItem_GREEN_RUPEE_e, dSv_evtBit_c::LETTER_ROCK_SPIRE_SHOP_AD}, - {true, 0x0DB6, COLLECT_MAP_52, dSv_evtBit_c::LETTER_TINGLE}, - {false, 0x1148, dItem_RED_RUPEE_e, dSv_evtBit_c::LETTER_ARYLL}, - {false, 0x1AAF, dItem_HEART_PIECE_e, dSv_evtBit_c::LETTER_BAITOS_MOM}, - {true, 0x0F76, KAISEN_PRESENT1, dSv_evtBit_c::LETTER_SILVER_MEMBERSHIP}, - {false, 0x19A6, KAKERA_HEART2, dSv_evtBit_c::LETTER_HOSKITS_GIRLFRIEND}, - {true, 0x0CFB, dItem_RED_RUPEE_e, dSv_evtBit_c::LETTER_BAITO}, - {true, 0x0F77, KAISEN_PRESENT2, dSv_evtBit_c::LETTER_GOLD_MEMBERSHIP}, + {false, 0x1AAF, dItem_HEART_PIECE_e, dSv_evtBit_c::LETTER_BAITOS_MOM}, + {false, 0x0CF9, dItem_HEART_PIECE_e, dSv_evtBit_c::LETTER_KOMALIS_FATHER}, + {false, 0x0CFA, dItem_COLLECT_MAP_60_e, dSv_evtBit_c::LETTER_BOMBS_AD}, + {false, 0x0CFC, dItem_RED_RUPEE_e, dSv_evtBit_c::LETTER_ORCA}, + {false, 0x0805, dItem_RED_RUPEE_e, dSv_evtBit_c::LETTER_GRANDMA}, + {false, 0x0CFD, dItem_GREEN_RUPEE_e, dSv_evtBit_c::LETTER_ROCK_SPIRE_SHOP_AD}, + {true, 0x0DB6, dItem_COLLECT_MAP_52_e, dSv_evtBit_c::LETTER_TINGLE}, + {false, 0x1148, dItem_RED_RUPEE_e, dSv_evtBit_c::LETTER_ARYLL}, + {false, 0x1AAF, dItem_HEART_PIECE_e, dSv_evtBit_c::LETTER_BAITOS_MOM}, + {true, 0x0F76, KAISEN_PRESENT1, dSv_evtBit_c::LETTER_SILVER_MEMBERSHIP}, + {false, 0x19A6, KAKERA_HEART2, dSv_evtBit_c::LETTER_HOSKITS_GIRLFRIEND}, + {true, 0x0CFB, dItem_RED_RUPEE_e, dSv_evtBit_c::LETTER_BAITO}, + {true, 0x0F77, KAISEN_PRESENT2, dSv_evtBit_c::LETTER_GOLD_MEMBERSHIP}, }; const dCcD_SrcCyl daObjTpost_c::m_cyl_src = { diff --git a/src/d/actor/d_a_player_main.cpp b/src/d/actor/d_a_player_main.cpp index ed9d1b74..243a9e74 100644 --- a/src/d/actor/d_a_player_main.cpp +++ b/src/d/actor/d_a_player_main.cpp @@ -954,7 +954,7 @@ BOOL daPy_lk_c::draw() { if (checkFreezeState() && checkMaskDraw()) { entryDLSetLight(mpYamuModel, mNoResetFlg1 & daPyFlg1_FREEZE_STATE); } - if (dComIfGs_getSelectEquip(2) == PWR_GROOVE) { + if (dComIfGs_getSelectEquip(2) == dItem_POWER_BRACELETS_e) { entryDLSetLight(mpPringModel, mNoResetFlg1 & daPyFlg1_FREEZE_STATE); } if (checkMasterSwordEquip() && !checkCaughtShapeHide() && !checkDemoShieldNoDraw()) { @@ -1014,7 +1014,7 @@ BOOL daPy_lk_c::draw() { } entryDLSetLight(mpEquipItemModel, mNoResetFlg1 & daPyFlg1_FREEZE_STATE); if (mpSwordModel1 != NULL) { - if (checkChanceMode() || checkNoResetFlg1(daPyFlg1_UNK8000) || dComIfGs_getSelectEquip(0) == MASTER_SWORD_EX) { + if (checkChanceMode() || checkNoResetFlg1(daPyFlg1_UNK8000) || dComIfGs_getSelectEquip(0) == dItem_MASTER_SWORD_3_e) { updateDLSetLight(mpSwordModel1, 0); } } @@ -1575,7 +1575,7 @@ void daPy_lk_c::makeItemType() { } else if (mEquipItem == dItem_SKULL_HAMMER_e) { setHammerModel(); return; - } else if (mEquipItem == EMPTY_BOTTLE) { + } else if (mEquipItem == dItem_EMPTY_BOTTLE_e) { setBottleModel(mEquipItem); return; } else { @@ -1655,8 +1655,8 @@ BOOL daPy_lk_c::checkItemChangeFromButton() { return procBootsEquip_init(dItem_IRON_BOOTS_e); } else if (checkSetItemTrigger(daPyItem_DRINK_BOTTLE_e, 0)) { return procBottleDrink_init(dComIfGp_getSelectItem(mReadyItemBtn)); - } else if (checkSetItemTrigger(FAIRY_BOTTLE, 0)) { - return procBottleOpen_init(FAIRY_BOTTLE); + } else if (checkSetItemTrigger(dItem_FAIRY_BOTTLE_e, 0)) { + return procBottleOpen_init(dItem_FAIRY_BOTTLE_e); } else if (doTrigger()) { if (dComIfGp_getDoStatus() == 0x08) { // A button shows "Put Away" setAnimeUnequip(); @@ -1753,7 +1753,7 @@ BOOL daPy_lk_c::setDamagePoint(f32 amount) { dComIfGp_setItemLifeCount(amount); if (amount < 0.0f) { offNoResetFlg1(daPyFlg1_UNK8000); - if (dComIfGs_getSelectEquip(0) != MASTER_SWORD_EX) { + if (dComIfGs_getSelectEquip(0) != dItem_MASTER_SWORD_3_e) { offNoResetFlg1(daPyFlg1_UNK200000); } } @@ -2058,17 +2058,17 @@ BOOL daPy_lk_c::checkHeavyStateOn() { /* 80111F5C-80111F7C .text checkBottleItem__9daPy_lk_cCFi */ BOOL daPy_lk_c::checkBottleItem(int itemNo) const { - return itemNo >= EMPTY_BOTTLE && itemNo <= UNK_BOTTLE_60; + return itemNo >= dItem_EMPTY_BOTTLE_e && itemNo <= UNK_BOTTLE_60; } /* 80111F7C-80111FEC .text checkDrinkBottleItem__9daPy_lk_cCFi */ BOOL daPy_lk_c::checkDrinkBottleItem(int itemNo) const { - return itemNo == RED_BOTTLE || itemNo == GREEN_BOTTLE || itemNo == BLUE_BOTTLE || itemNo == dItem_SOUP_BOTTLE_e || itemNo == dItem_HALF_SOUP_BOTTLE_e; + return itemNo == dItem_RED_POTION_e || itemNo == dItem_GREEN_POTION_e || itemNo == dItem_BLUE_POTION_e || itemNo == dItem_SOUP_BOTTLE_e || itemNo == dItem_HALF_SOUP_BOTTLE_e; } /* 80111FEC-8011201C .text checkOpenBottleItem__9daPy_lk_cCFi */ BOOL daPy_lk_c::checkOpenBottleItem(int itemNo) const { - return itemNo == FIREFLY_BOTTLE || itemNo == BIN_IN_WATER || itemNo == FWATER_BOTTLE || itemNo == FAIRY_BOTTLE; + return itemNo == dItem_FIREFLY_BOTTLE_e || itemNo == dItem_WATER_BOTTLE_e || itemNo == dItem_FOREST_WATER_e || itemNo == dItem_FAIRY_BOTTLE_e; } /* 8011201C-80112044 .text checkBowItem__9daPy_lk_cCFi */ @@ -3269,11 +3269,11 @@ BOOL daPy_lk_c::execute() { return TRUE; } - if (dComIfGs_checkBottle(FWATER_BOTTLE)) { + if (dComIfGs_checkBottle(dItem_FOREST_WATER_e)) { if (dComIfGs_getFwaterTimer() == 0) { if (dComIfGp_event_compulsory(this)) { onNoResetFlg1(daPyFlg1_UNK200); - dComIfGs_setBottleItemIn(FWATER_BOTTLE, BIN_IN_WATER); + dComIfGs_setBottleItemIn(dItem_FOREST_WATER_e, dItem_WATER_BOTTLE_e); mDemo.setDemoType(5); m3628 = fpcM_ERROR_PROCESS_ID_e; if (mCurProc == daPyProc_SCOPE_e) { diff --git a/src/d/actor/d_a_rd.cpp b/src/d/actor/d_a_rd.cpp index d4166db7..4914d4b1 100644 --- a/src/d/actor/d_a_rd.cpp +++ b/src/d/actor/d_a_rd.cpp @@ -1574,7 +1574,7 @@ bool daRd_c::_execute() { return true; } - fopAcM_setGbaName(this, MIRROR_SHIELD, 0x12, 0x30); + fopAcM_setGbaName(this, dItem_MIRROR_SHIELD_e, 0x12, 0x30); setIceCollision(); if (mMode != MODE_SILENT_PRAY && mMode != MODE_DEATH && mMode != MODE_DAMAGE && mMode != MODE_ATTACK && mMode != MODE_CRY && mMode != MODE_CRY_WAIT) diff --git a/src/d/actor/d_a_spc_item01.cpp b/src/d/actor/d_a_spc_item01.cpp index 5ff5545a..2a74e475 100644 --- a/src/d/actor/d_a_spc_item01.cpp +++ b/src/d/actor/d_a_spc_item01.cpp @@ -77,7 +77,7 @@ BOOL daSpcItem01_c::_delete() { s32 daSpcItem01_c::_create() { fopAcM_SetupActor(this, daSpcItem01_c); m_itemNo = daSpcItem01_prm::getItemNo(this); - if (m_itemNo == SHIELD && dComIfGs_isEventBit(0xE20)) { + if (m_itemNo == dItem_SHIELD_e && dComIfGs_isEventBit(0xE20)) { setLoadError(); return cPhs_ERROR_e; } @@ -114,7 +114,7 @@ BOOL daSpcItem01_c::CreateInit() { field_0x644 = daSpcItem01_prm::getFlag(this); fopAcM_SetGravity(this, -4.0f); switch ((s8)m_itemNo) { - case SHIELD: + case dItem_SHIELD_e: scale.x = 1.5f; scale.y = 1.5f; scale.z = 1.5f; @@ -173,7 +173,7 @@ void daSpcItem01_c::move() { fopAcM_posMoveF(this, mStts.GetCCMoveP()); mAcch.CrrPos(*dComIfG_Bgsp()); switch (m_itemNo) { - case SHIELD: + case dItem_SHIELD_e: break; case dItem_JOY_PENDANT_e: if (mAcch.ChkGroundLanding()) { diff --git a/src/d/d_a_race_item_static.cpp b/src/d/d_a_race_item_static.cpp index 7182bea9..79989b36 100644 --- a/src/d/d_a_race_item_static.cpp +++ b/src/d/d_a_race_item_static.cpp @@ -86,19 +86,19 @@ void daRaceItem_c::normalItemGet() { case dItem_SILVER_RUPEE_e: mDoAud_seStart(JA_SE_RED_LUPY_GET); break; - case S_MAGIC: + case dItem_SMALL_MAGIC_e: mDoAud_seStart(JA_SE_MAGIC_POT_GET_S); break; - case L_MAGIC: + case dItem_LARGE_MAGIC_e: mDoAud_seStart(JA_SE_MAGIC_POT_GET_L); break; - case BOMB_5: - case BOMB_10: - case BOMB_20: - case BOMB_30: - case ARROW_10: - case ARROW_20: - case ARROW_30: + case dItem_BOMB_5_e: + case dItem_BOMB_10_e: + case dItem_BOMB_20_e: + case dItem_BOMB_30_e: + case dItem_ARROW_10_e: + case dItem_ARROW_20_e: + case dItem_ARROW_30_e: mDoAud_seStart(JA_SE_CONSUMP_ITEM_GET); break; case dItem_TRIPLE_HEART_e: diff --git a/src/d/d_com_inf_game.cpp b/src/d/d_com_inf_game.cpp index f2a081a7..11d04f3d 100644 --- a/src/d/d_com_inf_game.cpp +++ b/src/d/d_com_inf_game.cpp @@ -810,12 +810,12 @@ u8 dComIfGs_checkGetItem(u8 i_itemNo) { get_item = 1; } break; - case PIRATES_OMAMORI: + case dItem_PIRATES_CHARM_e: if (dComIfGs_isCollect(3, 0)) { get_item = 1; } break; - case HEROS_OMAMORI: + case dItem_HEROS_CHARM_e: if (dComIfGs_isCollect(4, 0)) { get_item = 1; } @@ -934,12 +934,12 @@ u8 dComIfGs_checkGetItemNum(u8 i_itemNo) { get_item = 1; } break; - case PIRATES_OMAMORI: + case dItem_PIRATES_CHARM_e: if (dComIfGs_isCollect(3, 0)) { get_item = 1; } break; - case HEROS_OMAMORI: + case dItem_HEROS_CHARM_e: if (dComIfGs_isCollect(4, 0)) { get_item = 1; } @@ -954,23 +954,23 @@ u8 dComIfGs_checkGetItemNum(u8 i_itemNo) { get_item = dComIfGs_getBombNum(); } break; - case SKULL_NECKLACE: + case dItem_SKULL_NECKLACE_e: for (int i = 0; i < 8; i++) { - if (dComIfGs_getBeast(i) == SKULL_NECKLACE) { + if (dComIfGs_getBeast(i) == dItem_SKULL_NECKLACE_e) { get_item = dComIfGs_getBeastNum(0); } } break; - case BOKOBABA_SEED: + case dItem_BOKOBABA_SEED_e: for (int i = 0; i < 8; i++) { - if (dComIfGs_getBeast(i) == BOKOBABA_SEED) { + if (dComIfGs_getBeast(i) == dItem_BOKOBABA_SEED_e) { get_item = dComIfGs_getBeastNum(1); } } break; - case GOLDEN_FEATHER: + case dItem_GOLDEN_FEATHER_e: for (int i = 0; i < 8; i++) { - if (dComIfGs_getBeast(i) == GOLDEN_FEATHER) { + if (dComIfGs_getBeast(i) == dItem_GOLDEN_FEATHER_e) { get_item = dComIfGs_getBeastNum(2); } } @@ -982,23 +982,23 @@ u8 dComIfGs_checkGetItemNum(u8 i_itemNo) { } } break; - case RED_JELLY: + case dItem_RED_JELLY_e: for (int i = 0; i < 8; i++) { - if (dComIfGs_getBeast(i) == RED_JELLY) { + if (dComIfGs_getBeast(i) == dItem_RED_JELLY_e) { get_item = dComIfGs_getBeastNum(4); } } break; - case GREEN_JELLY: + case dItem_GREEN_JELLY_e: for (int i = 0; i < 8; i++) { - if (dComIfGs_getBeast(i) == GREEN_JELLY) { + if (dComIfGs_getBeast(i) == dItem_GREEN_JELLY_e) { get_item = dComIfGs_getBeastNum(5); } } break; - case BLUE_JELLY: + case dItem_BLUE_JELLY_e: for (int i = 0; i < 8; i++) { - if (dComIfGs_getBeast(i) == BLUE_JELLY) { + if (dComIfGs_getBeast(i) == dItem_BLUE_JELLY_e) { get_item = dComIfGs_getBeastNum(6); } } @@ -1601,32 +1601,32 @@ void dComIfGs_setSelectEquip(int i_type, u8 i_itemNo) { switch (i_type) { case 0: switch (i_itemNo) { - case SWORD: + case dItem_SWORD_e: dComIfGs_onCollect(i_type, 0); break; - case MASTER_SWORD: + case dItem_MASTER_SWORD_1_e: dComIfGs_onCollect(i_type, 1); break; - case LV3_SWORD: + case dItem_MASTER_SWORD_2_e: dComIfGs_onCollect(i_type, 2); break; - case MASTER_SWORD_EX: + case dItem_MASTER_SWORD_3_e: dComIfGs_onCollect(i_type, 3); break; } break; case 1: switch (i_itemNo) { - case SHIELD: + case dItem_SHIELD_e: dComIfGs_onCollect(i_type, 0); break; - case MIRROR_SHIELD: + case dItem_MIRROR_SHIELD_e: dComIfGs_onCollect(i_type, 1); break; } break; case 2: - if (i_itemNo == PWR_GROOVE) { + if (i_itemNo == dItem_POWER_BRACELETS_e) { dComIfGs_onCollect(i_type, 0); } break; diff --git a/src/d/d_item.cpp b/src/d/d_item.cpp index 9710818d..4e553631 100644 --- a/src/d/d_item.cpp +++ b/src/d/d_item.cpp @@ -611,7 +611,7 @@ void item_func_l_magic() { /* 800C3008-800C3060 .text item_func_bomb_5__Fv */ void item_func_bomb_5() { dComIfGs_onGetItem(dInvSlot_BOMB_e, 0); - dComIfGp_setItem(dInvSlot_BOMB_e, BOMB_5); + dComIfGp_setItem(dInvSlot_BOMB_e, dItem_BOMB_5_e); dComIfGp_setItemBombNumCount(5); } @@ -708,8 +708,8 @@ void item_func_camera() { /* 800C3368-800C33AC .text item_func_emono_bag__Fv */ void item_func_emono_bag() { - dComIfGs_onGetItem(dInvSlot_EMONO_BAG_e, 0); - dComIfGs_setItem(dInvSlot_EMONO_BAG_e, EMONO_BAG); + dComIfGs_onGetItem(dInvSlot_SPOILS_BAG_e, 0); + dComIfGs_setItem(dInvSlot_SPOILS_BAG_e, dItem_SPOILS_BAG_e); } /* 800C33AC-800C33F0 .text item_func_rope__Fv */ @@ -735,7 +735,7 @@ void item_func_bow() { /* 800C3484-800C34C4 .text item_func_pwr_groove__Fv */ void item_func_pwr_groove() { dComIfGs_onCollect(0x2, 0); - dComIfGs_setSelectEquip(0x2, PWR_GROOVE); + dComIfGs_setSelectEquip(0x2, dItem_POWER_BRACELETS_e); } /* 800C34C4-800C3508 .text item_func_hvy_boots__Fv */ @@ -756,8 +756,8 @@ void item_func_water_boots() { /* 800C3550-800C3594 .text item_func_esa_bag__Fv */ void item_func_esa_bag() { - dComIfGs_onGetItem(dInvSlot_ESA_BAG_e, 0); - dComIfGs_setItem(dInvSlot_ESA_BAG_e, ESA_BAG); + dComIfGs_onGetItem(dInvSlot_BAIT_BAG_e, 0); + dComIfGs_setItem(dInvSlot_BAIT_BAG_e, dItem_BAIT_BAG_e); } /* 800C3594-800C35D8 .text item_func_boomerang__Fv */ @@ -842,43 +842,43 @@ void item_func_light_arrow() { /* 800C3AD4-800C3B14 .text item_func_sword__Fv */ void item_func_sword() { dComIfGs_onCollect(0x0, 0); - dComIfGs_setSelectEquip(0x0, SWORD); + dComIfGs_setSelectEquip(0x0, dItem_SWORD_e); } /* 800C3B14-800C3B54 .text item_func_master_sword__Fv */ void item_func_master_sword() { dComIfGs_onCollect(0x0, 1); - dComIfGs_setSelectEquip(0x0, MASTER_SWORD); + dComIfGs_setSelectEquip(0x0, dItem_MASTER_SWORD_1_e); } /* 800C3B54-800C3B94 .text item_func_lv3_sword__Fv */ void item_func_lv3_sword() { dComIfGs_onCollect(0x0, 2); - dComIfGs_setSelectEquip(0x0, LV3_SWORD); + dComIfGs_setSelectEquip(0x0, dItem_MASTER_SWORD_2_e); } /* 800C3B94-800C3BD4 .text item_func_shield__Fv */ void item_func_shield() { dComIfGs_onCollect(0x1, 0); - dComIfGs_setSelectEquip(0x1, SHIELD); + dComIfGs_setSelectEquip(0x1, dItem_SHIELD_e); } /* 800C3BD4-800C3C14 .text item_func_mirror_shield__Fv */ void item_func_mirror_shield() { dComIfGs_onCollect(0x1, 1); - dComIfGs_setSelectEquip(0x1, MIRROR_SHIELD); + dComIfGs_setSelectEquip(0x1, dItem_MIRROR_SHIELD_e); } /* 800C3C14-800C3C54 .text item_func_dropped_sword__Fv */ void item_func_dropped_sword() { dComIfGs_onCollect(0x0, 0); - dComIfGs_setSelectEquip(0x0, SWORD); + dComIfGs_setSelectEquip(0x0, dItem_SWORD_e); } /* 800C3C54-800C3C94 .text item_func_master_sword_ex__Fv */ void item_func_master_sword_ex() { dComIfGs_onCollect(0x0, 3); - dComIfGs_setSelectEquip(0x0, MASTER_SWORD_EX); + dComIfGs_setSelectEquip(0x0, dItem_MASTER_SWORD_3_e); } /* 800C3C94-800C3CC8 .text item_func_pirates_omamori__Fv */ @@ -897,21 +897,21 @@ void item_func_grass_ball() { /* 800C3D00-800C3D58 .text item_func_skull_necklace__Fv */ void item_func_skull_necklace() { - dComIfGs_setBeastItem(SKULL_NECKLACE); + dComIfGs_setBeastItem(dItem_SKULL_NECKLACE_e); dComIfGs_onGetItemBeast(0x0); dComIfGp_setItemBeastNumCount(0x0, 1); } /* 800C3D58-800C3DB0 .text item_func_bokobaba_seed__Fv */ void item_func_bokobaba_seed() { - dComIfGs_setBeastItem(BOKOBABA_SEED); + dComIfGs_setBeastItem(dItem_BOKOBABA_SEED_e); dComIfGs_onGetItemBeast(0x1); dComIfGp_setItemBeastNumCount(0x1, 1); } /* 800C3DB0-800C3E08 .text item_func_golden_feather__Fv */ void item_func_golden_feather() { - dComIfGs_setBeastItem(GOLDEN_FEATHER); + dComIfGs_setBeastItem(dItem_GOLDEN_FEATHER_e); dComIfGs_onGetItemBeast(0x2); dComIfGp_setItemBeastNumCount(0x2, 1); } @@ -925,21 +925,21 @@ void item_func_boko_belt() { /* 800C3E60-800C3EB8 .text item_func_red_jerry__Fv */ void item_func_red_jerry() { - dComIfGs_setBeastItem(RED_JELLY); + dComIfGs_setBeastItem(dItem_RED_JELLY_e); dComIfGs_onGetItemBeast(0x4); dComIfGp_setItemBeastNumCount(0x4, 1); } /* 800C3EB8-800C3F10 .text item_func_green_jerry__Fv */ void item_func_green_jerry() { - dComIfGs_setBeastItem(GREEN_JELLY); + dComIfGs_setBeastItem(dItem_GREEN_JELLY_e); dComIfGs_onGetItemBeast(0x5); dComIfGp_setItemBeastNumCount(0x5, 1); } /* 800C3F10-800C3F68 .text item_func_blue_jerry__Fv */ void item_func_blue_jerry() { - dComIfGs_setBeastItem(BLUE_JELLY); + dComIfGs_setBeastItem(dItem_BLUE_JELLY_e); dComIfGs_onGetItemBeast(0x6); dComIfGp_setItemBeastNumCount(0x6, 1); } @@ -967,25 +967,25 @@ void item_func_empty_bship() { /* 800C4028-800C4068 .text item_func_empty_bottle__Fv */ void item_func_empty_bottle() { dComIfGs_setEmptyBottle(); - dComIfGs_onGetBottleItem(EMPTY_BOTTLE); + dComIfGs_onGetBottleItem(dItem_EMPTY_BOTTLE_e); } /* 800C4068-800C40AC .text item_func_red_bottle__Fv */ void item_func_red_bottle() { - dComIfGs_setEmptyBottleItemIn(RED_BOTTLE); - dComIfGs_onGetBottleItem(RED_BOTTLE); + dComIfGs_setEmptyBottleItemIn(dItem_RED_POTION_e); + dComIfGs_onGetBottleItem(dItem_RED_POTION_e); } /* 800C40AC-800C40F0 .text item_func_green_bottle__Fv */ void item_func_green_bottle() { - dComIfGs_setEmptyBottleItemIn(GREEN_BOTTLE); - dComIfGs_onGetBottleItem(GREEN_BOTTLE); + dComIfGs_setEmptyBottleItemIn(dItem_GREEN_POTION_e); + dComIfGs_onGetBottleItem(dItem_GREEN_POTION_e); } /* 800C40F0-800C4134 .text item_func_blue_bottle__Fv */ void item_func_blue_bottle() { - dComIfGs_setEmptyBottleItemIn(BLUE_BOTTLE); - dComIfGs_onGetBottleItem(BLUE_BOTTLE); + dComIfGs_setEmptyBottleItemIn(dItem_BLUE_POTION_e); + dComIfGs_onGetBottleItem(dItem_BLUE_POTION_e); } /* 800C4134-800C4164 .text item_func_bottleship__Fv */ @@ -1000,22 +1000,22 @@ void item_func_soup_bottle() { /* 800C4194-800C41C4 .text item_func_bin_in_water__Fv */ void item_func_bin_in_water() { - dComIfGs_onGetBottleItem(BIN_IN_WATER); + dComIfGs_onGetBottleItem(dItem_WATER_BOTTLE_e); } /* 800C41C4-800C41F4 .text item_func_fairy_bottle__Fv */ void item_func_fairy_bottle() { - dComIfGs_onGetBottleItem(FAIRY_BOTTLE); + dComIfGs_onGetBottleItem(dItem_FAIRY_BOTTLE_e); } /* 800C41F4-800C4224 .text item_func_firefly_bottle__Fv */ void item_func_firefly_bottle() { - dComIfGs_onGetBottleItem(FIREFLY_BOTTLE); + dComIfGs_onGetBottleItem(dItem_FIREFLY_BOTTLE_e); } /* 800C4224-800C4254 .text item_func_fwater_bottle__Fv */ void item_func_fwater_bottle() { - dComIfGs_onGetBottleItem(FWATER_BOTTLE); + dComIfGs_onGetBottleItem(dItem_FOREST_WATER_e); } /* 800C4254-800C4258 .text item_func_bin__Fv */ @@ -1152,7 +1152,7 @@ void item_func_triforce_map8() { /* 800C45E8-800C462C .text item_func_bird_esa_5__Fv */ void item_func_bird_esa_5() { dComIfGs_onGetItemBait(0x0); - dComIfGs_setBaitItem(BIRD_ESA_5); + dComIfGs_setBaitItem(dItem_BIRD_BAIT_5_e); } /* 800C462C-800C4670 .text item_func_animal_esa__Fv */ @@ -2226,22 +2226,22 @@ int item_getcheck_func_empty_bship() { /* 800C6D10-800C6D40 .text item_getcheck_func_empty_bottle__Fv */ int item_getcheck_func_empty_bottle() { - return dComIfGs_isGetBottleItem(EMPTY_BOTTLE); + return dComIfGs_isGetBottleItem(dItem_EMPTY_BOTTLE_e); } /* 800C6D40-800C6D70 .text item_getcheck_func_red_bottle__Fv */ int item_getcheck_func_red_bottle() { - return dComIfGs_isGetBottleItem(RED_BOTTLE); + return dComIfGs_isGetBottleItem(dItem_RED_POTION_e); } /* 800C6D70-800C6DA0 .text item_getcheck_func_green_bottle__Fv */ int item_getcheck_func_green_bottle() { - return dComIfGs_isGetBottleItem(GREEN_BOTTLE); + return dComIfGs_isGetBottleItem(dItem_GREEN_POTION_e); } /* 800C6DA0-800C6DD0 .text item_getcheck_func_blue_bottle__Fv */ int item_getcheck_func_blue_bottle() { - return dComIfGs_isGetBottleItem(BLUE_BOTTLE); + return dComIfGs_isGetBottleItem(dItem_BLUE_POTION_e); } /* 800C6DD0-800C6E00 .text item_getcheck_func_bottleship__Fv */ @@ -2256,12 +2256,12 @@ int item_getcheck_func_bin_in_bottleship() { /* 800C6E30-800C6E60 .text item_getcheck_func_bin_in_water__Fv */ int item_getcheck_func_bin_in_water() { - return dComIfGs_isGetBottleItem(BIN_IN_WATER); + return dComIfGs_isGetBottleItem(dItem_WATER_BOTTLE_e); } /* 800C6E60-800C6E90 .text item_getcheck_func_bin__Fv */ int item_getcheck_func_bin() { - return dComIfGs_isGetBottleItem(FAIRY_BOTTLE); + return dComIfGs_isGetBottleItem(dItem_FAIRY_BOTTLE_e); } /* 800C6E90-800C6EC0 .text item_getcheck_func_triforce1__Fv */ @@ -2634,7 +2634,7 @@ BOOL isDaizaItem(u8 itemNo) { /* 800C7B7C-800C7BA8 .text isBomb__FUc */ BOOL isBomb(u8 itemNo) { BOOL isBomb = FALSE; - if (itemNo == BOMB_5 || itemNo == BOMB_10 || itemNo == BOMB_20 || itemNo == BOMB_30) { + if (itemNo == dItem_BOMB_5_e || itemNo == dItem_BOMB_10_e || itemNo == dItem_BOMB_20_e || itemNo == dItem_BOMB_30_e) { isBomb = TRUE; } return isBomb; @@ -2643,7 +2643,7 @@ BOOL isBomb(u8 itemNo) { /* 800C7BA8-800C7BD4 .text isArrow__FUc */ BOOL isArrow(u8 itemNo) { BOOL isArrow = FALSE; - if (itemNo == ARROW_10 || itemNo == ARROW_20 || itemNo == ARROW_30) { + if (itemNo == dItem_ARROW_10_e || itemNo == dItem_ARROW_20_e || itemNo == dItem_ARROW_30_e) { isArrow = TRUE; } return isArrow; @@ -2652,8 +2652,8 @@ BOOL isArrow(u8 itemNo) { /* 800C7BD4-800C7C08 .text isEmono__FUc */ BOOL isEmono(u8 itemNo) { BOOL isEmono = FALSE; - if (itemNo == dItem_JOY_PENDANT_e || itemNo == SKULL_NECKLACE || itemNo == BOKOBABA_SEED || itemNo == GOLDEN_FEATHER || - itemNo == BOKO_BELT || itemNo == RED_JELLY || itemNo == GREEN_JELLY || itemNo == BLUE_JELLY) + if (itemNo == dItem_JOY_PENDANT_e || itemNo == dItem_SKULL_NECKLACE_e || itemNo == dItem_BOKOBABA_SEED_e || itemNo == dItem_GOLDEN_FEATHER_e || + itemNo == BOKO_BELT || itemNo == dItem_RED_JELLY_e || itemNo == dItem_GREEN_JELLY_e || itemNo == dItem_BLUE_JELLY_e) { isEmono = TRUE; } @@ -2663,7 +2663,7 @@ BOOL isEmono(u8 itemNo) { /* 800C7C08-800C7C34 .text isEsa__FUc */ BOOL isEsa(u8 itemNo) { BOOL isEsa = FALSE; - if (itemNo == BIRD_ESA_5 || itemNo == dItem_HYOI_PEAR_e || itemNo == MAGIC_BEAN) { + if (itemNo == dItem_BIRD_BAIT_5_e || itemNo == dItem_HYOI_PEAR_e || itemNo == MAGIC_BEAN) { isEsa = TRUE; } return isEsa; @@ -2683,7 +2683,7 @@ BOOL isRupee(u8 itemNo) { /* 800C7C60-800C7C7C .text isLimitedItem__FUc */ BOOL isLimitedItem(u8 itemNo) { BOOL isLimited = FALSE; - if (itemNo == BLUE_JELLY) { + if (itemNo == dItem_BLUE_JELLY_e) { isLimited = TRUE; } return isLimited; @@ -2692,8 +2692,8 @@ BOOL isLimitedItem(u8 itemNo) { /* 800C7C7C-800C7CB0 .text isNonSavedEmono__FUc */ BOOL isNonSavedEmono(u8 itemNo) { BOOL isEmono = FALSE; - if (itemNo == dItem_JOY_PENDANT_e || itemNo == SKULL_NECKLACE || itemNo == BOKOBABA_SEED || itemNo == GOLDEN_FEATHER || - itemNo == BOKO_BELT || itemNo == RED_JELLY || itemNo == GREEN_JELLY) // No BLUE_JELLY + if (itemNo == dItem_JOY_PENDANT_e || itemNo == dItem_SKULL_NECKLACE_e || itemNo == dItem_BOKOBABA_SEED_e || itemNo == dItem_GOLDEN_FEATHER_e || + itemNo == BOKO_BELT || itemNo == dItem_RED_JELLY_e || itemNo == dItem_GREEN_JELLY_e) // No dItem_BLUE_JELLY_e { isEmono = TRUE; } @@ -2748,7 +2748,7 @@ u8 getItemNoByLife(u8 itemNo) { /* 800C7D70-800C7ED0 .text check_itemno__Fi */ u8 check_itemno(int itemNo) { - if (dComIfGs_getMaxMagic() == 0 && (itemNo == S_MAGIC || itemNo == L_MAGIC)) { + if (dComIfGs_getMaxMagic() == 0 && (itemNo == dItem_SMALL_MAGIC_e || itemNo == dItem_LARGE_MAGIC_e)) { return dItem_GREEN_RUPEE_e; } if (!dComIfGs_isGetItem(0xC, 0) && !dComIfGs_isGetItem(0xC, 1) && !dComIfGs_isGetItem(0xC, 2)) { @@ -2763,12 +2763,12 @@ u8 check_itemno(int itemNo) { return dItem_GREEN_RUPEE_e; } } - if (!checkItemGet(ESA_BAG, TRUE)) { + if (!checkItemGet(dItem_BAIT_BAG_e, TRUE)) { if (isEsa(itemNo)) { return dItem_GREEN_RUPEE_e; } } - if (!checkItemGet(EMONO_BAG, TRUE)) { + if (!checkItemGet(dItem_SPOILS_BAG_e, TRUE)) { if (isEmono(itemNo)) { return dItem_GREEN_RUPEE_e; } diff --git a/src/d/d_item_data.cpp b/src/d/d_item_data.cpp index 5e00305c..8a7b93f5 100644 --- a/src/d/d_item_data.cpp +++ b/src/d/d_item_data.cpp @@ -733,7 +733,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x2500 }, { - // 0x09: S_MAGIC + // 0x09: dItem_SMALL_MAGIC_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOTTLE_00], /* mBmdIdx */ ALWAYS_BDL_MPODA, @@ -749,7 +749,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x0B80 }, { - // 0x0A: L_MAGIC + // 0x0A: dItem_LARGE_MAGIC_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOTTLE_00], /* mBmdIdx */ ALWAYS_BDL_MPODB, @@ -765,7 +765,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x0B80 }, { - // 0x0B: BOMB_5 + // 0x0B: dItem_BOMB_5_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_BOMB_00], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOMB_00], /* mBmdIdx */ BOMB_00_BDL_VBOMB, @@ -781,7 +781,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x3000 }, { - // 0x0C: BOMB_10 + // 0x0C: dItem_BOMB_10_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_BOMB_00], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOMB_00], /* mBmdIdx */ BOMB_00_BDL_VBOMB, @@ -797,7 +797,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x3000 }, { - // 0x0D: BOMB_20 + // 0x0D: dItem_BOMB_20_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_BOMB_00], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOMB_00], /* mBmdIdx */ BOMB_00_BDL_VBOMB, @@ -813,7 +813,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x3000 }, { - // 0x0E: BOMB_30 + // 0x0E: dItem_BOMB_30_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_BOMB_00], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOMB_00], /* mBmdIdx */ BOMB_00_BDL_VBOMB, @@ -845,7 +845,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x17C0 }, { - // 0x10: ARROW_10 + // 0x10: dItem_ARROW_10_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOW_01], /* mBmdIdx */ ALWAYS_BDL_ARROWITEM, @@ -861,7 +861,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x11: ARROW_20 + // 0x11: dItem_ARROW_20_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOW_01], /* mBmdIdx */ ALWAYS_BDL_ARROWITEM, @@ -877,7 +877,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x2000 }, { - // 0x12: ARROW_30 + // 0x12: dItem_ARROW_30_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOW_01], /* mBmdIdx */ ALWAYS_BDL_ARROWITEM, @@ -941,7 +941,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x3500 }, { - // 0x16: RECOVER_FAIRY + // 0x16: dItem_RECOVER_FAIRY_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_FA], /* mTexture */ NULL, /* mBmdIdx */ ALWAYS_BDL_FA, // Note: This file index is for the wrong RARC. @@ -1005,7 +1005,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x1A: SUB_DUN_RUPEE + // 0x1A: dItem_SUB_DUN_RUPEE_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], /* mBmdIdx */ VLUPY_BDL_VLUPY, @@ -1165,7 +1165,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x24: EMONO_BAG + // 0x24: dItem_SPOILS_BAG_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VBAGE], /* mTexture */ item_texture_tbl[TEXTURE_IDX_COVEROFBEAST], /* mBmdIdx */ VBAGE_BDL_VBAGE, @@ -1229,7 +1229,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x3000 }, { - // 0x28: PWR_GROOVE + // 0x28: dItem_POWER_BRACELETS_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VPOWR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GLOVES_00_0x35], /* mBmdIdx */ VPOWR_BDL_VPOWR, @@ -1293,7 +1293,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x2C: ESA_BAG + // 0x2C: dItem_BAIT_BAG_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VBAGF], /* mTexture */ item_texture_tbl[TEXTURE_IDX_COVEROFBAIT], /* mBmdIdx */ VBAGF_BDL_VBAGF, @@ -1485,7 +1485,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x38: SWORD + // 0x38: dItem_SWORD_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VSWON], /* mTexture */ item_texture_tbl[TEXTURE_IDX_SWORD_00], /* mBmdIdx */ VSWON_BDL_VSWON, @@ -1501,7 +1501,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x3000 }, { - // 0x39: MASTER_SWORD + // 0x39: dItem_MASTER_SWORD_1_e /* mArcname */ NULL, /* mTexture */ item_texture_tbl[TEXTURE_IDX_SWORD_01], /* mBmdIdx */ -1, @@ -1517,7 +1517,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x5500 }, { - // 0x3A: LV3_SWORD + // 0x3A: dItem_MASTER_SWORD_2_e /* mArcname */ NULL, /* mTexture */ item_texture_tbl[TEXTURE_IDX_SWORD_02], /* mBmdIdx */ -1, @@ -1533,7 +1533,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x5500 }, { - // 0x3B: SHIELD + // 0x3B: dItem_SHIELD_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VSHIN], /* mTexture */ item_texture_tbl[TEXTURE_IDX_SHIELD_00], /* mBmdIdx */ VSHIN_BDL_VSHIN, @@ -1549,7 +1549,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x5000 }, { - // 0x3C: MIRROR_SHIELD + // 0x3C: dItem_MIRROR_SHIELD_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VSHIM], /* mTexture */ item_texture_tbl[TEXTURE_IDX_SHIELD_01], /* mBmdIdx */ VSHIM_BDL_VSHIM, @@ -1565,7 +1565,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x3D: DROPPED_SWORD + // 0x3D: dItem_DROPPED_SWORD_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VSWON], /* mTexture */ item_texture_tbl[TEXTURE_IDX_SWORD_00], /* mBmdIdx */ VSWON_BDL_VSWON, @@ -1581,7 +1581,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x3000 }, { - // 0x3E: MASTER_SWORD_EX + // 0x3E: dItem_MASTER_SWORD_3_e /* mArcname */ NULL, /* mTexture */ item_texture_tbl[TEXTURE_IDX_SWORD_03], /* mBmdIdx */ -1, @@ -1645,7 +1645,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x42: PIRATES_OMAMORI + // 0x42: dItem_PIRATES_CHARM_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VAMUK], /* mTexture */ item_texture_tbl[TEXTURE_IDX_AMULET_00], /* mBmdIdx */ VAMUK_BDL_VAMUK, @@ -1661,7 +1661,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x3000 }, { - // 0x43: HEROS_OMAMORI + // 0x43: dItem_HEROS_CHARM_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VAMUY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_AMULET_01], /* mBmdIdx */ VAMUY_BDL_VAMUY, @@ -1693,7 +1693,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x45: SKULL_NECKLACE + // 0x45: dItem_SKULL_NECKLACE_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VDOKU], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BEAST_01], /* mBmdIdx */ VDOKU_BDL_VDOKU, @@ -1709,7 +1709,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x2000 }, { - // 0x46: BOKOBABA_SEED + // 0x46: dItem_BOKOBABA_SEED_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VBOKO], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BEAST_02], /* mBmdIdx */ VBOKO_BDL_VBOKO, @@ -1725,7 +1725,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x47: GOLDEN_FEATHER + // 0x47: dItem_GOLDEN_FEATHER_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VHANE], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BEAST_03], /* mBmdIdx */ VHANE_BDL_VHANE, @@ -1757,7 +1757,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x2000 }, { - // 0x49: RED_JELLY + // 0x49: dItem_RED_JELLY_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VCHUJ], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BEAST_05], /* mBmdIdx */ VCHUJ_BDL_VCHUJ, @@ -1773,7 +1773,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x4A: GREEN_JELLY + // 0x4A: dItem_GREEN_JELLY_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VCHUJ], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BEAST_06], /* mBmdIdx */ VCHUJ_BDL_VCHUJ, @@ -1789,7 +1789,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x4B: BLUE_JELLY + // 0x4B: dItem_BLUE_JELLY_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VCHUJ], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BEAST_07], /* mBmdIdx */ VCHUJ_BDL_VCHUJ, @@ -1869,7 +1869,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x50: EMPTY_BOTTLE + // 0x50: dItem_EMPTY_BOTTLE_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_BIN], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOTTLE_00], /* mBmdIdx */ BIN_BDL_VBINX, @@ -1885,7 +1885,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x3000 }, { - // 0x51: RED_BOTTLE + // 0x51: dItem_RED_POTION_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_MED_R], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOTTLE_01], /* mBmdIdx */ MED_R_BDL_VBINR, @@ -1901,7 +1901,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x3000 }, { - // 0x52: GREEN_BOTTLE + // 0x52: dItem_GREEN_POTION_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_MED_G], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOTTLE_02], /* mBmdIdx */ MED_G_BDL_VBING, @@ -1917,7 +1917,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x3000 }, { - // 0x53: BLUE_BOTTLE + // 0x53: dItem_BLUE_POTION_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_MED_B], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOTTLE_03], /* mBmdIdx */ MED_B_BDL_VBINB, @@ -1965,7 +1965,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x3000 }, { - // 0x56: BIN_IN_WATER + // 0x56: dItem_WATER_BOTTLE_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VBINW], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOTTLE_05], /* mBmdIdx */ VBINW_BDL_VBINW, @@ -1981,7 +1981,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x3000 }, { - // 0x57: FAIRY_BOTTLE + // 0x57: dItem_FAIRY_BOTTLE_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VBINY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOTTLE_06], /* mBmdIdx */ VBINY_BDL_VBINY, @@ -1997,7 +1997,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x3000 }, { - // 0x58: FIREFLY_BOTTLE + // 0x58: dItem_FIREFLY_BOTTLE_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VBINH], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOTTLE_07], /* mBmdIdx */ VBINH_BDL_VBINH, @@ -2013,7 +2013,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x3000 }, { - // 0x59: FWATER_BOTTLE + // 0x59: dItem_FOREST_WATER_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_FWBIN], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOTTLE_08], /* mBmdIdx */ FWBIN_BDL_VBINW_F, @@ -2669,7 +2669,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x82: BIRD_ESA_5 + // 0x82: dItem_BIRD_BAIT_5_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VESA], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BAIT_01], /* mBmdIdx */ VESA_BDL_VESA, @@ -3325,7 +3325,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xAB: MAX_RUPEE_UP1 + // 0xAB: dItem_MAX_RUPEE_UP1_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VSAIM], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BIG_PURSE], /* mBmdIdx */ VSAIM_BDL_VSAIM, @@ -3341,7 +3341,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x2000 }, { - // 0xAC: MAX_RUPEE_UP2 + // 0xAC: dItem_MAX_RUPEE_UP2_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VSAIL], /* mTexture */ item_texture_tbl[TEXTURE_IDX_MAX_PURSE], /* mBmdIdx */ VSAIL_BDL_VSAIL, @@ -3357,7 +3357,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x2000 }, { - // 0xAD: MAX_BOMB_UP1 + // 0xAD: dItem_MAX_BOMB_UP1_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VBOMM], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOMBPOUCH_1], /* mBmdIdx */ VBOMM_BDL_VBOMM, @@ -3373,7 +3373,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x2000 }, { - // 0xAE: MAX_BOMB_UP2 + // 0xAE: dItem_MAX_BOMB_UP2_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VBOML], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOMBPOUCH_2], /* mBmdIdx */ VBOML_BDL_VBOML, @@ -3389,7 +3389,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x2000 }, { - // 0xAF: MAX_ARROW_UP1 + // 0xAF: dItem_MAX_ARROW_UP1_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VYATM], /* mTexture */ item_texture_tbl[TEXTURE_IDX_ARROWCASE_1], /* mBmdIdx */ VYATM_BDL_VYATM, @@ -3405,7 +3405,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x2000 }, { - // 0xB0: MAX_ARROW_UP2 + // 0xB0: dItem_MAX_ARROW_UP2_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VYATL], /* mTexture */ item_texture_tbl[TEXTURE_IDX_ARROWCASE_2], /* mBmdIdx */ VYATL_BDL_VYATL, @@ -3421,7 +3421,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x2000 }, { - // 0xB1: MAGIC_POWER + // 0xB1: dItem_MAGIC_POWER_e /* mArcname */ NULL, /* mTexture */ NULL, /* mBmdIdx */ -1, @@ -3437,7 +3437,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xB2: MAX_MP_UP1 + // 0xB2: dItem_MAX_MP_UP1_e /* mArcname */ NULL, /* mTexture */ NULL, /* mBmdIdx */ -1, @@ -3645,7 +3645,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x17C0 }, { - // 0xBF: COLLECT_MAP_64 + // 0xBF: dItem_COLLECT_MAP_64_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], /* mBmdIdx */ VLUPY_BDL_VLUPY, @@ -3661,7 +3661,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x17C0 }, { - // 0xC0: COLLECT_MAP_63 + // 0xC0: dItem_COLLECT_MAP_63_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], /* mBmdIdx */ VLUPY_BDL_VLUPY, @@ -3677,7 +3677,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x17C0 }, { - // 0xC1: COLLECT_MAP_62 + // 0xC1: dItem_COLLECT_MAP_62_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], /* mBmdIdx */ VLUPY_BDL_VLUPY, @@ -3693,7 +3693,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x17C0 }, { - // 0xC2: COLLECT_MAP_61 + // 0xC2: dItem_COLLECT_MAP_61_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPQ], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_HINT2], /* mBmdIdx */ VMAPQ_BDL_VMAPQ, @@ -3709,7 +3709,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xC3: COLLECT_MAP_60 + // 0xC3: dItem_COLLECT_MAP_60_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPQ], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_HINT2], /* mBmdIdx */ VMAPQ_BDL_VMAPQ, @@ -3725,7 +3725,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xC4: COLLECT_MAP_59 + // 0xC4: dItem_COLLECT_MAP_59_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPQ], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_HINT2], /* mBmdIdx */ VMAPQ_BDL_VMAPQ, @@ -3741,7 +3741,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xC5: COLLECT_MAP_58 + // 0xC5: dItem_COLLECT_MAP_58_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPQ], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_HINT2], /* mBmdIdx */ VMAPQ_BDL_VMAPQ, @@ -3757,7 +3757,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xC6: COLLECT_MAP_57 + // 0xC6: dItem_COLLECT_MAP_57_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPQ], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_HINT2], /* mBmdIdx */ VMAPQ_BDL_VMAPQ, @@ -3773,7 +3773,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xC7: COLLECT_MAP_56 + // 0xC7: dItem_COLLECT_MAP_56_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPQ], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_HINT2], /* mBmdIdx */ VMAPQ_BDL_VMAPQ, @@ -3789,7 +3789,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xC8: COLLECT_MAP_55 + // 0xC8: dItem_COLLECT_MAP_55_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPQ], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_HINT2], /* mBmdIdx */ VMAPQ_BDL_VMAPQ, @@ -3805,7 +3805,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xC9: COLLECT_MAP_54 + // 0xC9: dItem_COLLECT_MAP_54_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPQ], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_HINT2], /* mBmdIdx */ VMAPQ_BDL_VMAPQ, @@ -3821,7 +3821,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xCA: COLLECT_MAP_53 + // 0xCA: dItem_COLLECT_MAP_53_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPQ], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_HINT2], /* mBmdIdx */ VMAPQ_BDL_VMAPQ, @@ -3837,7 +3837,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xCB: COLLECT_MAP_52 + // 0xCB: dItem_COLLECT_MAP_52_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPC], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TINGLE2], /* mBmdIdx */ VMAPC_BDL_VMAPC, @@ -3853,7 +3853,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xCC: COLLECT_MAP_51 + // 0xCC: dItem_COLLECT_MAP_51_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], /* mBmdIdx */ VMAPR_BDL_VMAPL, @@ -3869,7 +3869,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xCD: COLLECT_MAP_50 + // 0xCD: dItem_COLLECT_MAP_50_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], /* mBmdIdx */ VMAPR_BDL_VMAPL, @@ -3885,7 +3885,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xCE: COLLECT_MAP_49 + // 0xCE: dItem_COLLECT_MAP_49_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], /* mBmdIdx */ VMAPR_BDL_VMAPL, @@ -3901,7 +3901,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xCF: COLLECT_MAP_48 + // 0xCF: dItem_COLLECT_MAP_48_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], /* mBmdIdx */ VMAPR_BDL_VMAPL, @@ -3917,7 +3917,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xD0: COLLECT_MAP_47 + // 0xD0: dItem_COLLECT_MAP_47_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], /* mBmdIdx */ VMAPR_BDL_VMAPL, @@ -3933,7 +3933,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xD1: COLLECT_MAP_46 + // 0xD1: dItem_COLLECT_MAP_46_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], /* mBmdIdx */ VMAPR_BDL_VMAPL, @@ -3949,7 +3949,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xD2: COLLECT_MAP_45 + // 0xD2: dItem_COLLECT_MAP_45_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], /* mBmdIdx */ VMAPR_BDL_VMAPL, @@ -3965,7 +3965,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xD3: COLLECT_MAP_44 + // 0xD3: dItem_COLLECT_MAP_44_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], /* mBmdIdx */ VMAPR_BDL_VMAPL, @@ -3981,7 +3981,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xD4: COLLECT_MAP_43 + // 0xD4: dItem_COLLECT_MAP_43_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], /* mBmdIdx */ VMAPR_BDL_VMAPL, @@ -3997,7 +3997,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xD5: COLLECT_MAP_42 + // 0xD5: dItem_COLLECT_MAP_42_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], /* mBmdIdx */ VMAPR_BDL_VMAPL, @@ -4013,7 +4013,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xD6: COLLECT_MAP_41 + // 0xD6: dItem_COLLECT_MAP_41_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], /* mBmdIdx */ VMAPR_BDL_VMAPL, @@ -4029,7 +4029,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xD7: COLLECT_MAP_40 + // 0xD7: dItem_COLLECT_MAP_40_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], /* mBmdIdx */ VMAPR_BDL_VMAPL, @@ -4045,7 +4045,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xD8: COLLECT_MAP_39 + // 0xD8: dItem_COLLECT_MAP_39_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], /* mBmdIdx */ VMAPR_BDL_VMAPL, @@ -4061,7 +4061,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xD9: COLLECT_MAP_38 + // 0xD9: dItem_COLLECT_MAP_38_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], /* mBmdIdx */ VMAPR_BDL_VMAPL, @@ -4077,7 +4077,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xDA: COLLECT_MAP_37 + // 0xDA: dItem_COLLECT_MAP_37_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], /* mBmdIdx */ VMAPR_BDL_VMAPL, @@ -4093,7 +4093,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xDB: COLLECT_MAP_36 + // 0xDB: dItem_COLLECT_MAP_36_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPG], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_PHANTOMSHIP2], /* mBmdIdx */ VMAPG_BDL_VMAPG, @@ -4109,7 +4109,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xDC: COLLECT_MAP_35 + // 0xDC: dItem_COLLECT_MAP_35_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPC], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TINGLE2], /* mBmdIdx */ VMAPC_BDL_VMAPC, @@ -4125,7 +4125,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xDD: COLLECT_MAP_34 + // 0xDD: dItem_COLLECT_MAP_34_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], /* mBmdIdx */ VMAPR_BDL_VMAPL, @@ -4141,7 +4141,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xDE: COLLECT_MAP_33 + // 0xDE: dItem_COLLECT_MAP_33_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], /* mBmdIdx */ VMAPR_BDL_VMAPL, @@ -4157,7 +4157,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xDF: COLLECT_MAP_32 + // 0xDF: dItem_COLLECT_MAP_32_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], /* mBmdIdx */ VMAPR_BDL_VMAPL, @@ -4173,7 +4173,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xE0: COLLECT_MAP_31 + // 0xE0: dItem_COLLECT_MAP_31_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], /* mBmdIdx */ VMAPR_BDL_VMAPL, @@ -4189,7 +4189,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xE1: COLLECT_MAP_30 + // 0xE1: dItem_COLLECT_MAP_30_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], /* mBmdIdx */ VMAPR_BDL_VMAPL, @@ -4205,7 +4205,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xE2: COLLECT_MAP_29 + // 0xE2: dItem_COLLECT_MAP_29_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], /* mBmdIdx */ VMAPR_BDL_VMAPL, @@ -4221,7 +4221,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xE3: COLLECT_MAP_28 + // 0xE3: dItem_COLLECT_MAP_28_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], /* mBmdIdx */ VMAPR_BDL_VMAPL, @@ -4237,7 +4237,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xE4: COLLECT_MAP_27 + // 0xE4: dItem_COLLECT_MAP_27_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], /* mBmdIdx */ VMAPR_BDL_VMAPL, @@ -4253,7 +4253,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xE5: COLLECT_MAP_26 + // 0xE5: dItem_COLLECT_MAP_26_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], /* mBmdIdx */ VMAPR_BDL_VMAPL, @@ -4269,7 +4269,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xE6: COLLECT_MAP_25 + // 0xE6: dItem_COLLECT_MAP_25_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], /* mBmdIdx */ VMAPR_BDL_VMAPL, @@ -4285,7 +4285,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xE7: COLLECT_MAP_24 + // 0xE7: dItem_COLLECT_MAP_24_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], /* mBmdIdx */ VMAPR_BDL_VMAPL, @@ -4301,7 +4301,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xE8: COLLECT_MAP_23 + // 0xE8: dItem_COLLECT_MAP_23_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], /* mBmdIdx */ VMAPR_BDL_VMAPL, @@ -4317,7 +4317,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xE9: COLLECT_MAP_22 + // 0xE9: dItem_COLLECT_MAP_22_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], /* mBmdIdx */ VMAPR_BDL_VMAPL, @@ -4333,7 +4333,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xEA: COLLECT_MAP_21 + // 0xEA: dItem_COLLECT_MAP_21_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], /* mBmdIdx */ VMAPR_BDL_VMAPL, @@ -4349,7 +4349,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xEB: COLLECT_MAP_20 + // 0xEB: dItem_COLLECT_MAP_20_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], /* mBmdIdx */ VMAPR_BDL_VMAPL, @@ -4365,7 +4365,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xEC: COLLECT_MAP_19 + // 0xEC: dItem_COLLECT_MAP_19_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], /* mBmdIdx */ VMAPR_BDL_VMAPL, @@ -4381,7 +4381,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xED: COLLECT_MAP_18 + // 0xED: dItem_COLLECT_MAP_18_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPH], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x69], /* mBmdIdx */ VMAPH_BDL_VMAPH, @@ -4397,7 +4397,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xEE: COLLECT_MAP_17 + // 0xEE: dItem_COLLECT_MAP_17_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPH], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x69], /* mBmdIdx */ VMAPH_BDL_VMAPH, @@ -4413,7 +4413,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xEF: COLLECT_MAP_16 + // 0xEF: dItem_COLLECT_MAP_16_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPH], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x69], /* mBmdIdx */ VMAPH_BDL_VMAPH, @@ -4429,7 +4429,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xF0: COLLECT_MAP_15 + // 0xF0: dItem_COLLECT_MAP_15_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPH], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x69], /* mBmdIdx */ VMAPH_BDL_VMAPH, @@ -4445,7 +4445,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xF1: COLLECT_MAP_14 + // 0xF1: dItem_COLLECT_MAP_14_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPH], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x69], /* mBmdIdx */ VMAPH_BDL_VMAPH, @@ -4461,7 +4461,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xF2: COLLECT_MAP_13 + // 0xF2: dItem_COLLECT_MAP_13_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPH], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x69], /* mBmdIdx */ VMAPH_BDL_VMAPH, @@ -4477,7 +4477,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xF3: COLLECT_MAP_12 + // 0xF3: dItem_COLLECT_MAP_12_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPH], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x69], /* mBmdIdx */ VMAPH_BDL_VMAPH, @@ -4493,7 +4493,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xF4: COLLECT_MAP_11 + // 0xF4: dItem_COLLECT_MAP_11_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPH], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x69], /* mBmdIdx */ VMAPH_BDL_VMAPH, @@ -4509,7 +4509,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xF5: COLLECT_MAP_10 + // 0xF5: dItem_COLLECT_MAP_10_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPH], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x69], /* mBmdIdx */ VMAPH_BDL_VMAPH, @@ -4525,7 +4525,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xF6: COLLECT_MAP_09 + // 0xF6: dItem_COLLECT_MAP_09_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPH], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x69], /* mBmdIdx */ VMAPH_BDL_VMAPH, @@ -4541,7 +4541,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xF7: COLLECT_MAP_08 + // 0xF7: dItem_COLLECT_MAP_08_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TRI2], /* mBmdIdx */ VMAPT_BDL_VMAPT, @@ -4557,7 +4557,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xF8: COLLECT_MAP_07 + // 0xF8: dItem_COLLECT_MAP_07_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TRI2], /* mBmdIdx */ VMAPT_BDL_VMAPT, @@ -4573,7 +4573,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xF9: COLLECT_MAP_06 + // 0xF9: dItem_COLLECT_MAP_06_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TRI2], /* mBmdIdx */ VMAPT_BDL_VMAPT, @@ -4589,7 +4589,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xFA: COLLECT_MAP_05 + // 0xFA: dItem_COLLECT_MAP_05_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TRI2], /* mBmdIdx */ VMAPT_BDL_VMAPT, @@ -4605,7 +4605,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xFB: COLLECT_MAP_04 + // 0xFB: dItem_COLLECT_MAP_04_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TRI2], /* mBmdIdx */ VMAPT_BDL_VMAPT, @@ -4621,7 +4621,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xFC: COLLECT_MAP_03 + // 0xFC: dItem_COLLECT_MAP_03_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TRI2], /* mBmdIdx */ VMAPT_BDL_VMAPT, @@ -4637,7 +4637,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xFD: COLLECT_MAP_02 + // 0xFD: dItem_COLLECT_MAP_02_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TRI2], /* mBmdIdx */ VMAPT_BDL_VMAPT, @@ -4653,7 +4653,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xFE: COLLECT_MAP_01 + // 0xFE: dItem_COLLECT_MAP_01_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TRI2], /* mBmdIdx */ VMAPT_BDL_VMAPT, @@ -4806,7 +4806,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0C60 }, { - // 0x09: S_MAGIC + // 0x09: dItem_SMALL_MAGIC_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], /* mBmdIdx */ ALWAYS_BDL_MPODA, /* mSrtIdx */ -1, @@ -4819,7 +4819,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0700 }, { - // 0x0A: L_MAGIC + // 0x0A: dItem_LARGE_MAGIC_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], /* mBmdIdx */ ALWAYS_BDL_MPODB, /* mSrtIdx */ -1, @@ -4832,7 +4832,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0700 }, { - // 0x0B: BOMB_5 + // 0x0B: dItem_BOMB_5_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_LINK], /* mBmdIdx */ LINK_BDL_BOMB, /* mSrtIdx */ -1, @@ -4845,7 +4845,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0CC0 }, { - // 0x0C: BOMB_10 + // 0x0C: dItem_BOMB_10_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_LINK], /* mBmdIdx */ LINK_BDL_BOMB, /* mSrtIdx */ -1, @@ -4858,7 +4858,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0CC0 }, { - // 0x0D: BOMB_20 + // 0x0D: dItem_BOMB_20_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_LINK], /* mBmdIdx */ LINK_BDL_BOMB, /* mSrtIdx */ -1, @@ -4871,7 +4871,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0CC0 }, { - // 0x0E: BOMB_30 + // 0x0E: dItem_BOMB_30_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_LINK], /* mBmdIdx */ LINK_BDL_BOMB, /* mSrtIdx */ -1, @@ -4897,7 +4897,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0CA0 }, { - // 0x10: ARROW_10 + // 0x10: dItem_ARROW_10_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], /* mBmdIdx */ ALWAYS_BDL_ARROWITEM, /* mSrtIdx */ -1, @@ -4910,7 +4910,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0700 }, { - // 0x11: ARROW_20 + // 0x11: dItem_ARROW_20_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], /* mBmdIdx */ ALWAYS_BDL_ARROWITEM, /* mSrtIdx */ -1, @@ -4923,7 +4923,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0B40 }, { - // 0x12: ARROW_30 + // 0x12: dItem_ARROW_30_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], /* mBmdIdx */ ALWAYS_BDL_ARROWITEM, /* mSrtIdx */ -1, @@ -4975,7 +4975,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0780 }, { - // 0x16: RECOVER_FAIRY + // 0x16: dItem_RECOVER_FAIRY_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], /* mBmdIdx */ ALWAYS_BDL_FA, /* mSrtIdx */ -1, @@ -5027,7 +5027,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x1A: SUB_DUN_RUPEE + // 0x1A: dItem_SUB_DUN_RUPEE_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5157,7 +5157,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x24: EMONO_BAG + // 0x24: dItem_SPOILS_BAG_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5209,7 +5209,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x28: PWR_GROOVE + // 0x28: dItem_POWER_BRACELETS_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5261,7 +5261,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x2C: ESA_BAG + // 0x2C: dItem_BAIT_BAG_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5417,7 +5417,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x38: SWORD + // 0x38: dItem_SWORD_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_VSWON], /* mBmdIdx */ VSWON_BDL_VSWON, /* mSrtIdx */ -1, @@ -5430,7 +5430,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x3000 }, { - // 0x39: MASTER_SWORD + // 0x39: dItem_MASTER_SWORD_1_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5443,7 +5443,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x3A: LV3_SWORD + // 0x3A: dItem_MASTER_SWORD_2_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5456,7 +5456,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x3B: SHIELD + // 0x3B: dItem_SHIELD_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_VSHIN], /* mBmdIdx */ VSHIN_BDL_VSHIN, /* mSrtIdx */ -1, @@ -5469,7 +5469,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x5000 }, { - // 0x3C: MIRROR_SHIELD + // 0x3C: dItem_MIRROR_SHIELD_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5482,7 +5482,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x3D: DROPPED_SWORD + // 0x3D: dItem_DROPPED_SWORD_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_VSWON], /* mBmdIdx */ VSWON_BDL_VSWON, /* mSrtIdx */ -1, @@ -5495,7 +5495,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x3000 }, { - // 0x3E: MASTER_SWORD_EX + // 0x3E: dItem_MASTER_SWORD_3_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5547,7 +5547,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x42: PIRATES_OMAMORI + // 0x42: dItem_PIRATES_CHARM_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5560,7 +5560,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x43: HEROS_OMAMORI + // 0x43: dItem_HEROS_CHARM_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5586,7 +5586,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x45: SKULL_NECKLACE + // 0x45: dItem_SKULL_NECKLACE_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], /* mBmdIdx */ ALWAYS_BDL_VDOKL, /* mSrtIdx */ -1, @@ -5599,7 +5599,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x08A0 }, { - // 0x46: BOKOBABA_SEED + // 0x46: dItem_BOKOBABA_SEED_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], /* mBmdIdx */ ALWAYS_BDL_VBOKL, /* mSrtIdx */ -1, @@ -5612,7 +5612,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0720 }, { - // 0x47: GOLDEN_FEATHER + // 0x47: dItem_GOLDEN_FEATHER_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], /* mBmdIdx */ ALWAYS_BDL_VHANL, /* mSrtIdx */ ALWAYS_BTK_VHANL, @@ -5638,7 +5638,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0760 }, { - // 0x49: RED_JELLY + // 0x49: dItem_RED_JELLY_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], /* mBmdIdx */ ALWAYS_BDL_VCHUL, /* mSrtIdx */ -1, @@ -5651,7 +5651,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0800 }, { - // 0x4A: GREEN_JELLY + // 0x4A: dItem_GREEN_JELLY_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], /* mBmdIdx */ ALWAYS_BDL_VCHUL, /* mSrtIdx */ -1, @@ -5664,7 +5664,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0800 }, { - // 0x4B: BLUE_JELLY + // 0x4B: dItem_BLUE_JELLY_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], /* mBmdIdx */ ALWAYS_BDL_VCHUL, /* mSrtIdx */ -1, @@ -5729,7 +5729,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x50: EMPTY_BOTTLE + // 0x50: dItem_EMPTY_BOTTLE_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5742,7 +5742,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x51: RED_BOTTLE + // 0x51: dItem_RED_POTION_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5755,7 +5755,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x52: GREEN_BOTTLE + // 0x52: dItem_GREEN_POTION_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5768,7 +5768,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x53: BLUE_BOTTLE + // 0x53: dItem_BLUE_POTION_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5807,7 +5807,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x56: BIN_IN_WATER + // 0x56: dItem_WATER_BOTTLE_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5820,7 +5820,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x57: FAIRY_BOTTLE + // 0x57: dItem_FAIRY_BOTTLE_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5833,7 +5833,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x58: FIREFLY_BOTTLE + // 0x58: dItem_FIREFLY_BOTTLE_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5846,7 +5846,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x59: FWATER_BOTTLE + // 0x59: dItem_FOREST_WATER_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -6379,7 +6379,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x82: BIRD_ESA_5 + // 0x82: dItem_BIRD_BAIT_5_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], /* mBmdIdx */ ALWAYS_BDL_VESAL, /* mSrtIdx */ -1, @@ -6912,7 +6912,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xAB: MAX_RUPEE_UP1 + // 0xAB: dItem_MAX_RUPEE_UP1_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -6925,7 +6925,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xAC: MAX_RUPEE_UP2 + // 0xAC: dItem_MAX_RUPEE_UP2_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -6938,7 +6938,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xAD: MAX_BOMB_UP1 + // 0xAD: dItem_MAX_BOMB_UP1_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -6951,7 +6951,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xAE: MAX_BOMB_UP2 + // 0xAE: dItem_MAX_BOMB_UP2_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -6964,7 +6964,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xAF: MAX_ARROW_UP1 + // 0xAF: dItem_MAX_ARROW_UP1_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -6977,7 +6977,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xB0: MAX_ARROW_UP2 + // 0xB0: dItem_MAX_ARROW_UP2_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -6990,7 +6990,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xB1: MAGIC_POWER + // 0xB1: dItem_MAGIC_POWER_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7003,7 +7003,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xB2: MAX_MP_UP1 + // 0xB2: dItem_MAX_MP_UP1_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7172,7 +7172,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xBF: COLLECT_MAP_64 + // 0xBF: dItem_COLLECT_MAP_64_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7185,7 +7185,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xC0: COLLECT_MAP_63 + // 0xC0: dItem_COLLECT_MAP_63_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7198,7 +7198,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xC1: COLLECT_MAP_62 + // 0xC1: dItem_COLLECT_MAP_62_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7211,7 +7211,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xC2: COLLECT_MAP_61 + // 0xC2: dItem_COLLECT_MAP_61_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7224,7 +7224,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xC3: COLLECT_MAP_60 + // 0xC3: dItem_COLLECT_MAP_60_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7237,7 +7237,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xC4: COLLECT_MAP_59 + // 0xC4: dItem_COLLECT_MAP_59_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7250,7 +7250,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xC5: COLLECT_MAP_58 + // 0xC5: dItem_COLLECT_MAP_58_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7263,7 +7263,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xC6: COLLECT_MAP_57 + // 0xC6: dItem_COLLECT_MAP_57_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7276,7 +7276,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xC7: COLLECT_MAP_56 + // 0xC7: dItem_COLLECT_MAP_56_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7289,7 +7289,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xC8: COLLECT_MAP_55 + // 0xC8: dItem_COLLECT_MAP_55_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7302,7 +7302,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xC9: COLLECT_MAP_54 + // 0xC9: dItem_COLLECT_MAP_54_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7315,7 +7315,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xCA: COLLECT_MAP_53 + // 0xCA: dItem_COLLECT_MAP_53_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7328,7 +7328,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xCB: COLLECT_MAP_52 + // 0xCB: dItem_COLLECT_MAP_52_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7341,7 +7341,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xCC: COLLECT_MAP_51 + // 0xCC: dItem_COLLECT_MAP_51_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7354,7 +7354,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xCD: COLLECT_MAP_50 + // 0xCD: dItem_COLLECT_MAP_50_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7367,7 +7367,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xCE: COLLECT_MAP_49 + // 0xCE: dItem_COLLECT_MAP_49_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7380,7 +7380,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xCF: COLLECT_MAP_48 + // 0xCF: dItem_COLLECT_MAP_48_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7393,7 +7393,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xD0: COLLECT_MAP_47 + // 0xD0: dItem_COLLECT_MAP_47_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7406,7 +7406,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xD1: COLLECT_MAP_46 + // 0xD1: dItem_COLLECT_MAP_46_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7419,7 +7419,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xD2: COLLECT_MAP_45 + // 0xD2: dItem_COLLECT_MAP_45_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7432,7 +7432,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xD3: COLLECT_MAP_44 + // 0xD3: dItem_COLLECT_MAP_44_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7445,7 +7445,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xD4: COLLECT_MAP_43 + // 0xD4: dItem_COLLECT_MAP_43_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7458,7 +7458,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xD5: COLLECT_MAP_42 + // 0xD5: dItem_COLLECT_MAP_42_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7471,7 +7471,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xD6: COLLECT_MAP_41 + // 0xD6: dItem_COLLECT_MAP_41_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7484,7 +7484,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xD7: COLLECT_MAP_40 + // 0xD7: dItem_COLLECT_MAP_40_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7497,7 +7497,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xD8: COLLECT_MAP_39 + // 0xD8: dItem_COLLECT_MAP_39_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7510,7 +7510,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xD9: COLLECT_MAP_38 + // 0xD9: dItem_COLLECT_MAP_38_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7523,7 +7523,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xDA: COLLECT_MAP_37 + // 0xDA: dItem_COLLECT_MAP_37_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7536,7 +7536,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xDB: COLLECT_MAP_36 + // 0xDB: dItem_COLLECT_MAP_36_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7549,7 +7549,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xDC: COLLECT_MAP_35 + // 0xDC: dItem_COLLECT_MAP_35_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7562,7 +7562,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xDD: COLLECT_MAP_34 + // 0xDD: dItem_COLLECT_MAP_34_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7575,7 +7575,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xDE: COLLECT_MAP_33 + // 0xDE: dItem_COLLECT_MAP_33_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7588,7 +7588,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xDF: COLLECT_MAP_32 + // 0xDF: dItem_COLLECT_MAP_32_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7601,7 +7601,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xE0: COLLECT_MAP_31 + // 0xE0: dItem_COLLECT_MAP_31_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7614,7 +7614,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xE1: COLLECT_MAP_30 + // 0xE1: dItem_COLLECT_MAP_30_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7627,7 +7627,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xE2: COLLECT_MAP_29 + // 0xE2: dItem_COLLECT_MAP_29_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7640,7 +7640,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xE3: COLLECT_MAP_28 + // 0xE3: dItem_COLLECT_MAP_28_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7653,7 +7653,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xE4: COLLECT_MAP_27 + // 0xE4: dItem_COLLECT_MAP_27_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7666,7 +7666,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xE5: COLLECT_MAP_26 + // 0xE5: dItem_COLLECT_MAP_26_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7679,7 +7679,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xE6: COLLECT_MAP_25 + // 0xE6: dItem_COLLECT_MAP_25_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7692,7 +7692,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xE7: COLLECT_MAP_24 + // 0xE7: dItem_COLLECT_MAP_24_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7705,7 +7705,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xE8: COLLECT_MAP_23 + // 0xE8: dItem_COLLECT_MAP_23_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7718,7 +7718,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xE9: COLLECT_MAP_22 + // 0xE9: dItem_COLLECT_MAP_22_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7731,7 +7731,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xEA: COLLECT_MAP_21 + // 0xEA: dItem_COLLECT_MAP_21_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7744,7 +7744,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xEB: COLLECT_MAP_20 + // 0xEB: dItem_COLLECT_MAP_20_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7757,7 +7757,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xEC: COLLECT_MAP_19 + // 0xEC: dItem_COLLECT_MAP_19_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7770,7 +7770,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xED: COLLECT_MAP_18 + // 0xED: dItem_COLLECT_MAP_18_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7783,7 +7783,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xEE: COLLECT_MAP_17 + // 0xEE: dItem_COLLECT_MAP_17_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7796,7 +7796,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xEF: COLLECT_MAP_16 + // 0xEF: dItem_COLLECT_MAP_16_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7809,7 +7809,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xF0: COLLECT_MAP_15 + // 0xF0: dItem_COLLECT_MAP_15_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7822,7 +7822,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xF1: COLLECT_MAP_14 + // 0xF1: dItem_COLLECT_MAP_14_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7835,7 +7835,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xF2: COLLECT_MAP_13 + // 0xF2: dItem_COLLECT_MAP_13_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7848,7 +7848,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xF3: COLLECT_MAP_12 + // 0xF3: dItem_COLLECT_MAP_12_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7861,7 +7861,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xF4: COLLECT_MAP_11 + // 0xF4: dItem_COLLECT_MAP_11_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7874,7 +7874,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xF5: COLLECT_MAP_10 + // 0xF5: dItem_COLLECT_MAP_10_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7887,7 +7887,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xF6: COLLECT_MAP_09 + // 0xF6: dItem_COLLECT_MAP_09_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7900,7 +7900,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xF7: COLLECT_MAP_08 + // 0xF7: dItem_COLLECT_MAP_08_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7913,7 +7913,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xF8: COLLECT_MAP_07 + // 0xF8: dItem_COLLECT_MAP_07_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7926,7 +7926,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xF9: COLLECT_MAP_06 + // 0xF9: dItem_COLLECT_MAP_06_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7939,7 +7939,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xFA: COLLECT_MAP_05 + // 0xFA: dItem_COLLECT_MAP_05_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7952,7 +7952,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xFB: COLLECT_MAP_04 + // 0xFB: dItem_COLLECT_MAP_04_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7965,7 +7965,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xFC: COLLECT_MAP_03 + // 0xFC: dItem_COLLECT_MAP_03_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7978,7 +7978,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xFD: COLLECT_MAP_02 + // 0xFD: dItem_COLLECT_MAP_02_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7991,7 +7991,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xFE: COLLECT_MAP_01 + // 0xFE: dItem_COLLECT_MAP_01_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -8084,42 +8084,42 @@ dItem_data_item_info dItem_data::item_info[0x100] = { 0x01, }, { - // 0x09: S_MAGIC + // 0x09: dItem_SMALL_MAGIC_e 0x14, 0x28, 0x1E, 0x00, }, { - // 0x0A: L_MAGIC + // 0x0A: dItem_LARGE_MAGIC_e 0x19, 0x50, 0x1E, 0x00, }, { - // 0x0B: BOMB_5 + // 0x0B: dItem_BOMB_5_e 0x28, 0x3C, 0x1E, 0x00, }, { - // 0x0C: BOMB_10 + // 0x0C: dItem_BOMB_10_e 0x28, 0x3C, 0x1E, 0x00, }, { - // 0x0D: BOMB_20 + // 0x0D: dItem_BOMB_20_e 0x28, 0x3C, 0x1E, 0x00, }, { - // 0x0E: BOMB_30 + // 0x0E: dItem_BOMB_30_e 0x28, 0x3C, 0x1E, @@ -8133,21 +8133,21 @@ dItem_data_item_info dItem_data::item_info[0x100] = { 0x00, }, { - // 0x10: ARROW_10 + // 0x10: dItem_ARROW_10_e 0x14, 0x50, 0x32, 0x00, }, { - // 0x11: ARROW_20 + // 0x11: dItem_ARROW_20_e 0x14, 0x50, 0x32, 0x00, }, { - // 0x12: ARROW_30 + // 0x12: dItem_ARROW_30_e 0x14, 0x50, 0x32, @@ -8175,7 +8175,7 @@ dItem_data_item_info dItem_data::item_info[0x100] = { 0x05, }, { - // 0x16: RECOVER_FAIRY + // 0x16: dItem_RECOVER_FAIRY_e 0x1E, 0x3C, 0x1E, @@ -8203,7 +8203,7 @@ dItem_data_item_info dItem_data::item_info[0x100] = { 0x00, }, { - // 0x1A: SUB_DUN_RUPEE + // 0x1A: dItem_SUB_DUN_RUPEE_e 0x00, 0x00, 0x00, @@ -8273,7 +8273,7 @@ dItem_data_item_info dItem_data::item_info[0x100] = { 0x00, }, { - // 0x24: EMONO_BAG + // 0x24: dItem_SPOILS_BAG_e 0x00, 0x00, 0x00, @@ -8301,7 +8301,7 @@ dItem_data_item_info dItem_data::item_info[0x100] = { 0x00, }, { - // 0x28: PWR_GROOVE + // 0x28: dItem_POWER_BRACELETS_e 0x00, 0x00, 0x00, @@ -8329,7 +8329,7 @@ dItem_data_item_info dItem_data::item_info[0x100] = { 0x00, }, { - // 0x2C: ESA_BAG + // 0x2C: dItem_BAIT_BAG_e 0x00, 0x28, 0x28, @@ -8413,49 +8413,49 @@ dItem_data_item_info dItem_data::item_info[0x100] = { 0x00, }, { - // 0x38: SWORD + // 0x38: dItem_SWORD_e 0x1E, 0x32, 0x1E, 0x10, }, { - // 0x39: MASTER_SWORD + // 0x39: dItem_MASTER_SWORD_1_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x3A: LV3_SWORD + // 0x3A: dItem_MASTER_SWORD_2_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x3B: SHIELD + // 0x3B: dItem_SHIELD_e 0x28, 0x3C, 0x28, 0x10, }, { - // 0x3C: MIRROR_SHIELD + // 0x3C: dItem_MIRROR_SHIELD_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x3D: DROPPED_SWORD + // 0x3D: dItem_DROPPED_SWORD_e 0x00, 0x32, 0x1E, 0x10, }, { - // 0x3E: MASTER_SWORD_EX + // 0x3E: dItem_MASTER_SWORD_3_e 0x00, 0x00, 0x00, @@ -8483,14 +8483,14 @@ dItem_data_item_info dItem_data::item_info[0x100] = { 0x00, }, { - // 0x42: PIRATES_OMAMORI + // 0x42: dItem_PIRATES_CHARM_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x43: HEROS_OMAMORI + // 0x43: dItem_HEROS_CHARM_e 0x00, 0x00, 0x00, @@ -8504,21 +8504,21 @@ dItem_data_item_info dItem_data::item_info[0x100] = { 0x00, }, { - // 0x45: SKULL_NECKLACE + // 0x45: dItem_SKULL_NECKLACE_e 0x28, 0x5A, 0x32, 0x00, }, { - // 0x46: BOKOBABA_SEED + // 0x46: dItem_BOKOBABA_SEED_e 0x1E, 0x50, 0x28, 0x00, }, { - // 0x47: GOLDEN_FEATHER + // 0x47: dItem_GOLDEN_FEATHER_e 0x1E, 0x5A, 0x28, @@ -8532,21 +8532,21 @@ dItem_data_item_info dItem_data::item_info[0x100] = { 0x00, }, { - // 0x49: RED_JELLY + // 0x49: dItem_RED_JELLY_e 0x19, 0x46, 0x28, 0x00, }, { - // 0x4A: GREEN_JELLY + // 0x4A: dItem_GREEN_JELLY_e 0x19, 0x46, 0x28, 0x00, }, { - // 0x4B: BLUE_JELLY + // 0x4B: dItem_BLUE_JELLY_e 0x19, 0x46, 0x28, @@ -8581,28 +8581,28 @@ dItem_data_item_info dItem_data::item_info[0x100] = { 0x00, }, { - // 0x50: EMPTY_BOTTLE + // 0x50: dItem_EMPTY_BOTTLE_e 0x00, 0x28, 0x28, 0x00, }, { - // 0x51: RED_BOTTLE + // 0x51: dItem_RED_POTION_e 0x00, 0x28, 0x28, 0x00, }, { - // 0x52: GREEN_BOTTLE + // 0x52: dItem_GREEN_POTION_e 0x00, 0x28, 0x28, 0x00, }, { - // 0x53: BLUE_BOTTLE + // 0x53: dItem_BLUE_POTION_e 0x00, 0x28, 0x28, @@ -8623,28 +8623,28 @@ dItem_data_item_info dItem_data::item_info[0x100] = { 0x00, }, { - // 0x56: BIN_IN_WATER + // 0x56: dItem_WATER_BOTTLE_e 0x00, 0x28, 0x28, 0x00, }, { - // 0x57: FAIRY_BOTTLE + // 0x57: dItem_FAIRY_BOTTLE_e 0x00, 0x28, 0x28, 0x00, }, { - // 0x58: FIREFLY_BOTTLE + // 0x58: dItem_FIREFLY_BOTTLE_e 0x00, 0x28, 0x28, 0x00, }, { - // 0x59: FWATER_BOTTLE + // 0x59: dItem_FOREST_WATER_e 0x00, 0x28, 0x28, @@ -8931,7 +8931,7 @@ dItem_data_item_info dItem_data::item_info[0x100] = { 0x00, }, { - // 0x82: BIRD_ESA_5 + // 0x82: dItem_BIRD_BAIT_5_e 0x19, 0x37, 0x23, @@ -9218,56 +9218,56 @@ dItem_data_item_info dItem_data::item_info[0x100] = { 0x00, }, { - // 0xAB: MAX_RUPEE_UP1 + // 0xAB: dItem_MAX_RUPEE_UP1_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xAC: MAX_RUPEE_UP2 + // 0xAC: dItem_MAX_RUPEE_UP2_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xAD: MAX_BOMB_UP1 + // 0xAD: dItem_MAX_BOMB_UP1_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xAE: MAX_BOMB_UP2 + // 0xAE: dItem_MAX_BOMB_UP2_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xAF: MAX_ARROW_UP1 + // 0xAF: dItem_MAX_ARROW_UP1_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xB0: MAX_ARROW_UP2 + // 0xB0: dItem_MAX_ARROW_UP2_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xB1: MAGIC_POWER + // 0xB1: dItem_MAGIC_POWER_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xB2: MAX_MP_UP1 + // 0xB2: dItem_MAX_MP_UP1_e 0x00, 0x00, 0x00, @@ -9358,448 +9358,448 @@ dItem_data_item_info dItem_data::item_info[0x100] = { 0x00, }, { - // 0xBF: COLLECT_MAP_64 + // 0xBF: dItem_COLLECT_MAP_64_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xC0: COLLECT_MAP_63 + // 0xC0: dItem_COLLECT_MAP_63_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xC1: COLLECT_MAP_62 + // 0xC1: dItem_COLLECT_MAP_62_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xC2: COLLECT_MAP_61 + // 0xC2: dItem_COLLECT_MAP_61_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xC3: COLLECT_MAP_60 + // 0xC3: dItem_COLLECT_MAP_60_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xC4: COLLECT_MAP_59 + // 0xC4: dItem_COLLECT_MAP_59_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xC5: COLLECT_MAP_58 + // 0xC5: dItem_COLLECT_MAP_58_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xC6: COLLECT_MAP_57 + // 0xC6: dItem_COLLECT_MAP_57_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xC7: COLLECT_MAP_56 + // 0xC7: dItem_COLLECT_MAP_56_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xC8: COLLECT_MAP_55 + // 0xC8: dItem_COLLECT_MAP_55_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xC9: COLLECT_MAP_54 + // 0xC9: dItem_COLLECT_MAP_54_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xCA: COLLECT_MAP_53 + // 0xCA: dItem_COLLECT_MAP_53_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xCB: COLLECT_MAP_52 + // 0xCB: dItem_COLLECT_MAP_52_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xCC: COLLECT_MAP_51 + // 0xCC: dItem_COLLECT_MAP_51_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xCD: COLLECT_MAP_50 + // 0xCD: dItem_COLLECT_MAP_50_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xCE: COLLECT_MAP_49 + // 0xCE: dItem_COLLECT_MAP_49_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xCF: COLLECT_MAP_48 + // 0xCF: dItem_COLLECT_MAP_48_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xD0: COLLECT_MAP_47 + // 0xD0: dItem_COLLECT_MAP_47_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xD1: COLLECT_MAP_46 + // 0xD1: dItem_COLLECT_MAP_46_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xD2: COLLECT_MAP_45 + // 0xD2: dItem_COLLECT_MAP_45_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xD3: COLLECT_MAP_44 + // 0xD3: dItem_COLLECT_MAP_44_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xD4: COLLECT_MAP_43 + // 0xD4: dItem_COLLECT_MAP_43_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xD5: COLLECT_MAP_42 + // 0xD5: dItem_COLLECT_MAP_42_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xD6: COLLECT_MAP_41 + // 0xD6: dItem_COLLECT_MAP_41_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xD7: COLLECT_MAP_40 + // 0xD7: dItem_COLLECT_MAP_40_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xD8: COLLECT_MAP_39 + // 0xD8: dItem_COLLECT_MAP_39_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xD9: COLLECT_MAP_38 + // 0xD9: dItem_COLLECT_MAP_38_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xDA: COLLECT_MAP_37 + // 0xDA: dItem_COLLECT_MAP_37_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xDB: COLLECT_MAP_36 + // 0xDB: dItem_COLLECT_MAP_36_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xDC: COLLECT_MAP_35 + // 0xDC: dItem_COLLECT_MAP_35_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xDD: COLLECT_MAP_34 + // 0xDD: dItem_COLLECT_MAP_34_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xDE: COLLECT_MAP_33 + // 0xDE: dItem_COLLECT_MAP_33_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xDF: COLLECT_MAP_32 + // 0xDF: dItem_COLLECT_MAP_32_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xE0: COLLECT_MAP_31 + // 0xE0: dItem_COLLECT_MAP_31_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xE1: COLLECT_MAP_30 + // 0xE1: dItem_COLLECT_MAP_30_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xE2: COLLECT_MAP_29 + // 0xE2: dItem_COLLECT_MAP_29_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xE3: COLLECT_MAP_28 + // 0xE3: dItem_COLLECT_MAP_28_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xE4: COLLECT_MAP_27 + // 0xE4: dItem_COLLECT_MAP_27_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xE5: COLLECT_MAP_26 + // 0xE5: dItem_COLLECT_MAP_26_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xE6: COLLECT_MAP_25 + // 0xE6: dItem_COLLECT_MAP_25_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xE7: COLLECT_MAP_24 + // 0xE7: dItem_COLLECT_MAP_24_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xE8: COLLECT_MAP_23 + // 0xE8: dItem_COLLECT_MAP_23_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xE9: COLLECT_MAP_22 + // 0xE9: dItem_COLLECT_MAP_22_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xEA: COLLECT_MAP_21 + // 0xEA: dItem_COLLECT_MAP_21_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xEB: COLLECT_MAP_20 + // 0xEB: dItem_COLLECT_MAP_20_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xEC: COLLECT_MAP_19 + // 0xEC: dItem_COLLECT_MAP_19_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xED: COLLECT_MAP_18 + // 0xED: dItem_COLLECT_MAP_18_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xEE: COLLECT_MAP_17 + // 0xEE: dItem_COLLECT_MAP_17_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xEF: COLLECT_MAP_16 + // 0xEF: dItem_COLLECT_MAP_16_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xF0: COLLECT_MAP_15 + // 0xF0: dItem_COLLECT_MAP_15_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xF1: COLLECT_MAP_14 + // 0xF1: dItem_COLLECT_MAP_14_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xF2: COLLECT_MAP_13 + // 0xF2: dItem_COLLECT_MAP_13_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xF3: COLLECT_MAP_12 + // 0xF3: dItem_COLLECT_MAP_12_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xF4: COLLECT_MAP_11 + // 0xF4: dItem_COLLECT_MAP_11_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xF5: COLLECT_MAP_10 + // 0xF5: dItem_COLLECT_MAP_10_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xF6: COLLECT_MAP_09 + // 0xF6: dItem_COLLECT_MAP_09_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xF7: COLLECT_MAP_08 + // 0xF7: dItem_COLLECT_MAP_08_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xF8: COLLECT_MAP_07 + // 0xF8: dItem_COLLECT_MAP_07_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xF9: COLLECT_MAP_06 + // 0xF9: dItem_COLLECT_MAP_06_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xFA: COLLECT_MAP_05 + // 0xFA: dItem_COLLECT_MAP_05_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xFB: COLLECT_MAP_04 + // 0xFB: dItem_COLLECT_MAP_04_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xFC: COLLECT_MAP_03 + // 0xFC: dItem_COLLECT_MAP_03_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xFD: COLLECT_MAP_02 + // 0xFD: dItem_COLLECT_MAP_02_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xFE: COLLECT_MAP_01 + // 0xFE: dItem_COLLECT_MAP_01_e 0x00, 0x00, 0x00, @@ -9862,32 +9862,32 @@ dItem_data_effect_info dItem_data::effect_info[] = { 0x0293, }, { - // 0x09: S_MAGIC + // 0x09: dItem_SMALL_MAGIC_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x0A: L_MAGIC + // 0x0A: dItem_LARGE_MAGIC_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x0B: BOMB_5 + // 0x0B: dItem_BOMB_5_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x0C: BOMB_10 + // 0x0C: dItem_BOMB_10_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x0D: BOMB_20 + // 0x0D: dItem_BOMB_20_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x0E: BOMB_30 + // 0x0E: dItem_BOMB_30_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, @@ -9897,17 +9897,17 @@ dItem_data_effect_info dItem_data::effect_info[] = { dPa_name::ID_SCENE_END, }, { - // 0x10: ARROW_10 + // 0x10: dItem_ARROW_10_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x11: ARROW_20 + // 0x11: dItem_ARROW_20_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x12: ARROW_30 + // 0x12: dItem_ARROW_30_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, @@ -9927,7 +9927,7 @@ dItem_data_effect_info dItem_data::effect_info[] = { dPa_name::ID_SCENE_END, }, { - // 0x16: RECOVER_FAIRY + // 0x16: dItem_RECOVER_FAIRY_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, @@ -9947,7 +9947,7 @@ dItem_data_effect_info dItem_data::effect_info[] = { dPa_name::ID_SCENE_END, }, { - // 0x1A: SUB_DUN_RUPEE + // 0x1A: dItem_SUB_DUN_RUPEE_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, @@ -9997,7 +9997,7 @@ dItem_data_effect_info dItem_data::effect_info[] = { dPa_name::ID_SCENE_END, }, { - // 0x24: EMONO_BAG + // 0x24: dItem_SPOILS_BAG_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, @@ -10017,7 +10017,7 @@ dItem_data_effect_info dItem_data::effect_info[] = { dPa_name::ID_SCENE_END, }, { - // 0x28: PWR_GROOVE + // 0x28: dItem_POWER_BRACELETS_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, @@ -10037,7 +10037,7 @@ dItem_data_effect_info dItem_data::effect_info[] = { dPa_name::ID_SCENE_END, }, { - // 0x2C: ESA_BAG + // 0x2C: dItem_BAIT_BAG_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, @@ -10097,37 +10097,37 @@ dItem_data_effect_info dItem_data::effect_info[] = { dPa_name::ID_SCENE_END, }, { - // 0x38: SWORD + // 0x38: dItem_SWORD_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x39: MASTER_SWORD + // 0x39: dItem_MASTER_SWORD_1_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x3A: LV3_SWORD + // 0x3A: dItem_MASTER_SWORD_2_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x3B: SHIELD + // 0x3B: dItem_SHIELD_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x3C: MIRROR_SHIELD + // 0x3C: dItem_MIRROR_SHIELD_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x3D: DROPPED_SWORD + // 0x3D: dItem_DROPPED_SWORD_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x3E: MASTER_SWORD_EX + // 0x3E: dItem_MASTER_SWORD_3_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, @@ -10147,12 +10147,12 @@ dItem_data_effect_info dItem_data::effect_info[] = { dPa_name::ID_SCENE_END, }, { - // 0x42: PIRATES_OMAMORI + // 0x42: dItem_PIRATES_CHARM_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x43: HEROS_OMAMORI + // 0x43: dItem_HEROS_CHARM_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, @@ -10162,17 +10162,17 @@ dItem_data_effect_info dItem_data::effect_info[] = { dPa_name::ID_SCENE_END, }, { - // 0x45: SKULL_NECKLACE + // 0x45: dItem_SKULL_NECKLACE_e dPa_name::ID_SCENE_END, 0x0293, }, { - // 0x46: BOKOBABA_SEED + // 0x46: dItem_BOKOBABA_SEED_e dPa_name::ID_SCENE_END, 0x0293, }, { - // 0x47: GOLDEN_FEATHER + // 0x47: dItem_GOLDEN_FEATHER_e dPa_name::ID_SCENE_END, 0x0293, }, @@ -10182,17 +10182,17 @@ dItem_data_effect_info dItem_data::effect_info[] = { 0x0293, }, { - // 0x49: RED_JELLY + // 0x49: dItem_RED_JELLY_e dPa_name::ID_SCENE_END, 0x0293, }, { - // 0x4A: GREEN_JELLY + // 0x4A: dItem_GREEN_JELLY_e dPa_name::ID_SCENE_END, 0x0293, }, { - // 0x4B: BLUE_JELLY + // 0x4B: dItem_BLUE_JELLY_e dPa_name::ID_SCENE_END, 0x0293, }, @@ -10217,22 +10217,22 @@ dItem_data_effect_info dItem_data::effect_info[] = { dPa_name::ID_SCENE_END, }, { - // 0x50: EMPTY_BOTTLE + // 0x50: dItem_EMPTY_BOTTLE_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x51: RED_BOTTLE + // 0x51: dItem_RED_POTION_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x52: GREEN_BOTTLE + // 0x52: dItem_GREEN_POTION_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x53: BLUE_BOTTLE + // 0x53: dItem_BLUE_POTION_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, @@ -10247,22 +10247,22 @@ dItem_data_effect_info dItem_data::effect_info[] = { dPa_name::ID_SCENE_END, }, { - // 0x56: BIN_IN_WATER + // 0x56: dItem_WATER_BOTTLE_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x57: FAIRY_BOTTLE + // 0x57: dItem_FAIRY_BOTTLE_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x58: FIREFLY_BOTTLE + // 0x58: dItem_FIREFLY_BOTTLE_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x59: FWATER_BOTTLE + // 0x59: dItem_FOREST_WATER_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, diff --git a/src/d/d_save.cpp b/src/d/d_save.cpp index 82070f1a..3e97c2d5 100644 --- a/src/d/d_save.cpp +++ b/src/d/d_save.cpp @@ -93,7 +93,7 @@ void dSv_player_item_c::setBottleItemIn(u8 prevItemNo, u8 newItemNo) { /* 80058E1C-80058E44 .text setEmptyBottleItemIn__17dSv_player_item_cFUc */ void dSv_player_item_c::setEmptyBottleItemIn(u8 i_itemNo) { - setBottleItemIn(EMPTY_BOTTLE, i_itemNo); + setBottleItemIn(dItem_EMPTY_BOTTLE_e, i_itemNo); } /* 80058E44-80058F74 .text setEmptyBottle__17dSv_player_item_cFv */ @@ -101,7 +101,7 @@ void dSv_player_item_c::setEmptyBottle() { for (int bottleIdx = 0; bottleIdx < dInvSlot_BOTTLE_COUNT_e; bottleIdx++) { int invIdx = dInvSlot_BOTTLE0_e + bottleIdx; if (dComIfGs_getItem((u8)invIdx) == dItem_NONE_e) { - dComIfGs_setItem((u8)invIdx, EMPTY_BOTTLE); + dComIfGs_setItem((u8)invIdx, dItem_EMPTY_BOTTLE_e); break; } } @@ -124,7 +124,7 @@ void dSv_player_item_c::setEquipBottleItemIn(u8 i_itemBtn, u8 i_itemNo) { /* 8005918C-800591B0 .text setEquipBottleItemEmpty__17dSv_player_item_cFUc */ void dSv_player_item_c::setEquipBottleItemEmpty(u8 i_itemBtn) { - setEquipBottleItemIn(i_itemBtn, EMPTY_BOTTLE); + setEquipBottleItemIn(i_itemBtn, dItem_EMPTY_BOTTLE_e); } /* 800591B0-80059408 .text setEquipBottleItemIn__17dSv_player_item_cFUc */ @@ -158,7 +158,7 @@ void dSv_player_item_c::setEquipBottleItemIn(u8 i_itemNo) { /* 80059408-8005942C .text setEquipBottleItemEmpty__17dSv_player_item_cFv */ void dSv_player_item_c::setEquipBottleItemEmpty() { - setEquipBottleItemIn(EMPTY_BOTTLE); + setEquipBottleItemIn(dItem_EMPTY_BOTTLE_e); } /* 8005942C-8005946C .text checkBottle__17dSv_player_item_cFUc */ @@ -179,7 +179,7 @@ u8 dSv_player_item_c::checkEmptyBottle() { u8 ret = 0; for (int i = 0; i < dInvSlot_BOTTLE_COUNT_e; i++) { - if (mItems[i + dInvSlot_BOTTLE0_e] == EMPTY_BOTTLE) { + if (mItems[i + dInvSlot_BOTTLE0_e] == dItem_EMPTY_BOTTLE_e) { ret++; } } @@ -214,16 +214,16 @@ void dSv_player_get_item_c::onBottleItem(u8 i_item) { case EMPTY_BSHIP: mItemFlags[0] |= 0x02; break; - case EMPTY_BOTTLE: + case dItem_EMPTY_BOTTLE_e: mItemFlags[0] |= 0x04; break; - case RED_BOTTLE: + case dItem_RED_POTION_e: mItemFlags[0] |= 0x08; break; - case GREEN_BOTTLE: + case dItem_GREEN_POTION_e: mItemFlags[0] |= 0x10; break; - case BLUE_BOTTLE: + case dItem_BLUE_POTION_e: mItemFlags[0] |= 0x20; break; case dItem_HALF_SOUP_BOTTLE_e: @@ -232,16 +232,16 @@ void dSv_player_get_item_c::onBottleItem(u8 i_item) { case dItem_SOUP_BOTTLE_e: mItemFlags[0] |= 0x80; break; - case BIN_IN_WATER: + case dItem_WATER_BOTTLE_e: mItemFlags[1] |= 0x02; break; - case FAIRY_BOTTLE: + case dItem_FAIRY_BOTTLE_e: mItemFlags[1] |= 0x04; break; - case FIREFLY_BOTTLE: + case dItem_FIREFLY_BOTTLE_e: mItemFlags[1] |= 0x08; break; - case FWATER_BOTTLE: + case dItem_FOREST_WATER_e: mItemFlags[1] |= 0x10; break; case UNK_BOTTLE_5A: @@ -273,25 +273,25 @@ BOOL dSv_player_get_item_c::isBottleItem(u8 i_item) { switch (i_item) { case EMPTY_BSHIP: return (mItemFlags[0] >> 1) & 1; - case EMPTY_BOTTLE: + case dItem_EMPTY_BOTTLE_e: return (mItemFlags[0] >> 2) & 1; - case RED_BOTTLE: + case dItem_RED_POTION_e: return (mItemFlags[0] >> 3) & 1; - case GREEN_BOTTLE: + case dItem_GREEN_POTION_e: return (mItemFlags[0] >> 4) & 1; - case BLUE_BOTTLE: + case dItem_BLUE_POTION_e: return (mItemFlags[0] >> 5) & 1; case dItem_HALF_SOUP_BOTTLE_e: return (mItemFlags[0] >> 6) & 1; case dItem_SOUP_BOTTLE_e: return (mItemFlags[0] >> 7) & 1; - case BIN_IN_WATER: + case dItem_WATER_BOTTLE_e: return (mItemFlags[1] >> 1) & 1; - case FAIRY_BOTTLE: + case dItem_FAIRY_BOTTLE_e: return (mItemFlags[1] >> 2) & 1; - case FIREFLY_BOTTLE: + case dItem_FIREFLY_BOTTLE_e: return (mItemFlags[1] >> 3) & 1; - case FWATER_BOTTLE: + case dItem_FOREST_WATER_e: return (mItemFlags[1] >> 4) & 1; case UNK_BOTTLE_5A: return (mItemFlags[1] >> 5) & 1; @@ -491,7 +491,7 @@ void dSv_player_bag_item_c::setBaitItemEmpty() { if (itemNo == dItem_HYOI_PEAR_e) { u8 num = dComIfGs_getBaitNum(baitSlotIdx); setBaitItemChange(dItem_NONE_e); - } else if (itemNo == BIRD_ESA_5) { + } else if (itemNo == dItem_BIRD_BAIT_5_e) { num = dComIfGs_getBaitNum(baitSlotIdx); if (num > 0) { num = num - 1; @@ -524,7 +524,7 @@ void dSv_player_bag_item_c::setBaitItemEmpty(u8 i_itemBtn) { if (itemNo == dItem_HYOI_PEAR_e) { u8 num = dComIfGs_getBaitNum(baitSlotIdx); setBaitItemChange(i_itemBtn, dItem_NONE_e); - } else if (itemNo == BIRD_ESA_5) { + } else if (itemNo == dItem_BIRD_BAIT_5_e) { num = dComIfGs_getBaitNum(baitSlotIdx); if (num > 0) { num = num - 1; diff --git a/src/d/d_shop.cpp b/src/d/d_shop.cpp index 463c0425..2eaaf659 100644 --- a/src/d/d_shop.cpp +++ b/src/d/d_shop.cpp @@ -29,86 +29,86 @@ u32 default_select_msg[] = { }; ShopItems_c__ItemData shopItemData_Feedbag = { - /* mItemNo */ ESA_BAG, - /* mMustNotOwnItemNo */ ESA_BAG, + /* mItemNo */ dItem_BAIT_BAG_e, + /* mMustNotOwnItemNo */ dItem_BAIT_BAG_e, /* mMustOwnItemNo */ -1, /* mBuyConditions */ Shop_BuyCond_RUPEES_e | Shop_BuyCond_MUST_NOT_OWN_ITEM_e, }; ShopItems_c__ItemData shopItemData_FoodAll = { - /* mItemNo */ BIRD_ESA_5, - /* mMustNotOwnItemNo */ BIRD_ESA_5, - /* mMustOwnItemNo */ ESA_BAG, + /* mItemNo */ dItem_BIRD_BAIT_5_e, + /* mMustNotOwnItemNo */ dItem_BIRD_BAIT_5_e, + /* mMustOwnItemNo */ dItem_BAIT_BAG_e, /* mBuyConditions */ Shop_BuyCond_RUPEES_e | Shop_BuyCond_MAXIMUM_e | Shop_BuyCond_MUST_OWN_ITEM_e, }; ShopItems_c__ItemData shopItemData_FoodHyoi = { /* mItemNo */ dItem_HYOI_PEAR_e, /* mMustNotOwnItemNo */ dItem_HYOI_PEAR_e, - /* mMustOwnItemNo */ ESA_BAG, + /* mMustOwnItemNo */ dItem_BAIT_BAG_e, /* mBuyConditions */ Shop_BuyCond_RUPEES_e | Shop_BuyCond_MAXIMUM_e | Shop_BuyCond_MUST_OWN_ITEM_e, }; ShopItems_c__ItemData shopItemData_arrow10 = { - /* mItemNo */ ARROW_10, - /* mMustNotOwnItemNo */ ARROW_10, + /* mItemNo */ dItem_ARROW_10_e, + /* mMustNotOwnItemNo */ dItem_ARROW_10_e, /* mMustOwnItemNo */ dItem_BOW_e, /* mBuyConditions */ Shop_BuyCond_RUPEES_e | Shop_BuyCond_MAXIMUM_e | Shop_BuyCond_MUST_OWN_ITEM_e, }; ShopItems_c__ItemData shopItemData_arrow30 = { - /* mItemNo */ ARROW_30, - /* mMustNotOwnItemNo */ ARROW_30, + /* mItemNo */ dItem_ARROW_30_e, + /* mMustNotOwnItemNo */ dItem_ARROW_30_e, /* mMustOwnItemNo */ dItem_BOW_e, /* mBuyConditions */ Shop_BuyCond_RUPEES_e | Shop_BuyCond_MAXIMUM_e | Shop_BuyCond_MUST_OWN_ITEM_e, }; ShopItems_c__ItemData shopItemData_red_bottle = { - /* mItemNo */ RED_BOTTLE, - /* mMustNotOwnItemNo */ RED_BOTTLE, - /* mMustOwnItemNo */ EMPTY_BOTTLE, + /* mItemNo */ dItem_RED_POTION_e, + /* mMustNotOwnItemNo */ dItem_RED_POTION_e, + /* mMustOwnItemNo */ dItem_EMPTY_BOTTLE_e, /* mBuyConditions */ Shop_BuyCond_RUPEES_e | Shop_BuyCond_EMPTY_BOTTLE_e | Shop_BuyCond_ANY_BOTTLE_e, }; ShopItems_c__ItemData shopItemData_blue_bottle = { - /* mItemNo */ BLUE_BOTTLE, - /* mMustNotOwnItemNo */ BLUE_BOTTLE, - /* mMustOwnItemNo */ EMPTY_BOTTLE, + /* mItemNo */ dItem_BLUE_POTION_e, + /* mMustNotOwnItemNo */ dItem_BLUE_POTION_e, + /* mMustOwnItemNo */ dItem_EMPTY_BOTTLE_e, /* mBuyConditions */ Shop_BuyCond_RUPEES_e | Shop_BuyCond_EMPTY_BOTTLE_e | Shop_BuyCond_ANY_BOTTLE_e, }; ShopItems_c__ItemData shopItemData_green_bottle = { - /* mItemNo */ GREEN_BOTTLE, - /* mMustNotOwnItemNo */ GREEN_BOTTLE, - /* mMustOwnItemNo */ EMPTY_BOTTLE, + /* mItemNo */ dItem_GREEN_POTION_e, + /* mMustNotOwnItemNo */ dItem_GREEN_POTION_e, + /* mMustOwnItemNo */ dItem_EMPTY_BOTTLE_e, /* mBuyConditions */ Shop_BuyCond_RUPEES_e | Shop_BuyCond_EMPTY_BOTTLE_e | Shop_BuyCond_ANY_BOTTLE_e, }; ShopItems_c__ItemData shopItemData_bomb10 = { - /* mItemNo */ BOMB_10, - /* mMustNotOwnItemNo */ BOMB_10, + /* mItemNo */ dItem_BOMB_10_e, + /* mMustNotOwnItemNo */ dItem_BOMB_10_e, /* mMustOwnItemNo */ dItem_BOMB_BAG_e, /* mBuyConditions */ Shop_BuyCond_RUPEES_e | Shop_BuyCond_MAXIMUM_e, }; ShopItems_c__ItemData shopItemData_bomb20 = { - /* mItemNo */ BOMB_20, - /* mMustNotOwnItemNo */ BOMB_20, + /* mItemNo */ dItem_BOMB_20_e, + /* mMustNotOwnItemNo */ dItem_BOMB_20_e, /* mMustOwnItemNo */ dItem_BOMB_BAG_e, /* mBuyConditions */ Shop_BuyCond_RUPEES_e | Shop_BuyCond_MAXIMUM_e, }; ShopItems_c__ItemData shopItemData_bomb30 = { - /* mItemNo */ BOMB_30, - /* mMustNotOwnItemNo */ BOMB_30, + /* mItemNo */ dItem_BOMB_30_e, + /* mMustNotOwnItemNo */ dItem_BOMB_30_e, /* mMustOwnItemNo */ dItem_BOMB_BAG_e, /* mBuyConditions */ Shop_BuyCond_RUPEES_e | Shop_BuyCond_MAXIMUM_e, }; ShopItems_c__ItemData shopItemData_emptybottle = { - /* mItemNo */ EMPTY_BOTTLE, - /* mMustNotOwnItemNo */ EMPTY_BOTTLE, - /* mMustOwnItemNo */ EMPTY_BOTTLE, + /* mItemNo */ dItem_EMPTY_BOTTLE_e, + /* mMustNotOwnItemNo */ dItem_EMPTY_BOTTLE_e, + /* mMustOwnItemNo */ dItem_EMPTY_BOTTLE_e, /* mBuyConditions */ Shop_BuyCond_RUPEES_e, }; @@ -120,9 +120,9 @@ ShopItems_c__ItemData shopItemData_kakera_heart = { }; ShopItems_c__ItemData shopItemData_map = { - /* mItemNo */ COLLECT_MAP_30, - /* mMustNotOwnItemNo */ COLLECT_MAP_30, - /* mMustOwnItemNo */ COLLECT_MAP_30, + /* mItemNo */ dItem_COLLECT_MAP_30_e, + /* mMustNotOwnItemNo */ dItem_COLLECT_MAP_30_e, + /* mMustOwnItemNo */ dItem_COLLECT_MAP_30_e, /* mBuyConditions */ Shop_BuyCond_RUPEES_e | Shop_BuyCond_MUST_NOT_OWN_ITEM_e, }; @@ -1314,7 +1314,7 @@ BOOL dShop_now_triggercheck(msg_class* msg, STControl* stickControl, ShopItems_c /* 8006036C-8006044C .text dShop_maxCheck__Fii */ BOOL dShop_maxCheck(int itemNo, int) { - if (itemNo == BIRD_ESA_5 || itemNo == dItem_HYOI_PEAR_e) { + if (itemNo == dItem_BIRD_BAIT_5_e || itemNo == dItem_HYOI_PEAR_e) { if (!dComIfGs_checkBaitItemEmpty()) { return TRUE; } @@ -1323,11 +1323,11 @@ BOOL dShop_maxCheck(int itemNo, int) { if (dComIfGs_checkReserveItemEmpty() == 0) { return TRUE; } - } else if (itemNo >= ARROW_10 && itemNo <= ARROW_30) { + } else if (itemNo >= dItem_ARROW_10_e && itemNo <= dItem_ARROW_30_e) { if (dComIfGs_getArrowNum() == dComIfGs_getArrowMax()) { return TRUE; } - } else if (itemNo >= BOMB_5 && itemNo <= BOMB_30) { + } else if (itemNo >= dItem_BOMB_5_e && itemNo <= dItem_BOMB_30_e) { if (dComIfGs_getBombNum() == dComIfGs_getBombMax()) { return TRUE; } |