diff --git a/include/d/actor/d_a_npc_cb1.h b/include/d/actor/d_a_npc_cb1.h index 2d55573d9..d2ffda9af 100644 --- a/include/d/actor/d_a_npc_cb1.h +++ b/include/d/actor/d_a_npc_cb1.h @@ -37,7 +37,7 @@ public: virtual f32 getBaseAnimeFrame() { return 0.0f; } s16 XyCheckCB(int i_itemBtn) { - if(dComIfGp_getSelectItem(i_itemBtn) == dItem_WIND_WAKER_e && dComIfGs_isEventBit(dSv_event_flag_c::UNK_1880)) { + if(dComIfGp_getSelectItem(i_itemBtn) == dItemNo_WIND_WAKER_e && dComIfGs_isEventBit(dSv_event_flag_c::UNK_1880)) { return true; } diff --git a/include/d/actor/d_a_obj_barrel2.h b/include/d/actor/d_a_obj_barrel2.h index 71a4d68da..83fe39c2b 100644 --- a/include/d/actor/d_a_obj_barrel2.h +++ b/include/d/actor/d_a_obj_barrel2.h @@ -76,7 +76,7 @@ namespace daObjBarrel2 { fpc_ProcID get_item_id() { return mItemId; } static fpc_ProcID make_coming(cXyz* pos, int roomNo, Type_e type, int droppedItem, bool hasFlag, s16 angleY, daObjBuoyflag::Texture_e tex) { csXyz angle(0, angleY, 0); - return fopAcM_create(PROC_Obj_Barrel2, make_prm(type, droppedItem, !hasFlag, true, tex), pos, roomNo, &angle); + return fopAcM_create(fpcNm_Obj_Barrel2_e, make_prm(type, droppedItem, !hasFlag, true, tex), pos, roomNo, &angle); } static u32 make_prm(Type_e type, int droppedItem, bool hasFlag, bool _unused, daObjBuoyflag::Texture_e tex) { int itemNo = (droppedItem & 0x3F); diff --git a/include/d/actor/d_a_obj_barrier.h b/include/d/actor/d_a_obj_barrier.h index 8be88788a..c4298bdd7 100644 --- a/include/d/actor/d_a_obj_barrier.h +++ b/include/d/actor/d_a_obj_barrier.h @@ -55,10 +55,10 @@ public: class daObjBarrier_c : public fopAc_ac_c { public: - enum PROC_e { - PROC_BREAK_START_WAIT, - PROC_BREAK_ORDER, - PROC_BREAK_END_WAIT, + enum Proc_e { + PROC_BREAK_START_WAIT_e, + PROC_BREAK_ORDER_e, + PROC_BREAK_END_WAIT_e, }; enum Param_e { PRM_DAMAGE_W = 0x01, diff --git a/include/d/actor/d_a_obj_buoyflag.h b/include/d/actor/d_a_obj_buoyflag.h index 5899c5ea2..4be7c4aa5 100644 --- a/include/d/actor/d_a_obj_buoyflag.h +++ b/include/d/actor/d_a_obj_buoyflag.h @@ -3,7 +3,6 @@ #include "f_op/f_op_actor.h" #include "m_Do/m_Do_mtx.h" -#include "d/d_procname.h" #include "f_op/f_op_actor_mng.h" namespace daObjBuoyflag { @@ -53,7 +52,7 @@ namespace daObjBuoyflag { public: static fpc_ProcID make_norm(fpc_ProcID parentPId, cXyz* pos, int roomNo, csXyz* angle) { u32 params = prm_make(Type_UNK0_e, Texture_00_e, false); - return fopAcM_createChild(PROC_Obj_Buoyflag, parentPId, params, pos, roomNo, angle); + return fopAcM_createChild(fpcNm_Obj_Buoyflag_e, parentPId, params, pos, roomNo, angle); } static u32 prm_make(Type_e type, Texture_e texture, bool arg2) { s32 b = arg2 ? 1 : 0; @@ -68,11 +67,11 @@ namespace daObjBuoyflag { void jump_to_sea(float, float, short) {} static fpc_ProcID make_barrel2_mine(fpc_ProcID parent, cXyz* pos, int room, csXyz* angle, Texture_e texture, bool arg5) { u32 params = prm_make(Type_UNK2_e, texture, arg5); - return fopAcM_createChild(PROC_Obj_Buoyflag, parent, params, pos, room, angle); + return fopAcM_createChild(fpcNm_Obj_Buoyflag_e, parent, params, pos, room, angle); } static fpc_ProcID make_barrel2_norm(fpc_ProcID parent, cXyz* pos, int room, csXyz* angle, Texture_e texture) { u32 params = prm_make(Type_UNK1_e, texture, false); - return fopAcM_createChild(PROC_Obj_Buoyflag, parent, params, pos, room, angle); + return fopAcM_createChild(fpcNm_Obj_Buoyflag_e, parent, params, pos, room, angle); } void attr_type() const; // weak but not inlined? void prm_get_noCull() const {} diff --git a/include/d/actor/d_a_obj_eff.h b/include/d/actor/d_a_obj_eff.h index 5aff83ba8..efe3f7b15 100644 --- a/include/d/actor/d_a_obj_eff.h +++ b/include/d/actor/d_a_obj_eff.h @@ -5,7 +5,6 @@ #include "f_op/f_op_actor.h" #include "f_op/f_op_actor_mng.h" #include "d/d_particle.h" -#include "d/d_procname.h" namespace daObjEff { class Act_c : public fopAc_ac_c { @@ -31,16 +30,16 @@ namespace daObjEff { int prm_get_type() const { return daObj::PrmAbstract(this, PRM_TYPE_W, PRM_TYPE_S); } - static void make_barrel_smoke(cXyz* pos) { fopAcM_create(PROC_Obj_Eff, Type_BARREL_SMOKE_e, pos); } - static void make_stool_smoke(cXyz* pos) { fopAcM_create(PROC_Obj_Eff, Type_STOOL_SMOKE_e, pos); } - static void make_skull_smoke(cXyz* pos) { fopAcM_create(PROC_Obj_Eff, Type_SKULL_SMOKE_e, pos); } + static void make_barrel_smoke(cXyz* pos) { fopAcM_create(fpcNm_Obj_Eff_e, Type_BARREL_SMOKE_e, pos); } + static void make_stool_smoke(cXyz* pos) { fopAcM_create(fpcNm_Obj_Eff_e, Type_STOOL_SMOKE_e, pos); } + static void make_skull_smoke(cXyz* pos) { fopAcM_create(fpcNm_Obj_Eff_e, Type_SKULL_SMOKE_e, pos); } static void make_land_smoke(cXyz* i_pos, f32 i_scale) { cXyz scale(i_scale, i_scale, i_scale); scale *= (5.0f / 3.0f); - fopAcM_create(PROC_Obj_Eff, Type_LAND_SMOKE_e, i_pos, -1, NULL, &scale); + fopAcM_create(fpcNm_Obj_Eff_e, Type_LAND_SMOKE_e, i_pos, -1, NULL, &scale); } - static void make_pinecone_smoke(cXyz* pos) { fopAcM_create(PROC_Obj_Eff, Type_PINECONE_SMOKE_e, pos); } - static void make_woodBox_smoke(cXyz* pos) { fopAcM_create(PROC_Obj_Eff, Type_WOODBOX_SMOKE_e, pos); } + static void make_pinecone_smoke(cXyz* pos) { fopAcM_create(fpcNm_Obj_Eff_e, Type_PINECONE_SMOKE_e, pos); } + static void make_woodBox_smoke(cXyz* pos) { fopAcM_create(fpcNm_Obj_Eff_e, Type_WOODBOX_SMOKE_e, pos); } static BOOL solidHeapCB(fopAc_ac_c*); bool create_heap_barrel_smoke(); diff --git a/include/d/actor/d_a_player.h b/include/d/actor/d_a_player.h index 525d0ae53..58cda40d7 100644 --- a/include/d/actor/d_a_player.h +++ b/include/d/actor/d_a_player.h @@ -595,15 +595,15 @@ public: BOOL checkGrabWear() const { return field_0x2b0 < 0.0f; } BOOL checkNormalSwordEquip() const { - return dComIfGs_getSelectEquip(0) == dItem_SWORD_e || checkSwordMiniGame(); + return dComIfGs_getSelectEquip(0) == dItemNo_SWORD_e || checkSwordMiniGame(); } BOOL checkMasterSwordEquip() const { - return dComIfGs_getSelectEquip(0) == dItem_MASTER_SWORD_1_e || - dComIfGs_getSelectEquip(0) == dItem_MASTER_SWORD_2_e || - dComIfGs_getSelectEquip(0) == dItem_MASTER_SWORD_3_e; + return dComIfGs_getSelectEquip(0) == dItemNo_MASTER_SWORD_1_e || + dComIfGs_getSelectEquip(0) == dItemNo_MASTER_SWORD_2_e || + dComIfGs_getSelectEquip(0) == dItemNo_MASTER_SWORD_3_e; } BOOL checkFinalMasterSwordEquip() const { - return dComIfGs_getSelectEquip(0) == dItem_MASTER_SWORD_3_e; + return dComIfGs_getSelectEquip(0) == dItemNo_MASTER_SWORD_3_e; } void setFace(daPy_FACE face) { mFace = face; } diff --git a/include/d/actor/d_a_player_main.h b/include/d/actor/d_a_player_main.h index e26bc7d40..dedc733d7 100644 --- a/include/d/actor/d_a_player_main.h +++ b/include/d/actor/d_a_player_main.h @@ -1869,11 +1869,11 @@ public: void getBombWaterPillarBtk() {} // mpGwp00BtkData? BOOL checkSwordEquip() const { - return dComIfGs_getSelectEquip(0) != dItem_NONE_e || checkSwordMiniGame(); + return dComIfGs_getSelectEquip(0) != dItemNo_NONE_e || checkSwordMiniGame(); } - BOOL checkShieldEquip() const { return dComIfGs_getSelectEquip(1) != dItem_NONE_e; } - BOOL checkMirrorShieldEquip() const { return dComIfGs_getSelectEquip(1) == dItem_MIRROR_SHIELD_e; } - BOOL checkPowerGloveEquip() const { return dComIfGs_getSelectEquip(2) == dItem_POWER_BRACELETS_e; } + BOOL checkShieldEquip() const { return dComIfGs_getSelectEquip(1) != dItemNo_NONE_e; } + BOOL checkMirrorShieldEquip() const { return dComIfGs_getSelectEquip(1) == dItemNo_MIRROR_SHIELD_e; } + BOOL checkPowerGloveEquip() const { return dComIfGs_getSelectEquip(2) == dItemNo_POWER_BRACELETS_e; } int getStartRoomNo() { return fopAcM_GetParam(this) & 0x3F; } int getStartMode() { return (fopAcM_GetParam(this) >> 0x0C) & 0xF; } diff --git a/include/d/d_com_inf_game.h b/include/d/d_com_inf_game.h index 1e5552273..c36be4341 100644 --- a/include/d/d_com_inf_game.h +++ b/include/d/d_com_inf_game.h @@ -1860,7 +1860,7 @@ inline BOOL dComIfGs_checkEmptyBottle() { inline BOOL dComIfGs_checkGetBottle() { u8 bottleCount = 0; for (int i = 0; i < 4; i++) { - if (dComIfGs_getItem(dInvSlot_BOTTLE0_e + i) != dItem_NONE_e) { + if (dComIfGs_getItem(dInvSlot_BOTTLE0_e + i) != dItemNo_NONE_e) { bottleCount++; } } @@ -2772,11 +2772,11 @@ inline void dComIfGp_setSelectItem(int i_itemBtn) { invIdx = dComIfGs_getSelectItem(i_itemBtn); itemNo = dComIfGs_getItem(invIdx); - if (itemNo == dItem_NONE_e) { + if (itemNo == dItemNo_NONE_e) { dComIfGs_setSelectItem(i_itemBtn, dInvSlot_NONE_e); } } else { - g_dComIfG_gameInfo.play.setSelectItem(i_itemBtn, dItem_NONE_e); + g_dComIfG_gameInfo.play.setSelectItem(i_itemBtn, dItemNo_NONE_e); } } diff --git a/include/d/d_item_data.h b/include/d/d_item_data.h index 0b80d1174..413a8097a 100644 --- a/include/d/d_item_data.h +++ b/include/d/d_item_data.h @@ -4,262 +4,262 @@ #include "global.h" enum ItemTable { - /* 0x00 */ dItem_HEART_e, - /* 0x01 */ dItem_GREEN_RUPEE_e, - /* 0x02 */ dItem_BLUE_RUPEE_e, - /* 0x03 */ dItem_YELLOW_RUPEE_e, - /* 0x04 */ dItem_RED_RUPEE_e, - /* 0x05 */ dItem_PURPLE_RUPEE_e, - /* 0x06 */ dItem_ORANGE_RUPEE_e, - /* 0x07 */ dItem_HEART_PIECE_e, - /* 0x08 */ dItem_HEART_CONTAINER_e, - /* 0x09 */ dItem_SMALL_MAGIC_e, - /* 0x0A */ dItem_LARGE_MAGIC_e, - /* 0x0B */ dItem_BOMB_5_e, - /* 0x0C */ dItem_BOMB_10_e, - /* 0x0D */ dItem_BOMB_20_e, - /* 0x0E */ dItem_BOMB_30_e, - /* 0x0F */ dItem_SILVER_RUPEE_e, - /* 0x10 */ dItem_ARROW_10_e, - /* 0x11 */ dItem_ARROW_20_e, - /* 0x12 */ dItem_ARROW_30_e, - /* 0x13 */ noentry19, // Unused - /* 0x14 */ noentry20, // Unused - /* 0x15 */ dItem_SMALL_KEY_e, - /* 0x16 */ dItem_RECOVER_FAIRY_e, - /* 0x17 */ dItem_HEART_PIECE_2_e, // Not an item, used only for its msg no - /* 0x18 */ dItem_HEART_PIECE_3_e, // Not an item, used only for its msg no - /* 0x19 */ dItem_HEART_PIECE_4_e, // Not an item, used only for its msg no - /* 0x1A */ dItem_SUB_DUN_RUPEE_e, // Used in VERSION_JPN only - /* 0x1B */ noentry27, // Unused - /* 0x1C */ noentry28, // Unused - /* 0x1D */ noentry29, // Unused - /* 0x1E */ dItem_TRIPLE_HEART_e, - /* 0x1F */ dItem_JOY_PENDANT_e, - /* 0x20 */ dItem_TELESCOPE_e, - /* 0x21 */ dItem_TINGLE_TUNER_e, - /* 0x22 */ dItem_WIND_WAKER_e, - /* 0x23 */ CAMERA, - /* 0x24 */ dItem_SPOILS_BAG_e, - /* 0x25 */ dItem_GRAPPLING_HOOK_e, - /* 0x26 */ CAMERA2, - /* 0x27 */ dItem_BOW_e, - /* 0x28 */ dItem_POWER_BRACELETS_e, - /* 0x29 */ dItem_IRON_BOOTS_e, - /* 0x2A */ dItem_MAGIC_ARMOR_e, - /* 0x2B */ WATER_BOOTS, // Unused - /* 0x2C */ dItem_BAIT_BAG_e, - /* 0x2D */ dItem_BOOMERANG_e, - /* 0x2E */ BARE_HAND, // Unused - /* 0x2F */ dItem_HOOKSHOT_e, - /* 0x30 */ dItem_DELIVERY_BAG_e, - /* 0x31 */ dItem_BOMB_BAG_e, - /* 0x32 */ dItem_FUKU_e, - /* 0x33 */ dItem_SKULL_HAMMER_e, - /* 0x34 */ dItem_DEKU_LEAF_e, - /* 0x35 */ dItem_MAGIC_ARROW_e, - /* 0x36 */ dItem_LIGHT_ARROW_e, - /* 0x37 */ dItem_NEW_FUKU_e, - /* 0x38 */ dItem_SWORD_e, - /* 0x39 */ dItem_MASTER_SWORD_1_e, - /* 0x3A */ dItem_MASTER_SWORD_2_e, - /* 0x3B */ dItem_SHIELD_e, - /* 0x3C */ dItem_MIRROR_SHIELD_e, - /* 0x3D */ dItem_DROPPED_SWORD_e, - /* 0x3E */ dItem_MASTER_SWORD_3_e, - /* 0x3F */ KAKERA_HEART2, - /* 0x40 */ noentry64, // Unused - /* 0x41 */ noentry65, // Unused - /* 0x42 */ dItem_PIRATES_CHARM_e, - /* 0x43 */ dItem_HEROS_CHARM_e, - /* 0x44 */ GRASS_BALL, // Unused - /* 0x45 */ dItem_SKULL_NECKLACE_e, - /* 0x46 */ dItem_BOKOBABA_SEED_e, - /* 0x47 */ dItem_GOLDEN_FEATHER_e, - /* 0x48 */ dItem_KNIGHTS_CREST_e, - /* 0x49 */ dItem_RED_JELLY_e, - /* 0x4A */ dItem_GREEN_JELLY_e, - /* 0x4B */ dItem_BLUE_JELLY_e, - /* 0x4C */ dItem_MAP_e, - /* 0x4D */ dItem_COMPASS_e, - /* 0x4E */ dItem_BOSS_KEY_e, - /* 0x4F */ EMPTY_BSHIP, // Unused - /* 0x50 */ dItem_EMPTY_BOTTLE_e, - /* 0x51 */ dItem_RED_POTION_e, - /* 0x52 */ dItem_GREEN_POTION_e, - /* 0x53 */ dItem_BLUE_POTION_e, - /* 0x54 */ dItem_HALF_SOUP_BOTTLE_e, - /* 0x55 */ dItem_SOUP_BOTTLE_e, - /* 0x56 */ dItem_WATER_BOTTLE_e, - /* 0x57 */ dItem_FAIRY_BOTTLE_e, - /* 0x58 */ dItem_FIREFLY_BOTTLE_e, - /* 0x59 */ dItem_FOREST_WATER_e, - /* 0x5A */ UNK_BOTTLE_5A, // Unused - /* 0x5B */ UNK_BOTTLE_5B, // Unused - /* 0x5C */ UNK_BOTTLE_5C, // Unused - /* 0x5D */ UNK_BOTTLE_5D, // Unused - /* 0x5E */ UNK_BOTTLE_5E, // Unused - /* 0x5F */ UNK_BOTTLE_5F, // Unused - /* 0x60 */ UNK_BOTTLE_60, // Unused - /* 0x61 */ dItem_TRIFORCE1_e, - /* 0x62 */ dItem_TRIFORCE2_e, - /* 0x63 */ dItem_TRIFORCE3_e, - /* 0x64 */ dItem_TRIFORCE4_e, - /* 0x65 */ dItem_TRIFORCE5_e, - /* 0x66 */ dItem_TRIFORCE6_e, - /* 0x67 */ dItem_TRIFORCE7_e, - /* 0x68 */ dItem_TRIFORCE8_e, - /* 0x69 */ dItem_PEARL_NAYRU_e, - /* 0x6A */ dItem_PEARL_DIN_e, - /* 0x6B */ dItem_PEARL_FARORE_e, - /* 0x6C */ KNOWLEDGE_TF, // Unused - /* 0x6D */ TACT_SONG1, - /* 0x6E */ TACT_SONG2, - /* 0x6F */ TACT_SONG3, - /* 0x70 */ TACT_SONG4, - /* 0x71 */ TACT_SONG5, - /* 0x72 */ TACT_SONG6, - /* 0x73 */ noentry115, // Unused - /* 0x74 */ noentry116, // Unused - /* 0x75 */ noentry117, // Unused - /* 0x76 */ noentry118, // Unused - /* 0x77 */ noentry119, // Unused - /* 0x78 */ NORMAL_SAIL, - /* 0x79 */ TRIFORCE_MAP1, - /* 0x7A */ TRIFORCE_MAP2, - /* 0x7B */ TRIFORCE_MAP3, - /* 0x7C */ TRIFORCE_MAP4, - /* 0x7D */ TRIFORCE_MAP5, - /* 0x7E */ TRIFORCE_MAP6, - /* 0x7F */ TRIFORCE_MAP7, - /* 0x80 */ TRIFORCE_MAP8, - /* 0x81 */ noentry129, // Unused - /* 0x82 */ dItem_BIRD_BAIT_5_e, - /* 0x83 */ dItem_HYOI_PEAR_e, - /* 0x84 */ ESA1, // Unused - /* 0x85 */ ESA2, // Unused - /* 0x86 */ ESA3, // Unused - /* 0x87 */ ESA4, // Unused - /* 0x88 */ ESA5, // Unused - /* 0x89 */ MAGIC_BEAN, // Unused - /* 0x8A */ BIRD_ESA_10, // Unused - /* 0x8B */ noentry139, // Unused - /* 0x8C */ FLOWER_1, - /* 0x8D */ FLOWER_2, - /* 0x8E */ FLOWER_3, - /* 0x8F */ HEROS_FLAG, - /* 0x90 */ TAIRYO_FLAG, - /* 0x91 */ SALES_FLAG, - /* 0x92 */ WIND_FLAG, - /* 0x93 */ RED_FLAG, - /* 0x94 */ FOSSIL_HEAD, - /* 0x95 */ WATER_STATUE, - /* 0x96 */ POSTMAN_STATUE, - /* 0x97 */ PRESIDENT_STATUE, - /* 0x98 */ dItem_FATHER_LETTER_e, - /* 0x99 */ dItem_NOTE_TO_MOM_e, - /* 0x9A */ MAGYS_LETTER, - /* 0x9B */ MO_LETTER, - /* 0x9C */ COTTAGE_PAPER, - /* 0x9D */ KAISEN_PRESENT1, - /* 0x9E */ KAISEN_PRESENT2, - /* 0x9F */ SALVAGE_ITEM1, - /* 0xA0 */ SALVAGE_ITEM2, // Unused - /* 0xA1 */ SALVAGE_ITEM3, // Unused - /* 0xA2 */ XXX_039, // Unused - /* 0xA3 */ TINGLE_STATUE1, - /* 0xA4 */ TINGLE_STATUE2, - /* 0xA5 */ TINGLE_STATUE3, - /* 0xA6 */ TINGLE_STATUE4, - /* 0xA7 */ TINGLE_STATUE5, - /* 0xA8 */ TINGLE_STATUE6, // Unused - /* 0xA9 */ noentry169, // Unused - /* 0xAA */ dItem_HURRICANE_SPIN_e, - /* 0xAB */ dItem_MAX_RUPEE_UP1_e, - /* 0xAC */ dItem_MAX_RUPEE_UP2_e, - /* 0xAD */ dItem_MAX_BOMB_UP1_e, - /* 0xAE */ dItem_MAX_BOMB_UP2_e, - /* 0xAF */ dItem_MAX_ARROW_UP1_e, - /* 0xB0 */ dItem_MAX_ARROW_UP2_e, - /* 0xB1 */ dItem_MAGIC_POWER_e, - /* 0xB2 */ dItem_MAX_MP_UP1_e, - /* 0xB3 */ TINCLE_RUPEE1, - /* 0xB4 */ TINCLE_RUPEE2, - /* 0xB5 */ TINCLE_RUPEE3, - /* 0xB6 */ TINCLE_RUPEE4, - /* 0xB7 */ TINCLE_RUPEE5, - /* 0xB8 */ TINCLE_RUPEE6, - /* 0xB9 */ LITHOGRAPH1, // Unused - /* 0xBA */ LITHOGRAPH2, // Unused - /* 0xBB */ LITHOGRAPH3, // Unused - /* 0xBC */ LITHOGRAPH4, // Unused - /* 0xBD */ LITHOGRAPH5, // Unused - /* 0xBE */ LITHOGRAPH6, // Unused - /* 0xBF */ dItem_COLLECT_MAP_64_e, // Unused - /* 0xC0 */ dItem_COLLECT_MAP_63_e, // Unused - /* 0xC1 */ dItem_COLLECT_MAP_62_e, // Unused - /* 0xC2 */ dItem_COLLECT_MAP_61_e, - /* 0xC3 */ dItem_COLLECT_MAP_60_e, - /* 0xC4 */ dItem_COLLECT_MAP_59_e, - /* 0xC5 */ dItem_COLLECT_MAP_58_e, - /* 0xC6 */ dItem_COLLECT_MAP_57_e, - /* 0xC7 */ dItem_COLLECT_MAP_56_e, - /* 0xC8 */ dItem_COLLECT_MAP_55_e, - /* 0xC9 */ dItem_COLLECT_MAP_54_e, - /* 0xCA */ dItem_COLLECT_MAP_53_e, - /* 0xCB */ dItem_COLLECT_MAP_52_e, - /* 0xCC */ dItem_COLLECT_MAP_51_e, - /* 0xCD */ dItem_COLLECT_MAP_50_e, - /* 0xCE */ dItem_COLLECT_MAP_49_e, - /* 0xCF */ dItem_COLLECT_MAP_48_e, - /* 0xD0 */ dItem_COLLECT_MAP_47_e, - /* 0xD1 */ dItem_COLLECT_MAP_46_e, - /* 0xD2 */ dItem_COLLECT_MAP_45_e, - /* 0xD3 */ dItem_COLLECT_MAP_44_e, - /* 0xD4 */ dItem_COLLECT_MAP_43_e, - /* 0xD5 */ dItem_COLLECT_MAP_42_e, - /* 0xD6 */ dItem_COLLECT_MAP_41_e, - /* 0xD7 */ dItem_COLLECT_MAP_40_e, - /* 0xD8 */ dItem_COLLECT_MAP_39_e, - /* 0xD9 */ dItem_COLLECT_MAP_38_e, - /* 0xDA */ dItem_COLLECT_MAP_37_e, - /* 0xDB */ dItem_COLLECT_MAP_36_e, - /* 0xDC */ dItem_COLLECT_MAP_35_e, - /* 0xDD */ dItem_COLLECT_MAP_34_e, - /* 0xDE */ dItem_COLLECT_MAP_33_e, - /* 0xDF */ dItem_COLLECT_MAP_32_e, - /* 0xE0 */ dItem_COLLECT_MAP_31_e, - /* 0xE1 */ dItem_COLLECT_MAP_30_e, - /* 0xE2 */ dItem_COLLECT_MAP_29_e, - /* 0xE3 */ dItem_COLLECT_MAP_28_e, - /* 0xE4 */ dItem_COLLECT_MAP_27_e, - /* 0xE5 */ dItem_COLLECT_MAP_26_e, - /* 0xE6 */ dItem_COLLECT_MAP_25_e, - /* 0xE7 */ dItem_COLLECT_MAP_24_e, - /* 0xE8 */ dItem_COLLECT_MAP_23_e, - /* 0xE9 */ dItem_COLLECT_MAP_22_e, - /* 0xEA */ dItem_COLLECT_MAP_21_e, - /* 0xEB */ dItem_COLLECT_MAP_20_e, - /* 0xEC */ dItem_COLLECT_MAP_19_e, - /* 0xED */ dItem_COLLECT_MAP_18_e, - /* 0xEE */ dItem_COLLECT_MAP_17_e, - /* 0xEF */ dItem_COLLECT_MAP_16_e, - /* 0xF0 */ dItem_COLLECT_MAP_15_e, - /* 0xF1 */ dItem_COLLECT_MAP_14_e, - /* 0xF2 */ dItem_COLLECT_MAP_13_e, - /* 0xF3 */ dItem_COLLECT_MAP_12_e, - /* 0xF4 */ dItem_COLLECT_MAP_11_e, - /* 0xF5 */ dItem_COLLECT_MAP_10_e, - /* 0xF6 */ dItem_COLLECT_MAP_09_e, - /* 0xF7 */ dItem_COLLECT_MAP_08_e, - /* 0xF8 */ dItem_COLLECT_MAP_07_e, - /* 0xF9 */ dItem_COLLECT_MAP_06_e, - /* 0xFA */ dItem_COLLECT_MAP_05_e, - /* 0xFB */ dItem_COLLECT_MAP_04_e, - /* 0xFC */ dItem_COLLECT_MAP_03_e, - /* 0xFD */ dItem_COLLECT_MAP_02_e, - /* 0xFE */ dItem_COLLECT_MAP_01_e, - /* 0xFF */ dItem_NONE_e, + /* 0x00 */ dItemNo_HEART_e, + /* 0x01 */ dItemNo_GREEN_RUPEE_e, + /* 0x02 */ dItemNo_BLUE_RUPEE_e, + /* 0x03 */ dItemNo_YELLOW_RUPEE_e, + /* 0x04 */ dItemNo_RED_RUPEE_e, + /* 0x05 */ dItemNo_PURPLE_RUPEE_e, + /* 0x06 */ dItemNo_ORANGE_RUPEE_e, + /* 0x07 */ dItemNo_HEART_PIECE_e, + /* 0x08 */ dItemNo_HEART_CONTAINER_e, + /* 0x09 */ dItemNo_SMALL_MAGIC_e, + /* 0x0A */ dItemNo_LARGE_MAGIC_e, + /* 0x0B */ dItemNo_BOMB_5_e, + /* 0x0C */ dItemNo_BOMB_10_e, + /* 0x0D */ dItemNo_BOMB_20_e, + /* 0x0E */ dItemNo_BOMB_30_e, + /* 0x0F */ dItemNo_SILVER_RUPEE_e, + /* 0x10 */ dItemNo_ARROW_10_e, + /* 0x11 */ dItemNo_ARROW_20_e, + /* 0x12 */ dItemNo_ARROW_30_e, + /* 0x13 */ dItemNo_NOENTRY_19_e, // Unused + /* 0x14 */ dItemNo_NOENTRY_20_e, // Unused + /* 0x15 */ dItemNo_SMALL_KEY_e, + /* 0x16 */ dItemNo_RECOVER_FAIRY_e, + /* 0x17 */ dItemNo_HEART_PIECE_2_e, // Not an item, used only for its msg no + /* 0x18 */ dItemNo_HEART_PIECE_3_e, // Not an item, used only for its msg no + /* 0x19 */ dItemNo_HEART_PIECE_4_e, // Not an item, used only for its msg no + /* 0x1A */ dItemNo_SUB_DUN_RUPEE_e, // Used in VERSION_JPN only + /* 0x1B */ dItemNo_NOENTRY_27_e, // Unused + /* 0x1C */ dItemNo_NOENTRY_28_e, // Unused + /* 0x1D */ dItemNo_NOENTRY_29_e, // Unused + /* 0x1E */ dItemNo_TRIPLE_HEART_e, + /* 0x1F */ dItemNo_JOY_PENDANT_e, + /* 0x20 */ dItemNo_TELESCOPE_e, + /* 0x21 */ dItemNo_TINGLE_TUNER_e, + /* 0x22 */ dItemNo_WIND_WAKER_e, + /* 0x23 */ dItemNo_PICTO_BOX_e, + /* 0x24 */ dItemNo_SPOILS_BAG_e, + /* 0x25 */ dItemNo_GRAPPLING_HOOK_e, + /* 0x26 */ dItemNo_DELUXE_PICTO_BOX_e, + /* 0x27 */ dItemNo_BOW_e, + /* 0x28 */ dItemNo_POWER_BRACELETS_e, + /* 0x29 */ dItemNo_IRON_BOOTS_e, + /* 0x2A */ dItemNo_MAGIC_ARMOR_e, + /* 0x2B */ dItemNo_WATER_BOOTS_e, // Unused + /* 0x2C */ dItemNo_BAIT_BAG_e, + /* 0x2D */ dItemNo_BOOMERANG_e, + /* 0x2E */ dItemNo_BARE_HAND_e, // Unused + /* 0x2F */ dItemNo_HOOKSHOT_e, + /* 0x30 */ dItemNo_DELIVERY_BAG_e, + /* 0x31 */ dItemNo_BOMB_BAG_e, + /* 0x32 */ dItemNo_FUKU_e, + /* 0x33 */ dItemNo_SKULL_HAMMER_e, + /* 0x34 */ dItemNo_DEKU_LEAF_e, + /* 0x35 */ dItemNo_MAGIC_ARROW_e, + /* 0x36 */ dItemNo_LIGHT_ARROW_e, + /* 0x37 */ dItemNo_NEW_FUKU_e, + /* 0x38 */ dItemNo_SWORD_e, + /* 0x39 */ dItemNo_MASTER_SWORD_1_e, + /* 0x3A */ dItemNo_MASTER_SWORD_2_e, + /* 0x3B */ dItemNo_SHIELD_e, + /* 0x3C */ dItemNo_MIRROR_SHIELD_e, + /* 0x3D */ dItemNo_DROPPED_SWORD_e, + /* 0x3E */ dItemNo_MASTER_SWORD_3_e, + /* 0x3F */ dItemNo_HEART_PIECE_ALT_e, + /* 0x40 */ dItemNo_NOENTRY_64_e, // Unused + /* 0x41 */ dItemNo_NOENTRY_65_e, // Unused + /* 0x42 */ dItemNo_PIRATES_CHARM_e, + /* 0x43 */ dItemNo_HEROS_CHARM_e, + /* 0x44 */ dItemNo_GRASS_BALL_e, // Unused + /* 0x45 */ dItemNo_SKULL_NECKLACE_e, + /* 0x46 */ dItemNo_BOKOBABA_SEED_e, + /* 0x47 */ dItemNo_GOLDEN_FEATHER_e, + /* 0x48 */ dItemNo_KNIGHTS_CREST_e, + /* 0x49 */ dItemNo_RED_JELLY_e, + /* 0x4A */ dItemNo_GREEN_JELLY_e, + /* 0x4B */ dItemNo_BLUE_JELLY_e, + /* 0x4C */ dItemNo_MAP_e, + /* 0x4D */ dItemNo_COMPASS_e, + /* 0x4E */ dItemNo_BOSS_KEY_e, + /* 0x4F */ dItemNo_EMPTY_BSHIP_e, // Unused + /* 0x50 */ dItemNo_EMPTY_BOTTLE_e, + /* 0x51 */ dItemNo_RED_POTION_e, + /* 0x52 */ dItemNo_GREEN_POTION_e, + /* 0x53 */ dItemNo_BLUE_POTION_e, + /* 0x54 */ dItemNo_HALF_SOUP_BOTTLE_e, + /* 0x55 */ dItemNo_SOUP_BOTTLE_e, + /* 0x56 */ dItemNo_WATER_BOTTLE_e, + /* 0x57 */ dItemNo_FAIRY_BOTTLE_e, + /* 0x58 */ dItemNo_FIREFLY_BOTTLE_e, + /* 0x59 */ dItemNo_FOREST_WATER_e, + /* 0x5A */ dItemNo_UNK_BOTTLE_5A_e, // Unused + /* 0x5B */ dItemNo_UNK_BOTTLE_5B_e, // Unused + /* 0x5C */ dItemNo_UNK_BOTTLE_5C_e, // Unused + /* 0x5D */ dItemNo_UNK_BOTTLE_5D_e, // Unused + /* 0x5E */ dItemNo_UNK_BOTTLE_5E_e, // Unused + /* 0x5F */ dItemNo_UNK_BOTTLE_5F_e, // Unused + /* 0x60 */ dItemNo_UNK_BOTTLE_60_e, // Unused + /* 0x61 */ dItemNo_TRIFORCE1_e, + /* 0x62 */ dItemNo_TRIFORCE2_e, + /* 0x63 */ dItemNo_TRIFORCE3_e, + /* 0x64 */ dItemNo_TRIFORCE4_e, + /* 0x65 */ dItemNo_TRIFORCE5_e, + /* 0x66 */ dItemNo_TRIFORCE6_e, + /* 0x67 */ dItemNo_TRIFORCE7_e, + /* 0x68 */ dItemNo_TRIFORCE8_e, + /* 0x69 */ dItemNo_PEARL_NAYRU_e, + /* 0x6A */ dItemNo_PEARL_DIN_e, + /* 0x6B */ dItemNo_PEARL_FARORE_e, + /* 0x6C */ dItemNo_KNOWLEDGE_TF_e, // Unused + /* 0x6D */ dItemNo_WINDS_REQUIEM_e, + /* 0x6E */ dItemNo_BALLAD_OF_GALES_e, + /* 0x6F */ dItemNo_COMMAND_MELODY_e, + /* 0x70 */ dItemNo_EARTH_GODS_LYRIC_e, + /* 0x71 */ dItemNo_WIND_GODS_ARIA_e, + /* 0x72 */ dItemNo_SONG_OF_PASSING_e, + /* 0x73 */ dItemNo_NOENTRY_115_e, // Unused + /* 0x74 */ dItemNo_NOENTRY_116_e, // Unused + /* 0x75 */ dItemNo_NOENTRY_117_e, // Unused + /* 0x76 */ dItemNo_NOENTRY_118_e, // Unused + /* 0x77 */ dItemNo_NOENTRY_119_e, // Unused + /* 0x78 */ dItemNo_SAIL_e, + /* 0x79 */ dItemNo_TRIFORCE_MAP_1_e, + /* 0x7A */ dItemNo_TRIFORCE_MAP_2_e, + /* 0x7B */ dItemNo_TRIFORCE_MAP_3_e, + /* 0x7C */ dItemNo_TRIFORCE_MAP_4_e, + /* 0x7D */ dItemNo_TRIFORCE_MAP_5_e, + /* 0x7E */ dItemNo_TRIFORCE_MAP_6_e, + /* 0x7F */ dItemNo_TRIFORCE_MAP_7_e, + /* 0x80 */ dItemNo_TRIFORCE_MAP_8_e, + /* 0x81 */ dItemNo_NOENTRY_129_e, // Unused + /* 0x82 */ dItemNo_BIRD_BAIT_5_e, + /* 0x83 */ dItemNo_HYOI_PEAR_e, + /* 0x84 */ dItemNo_ESA_1_e, // Unused + /* 0x85 */ dItemNo_ESA_2_e, // Unused + /* 0x86 */ dItemNo_ESA_3_e, // Unused + /* 0x87 */ dItemNo_ESA_4_e, // Unused + /* 0x88 */ dItemNo_ESA_5_e, // Unused + /* 0x89 */ dItemNo_MAGIC_BEAN_e, // Unused + /* 0x8A */ dItemNo_BIRD_ESA_10_e, // Unused + /* 0x8B */ dItemNo_NOENTRY_139_e, // Unused + /* 0x8C */ dItemNo_TOWN_FLOWER_e, + /* 0x8D */ dItemNo_SEA_FLOWER_e, + /* 0x8E */ dItemNo_EXOTIC_FLOWER_e, + /* 0x8F */ dItemNo_HEROS_FLAG_e, + /* 0x90 */ dItemNo_BIG_CATCH_FLAG_e, + /* 0x91 */ dItemNo_BIG_SALE_FLAG_e, + /* 0x92 */ dItemNo_PINWHEEL_e, + /* 0x93 */ dItemNo_SICKLE_MOON_FLAG_e, + /* 0x94 */ dItemNo_SKULL_TOWER_IDOL_e, + /* 0x95 */ dItemNo_FOUNTAIN_IDOL_e, + /* 0x96 */ dItemNo_POSTMAN_STATUE_e, + /* 0x97 */ dItemNo_SHOP_GURU_STATUE_e, + /* 0x98 */ dItemNo_FATHER_LETTER_e, + /* 0x99 */ dItemNo_NOTE_TO_MOM_e, + /* 0x9A */ dItemNo_MAGGIES_LETTER_e, + /* 0x9B */ dItemNo_MOBLINS_LETTER_e, + /* 0x9C */ dItemNo_CABANA_DEED_e, + /* 0x9D */ dItemNo_COMPLIMENTARY_ID_e, + /* 0x9E */ dItemNo_FILL_UP_COUPON_e, + /* 0x9F */ dItemNo_LEGENDARY_PICTOGRAPH_e, // Originally "salvage item 1", but was repurposed + /* 0xA0 */ dItemNo_SALVAGE_ITEM_2_e, // Unused + /* 0xA1 */ dItemNo_SALVAGE_ITEM_3_e, // Unused + /* 0xA2 */ dItemNo_XXX_039_e, // Unused + /* 0xA3 */ dItemNo_TINGLE_STATUE_1_e, + /* 0xA4 */ dItemNo_TINGLE_STATUE_2_e, + /* 0xA5 */ dItemNo_TINGLE_STATUE_3_e, + /* 0xA6 */ dItemNo_TINGLE_STATUE_4_e, + /* 0xA7 */ dItemNo_TINGLE_STATUE_5_e, + /* 0xA8 */ dItemNo_TINGLE_STATUE_6_e, // Unused + /* 0xA9 */ dItemNo_NOENTRY_169_e, // Unused + /* 0xAA */ dItemNo_HURRICANE_SPIN_e, + /* 0xAB */ dItemNo_MAX_RUPEE_UP1_e, + /* 0xAC */ dItemNo_MAX_RUPEE_UP2_e, + /* 0xAD */ dItemNo_MAX_BOMB_UP1_e, + /* 0xAE */ dItemNo_MAX_BOMB_UP2_e, + /* 0xAF */ dItemNo_MAX_ARROW_UP1_e, + /* 0xB0 */ dItemNo_MAX_ARROW_UP2_e, + /* 0xB1 */ dItemNo_MAGIC_POWER_e, + /* 0xB2 */ dItemNo_MAX_MP_UP1_e, + /* 0xB3 */ dItemNo_TINGLE_RUPEE_1_e, + /* 0xB4 */ dItemNo_TINGLE_RUPEE_2_e, + /* 0xB5 */ dItemNo_TINGLE_RUPEE_3_e, + /* 0xB6 */ dItemNo_TINGLE_RUPEE_4_e, + /* 0xB7 */ dItemNo_TINGLE_RUPEE_5_e, + /* 0xB8 */ dItemNo_TINGLE_RUPEE_6_e, + /* 0xB9 */ dItemNo_LITHOGRAPH_1_e, // Unused + /* 0xBA */ dItemNo_LITHOGRAPH_2_e, // Unused + /* 0xBB */ dItemNo_LITHOGRAPH_3_e, // Unused + /* 0xBC */ dItemNo_LITHOGRAPH_4_e, // Unused + /* 0xBD */ dItemNo_LITHOGRAPH_5_e, // Unused + /* 0xBE */ dItemNo_LITHOGRAPH_6_e, // Unused + /* 0xBF */ dItemNo_COLLECT_MAP_64_e, // Unused + /* 0xC0 */ dItemNo_COLLECT_MAP_63_e, // Unused + /* 0xC1 */ dItemNo_COLLECT_MAP_62_e, // Unused + /* 0xC2 */ dItemNo_COLLECT_MAP_61_e, + /* 0xC3 */ dItemNo_COLLECT_MAP_60_e, + /* 0xC4 */ dItemNo_COLLECT_MAP_59_e, + /* 0xC5 */ dItemNo_COLLECT_MAP_58_e, + /* 0xC6 */ dItemNo_COLLECT_MAP_57_e, + /* 0xC7 */ dItemNo_COLLECT_MAP_56_e, + /* 0xC8 */ dItemNo_COLLECT_MAP_55_e, + /* 0xC9 */ dItemNo_COLLECT_MAP_54_e, + /* 0xCA */ dItemNo_COLLECT_MAP_53_e, + /* 0xCB */ dItemNo_COLLECT_MAP_52_e, + /* 0xCC */ dItemNo_COLLECT_MAP_51_e, + /* 0xCD */ dItemNo_COLLECT_MAP_50_e, + /* 0xCE */ dItemNo_COLLECT_MAP_49_e, + /* 0xCF */ dItemNo_COLLECT_MAP_48_e, + /* 0xD0 */ dItemNo_COLLECT_MAP_47_e, + /* 0xD1 */ dItemNo_COLLECT_MAP_46_e, + /* 0xD2 */ dItemNo_COLLECT_MAP_45_e, + /* 0xD3 */ dItemNo_COLLECT_MAP_44_e, + /* 0xD4 */ dItemNo_COLLECT_MAP_43_e, + /* 0xD5 */ dItemNo_COLLECT_MAP_42_e, + /* 0xD6 */ dItemNo_COLLECT_MAP_41_e, + /* 0xD7 */ dItemNo_COLLECT_MAP_40_e, + /* 0xD8 */ dItemNo_COLLECT_MAP_39_e, + /* 0xD9 */ dItemNo_COLLECT_MAP_38_e, + /* 0xDA */ dItemNo_COLLECT_MAP_37_e, + /* 0xDB */ dItemNo_COLLECT_MAP_36_e, + /* 0xDC */ dItemNo_COLLECT_MAP_35_e, + /* 0xDD */ dItemNo_COLLECT_MAP_34_e, + /* 0xDE */ dItemNo_COLLECT_MAP_33_e, + /* 0xDF */ dItemNo_COLLECT_MAP_32_e, + /* 0xE0 */ dItemNo_COLLECT_MAP_31_e, + /* 0xE1 */ dItemNo_COLLECT_MAP_30_e, + /* 0xE2 */ dItemNo_COLLECT_MAP_29_e, + /* 0xE3 */ dItemNo_COLLECT_MAP_28_e, + /* 0xE4 */ dItemNo_COLLECT_MAP_27_e, + /* 0xE5 */ dItemNo_COLLECT_MAP_26_e, + /* 0xE6 */ dItemNo_COLLECT_MAP_25_e, + /* 0xE7 */ dItemNo_COLLECT_MAP_24_e, + /* 0xE8 */ dItemNo_COLLECT_MAP_23_e, + /* 0xE9 */ dItemNo_COLLECT_MAP_22_e, + /* 0xEA */ dItemNo_COLLECT_MAP_21_e, + /* 0xEB */ dItemNo_COLLECT_MAP_20_e, + /* 0xEC */ dItemNo_COLLECT_MAP_19_e, + /* 0xED */ dItemNo_COLLECT_MAP_18_e, + /* 0xEE */ dItemNo_COLLECT_MAP_17_e, + /* 0xEF */ dItemNo_COLLECT_MAP_16_e, + /* 0xF0 */ dItemNo_COLLECT_MAP_15_e, + /* 0xF1 */ dItemNo_COLLECT_MAP_14_e, + /* 0xF2 */ dItemNo_COLLECT_MAP_13_e, + /* 0xF3 */ dItemNo_COLLECT_MAP_12_e, + /* 0xF4 */ dItemNo_COLLECT_MAP_11_e, + /* 0xF5 */ dItemNo_COLLECT_MAP_10_e, + /* 0xF6 */ dItemNo_COLLECT_MAP_09_e, + /* 0xF7 */ dItemNo_COLLECT_MAP_08_e, + /* 0xF8 */ dItemNo_COLLECT_MAP_07_e, + /* 0xF9 */ dItemNo_COLLECT_MAP_06_e, + /* 0xFA */ dItemNo_COLLECT_MAP_05_e, + /* 0xFB */ dItemNo_COLLECT_MAP_04_e, + /* 0xFC */ dItemNo_COLLECT_MAP_03_e, + /* 0xFD */ dItemNo_COLLECT_MAP_02_e, + /* 0xFE */ dItemNo_COLLECT_MAP_01_e, + /* 0xFF */ dItemNo_NONE_e, }; #define MSG_NO_FOR_ITEM(item_no) item_no + 101 diff --git a/include/d/d_priority.h b/include/d/d_priority.h deleted file mode 100644 index 94bdd8da2..000000000 --- a/include/d/d_priority.h +++ /dev/null @@ -1,504 +0,0 @@ -#ifndef D_PRIORITY_H -#define D_PRIORITY_H - -enum { - /* 0x0000 */ PRIO_CAMERA, - /* 0x0001 */ PRIO_CAMERA2, - /* 0x0002 */ PRIO_KANKYO, - /* 0x0003 */ PRIO_KYEFF2, - /* 0x0004 */ PRIO_VRBOX2, - /* 0x0005 */ PRIO_KYEFF, - /* 0x0006 */ PRIO_KY_THUNDER, - /* 0x0007 */ PRIO_VRBOX, - /* 0x0008 */ PRIO_WPILLAR, - /* 0x0009 */ PRIO_TORNADO, - /* 0x000A */ PRIO_TITLE, - /* 0x000B */ PRIO_MP, - /* 0x000C */ PRIO_AGB, - /* 0x000D */ PRIO_AGBSW0, - /* 0x000E */ PRIO_BB, - /* 0x000F */ PRIO_Obj_Ice, - /* 0x0010 */ PRIO_Obj_Swpush, - /* 0x0011 */ PRIO_Obj_Swheavy, - /* 0x0012 */ PRIO_Obj_Swflat, - /* 0x0013 */ PRIO_Obj_Swlight, - /* 0x0014 */ PRIO_Obj_Quake, - /* 0x0015 */ PRIO_Obj_Movebox, - /* 0x0016 */ PRIO_Obj_Tribox, - /* 0x0017 */ PRIO_Obj_Shelf, - /* 0x0018 */ PRIO_Obj_Hlift, - /* 0x0019 */ PRIO_Obj_Hami2, - /* 0x001A */ PRIO_Obj_Hami3, - /* 0x001B */ PRIO_Obj_Hami4, - /* 0x001C */ PRIO_Obj_Hbrf1, - /* 0x001D */ PRIO_Obj_Dmgroom, - /* 0x001E */ PRIO_Obj_Doguu, - /* 0x001F */ PRIO_Obj_Volcano, - /* 0x0020 */ PRIO_Obj_Vfan, - /* 0x0021 */ PRIO_Obj_Pbco, - /* 0x0022 */ PRIO_Obj_Vmc, - /* 0x0023 */ PRIO_Obj_Usovmc, - /* 0x0024 */ PRIO_Obj_Iceisland, - /* 0x0025 */ PRIO_Obj_Dragonhead, - /* 0x0026 */ PRIO_Obj_Correct, - /* 0x0027 */ PRIO_Obj_Coming, - /* 0x0028 */ PRIO_Coming2, - /* 0x0029 */ PRIO_Coming3, - /* 0x002A */ PRIO_Obj_Timer, - /* 0x002B */ PRIO_Obj_Mtest, - /* 0x002C */ PRIO_Obj_Nest, - /* 0x002D */ PRIO_Obj_Ojtree, - /* 0x002E */ PRIO_Obj_Drift, - /* 0x002F */ PRIO_Obj_Ospbox, - /* 0x0030 */ PRIO_Obj_Ladder, - /* 0x0031 */ PRIO_Obj_Jump, - /* 0x0032 */ PRIO_Obj_Smplbg, - /* 0x0033 */ PRIO_Obj_Akabe, - /* 0x0034 */ PRIO_Obj_Ashut, - /* 0x0035 */ PRIO_Obj_Mmrr, - /* 0x0036 */ PRIO_Obj_Mkie, - /* 0x0037 */ PRIO_Obj_Mkiek, - /* 0x0038 */ PRIO_Obj_Msdan, - /* 0x0039 */ PRIO_Obj_MsdanSub, - /* 0x003A */ PRIO_Obj_Msdan2, - /* 0x003B */ PRIO_Obj_MsdanSub2, - /* 0x003C */ PRIO_Obj_Ferris, - /* 0x003D */ PRIO_Obj_Xfuta, - /* 0x003E */ PRIO_Obj_Rforce, - /* 0x003F */ PRIO_Obj_Gaship, - /* 0x0040 */ PRIO_Obj_Gaship2, - /* 0x0041 */ PRIO_Obj_Light, - /* 0x0042 */ PRIO_Obj_Homen, - /* 0x0043 */ PRIO_Obj_Homensmk, - /* 0x0044 */ PRIO_Obj_Ftree, - /* 0x0045 */ PRIO_Obj_Vds, - /* 0x0046 */ PRIO_Obj_Vyasi, - /* 0x0047 */ PRIO_Obj_Ajav, - /* 0x0048 */ PRIO_Obj_Trap, - /* 0x0049 */ PRIO_Obj_Hha, - /* 0x004A */ PRIO_Obj_Htetu1, - /* 0x004B */ PRIO_Obj_Shmrgrd, - /* 0x004C */ PRIO_Obj_Eayogn, - /* 0x004D */ PRIO_Obj_Vmsms, - /* 0x004E */ PRIO_Obj_Vmsdz, - /* 0x004F */ PRIO_Ygcwp, - /* 0x0050 */ PRIO_Obj_Vgnfd, - /* 0x0051 */ PRIO_Obj_Gnntakis, - /* 0x0052 */ PRIO_Obj_Gnntakie, - /* 0x0053 */ PRIO_Obj_Gnnbtaki, - /* 0x0054 */ PRIO_Obj_Rcloud, - /* 0x0055 */ PRIO_Obj_Gryw00, - /* 0x0056 */ PRIO_Obj_AjavW, - /* 0x0057 */ PRIO_Obj_Leaves, - /* 0x0058 */ PRIO_Obj_YLzou, - /* 0x0059 */ PRIO_Obj_Gbed, - /* 0x005A */ PRIO_Obj_Vteng, - /* 0x005B */ PRIO_Obj_Hfuck1, - /* 0x005C */ PRIO_Obj_Ohatch, - /* 0x005D */ PRIO_Obj_Hcbh, - /* 0x005E */ PRIO_Obj_Ygush00, - /* 0x005F */ PRIO_Tag_Ret, - /* 0x0060 */ PRIO_Dummy, - /* 0x0061 */ PRIO_Tag_Volcano, - /* 0x0062 */ PRIO_TAG_EVSW, - /* 0x0063 */ PRIO_Tag_Light, - /* 0x0064 */ PRIO_Tag_Attention, - /* 0x0065 */ PRIO_TAG_SO, - /* 0x0066 */ PRIO_TAG_GSHIP, - /* 0x0067 */ PRIO_FM, - /* 0x0068 */ PRIO_PLAYER, - /* 0x0069 */ PRIO_SAIL, - /* 0x006A */ PRIO_PIRATE_FLAG, - /* 0x006B */ PRIO_MAJUU_FLAG, - /* 0x006C */ PRIO_Tori_Flag, - /* 0x006D */ PRIO_Sie_Flag, - /* 0x006E */ PRIO_Obj_Stair, - /* 0x006F */ PRIO_Obj_Lpalm, - /* 0x0070 */ PRIO_Obj_Pbka, - /* 0x0071 */ PRIO_Obj_Plant, - /* 0x0072 */ PRIO_Obj_Gtaki, - /* 0x0073 */ PRIO_Obj_Yboil, - /* 0x0074 */ PRIO_Obj_Rflw, - /* 0x0075 */ PRIO_Obj_Table, - /* 0x0076 */ PRIO_Obj_Tenmado, - /* 0x0077 */ PRIO_Obj_Cafelmp, - /* 0x0078 */ PRIO_Obj_Kanoke, - /* 0x0079 */ PRIO_Obj_Kanat, - /* 0x007A */ PRIO_Obj_Eskban, - /* 0x007B */ PRIO_Obj_Ekskz, - /* 0x007C */ PRIO_Obj_Ebomzo, - /* 0x007D */ PRIO_Obj_Apzl, - /* 0x007E */ PRIO_Obj_Adnno, - /* 0x007F */ PRIO_Obj_Auzu, - /* 0x0080 */ PRIO_Obj_Aygr, - /* 0x0081 */ PRIO_Obj_Gong, - /* 0x0082 */ PRIO_Obj_Swhammer, - /* 0x0083 */ PRIO_Obj_Barrier, - /* 0x0084 */ PRIO_Obj_Firewall, - /* 0x0085 */ PRIO_Obj_TnTrap, - /* 0x0086 */ PRIO_Obj_Monument, - /* 0x0087 */ PRIO_Obj_Tapestry, - /* 0x0088 */ PRIO_Obj_HSH, - /* 0x0089 */ PRIO_BRIDGE, - /* 0x008A */ PRIO_MSW, - /* 0x008B */ PRIO_MFLFT, - /* 0x008C */ PRIO_KLFT, - /* 0x008D */ PRIO_Hmlif, - /* 0x008E */ PRIO_LEAF_LIFT, - /* 0x008F */ PRIO_ICE_LIFT, - /* 0x0090 */ PRIO_AMI_PROP, - /* 0x0091 */ PRIO_PEDESTAL, - /* 0x0092 */ PRIO_FLOOR, - /* 0x0093 */ PRIO_KITA, - /* 0x0094 */ PRIO_KOKIIE, - /* 0x0095 */ PRIO_SHAND, - /* 0x0096 */ PRIO_BITA, - /* 0x0097 */ PRIO_SK, - /* 0x0098 */ PRIO_SK2, - /* 0x0099 */ PRIO_SSK, - /* 0x009A */ PRIO_SEA, - /* 0x009B */ PRIO_Obj_Tide, - /* 0x009C */ PRIO_SHIP, - /* 0x009D */ PRIO_OSHIP, - /* 0x009E */ PRIO_AYUSH, - /* 0x009F */ PRIO_RECTANGLE, - /* 0x00A0 */ PRIO_KYTAG00, - /* 0x00A1 */ PRIO_KYTAG01, - /* 0x00A2 */ PRIO_KYTAG02, - /* 0x00A3 */ PRIO_KYTAG03, - /* 0x00A4 */ PRIO_KYTAG04, - /* 0x00A5 */ PRIO_KYTAG05, - /* 0x00A6 */ PRIO_KYTAG06, - /* 0x00A7 */ PRIO_KYTAG07, - /* 0x00A8 */ PRIO_WindTag, - /* 0x00A9 */ PRIO_ENVSE, - /* 0x00AA */ PRIO_KANBAN, - /* 0x00AB */ PRIO_HITOBJ, - /* 0x00AC */ PRIO_KT, - /* 0x00AD */ PRIO_EP, - /* 0x00AE */ PRIO_LAMP, - /* 0x00AF */ PRIO_MO2, - /* 0x00B0 */ PRIO_BK, - /* 0x00B1 */ PRIO_ST, - /* 0x00B2 */ PRIO_TN, - /* 0x00B3 */ PRIO_MANT, - /* 0x00B4 */ PRIO_KANTERA, - /* 0x00B5 */ PRIO_KAMOME, -#if VERSION == VERSION_DEMO - /* 0x00B6 */ PRIO_KAMOME2, -#endif - /* 0x00B6 */ PRIO_NPC_KAM, - /* 0x00B7 */ PRIO_WBIRD, - /* 0x00B8 */ PRIO_DEMO_KMM, - /* 0x00B9 */ PRIO_NZ, - /* 0x00BA */ PRIO_NZG, - /* 0x00BB */ PRIO_KN, - /* 0x00BC */ PRIO_DEMO_DK, - /* 0x00BD */ PRIO_AM, - /* 0x00BE */ PRIO_AM2, - /* 0x00BF */ PRIO_GM, - /* 0x00C0 */ PRIO_KS, - /* 0x00C1 */ PRIO_CC, - /* 0x00C2 */ PRIO_BL, - /* 0x00C3 */ PRIO_WZ, - /* 0x00C4 */ PRIO_PH, - /* 0x00C5 */ PRIO_PZ, - /* 0x00C6 */ PRIO_BPW, - /* 0x00C7 */ PRIO_PW, - /* 0x00C8 */ PRIO_JBO, - /* 0x00C9 */ PRIO_BO, - /* 0x00CA */ PRIO_KI, - /* 0x00CB */ PRIO_MT, - /* 0x00CC */ PRIO_BWD, - /* 0x00CD */ PRIO_BWDS, - /* 0x00CE */ PRIO_BWDG, - /* 0x00CF */ PRIO_KB, - /* 0x00D0 */ PRIO_ESA, - /* 0x00D1 */ PRIO_MOZO, - /* 0x00D2 */ PRIO_DR, - /* 0x00D3 */ PRIO_DR2, - /* 0x00D4 */ PRIO_RD, - /* 0x00D5 */ PRIO_DAIOCTA, - /* 0x00D6 */ PRIO_DAIOCTA_EYE, - /* 0x00D7 */ PRIO_OQ, - /* 0x00D8 */ PRIO_GY, - /* 0x00D9 */ PRIO_GY_CTRL, - /* 0x00DA */ PRIO_GY_CTRLB, - /* 0x00DB */ PRIO_Hot_Floor, - /* 0x00DC */ PRIO_Beam, - /* 0x00DD */ PRIO_Bemos, - /* 0x00DE */ PRIO_BTD, - /* 0x00DF */ PRIO_BMD, - /* 0x00E0 */ PRIO_BMDHAND, - /* 0x00E1 */ PRIO_BMDFOOT, - /* 0x00E2 */ PRIO_DK, - /* 0x00E3 */ PRIO_BDK, - /* 0x00E4 */ PRIO_BDKOBJ, - /* 0x00E5 */ PRIO_BST, - /* 0x00E6 */ PRIO_FGANON, - /* 0x00E7 */ PRIO_FGMAHOU, - /* 0x00E8 */ PRIO_BGN, - /* 0x00E9 */ PRIO_BGN2, - /* 0x00EA */ PRIO_BGN3, - /* 0x00EB */ PRIO_GND, - /* 0x00EC */ PRIO_PT, - /* 0x00ED */ PRIO_SWTDOOR, - /* 0x00EE */ PRIO_FF, - /* 0x00EF */ PRIO_SYAN, - /* 0x00F0 */ PRIO_KUI, - /* 0x00F1 */ PRIO_SS, - /* 0x00F2 */ PRIO_SSS, - /* 0x00F3 */ PRIO_SITEM, - /* 0x00F4 */ PRIO_MACHINE, - /* 0x00F5 */ PRIO_ITEM, - /* 0x00F6 */ PRIO_Mmusic, - /* 0x00F7 */ PRIO_Komore, - /* 0x00F8 */ PRIO_Tpota, - /* 0x00F9 */ PRIO_Obj_Itnak, - /* 0x00FA */ PRIO_Obj_Zouk, - /* 0x00FB */ PRIO_BOSSITEM, - /* 0x00FC */ PRIO_Demo_Item, - /* 0x00FD */ PRIO_RACEITEM, - /* 0x00FE */ PRIO_ShopItem, - /* 0x00FF */ PRIO_DEKU_ITEM, - /* 0x0100 */ PRIO_SPC_ITEM01, - /* 0x0101 */ PRIO_STANDITEM, - /* 0x0102 */ PRIO_GRID, - /* 0x0103 */ PRIO_TSUBO, - /* 0x0104 */ PRIO_STONE, - /* 0x0105 */ PRIO_Stone2, - /* 0x0106 */ PRIO_Obj_Try, - /* 0x0107 */ PRIO_Obj_Vtil, - /* 0x0108 */ PRIO_Obj_Paper, - /* 0x0109 */ PRIO_Obj_Barrel, - /* 0x010A */ PRIO_Obj_Barrel2, - /* 0x010B */ PRIO_Obj_Eff, - /* 0x010C */ PRIO_Obj_Buoyrace, - /* 0x010D */ PRIO_Obj_Buoyflag, - /* 0x010E */ PRIO_Goal_Flag, - /* 0x010F */ PRIO_Obj_Demo_Barrel, - /* 0x0110 */ PRIO_Obj_Wood, - /* 0x0111 */ PRIO_Obj_Flame, - /* 0x0112 */ PRIO_Obj_Mshokki, - /* 0x0113 */ PRIO_TBOX, - /* 0x0114 */ PRIO_SBOX, - /* 0x0115 */ PRIO_BOMB, - /* 0x0116 */ PRIO_Bomb2, - /* 0x0117 */ PRIO_BOMB_FLOWER, - /* 0x0118 */ PRIO_ACORN_LEAF, - /* 0x0119 */ PRIO_SWHIT0, - /* 0x011A */ PRIO_SWC00, - /* 0x011B */ PRIO_FAN, - /* 0x011C */ PRIO_WINDMILL, - /* 0x011D */ PRIO_ALLDIE, - /* 0x011E */ PRIO_TAG_EVENT, - /* 0x011F */ PRIO_TAG_MK, - /* 0x0120 */ PRIO_TAG_HINT, - /* 0x0121 */ PRIO_TAG_MSG, - /* 0x0122 */ PRIO_TAG_ETC, - /* 0x0123 */ PRIO_TAG_ISLAND, - /* 0x0124 */ PRIO_TAG_KF1, - /* 0x0125 */ PRIO_TAG_KK1, - /* 0x0126 */ PRIO_TAG_PHOTO, - /* 0x0127 */ PRIO_TAG_KB_ITEM, - /* 0x0128 */ PRIO_Tag_Waterlevel, - /* 0x0129 */ PRIO_TAG_MDCB, - /* 0x012A */ PRIO_TAG_BA1, - /* 0x012B */ PRIO_BIGELF, - /* 0x012C */ PRIO_TAMA, - /* 0x012D */ PRIO_DOOR10, - /* 0x012E */ PRIO_DOOR12, - /* 0x012F */ PRIO_ATDOOR, - /* 0x0130 */ PRIO_MDOOR, - /* 0x0131 */ PRIO_KDDOOR, - /* 0x0132 */ PRIO_MBDOOR, - /* 0x0133 */ PRIO_KNOB00, - /* 0x0134 */ PRIO_MTOGE, - /* 0x0135 */ PRIO_ANDSW0, - /* 0x0136 */ PRIO_ANDSW2, - /* 0x0137 */ PRIO_Hys, - /* 0x0138 */ PRIO_DAI, - /* 0x0139 */ PRIO_SW_ATTACK, - /* 0x013A */ PRIO_SW_ITEM, - /* 0x013B */ PRIO_SW_TACT, - /* 0x013C */ PRIO_NH, - /* 0x013D */ PRIO_NPC_OS, - /* 0x013E */ PRIO_NPC_YM1, - /* 0x013F */ PRIO_NPC_YM2, - /* 0x0140 */ PRIO_NPC_YW1, - /* 0x0141 */ PRIO_NPC_JI1, - /* 0x0142 */ PRIO_NPC_KO1, - /* 0x0143 */ PRIO_NPC_KO2, - /* 0x0144 */ PRIO_NPC_LS1, - /* 0x0145 */ PRIO_NPC_P1, - /* 0x0146 */ PRIO_NPC_P2, - /* 0x0147 */ PRIO_NPC_SARACE, - /* 0x0148 */ PRIO_NPC_TC, - /* 0x0149 */ PRIO_NPC_SO, - /* 0x014A */ PRIO_NPC_NZ, - /* 0x014B */ PRIO_NPC_BM1, - /* 0x014C */ PRIO_NPC_BM2, - /* 0x014D */ PRIO_NPC_BM3, - /* 0x014E */ PRIO_NPC_BM4, - /* 0x014F */ PRIO_NPC_BM5, - /* 0x0150 */ PRIO_NPC_OB1, - /* 0x0151 */ PRIO_NPC_AJ1, - /* 0x0152 */ PRIO_NPC_KM1, - /* 0x0153 */ PRIO_NPC_CB1, - /* 0x0154 */ PRIO_NPC_BA1, - /* 0x0155 */ PRIO_NPC_BJ1, - /* 0x0156 */ PRIO_NPC_BJ2, - /* 0x0157 */ PRIO_NPC_BJ3, - /* 0x0158 */ PRIO_NPC_BJ4, - /* 0x0159 */ PRIO_NPC_BJ5, - /* 0x015A */ PRIO_NPC_BJ6, - /* 0x015B */ PRIO_NPC_BJ7, - /* 0x015C */ PRIO_NPC_BJ8, - /* 0x015D */ PRIO_NPC_BJ9, - /* 0x015E */ PRIO_NPC_BS1, - /* 0x015F */ PRIO_NPC_BMCON1, - /* 0x0160 */ PRIO_NPC_BMS1, - /* 0x0161 */ PRIO_NPC_BMSW, - /* 0x0162 */ PRIO_NPC_BTSW, - /* 0x0163 */ PRIO_NPC_BTSW2, - /* 0x0164 */ PRIO_NPC_DS1, - /* 0x0165 */ PRIO_NPC_RSH1, - /* 0x0166 */ PRIO_NPC_KK1, - /* 0x0167 */ PRIO_NPC_PM1, - /* 0x0168 */ PRIO_NPC_KP1, - /* 0x0169 */ PRIO_NPC_PF1, - /* 0x016A */ PRIO_NPC_GP1, - /* 0x016B */ PRIO_NPC_JB1, - /* 0x016C */ PRIO_NPC_KF1, - /* 0x016D */ PRIO_NPC_DE1, - /* 0x016E */ PRIO_NPC_FA1, - /* 0x016F */ PRIO_NPC_AUCTION, - /* 0x0170 */ PRIO_NPC_KG1, - /* 0x0171 */ PRIO_NPC_KG2, - /* 0x0172 */ PRIO_NPC_HR, - /* 0x0173 */ PRIO_NPC_HO, - /* 0x0174 */ PRIO_NPC_TT, - /* 0x0175 */ PRIO_NPC_MD, - /* 0x0176 */ PRIO_NPC_MK, - /* 0x0177 */ PRIO_NPC_UK, - /* 0x0178 */ PRIO_NPC_CO1, - /* 0x0179 */ PRIO_NPC_ZK1, - /* 0x017A */ PRIO_NPC_ROTEN, - /* 0x017B */ PRIO_NPC_PEOPLE, - /* 0x017C */ PRIO_NPC_GK1, - /* 0x017D */ PRIO_NPC_PHOTO, - /* 0x017E */ PRIO_NPC_AC1, - /* 0x017F */ PRIO_NPC_HI1, - /* 0x0180 */ PRIO_NPC_SV, - /* 0x0181 */ PRIO_NPC_MT, - /* 0x0182 */ PRIO_NPC_MN, - /* 0x0183 */ PRIO_NPC_AH, - /* 0x0184 */ PRIO_YOUGAN, - /* 0x0185 */ PRIO_Ykgr, - /* 0x0186 */ PRIO_SAKU, - /* 0x0187 */ PRIO_Iball, - /* 0x0188 */ PRIO_DISAPPEAR, - /* 0x0189 */ PRIO_Salvage, - /* 0x018A */ PRIO_SALVAGE_TBOX, - /* 0x018B */ PRIO_Kmon, - /* 0x018C */ PRIO_TOGE, - /* 0x018D */ PRIO_DEMO00, - /* 0x018E */ PRIO_Lwood, - /* 0x018F */ PRIO_TagRock, - /* 0x0190 */ PRIO_FallRock, - /* 0x0191 */ PRIO_SteamTag, - /* 0x0192 */ PRIO_Fire, - /* 0x0193 */ PRIO_BRANCH, - /* 0x0194 */ PRIO_NPC_ZL1, - /* 0x0195 */ PRIO_WATERFALL, - /* 0x0196 */ PRIO_LIGHTBRIDGE, - /* 0x0197 */ PRIO_LIGHTSTAIR, - /* 0x0198 */ PRIO_WALL, - /* 0x0199 */ PRIO_SW_PROPELLER, - /* 0x019A */ PRIO_HIMO2, - /* 0x019B */ PRIO_HIMO3, - /* 0x019C */ PRIO_ATT, - /* 0x019D */ PRIO_IKARI, - /* 0x019E */ PRIO_HOOKSHOT, - /* 0x019F */ PRIO_BOOMERANG, - /* 0x01A0 */ PRIO_BOKO, - /* 0x01A1 */ PRIO_SCENECHG, - /* 0x01A2 */ PRIO_WARPFLOWER, - /* 0x01A3 */ PRIO_WARPFOUT, - /* 0x01A4 */ PRIO_WARPLIGHT, - /* 0x01A5 */ PRIO_WARPHYRULE, - /* 0x01A6 */ PRIO_WARPDEMO20, - /* 0x01A7 */ PRIO_WARPGANON, - /* 0x01A8 */ PRIO_WARPMAJYUU, - /* 0x01A9 */ PRIO_Obj_Magmarock, - /* 0x01AA */ PRIO_Obj_Pirateship, - /* 0x01AB */ PRIO_Obj_Tousekiki, - /* 0x01AC */ PRIO_Kaji, - /* 0x01AD */ PRIO_Canon, - /* 0x01AE */ PRIO_MGBOARD, - /* 0x01AF */ PRIO_OBJ_CANON, - /* 0x01B0 */ PRIO_OBJ_OTBLE, - /* 0x01B1 */ PRIO_OBJ_WARPT, - /* 0x01B2 */ PRIO_OBJ_SEARCH, - /* 0x01B3 */ PRIO_OBJ_TORIPOST, - /* 0x01B4 */ PRIO_OBJ_IKADA, - /* 0x01B5 */ PRIO_OBJ_MJDOOR, - /* 0x01B6 */ PRIO_OBJ_PFALL, - /* 0x01B7 */ PRIO_OBJ_HOLE, - /* 0x01B8 */ PRIO_Balancelift, - /* 0x01B9 */ PRIO_Obj_Roten, - /* 0x01BA */ PRIO_SHUTTER, - /* 0x01BB */ PRIO_SHUTTER2, - /* 0x01BC */ PRIO_MAGMA, - /* 0x01BD */ PRIO_GRASS, - /* 0x01BE */ PRIO_Obj_Bscurtain, - /* 0x01BF */ PRIO_ARROW, - /* 0x01C0 */ PRIO_ARROW_ICEEFF, - /* 0x01C1 */ PRIO_ARROW_LIGHTEFF, - /* 0x01C2 */ PRIO_BG, - /* 0x01C3 */ PRIO_LODBG, - /* 0x01C4 */ PRIO_Obj_Tower, - /* 0x01C5 */ PRIO_Obj_DoguuD, - /* 0x01C6 */ PRIO_Obj_MknjD, - /* 0x01C7 */ PRIO_OBJ_FIGURE, - /* 0x01C8 */ PRIO_OBJ_HAT, - /* 0x01C9 */ PRIO_SPOTBOX, - /* 0x01CA */ PRIO_WATER_MARK, - /* 0x01CB */ PRIO_WIND_ARROW, - /* 0x01CC */ PRIO_WPOT_WATER, - /* 0x01CD */ PRIO_LEVEL_SE, - /* 0x01CE */ PRIO_THROWSTONE, - /* 0x01CF */ PRIO_OPERATE_WIND, - /* 0x01D0 */ PRIO_Menu_Cloth, - /* 0x01D1 */ PRIO_MENUWINDOW, - /* 0x01D2 */ PRIO_TIMER, - /* 0x01D3 */ PRIO_MINIGAME_STARTER, - /* 0x01D4 */ PRIO_MINIGAME_TERMINATER, - /* 0x01D5 */ PRIO_SCP, - /* 0x01D6 */ PRIO_PB, - /* 0x01D7 */ PRIO_METER, - /* 0x01D8 */ PRIO_MESG, - /* 0x01D9 */ PRIO_MSG, - /* 0x01DA */ PRIO_MSG2, - /* 0x01DB */ PRIO_MSG3, - /* 0x01DC */ PRIO_AUCTION_SCREEN, - /* 0x01DD */ PRIO_PLACE_NAME, - /* 0x01DE */ PRIO_GAMEOVER, - /* 0x01DF */ PRIO_SEATAG, - /* 0x01E0 */ PRIO_AUCTION, - /* 0x01E1 */ PRIO_OVERLAP0, - /* 0x01E2 */ PRIO_OVERLAP1, - /* 0x01E3 */ PRIO_OVERLAP2, - /* 0x01E4 */ PRIO_OVERLAP3, - /* 0x01E5 */ PRIO_OVERLAP4, - /* 0x01E6 */ PRIO_OVERLAP5, - /* 0x01E7 */ PRIO_OVERLAP6, - /* 0x01E8 */ PRIO_OVERLAP7, - /* 0x01E9 */ PRIO_OVERLAP8, -#if VERSION > VERSION_DEMO - /* 0x01EA */ PRIO_1EA, -#endif - /* 0x01FF */ PRIO_1FF = 0x1FF, -}; - -#endif /* D_PRIORITY_H */ diff --git a/include/d/d_procname.h b/include/d/d_procname.h deleted file mode 100644 index a160f07e8..000000000 --- a/include/d/d_procname.h +++ /dev/null @@ -1,516 +0,0 @@ -#ifndef D_PROCNAME_H -#define D_PROCNAME_H - -enum { - /* 0x0000 */ PROC_OVERLAP0, - /* 0x0001 */ PROC_OVERLAP1, - /* 0x0002 */ PROC_OVERLAP6, - /* 0x0003 */ PROC_OVERLAP7, - /* 0x0004 */ PROC_OVERLAP8, - /* 0x0005 */ PROC_LOGO_SCENE, - /* 0x0006 */ PROC_MENU_SCENE, - /* 0x0007 */ PROC_PLAY_SCENE, - /* 0x0008 */ PROC_OPENING_SCENE, - /* 0x0009 */ PROC_OPENING2_SCENE, - /* 0x000A */ PROC_TITLE_SCENE, - /* 0x000B */ PROC_ENDING_SCENE, - /* 0x000C */ PROC_NAME_SCENE, - /* 0x000D */ PROC_NAMEEX_SCENE, - /* 0x000E */ PROC_OPEN_SCENE, - /* 0x000F */ PROC_OPEN2_SCENE, - /* 0x0010 */ PROC_OVERLAP2, - /* 0x0011 */ PROC_OVERLAP3, - /* 0x0012 */ PROC_OVERLAP4, - /* 0x0013 */ PROC_OVERLAP5, - /* 0x0014 */ PROC_ROOM_SCENE, - /* 0x0015 */ PROC_KANKYO, - /* 0x0016 */ PROC_ALLDIE, - /* 0x0017 */ PROC_ENVSE, - /* 0x0018 */ PROC_WIND_ARROW, - /* 0x0019 */ PROC_WPOT_WATER, - /* 0x001A */ PROC_LEVEL_SE, - /* 0x001B */ PROC_THROWSTONE, - /* 0x001C */ PROC_TAG_EVSW, - /* 0x001D */ PROC_Obj_Swpush, - /* 0x001E */ PROC_Obj_Swheavy, - /* 0x001F */ PROC_Obj_Swflat, - /* 0x0020 */ PROC_Obj_Swlight, - /* 0x0021 */ PROC_Obj_Swhammer, - /* 0x0022 */ PROC_Obj_Quake, - /* 0x0023 */ PROC_Obj_Drift, - /* 0x0024 */ PROC_Tag_Volcano, - /* 0x0025 */ PROC_TAG_SO, - /* 0x0026 */ PROC_Obj_Pbco, - /* 0x0027 */ PROC_SEATAG, - /* 0x0028 */ PROC_SEA, - /* 0x0029 */ PROC_Obj_Tide, - /* 0x002A */ PROC_Hmlif, - /* 0x002B */ PROC_SCENECHG, - /* 0x002C */ PROC_Obj_Magmarock, - /* 0x002D */ PROC_Obj_Movebox, - /* 0x002E */ PROC_Obj_Tribox, - /* 0x002F */ PROC_Obj_Shelf, - /* 0x0030 */ PROC_Obj_Hlift, - /* 0x0031 */ PROC_Obj_Hami2, - /* 0x0032 */ PROC_Obj_Hami3, - /* 0x0033 */ PROC_Obj_Hami4, - /* 0x0034 */ PROC_Obj_Hbrf1, - /* 0x0035 */ PROC_Obj_Volcano, - /* 0x0036 */ PROC_Obj_Vmc, - /* 0x0037 */ PROC_Obj_Usovmc, - /* 0x0038 */ PROC_Obj_Vfan, - /* 0x0039 */ PROC_Obj_Iceisland, - /* 0x003A */ PROC_Obj_Dragonhead, - /* 0x003B */ PROC_Obj_Pirateship, - /* 0x003C */ PROC_Obj_Tousekiki, - /* 0x003D */ PROC_Tag_Ret, - /* 0x003E */ PROC_Kaji, - /* 0x003F */ PROC_Canon, - /* 0x0040 */ PROC_MGBOARD, - /* 0x0041 */ PROC_OBJ_CANON, - /* 0x0042 */ PROC_OBJ_OTBLE, - /* 0x0043 */ PROC_OBJ_WARPT, - /* 0x0044 */ PROC_OBJ_SEARCH, - /* 0x0045 */ PROC_OBJ_TORIPOST, - /* 0x0046 */ PROC_OBJ_IKADA, - /* 0x0047 */ PROC_OBJ_MJDOOR, - /* 0x0048 */ PROC_OBJ_PFALL, - /* 0x0049 */ PROC_OBJ_HOLE, - /* 0x004A */ PROC_Obj_Stair, - /* 0x004B */ PROC_Obj_Lpalm, - /* 0x004C */ PROC_Obj_Mtest, - /* 0x004D */ PROC_Obj_Mkie, - /* 0x004E */ PROC_Obj_Mkiek, - /* 0x004F */ PROC_Obj_MknjD, - /* 0x0050 */ PROC_Obj_Msdan, - /* 0x0051 */ PROC_Obj_MsdanSub, - /* 0x0052 */ PROC_Obj_Msdan2, - /* 0x0053 */ PROC_Obj_MsdanSub2, - /* 0x0054 */ PROC_Obj_Nest, - /* 0x0055 */ PROC_Obj_Ojtree, - /* 0x0056 */ PROC_Obj_Ospbox, - /* 0x0057 */ PROC_Obj_Ladder, - /* 0x0058 */ PROC_Obj_Smplbg, - /* 0x0059 */ PROC_Obj_Akabe, - /* 0x005A */ PROC_Obj_Ashut, - /* 0x005B */ PROC_BRIDGE, - /* 0x005C */ PROC_MSW, - /* 0x005D */ PROC_MFLFT, - /* 0x005E */ PROC_KLFT, - /* 0x005F */ PROC_ICE_LIFT, - /* 0x0060 */ PROC_AMI_PROP, - /* 0x0061 */ PROC_PEDESTAL, - /* 0x0062 */ PROC_FLOOR, - /* 0x0063 */ PROC_KITA, - /* 0x0064 */ PROC_KOKIIE, - /* 0x0065 */ PROC_SHAND, - /* 0x0066 */ PROC_BITA, - /* 0x0067 */ PROC_SK, - /* 0x0068 */ PROC_SK2, - /* 0x0069 */ PROC_SSK, - /* 0x006A */ PROC_WARPFLOWER, - /* 0x006B */ PROC_WARPFOUT, - /* 0x006C */ PROC_WARPLIGHT, - /* 0x006D */ PROC_WARPHYRULE, - /* 0x006E */ PROC_WARPDEMO20, - /* 0x006F */ PROC_WARPGANON, - /* 0x0070 */ PROC_WARPMAJYUU, - /* 0x0071 */ PROC_Balancelift, - /* 0x0072 */ PROC_SHUTTER, - /* 0x0073 */ PROC_SHUTTER2, - /* 0x0074 */ PROC_WINDMILL, - /* 0x0075 */ PROC_MBDOOR, - /* 0x0076 */ PROC_NPC_DE1, - /* 0x0077 */ PROC_NPC_NZ, - /* 0x0078 */ PROC_NPC_SO, - /* 0x0079 */ PROC_FM, - /* 0x007A */ PROC_LEAF_LIFT, - /* 0x007B */ PROC_Obj_Roten, - /* 0x007C */ PROC_TOGE, - /* 0x007D */ PROC_Obj_Ferris, - /* 0x007E */ PROC_Obj_Xfuta, - /* 0x007F */ PROC_Obj_Gaship, - /* 0x0080 */ PROC_Obj_Rforce, - /* 0x0081 */ PROC_Obj_Gaship2, - /* 0x0082 */ PROC_Obj_Light, - /* 0x0083 */ PROC_Obj_Homen, - /* 0x0084 */ PROC_Obj_Homensmk, - /* 0x0085 */ PROC_Obj_Ftree, - /* 0x0086 */ PROC_Obj_Vds, - /* 0x0087 */ PROC_Obj_Vyasi, - /* 0x0088 */ PROC_Obj_Ajav, - /* 0x0089 */ PROC_Obj_Trap, - /* 0x008A */ PROC_Obj_Hha, - /* 0x008B */ PROC_Obj_Htetu1, - /* 0x008C */ PROC_Obj_Gnntakis, - /* 0x008D */ PROC_Obj_Gnntakie, - /* 0x008E */ PROC_Obj_Gnnbtaki, - /* 0x008F */ PROC_Obj_Rcloud, - /* 0x0090 */ PROC_Obj_Gryw00, - /* 0x0091 */ PROC_Obj_AjavW, - /* 0x0092 */ PROC_Obj_Leaves, - /* 0x0093 */ PROC_Obj_YLzou, - /* 0x0094 */ PROC_Obj_Gbed, - /* 0x0095 */ PROC_Obj_Vteng, - /* 0x0096 */ PROC_Obj_Hfuck1, - /* 0x0097 */ PROC_Obj_Ohatch, - /* 0x0098 */ PROC_Obj_Hcbh, - /* 0x0099 */ PROC_Obj_Ygush00, - /* 0x009A */ PROC_Obj_Bscurtain, - /* 0x009B */ PROC_Obj_Shmrgrd, - /* 0x009C */ PROC_Obj_Eayogn, - /* 0x009D */ PROC_Obj_Vmsms, - /* 0x009E */ PROC_Obj_Vmsdz, - /* 0x009F */ PROC_Ygcwp, - /* 0x00A0 */ PROC_Obj_Vgnfd, - /* 0x00A1 */ PROC_Obj_Kanoke, - /* 0x00A2 */ PROC_Obj_Eskban, - /* 0x00A3 */ PROC_Obj_Ekskz, - /* 0x00A4 */ PROC_Obj_Ebomzo, - /* 0x00A5 */ PROC_Obj_Kanat, - /* 0x00A6 */ PROC_Obj_Aygr, - /* 0x00A7 */ PROC_SHIP, - /* 0x00A8 */ PROC_Obj_Jump, - /* 0x00A9 */ PROC_PLAYER, - /* 0x00AA */ PROC_HOOKSHOT, - /* 0x00AB */ PROC_NPC_MK, - /* 0x00AC */ PROC_GRID, - /* 0x00AD */ PROC_SAIL, - /* 0x00AE */ PROC_PIRATE_FLAG, - /* 0x00AF */ PROC_MAJUU_FLAG, - /* 0x00B0 */ PROC_Tori_Flag, - /* 0x00B1 */ PROC_Sie_Flag, - /* 0x00B2 */ PROC_SYAN, - /* 0x00B3 */ PROC_AYUSH, - /* 0x00B4 */ PROC_OSHIP, - /* 0x00B5 */ PROC_RECTANGLE, - /* 0x00B6 */ PROC_BB, - /* 0x00B7 */ PROC_KANBAN, - /* 0x00B8 */ PROC_HITOBJ, - /* 0x00B9 */ PROC_KT, - /* 0x00BA */ PROC_EP, - /* 0x00BB */ PROC_LAMP, - /* 0x00BC */ PROC_FF, - /* 0x00BD */ PROC_MO2, - /* 0x00BE */ PROC_BK, - /* 0x00BF */ PROC_ST, - /* 0x00C0 */ PROC_TN, - /* 0x00C1 */ PROC_MANT, - /* 0x00C2 */ PROC_KANTERA, - /* 0x00C3 */ PROC_KAMOME, -#if VERSION == VERSION_DEMO - /* 0x00C4 */ PROC_KAMOME2, -#endif - /* 0x00C4 */ PROC_NPC_KAM, - /* 0x00C5 */ PROC_WBIRD, - /* 0x00C6 */ PROC_DEMO_KMM, - /* 0x00C7 */ PROC_NZ, - /* 0x00C8 */ PROC_NZG, - /* 0x00C9 */ PROC_KN, - /* 0x00CA */ PROC_DEMO_DK, - /* 0x00CB */ PROC_AM, - /* 0x00CC */ PROC_AM2, - /* 0x00CD */ PROC_GM, - /* 0x00CE */ PROC_KS, - /* 0x00CF */ PROC_CC, - /* 0x00D0 */ PROC_BL, - /* 0x00D1 */ PROC_WZ, - /* 0x00D2 */ PROC_PH, - /* 0x00D3 */ PROC_PZ, - /* 0x00D4 */ PROC_BPW, - /* 0x00D5 */ PROC_PW, - /* 0x00D6 */ PROC_JBO, - /* 0x00D7 */ PROC_BO, - /* 0x00D8 */ PROC_KI, - /* 0x00D9 */ PROC_MT, - /* 0x00DA */ PROC_BWD, - /* 0x00DB */ PROC_BWDS, - /* 0x00DC */ PROC_BWDG, - /* 0x00DD */ PROC_KB, - /* 0x00DE */ PROC_ESA, - /* 0x00DF */ PROC_DR, - /* 0x00E0 */ PROC_DR2, - /* 0x00E1 */ PROC_RD, - /* 0x00E2 */ PROC_DAIOCTA, - /* 0x00E3 */ PROC_DAIOCTA_EYE, - /* 0x00E4 */ PROC_OQ, - /* 0x00E5 */ PROC_GY, - /* 0x00E6 */ PROC_GY_CTRL, - /* 0x00E7 */ PROC_GY_CTRLB, - /* 0x00E8 */ PROC_Hot_Floor, - /* 0x00E9 */ PROC_Beam, - /* 0x00EA */ PROC_Bemos, - /* 0x00EB */ PROC_BTD, - /* 0x00EC */ PROC_BMD, - /* 0x00ED */ PROC_BMDHAND, - /* 0x00EE */ PROC_BMDFOOT, - /* 0x00EF */ PROC_DK, - /* 0x00F0 */ PROC_BDK, - /* 0x00F1 */ PROC_BDKOBJ, - /* 0x00F2 */ PROC_BST, - /* 0x00F3 */ PROC_FGANON, - /* 0x00F4 */ PROC_FGMAHOU, - /* 0x00F5 */ PROC_BGN, - /* 0x00F6 */ PROC_BGN2, - /* 0x00F7 */ PROC_BGN3, - /* 0x00F8 */ PROC_GND, - /* 0x00F9 */ PROC_PT, - /* 0x00FA */ PROC_SWTDOOR, - /* 0x00FB */ PROC_MOZO, - /* 0x00FC */ PROC_KUI, - /* 0x00FD */ PROC_SS, - /* 0x00FE */ PROC_SSS, - /* 0x00FF */ PROC_SITEM, - /* 0x0100 */ PROC_MACHINE, - /* 0x0101 */ PROC_ITEM, - /* 0x0102 */ PROC_BOSSITEM, - /* 0x0103 */ PROC_Demo_Item, - /* 0x0104 */ PROC_RACEITEM, - /* 0x0105 */ PROC_ShopItem, - /* 0x0106 */ PROC_DEKU_ITEM, - /* 0x0107 */ PROC_SPC_ITEM01, - /* 0x0108 */ PROC_Obj_Paper, - /* 0x0109 */ PROC_Obj_Demo_Barrel, - /* 0x010A */ PROC_Obj_Dmgroom, - /* 0x010B */ PROC_Obj_Doguu, - /* 0x010C */ PROC_Obj_Wood, - /* 0x010D */ PROC_Obj_Flame, - /* 0x010E */ PROC_Obj_Buoyrace, - /* 0x010F */ PROC_Obj_Coming, - /* 0x0110 */ PROC_Coming2, - /* 0x0111 */ PROC_Coming3, - /* 0x0112 */ PROC_Obj_Mmrr, - /* 0x0113 */ PROC_Obj_Pbka, - /* 0x0114 */ PROC_Obj_Plant, - /* 0x0115 */ PROC_Obj_Gtaki, - /* 0x0116 */ PROC_Obj_Yboil, - /* 0x0117 */ PROC_Obj_Rflw, - /* 0x0118 */ PROC_Obj_Table, - /* 0x0119 */ PROC_Obj_Tenmado, - /* 0x011A */ PROC_Obj_Cafelmp, - /* 0x011B */ PROC_Obj_Apzl, - /* 0x011C */ PROC_Obj_Adnno, - /* 0x011D */ PROC_Obj_Auzu, - /* 0x011E */ PROC_Obj_Gong, - /* 0x011F */ PROC_Obj_Barrier, - /* 0x0120 */ PROC_Obj_Firewall, - /* 0x0121 */ PROC_Obj_TnTrap, - /* 0x0122 */ PROC_Obj_Monument, - /* 0x0123 */ PROC_Obj_Tapestry, - /* 0x0124 */ PROC_Obj_HSH, - /* 0x0125 */ PROC_Goal_Flag, - /* 0x0126 */ PROC_TBOX, - /* 0x0127 */ PROC_SBOX, - /* 0x0128 */ PROC_BOMB, - /* 0x0129 */ PROC_Bomb2, - /* 0x012A */ PROC_BOMB_FLOWER, - /* 0x012B */ PROC_ACORN_LEAF, - /* 0x012C */ PROC_SWC00, - /* 0x012D */ PROC_FAN, - /* 0x012E */ PROC_DOOR10, - /* 0x012F */ PROC_DOOR12, - /* 0x0130 */ PROC_ATDOOR, - /* 0x0131 */ PROC_MDOOR, - /* 0x0132 */ PROC_KDDOOR, - /* 0x0133 */ PROC_KNOB00, - /* 0x0134 */ PROC_MTOGE, - /* 0x0135 */ PROC_ANDSW0, - /* 0x0136 */ PROC_ANDSW2, - /* 0x0137 */ PROC_DAI, - /* 0x0138 */ PROC_SW_ATTACK, - /* 0x0139 */ PROC_SW_ITEM, - /* 0x013A */ PROC_SW_TACT, - /* 0x013B */ PROC_NH, - /* 0x013C */ PROC_NPC_OS, - /* 0x013D */ PROC_NPC_YM1, - /* 0x013E */ PROC_NPC_YM2, - /* 0x013F */ PROC_NPC_YW1, - /* 0x0140 */ PROC_NPC_JI1, - /* 0x0141 */ PROC_NPC_KO1, - /* 0x0142 */ PROC_NPC_KO2, - /* 0x0143 */ PROC_NPC_LS1, - /* 0x0144 */ PROC_NPC_P1, - /* 0x0145 */ PROC_NPC_P2, - /* 0x0146 */ PROC_NPC_SARACE, - /* 0x0147 */ PROC_NPC_TC, - /* 0x0148 */ PROC_NPC_BM1, - /* 0x0149 */ PROC_NPC_BM2, - /* 0x014A */ PROC_NPC_BM3, - /* 0x014B */ PROC_NPC_BM4, - /* 0x014C */ PROC_NPC_BM5, - /* 0x014D */ PROC_NPC_OB1, - /* 0x014E */ PROC_NPC_AJ1, - /* 0x014F */ PROC_NPC_KM1, - /* 0x0150 */ PROC_NPC_CB1, - /* 0x0151 */ PROC_NPC_BA1, - /* 0x0152 */ PROC_NPC_BJ1, - /* 0x0153 */ PROC_NPC_BJ2, - /* 0x0154 */ PROC_NPC_BJ3, - /* 0x0155 */ PROC_NPC_BJ4, - /* 0x0156 */ PROC_NPC_BJ5, - /* 0x0157 */ PROC_NPC_BJ6, - /* 0x0158 */ PROC_NPC_BJ7, - /* 0x0159 */ PROC_NPC_BJ8, - /* 0x015A */ PROC_NPC_BJ9, - /* 0x015B */ PROC_NPC_BS1, - /* 0x015C */ PROC_NPC_BMCON1, - /* 0x015D */ PROC_NPC_BMS1, - /* 0x015E */ PROC_NPC_BMSW, - /* 0x015F */ PROC_NPC_BTSW, - /* 0x0160 */ PROC_NPC_BTSW2, - /* 0x0161 */ PROC_NPC_DS1, - /* 0x0162 */ PROC_NPC_RSH1, - /* 0x0163 */ PROC_NPC_KK1, - /* 0x0164 */ PROC_NPC_PM1, - /* 0x0165 */ PROC_NPC_KP1, - /* 0x0166 */ PROC_NPC_PF1, - /* 0x0167 */ PROC_NPC_GP1, - /* 0x0168 */ PROC_NPC_JB1, - /* 0x0169 */ PROC_NPC_KF1, - /* 0x016A */ PROC_NPC_FA1, - /* 0x016B */ PROC_NPC_AUCTION, - /* 0x016C */ PROC_NPC_KG1, - /* 0x016D */ PROC_NPC_KG2, - /* 0x016E */ PROC_NPC_TT, - /* 0x016F */ PROC_NPC_HR, - /* 0x0170 */ PROC_NPC_HO, - /* 0x0171 */ PROC_NPC_MD, - /* 0x0172 */ PROC_NPC_UK, - /* 0x0173 */ PROC_BIGELF, - /* 0x0174 */ PROC_NPC_CO1, - /* 0x0175 */ PROC_NPC_ZK1, - /* 0x0176 */ PROC_NPC_ROTEN, - /* 0x0177 */ PROC_NPC_PEOPLE, - /* 0x0178 */ PROC_NPC_GK1, - /* 0x0179 */ PROC_NPC_PHOTO, - /* 0x017A */ PROC_NPC_AC1, - /* 0x017B */ PROC_NPC_HI1, - /* 0x017C */ PROC_NPC_SV, - /* 0x017D */ PROC_NPC_MT, - /* 0x017E */ PROC_NPC_MN, - /* 0x017F */ PROC_NPC_AH, - /* 0x0180 */ PROC_AUCTION, - /* 0x0181 */ PROC_KYTAG00, - /* 0x0182 */ PROC_KYTAG01, - /* 0x0183 */ PROC_KYTAG02, - /* 0x0184 */ PROC_KYTAG03, - /* 0x0185 */ PROC_KYTAG04, - /* 0x0186 */ PROC_KYTAG05, - /* 0x0187 */ PROC_KYTAG06, - /* 0x0188 */ PROC_KYTAG07, - /* 0x0189 */ PROC_WindTag, - /* 0x018A */ PROC_YOUGAN, - /* 0x018B */ PROC_Mmusic, - /* 0x018C */ PROC_Komore, - /* 0x018D */ PROC_Tpota, - /* 0x018E */ PROC_Obj_Itnak, - /* 0x018F */ PROC_Obj_Zouk, - /* 0x0190 */ PROC_Ykgr, - /* 0x0191 */ PROC_SAKU, - /* 0x0192 */ PROC_Iball, - /* 0x0193 */ PROC_DISAPPEAR, - /* 0x0194 */ PROC_Salvage, - /* 0x0195 */ PROC_SALVAGE_TBOX, - /* 0x0196 */ PROC_Kmon, - /* 0x0197 */ PROC_OBJ_FIGURE, - /* 0x0198 */ PROC_OBJ_HAT, - /* 0x0199 */ PROC_DEMO00, - /* 0x019A */ PROC_Lwood, - /* 0x019B */ PROC_Dummy, - /* 0x019C */ PROC_TAG_EVENT, - /* 0x019D */ PROC_TAG_HINT, - /* 0x019E */ PROC_TAG_MSG, - /* 0x019F */ PROC_TAG_ETC, - /* 0x01A0 */ PROC_TAG_ISLAND, - /* 0x01A1 */ PROC_TAG_KF1, - /* 0x01A2 */ PROC_TAG_KK1, - /* 0x01A3 */ PROC_TAG_PHOTO, - /* 0x01A4 */ PROC_TAG_KB_ITEM, - /* 0x01A5 */ PROC_TAG_MK, - /* 0x01A6 */ PROC_TAG_MDCB, - /* 0x01A7 */ PROC_TAG_BA1, - /* 0x01A8 */ PROC_TagRock, - /* 0x01A9 */ PROC_FallRock, - /* 0x01AA */ PROC_SteamTag, - /* 0x01AB */ PROC_Fire, - /* 0x01AC */ PROC_BRANCH, - /* 0x01AD */ PROC_NPC_ZL1, - /* 0x01AE */ PROC_WATERFALL, - /* 0x01AF */ PROC_LIGHTBRIDGE, - /* 0x01B0 */ PROC_LIGHTSTAIR, - /* 0x01B1 */ PROC_WALL, - /* 0x01B2 */ PROC_SW_PROPELLER, - /* 0x01B3 */ PROC_IKARI, - /* 0x01B4 */ PROC_BOOMERANG, - /* 0x01B5 */ PROC_AGB, - /* 0x01B6 */ PROC_AGBSW0, - /* 0x01B7 */ PROC_MAGMA, - /* 0x01B8 */ PROC_GRASS, - /* 0x01B9 */ PROC_KY_THUNDER, - /* 0x01BA */ PROC_VRBOX, - /* 0x01BB */ PROC_VRBOX2, - /* 0x01BC */ PROC_BG, - /* 0x01BD */ PROC_Obj_Tower, - /* 0x01BE */ PROC_Obj_DoguuD, - /* 0x01BF */ PROC_SPOTBOX, - /* 0x01C0 */ PROC_TORNADO, - /* 0x01C1 */ PROC_TITLE, - /* 0x01C2 */ PROC_MP, - /* 0x01C3 */ PROC_LODBG, - /* 0x01C4 */ PROC_HIMO2, - /* 0x01C5 */ PROC_HIMO3, - /* 0x01C6 */ PROC_ATT, - /* 0x01C7 */ PROC_WPILLAR, - /* 0x01C8 */ PROC_Hys, - /* 0x01C9 */ PROC_SWHIT0, - /* 0x01CA */ PROC_TAG_GSHIP, - /* 0x01CB */ PROC_TSUBO, - /* 0x01CC */ PROC_STONE, - /* 0x01CD */ PROC_Stone2, - /* 0x01CE */ PROC_Obj_Barrel, - /* 0x01CF */ PROC_Obj_Barrel2, - /* 0x01CF */ tk_Obj_Barrel2_e = PROC_Obj_Barrel2, - /* 0x01D0 */ PROC_Obj_Try, - /* 0x01D1 */ PROC_Obj_Vtil, - /* 0x01D2 */ PROC_Obj_Ice, - /* 0x01D3 */ PROC_Obj_Mshokki, - /* 0x01D4 */ PROC_STANDITEM, - /* 0x01D5 */ PROC_BOKO, - /* 0x01D6 */ PROC_TAMA, - /* 0x01D7 */ PROC_Obj_Buoyflag, - /* 0x01D8 */ PROC_Obj_Correct, - /* 0x01D9 */ PROC_Obj_Eff, - /* 0x01DA */ PROC_WATER_MARK, - /* 0x01DB */ PROC_Tag_Light, - /* 0x01DC */ PROC_Tag_Attention, - /* 0x01DD */ PROC_Tag_Waterlevel, - /* 0x01DE */ PROC_ARROW, - /* 0x01DF */ PROC_ARROW_ICEEFF, - /* 0x01E0 */ PROC_ARROW_LIGHTEFF, - /* 0x01E1 */ PROC_Obj_Timer, - /* 0x01E2 */ PROC_CAMERA, - /* 0x01E3 */ PROC_CAMERA2, - /* 0x01E4 */ PROC_KYEFF, - /* 0x01E5 */ PROC_KYEFF2, - /* 0x01E6 */ PROC_MESG, - /* 0x01E7 */ PROC_MSG, - /* 0x01E8 */ PROC_MSG2, - /* 0x01E9 */ PROC_MSG3, - /* 0x01EA */ PROC_MENUWINDOW, - /* 0x01EB */ PROC_Menu_Cloth, - /* 0x01EC */ PROC_TIMER, - /* 0x01ED */ PROC_AUCTION_SCREEN, - /* 0x01EE */ PROC_PLACE_NAME, - /* 0x01EF */ PROC_MINIGAME_STARTER, - /* 0x01F0 */ PROC_MINIGAME_TERMINATER, - /* 0x01F1 */ PROC_METER, - /* 0x01F2 */ PROC_OPERATE_WIND, - /* 0x01F3 */ PROC_SCP, - /* 0x01F4 */ PROC_PB, - /* 0x01F5 */ PROC_GAMEOVER, - PROC_COUNT_e, - - PROC_INVALID_e = 0x7FFF, -}; - -#endif /* D_PROCNAME_H */ diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h index 10ff52872..62d92e576 100644 --- a/include/f_op/f_op_actor_mng.h +++ b/include/f_op/f_op_actor_mng.h @@ -407,7 +407,7 @@ inline BOOL fopAcM_isItem(fopAc_ac_c* item, int bitNo) { inline BOOL dComIfGs_isVisitedRoom(int i_no); inline BOOL dComIfGs_isSaveSwitch(int i_stageNo, int i_no); inline BOOL fopAcM_isItemForIb(int itemBitNo, u8 itemNo, s8 roomNo) { - if (itemNo == dItem_BLUE_JELLY_e) { + if (itemNo == dItemNo_BLUE_JELLY_e) { #if VERSION == VERSION_DEMO return dComIfGs_isVisitedRoom(itemBitNo); #else @@ -422,7 +422,7 @@ inline BOOL fopAcM_isItemForIb(int itemBitNo, u8 itemNo, s8 roomNo) { inline void dComIfGs_onVisitedRoom(int i_no); inline void dComIfGs_onSaveSwitch(int i_stageNo, int i_no); inline void fopAcM_onItemForIb(int itemBitNo, u8 itemNo, s8 roomNo) { - if (itemNo == dItem_BLUE_JELLY_e) { + if (itemNo == dItemNo_BLUE_JELLY_e) { #if VERSION == VERSION_DEMO dComIfGs_onVisitedRoom(itemBitNo); #else diff --git a/include/f_pc/f_pc_draw_priority.h b/include/f_pc/f_pc_draw_priority.h index 1049f87ff..cfca036bd 100644 --- a/include/f_pc/f_pc_draw_priority.h +++ b/include/f_pc/f_pc_draw_priority.h @@ -12,4 +12,504 @@ s16 fpcDwPi_Get(draw_priority_class* pDwPi); void fpcDwPi_Set(draw_priority_class* pDwPi, s16 p); void fpcDwPi_Init(draw_priority_class* pDwPi, s16 p); +enum { + /* 0x0000 */ fpcDwPi_CAMERA_e, + /* 0x0001 */ fpcDwPi_CAMERA2_e, + /* 0x0002 */ fpcDwPi_KANKYO_e, + /* 0x0003 */ fpcDwPi_KYEFF2_e, + /* 0x0004 */ fpcDwPi_VRBOX2_e, + /* 0x0005 */ fpcDwPi_KYEFF_e, + /* 0x0006 */ fpcDwPi_KY_THUNDER_e, + /* 0x0007 */ fpcDwPi_VRBOX_e, + /* 0x0008 */ fpcDwPi_WPILLAR_e, + /* 0x0009 */ fpcDwPi_TORNADO_e, + /* 0x000A */ fpcDwPi_TITLE_e, + /* 0x000B */ fpcDwPi_MP_e, + /* 0x000C */ fpcDwPi_AGB_e, + /* 0x000D */ fpcDwPi_AGBSW0_e, + /* 0x000E */ fpcDwPi_BB_e, + /* 0x000F */ fpcDwPi_Obj_Ice_e, + /* 0x0010 */ fpcDwPi_Obj_Swpush_e, + /* 0x0011 */ fpcDwPi_Obj_Swheavy_e, + /* 0x0012 */ fpcDwPi_Obj_Swflat_e, + /* 0x0013 */ fpcDwPi_Obj_Swlight_e, + /* 0x0014 */ fpcDwPi_Obj_Quake_e, + /* 0x0015 */ fpcDwPi_Obj_Movebox_e, + /* 0x0016 */ fpcDwPi_Obj_Tribox_e, + /* 0x0017 */ fpcDwPi_Obj_Shelf_e, + /* 0x0018 */ fpcDwPi_Obj_Hlift_e, + /* 0x0019 */ fpcDwPi_Obj_Hami2_e, + /* 0x001A */ fpcDwPi_Obj_Hami3_e, + /* 0x001B */ fpcDwPi_Obj_Hami4_e, + /* 0x001C */ fpcDwPi_Obj_Hbrf1_e, + /* 0x001D */ fpcDwPi_Obj_Dmgroom_e, + /* 0x001E */ fpcDwPi_Obj_Doguu_e, + /* 0x001F */ fpcDwPi_Obj_Volcano_e, + /* 0x0020 */ fpcDwPi_Obj_Vfan_e, + /* 0x0021 */ fpcDwPi_Obj_Pbco_e, + /* 0x0022 */ fpcDwPi_Obj_Vmc_e, + /* 0x0023 */ fpcDwPi_Obj_Usovmc_e, + /* 0x0024 */ fpcDwPi_Obj_Iceisland_e, + /* 0x0025 */ fpcDwPi_Obj_Dragonhead_e, + /* 0x0026 */ fpcDwPi_Obj_Correct_e, + /* 0x0027 */ fpcDwPi_Obj_Coming_e, + /* 0x0028 */ fpcDwPi_Coming2_e, + /* 0x0029 */ fpcDwPi_Coming3_e, + /* 0x002A */ fpcDwPi_Obj_Timer_e, + /* 0x002B */ fpcDwPi_Obj_Mtest_e, + /* 0x002C */ fpcDwPi_Obj_Nest_e, + /* 0x002D */ fpcDwPi_Obj_Ojtree_e, + /* 0x002E */ fpcDwPi_Obj_Drift_e, + /* 0x002F */ fpcDwPi_Obj_Ospbox_e, + /* 0x0030 */ fpcDwPi_Obj_Ladder_e, + /* 0x0031 */ fpcDwPi_Obj_Jump_e, + /* 0x0032 */ fpcDwPi_Obj_Smplbg_e, + /* 0x0033 */ fpcDwPi_Obj_Akabe_e, + /* 0x0034 */ fpcDwPi_Obj_Ashut_e, + /* 0x0035 */ fpcDwPi_Obj_Mmrr_e, + /* 0x0036 */ fpcDwPi_Obj_Mkie_e, + /* 0x0037 */ fpcDwPi_Obj_Mkiek_e, + /* 0x0038 */ fpcDwPi_Obj_Msdan_e, + /* 0x0039 */ fpcDwPi_Obj_MsdanSub_e, + /* 0x003A */ fpcDwPi_Obj_Msdan2_e, + /* 0x003B */ fpcDwPi_Obj_MsdanSub2_e, + /* 0x003C */ fpcDwPi_Obj_Ferris_e, + /* 0x003D */ fpcDwPi_Obj_Xfuta_e, + /* 0x003E */ fpcDwPi_Obj_Rforce_e, + /* 0x003F */ fpcDwPi_Obj_Gaship_e, + /* 0x0040 */ fpcDwPi_Obj_Gaship2_e, + /* 0x0041 */ fpcDwPi_Obj_Light_e, + /* 0x0042 */ fpcDwPi_Obj_Homen_e, + /* 0x0043 */ fpcDwPi_Obj_Homensmk_e, + /* 0x0044 */ fpcDwPi_Obj_Ftree_e, + /* 0x0045 */ fpcDwPi_Obj_Vds_e, + /* 0x0046 */ fpcDwPi_Obj_Vyasi_e, + /* 0x0047 */ fpcDwPi_Obj_Ajav_e, + /* 0x0048 */ fpcDwPi_Obj_Trap_e, + /* 0x0049 */ fpcDwPi_Obj_Hha_e, + /* 0x004A */ fpcDwPi_Obj_Htetu1_e, + /* 0x004B */ fpcDwPi_Obj_Shmrgrd_e, + /* 0x004C */ fpcDwPi_Obj_Eayogn_e, + /* 0x004D */ fpcDwPi_Obj_Vmsms_e, + /* 0x004E */ fpcDwPi_Obj_Vmsdz_e, + /* 0x004F */ fpcDwPi_Ygcwp_e, + /* 0x0050 */ fpcDwPi_Obj_Vgnfd_e, + /* 0x0051 */ fpcDwPi_Obj_Gnntakis_e, + /* 0x0052 */ fpcDwPi_Obj_Gnntakie_e, + /* 0x0053 */ fpcDwPi_Obj_Gnnbtaki_e, + /* 0x0054 */ fpcDwPi_Obj_Rcloud_e, + /* 0x0055 */ fpcDwPi_Obj_Gryw00_e, + /* 0x0056 */ fpcDwPi_Obj_AjavW_e, + /* 0x0057 */ fpcDwPi_Obj_Leaves_e, + /* 0x0058 */ fpcDwPi_Obj_YLzou_e, + /* 0x0059 */ fpcDwPi_Obj_Gbed_e, + /* 0x005A */ fpcDwPi_Obj_Vteng_e, + /* 0x005B */ fpcDwPi_Obj_Hfuck1_e, + /* 0x005C */ fpcDwPi_Obj_Ohatch_e, + /* 0x005D */ fpcDwPi_Obj_Hcbh_e, + /* 0x005E */ fpcDwPi_Obj_Ygush00_e, + /* 0x005F */ fpcDwPi_Tag_Ret_e, + /* 0x0060 */ fpcDwPi_Dummy_e, + /* 0x0061 */ fpcDwPi_Tag_Volcano_e, + /* 0x0062 */ fpcDwPi_TAG_EVSW_e, + /* 0x0063 */ fpcDwPi_Tag_Light_e, + /* 0x0064 */ fpcDwPi_Tag_Attention_e, + /* 0x0065 */ fpcDwPi_TAG_SO_e, + /* 0x0066 */ fpcDwPi_TAG_GSHIP_e, + /* 0x0067 */ fpcDwPi_FM_e, + /* 0x0068 */ fpcDwPi_PLAYER_e, + /* 0x0069 */ fpcDwPi_SAIL_e, + /* 0x006A */ fpcDwPi_PIRATE_FLAG_e, + /* 0x006B */ fpcDwPi_MAJUU_FLAG_e, + /* 0x006C */ fpcDwPi_Tori_Flag_e, + /* 0x006D */ fpcDwPi_Sie_Flag_e, + /* 0x006E */ fpcDwPi_Obj_Stair_e, + /* 0x006F */ fpcDwPi_Obj_Lpalm_e, + /* 0x0070 */ fpcDwPi_Obj_Pbka_e, + /* 0x0071 */ fpcDwPi_Obj_Plant_e, + /* 0x0072 */ fpcDwPi_Obj_Gtaki_e, + /* 0x0073 */ fpcDwPi_Obj_Yboil_e, + /* 0x0074 */ fpcDwPi_Obj_Rflw_e, + /* 0x0075 */ fpcDwPi_Obj_Table_e, + /* 0x0076 */ fpcDwPi_Obj_Tenmado_e, + /* 0x0077 */ fpcDwPi_Obj_Cafelmp_e, + /* 0x0078 */ fpcDwPi_Obj_Kanoke_e, + /* 0x0079 */ fpcDwPi_Obj_Kanat_e, + /* 0x007A */ fpcDwPi_Obj_Eskban_e, + /* 0x007B */ fpcDwPi_Obj_Ekskz_e, + /* 0x007C */ fpcDwPi_Obj_Ebomzo_e, + /* 0x007D */ fpcDwPi_Obj_Apzl_e, + /* 0x007E */ fpcDwPi_Obj_Adnno_e, + /* 0x007F */ fpcDwPi_Obj_Auzu_e, + /* 0x0080 */ fpcDwPi_Obj_Aygr_e, + /* 0x0081 */ fpcDwPi_Obj_Gong_e, + /* 0x0082 */ fpcDwPi_Obj_Swhammer_e, + /* 0x0083 */ fpcDwPi_Obj_Barrier_e, + /* 0x0084 */ fpcDwPi_Obj_Firewall_e, + /* 0x0085 */ fpcDwPi_Obj_TnTrap_e, + /* 0x0086 */ fpcDwPi_Obj_Monument_e, + /* 0x0087 */ fpcDwPi_Obj_Tapestry_e, + /* 0x0088 */ fpcDwPi_Obj_HSH_e, + /* 0x0089 */ fpcDwPi_BRIDGE_e, + /* 0x008A */ fpcDwPi_MSW_e, + /* 0x008B */ fpcDwPi_MFLFT_e, + /* 0x008C */ fpcDwPi_KLFT_e, + /* 0x008D */ fpcDwPi_Hmlif_e, + /* 0x008E */ fpcDwPi_LEAF_LIFT_e, + /* 0x008F */ fpcDwPi_ICE_LIFT_e, + /* 0x0090 */ fpcDwPi_AMI_PROP_e, + /* 0x0091 */ fpcDwPi_PEDESTAL_e, + /* 0x0092 */ fpcDwPi_FLOOR_e, + /* 0x0093 */ fpcDwPi_KITA_e, + /* 0x0094 */ fpcDwPi_KOKIIE_e, + /* 0x0095 */ fpcDwPi_SHAND_e, + /* 0x0096 */ fpcDwPi_BITA_e, + /* 0x0097 */ fpcDwPi_SK_e, + /* 0x0098 */ fpcDwPi_SK2_e, + /* 0x0099 */ fpcDwPi_SSK_e, + /* 0x009A */ fpcDwPi_SEA_e, + /* 0x009B */ fpcDwPi_Obj_Tide_e, + /* 0x009C */ fpcDwPi_SHIP_e, + /* 0x009D */ fpcDwPi_OSHIP_e, + /* 0x009E */ fpcDwPi_AYUSH_e, + /* 0x009F */ fpcDwPi_RECTANGLE_e, + /* 0x00A0 */ fpcDwPi_KYTAG00_e, + /* 0x00A1 */ fpcDwPi_KYTAG01_e, + /* 0x00A2 */ fpcDwPi_KYTAG02_e, + /* 0x00A3 */ fpcDwPi_KYTAG03_e, + /* 0x00A4 */ fpcDwPi_KYTAG04_e, + /* 0x00A5 */ fpcDwPi_KYTAG05_e, + /* 0x00A6 */ fpcDwPi_KYTAG06_e, + /* 0x00A7 */ fpcDwPi_KYTAG07_e, + /* 0x00A8 */ fpcDwPi_WindTag_e, + /* 0x00A9 */ fpcDwPi_ENVSE_e, + /* 0x00AA */ fpcDwPi_KANBAN_e, + /* 0x00AB */ fpcDwPi_HITOBJ_e, + /* 0x00AC */ fpcDwPi_KT_e, + /* 0x00AD */ fpcDwPi_EP_e, + /* 0x00AE */ fpcDwPi_LAMP_e, + /* 0x00AF */ fpcDwPi_MO2_e, + /* 0x00B0 */ fpcDwPi_BK_e, + /* 0x00B1 */ fpcDwPi_ST_e, + /* 0x00B2 */ fpcDwPi_TN_e, + /* 0x00B3 */ fpcDwPi_MANT_e, + /* 0x00B4 */ fpcDwPi_KANTERA_e, + /* 0x00B5 */ fpcDwPi_KAMOME_e, +#if VERSION == VERSION_DEMO + /* 0x00B6 */ fpcDwPi_KAMOME2_e, +#endif + /* 0x00B6 */ fpcDwPi_NPC_KAM_e, + /* 0x00B7 */ fpcDwPi_WBIRD_e, + /* 0x00B8 */ fpcDwPi_DEMO_KMM_e, + /* 0x00B9 */ fpcDwPi_NZ_e, + /* 0x00BA */ fpcDwPi_NZG_e, + /* 0x00BB */ fpcDwPi_KN_e, + /* 0x00BC */ fpcDwPi_DEMO_DK_e, + /* 0x00BD */ fpcDwPi_AM_e, + /* 0x00BE */ fpcDwPi_AM2_e, + /* 0x00BF */ fpcDwPi_GM_e, + /* 0x00C0 */ fpcDwPi_KS_e, + /* 0x00C1 */ fpcDwPi_CC_e, + /* 0x00C2 */ fpcDwPi_BL_e, + /* 0x00C3 */ fpcDwPi_WZ_e, + /* 0x00C4 */ fpcDwPi_PH_e, + /* 0x00C5 */ fpcDwPi_PZ_e, + /* 0x00C6 */ fpcDwPi_BPW_e, + /* 0x00C7 */ fpcDwPi_PW_e, + /* 0x00C8 */ fpcDwPi_JBO_e, + /* 0x00C9 */ fpcDwPi_BO_e, + /* 0x00CA */ fpcDwPi_KI_e, + /* 0x00CB */ fpcDwPi_MT_e, + /* 0x00CC */ fpcDwPi_BWD_e, + /* 0x00CD */ fpcDwPi_BWDS_e, + /* 0x00CE */ fpcDwPi_BWDG_e, + /* 0x00CF */ fpcDwPi_KB_e, + /* 0x00D0 */ fpcDwPi_ESA_e, + /* 0x00D1 */ fpcDwPi_MOZO_e, + /* 0x00D2 */ fpcDwPi_DR_e, + /* 0x00D3 */ fpcDwPi_DR2_e, + /* 0x00D4 */ fpcDwPi_RD_e, + /* 0x00D5 */ fpcDwPi_DAIOCTA_e, + /* 0x00D6 */ fpcDwPi_DAIOCTA_EYE_e, + /* 0x00D7 */ fpcDwPi_OQ_e, + /* 0x00D8 */ fpcDwPi_GY_e, + /* 0x00D9 */ fpcDwPi_GY_CTRL_e, + /* 0x00DA */ fpcDwPi_GY_CTRLB_e, + /* 0x00DB */ fpcDwPi_Hot_Floor_e, + /* 0x00DC */ fpcDwPi_Beam_e, + /* 0x00DD */ fpcDwPi_Bemos_e, + /* 0x00DE */ fpcDwPi_BTD_e, + /* 0x00DF */ fpcDwPi_BMD_e, + /* 0x00E0 */ fpcDwPi_BMDHAND_e, + /* 0x00E1 */ fpcDwPi_BMDFOOT_e, + /* 0x00E2 */ fpcDwPi_DK_e, + /* 0x00E3 */ fpcDwPi_BDK_e, + /* 0x00E4 */ fpcDwPi_BDKOBJ_e, + /* 0x00E5 */ fpcDwPi_BST_e, + /* 0x00E6 */ fpcDwPi_FGANON_e, + /* 0x00E7 */ fpcDwPi_FGMAHOU_e, + /* 0x00E8 */ fpcDwPi_BGN_e, + /* 0x00E9 */ fpcDwPi_BGN2_e, + /* 0x00EA */ fpcDwPi_BGN3_e, + /* 0x00EB */ fpcDwPi_GND_e, + /* 0x00EC */ fpcDwPi_PT_e, + /* 0x00ED */ fpcDwPi_SWTDOOR_e, + /* 0x00EE */ fpcDwPi_FF_e, + /* 0x00EF */ fpcDwPi_SYAN_e, + /* 0x00F0 */ fpcDwPi_KUI_e, + /* 0x00F1 */ fpcDwPi_SS_e, + /* 0x00F2 */ fpcDwPi_SSS_e, + /* 0x00F3 */ fpcDwPi_SITEM_e, + /* 0x00F4 */ fpcDwPi_MACHINE_e, + /* 0x00F5 */ fpcDwPi_ITEM_e, + /* 0x00F6 */ fpcDwPi_Mmusic_e, + /* 0x00F7 */ fpcDwPi_Komore_e, + /* 0x00F8 */ fpcDwPi_Tpota_e, + /* 0x00F9 */ fpcDwPi_Obj_Itnak_e, + /* 0x00FA */ fpcDwPi_Obj_Zouk_e, + /* 0x00FB */ fpcDwPi_BOSSITEM_e, + /* 0x00FC */ fpcDwPi_Demo_Item_e, + /* 0x00FD */ fpcDwPi_RACEITEM_e, + /* 0x00FE */ fpcDwPi_ShopItem_e, + /* 0x00FF */ fpcDwPi_DEKU_ITEM_e, + /* 0x0100 */ fpcDwPi_SPC_ITEM01_e, + /* 0x0101 */ fpcDwPi_STANDITEM_e, + /* 0x0102 */ fpcDwPi_GRID_e, + /* 0x0103 */ fpcDwPi_TSUBO_e, + /* 0x0104 */ fpcDwPi_STONE_e, + /* 0x0105 */ fpcDwPi_Stone2_e, + /* 0x0106 */ fpcDwPi_Obj_Try_e, + /* 0x0107 */ fpcDwPi_Obj_Vtil_e, + /* 0x0108 */ fpcDwPi_Obj_Paper_e, + /* 0x0109 */ fpcDwPi_Obj_Barrel_e, + /* 0x010A */ fpcDwPi_Obj_Barrel2_e, + /* 0x010B */ fpcDwPi_Obj_Eff_e, + /* 0x010C */ fpcDwPi_Obj_Buoyrace_e, + /* 0x010D */ fpcDwPi_Obj_Buoyflag_e, + /* 0x010E */ fpcDwPi_Goal_Flag_e, + /* 0x010F */ fpcDwPi_Obj_Demo_Barrel_e, + /* 0x0110 */ fpcDwPi_Obj_Wood_e, + /* 0x0111 */ fpcDwPi_Obj_Flame_e, + /* 0x0112 */ fpcDwPi_Obj_Mshokki_e, + /* 0x0113 */ fpcDwPi_TBOX_e, + /* 0x0114 */ fpcDwPi_SBOX_e, + /* 0x0115 */ fpcDwPi_BOMB_e, + /* 0x0116 */ fpcDwPi_Bomb2_e, + /* 0x0117 */ fpcDwPi_BOMB_FLOWER_e, + /* 0x0118 */ fpcDwPi_ACORN_LEAF_e, + /* 0x0119 */ fpcDwPi_SWHIT0_e, + /* 0x011A */ fpcDwPi_SWC00_e, + /* 0x011B */ fpcDwPi_FAN_e, + /* 0x011C */ fpcDwPi_WINDMILL_e, + /* 0x011D */ fpcDwPi_ALLDIE_e, + /* 0x011E */ fpcDwPi_TAG_EVENT_e, + /* 0x011F */ fpcDwPi_TAG_MK_e, + /* 0x0120 */ fpcDwPi_TAG_HINT_e, + /* 0x0121 */ fpcDwPi_TAG_MSG_e, + /* 0x0122 */ fpcDwPi_TAG_ETC_e, + /* 0x0123 */ fpcDwPi_TAG_ISLAND_e, + /* 0x0124 */ fpcDwPi_TAG_KF1_e, + /* 0x0125 */ fpcDwPi_TAG_KK1_e, + /* 0x0126 */ fpcDwPi_TAG_PHOTO_e, + /* 0x0127 */ fpcDwPi_TAG_KB_ITEM_e, + /* 0x0128 */ fpcDwPi_Tag_Waterlevel_e, + /* 0x0129 */ fpcDwPi_TAG_MDCB_e, + /* 0x012A */ fpcDwPi_TAG_BA1_e, + /* 0x012B */ fpcDwPi_BIGELF_e, + /* 0x012C */ fpcDwPi_TAMA_e, + /* 0x012D */ fpcDwPi_DOOR10_e, + /* 0x012E */ fpcDwPi_DOOR12_e, + /* 0x012F */ fpcDwPi_ATDOOR_e, + /* 0x0130 */ fpcDwPi_MDOOR_e, + /* 0x0131 */ fpcDwPi_KDDOOR_e, + /* 0x0132 */ fpcDwPi_MBDOOR_e, + /* 0x0133 */ fpcDwPi_KNOB00_e, + /* 0x0134 */ fpcDwPi_MTOGE_e, + /* 0x0135 */ fpcDwPi_ANDSW0_e, + /* 0x0136 */ fpcDwPi_ANDSW2_e, + /* 0x0137 */ fpcDwPi_Hys_e, + /* 0x0138 */ fpcDwPi_DAI_e, + /* 0x0139 */ fpcDwPi_SW_ATTACK_e, + /* 0x013A */ fpcDwPi_SW_ITEM_e, + /* 0x013B */ fpcDwPi_SW_TACT_e, + /* 0x013C */ fpcDwPi_NH_e, + /* 0x013D */ fpcDwPi_NPC_OS_e, + /* 0x013E */ fpcDwPi_NPC_YM1_e, + /* 0x013F */ fpcDwPi_NPC_YM2_e, + /* 0x0140 */ fpcDwPi_NPC_YW1_e, + /* 0x0141 */ fpcDwPi_NPC_JI1_e, + /* 0x0142 */ fpcDwPi_NPC_KO1_e, + /* 0x0143 */ fpcDwPi_NPC_KO2_e, + /* 0x0144 */ fpcDwPi_NPC_LS1_e, + /* 0x0145 */ fpcDwPi_NPC_P1_e, + /* 0x0146 */ fpcDwPi_NPC_P2_e, + /* 0x0147 */ fpcDwPi_NPC_SARACE_e, + /* 0x0148 */ fpcDwPi_NPC_TC_e, + /* 0x0149 */ fpcDwPi_NPC_SO_e, + /* 0x014A */ fpcDwPi_NPC_NZ_e, + /* 0x014B */ fpcDwPi_NPC_BM1_e, + /* 0x014C */ fpcDwPi_NPC_BM2_e, + /* 0x014D */ fpcDwPi_NPC_BM3_e, + /* 0x014E */ fpcDwPi_NPC_BM4_e, + /* 0x014F */ fpcDwPi_NPC_BM5_e, + /* 0x0150 */ fpcDwPi_NPC_OB1_e, + /* 0x0151 */ fpcDwPi_NPC_AJ1_e, + /* 0x0152 */ fpcDwPi_NPC_KM1_e, + /* 0x0153 */ fpcDwPi_NPC_CB1_e, + /* 0x0154 */ fpcDwPi_NPC_BA1_e, + /* 0x0155 */ fpcDwPi_NPC_BJ1_e, + /* 0x0156 */ fpcDwPi_NPC_BJ2_e, + /* 0x0157 */ fpcDwPi_NPC_BJ3_e, + /* 0x0158 */ fpcDwPi_NPC_BJ4_e, + /* 0x0159 */ fpcDwPi_NPC_BJ5_e, + /* 0x015A */ fpcDwPi_NPC_BJ6_e, + /* 0x015B */ fpcDwPi_NPC_BJ7_e, + /* 0x015C */ fpcDwPi_NPC_BJ8_e, + /* 0x015D */ fpcDwPi_NPC_BJ9_e, + /* 0x015E */ fpcDwPi_NPC_BS1_e, + /* 0x015F */ fpcDwPi_NPC_BMCON1_e, + /* 0x0160 */ fpcDwPi_NPC_BMS1_e, + /* 0x0161 */ fpcDwPi_NPC_BMSW_e, + /* 0x0162 */ fpcDwPi_NPC_BTSW_e, + /* 0x0163 */ fpcDwPi_NPC_BTSW2_e, + /* 0x0164 */ fpcDwPi_NPC_DS1_e, + /* 0x0165 */ fpcDwPi_NPC_RSH1_e, + /* 0x0166 */ fpcDwPi_NPC_KK1_e, + /* 0x0167 */ fpcDwPi_NPC_PM1_e, + /* 0x0168 */ fpcDwPi_NPC_KP1_e, + /* 0x0169 */ fpcDwPi_NPC_PF1_e, + /* 0x016A */ fpcDwPi_NPC_GP1_e, + /* 0x016B */ fpcDwPi_NPC_JB1_e, + /* 0x016C */ fpcDwPi_NPC_KF1_e, + /* 0x016D */ fpcDwPi_NPC_DE1_e, + /* 0x016E */ fpcDwPi_NPC_FA1_e, + /* 0x016F */ fpcDwPi_NPC_AUCTION_e, + /* 0x0170 */ fpcDwPi_NPC_KG1_e, + /* 0x0171 */ fpcDwPi_NPC_KG2_e, + /* 0x0172 */ fpcDwPi_NPC_HR_e, + /* 0x0173 */ fpcDwPi_NPC_HO_e, + /* 0x0174 */ fpcDwPi_NPC_TT_e, + /* 0x0175 */ fpcDwPi_NPC_MD_e, + /* 0x0176 */ fpcDwPi_NPC_MK_e, + /* 0x0177 */ fpcDwPi_NPC_UK_e, + /* 0x0178 */ fpcDwPi_NPC_CO1_e, + /* 0x0179 */ fpcDwPi_NPC_ZK1_e, + /* 0x017A */ fpcDwPi_NPC_ROTEN_e, + /* 0x017B */ fpcDwPi_NPC_PEOPLE_e, + /* 0x017C */ fpcDwPi_NPC_GK1_e, + /* 0x017D */ fpcDwPi_NPC_PHOTO_e, + /* 0x017E */ fpcDwPi_NPC_AC1_e, + /* 0x017F */ fpcDwPi_NPC_HI1_e, + /* 0x0180 */ fpcDwPi_NPC_SV_e, + /* 0x0181 */ fpcDwPi_NPC_MT_e, + /* 0x0182 */ fpcDwPi_NPC_MN_e, + /* 0x0183 */ fpcDwPi_NPC_AH_e, + /* 0x0184 */ fpcDwPi_YOUGAN_e, + /* 0x0185 */ fpcDwPi_Ykgr_e, + /* 0x0186 */ fpcDwPi_SAKU_e, + /* 0x0187 */ fpcDwPi_Iball_e, + /* 0x0188 */ fpcDwPi_DISAPPEAR_e, + /* 0x0189 */ fpcDwPi_Salvage_e, + /* 0x018A */ fpcDwPi_SALVAGE_TBOX_e, + /* 0x018B */ fpcDwPi_Kmon_e, + /* 0x018C */ fpcDwPi_TOGE_e, + /* 0x018D */ fpcDwPi_DEMO00_e, + /* 0x018E */ fpcDwPi_Lwood_e, + /* 0x018F */ fpcDwPi_TagRock_e, + /* 0x0190 */ fpcDwPi_FallRock_e, + /* 0x0191 */ fpcDwPi_SteamTag_e, + /* 0x0192 */ fpcDwPi_Fire_e, + /* 0x0193 */ fpcDwPi_BRANCH_e, + /* 0x0194 */ fpcDwPi_NPC_ZL1_e, + /* 0x0195 */ fpcDwPi_WATERFALL_e, + /* 0x0196 */ fpcDwPi_LIGHTBRIDGE_e, + /* 0x0197 */ fpcDwPi_LIGHTSTAIR_e, + /* 0x0198 */ fpcDwPi_WALL_e, + /* 0x0199 */ fpcDwPi_SW_PROPELLER_e, + /* 0x019A */ fpcDwPi_HIMO2_e, + /* 0x019B */ fpcDwPi_HIMO3_e, + /* 0x019C */ fpcDwPi_ATT_e, + /* 0x019D */ fpcDwPi_IKARI_e, + /* 0x019E */ fpcDwPi_HOOKSHOT_e, + /* 0x019F */ fpcDwPi_BOOMERANG_e, + /* 0x01A0 */ fpcDwPi_BOKO_e, + /* 0x01A1 */ fpcDwPi_SCENECHG_e, + /* 0x01A2 */ fpcDwPi_WARPFLOWER_e, + /* 0x01A3 */ fpcDwPi_WARPFOUT_e, + /* 0x01A4 */ fpcDwPi_WARPLIGHT_e, + /* 0x01A5 */ fpcDwPi_WARPHYRULE_e, + /* 0x01A6 */ fpcDwPi_WARPDEMO20_e, + /* 0x01A7 */ fpcDwPi_WARPGANON_e, + /* 0x01A8 */ fpcDwPi_WARPMAJYUU_e, + /* 0x01A9 */ fpcDwPi_Obj_Magmarock_e, + /* 0x01AA */ fpcDwPi_Obj_Pirateship_e, + /* 0x01AB */ fpcDwPi_Obj_Tousekiki_e, + /* 0x01AC */ fpcDwPi_Kaji_e, + /* 0x01AD */ fpcDwPi_Canon_e, + /* 0x01AE */ fpcDwPi_MGBOARD_e, + /* 0x01AF */ fpcDwPi_OBJ_CANON_e, + /* 0x01B0 */ fpcDwPi_OBJ_OTBLE_e, + /* 0x01B1 */ fpcDwPi_OBJ_WARPT_e, + /* 0x01B2 */ fpcDwPi_OBJ_SEARCH_e, + /* 0x01B3 */ fpcDwPi_OBJ_TORIPOST_e, + /* 0x01B4 */ fpcDwPi_OBJ_IKADA_e, + /* 0x01B5 */ fpcDwPi_OBJ_MJDOOR_e, + /* 0x01B6 */ fpcDwPi_OBJ_PFALL_e, + /* 0x01B7 */ fpcDwPi_OBJ_HOLE_e, + /* 0x01B8 */ fpcDwPi_Balancelift_e, + /* 0x01B9 */ fpcDwPi_Obj_Roten_e, + /* 0x01BA */ fpcDwPi_SHUTTER_e, + /* 0x01BB */ fpcDwPi_SHUTTER2_e, + /* 0x01BC */ fpcDwPi_MAGMA_e, + /* 0x01BD */ fpcDwPi_GRASS_e, + /* 0x01BE */ fpcDwPi_Obj_Bscurtain_e, + /* 0x01BF */ fpcDwPi_ARROW_e, + /* 0x01C0 */ fpcDwPi_ARROW_ICEEFF_e, + /* 0x01C1 */ fpcDwPi_ARROW_LIGHTEFF_e, + /* 0x01C2 */ fpcDwPi_BG_e, + /* 0x01C3 */ fpcDwPi_LODBG_e, + /* 0x01C4 */ fpcDwPi_Obj_Tower_e, + /* 0x01C5 */ fpcDwPi_Obj_DoguuD_e, + /* 0x01C6 */ fpcDwPi_Obj_MknjD_e, + /* 0x01C7 */ fpcDwPi_OBJ_FIGURE_e, + /* 0x01C8 */ fpcDwPi_OBJ_HAT_e, + /* 0x01C9 */ fpcDwPi_SPOTBOX_e, + /* 0x01CA */ fpcDwPi_WATER_MARK_e, + /* 0x01CB */ fpcDwPi_WIND_ARROW_e, + /* 0x01CC */ fpcDwPi_WPOT_WATER_e, + /* 0x01CD */ fpcDwPi_LEVEL_SE_e, + /* 0x01CE */ fpcDwPi_THROWSTONE_e, + /* 0x01CF */ fpcDwPi_OPERATE_WIND_e, + /* 0x01D0 */ fpcDwPi_Menu_Cloth_e, + /* 0x01D1 */ fpcDwPi_MENUWINDOW_e, + /* 0x01D2 */ fpcDwPi_TIMER_e, + /* 0x01D3 */ fpcDwPi_MINIGAME_STARTER_e, + /* 0x01D4 */ fpcDwPi_MINIGAME_TERMINATER_e, + /* 0x01D5 */ fpcDwPi_SCP_e, + /* 0x01D6 */ fpcDwPi_PB_e, + /* 0x01D7 */ fpcDwPi_METER_e, + /* 0x01D8 */ fpcDwPi_MESG_e, + /* 0x01D9 */ fpcDwPi_MSG_e, + /* 0x01DA */ fpcDwPi_MSG2_e, + /* 0x01DB */ fpcDwPi_MSG3_e, + /* 0x01DC */ fpcDwPi_AUCTION_SCREEN_e, + /* 0x01DD */ fpcDwPi_PLACE_NAME_e, + /* 0x01DE */ fpcDwPi_GAMEOVER_e, + /* 0x01DF */ fpcDwPi_SEATAG_e, + /* 0x01E0 */ fpcDwPi_AUCTION_e, + /* 0x01E1 */ fpcDwPi_OVERLAP0_e, + /* 0x01E2 */ fpcDwPi_OVERLAP1_e, + /* 0x01E3 */ fpcDwPi_OVERLAP2_e, + /* 0x01E4 */ fpcDwPi_OVERLAP3_e, + /* 0x01E5 */ fpcDwPi_OVERLAP4_e, + /* 0x01E6 */ fpcDwPi_OVERLAP5_e, + /* 0x01E7 */ fpcDwPi_OVERLAP6_e, + /* 0x01E8 */ fpcDwPi_OVERLAP7_e, + /* 0x01E9 */ fpcDwPi_OVERLAP8_e, +#if VERSION > VERSION_DEMO + /* 0x01EA */ fpcDwPi_1EA_e, +#endif + /* 0x01FF */ fpcDwPi_1FF_e = 0x1FF, +}; + #endif diff --git a/include/f_pc/f_pc_leaf.h b/include/f_pc/f_pc_leaf.h index bd9e57829..cb28c5b65 100644 --- a/include/f_pc/f_pc_leaf.h +++ b/include/f_pc/f_pc_leaf.h @@ -6,6 +6,7 @@ #include "f_pc/f_pc_draw_priority.h" #include "f_pc/f_pc_method.h" #include "f_pc/f_pc_profile.h" +#include "f_pc/f_pc_name.h" // IWYU pragma: export typedef struct leafdraw_method_class { /* 0x00 */ process_method_class base; diff --git a/include/f_pc/f_pc_name.h b/include/f_pc/f_pc_name.h new file mode 100644 index 000000000..614c15d5a --- /dev/null +++ b/include/f_pc/f_pc_name.h @@ -0,0 +1,518 @@ + +#ifndef F_PC_NAME_H +#define F_PC_NAME_H + +// The fpcNm prefix is from an error string in TP. +enum { + /* 0x0000 */ fpcNm_OVERLAP0_e, + /* 0x0001 */ fpcNm_OVERLAP1_e, + /* 0x0002 */ fpcNm_OVERLAP6_e, + /* 0x0003 */ fpcNm_OVERLAP7_e, + /* 0x0004 */ fpcNm_OVERLAP8_e, + /* 0x0005 */ fpcNm_LOGO_SCENE_e, + /* 0x0006 */ fpcNm_MENU_SCENE_e, + /* 0x0007 */ fpcNm_PLAY_SCENE_e, + /* 0x0008 */ fpcNm_OPENING_SCENE_e, + /* 0x0009 */ fpcNm_OPENING2_SCENE_e, + /* 0x000A */ fpcNm_TITLE_SCENE_e, + /* 0x000B */ fpcNm_ENDING_SCENE_e, + /* 0x000C */ fpcNm_NAME_SCENE_e, + /* 0x000D */ fpcNm_NAMEEX_SCENE_e, + /* 0x000E */ fpcNm_OPEN_SCENE_e, + /* 0x000F */ fpcNm_OPEN2_SCENE_e, + /* 0x0010 */ fpcNm_OVERLAP2_e, + /* 0x0011 */ fpcNm_OVERLAP3_e, + /* 0x0012 */ fpcNm_OVERLAP4_e, + /* 0x0013 */ fpcNm_OVERLAP5_e, + /* 0x0014 */ fpcNm_ROOM_SCENE_e, + /* 0x0015 */ fpcNm_KANKYO_e, + /* 0x0016 */ fpcNm_ALLDIE_e, + /* 0x0017 */ fpcNm_ENVSE_e, + /* 0x0018 */ fpcNm_WIND_ARROW_e, + /* 0x0019 */ fpcNm_WPOT_WATER_e, + /* 0x001A */ fpcNm_LEVEL_SE_e, + /* 0x001B */ fpcNm_THROWSTONE_e, + /* 0x001C */ fpcNm_TAG_EVSW_e, + /* 0x001D */ fpcNm_Obj_Swpush_e, + /* 0x001E */ fpcNm_Obj_Swheavy_e, + /* 0x001F */ fpcNm_Obj_Swflat_e, + /* 0x0020 */ fpcNm_Obj_Swlight_e, + /* 0x0021 */ fpcNm_Obj_Swhammer_e, + /* 0x0022 */ fpcNm_Obj_Quake_e, + /* 0x0023 */ fpcNm_Obj_Drift_e, + /* 0x0024 */ fpcNm_Tag_Volcano_e, + /* 0x0025 */ fpcNm_TAG_SO_e, + /* 0x0026 */ fpcNm_Obj_Pbco_e, + /* 0x0027 */ fpcNm_SEATAG_e, + /* 0x0028 */ fpcNm_SEA_e, + /* 0x0029 */ fpcNm_Obj_Tide_e, + /* 0x002A */ fpcNm_Hmlif_e, + /* 0x002B */ fpcNm_SCENECHG_e, + /* 0x002C */ fpcNm_Obj_Magmarock_e, + /* 0x002D */ fpcNm_Obj_Movebox_e, + /* 0x002E */ fpcNm_Obj_Tribox_e, + /* 0x002F */ fpcNm_Obj_Shelf_e, + /* 0x0030 */ fpcNm_Obj_Hlift_e, + /* 0x0031 */ fpcNm_Obj_Hami2_e, + /* 0x0032 */ fpcNm_Obj_Hami3_e, + /* 0x0033 */ fpcNm_Obj_Hami4_e, + /* 0x0034 */ fpcNm_Obj_Hbrf1_e, + /* 0x0035 */ fpcNm_Obj_Volcano_e, + /* 0x0036 */ fpcNm_Obj_Vmc_e, + /* 0x0037 */ fpcNm_Obj_Usovmc_e, + /* 0x0038 */ fpcNm_Obj_Vfan_e, + /* 0x0039 */ fpcNm_Obj_Iceisland_e, + /* 0x003A */ fpcNm_Obj_Dragonhead_e, + /* 0x003B */ fpcNm_Obj_Pirateship_e, + /* 0x003C */ fpcNm_Obj_Tousekiki_e, + /* 0x003D */ fpcNm_Tag_Ret_e, + /* 0x003E */ fpcNm_Kaji_e, + /* 0x003F */ fpcNm_Canon_e, + /* 0x0040 */ fpcNm_MGBOARD_e, + /* 0x0041 */ fpcNm_OBJ_CANON_e, + /* 0x0042 */ fpcNm_OBJ_OTBLE_e, + /* 0x0043 */ fpcNm_OBJ_WARPT_e, + /* 0x0044 */ fpcNm_OBJ_SEARCH_e, + /* 0x0045 */ fpcNm_OBJ_TORIPOST_e, + /* 0x0046 */ fpcNm_OBJ_IKADA_e, + /* 0x0047 */ fpcNm_OBJ_MJDOOR_e, + /* 0x0048 */ fpcNm_OBJ_PFALL_e, + /* 0x0049 */ fpcNm_OBJ_HOLE_e, + /* 0x004A */ fpcNm_Obj_Stair_e, + /* 0x004B */ fpcNm_Obj_Lpalm_e, + /* 0x004C */ fpcNm_Obj_Mtest_e, + /* 0x004D */ fpcNm_Obj_Mkie_e, + /* 0x004E */ fpcNm_Obj_Mkiek_e, + /* 0x004F */ fpcNm_Obj_MknjD_e, + /* 0x0050 */ fpcNm_Obj_Msdan_e, + /* 0x0051 */ fpcNm_Obj_MsdanSub_e, + /* 0x0052 */ fpcNm_Obj_Msdan2_e, + /* 0x0053 */ fpcNm_Obj_MsdanSub2_e, + /* 0x0054 */ fpcNm_Obj_Nest_e, + /* 0x0055 */ fpcNm_Obj_Ojtree_e, + /* 0x0056 */ fpcNm_Obj_Ospbox_e, + /* 0x0057 */ fpcNm_Obj_Ladder_e, + /* 0x0058 */ fpcNm_Obj_Smplbg_e, + /* 0x0059 */ fpcNm_Obj_Akabe_e, + /* 0x005A */ fpcNm_Obj_Ashut_e, + /* 0x005B */ fpcNm_BRIDGE_e, + /* 0x005C */ fpcNm_MSW_e, + /* 0x005D */ fpcNm_MFLFT_e, + /* 0x005E */ fpcNm_KLFT_e, + /* 0x005F */ fpcNm_ICE_LIFT_e, + /* 0x0060 */ fpcNm_AMI_PROP_e, + /* 0x0061 */ fpcNm_PEDESTAL_e, + /* 0x0062 */ fpcNm_FLOOR_e, + /* 0x0063 */ fpcNm_KITA_e, + /* 0x0064 */ fpcNm_KOKIIE_e, + /* 0x0065 */ fpcNm_SHAND_e, + /* 0x0066 */ fpcNm_BITA_e, + /* 0x0067 */ fpcNm_SK_e, + /* 0x0068 */ fpcNm_SK2_e, + /* 0x0069 */ fpcNm_SSK_e, + /* 0x006A */ fpcNm_WARPFLOWER_e, + /* 0x006B */ fpcNm_WARPFOUT_e, + /* 0x006C */ fpcNm_WARPLIGHT_e, + /* 0x006D */ fpcNm_WARPHYRULE_e, + /* 0x006E */ fpcNm_WARPDEMO20_e, + /* 0x006F */ fpcNm_WARPGANON_e, + /* 0x0070 */ fpcNm_WARPMAJYUU_e, + /* 0x0071 */ fpcNm_Balancelift_e, + /* 0x0072 */ fpcNm_SHUTTER_e, + /* 0x0073 */ fpcNm_SHUTTER2_e, + /* 0x0074 */ fpcNm_WINDMILL_e, + /* 0x0075 */ fpcNm_MBDOOR_e, + /* 0x0076 */ fpcNm_NPC_DE1_e, + /* 0x0077 */ fpcNm_NPC_NZ_e, + /* 0x0078 */ fpcNm_NPC_SO_e, + /* 0x0079 */ fpcNm_FM_e, + /* 0x007A */ fpcNm_LEAF_LIFT_e, + /* 0x007B */ fpcNm_Obj_Roten_e, + /* 0x007C */ fpcNm_TOGE_e, + /* 0x007D */ fpcNm_Obj_Ferris_e, + /* 0x007E */ fpcNm_Obj_Xfuta_e, + /* 0x007F */ fpcNm_Obj_Gaship_e, + /* 0x0080 */ fpcNm_Obj_Rforce_e, + /* 0x0081 */ fpcNm_Obj_Gaship2_e, + /* 0x0082 */ fpcNm_Obj_Light_e, + /* 0x0083 */ fpcNm_Obj_Homen_e, + /* 0x0084 */ fpcNm_Obj_Homensmk_e, + /* 0x0085 */ fpcNm_Obj_Ftree_e, + /* 0x0086 */ fpcNm_Obj_Vds_e, + /* 0x0087 */ fpcNm_Obj_Vyasi_e, + /* 0x0088 */ fpcNm_Obj_Ajav_e, + /* 0x0089 */ fpcNm_Obj_Trap_e, + /* 0x008A */ fpcNm_Obj_Hha_e, + /* 0x008B */ fpcNm_Obj_Htetu1_e, + /* 0x008C */ fpcNm_Obj_Gnntakis_e, + /* 0x008D */ fpcNm_Obj_Gnntakie_e, + /* 0x008E */ fpcNm_Obj_Gnnbtaki_e, + /* 0x008F */ fpcNm_Obj_Rcloud_e, + /* 0x0090 */ fpcNm_Obj_Gryw00_e, + /* 0x0091 */ fpcNm_Obj_AjavW_e, + /* 0x0092 */ fpcNm_Obj_Leaves_e, + /* 0x0093 */ fpcNm_Obj_YLzou_e, + /* 0x0094 */ fpcNm_Obj_Gbed_e, + /* 0x0095 */ fpcNm_Obj_Vteng_e, + /* 0x0096 */ fpcNm_Obj_Hfuck1_e, + /* 0x0097 */ fpcNm_Obj_Ohatch_e, + /* 0x0098 */ fpcNm_Obj_Hcbh_e, + /* 0x0099 */ fpcNm_Obj_Ygush00_e, + /* 0x009A */ fpcNm_Obj_Bscurtain_e, + /* 0x009B */ fpcNm_Obj_Shmrgrd_e, + /* 0x009C */ fpcNm_Obj_Eayogn_e, + /* 0x009D */ fpcNm_Obj_Vmsms_e, + /* 0x009E */ fpcNm_Obj_Vmsdz_e, + /* 0x009F */ fpcNm_Ygcwp_e, + /* 0x00A0 */ fpcNm_Obj_Vgnfd_e, + /* 0x00A1 */ fpcNm_Obj_Kanoke_e, + /* 0x00A2 */ fpcNm_Obj_Eskban_e, + /* 0x00A3 */ fpcNm_Obj_Ekskz_e, + /* 0x00A4 */ fpcNm_Obj_Ebomzo_e, + /* 0x00A5 */ fpcNm_Obj_Kanat_e, + /* 0x00A6 */ fpcNm_Obj_Aygr_e, + /* 0x00A7 */ fpcNm_SHIP_e, + /* 0x00A8 */ fpcNm_Obj_Jump_e, + /* 0x00A9 */ fpcNm_PLAYER_e, + /* 0x00AA */ fpcNm_HOOKSHOT_e, + /* 0x00AB */ fpcNm_NPC_MK_e, + /* 0x00AC */ fpcNm_GRID_e, + /* 0x00AD */ fpcNm_SAIL_e, + /* 0x00AE */ fpcNm_PIRATE_FLAG_e, + /* 0x00AF */ fpcNm_MAJUU_FLAG_e, + /* 0x00B0 */ fpcNm_Tori_Flag_e, + /* 0x00B1 */ fpcNm_Sie_Flag_e, + /* 0x00B2 */ fpcNm_SYAN_e, + /* 0x00B3 */ fpcNm_AYUSH_e, + /* 0x00B4 */ fpcNm_OSHIP_e, + /* 0x00B5 */ fpcNm_RECTANGLE_e, + /* 0x00B6 */ fpcNm_BB_e, + /* 0x00B7 */ fpcNm_KANBAN_e, + /* 0x00B8 */ fpcNm_HITOBJ_e, + /* 0x00B9 */ fpcNm_KT_e, + /* 0x00BA */ fpcNm_EP_e, + /* 0x00BB */ fpcNm_LAMP_e, + /* 0x00BC */ fpcNm_FF_e, + /* 0x00BD */ fpcNm_MO2_e, + /* 0x00BE */ fpcNm_BK_e, + /* 0x00BF */ fpcNm_ST_e, + /* 0x00C0 */ fpcNm_TN_e, + /* 0x00C1 */ fpcNm_MANT_e, + /* 0x00C2 */ fpcNm_KANTERA_e, + /* 0x00C3 */ fpcNm_KAMOME_e, +#if VERSION == VERSION_DEMO + /* 0x00C4 */ fpcNm_KAMOME2_e, +#endif + /* 0x00C4 */ fpcNm_NPC_KAM_e, + /* 0x00C5 */ fpcNm_WBIRD_e, + /* 0x00C6 */ fpcNm_DEMO_KMM_e, + /* 0x00C7 */ fpcNm_NZ_e, + /* 0x00C8 */ fpcNm_NZG_e, + /* 0x00C9 */ fpcNm_KN_e, + /* 0x00CA */ fpcNm_DEMO_DK_e, + /* 0x00CB */ fpcNm_AM_e, + /* 0x00CC */ fpcNm_AM2_e, + /* 0x00CD */ fpcNm_GM_e, + /* 0x00CE */ fpcNm_KS_e, + /* 0x00CF */ fpcNm_CC_e, + /* 0x00D0 */ fpcNm_BL_e, + /* 0x00D1 */ fpcNm_WZ_e, + /* 0x00D2 */ fpcNm_PH_e, + /* 0x00D3 */ fpcNm_PZ_e, + /* 0x00D4 */ fpcNm_BPW_e, + /* 0x00D5 */ fpcNm_PW_e, + /* 0x00D6 */ fpcNm_JBO_e, + /* 0x00D7 */ fpcNm_BO_e, + /* 0x00D8 */ fpcNm_KI_e, + /* 0x00D9 */ fpcNm_MT_e, + /* 0x00DA */ fpcNm_BWD_e, + /* 0x00DB */ fpcNm_BWDS_e, + /* 0x00DC */ fpcNm_BWDG_e, + /* 0x00DD */ fpcNm_KB_e, + /* 0x00DE */ fpcNm_ESA_e, + /* 0x00DF */ fpcNm_DR_e, + /* 0x00E0 */ fpcNm_DR2_e, + /* 0x00E1 */ fpcNm_RD_e, + /* 0x00E2 */ fpcNm_DAIOCTA_e, + /* 0x00E3 */ fpcNm_DAIOCTA_EYE_e, + /* 0x00E4 */ fpcNm_OQ_e, + /* 0x00E5 */ fpcNm_GY_e, + /* 0x00E6 */ fpcNm_GY_CTRL_e, + /* 0x00E7 */ fpcNm_GY_CTRLB_e, + /* 0x00E8 */ fpcNm_Hot_Floor_e, + /* 0x00E9 */ fpcNm_Beam_e, + /* 0x00EA */ fpcNm_Bemos_e, + /* 0x00EB */ fpcNm_BTD_e, + /* 0x00EC */ fpcNm_BMD_e, + /* 0x00ED */ fpcNm_BMDHAND_e, + /* 0x00EE */ fpcNm_BMDFOOT_e, + /* 0x00EF */ fpcNm_DK_e, + /* 0x00F0 */ fpcNm_BDK_e, + /* 0x00F1 */ fpcNm_BDKOBJ_e, + /* 0x00F2 */ fpcNm_BST_e, + /* 0x00F3 */ fpcNm_FGANON_e, + /* 0x00F4 */ fpcNm_FGMAHOU_e, + /* 0x00F5 */ fpcNm_BGN_e, + /* 0x00F6 */ fpcNm_BGN2_e, + /* 0x00F7 */ fpcNm_BGN3_e, + /* 0x00F8 */ fpcNm_GND_e, + /* 0x00F9 */ fpcNm_PT_e, + /* 0x00FA */ fpcNm_SWTDOOR_e, + /* 0x00FB */ fpcNm_MOZO_e, + /* 0x00FC */ fpcNm_KUI_e, + /* 0x00FD */ fpcNm_SS_e, + /* 0x00FE */ fpcNm_SSS_e, + /* 0x00FF */ fpcNm_SITEM_e, + /* 0x0100 */ fpcNm_MACHINE_e, + /* 0x0101 */ fpcNm_ITEM_e, + /* 0x0102 */ fpcNm_BOSSITEM_e, + /* 0x0103 */ fpcNm_Demo_Item_e, + /* 0x0104 */ fpcNm_RACEITEM_e, + /* 0x0105 */ fpcNm_ShopItem_e, + /* 0x0106 */ fpcNm_DEKU_ITEM_e, + /* 0x0107 */ fpcNm_SPC_ITEM01_e, + /* 0x0108 */ fpcNm_Obj_Paper_e, + /* 0x0109 */ fpcNm_Obj_Demo_Barrel_e, + /* 0x010A */ fpcNm_Obj_Dmgroom_e, + /* 0x010B */ fpcNm_Obj_Doguu_e, + /* 0x010C */ fpcNm_Obj_Wood_e, + /* 0x010D */ fpcNm_Obj_Flame_e, + /* 0x010E */ fpcNm_Obj_Buoyrace_e, + /* 0x010F */ fpcNm_Obj_Coming_e, + /* 0x0110 */ fpcNm_Coming2_e, + /* 0x0111 */ fpcNm_Coming3_e, + /* 0x0112 */ fpcNm_Obj_Mmrr_e, + /* 0x0113 */ fpcNm_Obj_Pbka_e, + /* 0x0114 */ fpcNm_Obj_Plant_e, + /* 0x0115 */ fpcNm_Obj_Gtaki_e, + /* 0x0116 */ fpcNm_Obj_Yboil_e, + /* 0x0117 */ fpcNm_Obj_Rflw_e, + /* 0x0118 */ fpcNm_Obj_Table_e, + /* 0x0119 */ fpcNm_Obj_Tenmado_e, + /* 0x011A */ fpcNm_Obj_Cafelmp_e, + /* 0x011B */ fpcNm_Obj_Apzl_e, + /* 0x011C */ fpcNm_Obj_Adnno_e, + /* 0x011D */ fpcNm_Obj_Auzu_e, + /* 0x011E */ fpcNm_Obj_Gong_e, + /* 0x011F */ fpcNm_Obj_Barrier_e, + /* 0x0120 */ fpcNm_Obj_Firewall_e, + /* 0x0121 */ fpcNm_Obj_TnTrap_e, + /* 0x0122 */ fpcNm_Obj_Monument_e, + /* 0x0123 */ fpcNm_Obj_Tapestry_e, + /* 0x0124 */ fpcNm_Obj_HSH_e, + /* 0x0125 */ fpcNm_Goal_Flag_e, + /* 0x0126 */ fpcNm_TBOX_e, + /* 0x0127 */ fpcNm_SBOX_e, + /* 0x0128 */ fpcNm_BOMB_e, + /* 0x0129 */ fpcNm_Bomb2_e, + /* 0x012A */ fpcNm_BOMB_FLOWER_e, + /* 0x012B */ fpcNm_ACORN_LEAF_e, + /* 0x012C */ fpcNm_SWC00_e, + /* 0x012D */ fpcNm_FAN_e, + /* 0x012E */ fpcNm_DOOR10_e, + /* 0x012F */ fpcNm_DOOR12_e, + /* 0x0130 */ fpcNm_ATDOOR_e, + /* 0x0131 */ fpcNm_MDOOR_e, + /* 0x0132 */ fpcNm_KDDOOR_e, + /* 0x0133 */ fpcNm_KNOB00_e, + /* 0x0134 */ fpcNm_MTOGE_e, + /* 0x0135 */ fpcNm_ANDSW0_e, + /* 0x0136 */ fpcNm_ANDSW2_e, + /* 0x0137 */ fpcNm_DAI_e, + /* 0x0138 */ fpcNm_SW_ATTACK_e, + /* 0x0139 */ fpcNm_SW_ITEM_e, + /* 0x013A */ fpcNm_SW_TACT_e, + /* 0x013B */ fpcNm_NH_e, + /* 0x013C */ fpcNm_NPC_OS_e, + /* 0x013D */ fpcNm_NPC_YM1_e, + /* 0x013E */ fpcNm_NPC_YM2_e, + /* 0x013F */ fpcNm_NPC_YW1_e, + /* 0x0140 */ fpcNm_NPC_JI1_e, + /* 0x0141 */ fpcNm_NPC_KO1_e, + /* 0x0142 */ fpcNm_NPC_KO2_e, + /* 0x0143 */ fpcNm_NPC_LS1_e, + /* 0x0144 */ fpcNm_NPC_P1_e, + /* 0x0145 */ fpcNm_NPC_P2_e, + /* 0x0146 */ fpcNm_NPC_SARACE_e, + /* 0x0147 */ fpcNm_NPC_TC_e, + /* 0x0148 */ fpcNm_NPC_BM1_e, + /* 0x0149 */ fpcNm_NPC_BM2_e, + /* 0x014A */ fpcNm_NPC_BM3_e, + /* 0x014B */ fpcNm_NPC_BM4_e, + /* 0x014C */ fpcNm_NPC_BM5_e, + /* 0x014D */ fpcNm_NPC_OB1_e, + /* 0x014E */ fpcNm_NPC_AJ1_e, + /* 0x014F */ fpcNm_NPC_KM1_e, + /* 0x0150 */ fpcNm_NPC_CB1_e, + /* 0x0151 */ fpcNm_NPC_BA1_e, + /* 0x0152 */ fpcNm_NPC_BJ1_e, + /* 0x0153 */ fpcNm_NPC_BJ2_e, + /* 0x0154 */ fpcNm_NPC_BJ3_e, + /* 0x0155 */ fpcNm_NPC_BJ4_e, + /* 0x0156 */ fpcNm_NPC_BJ5_e, + /* 0x0157 */ fpcNm_NPC_BJ6_e, + /* 0x0158 */ fpcNm_NPC_BJ7_e, + /* 0x0159 */ fpcNm_NPC_BJ8_e, + /* 0x015A */ fpcNm_NPC_BJ9_e, + /* 0x015B */ fpcNm_NPC_BS1_e, + /* 0x015C */ fpcNm_NPC_BMCON1_e, + /* 0x015D */ fpcNm_NPC_BMS1_e, + /* 0x015E */ fpcNm_NPC_BMSW_e, + /* 0x015F */ fpcNm_NPC_BTSW_e, + /* 0x0160 */ fpcNm_NPC_BTSW2_e, + /* 0x0161 */ fpcNm_NPC_DS1_e, + /* 0x0162 */ fpcNm_NPC_RSH1_e, + /* 0x0163 */ fpcNm_NPC_KK1_e, + /* 0x0164 */ fpcNm_NPC_PM1_e, + /* 0x0165 */ fpcNm_NPC_KP1_e, + /* 0x0166 */ fpcNm_NPC_PF1_e, + /* 0x0167 */ fpcNm_NPC_GP1_e, + /* 0x0168 */ fpcNm_NPC_JB1_e, + /* 0x0169 */ fpcNm_NPC_KF1_e, + /* 0x016A */ fpcNm_NPC_FA1_e, + /* 0x016B */ fpcNm_NPC_AUCTION_e, + /* 0x016C */ fpcNm_NPC_KG1_e, + /* 0x016D */ fpcNm_NPC_KG2_e, + /* 0x016E */ fpcNm_NPC_TT_e, + /* 0x016F */ fpcNm_NPC_HR_e, + /* 0x0170 */ fpcNm_NPC_HO_e, + /* 0x0171 */ fpcNm_NPC_MD_e, + /* 0x0172 */ fpcNm_NPC_UK_e, + /* 0x0173 */ fpcNm_BIGELF_e, + /* 0x0174 */ fpcNm_NPC_CO1_e, + /* 0x0175 */ fpcNm_NPC_ZK1_e, + /* 0x0176 */ fpcNm_NPC_ROTEN_e, + /* 0x0177 */ fpcNm_NPC_PEOPLE_e, + /* 0x0178 */ fpcNm_NPC_GK1_e, + /* 0x0179 */ fpcNm_NPC_PHOTO_e, + /* 0x017A */ fpcNm_NPC_AC1_e, + /* 0x017B */ fpcNm_NPC_HI1_e, + /* 0x017C */ fpcNm_NPC_SV_e, + /* 0x017D */ fpcNm_NPC_MT_e, + /* 0x017E */ fpcNm_NPC_MN_e, + /* 0x017F */ fpcNm_NPC_AH_e, + /* 0x0180 */ fpcNm_AUCTION_e, + /* 0x0181 */ fpcNm_KYTAG00_e, + /* 0x0182 */ fpcNm_KYTAG01_e, + /* 0x0183 */ fpcNm_KYTAG02_e, + /* 0x0184 */ fpcNm_KYTAG03_e, + /* 0x0185 */ fpcNm_KYTAG04_e, + /* 0x0186 */ fpcNm_KYTAG05_e, + /* 0x0187 */ fpcNm_KYTAG06_e, + /* 0x0188 */ fpcNm_KYTAG07_e, + /* 0x0189 */ fpcNm_WindTag_e, + /* 0x018A */ fpcNm_YOUGAN_e, + /* 0x018B */ fpcNm_Mmusic_e, + /* 0x018C */ fpcNm_Komore_e, + /* 0x018D */ fpcNm_Tpota_e, + /* 0x018E */ fpcNm_Obj_Itnak_e, + /* 0x018F */ fpcNm_Obj_Zouk_e, + /* 0x0190 */ fpcNm_Ykgr_e, + /* 0x0191 */ fpcNm_SAKU_e, + /* 0x0192 */ fpcNm_Iball_e, + /* 0x0193 */ fpcNm_DISAPPEAR_e, + /* 0x0194 */ fpcNm_Salvage_e, + /* 0x0195 */ fpcNm_SALVAGE_TBOX_e, + /* 0x0196 */ fpcNm_Kmon_e, + /* 0x0197 */ fpcNm_OBJ_FIGURE_e, + /* 0x0198 */ fpcNm_OBJ_HAT_e, + /* 0x0199 */ fpcNm_DEMO00_e, + /* 0x019A */ fpcNm_Lwood_e, + /* 0x019B */ fpcNm_Dummy_e, + /* 0x019C */ fpcNm_TAG_EVENT_e, + /* 0x019D */ fpcNm_TAG_HINT_e, + /* 0x019E */ fpcNm_TAG_MSG_e, + /* 0x019F */ fpcNm_TAG_ETC_e, + /* 0x01A0 */ fpcNm_TAG_ISLAND_e, + /* 0x01A1 */ fpcNm_TAG_KF1_e, + /* 0x01A2 */ fpcNm_TAG_KK1_e, + /* 0x01A3 */ fpcNm_TAG_PHOTO_e, + /* 0x01A4 */ fpcNm_TAG_KB_ITEM_e, + /* 0x01A5 */ fpcNm_TAG_MK_e, + /* 0x01A6 */ fpcNm_TAG_MDCB_e, + /* 0x01A7 */ fpcNm_TAG_BA1_e, + /* 0x01A8 */ fpcNm_TagRock_e, + /* 0x01A9 */ fpcNm_FallRock_e, + /* 0x01AA */ fpcNm_SteamTag_e, + /* 0x01AB */ fpcNm_Fire_e, + /* 0x01AC */ fpcNm_BRANCH_e, + /* 0x01AD */ fpcNm_NPC_ZL1_e, + /* 0x01AE */ fpcNm_WATERFALL_e, + /* 0x01AF */ fpcNm_LIGHTBRIDGE_e, + /* 0x01B0 */ fpcNm_LIGHTSTAIR_e, + /* 0x01B1 */ fpcNm_WALL_e, + /* 0x01B2 */ fpcNm_SW_PROPELLER_e, + /* 0x01B3 */ fpcNm_IKARI_e, + /* 0x01B4 */ fpcNm_BOOMERANG_e, + /* 0x01B5 */ fpcNm_AGB_e, + /* 0x01B6 */ fpcNm_AGBSW0_e, + /* 0x01B7 */ fpcNm_MAGMA_e, + /* 0x01B8 */ fpcNm_GRASS_e, + /* 0x01B9 */ fpcNm_KY_THUNDER_e, + /* 0x01BA */ fpcNm_VRBOX_e, + /* 0x01BB */ fpcNm_VRBOX2_e, + /* 0x01BC */ fpcNm_BG_e, + /* 0x01BD */ fpcNm_Obj_Tower_e, + /* 0x01BE */ fpcNm_Obj_DoguuD_e, + /* 0x01BF */ fpcNm_SPOTBOX_e, + /* 0x01C0 */ fpcNm_TORNADO_e, + /* 0x01C1 */ fpcNm_TITLE_e, + /* 0x01C2 */ fpcNm_MP_e, + /* 0x01C3 */ fpcNm_LODBG_e, + /* 0x01C4 */ fpcNm_HIMO2_e, + /* 0x01C5 */ fpcNm_HIMO3_e, + /* 0x01C6 */ fpcNm_ATT_e, + /* 0x01C7 */ fpcNm_WPILLAR_e, + /* 0x01C8 */ fpcNm_Hys_e, + /* 0x01C9 */ fpcNm_SWHIT0_e, + /* 0x01CA */ fpcNm_TAG_GSHIP_e, + /* 0x01CB */ fpcNm_TSUBO_e, + /* 0x01CC */ fpcNm_STONE_e, + /* 0x01CD */ fpcNm_Stone2_e, + /* 0x01CE */ fpcNm_Obj_Barrel_e, + /* 0x01CF */ fpcNm_Obj_Barrel2_e, + /* 0x01CF */ tk_Obj_Barrel2_e = fpcNm_Obj_Barrel2_e, + /* 0x01D0 */ fpcNm_Obj_Try_e, + /* 0x01D1 */ fpcNm_Obj_Vtil_e, + /* 0x01D2 */ fpcNm_Obj_Ice_e, + /* 0x01D3 */ fpcNm_Obj_Mshokki_e, + /* 0x01D4 */ fpcNm_STANDITEM_e, + /* 0x01D5 */ fpcNm_BOKO_e, + /* 0x01D6 */ fpcNm_TAMA_e, + /* 0x01D7 */ fpcNm_Obj_Buoyflag_e, + /* 0x01D8 */ fpcNm_Obj_Correct_e, + /* 0x01D9 */ fpcNm_Obj_Eff_e, + /* 0x01DA */ fpcNm_WATER_MARK_e, + /* 0x01DB */ fpcNm_Tag_Light_e, + /* 0x01DC */ fpcNm_Tag_Attention_e, + /* 0x01DD */ fpcNm_Tag_Waterlevel_e, + /* 0x01DE */ fpcNm_ARROW_e, + /* 0x01DF */ fpcNm_ARROW_ICEEFF_e, + /* 0x01E0 */ fpcNm_ARROW_LIGHTEFF_e, + /* 0x01E1 */ fpcNm_Obj_Timer_e, + /* 0x01E2 */ fpcNm_CAMERA_e, + /* 0x01E3 */ fpcNm_CAMERA2_e, + /* 0x01E4 */ fpcNm_KYEFF_e, + /* 0x01E5 */ fpcNm_KYEFF2_e, + /* 0x01E6 */ fpcNm_MESG_e, + /* 0x01E7 */ fpcNm_MSG_e, + /* 0x01E8 */ fpcNm_MSG2_e, + /* 0x01E9 */ fpcNm_MSG3_e, + /* 0x01EA */ fpcNm_MENUWINDOW_e, + /* 0x01EB */ fpcNm_Menu_Cloth_e, + /* 0x01EC */ fpcNm_TIMER_e, + /* 0x01ED */ fpcNm_AUCTION_SCREEN_e, + /* 0x01EE */ fpcNm_PLACE_NAME_e, + /* 0x01EF */ fpcNm_MINIGAME_STARTER_e, + /* 0x01F0 */ fpcNm_MINIGAME_TERMINATER_e, + /* 0x01F1 */ fpcNm_METER_e, + /* 0x01F2 */ fpcNm_OPERATE_WIND_e, + /* 0x01F3 */ fpcNm_SCP_e, + /* 0x01F4 */ fpcNm_PB_e, + /* 0x01F5 */ fpcNm_GAMEOVER_e, + fpcNm_MAX_NUM_e, + + fpcNm_INVALID_e = 0x7FFF, +}; + +#endif /* F_PC_NAME_H */ diff --git a/src/SSystem/SComponent/c_bg_s.cpp b/src/SSystem/SComponent/c_bg_s.cpp index 1f3c899e3..99de741af 100644 --- a/src/SSystem/SComponent/c_bg_s.cpp +++ b/src/SSystem/SComponent/c_bg_s.cpp @@ -10,7 +10,7 @@ #include "JSystem/JUtility/JUTAssert.h" #include "dolphin/types.h" -s32 l_SetCounter = 0; +static s32 l_SetCounter = 0; /* 80246440-8024645C .text Init__11cBgS_ChkElmFv */ void cBgS_ChkElm::Init() { diff --git a/src/c/c_damagereaction.cpp b/src/c/c_damagereaction.cpp index 863dcc0d1..f6763035a 100644 --- a/src/c/c_damagereaction.cpp +++ b/src/c/c_damagereaction.cpp @@ -15,7 +15,6 @@ #include "m_Do/m_Do_mtx.h" #include "d/d_cc_uty.h" #include "d/d_bg_s_lin_chk.h" -#include "d/d_procname.h" cXyz non_pos(-20000.0f, -20000.0f, 20000.0f); @@ -158,7 +157,7 @@ BOOL enemy_ice(enemyice* ei) { if (ei->mLightShrinkTimer > (s8)(90 + REG14_S(2))) { fopAcM_delete(ac); fopAcM_onActor(ac); - if (fopAcM_GetName(ac) != PROC_PZ) { + if (fopAcM_GetName(ac) != fpcNm_PZ_e) { // If the actor is not Princess Zelda, drop an item ball. // TODO: Why the Zelda check? Is she coded to be able to die to Light Arrows? fopAcM_createIball(&pos, ac->itemTableIdx, fopAcM_GetRoomNo(ac), &ac->current.angle, ac->stealItemBitNo); diff --git a/src/c/c_dylink.cpp b/src/c/c_dylink.cpp index 9accc85b4..439c6c232 100644 --- a/src/c/c_dylink.cpp +++ b/src/c/c_dylink.cpp @@ -5,7 +5,7 @@ #include "c/c_dylink.h" #include "d/d_com_lib_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "m_Do/m_Do_dvd_thread.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_printf.h" @@ -16,7 +16,7 @@ #include "dolphin/os/OS.h" #include "string.h" -DynamicModuleControlBase * DMC[PROC_COUNT_e]; +DynamicModuleControlBase * DMC[fpcNm_MAX_NUM_e]; #if VERSION == VERSION_DEMO JKRSolidHeap* cCc_solidHeap = NULL; #else @@ -26,438 +26,438 @@ volatile BOOL cDyl_Initialized = false; mDoDvdThd_callback_c * cDyl_DVD = NULL; const cDyl_DynamicName_t DynamicNameTable[] = { - {PROC_ALLDIE, "d_a_alldie"}, - {PROC_TAG_EVSW, "d_a_tag_evsw"}, - {PROC_Obj_Swpush, "d_a_obj_swpush"}, - {PROC_Obj_Swheavy, "d_a_obj_swheavy"}, - {PROC_Obj_Swflat, "d_a_obj_swflat"}, - {PROC_Obj_Swlight, "d_a_obj_swlight"}, - {PROC_Obj_Swhammer, "d_a_obj_swhammer"}, - {PROC_Obj_Quake, "d_a_obj_quake"}, - {PROC_Obj_Drift, "d_a_obj_drift"}, - {PROC_Tag_Volcano, "d_a_tag_volcano"}, - {PROC_TAG_SO, "d_a_tag_so"}, - {PROC_Obj_Pbco, "d_a_obj_pbco"}, - {PROC_SEATAG, "d_a_seatag"}, - {PROC_Obj_Tide, "d_a_obj_tide"}, - {PROC_Hmlif, "d_a_hmlif"}, - {PROC_SCENECHG, "d_a_scene_change"}, - {PROC_Obj_Magmarock, "d_a_obj_magmarock"}, - {PROC_Obj_Movebox, "d_a_obj_movebox"}, - {PROC_Obj_Tribox, "d_a_obj_tribox"}, - {PROC_Obj_Shelf, "d_a_obj_shelf"}, - {PROC_Obj_Hlift, "d_a_obj_hlift"}, - {PROC_Obj_Hami2, "d_a_obj_hami2"}, - {PROC_Obj_Hami3, "d_a_obj_hami3"}, - {PROC_Obj_Hami4, "d_a_obj_hami4"}, - {PROC_Obj_Hbrf1, "d_a_obj_hbrf1"}, - {PROC_Obj_Volcano, "d_a_obj_volcano"}, - {PROC_Obj_Vmc, "d_a_obj_vmc"}, - {PROC_Obj_Usovmc, "d_a_obj_usovmc"}, - {PROC_Obj_Vfan, "d_a_obj_vfan"}, - {PROC_Obj_Iceisland, "d_a_obj_iceisland"}, - {PROC_Obj_Dragonhead, "d_a_obj_dragonhead"}, - {PROC_Obj_Pirateship, "d_a_obj_pirateship"}, - {PROC_Obj_Tousekiki, "d_a_obj_tousekiki"}, - {PROC_Tag_Ret, "d_a_tag_ret"}, - {PROC_Kaji, "d_a_kaji"}, - {PROC_Canon, "d_a_canon"}, - {PROC_MGBOARD, "d_a_mgameboard"}, - {PROC_OBJ_CANON, "d_a_obj_canon"}, - {PROC_OBJ_OTBLE, "d_a_obj_otble"}, - {PROC_OBJ_WARPT, "d_a_obj_warpt"}, - {PROC_OBJ_TORIPOST, "d_a_obj_toripost"}, - {PROC_OBJ_IKADA, "d_a_obj_ikada"}, - {PROC_OBJ_MJDOOR, "d_a_obj_majyuu_door"}, - {PROC_OBJ_PFALL, "d_a_obj_pfall"}, - {PROC_OBJ_HOLE, "d_a_obj_hole"}, - {PROC_Obj_Stair, "d_a_obj_stair"}, - {PROC_Obj_Lpalm, "d_a_obj_lpalm"}, - {PROC_Obj_Mtest, "d_a_obj_mtest"}, - {PROC_Obj_Mkie, "d_a_obj_mkie"}, - {PROC_Obj_Mkiek, "d_a_obj_mkiek"}, - {PROC_Obj_MknjD, "d_a_obj_mknjd"}, - {PROC_Obj_Msdan, "d_a_obj_msdan"}, - {PROC_Obj_MsdanSub, "d_a_obj_msdan_sub"}, - {PROC_Obj_Msdan2, "d_a_obj_msdan2"}, - {PROC_Obj_MsdanSub2, "d_a_obj_msdan_sub2"}, - {PROC_Obj_Nest, "d_a_obj_nest"}, - {PROC_Obj_Ojtree, "d_a_obj_ojtree"}, - {PROC_Obj_Ospbox, "d_a_obj_ospbox"}, - {PROC_Obj_Ladder, "d_a_obj_ladder"}, - {PROC_Obj_Smplbg, "d_a_obj_smplbg"}, - {PROC_Obj_Akabe, "d_a_obj_akabe"}, - {PROC_Obj_Ashut, "d_a_obj_ashut"}, - {PROC_BRIDGE, "d_a_bridge"}, - {PROC_MSW, "d_a_msw"}, - {PROC_MFLFT, "d_a_mflft"}, - {PROC_KLFT, "d_a_klft"}, - {PROC_ICE_LIFT, "d_a_icelift"}, - {PROC_AMI_PROP, "d_a_amiprop"}, - {PROC_PEDESTAL, "d_a_pedestal"}, - {PROC_FLOOR, "d_a_floor"}, - {PROC_KITA, "d_a_kita"}, - {PROC_KOKIIE, "d_a_kokiie"}, - {PROC_SHAND, "d_a_shand"}, - {PROC_BITA, "d_a_bita"}, - {PROC_SK, "d_a_sk"}, - {PROC_SK2, "d_a_sk2"}, - {PROC_SSK, "d_a_ssk"}, - {PROC_WARPFLOWER, "d_a_warpf"}, - {PROC_WARPFOUT, "d_a_warpfout"}, - {PROC_WARPLIGHT, "d_a_warpls"}, - {PROC_WARPHYRULE, "d_a_warphr"}, - {PROC_WARPDEMO20, "d_a_warpdm20"}, - {PROC_WARPGANON, "d_a_warpgn"}, - {PROC_WARPMAJYUU, "d_a_warpmj"}, - {PROC_Balancelift, "d_a_obj_balancelift"}, - {PROC_SHUTTER, "d_a_shutter"}, - {PROC_SHUTTER2, "d_a_shutter2"}, - {PROC_WINDMILL, "d_a_windmill"}, - {PROC_MBDOOR, "d_a_mbdoor"}, - {PROC_NPC_DE1, "d_a_npc_de1"}, - {PROC_NPC_NZ, "d_a_npc_nz"}, - {PROC_NPC_SO, "d_a_npc_so"}, - {PROC_FM, "d_a_fm"}, - {PROC_LEAF_LIFT, "d_a_leaflift"}, - {PROC_Obj_Roten, "d_a_obj_roten"}, - {PROC_TOGE, "d_a_toge"}, - {PROC_Obj_Ferris, "d_a_obj_ferris"}, - {PROC_Obj_Xfuta, "d_a_obj_xfuta"}, - {PROC_Obj_Gaship, "d_a_obj_gaship"}, - {PROC_Obj_Rforce, "d_a_obj_rforce"}, - {PROC_Obj_Gaship2, "d_a_obj_gaship2"}, - {PROC_Obj_Light, "d_a_obj_light"}, - {PROC_Obj_Homen, "d_a_obj_homen"}, - {PROC_Obj_Homensmk, "d_a_obj_homensmoke"}, - {PROC_Obj_Ftree, "d_a_obj_ftree"}, - {PROC_Obj_Vds, "d_a_obj_Vds"}, - {PROC_Obj_Vyasi, "d_a_obj_vyasi"}, - {PROC_Obj_Ajav, "d_a_obj_ajav"}, - {PROC_Obj_Trap, "d_a_obj_trap"}, - {PROC_Obj_Hha, "d_a_obj_hha"}, - {PROC_Obj_Htetu1, "d_a_obj_htetu1"}, - {PROC_Obj_Gnntakis, "d_a_obj_gnndemotakis"}, - {PROC_Obj_Gnntakie, "d_a_obj_gnndemotakie"}, - {PROC_Obj_Gnnbtaki, "d_a_obj_gnnbtltaki"}, - {PROC_Obj_Rcloud, "d_a_obj_rcloud"}, - {PROC_Obj_Gryw00, "d_a_obj_gryw00"}, - {PROC_Obj_AjavW, "d_a_obj_AjavW"}, - {PROC_Obj_Leaves, "d_a_obj_leaves"}, - {PROC_Obj_YLzou, "d_a_obj_YLzou"}, - {PROC_Obj_Gbed, "d_a_obj_ganonbed"}, - {PROC_Obj_Vteng, "d_a_obj_Vteng"}, - {PROC_Obj_Hfuck1, "d_a_obj_hfuck1"}, - {PROC_Obj_Ohatch, "d_a_obj_ohatch"}, - {PROC_Obj_Hcbh, "d_a_obj_hcbh"}, - {PROC_Obj_Ygush00, "d_a_obj_Ygush00"}, - {PROC_Obj_Bscurtain, "d_a_obj_bscurtain"}, - {PROC_Obj_Shmrgrd, "d_a_obj_shmrgrd"}, - {PROC_Obj_Eayogn, "d_a_obj_eayogn"}, - {PROC_Obj_Vmsms, "d_a_obj_vmsms"}, - {PROC_Obj_Vmsdz, "d_a_obj_vmsdz"}, - {PROC_Ygcwp, "d_a_ygcwp"}, - {PROC_Obj_Vgnfd, "d_a_obj_vgnfd"}, - {PROC_Obj_Kanoke, "d_a_obj_kanoke"}, - {PROC_Obj_Eskban, "d_a_obj_eskban"}, - {PROC_Obj_Ekskz, "d_a_obj_ekskz"}, - {PROC_Obj_Ebomzo, "d_a_obj_ebomzo"}, - {PROC_Obj_Kanat, "d_a_obj_kanat"}, - {PROC_Obj_Aygr, "d_a_obj_aygr"}, - {PROC_SHIP, "d_a_ship"}, - {PROC_Obj_Jump, "d_a_obj_jump"}, - {PROC_NPC_MK, "d_a_npc_mk"}, - {PROC_SAIL, "d_a_sail"}, - {PROC_PIRATE_FLAG, "d_a_pirate_flag"}, - {PROC_MAJUU_FLAG, "d_a_majuu_flag"}, - {PROC_Tori_Flag, "d_a_tori_flag"}, - {PROC_Sie_Flag, "d_a_sie_flag"}, - {PROC_SYAN, "d_a_syan"}, - {PROC_AYUSH, "d_a_ghostship"}, - {PROC_OSHIP, "d_a_oship"}, - {PROC_RECTANGLE, "d_a_rectangle"}, - {PROC_BB, "d_a_bb"}, - {PROC_KANBAN, "d_a_kanban"}, - {PROC_HITOBJ, "d_a_hitobj"}, - {PROC_KT, "d_a_kt"}, - {PROC_EP, "d_a_ep"}, - {PROC_LAMP, "d_a_lamp"}, - {PROC_FF, "d_a_ff"}, - {PROC_MO2, "d_a_mo2"}, - {PROC_BK, "d_a_bk"}, - {PROC_ST, "d_a_st"}, - {PROC_TN, "d_a_tn"}, - {PROC_MANT, "d_a_mant"}, - {PROC_KANTERA, "d_a_kantera"}, - {PROC_KAMOME, "d_a_kamome"}, + {fpcNm_ALLDIE_e, "d_a_alldie"}, + {fpcNm_TAG_EVSW_e, "d_a_tag_evsw"}, + {fpcNm_Obj_Swpush_e, "d_a_obj_swpush"}, + {fpcNm_Obj_Swheavy_e, "d_a_obj_swheavy"}, + {fpcNm_Obj_Swflat_e, "d_a_obj_swflat"}, + {fpcNm_Obj_Swlight_e, "d_a_obj_swlight"}, + {fpcNm_Obj_Swhammer_e, "d_a_obj_swhammer"}, + {fpcNm_Obj_Quake_e, "d_a_obj_quake"}, + {fpcNm_Obj_Drift_e, "d_a_obj_drift"}, + {fpcNm_Tag_Volcano_e, "d_a_tag_volcano"}, + {fpcNm_TAG_SO_e, "d_a_tag_so"}, + {fpcNm_Obj_Pbco_e, "d_a_obj_pbco"}, + {fpcNm_SEATAG_e, "d_a_seatag"}, + {fpcNm_Obj_Tide_e, "d_a_obj_tide"}, + {fpcNm_Hmlif_e, "d_a_hmlif"}, + {fpcNm_SCENECHG_e, "d_a_scene_change"}, + {fpcNm_Obj_Magmarock_e, "d_a_obj_magmarock"}, + {fpcNm_Obj_Movebox_e, "d_a_obj_movebox"}, + {fpcNm_Obj_Tribox_e, "d_a_obj_tribox"}, + {fpcNm_Obj_Shelf_e, "d_a_obj_shelf"}, + {fpcNm_Obj_Hlift_e, "d_a_obj_hlift"}, + {fpcNm_Obj_Hami2_e, "d_a_obj_hami2"}, + {fpcNm_Obj_Hami3_e, "d_a_obj_hami3"}, + {fpcNm_Obj_Hami4_e, "d_a_obj_hami4"}, + {fpcNm_Obj_Hbrf1_e, "d_a_obj_hbrf1"}, + {fpcNm_Obj_Volcano_e, "d_a_obj_volcano"}, + {fpcNm_Obj_Vmc_e, "d_a_obj_vmc"}, + {fpcNm_Obj_Usovmc_e, "d_a_obj_usovmc"}, + {fpcNm_Obj_Vfan_e, "d_a_obj_vfan"}, + {fpcNm_Obj_Iceisland_e, "d_a_obj_iceisland"}, + {fpcNm_Obj_Dragonhead_e, "d_a_obj_dragonhead"}, + {fpcNm_Obj_Pirateship_e, "d_a_obj_pirateship"}, + {fpcNm_Obj_Tousekiki_e, "d_a_obj_tousekiki"}, + {fpcNm_Tag_Ret_e, "d_a_tag_ret"}, + {fpcNm_Kaji_e, "d_a_kaji"}, + {fpcNm_Canon_e, "d_a_canon"}, + {fpcNm_MGBOARD_e, "d_a_mgameboard"}, + {fpcNm_OBJ_CANON_e, "d_a_obj_canon"}, + {fpcNm_OBJ_OTBLE_e, "d_a_obj_otble"}, + {fpcNm_OBJ_WARPT_e, "d_a_obj_warpt"}, + {fpcNm_OBJ_TORIPOST_e, "d_a_obj_toripost"}, + {fpcNm_OBJ_IKADA_e, "d_a_obj_ikada"}, + {fpcNm_OBJ_MJDOOR_e, "d_a_obj_majyuu_door"}, + {fpcNm_OBJ_PFALL_e, "d_a_obj_pfall"}, + {fpcNm_OBJ_HOLE_e, "d_a_obj_hole"}, + {fpcNm_Obj_Stair_e, "d_a_obj_stair"}, + {fpcNm_Obj_Lpalm_e, "d_a_obj_lpalm"}, + {fpcNm_Obj_Mtest_e, "d_a_obj_mtest"}, + {fpcNm_Obj_Mkie_e, "d_a_obj_mkie"}, + {fpcNm_Obj_Mkiek_e, "d_a_obj_mkiek"}, + {fpcNm_Obj_MknjD_e, "d_a_obj_mknjd"}, + {fpcNm_Obj_Msdan_e, "d_a_obj_msdan"}, + {fpcNm_Obj_MsdanSub_e, "d_a_obj_msdan_sub"}, + {fpcNm_Obj_Msdan2_e, "d_a_obj_msdan2"}, + {fpcNm_Obj_MsdanSub2_e, "d_a_obj_msdan_sub2"}, + {fpcNm_Obj_Nest_e, "d_a_obj_nest"}, + {fpcNm_Obj_Ojtree_e, "d_a_obj_ojtree"}, + {fpcNm_Obj_Ospbox_e, "d_a_obj_ospbox"}, + {fpcNm_Obj_Ladder_e, "d_a_obj_ladder"}, + {fpcNm_Obj_Smplbg_e, "d_a_obj_smplbg"}, + {fpcNm_Obj_Akabe_e, "d_a_obj_akabe"}, + {fpcNm_Obj_Ashut_e, "d_a_obj_ashut"}, + {fpcNm_BRIDGE_e, "d_a_bridge"}, + {fpcNm_MSW_e, "d_a_msw"}, + {fpcNm_MFLFT_e, "d_a_mflft"}, + {fpcNm_KLFT_e, "d_a_klft"}, + {fpcNm_ICE_LIFT_e, "d_a_icelift"}, + {fpcNm_AMI_PROP_e, "d_a_amiprop"}, + {fpcNm_PEDESTAL_e, "d_a_pedestal"}, + {fpcNm_FLOOR_e, "d_a_floor"}, + {fpcNm_KITA_e, "d_a_kita"}, + {fpcNm_KOKIIE_e, "d_a_kokiie"}, + {fpcNm_SHAND_e, "d_a_shand"}, + {fpcNm_BITA_e, "d_a_bita"}, + {fpcNm_SK_e, "d_a_sk"}, + {fpcNm_SK2_e, "d_a_sk2"}, + {fpcNm_SSK_e, "d_a_ssk"}, + {fpcNm_WARPFLOWER_e, "d_a_warpf"}, + {fpcNm_WARPFOUT_e, "d_a_warpfout"}, + {fpcNm_WARPLIGHT_e, "d_a_warpls"}, + {fpcNm_WARPHYRULE_e, "d_a_warphr"}, + {fpcNm_WARPDEMO20_e, "d_a_warpdm20"}, + {fpcNm_WARPGANON_e, "d_a_warpgn"}, + {fpcNm_WARPMAJYUU_e, "d_a_warpmj"}, + {fpcNm_Balancelift_e, "d_a_obj_balancelift"}, + {fpcNm_SHUTTER_e, "d_a_shutter"}, + {fpcNm_SHUTTER2_e, "d_a_shutter2"}, + {fpcNm_WINDMILL_e, "d_a_windmill"}, + {fpcNm_MBDOOR_e, "d_a_mbdoor"}, + {fpcNm_NPC_DE1_e, "d_a_npc_de1"}, + {fpcNm_NPC_NZ_e, "d_a_npc_nz"}, + {fpcNm_NPC_SO_e, "d_a_npc_so"}, + {fpcNm_FM_e, "d_a_fm"}, + {fpcNm_LEAF_LIFT_e, "d_a_leaflift"}, + {fpcNm_Obj_Roten_e, "d_a_obj_roten"}, + {fpcNm_TOGE_e, "d_a_toge"}, + {fpcNm_Obj_Ferris_e, "d_a_obj_ferris"}, + {fpcNm_Obj_Xfuta_e, "d_a_obj_xfuta"}, + {fpcNm_Obj_Gaship_e, "d_a_obj_gaship"}, + {fpcNm_Obj_Rforce_e, "d_a_obj_rforce"}, + {fpcNm_Obj_Gaship2_e, "d_a_obj_gaship2"}, + {fpcNm_Obj_Light_e, "d_a_obj_light"}, + {fpcNm_Obj_Homen_e, "d_a_obj_homen"}, + {fpcNm_Obj_Homensmk_e, "d_a_obj_homensmoke"}, + {fpcNm_Obj_Ftree_e, "d_a_obj_ftree"}, + {fpcNm_Obj_Vds_e, "d_a_obj_Vds"}, + {fpcNm_Obj_Vyasi_e, "d_a_obj_vyasi"}, + {fpcNm_Obj_Ajav_e, "d_a_obj_ajav"}, + {fpcNm_Obj_Trap_e, "d_a_obj_trap"}, + {fpcNm_Obj_Hha_e, "d_a_obj_hha"}, + {fpcNm_Obj_Htetu1_e, "d_a_obj_htetu1"}, + {fpcNm_Obj_Gnntakis_e, "d_a_obj_gnndemotakis"}, + {fpcNm_Obj_Gnntakie_e, "d_a_obj_gnndemotakie"}, + {fpcNm_Obj_Gnnbtaki_e, "d_a_obj_gnnbtltaki"}, + {fpcNm_Obj_Rcloud_e, "d_a_obj_rcloud"}, + {fpcNm_Obj_Gryw00_e, "d_a_obj_gryw00"}, + {fpcNm_Obj_AjavW_e, "d_a_obj_AjavW"}, + {fpcNm_Obj_Leaves_e, "d_a_obj_leaves"}, + {fpcNm_Obj_YLzou_e, "d_a_obj_YLzou"}, + {fpcNm_Obj_Gbed_e, "d_a_obj_ganonbed"}, + {fpcNm_Obj_Vteng_e, "d_a_obj_Vteng"}, + {fpcNm_Obj_Hfuck1_e, "d_a_obj_hfuck1"}, + {fpcNm_Obj_Ohatch_e, "d_a_obj_ohatch"}, + {fpcNm_Obj_Hcbh_e, "d_a_obj_hcbh"}, + {fpcNm_Obj_Ygush00_e, "d_a_obj_Ygush00"}, + {fpcNm_Obj_Bscurtain_e, "d_a_obj_bscurtain"}, + {fpcNm_Obj_Shmrgrd_e, "d_a_obj_shmrgrd"}, + {fpcNm_Obj_Eayogn_e, "d_a_obj_eayogn"}, + {fpcNm_Obj_Vmsms_e, "d_a_obj_vmsms"}, + {fpcNm_Obj_Vmsdz_e, "d_a_obj_vmsdz"}, + {fpcNm_Ygcwp_e, "d_a_ygcwp"}, + {fpcNm_Obj_Vgnfd_e, "d_a_obj_vgnfd"}, + {fpcNm_Obj_Kanoke_e, "d_a_obj_kanoke"}, + {fpcNm_Obj_Eskban_e, "d_a_obj_eskban"}, + {fpcNm_Obj_Ekskz_e, "d_a_obj_ekskz"}, + {fpcNm_Obj_Ebomzo_e, "d_a_obj_ebomzo"}, + {fpcNm_Obj_Kanat_e, "d_a_obj_kanat"}, + {fpcNm_Obj_Aygr_e, "d_a_obj_aygr"}, + {fpcNm_SHIP_e, "d_a_ship"}, + {fpcNm_Obj_Jump_e, "d_a_obj_jump"}, + {fpcNm_NPC_MK_e, "d_a_npc_mk"}, + {fpcNm_SAIL_e, "d_a_sail"}, + {fpcNm_PIRATE_FLAG_e, "d_a_pirate_flag"}, + {fpcNm_MAJUU_FLAG_e, "d_a_majuu_flag"}, + {fpcNm_Tori_Flag_e, "d_a_tori_flag"}, + {fpcNm_Sie_Flag_e, "d_a_sie_flag"}, + {fpcNm_SYAN_e, "d_a_syan"}, + {fpcNm_AYUSH_e, "d_a_ghostship"}, + {fpcNm_OSHIP_e, "d_a_oship"}, + {fpcNm_RECTANGLE_e, "d_a_rectangle"}, + {fpcNm_BB_e, "d_a_bb"}, + {fpcNm_KANBAN_e, "d_a_kanban"}, + {fpcNm_HITOBJ_e, "d_a_hitobj"}, + {fpcNm_KT_e, "d_a_kt"}, + {fpcNm_EP_e, "d_a_ep"}, + {fpcNm_LAMP_e, "d_a_lamp"}, + {fpcNm_FF_e, "d_a_ff"}, + {fpcNm_MO2_e, "d_a_mo2"}, + {fpcNm_BK_e, "d_a_bk"}, + {fpcNm_ST_e, "d_a_st"}, + {fpcNm_TN_e, "d_a_tn"}, + {fpcNm_MANT_e, "d_a_mant"}, + {fpcNm_KANTERA_e, "d_a_kantera"}, + {fpcNm_KAMOME_e, "d_a_kamome"}, #if VERSION == VERSION_DEMO - {PROC_KAMOME2, "d_a_kamome2"}, + {fpcNm_KAMOME2_e, "d_a_kamome2"}, #endif - {PROC_NPC_KAM, "d_a_npc_kamome"}, - {PROC_WBIRD, "d_a_wbird"}, - {PROC_DEMO_KMM, "d_a_demo_kmm"}, - {PROC_NZ, "d_a_nz"}, - {PROC_NZG, "d_a_nzg"}, - {PROC_KN, "d_a_kn"}, - {PROC_DEMO_DK, "d_a_demo_dk"}, - {PROC_AM, "d_a_am"}, - {PROC_AM2, "d_a_am2"}, - {PROC_GM, "d_a_gm"}, - {PROC_KS, "d_a_ks"}, - {PROC_CC, "d_a_cc"}, - {PROC_BL, "d_a_bl"}, - {PROC_WZ, "d_a_wz"}, - {PROC_PH, "d_a_ph"}, - {PROC_PZ, "d_a_pz"}, - {PROC_BPW, "d_a_bpw"}, - {PROC_PW, "d_a_pw"}, - {PROC_JBO, "d_a_jbo"}, - {PROC_BO, "d_a_bo"}, - {PROC_KI, "d_a_ki"}, - {PROC_MT, "d_a_mt"}, - {PROC_BWD, "d_a_bwd"}, - {PROC_BWDS, "d_a_bwds"}, - {PROC_BWDG, "d_a_bwdg"}, - {PROC_KB, "d_a_kb"}, - {PROC_DR, "d_a_dr"}, - {PROC_DR2, "d_a_dr2"}, - {PROC_RD, "d_a_rd"}, - {PROC_DAIOCTA, "d_a_daiocta"}, - {PROC_DAIOCTA_EYE, "d_a_daiocta_eye"}, - {PROC_OQ, "d_a_oq"}, - {PROC_GY, "d_a_gy"}, - {PROC_GY_CTRL, "d_a_gy_ctrl"}, - {PROC_GY_CTRLB, "d_a_gy_ctrl"}, - {PROC_Hot_Floor, "d_a_hot_floor"}, - {PROC_Beam, "d_a_beam"}, - {PROC_Bemos, "d_a_obj_bemos"}, - {PROC_BTD, "d_a_btd"}, - {PROC_BMD, "d_a_bmd"}, - {PROC_BMDHAND, "d_a_bmdhand"}, - {PROC_BMDFOOT, "d_a_bmdfoot"}, - {PROC_DK, "d_a_dk"}, - {PROC_BDK, "d_a_bdk"}, - {PROC_BDKOBJ, "d_a_bdkobj"}, - {PROC_BST, "d_a_bst"}, - {PROC_FGANON, "d_a_fganon"}, - {PROC_FGMAHOU, "d_a_fgmahou"}, - {PROC_BGN, "d_a_bgn"}, - {PROC_BGN2, "d_a_bgn2"}, - {PROC_BGN3, "d_a_bgn3"}, - {PROC_GND, "d_a_gnd"}, - {PROC_PT, "d_a_pt"}, - {PROC_SWTDOOR, "d_a_swtdoor"}, - {PROC_MOZO, "d_a_mozo"}, - {PROC_KUI, "d_a_kui"}, - {PROC_SS, "d_a_ss"}, - {PROC_SSS, "d_a_sss"}, - {PROC_SITEM, "d_a_sitem"}, - {PROC_MACHINE, "d_a_machine"}, - {PROC_BOSSITEM, "d_a_boss_item"}, - {PROC_Demo_Item, "d_a_demo_item"}, - {PROC_RACEITEM, "d_a_race_item"}, - {PROC_ShopItem, "d_a_shop_item"}, - {PROC_DEKU_ITEM, "d_a_deku_item"}, - {PROC_Obj_Paper, "d_a_obj_paper"}, - {PROC_Obj_Demo_Barrel,"d_a_obj_demo_barrel"}, - {PROC_Obj_Dmgroom, "d_a_obj_dmgroom"}, - {PROC_Obj_Doguu, "d_a_obj_doguu"}, - {PROC_Obj_Wood, "d_a_obj_wood"}, - {PROC_Obj_Flame, "d_a_obj_flame"}, - {PROC_Obj_Buoyrace, "d_a_obj_buoyrace"}, - {PROC_Obj_Coming, "d_a_obj_coming"}, - {PROC_Coming2, "d_a_coming2"}, - {PROC_Coming3, "d_a_coming3"}, - {PROC_Obj_Mmrr, "d_a_obj_mmrr"}, - {PROC_Obj_Pbka, "d_a_obj_pbka"}, - {PROC_Obj_Plant, "d_a_obj_plant"}, - {PROC_Obj_Gtaki, "d_a_obj_gtaki"}, - {PROC_Obj_Yboil, "d_a_obj_Yboil"}, - {PROC_Obj_Rflw, "d_a_obj_rflw"}, - {PROC_Obj_Table, "d_a_obj_table"}, - {PROC_Obj_Tenmado, "d_a_obj_tenmado"}, - {PROC_Obj_Cafelmp, "d_a_obj_cafelmp"}, - {PROC_Obj_Apzl, "d_a_obj_apzl"}, - {PROC_Obj_Adnno, "d_a_obj_adnno"}, - {PROC_Obj_Auzu, "d_a_obj_auzu"}, - {PROC_Obj_Gong, "d_a_obj_gong"}, - {PROC_Obj_Barrier, "d_a_obj_barrier"}, - {PROC_Obj_Firewall, "d_a_obj_firewall"}, - {PROC_Obj_TnTrap, "d_a_obj_tntrap"}, - {PROC_Obj_Monument, "d_a_obj_monument"}, - {PROC_Obj_Tapestry, "d_a_obj_tapestry"}, - {PROC_Obj_HSH, "d_a_obj_hsehi1"}, - {PROC_Goal_Flag, "d_a_goal_flag"}, - {PROC_TBOX, "d_a_tbox"}, - {PROC_SBOX, "d_a_sbox"}, - {PROC_BOMB_FLOWER, "d_a_bflower"}, - {PROC_ACORN_LEAF, "d_a_acorn_leaf"}, - {PROC_SWC00, "d_a_swc00"}, - {PROC_FAN, "d_a_fan"}, - {PROC_DOOR10, "d_a_door10"}, - {PROC_DOOR12, "d_a_door12"}, - {PROC_ATDOOR, "d_a_atdoor"}, - {PROC_MDOOR, "d_a_mdoor"}, - {PROC_KDDOOR, "d_a_kddoor"}, - {PROC_KNOB00, "d_a_knob00"}, - {PROC_MTOGE, "d_a_mtoge"}, - {PROC_ANDSW0, "d_a_andsw0"}, - {PROC_ANDSW2, "d_a_andsw2"}, - {PROC_DAI, "d_a_dai"}, - {PROC_SW_ATTACK, "d_a_swattack"}, - {PROC_SW_ITEM, "d_a_switem"}, - {PROC_SW_TACT, "d_a_swtact"}, - {PROC_NPC_OS, "d_a_npc_os"}, - {PROC_NPC_YM1, "d_a_npc_ym1"}, - {PROC_NPC_YM2, "d_a_npc_ym1"}, - {PROC_NPC_YW1, "d_a_npc_yw1"}, - {PROC_NPC_JI1, "d_a_npc_ji1"}, - {PROC_NPC_KO1, "d_a_npc_ko1"}, - {PROC_NPC_KO2, "d_a_npc_ko1"}, - {PROC_NPC_LS1, "d_a_npc_ls1"}, - {PROC_NPC_P1, "d_a_npc_p1"}, - {PROC_NPC_P2, "d_a_npc_p2"}, - {PROC_NPC_SARACE, "d_a_npc_sarace"}, - {PROC_NPC_TC, "d_a_npc_tc"}, - {PROC_NPC_BM1, "d_a_npc_bm1"}, - {PROC_NPC_BM2, "d_a_npc_bm1"}, - {PROC_NPC_BM3, "d_a_npc_bm1"}, - {PROC_NPC_BM4, "d_a_npc_bm1"}, - {PROC_NPC_BM5, "d_a_npc_bm1"}, - {PROC_NPC_OB1, "d_a_npc_ob1"}, - {PROC_NPC_AJ1, "d_a_npc_aj1"}, - {PROC_NPC_KM1, "d_a_npc_km1"}, - {PROC_NPC_CB1, "d_a_npc_cb1"}, - {PROC_NPC_BA1, "d_a_npc_ba1"}, - {PROC_NPC_BJ1, "d_a_npc_bj1"}, - {PROC_NPC_BJ2, "d_a_npc_bj1"}, - {PROC_NPC_BJ3, "d_a_npc_bj1"}, - {PROC_NPC_BJ4, "d_a_npc_bj1"}, - {PROC_NPC_BJ5, "d_a_npc_bj1"}, - {PROC_NPC_BJ6, "d_a_npc_bj1"}, - {PROC_NPC_BJ7, "d_a_npc_bj1"}, - {PROC_NPC_BJ8, "d_a_npc_bj1"}, - {PROC_NPC_BJ9, "d_a_npc_bj1"}, - {PROC_NPC_BS1, "d_a_npc_bs1"}, - {PROC_NPC_BMCON1, "d_a_npc_bmcon1"}, - {PROC_NPC_BMS1, "d_a_npc_bms1"}, - {PROC_NPC_BMSW, "d_a_npc_bmsw"}, - {PROC_NPC_BTSW, "d_a_npc_btsw"}, - {PROC_NPC_BTSW2, "d_a_npc_btsw2"}, - {PROC_NPC_DS1, "d_a_npc_ds1"}, - {PROC_NPC_RSH1, "d_a_npc_rsh1"}, - {PROC_NPC_KK1, "d_a_npc_kk1"}, - {PROC_NPC_PM1, "d_a_npc_pm1"}, - {PROC_NPC_KP1, "d_a_npc_kp1"}, - {PROC_NPC_PF1, "d_a_npc_pf1"}, - {PROC_NPC_GP1, "d_a_npc_gp1"}, - {PROC_NPC_JB1, "d_a_npc_jb1"}, - {PROC_NPC_KF1, "d_a_npc_kf1"}, - {PROC_NPC_AUCTION, "d_a_npc_auction"}, - {PROC_NPC_KG1, "d_a_npc_kg1"}, - {PROC_NPC_KG2, "d_a_npc_kg2"}, - {PROC_NPC_TT, "d_a_npc_tt"}, - {PROC_NPC_HR, "d_a_npc_hr"}, - {PROC_NPC_HO, "d_a_npc_ho"}, - {PROC_NPC_MD, "d_a_npc_md"}, - {PROC_NPC_UK, "d_a_npc_uk"}, - {PROC_BIGELF, "d_a_bigelf"}, - {PROC_NPC_CO1, "d_a_npc_co1"}, - {PROC_NPC_ZK1, "d_a_npc_zk1"}, - {PROC_NPC_ROTEN, "d_a_npc_roten"}, - {PROC_NPC_PEOPLE, "d_a_npc_people"}, - {PROC_NPC_GK1, "d_a_npc_gk1"}, - {PROC_NPC_PHOTO, "d_a_npc_photo"}, - {PROC_NPC_AC1, "d_a_npc_ac1"}, - {PROC_NPC_HI1, "d_a_npc_hi1"}, - {PROC_NPC_SV, "d_a_npc_sv"}, - {PROC_NPC_MT, "d_a_npc_mt"}, - {PROC_NPC_MN, "d_a_npc_mn"}, - {PROC_NPC_AH, "d_a_npc_ah"}, - {PROC_AUCTION, "d_a_auction"}, - {PROC_KYTAG00, "d_a_kytag00"}, - {PROC_KYTAG01, "d_a_kytag01"}, - {PROC_KYTAG02, "d_a_kytag02"}, - {PROC_KYTAG03, "d_a_kytag03"}, - {PROC_KYTAG04, "d_a_kytag04"}, - {PROC_KYTAG05, "d_a_kytag05"}, - {PROC_KYTAG06, "d_a_kytag06"}, - {PROC_KYTAG07, "d_a_kytag07"}, - {PROC_WindTag, "d_a_wind_tag"}, - {PROC_YOUGAN, "d_a_yougan"}, - {PROC_Mmusic, "d_a_mmusic"}, - {PROC_Komore, "d_a_komore"}, - {PROC_Tpota, "d_a_tpota"}, - {PROC_Obj_Itnak, "d_a_obj_Itnak"}, - {PROC_Obj_Zouk, "d_a_obj_zouK"}, - {PROC_Ykgr, "d_a_ykgr"}, - {PROC_SAKU, "d_a_saku"}, - {PROC_Salvage, "d_a_salvage"}, - {PROC_SALVAGE_TBOX, "d_a_salvage_tbox"}, - {PROC_Kmon, "d_a_kmon"}, - {PROC_OBJ_FIGURE, "d_a_obj_figure"}, - {PROC_OBJ_HAT, "d_a_obj_hat"}, - {PROC_Lwood, "d_a_lwood"}, - {PROC_Dummy, "d_a_dummy"}, - {PROC_TAG_EVENT, "d_a_tag_event"}, - {PROC_TAG_HINT, "d_a_tag_hint"}, - {PROC_TAG_MSG, "d_a_tag_msg"}, - {PROC_TAG_ETC, "d_a_tag_etc"}, - {PROC_TAG_ISLAND, "d_a_tag_island"}, - {PROC_TAG_KF1, "d_a_tag_kf1"}, - {PROC_TAG_KK1, "d_a_tag_kk1"}, - {PROC_TAG_PHOTO, "d_a_tag_photo"}, - {PROC_TAG_KB_ITEM, "d_a_tag_kb_item"}, - {PROC_TAG_MK, "d_a_tag_mk"}, - {PROC_TAG_MDCB, "d_a_tag_md_cb"}, - {PROC_TAG_BA1, "d_a_tag_ba1"}, - {PROC_TagRock, "d_a_fallrock_tag"}, - {PROC_FallRock, "d_a_fallrock"}, - {PROC_SteamTag, "d_a_steam_tag"}, - {PROC_Fire, "d_a_fire"}, - {PROC_BRANCH, "d_a_branch"}, - {PROC_NPC_ZL1, "d_a_npc_zl1"}, - {PROC_WATERFALL, "d_a_waterfall"}, - {PROC_LIGHTBRIDGE, "d_a_lbridge"}, - {PROC_LIGHTSTAIR, "d_a_lstair"}, - {PROC_WALL, "d_a_wall"}, - {PROC_SW_PROPELLER, "d_a_swpropeller"}, - {PROC_IKARI, "d_a_ikari"}, - {PROC_AGBSW0, "d_a_agbsw0"}, - {PROC_MAGMA, "d_a_magma"}, - {PROC_GRASS, "d_a_grass"}, - {PROC_Obj_Tower, "d_a_obj_tower"}, - {PROC_Obj_DoguuD, "d_a_obj_doguu_demo"}, - {PROC_SPOTBOX, "d_a_spotbox"}, - {PROC_TORNADO, "d_a_tornado"}, - {PROC_TITLE, "d_a_title"}, - {PROC_MP, "d_a_movie_player"}, - {PROC_LODBG, "d_a_lod_bg"}, - {PROC_HIMO3, "d_a_himo3"}, - {PROC_ATT, "d_a_att"}, - {PROC_Hys, "d_a_hys"}, - {PROC_SWHIT0, "d_a_swhit0"}, - {PROC_TAG_GSHIP, "d_a_tag_ghostship"}, - {PROC_TSUBO, "d_a_tsubo"}, - {PROC_STONE, "d_a_stone"}, - {PROC_Stone2, "d_a_stone2"}, - {PROC_Obj_Barrel, "d_a_obj_barrel"}, - {PROC_Obj_Barrel2, "d_a_obj_barrel2"}, - {PROC_Obj_Try, "d_a_obj_try"}, - {PROC_Obj_Vtil, "d_a_obj_vtil"}, - {PROC_Obj_Ice, "d_a_obj_ice"}, - {PROC_Obj_Mshokki, "d_a_obj_mshokki"}, - {PROC_BOKO, "d_a_boko"}, - {PROC_TAMA, "d_a_tama"}, - {PROC_Obj_Buoyflag, "d_a_obj_buoyflag"}, - {PROC_Obj_Correct, "d_a_obj_correct"}, - {PROC_Obj_Eff, "d_a_obj_eff"}, - {PROC_Tag_Light, "d_a_tag_light"}, - {PROC_Tag_Attention, "d_a_tag_attention"}, - {PROC_Tag_Waterlevel, "d_a_tag_waterlevel"}, - {PROC_ARROW_ICEEFF, "d_a_arrow_iceeff"}, - {PROC_ARROW_LIGHTEFF, "d_a_arrow_lighteff"}, - {PROC_Obj_Timer, "d_a_obj_timer"}, + {fpcNm_NPC_KAM_e, "d_a_npc_kamome"}, + {fpcNm_WBIRD_e, "d_a_wbird"}, + {fpcNm_DEMO_KMM_e, "d_a_demo_kmm"}, + {fpcNm_NZ_e, "d_a_nz"}, + {fpcNm_NZG_e, "d_a_nzg"}, + {fpcNm_KN_e, "d_a_kn"}, + {fpcNm_DEMO_DK_e, "d_a_demo_dk"}, + {fpcNm_AM_e, "d_a_am"}, + {fpcNm_AM2_e, "d_a_am2"}, + {fpcNm_GM_e, "d_a_gm"}, + {fpcNm_KS_e, "d_a_ks"}, + {fpcNm_CC_e, "d_a_cc"}, + {fpcNm_BL_e, "d_a_bl"}, + {fpcNm_WZ_e, "d_a_wz"}, + {fpcNm_PH_e, "d_a_ph"}, + {fpcNm_PZ_e, "d_a_pz"}, + {fpcNm_BPW_e, "d_a_bpw"}, + {fpcNm_PW_e, "d_a_pw"}, + {fpcNm_JBO_e, "d_a_jbo"}, + {fpcNm_BO_e, "d_a_bo"}, + {fpcNm_KI_e, "d_a_ki"}, + {fpcNm_MT_e, "d_a_mt"}, + {fpcNm_BWD_e, "d_a_bwd"}, + {fpcNm_BWDS_e, "d_a_bwds"}, + {fpcNm_BWDG_e, "d_a_bwdg"}, + {fpcNm_KB_e, "d_a_kb"}, + {fpcNm_DR_e, "d_a_dr"}, + {fpcNm_DR2_e, "d_a_dr2"}, + {fpcNm_RD_e, "d_a_rd"}, + {fpcNm_DAIOCTA_e, "d_a_daiocta"}, + {fpcNm_DAIOCTA_EYE_e, "d_a_daiocta_eye"}, + {fpcNm_OQ_e, "d_a_oq"}, + {fpcNm_GY_e, "d_a_gy"}, + {fpcNm_GY_CTRL_e, "d_a_gy_ctrl"}, + {fpcNm_GY_CTRLB_e, "d_a_gy_ctrl"}, + {fpcNm_Hot_Floor_e, "d_a_hot_floor"}, + {fpcNm_Beam_e, "d_a_beam"}, + {fpcNm_Bemos_e, "d_a_obj_bemos"}, + {fpcNm_BTD_e, "d_a_btd"}, + {fpcNm_BMD_e, "d_a_bmd"}, + {fpcNm_BMDHAND_e, "d_a_bmdhand"}, + {fpcNm_BMDFOOT_e, "d_a_bmdfoot"}, + {fpcNm_DK_e, "d_a_dk"}, + {fpcNm_BDK_e, "d_a_bdk"}, + {fpcNm_BDKOBJ_e, "d_a_bdkobj"}, + {fpcNm_BST_e, "d_a_bst"}, + {fpcNm_FGANON_e, "d_a_fganon"}, + {fpcNm_FGMAHOU_e, "d_a_fgmahou"}, + {fpcNm_BGN_e, "d_a_bgn"}, + {fpcNm_BGN2_e, "d_a_bgn2"}, + {fpcNm_BGN3_e, "d_a_bgn3"}, + {fpcNm_GND_e, "d_a_gnd"}, + {fpcNm_PT_e, "d_a_pt"}, + {fpcNm_SWTDOOR_e, "d_a_swtdoor"}, + {fpcNm_MOZO_e, "d_a_mozo"}, + {fpcNm_KUI_e, "d_a_kui"}, + {fpcNm_SS_e, "d_a_ss"}, + {fpcNm_SSS_e, "d_a_sss"}, + {fpcNm_SITEM_e, "d_a_sitem"}, + {fpcNm_MACHINE_e, "d_a_machine"}, + {fpcNm_BOSSITEM_e, "d_a_boss_item"}, + {fpcNm_Demo_Item_e, "d_a_demo_item"}, + {fpcNm_RACEITEM_e, "d_a_race_item"}, + {fpcNm_ShopItem_e, "d_a_shop_item"}, + {fpcNm_DEKU_ITEM_e, "d_a_deku_item"}, + {fpcNm_Obj_Paper_e, "d_a_obj_paper"}, + {fpcNm_Obj_Demo_Barrel_e,"d_a_obj_demo_barrel"}, + {fpcNm_Obj_Dmgroom_e, "d_a_obj_dmgroom"}, + {fpcNm_Obj_Doguu_e, "d_a_obj_doguu"}, + {fpcNm_Obj_Wood_e, "d_a_obj_wood"}, + {fpcNm_Obj_Flame_e, "d_a_obj_flame"}, + {fpcNm_Obj_Buoyrace_e, "d_a_obj_buoyrace"}, + {fpcNm_Obj_Coming_e, "d_a_obj_coming"}, + {fpcNm_Coming2_e, "d_a_coming2"}, + {fpcNm_Coming3_e, "d_a_coming3"}, + {fpcNm_Obj_Mmrr_e, "d_a_obj_mmrr"}, + {fpcNm_Obj_Pbka_e, "d_a_obj_pbka"}, + {fpcNm_Obj_Plant_e, "d_a_obj_plant"}, + {fpcNm_Obj_Gtaki_e, "d_a_obj_gtaki"}, + {fpcNm_Obj_Yboil_e, "d_a_obj_Yboil"}, + {fpcNm_Obj_Rflw_e, "d_a_obj_rflw"}, + {fpcNm_Obj_Table_e, "d_a_obj_table"}, + {fpcNm_Obj_Tenmado_e, "d_a_obj_tenmado"}, + {fpcNm_Obj_Cafelmp_e, "d_a_obj_cafelmp"}, + {fpcNm_Obj_Apzl_e, "d_a_obj_apzl"}, + {fpcNm_Obj_Adnno_e, "d_a_obj_adnno"}, + {fpcNm_Obj_Auzu_e, "d_a_obj_auzu"}, + {fpcNm_Obj_Gong_e, "d_a_obj_gong"}, + {fpcNm_Obj_Barrier_e, "d_a_obj_barrier"}, + {fpcNm_Obj_Firewall_e, "d_a_obj_firewall"}, + {fpcNm_Obj_TnTrap_e, "d_a_obj_tntrap"}, + {fpcNm_Obj_Monument_e, "d_a_obj_monument"}, + {fpcNm_Obj_Tapestry_e, "d_a_obj_tapestry"}, + {fpcNm_Obj_HSH_e, "d_a_obj_hsehi1"}, + {fpcNm_Goal_Flag_e, "d_a_goal_flag"}, + {fpcNm_TBOX_e, "d_a_tbox"}, + {fpcNm_SBOX_e, "d_a_sbox"}, + {fpcNm_BOMB_FLOWER_e, "d_a_bflower"}, + {fpcNm_ACORN_LEAF_e, "d_a_acorn_leaf"}, + {fpcNm_SWC00_e, "d_a_swc00"}, + {fpcNm_FAN_e, "d_a_fan"}, + {fpcNm_DOOR10_e, "d_a_door10"}, + {fpcNm_DOOR12_e, "d_a_door12"}, + {fpcNm_ATDOOR_e, "d_a_atdoor"}, + {fpcNm_MDOOR_e, "d_a_mdoor"}, + {fpcNm_KDDOOR_e, "d_a_kddoor"}, + {fpcNm_KNOB00_e, "d_a_knob00"}, + {fpcNm_MTOGE_e, "d_a_mtoge"}, + {fpcNm_ANDSW0_e, "d_a_andsw0"}, + {fpcNm_ANDSW2_e, "d_a_andsw2"}, + {fpcNm_DAI_e, "d_a_dai"}, + {fpcNm_SW_ATTACK_e, "d_a_swattack"}, + {fpcNm_SW_ITEM_e, "d_a_switem"}, + {fpcNm_SW_TACT_e, "d_a_swtact"}, + {fpcNm_NPC_OS_e, "d_a_npc_os"}, + {fpcNm_NPC_YM1_e, "d_a_npc_ym1"}, + {fpcNm_NPC_YM2_e, "d_a_npc_ym1"}, + {fpcNm_NPC_YW1_e, "d_a_npc_yw1"}, + {fpcNm_NPC_JI1_e, "d_a_npc_ji1"}, + {fpcNm_NPC_KO1_e, "d_a_npc_ko1"}, + {fpcNm_NPC_KO2_e, "d_a_npc_ko1"}, + {fpcNm_NPC_LS1_e, "d_a_npc_ls1"}, + {fpcNm_NPC_P1_e, "d_a_npc_p1"}, + {fpcNm_NPC_P2_e, "d_a_npc_p2"}, + {fpcNm_NPC_SARACE_e, "d_a_npc_sarace"}, + {fpcNm_NPC_TC_e, "d_a_npc_tc"}, + {fpcNm_NPC_BM1_e, "d_a_npc_bm1"}, + {fpcNm_NPC_BM2_e, "d_a_npc_bm1"}, + {fpcNm_NPC_BM3_e, "d_a_npc_bm1"}, + {fpcNm_NPC_BM4_e, "d_a_npc_bm1"}, + {fpcNm_NPC_BM5_e, "d_a_npc_bm1"}, + {fpcNm_NPC_OB1_e, "d_a_npc_ob1"}, + {fpcNm_NPC_AJ1_e, "d_a_npc_aj1"}, + {fpcNm_NPC_KM1_e, "d_a_npc_km1"}, + {fpcNm_NPC_CB1_e, "d_a_npc_cb1"}, + {fpcNm_NPC_BA1_e, "d_a_npc_ba1"}, + {fpcNm_NPC_BJ1_e, "d_a_npc_bj1"}, + {fpcNm_NPC_BJ2_e, "d_a_npc_bj1"}, + {fpcNm_NPC_BJ3_e, "d_a_npc_bj1"}, + {fpcNm_NPC_BJ4_e, "d_a_npc_bj1"}, + {fpcNm_NPC_BJ5_e, "d_a_npc_bj1"}, + {fpcNm_NPC_BJ6_e, "d_a_npc_bj1"}, + {fpcNm_NPC_BJ7_e, "d_a_npc_bj1"}, + {fpcNm_NPC_BJ8_e, "d_a_npc_bj1"}, + {fpcNm_NPC_BJ9_e, "d_a_npc_bj1"}, + {fpcNm_NPC_BS1_e, "d_a_npc_bs1"}, + {fpcNm_NPC_BMCON1_e, "d_a_npc_bmcon1"}, + {fpcNm_NPC_BMS1_e, "d_a_npc_bms1"}, + {fpcNm_NPC_BMSW_e, "d_a_npc_bmsw"}, + {fpcNm_NPC_BTSW_e, "d_a_npc_btsw"}, + {fpcNm_NPC_BTSW2_e, "d_a_npc_btsw2"}, + {fpcNm_NPC_DS1_e, "d_a_npc_ds1"}, + {fpcNm_NPC_RSH1_e, "d_a_npc_rsh1"}, + {fpcNm_NPC_KK1_e, "d_a_npc_kk1"}, + {fpcNm_NPC_PM1_e, "d_a_npc_pm1"}, + {fpcNm_NPC_KP1_e, "d_a_npc_kp1"}, + {fpcNm_NPC_PF1_e, "d_a_npc_pf1"}, + {fpcNm_NPC_GP1_e, "d_a_npc_gp1"}, + {fpcNm_NPC_JB1_e, "d_a_npc_jb1"}, + {fpcNm_NPC_KF1_e, "d_a_npc_kf1"}, + {fpcNm_NPC_AUCTION_e, "d_a_npc_auction"}, + {fpcNm_NPC_KG1_e, "d_a_npc_kg1"}, + {fpcNm_NPC_KG2_e, "d_a_npc_kg2"}, + {fpcNm_NPC_TT_e, "d_a_npc_tt"}, + {fpcNm_NPC_HR_e, "d_a_npc_hr"}, + {fpcNm_NPC_HO_e, "d_a_npc_ho"}, + {fpcNm_NPC_MD_e, "d_a_npc_md"}, + {fpcNm_NPC_UK_e, "d_a_npc_uk"}, + {fpcNm_BIGELF_e, "d_a_bigelf"}, + {fpcNm_NPC_CO1_e, "d_a_npc_co1"}, + {fpcNm_NPC_ZK1_e, "d_a_npc_zk1"}, + {fpcNm_NPC_ROTEN_e, "d_a_npc_roten"}, + {fpcNm_NPC_PEOPLE_e, "d_a_npc_people"}, + {fpcNm_NPC_GK1_e, "d_a_npc_gk1"}, + {fpcNm_NPC_PHOTO_e, "d_a_npc_photo"}, + {fpcNm_NPC_AC1_e, "d_a_npc_ac1"}, + {fpcNm_NPC_HI1_e, "d_a_npc_hi1"}, + {fpcNm_NPC_SV_e, "d_a_npc_sv"}, + {fpcNm_NPC_MT_e, "d_a_npc_mt"}, + {fpcNm_NPC_MN_e, "d_a_npc_mn"}, + {fpcNm_NPC_AH_e, "d_a_npc_ah"}, + {fpcNm_AUCTION_e, "d_a_auction"}, + {fpcNm_KYTAG00_e, "d_a_kytag00"}, + {fpcNm_KYTAG01_e, "d_a_kytag01"}, + {fpcNm_KYTAG02_e, "d_a_kytag02"}, + {fpcNm_KYTAG03_e, "d_a_kytag03"}, + {fpcNm_KYTAG04_e, "d_a_kytag04"}, + {fpcNm_KYTAG05_e, "d_a_kytag05"}, + {fpcNm_KYTAG06_e, "d_a_kytag06"}, + {fpcNm_KYTAG07_e, "d_a_kytag07"}, + {fpcNm_WindTag_e, "d_a_wind_tag"}, + {fpcNm_YOUGAN_e, "d_a_yougan"}, + {fpcNm_Mmusic_e, "d_a_mmusic"}, + {fpcNm_Komore_e, "d_a_komore"}, + {fpcNm_Tpota_e, "d_a_tpota"}, + {fpcNm_Obj_Itnak_e, "d_a_obj_Itnak"}, + {fpcNm_Obj_Zouk_e, "d_a_obj_zouK"}, + {fpcNm_Ykgr_e, "d_a_ykgr"}, + {fpcNm_SAKU_e, "d_a_saku"}, + {fpcNm_Salvage_e, "d_a_salvage"}, + {fpcNm_SALVAGE_TBOX_e, "d_a_salvage_tbox"}, + {fpcNm_Kmon_e, "d_a_kmon"}, + {fpcNm_OBJ_FIGURE_e, "d_a_obj_figure"}, + {fpcNm_OBJ_HAT_e, "d_a_obj_hat"}, + {fpcNm_Lwood_e, "d_a_lwood"}, + {fpcNm_Dummy_e, "d_a_dummy"}, + {fpcNm_TAG_EVENT_e, "d_a_tag_event"}, + {fpcNm_TAG_HINT_e, "d_a_tag_hint"}, + {fpcNm_TAG_MSG_e, "d_a_tag_msg"}, + {fpcNm_TAG_ETC_e, "d_a_tag_etc"}, + {fpcNm_TAG_ISLAND_e, "d_a_tag_island"}, + {fpcNm_TAG_KF1_e, "d_a_tag_kf1"}, + {fpcNm_TAG_KK1_e, "d_a_tag_kk1"}, + {fpcNm_TAG_PHOTO_e, "d_a_tag_photo"}, + {fpcNm_TAG_KB_ITEM_e, "d_a_tag_kb_item"}, + {fpcNm_TAG_MK_e, "d_a_tag_mk"}, + {fpcNm_TAG_MDCB_e, "d_a_tag_md_cb"}, + {fpcNm_TAG_BA1_e, "d_a_tag_ba1"}, + {fpcNm_TagRock_e, "d_a_fallrock_tag"}, + {fpcNm_FallRock_e, "d_a_fallrock"}, + {fpcNm_SteamTag_e, "d_a_steam_tag"}, + {fpcNm_Fire_e, "d_a_fire"}, + {fpcNm_BRANCH_e, "d_a_branch"}, + {fpcNm_NPC_ZL1_e, "d_a_npc_zl1"}, + {fpcNm_WATERFALL_e, "d_a_waterfall"}, + {fpcNm_LIGHTBRIDGE_e, "d_a_lbridge"}, + {fpcNm_LIGHTSTAIR_e, "d_a_lstair"}, + {fpcNm_WALL_e, "d_a_wall"}, + {fpcNm_SW_PROPELLER_e, "d_a_swpropeller"}, + {fpcNm_IKARI_e, "d_a_ikari"}, + {fpcNm_AGBSW0_e, "d_a_agbsw0"}, + {fpcNm_MAGMA_e, "d_a_magma"}, + {fpcNm_GRASS_e, "d_a_grass"}, + {fpcNm_Obj_Tower_e, "d_a_obj_tower"}, + {fpcNm_Obj_DoguuD_e, "d_a_obj_doguu_demo"}, + {fpcNm_SPOTBOX_e, "d_a_spotbox"}, + {fpcNm_TORNADO_e, "d_a_tornado"}, + {fpcNm_TITLE_e, "d_a_title"}, + {fpcNm_MP_e, "d_a_movie_player"}, + {fpcNm_LODBG_e, "d_a_lod_bg"}, + {fpcNm_HIMO3_e, "d_a_himo3"}, + {fpcNm_ATT_e, "d_a_att"}, + {fpcNm_Hys_e, "d_a_hys"}, + {fpcNm_SWHIT0_e, "d_a_swhit0"}, + {fpcNm_TAG_GSHIP_e, "d_a_tag_ghostship"}, + {fpcNm_TSUBO_e, "d_a_tsubo"}, + {fpcNm_STONE_e, "d_a_stone"}, + {fpcNm_Stone2_e, "d_a_stone2"}, + {fpcNm_Obj_Barrel_e, "d_a_obj_barrel"}, + {fpcNm_Obj_Barrel2_e, "d_a_obj_barrel2"}, + {fpcNm_Obj_Try_e, "d_a_obj_try"}, + {fpcNm_Obj_Vtil_e, "d_a_obj_vtil"}, + {fpcNm_Obj_Ice_e, "d_a_obj_ice"}, + {fpcNm_Obj_Mshokki_e, "d_a_obj_mshokki"}, + {fpcNm_BOKO_e, "d_a_boko"}, + {fpcNm_TAMA_e, "d_a_tama"}, + {fpcNm_Obj_Buoyflag_e, "d_a_obj_buoyflag"}, + {fpcNm_Obj_Correct_e, "d_a_obj_correct"}, + {fpcNm_Obj_Eff_e, "d_a_obj_eff"}, + {fpcNm_Tag_Light_e, "d_a_tag_light"}, + {fpcNm_Tag_Attention_e, "d_a_tag_attention"}, + {fpcNm_Tag_Waterlevel_e, "d_a_tag_waterlevel"}, + {fpcNm_ARROW_ICEEFF_e, "d_a_arrow_iceeff"}, + {fpcNm_ARROW_LIGHTEFF_e, "d_a_arrow_lighteff"}, + {fpcNm_Obj_Timer_e, "d_a_obj_timer"}, {0xFFFF, NULL}, }; diff --git a/src/d/actor/d_a_acorn_leaf.cpp b/src/d/actor/d_a_acorn_leaf.cpp index b9cad9fbf..83c055252 100644 --- a/src/d/actor/d_a_acorn_leaf.cpp +++ b/src/d/actor/d_a_acorn_leaf.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_acorn_leaf.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" @@ -120,7 +118,7 @@ fpc_ProcID daAleaf_c::create_acorn_sub(bool arg1) { cXyz sp10; mDoMtx_stack_c::multVec(&acorn_offset, &sp10); - unk_424 = fopAcM_createChildFromOffset(PROC_TSUBO, fpcM_GetID(this), params, &sp10, fopAcM_GetRoomNo(this), NULL, NULL, -1, NULL); + unk_424 = fopAcM_createChildFromOffset(fpcNm_TSUBO_e, fpcM_GetID(this), params, &sp10, fopAcM_GetRoomNo(this), NULL, NULL, -1, NULL); unk_41B = false; unk_41C = false; @@ -264,18 +262,18 @@ static actor_method_class daAleafMethodTable = { }; actor_process_profile_definition g_profile_ACORN_LEAF = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_ACORN_LEAF, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_ACORN_LEAF_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daAleaf_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_ACORN_LEAF, + /* Draw Prio */ fpcDwPi_ACORN_LEAF_e, /* Actor SubMtd */ &daAleafMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_agb.cpp b/src/d/actor/d_a_agb.cpp index c4ecbc23c..5c99cc440 100644 --- a/src/d/actor/d_a_agb.cpp +++ b/src/d/actor/d_a_agb.cpp @@ -15,8 +15,6 @@ #include "d/d_com_inf_game.h" #include "d/d_item_data.h" #include "d/d_meter.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_kankyo_wether.h" #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_dvd_thread.h" @@ -742,7 +740,7 @@ void daAgb_c::resetCursor(bool param_0) { setFollowTarget(false); setTargetID(fpcM_ERROR_PROCESS_ID_e); - if (fopAcM_GetName(player_p) != PROC_NPC_KAM) { + if (fopAcM_GetName(player_p) != fpcNm_NPC_KAM_e) { current.pos = player_p->current.pos; home.pos = player_p->current.pos; } else { @@ -932,9 +930,9 @@ void daAgb_c::GbaItemUse() { fopAc_ac_c* actor_p = fopAcM_SearchByID(getTargetID()); if (cM_rndF(5.0f) < 4.0) { - field_0x640 = dItem_YELLOW_RUPEE_e; + field_0x640 = dItemNo_YELLOW_RUPEE_e; } else { - field_0x640 = dItem_RED_RUPEE_e; + field_0x640 = dItemNo_RED_RUPEE_e; } field_0x634 = actor_p->current.pos; @@ -942,7 +940,7 @@ void daAgb_c::GbaItemUse() { temp_r29 = 15; } - fopAcM_create(PROC_BOMB, daBomb_c::prm_make(daBomb_c::STATE_8, false, false), ¤t.pos); + fopAcM_create(fpcNm_BOMB_e, daBomb_c::prm_make(daBomb_c::STATE_8, false, false), ¤t.pos); field_0x65c = 120; } else { temp_r29 = 0xe; @@ -953,7 +951,7 @@ void daAgb_c::GbaItemUse() { break; case 0x15: resetCursor(false); - fopAcM_create(PROC_BOMB, daBomb_c::prm_make(daBomb_c::STATE_8, false, false), ¤t.pos); + fopAcM_create(fpcNm_BOMB_e, daBomb_c::prm_make(daBomb_c::STATE_8, false, false), ¤t.pos); field_0x65c = 120; break; case 0x11: @@ -1026,16 +1024,16 @@ void daAgb_c::GbaItemUse() { field_0x65c = 30; break; case 7: - if (dComIfGs_checkGetItem(dItem_BAIT_BAG_e)) { + if (dComIfGs_checkGetItem(dItemNo_BAIT_BAG_e)) { if (dComIfGs_checkBaitItemEmpty()) { temp_r29 |= 0x1000000; } - if (dComIfGs_checkGetItem(dItem_BOMB_BAG_e) && dComIfGs_getBombNum() < dComIfGs_getBombMax()) { + if (dComIfGs_checkGetItem(dItemNo_BOMB_BAG_e) && dComIfGs_getBombNum() < dComIfGs_getBombMax()) { temp_r29 |= 0x10000; } - if (dComIfGs_getItem(dInvSlot_BOW_e) != dItem_NONE_e && dComIfGs_getArrowNum() < dComIfGs_getArrowMax()) { + if (dComIfGs_getItem(dInvSlot_BOW_e) != dItemNo_NONE_e && dComIfGs_getArrowNum() < dComIfGs_getArrowMax()) { temp_r29 |= 0x100; } } @@ -1096,7 +1094,7 @@ void daAgb_c::Shopping() { } } else { if (dComIfGs_checkBaitItemEmpty()) { - dComIfGs_setBaitItem(dItem_BIRD_BAIT_5_e); + dComIfGs_setBaitItem(dItemNo_BIRD_BAIT_5_e); } else { itemBuy.U8.field_0x1 = 2; return; @@ -1219,7 +1217,7 @@ void daAgb_c::FlagsSend(u32 stage_type) { mFlags.field_0xb_0 = 0; } mFlags.field_0x5_2 = field_0x675; - mFlags.field_0x5_1 = dComIfGs_checkGetItem(COTTAGE_PAPER) != FALSE; + mFlags.field_0x5_1 = dComIfGs_checkGetItem(dItemNo_CABANA_DEED_e) != FALSE; mDoGac_SendDataSet((u32*)&mFlags, 0xC, 9, 0); } @@ -1399,7 +1397,7 @@ void daAgb_c::modeMove() { if (field_0x66b == 0xE) { if (field_0x65c == 120) { - fopAcM_create(PROC_BOMB, daBomb_c::prm_make(daBomb_c::STATE_8, false, false), ¤t.pos); + fopAcM_create(fpcNm_BOMB_e, daBomb_c::prm_make(daBomb_c::STATE_8, false, false), ¤t.pos); } else if (field_0x65c == 0) { resetCursor(false); } @@ -1473,7 +1471,7 @@ void daAgb_c::modeMove() { mDoGac_SendDataSet((u32*)&mItemBuy, 4, 0xD, mItemBuy.U32); } - if ((g_mDoCPd_cpadInfo[mDoGaC_getPortNo()].mGamepadErrorFlags == 0 && fopAcM_GetName(player) != PROC_NPC_KAM) && + if ((g_mDoCPd_cpadInfo[mDoGaC_getPortNo()].mGamepadErrorFlags == 0 && fopAcM_GetName(player) != fpcNm_NPC_KAM_e) && ((isActive() && !field_0x675 && CPad_CHECK_TRIG_R(mDoGaC_getPortNo())) || (mFlags.field_0x3_5 != 0 && (CPad_CHECK_TRIG_R(mDoGaC_getPortNo()) || CPad_CHECK_TRIG_A(mDoGaC_getPortNo()))))) { @@ -1487,7 +1485,7 @@ void daAgb_c::modeMove() { if (attList) { fopAc_ac_c* r3 = attList->getActor(); if (r3) { - if (fopAcM_CheckStatusMap(r3, 0) && !fopAcM_CheckStatus(r3, fopAcStts_BOSS_e) && fopAcM_GetName(r3) != PROC_FGANON) { + if (fopAcM_CheckStatusMap(r3, 0) && !fopAcM_CheckStatus(r3, fopAcStts_BOSS_e) && fopAcM_GetName(r3) != fpcNm_FGANON_e) { current.pos = r3->current.pos; home.pos = r3->current.pos; setTargetID(attList->getPid()); @@ -1508,7 +1506,7 @@ void daAgb_c::modeMove() { } if (getFollowTarget() == 0) { - if (fopAcM_GetName(player) == PROC_NPC_KAM) { + if (fopAcM_GetName(player) == fpcNm_NPC_KAM_e) { onFree(); } else { current.pos = player->current.pos; @@ -1624,9 +1622,9 @@ static BOOL daAgb_Execute(daAgb_c* i_this) { } else { daPy_lk_c* player_p2 = daPy_getPlayerLinkActorClass(); if ((dComIfGp_getPlayer(0) == player_p2 && !player->checkPlayerFly()) || - ((fopAcM_GetName(player) == PROC_NPC_MD && !daNpc_Md_c::isFlying()) || - (fopAcM_GetName(player) == PROC_NPC_CB1 && !daNpc_Cb1_c::isFlying()) || - fopAcM_GetName(player) == PROC_NPC_OS)) + ((fopAcM_GetName(player) == fpcNm_NPC_MD_e && !daNpc_Md_c::isFlying()) || + (fopAcM_GetName(player) == fpcNm_NPC_CB1_e && !daNpc_Cb1_c::isFlying()) || + fopAcM_GetName(player) == fpcNm_NPC_OS_e)) { f32 speedF = fabs(player->speedF); @@ -1824,18 +1822,18 @@ static actor_method_class l_daAgb_Method = { }; actor_process_profile_definition g_profile_AGB = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_AGB, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_AGB_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daAgb_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_AGB, + /* Draw Prio */ fpcDwPi_AGB_e, /* Actor SubMtd */ &l_daAgb_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_NOPAUSE_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_agbsw0.cpp b/src/d/actor/d_a_agbsw0.cpp index cad27fad6..ffa9d6525 100644 --- a/src/d/actor/d_a_agbsw0.cpp +++ b/src/d/actor/d_a_agbsw0.cpp @@ -5,12 +5,9 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "global.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/actor/d_a_agbsw0.h" #include "f_op/f_op_actor_mng.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" #include "d/d_item_data.h" #include "d/d_map.h" #include "d/d_kankyo_wether.h" @@ -93,7 +90,7 @@ BOOL daAgbsw0_c::draw() { } } else if(type == daAgbsw0Type_UNK_0xD_e) { - if(!dComIfGs_checkGetItem(dItem_SKULL_HAMMER_e) || dComIfGs_isEventBit(dSv_event_flag_c::UNK_2D01)) { + if(!dComIfGs_checkGetItem(dItemNo_SKULL_HAMMER_e) || dComIfGs_isEventBit(dSv_event_flag_c::UNK_2D01)) { return true; } } @@ -787,7 +784,7 @@ BOOL daAgbsw0_c::ExeSubM2() { return true; } else { - if(!dComIfGs_checkGetItem(dItem_SKULL_HAMMER_e)) { + if(!dComIfGs_checkGetItem(dItemNo_SKULL_HAMMER_e)) { return true; } else { @@ -893,8 +890,8 @@ u32 daAgbsw0_c::TriforceCheck(daAgb_c* agb) if(!dComIfGs_isGetCollectMap(1)) { return 0x309; } - if(!dComIfGs_isGetCollectMap(2) && dComIfGs_checkGetItem(dItem_SKULL_HAMMER_e)) { - if(dComIfGs_checkGetItem(COTTAGE_PAPER)) { + if(!dComIfGs_isGetCollectMap(2) && dComIfGs_checkGetItem(dItemNo_SKULL_HAMMER_e)) { + if(dComIfGs_checkGetItem(dItemNo_CABANA_DEED_e)) { #if VERSION <= VERSION_JPN s8 roomNo = dComIfGp_roomControl_getStayNo(); #else @@ -903,13 +900,13 @@ u32 daAgbsw0_c::TriforceCheck(daAgb_c* agb) return roomNo == dIsleRoom_PrivateOasis_e ? 0x30A : 0x30B; } else { - u8 num = dComIfGs_checkGetItemNum(dItem_JOY_PENDANT_e); + u8 num = dComIfGs_checkGetItemNum(dItemNo_JOY_PENDANT_e); return num >= 0x14 ? 0x30C : 0x30D; } } if(!dComIfGs_isGetCollectMap(3)) { - if(dComIfGs_checkGetItem(dItem_BAIT_BAG_e)) { - if(dComIfGs_checkBaitItem(dItem_HYOI_PEAR_e)) { + if(dComIfGs_checkGetItem(dItemNo_BAIT_BAG_e)) { + if(dComIfGs_checkBaitItem(dItemNo_HYOI_PEAR_e)) { #if VERSION <= VERSION_JPN s8 roomNo = dComIfGp_roomControl_getStayNo(); #else @@ -924,7 +921,7 @@ u32 daAgbsw0_c::TriforceCheck(daAgb_c* agb) return 0x30E; } - if(!dComIfGs_isGetCollectMap(4) && dComIfGs_checkGetItem(dItem_HOOKSHOT_e)) { + if(!dComIfGs_isGetCollectMap(4) && dComIfGs_checkGetItem(dItemNo_HOOKSHOT_e)) { if(dComIfGs_isOpenCollectMap(0x24)) { s32 hour = dKy_getdaytime_hour(); if(hour < 6 || hour >= 0x13) { @@ -1018,7 +1015,7 @@ u32 daAgbsw0_c::TriforceCheck(daAgb_c* agb) } } if(!dComIfGs_isCollect(2, 0)) { - if(dComIfGs_checkGetItem(dItem_MAGIC_ARROW_e)) { + if(dComIfGs_checkGetItem(dItemNo_MAGIC_ARROW_e)) { return 0x328; } else { @@ -1042,7 +1039,7 @@ u32 daAgbsw0_c::TriforceCheck(daAgb_c* agb) #endif return roomNo == dIsleRoom_StoneWatcherIsland_e ? 0x327 : 0x326; } - if(dComIfGs_checkGetItem(dItem_HOOKSHOT_e)) { + if(dComIfGs_checkGetItem(dItemNo_HOOKSHOT_e)) { #if VERSION <= VERSION_JPN s8 roomNo = dComIfGp_roomControl_getStayNo(); #else @@ -1152,7 +1149,7 @@ BOOL daAgbsw0_c::ExeSubT() { else { if(mDoGaC_GbaLink()) { if(mDoGac_SendStatusCheck(0xF)) { - if(mCyl.ChkTgHit() && mCyl.GetTgHitAc() && fopAcM_GetName(mCyl.GetTgHitAc()) == PROC_BOMB && ((daBomb_c*)mCyl.GetTgHitAc())->chk_state(daBomb_c::STATE_8)) { + if(mCyl.ChkTgHit() && mCyl.GetTgHitAc() && fopAcM_GetName(mCyl.GetTgHitAc()) == fpcNm_BOMB_e && ((daBomb_c*)mCyl.GetTgHitAc())->chk_state(daBomb_c::STATE_8)) { mSE = BigLittleChange(0x12); mDoGac_SendDataSet(&mSE, 4, 0xF, 0); fopAcM_onSwitch(this, sw0); @@ -1248,11 +1245,11 @@ BOOL daAgbsw0_c::ExeSubR() { if(mDoGaC_GbaLink() && mDoGac_SendStatusCheck(5)) { if(sw0 != 0xFF && fopAcM_isSwitch(this, sw0)) { s32 itemNo = getParamNo(); - if(itemNo < 0 || dItem_TRIPLE_HEART_e < itemNo) { + if(itemNo < 0 || dItemNo_TRIPLE_HEART_e < itemNo) { itemNo = 0; } - if(itemNo != dItem_RECOVER_FAIRY_e) { + if(itemNo != dItemNo_RECOVER_FAIRY_e) { current.pos.y += scale.y / 2.0f; } @@ -1517,10 +1514,10 @@ BOOL daAgbsw0_c::ExeSubD() { } else if(field_0x299 == 2 && fopAcM_isSwitch(this, getSw1())) { s32 itemNo = getParamNo(); - if(itemNo != dItem_RECOVER_FAIRY_e) { + if(itemNo != dItemNo_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) { + if(0 <= itemNo && itemNo < 0x1F && itemNo != dItemNo_HEART_PIECE_e && itemNo != dItemNo_HEART_CONTAINER_e && itemNo != dItemNo_SMALL_KEY_e) { s8 roomNo = fopAcM_GetHomeRoomNo(this); f32 rnd = cM_rndF(10.0f) + 40.0f; fopAcM_fastCreateItem(¤t.pos, itemNo, roomNo, NULL, NULL, 0.0f, rnd, -7.0f); @@ -1785,9 +1782,9 @@ BOOL daAgbsw0_c::MoveCheck(s16 conditionNo) { break; case 0x11: if( - dComIfGp_getSelectItem(dItemBtn_X_e) != dItem_BOW_e && - dComIfGp_getSelectItem(dItemBtn_Y_e) != dItem_BOW_e && - dComIfGp_getSelectItem(dItemBtn_Z_e) != dItem_BOW_e + dComIfGp_getSelectItem(dItemBtn_X_e) != dItemNo_BOW_e && + dComIfGp_getSelectItem(dItemBtn_Y_e) != dItemNo_BOW_e && + dComIfGp_getSelectItem(dItemBtn_Z_e) != dItemNo_BOW_e ) { return FALSE; } @@ -1795,9 +1792,9 @@ BOOL daAgbsw0_c::MoveCheck(s16 conditionNo) { break; case 0x12: if( - dComIfGp_getSelectItem(dItemBtn_X_e) != dItem_BOOMERANG_e && - dComIfGp_getSelectItem(dItemBtn_Y_e) != dItem_BOOMERANG_e && - dComIfGp_getSelectItem(dItemBtn_Z_e) != dItem_BOOMERANG_e + dComIfGp_getSelectItem(dItemBtn_X_e) != dItemNo_BOOMERANG_e && + dComIfGp_getSelectItem(dItemBtn_Y_e) != dItemNo_BOOMERANG_e && + dComIfGp_getSelectItem(dItemBtn_Z_e) != dItemNo_BOOMERANG_e ) { return FALSE; } @@ -1805,9 +1802,9 @@ BOOL daAgbsw0_c::MoveCheck(s16 conditionNo) { break; case 0x13: if( - dComIfGp_getSelectItem(dItemBtn_X_e) != dItem_DEKU_LEAF_e && - dComIfGp_getSelectItem(dItemBtn_Y_e) != dItem_DEKU_LEAF_e && - dComIfGp_getSelectItem(dItemBtn_Z_e) != dItem_DEKU_LEAF_e + dComIfGp_getSelectItem(dItemBtn_X_e) != dItemNo_DEKU_LEAF_e && + dComIfGp_getSelectItem(dItemBtn_Y_e) != dItemNo_DEKU_LEAF_e && + dComIfGp_getSelectItem(dItemBtn_Z_e) != dItemNo_DEKU_LEAF_e ) { return FALSE; } @@ -1815,9 +1812,9 @@ BOOL daAgbsw0_c::MoveCheck(s16 conditionNo) { break; case 0x14: if( - dComIfGp_getSelectItem(dItemBtn_X_e) != dItem_GRAPPLING_HOOK_e && - dComIfGp_getSelectItem(dItemBtn_Y_e) != dItem_GRAPPLING_HOOK_e && - dComIfGp_getSelectItem(dItemBtn_Z_e) != dItem_GRAPPLING_HOOK_e + dComIfGp_getSelectItem(dItemBtn_X_e) != dItemNo_GRAPPLING_HOOK_e && + dComIfGp_getSelectItem(dItemBtn_Y_e) != dItemNo_GRAPPLING_HOOK_e && + dComIfGp_getSelectItem(dItemBtn_Z_e) != dItemNo_GRAPPLING_HOOK_e ) { return FALSE; } @@ -1825,9 +1822,9 @@ BOOL daAgbsw0_c::MoveCheck(s16 conditionNo) { break; case 0x15: if( - dComIfGp_getSelectItem(dItemBtn_X_e) != dItem_BOMB_BAG_e && - dComIfGp_getSelectItem(dItemBtn_Y_e) != dItem_BOMB_BAG_e && - dComIfGp_getSelectItem(dItemBtn_Z_e) != dItem_BOMB_BAG_e + dComIfGp_getSelectItem(dItemBtn_X_e) != dItemNo_BOMB_BAG_e && + dComIfGp_getSelectItem(dItemBtn_Y_e) != dItemNo_BOMB_BAG_e && + dComIfGp_getSelectItem(dItemBtn_Z_e) != dItemNo_BOMB_BAG_e ) { return FALSE; } @@ -1835,16 +1832,16 @@ BOOL daAgbsw0_c::MoveCheck(s16 conditionNo) { break; case 0x16: if( - dComIfGp_getSelectItem(dItemBtn_X_e) != dItem_HOOKSHOT_e && - dComIfGp_getSelectItem(dItemBtn_Y_e) != dItem_HOOKSHOT_e && - dComIfGp_getSelectItem(dItemBtn_Z_e) != dItem_HOOKSHOT_e + dComIfGp_getSelectItem(dItemBtn_X_e) != dItemNo_HOOKSHOT_e && + dComIfGp_getSelectItem(dItemBtn_Y_e) != dItemNo_HOOKSHOT_e && + dComIfGp_getSelectItem(dItemBtn_Z_e) != dItemNo_HOOKSHOT_e ) { return FALSE; } break; case 0x17: - if(dComIfGs_checkGetItem(dItem_MAGIC_ARMOR_e)) { + if(dComIfGs_checkGetItem(dItemNo_MAGIC_ARMOR_e)) { return FALSE; } @@ -1862,13 +1859,13 @@ BOOL daAgbsw0_c::MoveCheck(s16 conditionNo) { break; case 0x1A: - if(dComIfGs_getItem(dInvSlot_BOW_e) != dItem_NONE_e && dComIfGs_getArrowNum() < dComIfGs_getArrowMax()) { + if(dComIfGs_getItem(dInvSlot_BOW_e) != dItemNo_NONE_e && dComIfGs_getArrowNum() < dComIfGs_getArrowMax()) { return FALSE; } break; case 0x1B: - if(dComIfGs_checkGetItem(dItem_BOMB_BAG_e) && dComIfGs_getBombNum() < dComIfGs_getBombMax()) { + if(dComIfGs_checkGetItem(dItemNo_BOMB_BAG_e) && dComIfGs_getBombNum() < dComIfGs_getBombMax()) { return FALSE; } @@ -1887,25 +1884,25 @@ BOOL daAgbsw0_c::MoveCheck(s16 conditionNo) { break; case 0x1E: - if(dComIfGs_getItem(dInvSlot_BOW_e) != dItem_NONE_e && dComIfGs_getArrowNum() == 0) { + if(dComIfGs_getItem(dInvSlot_BOW_e) != dItemNo_NONE_e && dComIfGs_getArrowNum() == 0) { return FALSE; } break; case 0x1F: - if(dComIfGs_checkGetItem(dItem_BOMB_BAG_e) && dComIfGs_getBombNum() == 0) { + if(dComIfGs_checkGetItem(dItemNo_BOMB_BAG_e) && dComIfGs_getBombNum() == 0) { return FALSE; } break; case 0x20: - if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_1708) && dComIfGs_getItem(dInvSlot_BOW_e) != dItem_NONE_e && dComIfGs_getArrowNum() == 0) { + if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_1708) && dComIfGs_getItem(dInvSlot_BOW_e) != dItemNo_NONE_e && dComIfGs_getArrowNum() == 0) { return FALSE; } break; case 0x21: - if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_1708) && dComIfGs_checkGetItem(dItem_BOMB_BAG_e) && dComIfGs_getBombNum() == 0) { + if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_1708) && dComIfGs_checkGetItem(dItemNo_BOMB_BAG_e) && dComIfGs_getBombNum() == 0) { return FALSE; } @@ -1930,9 +1927,9 @@ BOOL daAgbsw0_c::MoveCheck(s16 conditionNo) { break; case 0x25: if (dComIfGp_checkPlayerStatus0(0, daPyStts0_SHIP_RIDE_e) && - dComIfGp_getSelectItem(dItemBtn_X_e) != dItem_BOMB_BAG_e && - dComIfGp_getSelectItem(dItemBtn_Y_e) != dItem_BOMB_BAG_e && - dComIfGp_getSelectItem(dItemBtn_Z_e) != dItem_BOMB_BAG_e) + dComIfGp_getSelectItem(dItemBtn_X_e) != dItemNo_BOMB_BAG_e && + dComIfGp_getSelectItem(dItemBtn_Y_e) != dItemNo_BOMB_BAG_e && + dComIfGp_getSelectItem(dItemBtn_Z_e) != dItemNo_BOMB_BAG_e) { return FALSE; } @@ -1940,9 +1937,9 @@ BOOL daAgbsw0_c::MoveCheck(s16 conditionNo) { break; case 0x26: if (dComIfGp_checkPlayerStatus0(0, daPyStts0_SHIP_RIDE_e) && - dComIfGp_getSelectItem(dItemBtn_X_e) != dItem_GRAPPLING_HOOK_e && - dComIfGp_getSelectItem(dItemBtn_Y_e) != dItem_GRAPPLING_HOOK_e && - dComIfGp_getSelectItem(dItemBtn_Z_e) != dItem_GRAPPLING_HOOK_e) + dComIfGp_getSelectItem(dItemBtn_X_e) != dItemNo_GRAPPLING_HOOK_e && + dComIfGp_getSelectItem(dItemBtn_Y_e) != dItemNo_GRAPPLING_HOOK_e && + dComIfGp_getSelectItem(dItemBtn_Z_e) != dItemNo_GRAPPLING_HOOK_e) { return FALSE; } @@ -1961,25 +1958,25 @@ BOOL daAgbsw0_c::MoveCheck(s16 conditionNo) { break; case 0x29: - if(dComIfGs_checkGetItem(dItem_GRAPPLING_HOOK_e)) { + if(dComIfGs_checkGetItem(dItemNo_GRAPPLING_HOOK_e)) { return FALSE; } break; case 0x2A: - if(dComIfGs_checkGetItem(dItem_BOOMERANG_e)) { + if(dComIfGs_checkGetItem(dItemNo_BOOMERANG_e)) { return FALSE; } break; case 0x2B: - if(dComIfGs_checkGetItem(dItem_BOMB_BAG_e)) { + if(dComIfGs_checkGetItem(dItemNo_BOMB_BAG_e)) { return FALSE; } break; case 0x2C: - if(dComIfGs_getItem(dInvSlot_BOW_e) != dItem_NONE_e) { + if(dComIfGs_getItem(dInvSlot_BOW_e) != dItemNo_NONE_e) { return FALSE; } @@ -2127,73 +2124,73 @@ BOOL daAgbsw0_c::MoveCheck(s16 conditionNo) { return FALSE; case 0x44: - if(fopAcM_GetName(dComIfGp_getPlayer(0)) == PROC_NPC_OS) { + if(fopAcM_GetName(dComIfGp_getPlayer(0)) == fpcNm_NPC_OS_e) { return FALSE; } break; case 0x45: - if(fopAcM_GetName(dComIfGp_getPlayer(0)) != PROC_NPC_OS) { + if(fopAcM_GetName(dComIfGp_getPlayer(0)) != fpcNm_NPC_OS_e) { return FALSE; } break; case 0x46: - if(fopAcM_GetName(dComIfGp_getPlayer(0)) == PROC_NPC_MD) { + if(fopAcM_GetName(dComIfGp_getPlayer(0)) == fpcNm_NPC_MD_e) { return FALSE; } break; case 0x47: - if(fopAcM_GetName(dComIfGp_getPlayer(0)) != PROC_NPC_MD) { + if(fopAcM_GetName(dComIfGp_getPlayer(0)) != fpcNm_NPC_MD_e) { return FALSE; } break; case 0x48: - if(fopAcM_GetName(dComIfGp_getPlayer(0)) == PROC_NPC_CB1) { + if(fopAcM_GetName(dComIfGp_getPlayer(0)) == fpcNm_NPC_CB1_e) { return FALSE; } break; case 0x49: - if(fopAcM_GetName(dComIfGp_getPlayer(0)) != PROC_NPC_CB1) { + if(fopAcM_GetName(dComIfGp_getPlayer(0)) != fpcNm_NPC_CB1_e) { return FALSE; } break; case 0x4A: - if(fopAcM_GetName(dComIfGp_getPlayer(0)) == PROC_NPC_KAM) { + if(fopAcM_GetName(dComIfGp_getPlayer(0)) == fpcNm_NPC_KAM_e) { return FALSE; } break; case 0x4B: - if(fopAcM_GetName(dComIfGp_getPlayer(0)) != PROC_NPC_KAM) { + if(fopAcM_GetName(dComIfGp_getPlayer(0)) != fpcNm_NPC_KAM_e) { return FALSE; } break; case 0x4C: - if(dComIfGs_checkGetItem(dItem_SKULL_HAMMER_e)) { + if(dComIfGs_checkGetItem(dItemNo_SKULL_HAMMER_e)) { return FALSE; } break; case 0x4D: - if(!dComIfGs_checkGetItem(dItem_SKULL_HAMMER_e)) { + if(!dComIfGs_checkGetItem(dItemNo_SKULL_HAMMER_e)) { return FALSE; } break; case 0x4E: - if(dComIfGs_checkGetItem(dItem_MIRROR_SHIELD_e)) { + if(dComIfGs_checkGetItem(dItemNo_MIRROR_SHIELD_e)) { return FALSE; } break; case 0x4F: - if(!dComIfGs_checkGetItem(dItem_MIRROR_SHIELD_e)) { + if(!dComIfGs_checkGetItem(dItemNo_MIRROR_SHIELD_e)) { return FALSE; } @@ -2211,13 +2208,13 @@ BOOL daAgbsw0_c::MoveCheck(s16 conditionNo) { break; case 0x52: - if(dComIfGs_checkGetItem(dItem_HOOKSHOT_e)) { + if(dComIfGs_checkGetItem(dItemNo_HOOKSHOT_e)) { return FALSE; } break; case 0x53: - if(!dComIfGs_checkGetItem(dItem_HOOKSHOT_e)) { + if(!dComIfGs_checkGetItem(dItemNo_HOOKSHOT_e)) { return FALSE; } @@ -2247,31 +2244,31 @@ BOOL daAgbsw0_c::MoveCheck(s16 conditionNo) { break; case 0x58: - if(!dComIfGs_checkGetItem(dItem_IRON_BOOTS_e)) { + if(!dComIfGs_checkGetItem(dItemNo_IRON_BOOTS_e)) { return FALSE; } break; case 0x59: - if(dComIfGs_checkGetItem(dItem_MASTER_SWORD_2_e) || dComIfGs_checkGetItem(dItem_MASTER_SWORD_3_e)) { + if(dComIfGs_checkGetItem(dItemNo_MASTER_SWORD_2_e) || dComIfGs_checkGetItem(dItemNo_MASTER_SWORD_3_e)) { return FALSE; } break; case 0x5A: - if(!dComIfGs_checkGetItem(dItem_MASTER_SWORD_2_e) && !dComIfGs_checkGetItem(dItem_MASTER_SWORD_3_e)) { + if(!dComIfGs_checkGetItem(dItemNo_MASTER_SWORD_2_e) && !dComIfGs_checkGetItem(dItemNo_MASTER_SWORD_3_e)) { return FALSE; } break; case 0x5B: - if(dComIfGs_checkGetItem(dItem_MASTER_SWORD_3_e)) { + if(dComIfGs_checkGetItem(dItemNo_MASTER_SWORD_3_e)) { return FALSE; } break; case 0x5C: - if(!dComIfGs_checkGetItem(dItem_MASTER_SWORD_3_e)) { + if(!dComIfGs_checkGetItem(dItemNo_MASTER_SWORD_3_e)) { return FALSE; } @@ -2465,27 +2462,27 @@ BOOL daAgbsw0_c::MoveCheck(s16 conditionNo) { break; case 0x7B: - if(fopAcM_GetName(dComIfGp_getPlayer(0)) == PROC_NPC_MD && daNpc_Md_c::isFlying()) { + if(fopAcM_GetName(dComIfGp_getPlayer(0)) == fpcNm_NPC_MD_e && daNpc_Md_c::isFlying()) { return FALSE; } break; case 0x7C: - if(fopAcM_GetName(dComIfGp_getPlayer(0)) != PROC_NPC_MD || !daNpc_Md_c::isFlying()) { + if(fopAcM_GetName(dComIfGp_getPlayer(0)) != fpcNm_NPC_MD_e || !daNpc_Md_c::isFlying()) { return FALSE; } break; case 0x7F: // Potential bug: This seems to check if the current player is Medli, but that Makar is flying? - if(fopAcM_GetName(dComIfGp_getPlayer(0)) == PROC_NPC_MD && daNpc_Cb1_c::isFlying()) { + if(fopAcM_GetName(dComIfGp_getPlayer(0)) == fpcNm_NPC_MD_e && daNpc_Cb1_c::isFlying()) { return FALSE; } break; case 0x80: // Potential bug: This seems to check if the current player is Medli, but that Makar is flying? - if(fopAcM_GetName(dComIfGp_getPlayer(0)) != PROC_NPC_MD || !daNpc_Cb1_c::isFlying()) { + if(fopAcM_GetName(dComIfGp_getPlayer(0)) != fpcNm_NPC_MD_e || !daNpc_Cb1_c::isFlying()) { return FALSE; } @@ -2497,7 +2494,7 @@ BOOL daAgbsw0_c::MoveCheck(s16 conditionNo) { break; case 0x7E: - if(dComIfGs_checkGetItem(dItem_SKULL_HAMMER_e) && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_2D01)) { + if(dComIfGs_checkGetItem(dItemNo_SKULL_HAMMER_e) && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_2D01)) { return FALSE; } @@ -2586,18 +2583,18 @@ static actor_method_class l_daAgbsw0_Method = { }; actor_process_profile_definition g_profile_AGBSW0 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_AGBSW0, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_AGBSW0_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daAgbsw0_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_AGBSW0, + /* Draw Prio */ fpcDwPi_AGBSW0_e, /* Actor SubMtd */ &l_daAgbsw0_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_alldie.cpp b/src/d/actor/d_a_alldie.cpp index 8a07e2f31..f96bd4865 100644 --- a/src/d/actor/d_a_alldie.cpp +++ b/src/d/actor/d_a_alldie.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_alldie.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "f_op/f_op_actor_mng.h" enum { @@ -119,18 +117,18 @@ static actor_method_class l_daAlldie_Method = { }; actor_process_profile_definition g_profile_ALLDIE = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0002, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_ALLDIE, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0002, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_ALLDIE_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daAlldie_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_ALLDIE, + /* Draw Prio */ fpcDwPi_ALLDIE_e, /* Actor SubMtd */ &l_daAlldie_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_6_e, + /* Cull Type */ fopAc_CULLBOX_6_e, }; diff --git a/src/d/actor/d_a_am.cpp b/src/d/actor/d_a_am.cpp index b56181448..6c9759942 100644 --- a/src/d/actor/d_a_am.cpp +++ b/src/d/actor/d_a_am.cpp @@ -9,8 +9,6 @@ #include "f_op/f_op_actor_mng.h" #include "JSystem/J3DGraphAnimator/J3DNode.h" #include "SSystem/SComponent/c_xyz.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" #include "d/d_bg_s_acch.h" #include "d/d_bg_s_lin_chk.h" @@ -348,7 +346,7 @@ static void bomb_move_set(am_class* i_this, u8 alwaysMoveY) { swallowedActor->current.angle.y = actor->shape_angle.y; swallowedActor->shape_angle.y = actor->shape_angle.y; - if (fpcM_GetName(swallowedActor) == PROC_BOMB) { + if (fpcM_GetName(swallowedActor) == fpcNm_BOMB_e) { daBomb_c* bomb = (daBomb_c*)swallowedActor; if (i_this->mCountDownTimers[1] == 1) { bomb->scale.setall(0.0f); @@ -357,7 +355,7 @@ static void bomb_move_set(am_class* i_this, u8 alwaysMoveY) { bomb->scale.setall(1.0f); } bomb->setBombRestTime(100); - } else if (fpcM_GetName(swallowedActor) == PROC_Bomb2) { + } else if (fpcM_GetName(swallowedActor) == fpcNm_Bomb2_e) { daBomb2::Act_c* bomb2 = (daBomb2::Act_c*)swallowedActor; if (i_this->mCountDownTimers[1] == 1) { bomb2->scale.setall(0.0f); @@ -392,7 +390,7 @@ static BOOL bomb_nomi_check(am_class* i_this) { if (hitObj) { fopAc_ac_c* hitActor = hitObj->GetAc(); if (hitActor) { - if (fpcM_GetName(hitActor) == PROC_BOMB) { + if (fpcM_GetName(hitActor) == fpcNm_BOMB_e) { daBomb_c* bomb = (daBomb_c*)hitActor; if (!bomb->getBombCheck_Flag() && bomb->getBombRestTime() > 1) { if (i_this->mMouthPos.y - (20.0f + REG8_F(1)) < bomb->current.pos.y) { @@ -407,7 +405,7 @@ static BOOL bomb_nomi_check(am_class* i_this) { return TRUE; } } - } else if (fpcM_GetName(hitActor) == PROC_Bomb2) { + } else if (fpcM_GetName(hitActor) == fpcNm_Bomb2_e) { daBomb2::Act_c* bomb2 = (daBomb2::Act_c*)hitActor; if (!bomb2->chk_eat() && bomb2->get_time() > 1) { if (i_this->mMouthPos.y - (20.0f + REG8_F(1)) < bomb2->current.pos.y) { @@ -938,10 +936,10 @@ static void action_itai_move(am_class* i_this) { fopAc_ac_c* swallowedActor = fopAcM_SearchByID(i_this->mSwallowedActorPID); if (swallowedActor) { swallowedActor->scale.setall(1.0f); - if (fpcM_GetName(swallowedActor) == PROC_BOMB) { + if (fpcM_GetName(swallowedActor) == fpcNm_BOMB_e) { daBomb_c* bomb = (daBomb_c*)swallowedActor; bomb->setBombRestTime(1); - } else if (fpcM_GetName(swallowedActor) == PROC_Bomb2) { + } else if (fpcM_GetName(swallowedActor) == fpcNm_Bomb2_e) { daBomb2::Act_c* bomb2 = (daBomb2::Act_c*)swallowedActor; bomb2->set_time(1); } @@ -973,7 +971,7 @@ static void action_itai_move(am_class* i_this) { static BOOL daAM_Execute(am_class* i_this) { fopAc_ac_c* actor = &i_this->actor; - fopAcM_setGbaName(actor, dItem_BOW_e, 0xC, 0x2A); + fopAcM_setGbaName(actor, dItemNo_BOW_e, 0xC, 0x2A); if (enemy_ice(&i_this->mEnemyIce)) { J3DModel* model = i_this->mpMorf->getModel(); @@ -1382,18 +1380,18 @@ static actor_method_class l_daAM_Method = { }; actor_process_profile_definition g_profile_AM = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_AM, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_AM_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(am_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_AM, + /* Draw Prio */ fpcDwPi_AM_e, /* Actor SubMtd */ &l_daAM_Method, /* Status */ fopAcStts_SHOWMAP_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ENEMY_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_am2.cpp b/src/d/actor/d_a_am2.cpp index 9faf0749d..7317013a0 100644 --- a/src/d/actor/d_a_am2.cpp +++ b/src/d/actor/d_a_am2.cpp @@ -7,8 +7,6 @@ #include "d/actor/d_a_am2.h" #include "d/res/res_am2.h" #include "f_op/f_op_actor_mng.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_bg_s_lin_chk.h" #include "d/d_s_play.h" #include "d/d_com_inf_game.h" @@ -1101,7 +1099,7 @@ static BOOL daAM2_Execute(am2_class* i_this) { } } - fopAcM_setGbaName(actor, dItem_BOW_e, 0xB, 0x29); + fopAcM_setGbaName(actor, dItemNo_BOW_e, 0xB, 0x29); if (enemy_ice(&i_this->mEnemyIce)) { i_this->mpMorf->getModel()->setBaseTRMtx(mDoMtx_stack_c::get()); @@ -1496,18 +1494,18 @@ static actor_method_class l_daAM2_Method = { }; actor_process_profile_definition g_profile_AM2 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_AM2, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_AM2_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(am2_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_AM2, + /* Draw Prio */ fpcDwPi_AM2_e, /* Actor SubMtd */ &l_daAM2_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_FREEZE_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ENEMY_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_amiprop.cpp b/src/d/actor/d_a_amiprop.cpp index c5b6e1874..94522cf0f 100644 --- a/src/d/actor/d_a_amiprop.cpp +++ b/src/d/actor/d_a_amiprop.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_amiprop.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" #include "d/d_com_inf_game.h" #include "d/d_bg_s_movebg_actor.h" @@ -230,18 +228,18 @@ static actor_method_class daAmiPropMethodTable = { }; actor_process_profile_definition g_profile_AMI_PROP = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_AMI_PROP, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_AMI_PROP_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daAmiProp_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_AMI_PROP, + /* Draw Prio */ fpcDwPi_AMI_PROP_e, /* Actor SubMtd */ &daAmiPropMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_andsw0.cpp b/src/d/actor/d_a_andsw0.cpp index 4472fcd12..8adada0ef 100644 --- a/src/d/actor/d_a_andsw0.cpp +++ b/src/d/actor/d_a_andsw0.cpp @@ -7,8 +7,6 @@ #include "d/actor/d_a_andsw0.h" #include "f_op/f_op_actor_mng.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/actor/d_a_bk.h" #include "d/actor/d_a_bb.h" @@ -145,7 +143,7 @@ static s32 check_count; /* 000003C4-0000044C .text bk_s_sub1__FPvPv */ static void* bk_s_sub1(void* i_this, void*) { - if(fopAcM_IsActor(i_this) && fopAcM_GetName(i_this) == PROC_BK && (fopAcM_GetParam(i_this) & 0xF) == 7) { + if(fopAcM_IsActor(i_this) && fopAcM_GetName(i_this) == fpcNm_BK_e && (fopAcM_GetParam(i_this) & 0xF) == 7) { s32 count = check_count; //regswaps without this if(count < 2) { ac[check_count] = i_this; @@ -160,7 +158,7 @@ static void* bk_s_sub1(void* i_this, void*) { /* 0000044C-000004D4 .text bk_s_sub2__FPvPv */ static void* bk_s_sub2(void* i_this, void*) { - if(fopAcM_IsActor(i_this) && fopAcM_GetName(i_this) == PROC_BK && (fopAcM_GetParam(i_this) & 0xF) == 4) { + if(fopAcM_IsActor(i_this) && fopAcM_GetName(i_this) == fpcNm_BK_e && (fopAcM_GetParam(i_this) & 0xF) == 4) { s32 count = check_count; //regswaps without this if(count == 2) { ac[check_count] = i_this; @@ -175,7 +173,7 @@ static void* bk_s_sub2(void* i_this, void*) { /* 000004D4-0000055C .text bk_s_sub3__FPvPv */ static void* bk_s_sub3(void* i_this, void*) { - if(fopAcM_IsActor(i_this) && fopAcM_GetName(i_this) == PROC_BK && (fopAcM_GetParam(i_this) & 0xF) == 5) { + if(fopAcM_IsActor(i_this) && fopAcM_GetName(i_this) == fpcNm_BK_e && (fopAcM_GetParam(i_this) & 0xF) == 5) { s32 count = check_count; //regswaps without this if(count < 5) { ac[check_count] = i_this; @@ -190,7 +188,7 @@ static void* bk_s_sub3(void* i_this, void*) { /* 0000055C-000005D4 .text bb_s_sub__FPvPv */ static void* bb_s_sub(void* search, void*) { - if(fopAcM_IsActor(search) && fopAcM_GetName(search) == PROC_BB) { + if(fopAcM_IsActor(search) && fopAcM_GetName(search) == fpcNm_BB_e) { s32 count = check_count; //regswaps without this if(count < 7) { ac[check_count] = search; @@ -349,18 +347,18 @@ static actor_method_class l_daAndsw0_Method = { }; actor_process_profile_definition g_profile_ANDSW0 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_ANDSW0, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_ANDSW0_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(andsw0_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_ANDSW0, + /* Draw Prio */ fpcDwPi_ANDSW0_e, /* Actor SubMtd */ &l_daAndsw0_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_andsw2.cpp b/src/d/actor/d_a_andsw2.cpp index cd2defd01..cd77240ea 100644 --- a/src/d/actor/d_a_andsw2.cpp +++ b/src/d/actor/d_a_andsw2.cpp @@ -7,8 +7,6 @@ #include "d/actor/d_a_andsw2.h" #include "f_op/f_op_actor_mng.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" enum Action { ACT_ON_ALL, @@ -256,18 +254,18 @@ static actor_method_class l_daAndsw2_Method = { }; actor_process_profile_definition g_profile_ANDSW2 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_ANDSW2, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_ANDSW2_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daAndsw2_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_ANDSW2, + /* Draw Prio */ fpcDwPi_ANDSW2_e, /* Actor SubMtd */ &l_daAndsw2_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_6_e, + /* Cull Type */ fopAc_CULLBOX_6_e, }; diff --git a/src/d/actor/d_a_arrow.cpp b/src/d/actor/d_a_arrow.cpp index d069afe3f..e21ea3d73 100644 --- a/src/d/actor/d_a_arrow.cpp +++ b/src/d/actor/d_a_arrow.cpp @@ -7,8 +7,6 @@ #include "d/actor/d_a_arrow.h" #include "m_Do/m_Do_mtx.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_item_data.h" #include "d/actor/d_a_player.h" #include "d/actor/d_a_player_main.h" @@ -142,7 +140,7 @@ void daArrow_c::checkCreater() { // Check if this arrow was fired by Princess Zelda (during the Ganondorf fight). fopAc_ac_c* archer; if (fopAcM_SearchByID(fopAcM_GetLinkId(this), &archer)) { - if (fpcM_GetName(archer) == PROC_PZ) { + if (fpcM_GetName(archer) == fpcNm_PZ_e) { mbSetByZelda = true; } } @@ -156,7 +154,7 @@ void daArrow_c::setLightEffect() { } if (!mbHasLightEff) { mLightEffPID = fopAcM_createChild( - PROC_ARROW_LIGHTEFF, fopAcM_GetID(this), + fpcNm_ARROW_LIGHTEFF_e, fopAcM_GetID(this), mArrowType, &field_0x6a8, current.roomNo, &shape_angle ); @@ -326,7 +324,7 @@ void daArrow_c::ShieldReflect() { s16 targetAngleX = link->getBodyAngleX(); fopAc_ac_c* ganondorf; - if (fopAcM_SearchByName(PROC_GND, &ganondorf)) { + if (fopAcM_SearchByName(fpcNm_GND_e, &ganondorf)) { dAttention_c& attention = dComIfGp_getAttention(); if (attention.LockonTruth() && attention.LockonTarget(0) == ganondorf) { cXyz ganondorfChestPos = ganondorf->current.pos; @@ -393,7 +391,7 @@ bool daArrow_c::check_water_in() { } else if (mArrowType == TYPE_ICE) { mInWaterTimer = 10*30; fopAcM_createChild( - PROC_ARROW_ICEEFF, fopAcM_GetID(this), mArrowType, + fpcNm_ARROW_ICEEFF_e, fopAcM_GetID(this), mArrowType, &waterHitPos, current.roomNo, ¤t.angle ); #if VERSION > VERSION_DEMO @@ -438,19 +436,19 @@ daArrow_c* daArrow_c::changeArrowType() { daArrow_c* ret = this; if (mArrowType == TYPE_NORMAL) { - if (dComIfGs_getMagic() < 1 || !(dComIfGs_getItem(dInvSlot_BOW_e) == dItem_MAGIC_ARROW_e || dComIfGs_getItem(dInvSlot_BOW_e) == dItem_LIGHT_ARROW_e)) { + if (dComIfGs_getMagic() < 1 || !(dComIfGs_getItem(dInvSlot_BOW_e) == dItemNo_MAGIC_ARROW_e || dComIfGs_getItem(dInvSlot_BOW_e) == dItemNo_LIGHT_ARROW_e)) { mArrowType = TYPE_NORMAL; } else { mArrowType = TYPE_FIRE; } } else if (mArrowType == TYPE_FIRE) { - if (dComIfGs_getMagic() < 1 || !(dComIfGs_getItem(dInvSlot_BOW_e) == dItem_MAGIC_ARROW_e || dComIfGs_getItem(dInvSlot_BOW_e) == dItem_LIGHT_ARROW_e)) { + if (dComIfGs_getMagic() < 1 || !(dComIfGs_getItem(dInvSlot_BOW_e) == dItemNo_MAGIC_ARROW_e || dComIfGs_getItem(dInvSlot_BOW_e) == dItemNo_LIGHT_ARROW_e)) { mArrowType = TYPE_NORMAL; } else { mArrowType = TYPE_ICE; } } else if (mArrowType == TYPE_ICE) { - if (dComIfGs_getMagic() < 2 || dComIfGs_getItem(dInvSlot_BOW_e) != dItem_LIGHT_ARROW_e) { + if (dComIfGs_getMagic() < 2 || dComIfGs_getItem(dInvSlot_BOW_e) != dItemNo_LIGHT_ARROW_e) { mArrowType = TYPE_NORMAL; } else { mArrowType = TYPE_LIGHT; @@ -461,7 +459,7 @@ daArrow_c* daArrow_c::changeArrowType() { if (mArrowType != origArrowType) { m_keep_type = mArrowType; - daArrow_c* newNockedArrow = (daArrow_c*)fopAcM_fastCreate(PROC_ARROW, 0, ¤t.pos, fopAcM_GetRoomNo(this)); + daArrow_c* newNockedArrow = (daArrow_c*)fopAcM_fastCreate(fpcNm_ARROW_e, 0, ¤t.pos, fopAcM_GetRoomNo(this)); if (!newNockedArrow) { mArrowType = origArrowType; m_keep_type = origArrowType; @@ -483,18 +481,18 @@ void daArrow_c::changeArrowTypeNotReady() { if (dComIfGs_getMagic() < 1) { return; } - if (dComIfGs_getItem(dInvSlot_BOW_e) == dItem_MAGIC_ARROW_e || dComIfGs_getItem(dInvSlot_BOW_e) == dItem_LIGHT_ARROW_e) { + if (dComIfGs_getItem(dInvSlot_BOW_e) == dItemNo_MAGIC_ARROW_e || dComIfGs_getItem(dInvSlot_BOW_e) == dItemNo_LIGHT_ARROW_e) { m_keep_type = TYPE_FIRE; } } else if (m_keep_type == TYPE_FIRE) { if (dComIfGs_getMagic() < 1) { return; } - if (dComIfGs_getItem(dInvSlot_BOW_e) == dItem_MAGIC_ARROW_e || dComIfGs_getItem(dInvSlot_BOW_e) == dItem_LIGHT_ARROW_e) { + if (dComIfGs_getItem(dInvSlot_BOW_e) == dItemNo_MAGIC_ARROW_e || dComIfGs_getItem(dInvSlot_BOW_e) == dItemNo_LIGHT_ARROW_e) { m_keep_type = TYPE_ICE; } } else if (m_keep_type == TYPE_ICE) { - if (dComIfGs_getMagic() >= 2 && dComIfGs_getItem(dInvSlot_BOW_e) == dItem_LIGHT_ARROW_e) { + if (dComIfGs_getMagic() >= 2 && dComIfGs_getItem(dInvSlot_BOW_e) == dItemNo_LIGHT_ARROW_e) { m_keep_type = TYPE_LIGHT; } else { m_keep_type = TYPE_NORMAL; @@ -630,7 +628,7 @@ BOOL daArrow_c::procMove() { cXyz temp12; cXyz hitPos; csXyz temp11; - if (mArrowType == TYPE_LIGHT && !mbLinkReflect && mAtCps.ChkAtShieldHit() && fpcM_GetName(mAtCps.GetAtHitAc()) == PROC_PLAYER) { + if (mArrowType == TYPE_LIGHT && !mbLinkReflect && mAtCps.ChkAtShieldHit() && fpcM_GetName(mAtCps.GetAtHitAc()) == fpcNm_PLAYER_e) { mAtCps.GetAtHitAc(); hitPos = *mAtCps.GetAtHitPosP(); hitType = -1; // Reflected hit @@ -653,9 +651,9 @@ BOOL daArrow_c::procMove() { if (hitActor) { JntHit_c* jntHit = fopAcM_GetJntHit(hitActor); if (mArrowType == TYPE_LIGHT) { - if (fpcM_GetName(mAtCps.GetAtHitAc()) == PROC_BGN || - fpcM_GetName(mAtCps.GetAtHitAc()) == PROC_BGN2 || - fpcM_GetName(mAtCps.GetAtHitAc()) == PROC_BGN3) { + if (fpcM_GetName(mAtCps.GetAtHitAc()) == fpcNm_BGN_e || + fpcM_GetName(mAtCps.GetAtHitAc()) == fpcNm_BGN2_e || + fpcM_GetName(mAtCps.GetAtHitAc()) == fpcNm_BGN3_e) { // Hit Puppet Ganon. if (hitWasBlocked) { field_0x6a8 = hitPos; @@ -794,12 +792,12 @@ BOOL daArrow_c::procMove() { field_0x698 = false; } else if (mArrowType == TYPE_ICE) { if (dComIfG_Bgsp()->ChkGrpInf(mLinChk, 0x200)) { - fopAcM_create(PROC_Obj_Magmarock, NULL, &field_0x6a8, current.roomNo); + fopAcM_create(fpcNm_Obj_Magmarock_e, NULL, &field_0x6a8, current.roomNo); } else { dComIfGp_particle_setP1(dPa_name::ID_IT_JN_ARWI_HITA00, &field_0x6a8, &temp10); fopAcM_createChild( - PROC_ARROW_ICEEFF, fopAcM_GetID(this), + fpcNm_ARROW_ICEEFF_e, fopAcM_GetID(this), mArrowType, &field_0x6a8, current.roomNo, &field_0x6e6 ); @@ -977,7 +975,7 @@ BOOL daArrow_c::procStop_BG() { if (mCoSph.ChkCoHit()) { dComIfGp_setItemArrowNumCount(1); - fopAcM_createItemForSimpleDemo(¤t.pos, dItem_ARROW_10_e, -1, NULL, NULL, 0.0f, 0.0f); + fopAcM_createItemForSimpleDemo(¤t.pos, dItemNo_ARROW_10_e, -1, NULL, NULL, 0.0f, 0.0f); mDoAud_seStart(JA_SE_CONSUMP_ITEM_GET); fopAcM_delete(this); return TRUE; @@ -1287,18 +1285,18 @@ static actor_method_class daArrowMethodTable = { }; actor_process_profile_definition g_profile_ARROW = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0009, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_ARROW, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0009, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_ARROW_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daArrow_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_ARROW, + /* Draw Prio */ fpcDwPi_ARROW_e, /* Actor SubMtd */ &daArrowMethodTable, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_arrow_iceeff.cpp b/src/d/actor/d_a_arrow_iceeff.cpp index 35ccc621f..12ef4c347 100644 --- a/src/d/actor/d_a_arrow_iceeff.cpp +++ b/src/d/actor/d_a_arrow_iceeff.cpp @@ -8,8 +8,6 @@ #include "m_Do/m_Do_mtx.h" #include "f_op/f_op_actor_mng.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/actor/d_a_player_main.h" #include "d/actor/d_a_arrow.h" @@ -303,18 +301,18 @@ static actor_method_class daArrow_IceeffMethodTable = { }; actor_process_profile_definition g_profile_ARROW_ICEEFF = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0009, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_ARROW_ICEEFF, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0009, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_ARROW_ICEEFF_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daArrow_Iceeff_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_ARROW_ICEEFF, + /* Draw Prio */ fpcDwPi_ARROW_ICEEFF_e, /* Actor SubMtd */ &daArrow_IceeffMethodTable, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_arrow_lighteff.cpp b/src/d/actor/d_a_arrow_lighteff.cpp index a204fe381..5be811496 100644 --- a/src/d/actor/d_a_arrow_lighteff.cpp +++ b/src/d/actor/d_a_arrow_lighteff.cpp @@ -8,8 +8,6 @@ #include "d/actor/d_a_player_main.h" #include "d/actor/d_a_arrow.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "m_Do/m_Do_mtx.h" #include "m_Do/m_Do_graphic.h" #include "SSystem/SComponent/c_lib.h" @@ -418,18 +416,18 @@ static actor_method_class daArrow_LighteffMethodTable = { }; actor_process_profile_definition g_profile_ARROW_LIGHTEFF = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0009, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_ARROW_LIGHTEFF, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0009, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_ARROW_LIGHTEFF_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daArrow_Lighteff_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_ARROW_LIGHTEFF, + /* Draw Prio */ fpcDwPi_ARROW_LIGHTEFF_e, /* Actor SubMtd */ &daArrow_LighteffMethodTable, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_atdoor.cpp b/src/d/actor/d_a_atdoor.cpp index d26813c36..d14d1baa5 100644 --- a/src/d/actor/d_a_atdoor.cpp +++ b/src/d/actor/d_a_atdoor.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_atdoor.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "d/res/res_atdoor.h" @@ -220,18 +218,18 @@ static actor_method_class l_daAtdoor_Method = { }; actor_process_profile_definition g_profile_ATDOOR = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_ATDOOR, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_ATDOOR_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daAtdoor_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_ATDOOR, + /* Draw Prio */ fpcDwPi_ATDOOR_e, /* Actor SubMtd */ &l_daAtdoor_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_6_e, + /* Cull Type */ fopAc_CULLBOX_6_e, }; diff --git a/src/d/actor/d_a_att.cpp b/src/d/actor/d_a_att.cpp index 572803cb1..0d8fd5155 100644 --- a/src/d/actor/d_a_att.cpp +++ b/src/d/actor/d_a_att.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_att.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" #include "d/actor/d_a_bgn.h" @@ -21,7 +19,7 @@ static BOOL daAtt_Draw(att_class* i_this) { /* 000000F4-00000140 .text boss_s_sub__FPvPv */ static void* boss_s_sub(void* search, void*) { - if (fopAcM_IsActor(search) && fopAcM_GetName(search) == PROC_BGN) { + if (fopAcM_IsActor(search) && fopAcM_GetName(search) == fpcNm_BGN_e) { return search; } return NULL; @@ -239,18 +237,18 @@ static actor_method_class l_daAtt_Method = { }; actor_process_profile_definition g_profile_ATT = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0008, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_ATT, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0008, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_ATT_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(att_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_ATT, + /* Draw Prio */ fpcDwPi_ATT_e, /* Actor SubMtd */ &l_daAtt_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ENEMY_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_auction.cpp b/src/d/actor/d_a_auction.cpp index a22c91fc0..32baa5ba9 100644 --- a/src/d/actor/d_a_auction.cpp +++ b/src/d/actor/d_a_auction.cpp @@ -9,8 +9,6 @@ #include "d/actor/d_a_player.h" #include "d/actor/d_a_player_main.h" #include "d/d_camera.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/res/res_pspl.h" #include "m_Do/m_Do_controller_pad.h" #include "d/d_auction_screen.h" @@ -50,20 +48,20 @@ static daAuction_HIO_c l_HIO; static daAuction_c::ItemData l_item_dat[] = { - {dItem_JOY_PENDANT_e, 0x1D10, 40, dSv_event_flag_c::UNK_0F01}, - {dItem_COLLECT_MAP_27_e, 0x1D11, 5, dSv_event_flag_c::UNK_1080}, - {dItem_COLLECT_MAP_18_e, 0x1D12, 60, dSv_event_flag_c::UNK_1040}, - {dItem_HEART_PIECE_e, 0x1D13, 80, dSv_event_flag_c::UNK_1020}, + {dItemNo_JOY_PENDANT_e, 0x1D10, 40, dSv_event_flag_c::UNK_0F01}, + {dItemNo_COLLECT_MAP_27_e, 0x1D11, 5, dSv_event_flag_c::UNK_1080}, + {dItemNo_COLLECT_MAP_18_e, 0x1D12, 60, dSv_event_flag_c::UNK_1040}, + {dItemNo_HEART_PIECE_e, 0x1D13, 80, dSv_event_flag_c::UNK_1020}, }; static daAuction_c::ItemData l_item_dat2[] = { - {POSTMAN_STATUE, 0x1D14, 30, dSv_event_flag_c::UNK_1008}, - {PRESIDENT_STATUE, 0x1D15, 40, dSv_event_flag_c::UNK_1004}, + {dItemNo_POSTMAN_STATUE_e, 0x1D14, 30, dSv_event_flag_c::UNK_1008}, + {dItemNo_SHOP_GURU_STATUE_e, 0x1D15, 40, dSv_event_flag_c::UNK_1004}, }; static s16 l_item_dat22[] = { - dItem_MAGIC_ARMOR_e, - dItem_COLLECT_MAP_06_e, + dItemNo_MAGIC_ARMOR_e, + dItemNo_COLLECT_MAP_06_e, }; static NpcDatStruct l_npc_dat[7] = { @@ -667,7 +665,7 @@ void daAuction_c::eventStartInit() { dAuction_screen_gaugeHide(); dAuction_screen_talkEnd(); - mCurrAuctionItemPID = fopAcM_create(PROC_ShopItem, l_item_dat[mCurrAuctionItemIndex].mItemID, ¤t.pos); + mCurrAuctionItemPID = fopAcM_create(fpcNm_ShopItem_e, l_item_dat[mCurrAuctionItemIndex].mItemID, ¤t.pos); dKy_custom_colset(0, 4, 1.0f); mLight.mPos.x = 0.0f; @@ -1640,18 +1638,18 @@ static actor_method_class daAuctionMethodTable = { }; actor_process_profile_definition g_profile_AUCTION = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_AUCTION, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_AUCTION_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daAuction_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_AUCTION, + /* Draw Prio */ fpcDwPi_AUCTION_e, /* Actor SubMtd */ &daAuctionMethodTable, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_bb.cpp b/src/d/actor/d_a_bb.cpp index d6a64eec1..df2ed6630 100644 --- a/src/d/actor/d_a_bb.cpp +++ b/src/d/actor/d_a_bb.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_bb.h" #include "m_Do/m_Do_ext.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" #include "d/d_com_inf_game.h" #include "d/d_s_play.h" @@ -372,7 +370,7 @@ void* s_a_d_sub(void* ac1, void* ac2) { cXyz sp14; cXyz sp8; - if (esa_check_count < 100 && fopAc_IsActor(ac1) && fpcM_GetName(ac1) == PROC_ESA) { + if (esa_check_count < 100 && fopAc_IsActor(ac1) && fpcM_GetName(ac1) == fpcNm_ESA_e) { esa_class* esa1 = (esa_class*)ac1; esa_class* esa2 = (esa_class*)ac2; @@ -1248,7 +1246,7 @@ void bb_water_check(bb_class* i_this) { /* 00004000-0000404C .text pl_name_check__FPvPv */ void* pl_name_check(void* ac1, void* ac2) { - if (fopAc_IsActor(ac1) && fopAcM_GetName(ac1) == PROC_NPC_KAM) { + if (fopAc_IsActor(ac1) && fopAcM_GetName(ac1) == fpcNm_NPC_KAM_e) { return ac1; } return NULL; @@ -2362,14 +2360,14 @@ static BOOL daBb_Execute(bb_class* i_this) { ac->current.angle = i_this->actor.current.angle; ac->shape_angle = i_this->actor.current.angle; - if (i_this->unk_2EC == PROC_MO2 || i_this->unk_2EC == PROC_BK) { + if (i_this->unk_2EC == fpcNm_MO2_e || i_this->unk_2EC == fpcNm_BK_e) { damagereaction* dr; - if (i_this->unk_2EC == PROC_MO2) { + if (i_this->unk_2EC == fpcNm_MO2_e) { dr = &((mo2_class*)ac)->mDamageReaction; dr->m468 = REG0_F(8) * 10.0f + -110.0f; dr->m46C = REG0_F(9) * 10.0f + 10.0f; - } else if (i_this->unk_2EC == PROC_BK) { + } else if (i_this->unk_2EC == fpcNm_BK_e) { dr = &((bk_class*)ac)->dr; dr->m468 = REG0_F(8) * 10.0f + -100.0f; dr->m46C = REG0_F(9) * 10.0f; @@ -2748,11 +2746,11 @@ static cPhs_State daBb_Create(fopAc_ac_c* a_this) { ac->base.parameters = (fopAcM_GetParam(i_this) & 0xFF000000) | 0xFFFF05; if (i_this->unk_2DD == 5) { - i_this->unk_2E8 = fpcM_Create(PROC_MO2, NULL, ac); - i_this->unk_2EC = PROC_MO2; + i_this->unk_2E8 = fpcM_Create(fpcNm_MO2_e, NULL, ac); + i_this->unk_2EC = fpcNm_MO2_e; } else { - i_this->unk_2E8 = fpcM_Create(PROC_BK, NULL, ac); - i_this->unk_2EC = PROC_BK; + i_this->unk_2E8 = fpcM_Create(fpcNm_BK_e, NULL, ac); + i_this->unk_2EC = fpcNm_BK_e; } } else if (i_this->unk_2D8 == 3) { i_this->unk_2DD = 3; @@ -2820,18 +2818,18 @@ static actor_method_class l_daBb_Method = { }; actor_process_profile_definition g_profile_BB = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_BB, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_BB_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(bb_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_BB, + /* Draw Prio */ fpcDwPi_BB_e, /* Actor SubMtd */ &l_daBb_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e | fopAcStts_UNK80000_e, /* Group */ fopAc_ENEMY_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_bdk.cpp b/src/d/actor/d_a_bdk.cpp index 91e954ae0..60ebdcf84 100644 --- a/src/d/actor/d_a_bdk.cpp +++ b/src/d/actor/d_a_bdk.cpp @@ -16,8 +16,6 @@ #include "d/d_snap.h" #include "d/d_s_play.h" #include "d/d_particle_name.h" -#include "d/d_priority.h" -#include "d/d_procname.h" #include "f_op/f_op_actor_mng.h" #include "f_op/f_op_camera.h" #include "JSystem/JUtility/JUTReport.h" @@ -137,7 +135,7 @@ daBdk_HIO_c::daBdk_HIO_c() { /* 0000015C-000001A8 .text kamome_delete_sub__FPvPv */ static void* kamome_delete_sub(void* param_1, void*) { - if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_KAMOME) { + if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == fpcNm_KAMOME_e) { fopAcM_delete(static_cast(param_1)); } return NULL; @@ -145,7 +143,7 @@ static void* kamome_delete_sub(void* param_1, void*) { /* 000001A8-000001F4 .text kui_delete_sub__FPvPv */ static void* kui_delete_sub(void* param_1, void*) { - if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_KUI) { + if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == fpcNm_KUI_e) { fopAcM_delete(static_cast(param_1)); } return NULL; @@ -153,7 +151,7 @@ static void* kui_delete_sub(void* param_1, void*) { /* 000001F4-00000240 .text ep_delete_sub__FPvPv */ static void* ep_delete_sub(void* param_1, void*) { - if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_EP) { + if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == fpcNm_EP_e) { fopAcM_delete(static_cast(param_1)); } return NULL; @@ -161,7 +159,7 @@ static void* ep_delete_sub(void* param_1, void*) { /* 00000240-0000028C .text dk_delete_sub__FPvPv */ static void* dk_delete_sub(void* param_1, void*) { - if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_DK) { + if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == fpcNm_DK_e) { fopAcM_delete(static_cast(param_1)); } return NULL; @@ -170,7 +168,7 @@ static void* dk_delete_sub(void* param_1, void*) { /* 0000028C-000002E8 .text obj_delete_sub__FPvPv */ static void* obj_delete_sub(void* param_1, void*) { fopAc_ac_c* actor = static_cast(param_1); - if (fopAcM_IsActor(actor) && fopAcM_GetName(actor) == PROC_BDKOBJ && (fopAcM_GetParam(actor) & 0xF) >= 2) { + if (fopAcM_IsActor(actor) && fopAcM_GetName(actor) == fpcNm_BDKOBJ_e && (fopAcM_GetParam(actor) & 0xF) >= 2) { fopAcM_delete(actor); } return NULL; @@ -178,7 +176,7 @@ static void* obj_delete_sub(void* param_1, void*) { /* 000002E8-00000334 .text sea_delete_sub__FPvPv */ static void* sea_delete_sub(void* param_1, void*) { - if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_Obj_Tide) { + if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == fpcNm_Obj_Tide_e) { fopAcM_delete(static_cast(param_1)); } return NULL; @@ -186,7 +184,7 @@ static void* sea_delete_sub(void* param_1, void*) { /* 00000334-00000380 .text bk_delete_sub__FPvPv */ static void* bk_delete_sub(void* param_1, void*) { - if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_BK) { + if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == fpcNm_BK_e) { fopAcM_delete(static_cast(param_1)); } return NULL; @@ -194,7 +192,7 @@ static void* bk_delete_sub(void* param_1, void*) { /* 00000380-000003CC .text boko_delete_sub__FPvPv */ static void* boko_delete_sub(void* param_1, void*) { - if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_BOKO) { + if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == fpcNm_BOKO_e) { fopAcM_delete(static_cast(param_1)); } return NULL; @@ -203,7 +201,7 @@ static void* boko_delete_sub(void* param_1, void*) { /* 000003CC-00000424 .text obj2_delete_sub__FPvPv */ static void* obj2_delete_sub(void* param_1, void*) { fopAc_ac_c* actor = static_cast(param_1); - if (fopAcM_IsActor(actor) && fopAcM_GetName(actor) == PROC_BDKOBJ && actor->model == NULL) { + if (fopAcM_IsActor(actor) && fopAcM_GetName(actor) == fpcNm_BDKOBJ_e && actor->model == NULL) { fopAcM_delete(actor); } return NULL; @@ -2116,7 +2114,7 @@ static void end(bdk_class* i_this) { /* 00005EA0-00005F08 .text obj_s_sub__FPvPv */ static void* obj_s_sub(void* param_1, void*) { fopAc_ac_c* actor = (fopAc_ac_c*)param_1; - if (fopAcM_IsActor(actor) && fopAcM_GetName(actor) == PROC_BDKOBJ && (fpcM_GetParam(actor) & 0xF) != 0xF && actor->health != 0) { + if (fopAcM_IsActor(actor) && fopAcM_GetName(actor) == fpcNm_BDKOBJ_e && (fpcM_GetParam(actor) & 0xF) != 0xF && actor->health != 0) { return param_1; } return NULL; @@ -4353,18 +4351,18 @@ static actor_method_class l_daBdk_Method = { }; actor_process_profile_definition g_profile_BDK = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_BDK, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_BDK_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(bdk_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_BDK, + /* Draw Prio */ fpcDwPi_BDK_e, /* Actor SubMtd */ &l_daBdk_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e | fopAcStts_BOSS_e, /* Group */ fopAc_ENEMY_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_bdkobj.cpp b/src/d/actor/d_a_bdkobj.cpp index 990bb8752..c7359cece 100644 --- a/src/d/actor/d_a_bdkobj.cpp +++ b/src/d/actor/d_a_bdkobj.cpp @@ -11,8 +11,6 @@ #include "d/d_cc_d.h" #include "d/d_cc_uty.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_s_play.h" #include "d/res/res_bdkobj.h" #include "f_op/f_op_actor_mng.h" @@ -25,7 +23,7 @@ static cXyz non_pos(10000.0f, -10000.0f, 20000.0f); /* 000000EC-00000104 .text ride_call_back__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c */ static void ride_call_back(dBgW* param1, fopAc_ac_c* param2, fopAc_ac_c* param3) { - if (fopAcM_GetName(param3) != PROC_PLAYER) { + if (fopAcM_GetName(param3) != fpcNm_PLAYER_e) { return; } param2->health = 0xA; @@ -621,18 +619,18 @@ static actor_method_class l_daBdkobj_Method = { }; actor_process_profile_definition g_profile_BDKOBJ = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_BDKOBJ, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_BDKOBJ_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(bdkobj_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_BDKOBJ, + /* Draw Prio */ fpcDwPi_BDKOBJ_e, /* Actor SubMtd */ &l_daBdkobj_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_beam.cpp b/src/d/actor/d_a_beam.cpp index 8db150313..607749057 100644 --- a/src/d/actor/d_a_beam.cpp +++ b/src/d/actor/d_a_beam.cpp @@ -11,8 +11,6 @@ #include "d/d_cc_d.h" #include "d/d_lib.h" #include "d/d_particle.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_a_obj.h" #include "d/d_s_play.h" #include "f_op/f_op_actor_mng.h" @@ -158,7 +156,7 @@ void daBeam_AtHitCallback(fopAc_ac_c* arg0, dCcD_GObjInf* arg1, fopAc_ac_c* arg2 daBeam_c* i_this = (daBeam_c*)arg0; if (fopAcM_IsActor(arg2)) { - if (fopAcM_GetName(arg2) == PROC_PLAYER) { + if (fopAcM_GetName(arg2) == fpcNm_PLAYER_e) { fopAcM_seStartCurrent(arg2, JA_SE_LK_BEAM_HIT, 0); if (i_this->m54C != 0) { @@ -173,7 +171,7 @@ void daBeam_AtHitCallback(fopAc_ac_c* arg0, dCcD_GObjInf* arg1, fopAc_ac_c* arg2 arg1->SetAtVec(sp20); arg3->SetTgRVec(sp20); } - } else if (fopAcM_GetName(arg2) == PROC_AM2) { + } else if (fopAcM_GetName(arg2) == fpcNm_AM2_e) { arg3->ClrTgHit(); } @@ -189,7 +187,7 @@ void daBeam_AtHitDummyCallback(fopAc_ac_c* arg0, dCcD_GObjInf* arg1, fopAc_ac_c* daBeam_c* i_this = (daBeam_c*)arg0; if (fopAcM_IsActor(arg2)) { - if (fopAcM_GetName(arg2) == PROC_PLAYER) { + if (fopAcM_GetName(arg2) == fpcNm_PLAYER_e) { fopAcM_seStartCurrent(arg2, JA_SE_LK_BEAM_HIT, 0); if (i_this->m54C != 0) { @@ -203,7 +201,7 @@ void daBeam_AtHitDummyCallback(fopAc_ac_c* arg0, dCcD_GObjInf* arg1, fopAc_ac_c* arg1->SetAtVec(sp20); arg3->SetTgRVec(sp20); } - } else if (fopAcM_GetName(arg2) == PROC_AM2) { + } else if (fopAcM_GetName(arg2) == fpcNm_AM2_e) { arg3->ClrTgHit(); } } @@ -212,7 +210,7 @@ void daBeam_AtHitDummyCallback(fopAc_ac_c* arg0, dCcD_GObjInf* arg1, fopAc_ac_c* /* 00000A00-00000AA0 .text daBeam_checkHitCallback__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */ void daBeam_checkHitCallback(fopAc_ac_c* arg0, dCcD_GObjInf* arg1, fopAc_ac_c* arg2, dCcD_GObjInf* arg3) { if (fopAcM_IsActor(arg2) && arg0->parentActorID != fopAcM_GetID(arg2)) { - if (fopAcM_GetName(arg2) != PROC_PLAYER || arg1->ChkAtShieldHit()) { + if (fopAcM_GetName(arg2) != fpcNm_PLAYER_e || arg1->ChkAtShieldHit()) { daBeam_c* i_this = (daBeam_c*)arg0; i_this->m540 = *i_this->mCps2.GetAtHitPosP(); i_this->m53C = true; @@ -403,7 +401,7 @@ bool daBeam_c::_execute() { parameters |= 2; } - m684 = fopAcM_create(PROC_Hot_Floor, parameters, &m668); + m684 = fopAcM_create(fpcNm_Hot_Floor_e, parameters, &m668); } m688 = 1.0f; } else { @@ -658,18 +656,18 @@ static actor_method_class daBeamMethodTable = { }; actor_process_profile_definition g_profile_Beam = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Beam, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Beam_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daBeam_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Beam, + /* Draw Prio */ fpcDwPi_Beam_e, /* Actor SubMtd */ &daBeamMethodTable, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_bflower.cpp b/src/d/actor/d_a_bflower.cpp index bf1444166..044239441 100644 --- a/src/d/actor/d_a_bflower.cpp +++ b/src/d/actor/d_a_bflower.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_bflower.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/res/res_vbakh.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_player_main.h" @@ -345,7 +343,7 @@ BOOL daBFlower_c::actLive() { cCcD_Obj* tg = mSph.GetTgHitObj(); if (tg != NULL) { if (tg->ChkAtType(AT_TYPE_BOMB)) { - mpBombActor = static_cast(fopAcM_fastCreate(PROC_Bomb2, daBomb2::Act_c::prm_make(daBomb2::Start_UNK0_e, true), ¤t.pos, fopAcM_GetRoomNo(this), ¤t.angle)); + mpBombActor = static_cast(fopAcM_fastCreate(fpcNm_Bomb2_e, daBomb2::Act_c::prm_make(daBomb2::Start_UNK0_e, true), ¤t.pos, fopAcM_GetRoomNo(this), ¤t.angle)); m58C = 0; } else if (tg->ChkAtType(~(AT_TYPE_WATER | AT_TYPE_UNK20000 | AT_TYPE_WIND | AT_TYPE_UNK400000 | AT_TYPE_LIGHT))) { // TODO: simplify @@ -355,7 +353,7 @@ BOOL daBFlower_c::actLive() { } u32 prm = daBomb2::Act_c::prm_make(daBomb2::Start_UNK1_e, b); - mpBombActor = static_cast(fopAcM_fastCreate(PROC_Bomb2, prm, ¤t.pos, fopAcM_GetRoomNo(this), ¤t.angle)); + mpBombActor = static_cast(fopAcM_fastCreate(fpcNm_Bomb2_e, prm, ¤t.pos, fopAcM_GetRoomNo(this), ¤t.angle)); m58C = 0; } } @@ -366,7 +364,7 @@ BOOL daBFlower_c::actLive() { if (fopAcM_checkCarryNow(this) && m58D != 0) { m58C = 0; - mpBombActor = static_cast(fopAcM_fastCreate(PROC_Bomb2, daBomb2::Act_c::prm_make(daBomb2::Start_UNK2_e, false), ¤t.pos, fopAcM_GetRoomNo(this), ¤t.angle)); + mpBombActor = static_cast(fopAcM_fastCreate(fpcNm_Bomb2_e, daBomb2::Act_c::prm_make(daBomb2::Start_UNK2_e, false), ¤t.pos, fopAcM_GetRoomNo(this), ¤t.angle)); fopAcM_cancelCarryNow(this); if (mpBombActor != NULL) { @@ -522,18 +520,18 @@ static actor_method_class daBFlowerMethodTable = { }; actor_process_profile_definition g_profile_BOMB_FLOWER = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_BOMB_FLOWER, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_BOMB_FLOWER_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daBFlower_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_BOMB_FLOWER, + /* Draw Prio */ fpcDwPi_BOMB_FLOWER_e, /* Actor SubMtd */ &daBFlowerMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_bg.cpp b/src/d/actor/d_a_bg.cpp index 9f109af36..2acb5011c 100644 --- a/src/d/actor/d_a_bg.cpp +++ b/src/d/actor/d_a_bg.cpp @@ -7,7 +7,6 @@ #include "d/actor/d_a_bg.h" #include "f_op/f_op_actor_mng.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" #include "d/d_magma.h" #include "d/d_grass.h" #include "d/d_tree.h" @@ -405,19 +404,19 @@ static actor_method_class l_daBg_Method = { }; actor_process_profile_definition2 g_profile_BG = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_BG, - &g_fpcLf_Method.base, - sizeof(daBg_c), - 0, - 0, - &g_fopAc_Method.base, - 0x01C2, - &l_daBg_Method, - fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, - 0, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_BG_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daBg_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_BG_e, + /* Actor SubMtd */ &l_daBg_Method, + /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, + /* field_0x30 */ 0, }; diff --git a/src/d/actor/d_a_bgn.cpp b/src/d/actor/d_a_bgn.cpp index 15d3e73af..000aee913 100644 --- a/src/d/actor/d_a_bgn.cpp +++ b/src/d/actor/d_a_bgn.cpp @@ -14,8 +14,6 @@ #endif #include "d/actor/d_a_player.h" #include "d/d_meter.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_s_play.h" #include "d/d_snap.h" #include "d/res/res_bgn.h" @@ -916,7 +914,7 @@ static void room_disp(bgn_class* i_this) { /* 00001898-0000192C .text ten_a_d_sub__FPvPv */ static void* ten_a_d_sub(void* param_1, void*) { fopAc_ac_c* actor = (fopAc_ac_c*)param_1; - if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == PROC_Obj_Vteng)) { + if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_Obj_Vteng_e)) { if ((actor->model != NULL) && (bgn != NULL)) { bgn->mCC24.setModel(actor->model); bgn->mCC24.update(); @@ -930,7 +928,7 @@ static void* ten_a_d_sub(void* param_1, void*) { /* 0000192C-00001998 .text ki_a_d_sub__FPvPv */ static void* ki_a_d_sub(void* param_1, void*) { ki_class* keese = (ki_class*)param_1; - if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == PROC_KI)) { + if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_KI_e)) { if (keese->actor.model != NULL) { keese->m2B8.setModel(keese->actor.model); keese->m2B8.update(); @@ -950,7 +948,7 @@ static void obj_disp(bgn_class* i_this) { #if VERSION > VERSION_DEMO /* 000019F4-00001A40 .text bgn2_s_sub__FPvPv */ static void* bgn2_s_sub(void* param_1, void*) { - if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == PROC_BGN2)) { + if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_BGN2_e)) { return param_1; } else { return NULL; @@ -959,7 +957,7 @@ static void* bgn2_s_sub(void* param_1, void*) { /* 00001A40-00001A8C .text bgn3_s_sub__FPvPv */ static void* bgn3_s_sub(void* param_1, void*) { - if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == PROC_BGN3)) { + if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_BGN3_e)) { return param_1; } else { return NULL; @@ -1030,7 +1028,7 @@ static BOOL daBgn_Draw(bgn_class* i_this) { /* 00001C40-00001C8C .text ki_del_sub__FPvPv */ static void* ki_del_sub(void* param_1, void*) { ki_class* keese = (ki_class*)param_1; - if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == PROC_KI)) { + if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_KI_e)) { fopAcM_delete(&keese->actor); } return NULL; @@ -1040,7 +1038,7 @@ static void* ki_del_sub(void* param_1, void*) { /* 00001C8C-00001CD8 .text ks_del_sub__FPvPv */ static void* ks_del_sub(void* param_1, void*) { ks_class* morth = (ks_class*)param_1; - if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == PROC_KS)) { + if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_KS_e)) { fopAcM_delete(&morth->actor); } return NULL; @@ -1049,7 +1047,7 @@ static void* ks_del_sub(void* param_1, void*) { /* 00001CD8-00001D30 .text ki_c_sub__FPvPv */ static void* ki_c_sub(void* param_1, void*) { - if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == PROC_KI)) { + if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_KI_e)) { ki_all_count++; } return NULL; @@ -1109,7 +1107,7 @@ static s32 gr_check(bgn_class* i_this, cXyz* param_2) { static void* s_b_sub(void* param_1, void* param_2) { bgn_class* bgn = (bgn_class*)param_2; daBomb_c* bomb = (daBomb_c*)param_1; - if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == PROC_BOMB) && bomb->get_explode_instant()) { + if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_BOMB_e) && bomb->get_explode_instant()) { cXyz local_18 = bomb->current.pos; if (!gr_check(bgn, &local_18)) { dComIfGp_particle_set(dPa_name::ID_AK_SN_KGTT1PUNCHSPLASH00, &local_18); @@ -3294,7 +3292,7 @@ static void demo_camera(bgn_class* i_this) { #if VERSION == VERSION_DEMO /* 000019F4-00001A40 .text bgn2_s_sub__FPvPv */ static void* bgn2_s_sub(void* param_1, void*) { - if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == PROC_BGN2)) { + if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_BGN2_e)) { return param_1; } else { return NULL; @@ -3303,7 +3301,7 @@ static void* bgn2_s_sub(void* param_1, void*) { /* 00001A40-00001A8C .text bgn3_s_sub__FPvPv */ static void* bgn3_s_sub(void* param_1, void*) { - if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == PROC_BGN3)) { + if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_BGN3_e)) { return param_1; } else { return NULL; @@ -3375,7 +3373,7 @@ static BOOL daBgn_Execute(bgn_class* i_this) { local_28.x = cM_rndFX(2500.0f); local_28.y = cM_rndF(500.0f) + 3500.0f; local_28.x = cM_rndFX(2500.0f); - fopAcM_create(PROC_KI, 0xFFFF0003, &local_28, fopAcM_GetRoomNo(actor)); + fopAcM_create(fpcNm_KI_e, 0xFFFF0003, &local_28, fopAcM_GetRoomNo(actor)); } } i_this->m02B5 = l_HIO.m024; @@ -3694,17 +3692,17 @@ static cPhs_State daBgn_Create(fopAc_ac_c* a_this) { if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_3F10)) { i_this->m02B4 = 0xFF; local_50.set(375.17f, REG8_F(4) + 4441.46f, REG8_F(3) + -15.0f); - fopAcM_create(PROC_HIMO3, 0xf, &local_50, fopAcM_GetRoomNo(a_this)); + fopAcM_create(fpcNm_HIMO3_e, 0xf, &local_50, fopAcM_GetRoomNo(a_this)); local_50.set(375.17f, REG8_F(4) + 4453.96f, 0.0f); csXyz cStack_58(0, 0x4000, 0); - fopAcM_create(PROC_KUI, 0xffff0400, &local_50, fopAcM_GetRoomNo(a_this), &cStack_58, NULL, 0xFF, NULL); + fopAcM_create(fpcNm_KUI_e, 0xffff0400, &local_50, fopAcM_GetRoomNo(a_this), &cStack_58, NULL, 0xFF, NULL); } else { for (s32 parameters = 0, i = 0; parameters < 8; i++, parameters++) { - fopAcM_create(PROC_ATT, parameters, &a_this->current.pos, fopAcM_GetRoomNo(a_this)); + fopAcM_create(fpcNm_ATT_e, parameters, &a_this->current.pos, fopAcM_GetRoomNo(a_this)); i_this->mAAA8[i].m308 = 3; } - fopAcM_create(PROC_BGN2, 0, &a_this->current.pos, fopAcM_GetRoomNo(a_this)); - fopAcM_create(PROC_BGN3, 0, &a_this->current.pos, fopAcM_GetRoomNo(a_this)); + fopAcM_create(fpcNm_BGN2_e, 0, &a_this->current.pos, fopAcM_GetRoomNo(a_this)); + fopAcM_create(fpcNm_BGN3_e, 0, &a_this->current.pos, fopAcM_GetRoomNo(a_this)); mDoAud_bgmStart(JA_BGM_BGN_KUGUTSU); a_this->health = 3; a_this->max_health = 3; @@ -3732,18 +3730,18 @@ static actor_method_class l_daBgn_Method = { }; actor_process_profile_definition g_profile_BGN = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_BGN, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_BGN_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(bgn_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_BGN, + /* Draw Prio */ fpcDwPi_BGN_e, /* Actor SubMtd */ &l_daBgn_Method, /* Status */ DEMO_SELECT(fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, fopAcStts_UNK4000_e | fopAcStts_UNK40000_e | fopAcStts_BOSS_e), /* Group */ fopAc_ENEMY_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_bgn2.cpp b/src/d/actor/d_a_bgn2.cpp index 608190fe6..dbd90e478 100644 --- a/src/d/actor/d_a_bgn2.cpp +++ b/src/d/actor/d_a_bgn2.cpp @@ -8,8 +8,6 @@ #include "d/actor/d_a_bgn.h" #include "d/actor/d_a_bgn3.h" #include "d/actor/d_a_player.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" #include "d/d_s_play.h" #include "d/res/res_bgn.h" @@ -89,7 +87,7 @@ static void anm_init(bgn2_class* i_this, int bckFileIdx, f32 morf, u8 loopMode, /* 000002BC-00000308 .text bgn_s_sub__FPvPv */ static void* bgn_s_sub(void* param_1, void*) { - if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == PROC_BGN)) { + if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_BGN_e)) { return param_1; } else { return NULL; @@ -98,7 +96,7 @@ static void* bgn_s_sub(void* param_1, void*) { /* 00000308-00000354 .text bgn3_s_sub__FPvPv */ static void* bgn3_s_sub(void* param_1, void*) { - if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == PROC_BGN3)) { + if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_BGN3_e)) { return param_1; } else { return NULL; @@ -810,7 +808,7 @@ static void damage_check(bgn2_class* i_this) { /* 00002C88-00002CE0 .text ki_c_sub__FPvPv */ static void* ki_c_sub(void* param_1, void*) { - if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == PROC_KI)) { + if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_KI_e)) { ki_all_count++; } return NULL; @@ -1051,7 +1049,7 @@ static BOOL daBgn2_Execute(bgn2_class* i_this) { local_b8.x = cM_rndFX(2500.0f); local_b8.y = cM_rndF(500.0f) + 3500.0f; local_b8.z = cM_rndFX(2500.0f); - fopAcM_create(PROC_KI, 0xFFFF0003, &local_b8, fopAcM_GetRoomNo(actor)); + fopAcM_create(fpcNm_KI_e, 0xFFFF0003, &local_b8, fopAcM_GetRoomNo(actor)); } } i_this->mAcch.CrrPos(*dComIfG_Bgsp()); @@ -1270,18 +1268,18 @@ static actor_method_class l_daBgn2_Method = { }; actor_process_profile_definition g_profile_BGN2 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_BGN2, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_BGN2_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(bgn2_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_BGN2, + /* Draw Prio */ fpcDwPi_BGN2_e, /* Actor SubMtd */ &l_daBgn2_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e | fopAcStts_BOSS_e, /* Group */ fopAc_ENEMY_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_bgn3.cpp b/src/d/actor/d_a_bgn3.cpp index 3697f8a11..fc094b37d 100644 --- a/src/d/actor/d_a_bgn3.cpp +++ b/src/d/actor/d_a_bgn3.cpp @@ -8,8 +8,6 @@ #include "d/actor/d_a_bgn.h" #include "d/actor/d_a_esa.h" #include "d/actor/d_a_player.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" #include "d/d_s_play.h" #include "d/res/res_bgn.h" @@ -109,7 +107,7 @@ daBgn3_HIO_c::daBgn3_HIO_c() { #if VERSION > VERSION_DEMO /* 000001F4-00000240 .text bgn_s_sub__FPvPv */ static void* bgn_s_sub(void* param_1, void*) { - if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == PROC_BGN)) { + if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_BGN_e)) { return param_1; } else { return NULL; @@ -222,7 +220,7 @@ static void drop_eff_set(bgn3_class* i_this) { /* 0000101C-00001068 .text esa_s_sub__FPvPv */ static void* esa_s_sub(void* param_1, void*) { - if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == PROC_ESA)) { + if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_ESA_e)) { return param_1; } else { return NULL; @@ -619,7 +617,7 @@ static void damage_check(bgn3_class* i_this) { i_this->m100A8 = 0xf; sVar7 = l_HIO.m2A; } - } else if (fopAcM_GetName(atInfo.mpActor) == PROC_ARROW) { + } else if (fopAcM_GetName(atInfo.mpActor) == fpcNm_ARROW_e) { bVar10 = 2; i_this->m100A8 = 10; sVar7 = l_HIO.m28; @@ -1045,7 +1043,7 @@ static void move(bgn3_class* i_this) { #if VERSION == VERSION_DEMO /* 000001F4-00000240 .text bgn_s_sub__FPvPv */ static void* bgn_s_sub(void* param_1, void*) { - if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == PROC_BGN)) { + if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_BGN_e)) { return param_1; } else { return NULL; @@ -1055,7 +1053,7 @@ static void* bgn_s_sub(void* param_1, void*) { /* 00004058-000040B0 .text ki_c_sub__FPvPv */ static void* ki_c_sub(void* param_1, void*) { - if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == PROC_KS)) { + if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_KS_e)) { ki_all_count++; } return NULL; @@ -1126,7 +1124,7 @@ static BOOL daBgn3_Execute(bgn3_class* i_this) { local_28.x = cM_rndFX(2500.0f); local_28.y = cM_rndF(500.0f) + 3500.0f; local_28.z = cM_rndFX(2500.0f); - fopAcM_create(PROC_KS, 3, &local_28, fopAcM_GetRoomNo(actor)); + fopAcM_create(fpcNm_KS_e, 3, &local_28, fopAcM_GetRoomNo(actor)); } } return TRUE; @@ -1348,18 +1346,18 @@ static actor_method_class l_daBgn3_Method = { }; actor_process_profile_definition g_profile_BGN3 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_BGN3, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_BGN3_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(bgn3_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_BGN3, + /* Draw Prio */ fpcDwPi_BGN3_e, /* Actor SubMtd */ &l_daBgn3_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e | fopAcStts_BOSS_e, /* Group */ fopAc_ENEMY_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_bigelf.cpp b/src/d/actor/d_a_bigelf.cpp index 20ea5f917..5793a5dd8 100644 --- a/src/d/actor/d_a_bigelf.cpp +++ b/src/d/actor/d_a_bigelf.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_bigelf.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 00000078-0000016C .text oct_delete__10daBigelf_cFv */ void daBigelf_c::oct_delete() { @@ -367,18 +365,18 @@ static actor_method_class l_daBigelf_Method = { }; actor_process_profile_definition g_profile_BIGELF = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_BIGELF, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_BIGELF_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daBigelf_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_BIGELF, + /* Draw Prio */ fpcDwPi_BIGELF_e, /* Actor SubMtd */ &l_daBigelf_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_12_e, + /* Cull Type */ fopAc_CULLBOX_12_e, }; diff --git a/src/d/actor/d_a_bita.cpp b/src/d/actor/d_a_bita.cpp index 6edae8ad8..c8b6d9eb6 100644 --- a/src/d/actor/d_a_bita.cpp +++ b/src/d/actor/d_a_bita.cpp @@ -11,8 +11,6 @@ #include "d/d_bg_s_movebg_actor.h" #include "d/d_com_inf_game.h" #include "d/d_kankyo.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/actor/d_a_btd.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" @@ -27,7 +25,7 @@ static u32 ita_Ef[] = { BITA_BRK_EF_BTDITA0, BITA_BRK_EF_BTDITA1 }; /* 00000078-000000C4 .text b_a_sub__FPvPv */ static void* b_a_sub(void* search, void* user) { UNUSED(user); - if (fopAc_IsActor(search) && fopAcM_GetName(search) == PROC_BTD) + if (fopAc_IsActor(search) && fopAcM_GetName(search) == fpcNm_BTD_e) return search; return NULL; } @@ -282,18 +280,18 @@ static actor_method_class l_daBita_Method = { }; actor_process_profile_definition g_profile_BITA = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_BITA, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_BITA_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(bita_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_BITA, + /* Draw Prio */ fpcDwPi_BITA_e, /* Actor SubMtd */ &l_daBita_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ENV_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_bk.cpp b/src/d/actor/d_a_bk.cpp index 70e56b5e2..e02efe782 100644 --- a/src/d/actor/d_a_bk.cpp +++ b/src/d/actor/d_a_bk.cpp @@ -9,8 +9,6 @@ #include "d/res/res_bk.h" #include "f_op/f_op_actor_mng.h" #include "f_op/f_op_camera.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_obj_search.h" #include "d/actor/d_a_bridge.h" @@ -670,7 +668,7 @@ static s32 target_info_count; /* 00002C4C-00002CD4 .text s_w_sub__FPvPv */ static void* s_w_sub(void* param_1, void*) { - if (fopAc_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_BOKO) { + if (fopAc_IsActor(param_1) && fopAcM_GetName(param_1) == fpcNm_BOKO_e) { daBoko_c* boko = (daBoko_c*)param_1; if (fopAcM_GetParam(boko) != daBoko_c::Type_MOBLIN_SPEAR_e && !fopAcM_checkCarryNow(boko)) { if (target_info_count < (s32)ARRAY_SIZE(target_info)) { @@ -741,7 +739,7 @@ static fpc_ProcID search_wepon(bk_class* i_this) { /* 00002FB0-0000302C .text s_b_sub__FPvPv */ static void* s_b_sub(void* param_1, void*) { - if (fopAc_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_BOMB) { + if (fopAc_IsActor(param_1) && fopAcM_GetName(param_1) == fpcNm_BOMB_e) { daBomb_c* bomb = (daBomb_c*)param_1; // TODO: why is it checking the bomb's params as a single field instead of just one param? bug? if (fopAcM_GetParam(bomb) != 0) { @@ -1194,9 +1192,9 @@ static void jyunkai(bk_class* i_this) { /* 0000488C-000048E4 .text ken_s_sub__FPvPv */ static void* ken_s_sub(void* param_1, void*) { - if (fopAc_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_ITEM) { + if (fopAc_IsActor(param_1) && fopAcM_GetName(param_1) == fpcNm_ITEM_e) { daItem_c* item = (daItem_c*)param_1; - if (item->getItemNo() == dItem_DROPPED_SWORD_e) { + if (item->getItemNo() == dItemNo_DROPPED_SWORD_e) { return param_1; } } @@ -1430,7 +1428,7 @@ static void stand(bk_class* i_this) { /* 000053E0-000054E0 .text s_s_sub__FPvPv */ static void* s_s_sub(void* r29, void* r30) { bk_class* i_this = (bk_class*)r30; - if (fopAc_IsActor(r29) && fopAcM_GetName(r29) == PROC_OBJ_SEARCH) { + if (fopAc_IsActor(r29) && fopAcM_GetName(r29) == fpcNm_OBJ_SEARCH_e) { daObj_Search::Act_c* search = (daObj_Search::Act_c*)r29; cXyz sp18 = i_this->home.pos - search->current.pos; if (sp18.abs() < 600.0f) { @@ -1769,7 +1767,7 @@ u16 learn_check; /* 0000647C-000064D8 .text shot_s_sub__FPvPv */ static void* shot_s_sub(void* param_1, void*) { - if (fopAc_IsActor(param_1) && (learn_check & 0x400) && fopAcM_GetName(param_1) == PROC_HIMO2) { + if (fopAc_IsActor(param_1) && (learn_check & 0x400) && fopAcM_GetName(param_1) == fpcNm_HIMO2_e) { return param_1; } return NULL; @@ -2249,7 +2247,7 @@ temp_1B8: fopAc_ac_c* hitActor = yari_hit_check(i_this); if (hitActor != NULL) { - if (fopAcM_GetName(hitActor) == PROC_PLAYER) { + if (fopAcM_GetName(hitActor) == fpcNm_PLAYER_e) { // Note: The code seems to assume that the hit actor and the controlled player are the same actor. // This isn't necessarily correct, but likely doesn't cause any bugs in practice as checkPlayerGuard always // returns false for non-Link player actors. @@ -2269,7 +2267,7 @@ temp_1B8: i_this->m0300[1] = 100; } } - } else if (fopAcM_GetName(hitActor) == PROC_BK) { + } else if (fopAcM_GetName(hitActor) == fpcNm_BK_e) { i_this->m11FC = fopAcM_GetID(hitActor); } } else { @@ -3783,7 +3781,7 @@ static void damage_check(bk_class* i_this) { /* 0000BCD4-0000BD30 .text s_s2_sub__FPvPv */ static void* s_s2_sub(void* param_1, void*) { - if (fopAc_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_OBJ_SEARCH) { + if (fopAc_IsActor(param_1) && fopAcM_GetName(param_1) == fpcNm_OBJ_SEARCH_e) { if (daObj_Search::Act_c::getFindFlag()) { return param_1; } @@ -3905,7 +3903,7 @@ static void waki_set(bk_class* i_this) { params->base.parameters = (i_this->m02B6 << 0x10) | 0xFF00FF39; // TODO clean up parameters } params->room_no = fopAcM_GetRoomNo(actor); - fopAcM_Create(PROC_BK, NULL, params); + fopAcM_Create(fpcNm_BK_e, NULL, params); i_this->m1212++; } } @@ -5085,7 +5083,7 @@ static cPhs_State daBk_Create(fopAc_ac_c* i_actor) { } else { weaponType = 0; } - i_this->m1200 = fopAcM_create(PROC_BOKO, weaponType, &i_actor->current.pos, fopAcM_GetRoomNo(i_actor)); + i_this->m1200 = fopAcM_create(fpcNm_BOKO_e, weaponType, &i_actor->current.pos, fopAcM_GetRoomNo(i_actor)); i_this->m1214 = 1; i_this->m02D5 &= 0x40; } @@ -5322,18 +5320,18 @@ static actor_method_class l_daBk_Method = { }; actor_process_profile_definition g_profile_BK = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_BK, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_BK_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(bk_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_BK, + /* Draw Prio */ fpcDwPi_BK_e, /* Actor SubMtd */ &l_daBk_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e | fopAcStts_UNK80000_e, /* Group */ fopAc_ENEMY_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_bl.cpp b/src/d/actor/d_a_bl.cpp index 2e84ea3ca..d4a2a5afb 100644 --- a/src/d/actor/d_a_bl.cpp +++ b/src/d/actor/d_a_bl.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_bl.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" /* 00000078-00000178 .text draw_SUB__FP8bl_class */ @@ -196,18 +194,18 @@ static actor_method_class l_daBL_Method = { }; actor_process_profile_definition g_profile_BL = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_BL, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_BL_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(bl_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_BL, + /* Draw Prio */ fpcDwPi_BL_e, /* Actor SubMtd */ &l_daBL_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e | fopAcStts_UNK80000_e, /* Group */ fopAc_ENEMY_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_bmd.cpp b/src/d/actor/d_a_bmd.cpp index 45696d079..41d8e09b6 100644 --- a/src/d/actor/d_a_bmd.cpp +++ b/src/d/actor/d_a_bmd.cpp @@ -11,8 +11,6 @@ #include "d/d_kankyo_wether.h" #include "d/d_lib.h" #include "d/res/res_bmd.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" #include "d/d_s_play.h" #include "d/d_snap.h" @@ -1142,7 +1140,7 @@ void ride_call_back(dBgW* bgw, fopAc_ac_c* i_ac, fopAc_ac_c* i_pt) { cLib_addCalc2(&i_pt->current.pos.y, i_ac->current.pos.y, 1.0f, REG0_F(2) + 400.0f); cLib_addCalc2(&i_pt->current.pos.z, i_ac->current.pos.z, 1.0f, REG0_F(2) + 400.0f); i_pt->old.pos = i_pt->current.pos; - if (fopAcM_GetName(i_pt) == PROC_PLAYER) { + if (fopAcM_GetName(i_pt) == fpcNm_PLAYER_e) { i_this->m942 = 5; } } @@ -1489,7 +1487,7 @@ void demo_camera(bmd_class* i_this) { i_this->mB70 = 1; csXyz cStack_b8(0, 0, 0); cStack_b8.y = actor->shape_angle.y + 0x8BB8; - fopAcM_create(PROC_NPC_CB1, 0, &i_this->m2E0, fopAcM_GetRoomNo(actor), &cStack_b8); + fopAcM_create(fpcNm_NPC_CB1_e, 0, &i_this->m2E0, fopAcM_GetRoomNo(actor), &cStack_b8); i_this->m2DC = 0; // Fall-through } @@ -1972,11 +1970,11 @@ static cPhs_State daBmd_Create(fopAc_ac_c* a_this) { i_this->mSmokeCb[i].setFollowOff(); } if (dComIfGs_isStageBossEnemy() && (dComIfGp_getStartStageName()[0] != 'X')) { - if ((!dComIfGs_checkGetItem(dItem_PEARL_FARORE_e)) || (REG0_S(6) != 0)) { + if ((!dComIfGs_checkGetItem(dItemNo_PEARL_FARORE_e)) || (REG0_S(6) != 0)) { local_30.x = 100.0f; local_30.y = 0.0f; local_30.z = 800.0f; - fopAcM_create(PROC_NPC_CB1, 0, &local_30, fopAcM_GetRoomNo(a_this)); + fopAcM_create(fpcNm_NPC_CB1_e, 0, &local_30, fopAcM_GetRoomNo(a_this)); } res = cPhs_ERROR_e; } else if (!fopAcM_entrySolidHeap(a_this, solidHeapCB, 0x96000)) { @@ -1995,12 +1993,12 @@ static cPhs_State daBmd_Create(fopAc_ac_c* a_this) { for (s32 i = 0; i < 20; i++) { fopAcM_prm_class* params = fopAcM_CreateAppend(); params->base.parameters = i; - fopAcM_create(PROC_BMDHAND, 0, params); + fopAcM_create(fpcNm_BMDHAND_e, 0, params); } for (s32 i = 0; i < 8; i++) { fopAcM_prm_class* params = fopAcM_CreateAppend(); params->base.parameters = i; - fopAcM_create(PROC_BMDFOOT, 0, params); + fopAcM_create(fpcNm_BMDFOOT_e, 0, params); } a_this->home.pos.y += REG0_F(2) + 20.0f; a_this->current.pos.y = a_this->home.pos.y; @@ -2045,18 +2043,18 @@ static actor_method_class l_daBmd_Method = { }; actor_process_profile_definition g_profile_BMD = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_BMD, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_BMD_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(bmd_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_BMD, + /* Draw Prio */ fpcDwPi_BMD_e, /* Actor SubMtd */ &l_daBmd_Method, /* Status */ fopAcStts_SHOWMAP_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e | fopAcStts_BOSS_e, /* Group */ fopAc_ENEMY_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_bmdfoot.cpp b/src/d/actor/d_a_bmdfoot.cpp index 1c13334ee..5e78d8100 100644 --- a/src/d/actor/d_a_bmdfoot.cpp +++ b/src/d/actor/d_a_bmdfoot.cpp @@ -10,8 +10,6 @@ #include "d/actor/d_a_bmd.h" #include "d/d_s_play.h" #include "m_Do/m_Do_ext.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" class daBmdfoot_HIO_c : public JORReflexible { @@ -590,7 +588,7 @@ void move(bmdfoot_class* i_this) { /* 000021B8-00002204 .text s_a_d_sub__FPvPv */ void* s_a_d_sub(void* search, void* param_2) { UNUSED(param_2); - if ((fopAcM_IsActor(search)) && (fopAcM_GetName(search) == PROC_BMD)) { + if ((fopAcM_IsActor(search)) && (fopAcM_GetName(search) == fpcNm_BMD_e)) { return search; } else { return NULL; @@ -829,18 +827,18 @@ static actor_method_class l_daBmdfoot_Method = { }; actor_process_profile_definition g_profile_BMDFOOT = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_BMDFOOT, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_BMDFOOT_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(bmdfoot_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_BMDFOOT, + /* Draw Prio */ fpcDwPi_BMDFOOT_e, /* Actor SubMtd */ &l_daBmdfoot_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e | fopAcStts_BOSS_e, /* Group */ fopAc_ENEMY_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_bmdhand.cpp b/src/d/actor/d_a_bmdhand.cpp index abd553dc9..1f23ea214 100644 --- a/src/d/actor/d_a_bmdhand.cpp +++ b/src/d/actor/d_a_bmdhand.cpp @@ -8,8 +8,6 @@ #include "d/d_s_play.h" #include "d/res/res_bmdhand.h" #include "d/actor/d_a_bmd.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" class daBmdhand_HIO_c : public JORReflexible { @@ -662,7 +660,7 @@ void hand_move(bmdhand_class* i_this) { /* 00002E74-00002EC0 .text s_a_d_sub__FPvPv */ void* s_a_d_sub(void* param_1, void* param_2) { UNUSED(param_2); - if ((fopAcM_IsActor(param_1)) && (fopAcM_GetName(param_1) == PROC_BMD)) { + if ((fopAcM_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_BMD_e)) { return param_1; } else { return NULL; @@ -832,18 +830,18 @@ static actor_method_class l_daBmdhand_Method = { }; actor_process_profile_definition g_profile_BMDHAND = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_BMDHAND, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_BMDHAND_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(bmdhand_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_BMDHAND, + /* Draw Prio */ fpcDwPi_BMDHAND_e, /* Actor SubMtd */ &l_daBmdhand_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e | fopAcStts_BOSS_e, /* Group */ fopAc_ENEMY_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_bo.cpp b/src/d/actor/d_a_bo.cpp index 1b6b69336..c2aa3ca29 100644 --- a/src/d/actor/d_a_bo.cpp +++ b/src/d/actor/d_a_bo.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_bo.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" /* 000000EC-000001E8 .text smoke_set__FP8bo_class */ @@ -233,18 +231,18 @@ static actor_method_class l_daBO_Method = { }; actor_process_profile_definition g_profile_BO = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_BO, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_BO_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(bo_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_BO, + /* Draw Prio */ fpcDwPi_BO_e, /* Actor SubMtd */ &l_daBO_Method, /* Status */ fopAcStts_SHOWMAP_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ENEMY_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_boko.cpp b/src/d/actor/d_a_boko.cpp index eb2ee9ec7..731d17ca1 100644 --- a/src/d/actor/d_a_boko.cpp +++ b/src/d/actor/d_a_boko.cpp @@ -13,8 +13,6 @@ #include "d/res/res_spear.h" #include "d/res/res_pgsw.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_bg_s_lin_chk.h" #include "d/d_s_play.h" #include "SSystem/SComponent/c_counter.h" @@ -530,7 +528,7 @@ BOOL daBoko_c::procMove() { setRoomInfo(); if (mAcch.ChkGroundHit() && fVar14_3 <= 2.5f) { - if (dComIfG_Bgsp()->ChkMoveBG(mAcch.m_gnd) && fopAcM_GetName(dComIfG_Bgsp()->GetActorPointer(mAcch.m_gnd)) == PROC_TBOX) { + if (dComIfG_Bgsp()->ChkMoveBG(mAcch.m_gnd) && fopAcM_GetName(dComIfG_Bgsp()->GetActorPointer(mAcch.m_gnd)) == fpcNm_TBOX_e) { if (speedF < 15.0f) { speedF = 15.0f; } @@ -1057,18 +1055,18 @@ static actor_method_class l_daBoko_Method = { }; actor_process_profile_definition g_profile_BOKO = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0009, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_BOKO, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0009, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_BOKO_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daBoko_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_BOKO, + /* Draw Prio */ fpcDwPi_BOKO_e, /* Actor SubMtd */ &l_daBoko_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_bomb2.cpp b/src/d/actor/d_a_bomb2.cpp index 62ec1b72c..c4eb40bd7 100644 --- a/src/d/actor/d_a_bomb2.cpp +++ b/src/d/actor/d_a_bomb2.cpp @@ -8,8 +8,6 @@ #include "d/actor/d_a_sea.h" #include "d/actor/d_a_player.h" #include "d/d_a_obj.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_kankyo_wether.h" #include "d/d_com_inf_game.h" #include "d/res/res_vbakh.h" @@ -656,7 +654,7 @@ namespace daBomb2 { hitNormal *= attr().field_0x44; mWindVec.abs2(); fopAc_ac_c* hitActor = mSph.GetTgHitAc(); - if (hitActor && fopAcM_GetProfName(hitActor) == PROC_PLAYER) { + if (hitActor && fopAcM_GetProfName(hitActor) == fpcNm_PLAYER_e) { s16 hitObjAngleY = cM_atan2s(hitNormal.x, hitNormal.z); f32 f2 = cM_scos(hitActor->shape_angle.y - hitObjAngleY); if (f2 > 0.0f) { @@ -1339,18 +1337,18 @@ namespace daBomb2 { } actor_process_profile_definition g_profile_Bomb2 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Bomb2, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Bomb2_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daBomb2::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Bomb2, + /* Draw Prio */ fpcDwPi_Bomb2_e, /* Actor SubMtd */ &daBomb2::Mthd_Table, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_bomb3.inc b/src/d/actor/d_a_bomb3.inc index 6df357f87..e1d364e9a 100644 --- a/src/d/actor/d_a_bomb3.inc +++ b/src/d/actor/d_a_bomb3.inc @@ -7,8 +7,6 @@ #include "SSystem/SComponent/c_counter.h" #include "d/d_a_obj.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/actor/d_a_player_main.h" #include "d/actor/d_a_sea.h" #include "d/d_kankyo_wether.h" @@ -1173,7 +1171,7 @@ void daBomb_c::set_wind_vec() { hitNormal *= 50.0f; mWindVec.abs2(); fopAc_ac_c* hitActor = mSph.GetTgHitAc(); - if (hitActor && fopAcM_GetProfName(hitActor) == PROC_PLAYER) { + if (hitActor && fopAcM_GetProfName(hitActor) == fpcNm_PLAYER_e) { s16 hitObjAngleY = cM_atan2s(hitNormal.x, hitNormal.z); f32 f2 = cM_scos(hitActor->shape_angle.y - hitObjAngleY); if (f2 > 0.0f) { @@ -1520,18 +1518,18 @@ static actor_method_class l_daBomb_Method = { }; actor_process_profile_definition g_profile_BOMB = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_BOMB, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_BOMB_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daBomb_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_BOMB, + /* Draw Prio */ fpcDwPi_BOMB_e, /* Actor SubMtd */ &l_daBomb_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_boomerang.cpp b/src/d/actor/d_a_boomerang.cpp index d4b86755a..a456c19fe 100644 --- a/src/d/actor/d_a_boomerang.cpp +++ b/src/d/actor/d_a_boomerang.cpp @@ -6,8 +6,6 @@ #include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_boomerang.h" #include "d/d_camera.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" #include "d/d_material.h" #include "d/actor/d_a_player_main.h" @@ -854,18 +852,18 @@ static actor_method_class l_daBoomerang_Method = { }; actor_process_profile_definition g_profile_BOOMERANG = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_BOOMERANG, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_BOOMERANG_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daBoomerang_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_BOOMERANG, + /* Draw Prio */ fpcDwPi_BOOMERANG_e, /* Actor SubMtd */ &l_daBoomerang_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_boss_item.cpp b/src/d/actor/d_a_boss_item.cpp index 0a8d1f9e0..8e7f7add0 100644 --- a/src/d/actor/d_a_boss_item.cpp +++ b/src/d/actor/d_a_boss_item.cpp @@ -7,8 +7,6 @@ #include "d/actor/d_a_boss_item.h" #include "f_op/f_op_actor.h" #include "f_op/f_op_actor_mng.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_com_inf_game.h" /* 00000078-00000080 .text daBossItem_IsDelete__FP14bossitem_class */ @@ -48,18 +46,18 @@ static actor_method_class daBossItem_METHODS = { }; actor_process_profile_definition g_profile_BOSSITEM = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_BOSSITEM, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_BOSSITEM_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(bossitem_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_BOSSITEM, + /* Draw Prio */ fpcDwPi_BOSSITEM_e, /* Actor SubMtd */ &daBossItem_METHODS, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_bpw.cpp b/src/d/actor/d_a_bpw.cpp index a332c0d23..5da151c06 100644 --- a/src/d/actor/d_a_bpw.cpp +++ b/src/d/actor/d_a_bpw.cpp @@ -10,8 +10,6 @@ #include "d/d_lib.h" #include "d/d_snap.h" #include "d/res/res_bpw.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" #include "d/d_s_play.h" #include "f_op/f_op_camera.h" @@ -699,7 +697,7 @@ void noroi_check(bpw_class* i_this) { dComIfGp_particle_set(dPa_name::ID_IT_JN_PIYOHIT00, &i_this->mFire1DousaPos); r31 |= ACTOR_TYPE_TORITUKI; local_28.y = fopCamM_GetAngleY(camera); - fopAcM_create(PROC_BPW, r31, &i_this->mFire1DousaPos, fopAcM_GetRoomNo(actor), &local_28); + fopAcM_create(fpcNm_BPW_e, r31, &i_this->mFire1DousaPos, fopAcM_GetRoomNo(actor), &local_28); } } } @@ -905,7 +903,7 @@ void* skull_search_sub(void* param_1, void* param_2) { fopAc_ac_c* actor = (fopAc_ac_c*)param_1; if ((get_check_count < 100) && (fopAcM_IsActor(actor))) { - if ((fopAcM_GetName(actor) == PROC_BL) && (actor->health > 0)) { + if ((fopAcM_GetName(actor) == fpcNm_BL_e) && (actor->health > 0)) { check_info[get_check_count] = actor; get_check_count++; } @@ -1474,7 +1472,7 @@ void action_kougeki(bpw_class* i_this) { if (pfVar6 != NULL) { u32 params = ACTOR_TYPE_DAMAGE_BALL; params |= DAMAGE_ACTION_LINE << 8; - i_this->m400 = fopAcM_create(PROC_BPW, params, &pfVar6->m358, fopAcM_GetRoomNo(actor), &actor->current.angle); + i_this->m400 = fopAcM_create(fpcNm_BPW_e, params, &pfVar6->m358, fopAcM_GetRoomNo(actor), &actor->current.angle); i_this->mSomeCountdownTimers[0] = 0x46; i_this->mSomeCountdownTimers[0] += (int)cM_rndF(i_this->mSomeCountdownTimers[0]); i_this->m47A = 0x300; @@ -1551,7 +1549,7 @@ void action_kougeki(bpw_class* i_this) { cXyz cStack_44; MtxPosition(&local_38, &cStack_44); cStack_44 += pfVar7->m358; - i_this->m400 = fopAcM_create(PROC_BPW, params, &cStack_44, fopAcM_GetRoomNo(actor), &actor->current.angle); + i_this->m400 = fopAcM_create(fpcNm_BPW_e, params, &cStack_44, fopAcM_GetRoomNo(actor), &actor->current.angle); i_this->mSomeCountdownTimers[1] = REG12_S(4) + 7; if (player->checkConfuse()) { i_this->mSomeCountdownTimers[1] = REG12_S(4) + 9; @@ -2034,7 +2032,7 @@ void action_damage(bpw_class* i_this) { u32 uVar2 = uVar14 << 9 | 0xFF000003; for (i = 0; i < actor->health; i++) { f32 maxPoeSpread = ((s16)pwSpreadAmount * 0.25f); - i_this->mChildPoeIds[i] = fopAcM_createChild(PROC_PW, fopAcM_GetID(i_this), uVar2, &local_58, fopAcM_GetRoomNo(actor), &pwAngle); + i_this->mChildPoeIds[i] = fopAcM_createChild(fpcNm_PW_e, fopAcM_GetID(i_this), uVar2, &local_58, fopAcM_GetRoomNo(actor), &pwAngle); currRandomAngle += pwSpreadAmount; pwAngle.y = (s16)currRandomAngle; pwAngle.y += (int)cM_rndFX((f32)maxPoeSpread); @@ -2098,7 +2096,7 @@ void action_bunri_dousa(bpw_class* i_this) { u32 uVar2 = uVar14 << 9 | 0xFF000003; for (i = 0; i < actor->health; i++) { f32 maxPoeSpread = ((s16)pwSpreadAmount * 0.25f); - i_this->mChildPoeIds[i] = fopAcM_createChild(PROC_PW, fopAcM_GetID(i_this), uVar2, &local_58, fopAcM_GetRoomNo(actor), &pwAngle); + i_this->mChildPoeIds[i] = fopAcM_createChild(fpcNm_PW_e, fopAcM_GetID(i_this), uVar2, &local_58, fopAcM_GetRoomNo(actor), &pwAngle); currRandomAngle += pwSpreadAmount; pwAngle.y = (s16)currRandomAngle; pwAngle.y += (int)cM_rndFX((f32)maxPoeSpread); @@ -4604,7 +4602,7 @@ static cPhs_State daBPW_Create(fopAc_ac_c* a_this) { BG_check(i_this); draw_SUB(i_this); sp18.y += 0x4000; - i_this->m3FC = fopAcM_createChild(PROC_BPW, fopAcM_GetID(i_this), ACTOR_TYPE_KANTERA, &i_this->mChildActorPos, fopAcM_GetRoomNo(a_this), &sp18); + i_this->m3FC = fopAcM_createChild(fpcNm_BPW_e, fopAcM_GetID(i_this), ACTOR_TYPE_KANTERA, &i_this->mChildActorPos, fopAcM_GetRoomNo(a_this), &sp18); i_this->mAttWaitTimer = 1; kantera_calc(i_this); if ((dComIfGp_getStartStageName()[0] != 'X') && (REG0_S(9) != 0 || (!dComIfGs_isStageBossDemo()))) { @@ -4620,7 +4618,7 @@ static cPhs_State daBPW_Create(fopAc_ac_c* a_this) { uVar14 = (s16)cM_rndF(4.99f); u32 uVar2 = uVar14 << 9 | 0xFF000004; for (s32 i = 0; i < 15; i++) { - i_this->mChildPoeIds[i] = fopAcM_createChild(PROC_PW, fopAcM_GetID(i_this), uVar2, &local_58, fopAcM_GetRoomNo(a_this), &pwAngle); + i_this->mChildPoeIds[i] = fopAcM_createChild(fpcNm_PW_e, fopAcM_GetID(i_this), uVar2, &local_58, fopAcM_GetRoomNo(a_this), &pwAngle); currRandomAngle += pwSpreadAmount; pwAngle.y = (s16)currRandomAngle; pwAngle.y += (int)cM_rndFX((s16)pwSpreadAmount * 0.25f); @@ -4712,18 +4710,18 @@ static actor_method_class l_daBPW_Method = { }; actor_process_profile_definition g_profile_BPW = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_BPW, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_BPW_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(bpw_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_BPW, + /* Draw Prio */ fpcDwPi_BPW_e, /* Actor SubMtd */ &l_daBPW_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ENEMY_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_branch.cpp b/src/d/actor/d_a_branch.cpp index 63e4bd944..77a1cba40 100644 --- a/src/d/actor/d_a_branch.cpp +++ b/src/d/actor/d_a_branch.cpp @@ -8,8 +8,6 @@ #include "d/res/res_kwood_00.h" #include "JSystem/JUtility/JUTAssert.h" #include "f_op/f_op_actor_mng.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "m_Do/m_Do_mtx.h" #include "d/d_kankyo.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" @@ -245,16 +243,16 @@ static actor_method_class l_daBranch_Method = { }; actor_process_profile_definition g_profile_BRANCH = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_BRANCH, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_BRANCH_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daBranch_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_BRANCH, + /* Draw Prio */ fpcDwPi_BRANCH_e, /* Actor SubMtd */ &l_daBranch_Method, #if VERSION == VERSION_DEMO /* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, @@ -262,5 +260,5 @@ actor_process_profile_definition g_profile_BRANCH = { /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, #endif /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_bridge.cpp b/src/d/actor/d_a_bridge.cpp index 6e1e28b4b..edd2ba756 100644 --- a/src/d/actor/d_a_bridge.cpp +++ b/src/d/actor/d_a_bridge.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_bridge.h" #include "d/d_bg_w.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" #include "d/d_path.h" #include "d/d_com_inf_game.h" @@ -54,15 +52,15 @@ void ride_call_back(dBgW* bgw, fopAc_ac_c* i_ac, fopAc_ac_c* i_pt) { i_pt->speed.y = -5.0f; f32 fVar7; - if (fpcM_GetName(i_pt) == PROC_PLAYER) { + if (fpcM_GetName(i_pt) == fpcNm_PLAYER_e) { fVar7 = 100.0f; pBr->m3F4 = -31.0f; i_this->m033C = 5; - } else if (fpcM_GetName(i_pt) == PROC_MO2) { + } else if (fpcM_GetName(i_pt) == fpcNm_MO2_e) { fVar7 = 150.0f; pBr->m3F4 = -40.0f; i_pt->speed.y = -20.0f; - } else if (fpcM_GetName(i_pt) == PROC_BK) { + } else if (fpcM_GetName(i_pt) == fpcNm_BK_e) { bk_class* bk = (bk_class*)i_pt; bk->speed.y = -20.0f; fVar7 = 100.0f; @@ -84,7 +82,7 @@ void ride_call_back(dBgW* bgw, fopAc_ac_c* i_ac, fopAc_ac_c* i_pt) { } else { fVar7 = 50.0f; pBr->m3F4 = -10.0f; - if (fpcM_GetName(i_pt) == PROC_BOMB) { + if (fpcM_GetName(i_pt) == fpcNm_BOMB_e) { daBomb_c* bomb = (daBomb_c*)i_pt; if (bomb->getBombRestTime() <= 1) { @@ -840,7 +838,7 @@ void bridge_move(bridge_class* i_this) { /* 00002A1C-00002A8C .text s_a_b_sub__FPvPv */ void* s_a_b_sub(void* ac1, void* ac2) { - if (fopAc_IsActor(ac1) && fpcM_GetName(ac1) == PROC_BRIDGE && ac1 != ac2) { + if (fopAc_IsActor(ac1) && fpcM_GetName(ac1) == fpcNm_BRIDGE_e && ac1 != ac2) { bridge_class* bridge = (bridge_class*)ac1; if ((bridge->mTypeBits & 0x82) == 2) { return ac1; @@ -1530,18 +1528,18 @@ static actor_method_class l_daBridge_Method = { }; actor_process_profile_definition g_profile_BRIDGE = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_BRIDGE, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_BRIDGE_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(bridge_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_BRIDGE, + /* Draw Prio */ fpcDwPi_BRIDGE_e, /* Actor SubMtd */ &l_daBridge_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_bst.cpp b/src/d/actor/d_a_bst.cpp index 64a26228d..741e82efa 100644 --- a/src/d/actor/d_a_bst.cpp +++ b/src/d/actor/d_a_bst.cpp @@ -19,8 +19,6 @@ #include "f_op/f_op_msg_mng.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_graphic.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" #include "JSystem/JUtility/JUTReport.h" @@ -1087,7 +1085,7 @@ static BOOL bom_eat_check(bst_class* i_this) { if (hit_obj != NULL) { fopAc_ac_c* hit_actor = (fopAc_ac_c*)hit_obj->GetAc(); daBomb_c* bomb = (daBomb_c*)hit_actor; - if (hit_actor != NULL && fopAcM_GetName(hit_actor) == PROC_BOMB && bomb->getBombCheck_Flag() == 0 && bomb->getBombRestTime() > 1) { + if (hit_actor != NULL && fopAcM_GetName(hit_actor) == fpcNm_BOMB_e && bomb->getBombCheck_Flag() == 0 && bomb->getBombRestTime() > 1) { i_this->mBombId = fopAcM_GetID(bomb); bomb->setBombCheck_Flag(); bomb->change_state(daBomb_c::STATE_2); @@ -1576,12 +1574,12 @@ static void hana_demo(bst_class* i_this) { if ((s32)i_this->m02B8->getFrame() == 26) { int itemNo; if (dComIfGs_getArrowNum() == 0) { - itemNo = dItem_ARROW_10_e; + itemNo = dItemNo_ARROW_10_e; MtxP mtx = i_this->m02B8->getModel()->getAnmMtx(6); cMtx_copy(mtx, *calc_mtx); i_this->m2E9E = 0; } else { - itemNo = dItem_BOMB_5_e; + itemNo = dItemNo_BOMB_5_e; MtxP mtx = i_this->m02B8->getModel()->getAnmMtx(7); cMtx_copy(mtx, *calc_mtx); i_this->m2E9E = 1; @@ -3166,7 +3164,7 @@ static cPhs_State daBst_Create(fopAc_ac_c* a_this) { i_this->mEyeHealth[1] = 2; i_this->mEyeHealth[0] = 2; for (s32 i = 0; i < (s32)ARRAY_SIZE(i_this->m2E90); i++) { - i_this->m2E90[i] = fopAcM_create(PROC_ATT, 100, &actor->current.pos, fopAcM_GetRoomNo(actor)); + i_this->m2E90[i] = fopAcM_create(fpcNm_ATT_e, 100, &actor->current.pos, fopAcM_GetRoomNo(actor)); } for (s32 i = 0; i < (s32)ARRAY_SIZE(i_this->mCcD_beams); i++) { i_this->mCcD_beams[i].Set(beam_sph_src); @@ -3198,18 +3196,18 @@ static actor_method_class l_daBst_Method = { }; actor_process_profile_definition g_profile_BST = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_BST, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_BST_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(bst_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_BST, + /* Draw Prio */ fpcDwPi_BST_e, /* Actor SubMtd */ &l_daBst_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e | fopAcStts_BOSS_e, /* Group */ fopAc_ENEMY_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_btd.cpp b/src/d/actor/d_a_btd.cpp index f1901ee65..03e69355d 100644 --- a/src/d/actor/d_a_btd.cpp +++ b/src/d/actor/d_a_btd.cpp @@ -16,8 +16,6 @@ #include "d/res/res_btd.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_graphic.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" #include "f_op/f_op_camera.h" #include "JSystem/JUtility/JUTReport.h" @@ -1790,7 +1788,7 @@ static void move(btd_class* i_this) { /* 00005BCC-00005C24 .text k_a_d_sub__FPvPv */ static void* k_a_d_sub(void* i_this, void* param_2) { UNUSED(param_2); - if (((fopAcM_IsActor(i_this)) && (fopAcM_GetName(i_this) == PROC_KUI)) && (fopAcM_GetParam(i_this) == 0x511)) { + if (((fopAcM_IsActor(i_this)) && (fopAcM_GetName(i_this) == fpcNm_KUI_e)) && (fopAcM_GetParam(i_this) == 0x511)) { return i_this; } return NULL; @@ -1799,7 +1797,7 @@ static void* k_a_d_sub(void* i_this, void* param_2) { /* 00005C24-00005C70 .text dr2_a_d_sub__FPvPv */ static void* dr2_a_d_sub(void* i_this, void* param_2) { UNUSED(param_2); - if ((fopAcM_IsActor(i_this)) && (fopAcM_GetName(i_this) == PROC_DR2)) { + if ((fopAcM_IsActor(i_this)) && (fopAcM_GetName(i_this) == fpcNm_DR2_e)) { return i_this; } else { return NULL; @@ -1809,7 +1807,7 @@ static void* dr2_a_d_sub(void* i_this, void* param_2) { /* 00005C70-00005CC8 .text wepon_s_sub__FPvPv */ static void* wepon_s_sub(void* i_this, void* param_2) { UNUSED(param_2); - if (((fopAcM_IsActor(i_this)) && (fopAcM_GetName(i_this) == PROC_HIMO2)) || (fopAcM_GetName(i_this) == PROC_BOOMERANG)) { + if (((fopAcM_IsActor(i_this)) && (fopAcM_GetName(i_this) == fpcNm_HIMO2_e)) || (fopAcM_GetName(i_this) == fpcNm_BOOMERANG_e)) { return i_this; } return NULL; @@ -2982,7 +2980,7 @@ static cPhs_State daBtd_Create(fopAc_ac_c* a_this) { i_this->floor = dComIfGp_getMagma()->newFloor(local_48, actor->scale, fopAcM_GetRoomNo(actor), -0xFA); JUT_ASSERT(DEMO_SELECT(6003, 6096), i_this->floor != NULL); } - fopAcM_create(PROC_Ykgr, 0x10FF00, &actor->current.pos); + fopAcM_create(fpcNm_Ykgr_e, 0x10FF00, &actor->current.pos); dKy_custom_timeset(l_HIO.m30); return cPhs_COMPLEATE_e; } @@ -2996,18 +2994,18 @@ static actor_method_class l_daBtd_Method = { }; actor_process_profile_definition g_profile_BTD = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_BTD, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_BTD_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(btd_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_BTD, + /* Draw Prio */ fpcDwPi_BTD_e, /* Actor SubMtd */ &l_daBtd_Method, /* Status */ fopAcStts_UNK40000_e | fopAcStts_BOSS_e, /* Group */ fopAc_ENEMY_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_bwd.cpp b/src/d/actor/d_a_bwd.cpp index 8ec4868b4..79792ed25 100644 --- a/src/d/actor/d_a_bwd.cpp +++ b/src/d/actor/d_a_bwd.cpp @@ -9,8 +9,6 @@ #include "d/actor/d_a_player.h" #include "d/actor/d_a_player_main.h" #include "d/d_lib.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" #include "d/d_s_play.h" #include "d/d_bg_s_movebg_actor.h" @@ -115,7 +113,7 @@ void* ko_s_sub(void* param_1, void* param_2) { UNUSED(param_2); fopAc_ac_c* actor = (fopAc_ac_c*)param_1; - if ((fopAcM_IsActor(actor)) && (fopAcM_GetName(actor) == PROC_BWDS)) { + if ((fopAcM_IsActor(actor)) && (fopAcM_GetName(actor) == fpcNm_BWDS_e)) { if (ko_count < l_HIO.m26) { ko_ac[ko_count] = actor; ko_count++; @@ -130,7 +128,7 @@ void* ko_delete_sub(void* param_1, void* param_2) { UNUSED(param_2); bwds_class* actor = (bwds_class*)param_1; - if ((fopAcM_IsActor(actor)) && (fopAcM_GetName(actor) == PROC_BWDS)) { + if ((fopAcM_IsActor(actor)) && (fopAcM_GetName(actor) == fpcNm_BWDS_e)) { actor->m04F4 = 1; } return FALSE; @@ -613,7 +611,7 @@ void sita_hit(bwd_class* i_this) { { local_2c = i_this->mTongueSegments[0].m04; local_2c.y = REG0_F(9) + -600.0f + l_HIO.m28; - fopAcM_create(PROC_BWDS, 0x23, &local_2c, fopAcM_GetRoomNo(actor)); + fopAcM_create(fpcNm_BWDS_e, 0x23, &local_2c, fopAcM_GetRoomNo(actor)); if (i_this->m1710 == 0) { if (dComIfGp_getStartStageName()[0] == 'X') { mDoAud_bgmStart(JA_BGM_UNK_152); @@ -2166,7 +2164,7 @@ static BOOL daBwd_Execute(bwd_class* i_this) { } if (i_this->m18D8 == 0) { i_this->m18D8 = 1; - fopAcM_create(PROC_BWDG, 0, &actor->home.pos, fopAcM_GetRoomNo(actor), NULL, NULL, 0xff, NULL); + fopAcM_create(fpcNm_BWDG_e, 0, &actor->home.pos, fopAcM_GetRoomNo(actor), NULL, NULL, 0xff, NULL); } if (i_this->m17C4 != 0) { if (i_this->m17C4 == 0xFF) { @@ -2575,7 +2573,7 @@ static cPhs_State daBwd_Create(fopAc_ac_c* a_this) { i_this->m1714 = a_this->tevStr; #endif #if VERSION == VERSION_USA - i_this->m1BC0 = fopAcM_create(PROC_ATT, 0x65, &a_this->current.pos, fopAcM_GetRoomNo(a_this)); + i_this->m1BC0 = fopAcM_create(fpcNm_ATT_e, 0x65, &a_this->current.pos, fopAcM_GetRoomNo(a_this)); #endif return cPhs_COMPLEATE_e; } @@ -2589,18 +2587,18 @@ static actor_method_class l_daBwd_Method = { }; actor_process_profile_definition g_profile_BWD = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_BWD, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_BWD_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(bwd_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_BWD, + /* Draw Prio */ fpcDwPi_BWD_e, /* Actor SubMtd */ &l_daBwd_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e | fopAcStts_BOSS_e, /* Group */ fopAc_ENEMY_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_bwdg.cpp b/src/d/actor/d_a_bwdg.cpp index 330762a8c..5835dbcd6 100644 --- a/src/d/actor/d_a_bwdg.cpp +++ b/src/d/actor/d_a_bwdg.cpp @@ -8,8 +8,6 @@ #include "d/res/res_bwdg.h" #include "d/d_bg_w_hf.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/actor/d_a_bwd.h" #include "f_op/f_op_actor_mng.h" #include "dolphin/gf/GF.h" @@ -159,7 +157,7 @@ static void wave_cont(bwdg_class* i_this, u8 r4) { /* 00000734-00000780 .text boss_a_d_sub__FPvPv */ static void* boss_a_d_sub(void* param_1, void* param_2) { UNUSED(param_2); - if (fopAc_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_BWD) { + if (fopAc_IsActor(param_1) && fopAcM_GetName(param_1) == fpcNm_BWD_e) { return param_1; } return NULL; @@ -254,18 +252,18 @@ static actor_method_class l_daBwdg_Method = { }; actor_process_profile_definition g_profile_BWDG = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_BWDG, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_BWDG_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(bwdg_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_BWDG, + /* Draw Prio */ fpcDwPi_BWDG_e, /* Actor SubMtd */ &l_daBwdg_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ENEMY_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_bwds.cpp b/src/d/actor/d_a_bwds.cpp index d7a5a114b..df66a326b 100644 --- a/src/d/actor/d_a_bwds.cpp +++ b/src/d/actor/d_a_bwds.cpp @@ -7,8 +7,6 @@ #include "d/d_cc_uty.h" #include "d/d_bg_s_gnd_chk.h" #include "d/actor/d_a_bwds.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" #include "d/d_s_play.h" #include "m_Do/m_Do_mtx.h" @@ -1087,18 +1085,18 @@ static actor_method_class l_daBwds_Method = { }; actor_process_profile_definition g_profile_BWDS = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_BWDS, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_BWDS_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(bwds_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_BWDS, + /* Draw Prio */ fpcDwPi_BWDS_e, /* Actor SubMtd */ &l_daBwds_Method, /* Status */ fopAcStts_UNK40000_e | fopAcStts_UNK80000_e, /* Group */ fopAc_ENEMY_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_canon.cpp b/src/d/actor/d_a_canon.cpp index d2bb9a06e..a1a83d921 100644 --- a/src/d/actor/d_a_canon.cpp +++ b/src/d/actor/d_a_canon.cpp @@ -11,11 +11,9 @@ #include "d/actor/d_a_sea.h" #include "d/res/res_bomber.h" #include "m_Do/m_Do_ext.h" -#include "d/d_procname.h" #include "d/d_2dnumber.h" #include "d/d_kankyo.h" #include "d/d_kankyo_wether.h" -#include "d/d_priority.h" #include "d/d_s_play.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" @@ -190,7 +188,7 @@ void* daCanon_BreakTarget(void* arg1, void* arg2) { if (fopAcM_IsActor(arg1) && fopAcM_GetName(arg1) == tk_Obj_Barrel2_e) { fopAc_ac_c* ac1 = (fopAc_ac_c*)arg1; if (fopAcM_GetID(arg2) == fopAcM_GetLinkId(ac1)) { - fopAcM_create(PROC_BOMB, daBomb_c::prm_make(daBomb_c::STATE_0, false, false), &ac1->current.pos, -1, NULL, NULL, -1, dEv_extra_createCB); + fopAcM_create(fpcNm_BOMB_e, daBomb_c::prm_make(daBomb_c::STATE_0, false, false), &ac1->current.pos, -1, NULL, NULL, -1, dEv_extra_createCB); } } return NULL; @@ -706,18 +704,18 @@ static actor_method_class daCanonMethodTable = { }; actor_process_profile_definition g_profile_Canon = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Canon, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Canon_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daCanon_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Canon, + /* Draw Prio */ fpcDwPi_Canon_e, /* Actor SubMtd */ &daCanonMethodTable, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_cc.cpp b/src/d/actor/d_a_cc.cpp index 308d5f61f..02ad8625a 100644 --- a/src/d/actor/d_a_cc.cpp +++ b/src/d/actor/d_a_cc.cpp @@ -9,8 +9,6 @@ #include "d/actor/d_a_bomb.h" #include "d/actor/d_a_bomb2.h" #include "d/res/res_cc.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_s_play.h" #include "d/d_snap.h" #include "d/d_com_inf_game.h" @@ -274,12 +272,12 @@ void* s_b_sub(void* arg0, void* arg1) { UNUSED(arg1); if (fopAcM_IsActor(arg0)) { bool bVar2 = false; - if (fopAcM_GetName(arg0) == PROC_BOMB) { + if (fopAcM_GetName(arg0) == fpcNm_BOMB_e) { daBomb_c* bomb = (daBomb_c*)arg0; if (bomb->chk_state(daBomb_c::STATE_0)) { bVar2 = true; } - } else if (fopAcM_GetName(arg0) == PROC_Bomb2) { + } else if (fopAcM_GetName(arg0) == fpcNm_Bomb2_e) { daBomb2::Act_c* bomb2 = (daBomb2::Act_c*)arg0; if (bomb2->chk_explode() != false) { bVar2 = true; @@ -2006,7 +2004,7 @@ void* tsubo_search(void* arg1, void* arg2) { if (tmp < 100) #endif { - if (fopAcM_IsActor(actor1) && fopAcM_GetName(actor1) == PROC_TSUBO && actor1->current.pos.x == i_this->actor.current.pos.x && + if (fopAcM_IsActor(actor1) && fopAcM_GetName(actor1) == fpcNm_TSUBO_e && actor1->current.pos.x == i_this->actor.current.pos.x && std::fabsf(actor1->current.pos.y - i_this->actor.current.pos.y) < 10.0f && actor1->current.pos.z == i_this->actor.current.pos.z) { i_this->m30C = fopAcM_GetID(actor1); @@ -2095,15 +2093,15 @@ static BOOL daCC_Execute(cc_class* i_this) { i_this->actor.model = NULL; switch (i_this->mColorType) { case 2: - fopAcM_setGbaName(&i_this->actor, dItem_BOW_e, 30, 0x2b); + fopAcM_setGbaName(&i_this->actor, dItemNo_BOW_e, 30, 0x2b); break; case 3: - fopAcM_setGbaName(&i_this->actor, dItem_MIRROR_SHIELD_e, 16, 0x2e); + fopAcM_setGbaName(&i_this->actor, dItemNo_MIRROR_SHIELD_e, 16, 0x2e); break; case 4: - fopAcM_setGbaName(&i_this->actor, dItem_BOW_e, 10, 0x28); + fopAcM_setGbaName(&i_this->actor, dItemNo_BOW_e, 10, 0x28); break; } @@ -2757,18 +2755,18 @@ static actor_method_class l_daCC_Method = { }; actor_process_profile_definition g_profile_CC = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_CC, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_CC_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(cc_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_CC, + /* Draw Prio */ fpcDwPi_CC_e, /* Actor SubMtd */ &l_daCC_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e | fopAcStts_UNK80000_e, /* Group */ fopAc_ENEMY_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_coming2.cpp b/src/d/actor/d_a_coming2.cpp index f09a795f1..236aa2dc8 100644 --- a/src/d/actor/d_a_coming2.cpp +++ b/src/d/actor/d_a_coming2.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_coming2.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_bg_s_lin_chk.h" #include "d/d_bg_s_wtr_chk.h" #include "d/d_bg_s_gnd_chk.h" @@ -16,21 +14,21 @@ #include "d/actor/d_a_obj_barrel2.h" s32 daComing2::coming_make_item_no_table[] = { - dItem_GREEN_RUPEE_e, - dItem_GREEN_RUPEE_e, - dItem_GREEN_RUPEE_e, - dItem_GREEN_RUPEE_e, - dItem_GREEN_RUPEE_e, - dItem_BLUE_RUPEE_e, - dItem_BLUE_RUPEE_e, - dItem_BLUE_RUPEE_e, - dItem_BLUE_RUPEE_e, - dItem_BLUE_RUPEE_e, - dItem_YELLOW_RUPEE_e, - dItem_YELLOW_RUPEE_e, - dItem_YELLOW_RUPEE_e, - dItem_YELLOW_RUPEE_e, - dItem_YELLOW_RUPEE_e, + dItemNo_GREEN_RUPEE_e, + dItemNo_GREEN_RUPEE_e, + dItemNo_GREEN_RUPEE_e, + dItemNo_GREEN_RUPEE_e, + dItemNo_GREEN_RUPEE_e, + dItemNo_BLUE_RUPEE_e, + dItemNo_BLUE_RUPEE_e, + dItemNo_BLUE_RUPEE_e, + dItemNo_BLUE_RUPEE_e, + dItemNo_BLUE_RUPEE_e, + dItemNo_YELLOW_RUPEE_e, + dItemNo_YELLOW_RUPEE_e, + dItemNo_YELLOW_RUPEE_e, + dItemNo_YELLOW_RUPEE_e, + dItemNo_YELLOW_RUPEE_e, }; static void dummy() { @@ -231,7 +229,7 @@ BOOL daComing2::Act_c::make_coming_param(cXyz* outPos, daObjBarrel2::Type_e* out *outType = daObjBarrel2::Type_01_e; *outHasFlag = false; - *outDroppedItem = (unk_2A4 < 0xFu) ? coming_make_item_no_table[unk_2A4] : dItem_RECOVER_FAIRY_e; + *outDroppedItem = (unk_2A4 < 0xFu) ? coming_make_item_no_table[unk_2A4] : dItemNo_RECOVER_FAIRY_e; return TRUE; } return FALSE; @@ -676,18 +674,18 @@ static actor_method_class Mthd_Table = { }; // namespace daComing2 actor_process_profile_definition g_profile_Coming2 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Coming2, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Coming2_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daComing2::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Coming2, + /* Draw Prio */ fpcDwPi_Coming2_e, /* Actor SubMtd */ &daComing2::Mthd_Table, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_coming3.cpp b/src/d/actor/d_a_coming3.cpp index 7036f164e..321c44832 100644 --- a/src/d/actor/d_a_coming3.cpp +++ b/src/d/actor/d_a_coming3.cpp @@ -8,8 +8,6 @@ #include "d/actor/d_a_player.h" #include "d/actor/d_a_sea.h" #include "d/actor/d_a_obj_barrel2.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/res/res_always.h" #include "d/d_bg_s_gnd_chk.h" #include "d/d_bg_s_wtr_chk.h" @@ -196,7 +194,7 @@ void daComing3::Act_c::coming_start_main() { if (unk_400 == fpcM_ERROR_PROCESS_ID_e) { static s32 make_item_table[] = { - dItem_BLUE_RUPEE_e, dItem_YELLOW_RUPEE_e, + dItemNo_BLUE_RUPEE_e, dItemNo_YELLOW_RUPEE_e, }; unk_400 = daObjBarrel2::Act_c::make_coming( &sp18, @@ -512,18 +510,18 @@ static actor_method_class Mthd_Table = { }; // namespace daComing3 actor_process_profile_definition g_profile_Coming3 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Coming3, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Coming3_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daComing3::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Coming3, + /* Draw Prio */ fpcDwPi_Coming3_e, /* Actor SubMtd */ &daComing3::Mthd_Table, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_dai.cpp b/src/d/actor/d_a_dai.cpp index cba360b10..406479f7f 100644 --- a/src/d/actor/d_a_dai.cpp +++ b/src/d/actor/d_a_dai.cpp @@ -8,8 +8,6 @@ #include "d/actor/d_a_player.h" #include "d/actor/d_a_dai_item.h" #include "d/res/res_fdai.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_item.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" @@ -102,9 +100,9 @@ void daDai_c::CreateInit() { if (dComIfGs_getEventReg(m_savelabel[mSaveID])) { #if VERSION <= VERSION_JPN - void* pfVar3 = fopAcM_fastCreate(PROC_STANDITEM, dComIfGs_getEventReg(m_savelabel[mSaveID]), ¤t.pos, -1, ¤t.angle); + void* pfVar3 = fopAcM_fastCreate(fpcNm_STANDITEM_e, dComIfGs_getEventReg(m_savelabel[mSaveID]), ¤t.pos, -1, ¤t.angle); #else - void* pfVar3 = fopAcM_fastCreate(PROC_STANDITEM, dComIfGs_getEventReg(m_savelabel[mSaveID]), ¤t.pos, fopAcM_GetRoomNo(this), ¤t.angle); + void* pfVar3 = fopAcM_fastCreate(fpcNm_STANDITEM_e, dComIfGs_getEventReg(m_savelabel[mSaveID]), ¤t.pos, fopAcM_GetRoomNo(this), ¤t.angle); #endif m850 = fopAcM_GetID(pfVar3); incNowItemNum(); @@ -116,7 +114,7 @@ void daDai_c::CreateInit() { cPhs_State daDai_c::_create() { fopAcM_ct(this, daDai_c); - if (!checkItemGet(dItem_DELIVERY_BAG_e, TRUE)) { + if (!checkItemGet(dItemNo_DELIVERY_BAG_e, TRUE)) { return cPhs_ERROR_e; } @@ -375,18 +373,18 @@ static actor_method_class daDaiMethodTable = { }; actor_process_profile_definition g_profile_DAI = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_DAI, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_DAI_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daDai_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_DAI, + /* Draw Prio */ fpcDwPi_DAI_e, /* Actor SubMtd */ &daDaiMethodTable, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_dai_item.cpp b/src/d/actor/d_a_dai_item.cpp index 42d096703..577f386aa 100644 --- a/src/d/actor/d_a_dai_item.cpp +++ b/src/d/actor/d_a_dai_item.cpp @@ -7,127 +7,125 @@ #include "d/actor/d_a_dai_item.h" #include "SSystem/SComponent/c_math.h" #include "d/d_kankyo_wether.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_s_play.h" #include "d/res/res_fdai.h" #include "d/res/res_cloth.h" const char daStandItem_c::m_arcname[] = "Fdai"; const s16 daStandItem_c::m_bmdidx[] = { - FDAI_BDL_FOBJ00, /* FLOWER_1 */ - FDAI_BDL_FOBJ01, /* FLOWER_2 */ - FDAI_BDL_FOBJ02, /* FLOWER_3 */ - FDAI_BDL_FOBJ03, /* HEROS_FLAG */ - FDAI_BDL_FOBJ04, /* TAIRYO_FLAG */ - FDAI_BDL_FOBJ05, /* SALES_FLAG */ - FDAI_BDL_FOBJ06, /* WIND_FLAG */ - FDAI_BDL_FOBJ07, /* RED_FLAG */ - FDAI_BDL_FOBJ08, /* FOSSIL_HEAD */ - FDAI_BDL_FOBJ09, /* WATER_STATUE */ - FDAI_BDL_FOBJ10, /* POSTMAN_STATUE */ - FDAI_BDL_FOBJ11, /* PRESIDENT_STATUE */ + FDAI_BDL_FOBJ00, /* dItemNo_TOWN_FLOWER_e */ + FDAI_BDL_FOBJ01, /* dItemNo_SEA_FLOWER_e */ + FDAI_BDL_FOBJ02, /* dItemNo_EXOTIC_FLOWER_e */ + FDAI_BDL_FOBJ03, /* dItemNo_HEROS_FLAG_e */ + FDAI_BDL_FOBJ04, /* dItemNo_BIG_CATCH_FLAG_e */ + FDAI_BDL_FOBJ05, /* dItemNo_BIG_SALE_FLAG_e */ + FDAI_BDL_FOBJ06, /* dItemNo_PINWHEEL_e */ + FDAI_BDL_FOBJ07, /* dItemNo_SICKLE_MOON_FLAG_e */ + FDAI_BDL_FOBJ08, /* dItemNo_SKULL_TOWER_IDOL_e */ + FDAI_BDL_FOBJ09, /* dItemNo_FOUNTAIN_IDOL_e */ + FDAI_BDL_FOBJ10, /* dItemNo_POSTMAN_STATUE_e */ + FDAI_BDL_FOBJ11, /* dItemNo_SHOP_GURU_STATUE_e */ }; const s16 daStandItem_c::m_bckidx[] = { - FDAI_BCK_FOBJ00, /* FLOWER_1 */ - FDAI_BCK_FOBJ01, /* FLOWER_2 */ - FDAI_BCK_FOBJ02, /* FLOWER_3 */ - -1, /* HEROS_FLAG */ - -1, /* TAIRYO_FLAG */ - FDAI_BCK_FOBJ05, /* SALES_FLAG */ - -1, /* WIND_FLAG */ - FDAI_BCK_FOBJ07, /* RED_FLAG */ - FDAI_BCK_FOBJ08, /* FOSSIL_HEAD */ - FDAI_BCK_FOBJ09, /* WATER_STATUE */ - FDAI_BCK_FOBJ10, /* POSTMAN_STATUE */ - FDAI_BCK_FOBJ11, /* PRESIDENT_STATUE */ + FDAI_BCK_FOBJ00, /* dItemNo_TOWN_FLOWER_e */ + FDAI_BCK_FOBJ01, /* dItemNo_SEA_FLOWER_e */ + FDAI_BCK_FOBJ02, /* dItemNo_EXOTIC_FLOWER_e */ + -1, /* dItemNo_HEROS_FLAG_e */ + -1, /* dItemNo_BIG_CATCH_FLAG_e */ + FDAI_BCK_FOBJ05, /* dItemNo_BIG_SALE_FLAG_e */ + -1, /* dItemNo_PINWHEEL_e */ + FDAI_BCK_FOBJ07, /* dItemNo_SICKLE_MOON_FLAG_e */ + FDAI_BCK_FOBJ08, /* dItemNo_SKULL_TOWER_IDOL_e */ + FDAI_BCK_FOBJ09, /* dItemNo_FOUNTAIN_IDOL_e */ + FDAI_BCK_FOBJ10, /* dItemNo_POSTMAN_STATUE_e */ + FDAI_BCK_FOBJ11, /* dItemNo_SHOP_GURU_STATUE_e */ }; const u16 daStandItem_c::m_heapsize[] = { - 0x2000, /* FLOWER_1 */ - 0x2000, /* FLOWER_2 */ - 0x2000, /* FLOWER_3 */ - 0x2000, /* HEROS_FLAG */ - 0x2000, /* TAIRYO_FLAG */ - 0x2000, /* SALES_FLAG */ - 0x2000, /* WIND_FLAG */ - 0x2000, /* RED_FLAG */ - 0x2000, /* FOSSIL_HEAD */ - 0x2000, /* WATER_STATUE */ - 0x2000, /* POSTMAN_STATUE */ - 0x2000, /* PRESIDENT_STATUE */ + 0x2000, /* dItemNo_TOWN_FLOWER_e */ + 0x2000, /* dItemNo_SEA_FLOWER_e */ + 0x2000, /* dItemNo_EXOTIC_FLOWER_e */ + 0x2000, /* dItemNo_HEROS_FLAG_e */ + 0x2000, /* dItemNo_BIG_CATCH_FLAG_e */ + 0x2000, /* dItemNo_BIG_SALE_FLAG_e */ + 0x2000, /* dItemNo_PINWHEEL_e */ + 0x2000, /* dItemNo_SICKLE_MOON_FLAG_e */ + 0x2000, /* dItemNo_SKULL_TOWER_IDOL_e */ + 0x2000, /* dItemNo_FOUNTAIN_IDOL_e */ + 0x2000, /* dItemNo_POSTMAN_STATUE_e */ + 0x2000, /* dItemNo_SHOP_GURU_STATUE_e */ }; const s16 daStandItem_c::m_anim_min_time[] = { - 50, /* FLOWER_1 */ - 50, /* FLOWER_2 */ - 50, /* FLOWER_3 */ - 50, /* HEROS_FLAG */ - 50, /* TAIRYO_FLAG */ - 50, /* SALES_FLAG */ - 50, /* WIND_FLAG */ - 50, /* RED_FLAG */ - 30, /* FOSSIL_HEAD */ - 20, /* WATER_STATUE */ - 50, /* POSTMAN_STATUE */ - 50, /* PRESIDENT_STATUE */ + 50, /* dItemNo_TOWN_FLOWER_e */ + 50, /* dItemNo_SEA_FLOWER_e */ + 50, /* dItemNo_EXOTIC_FLOWER_e */ + 50, /* dItemNo_HEROS_FLAG_e */ + 50, /* dItemNo_BIG_CATCH_FLAG_e */ + 50, /* dItemNo_BIG_SALE_FLAG_e */ + 50, /* dItemNo_PINWHEEL_e */ + 50, /* dItemNo_SICKLE_MOON_FLAG_e */ + 30, /* dItemNo_SKULL_TOWER_IDOL_e */ + 20, /* dItemNo_FOUNTAIN_IDOL_e */ + 50, /* dItemNo_POSTMAN_STATUE_e */ + 50, /* dItemNo_SHOP_GURU_STATUE_e */ }; const s16 daStandItem_c::m_anim_max_time[] = { - 100, /* FLOWER_1 */ - 100, /* FLOWER_2 */ - 100, /* FLOWER_3 */ - 100, /* HEROS_FLAG */ - 100, /* TAIRYO_FLAG */ - 100, /* SALES_FLAG */ - 100, /* WIND_FLAG */ - 100, /* RED_FLAG */ - 100, /* FOSSIL_HEAD */ - 20, /* WATER_STATUE */ - 100, /* POSTMAN_STATUE */ - 100, /* PRESIDENT_STATUE */ + 100, /* dItemNo_TOWN_FLOWER_e */ + 100, /* dItemNo_SEA_FLOWER_e */ + 100, /* dItemNo_EXOTIC_FLOWER_e */ + 100, /* dItemNo_HEROS_FLAG_e */ + 100, /* dItemNo_BIG_CATCH_FLAG_e */ + 100, /* dItemNo_BIG_SALE_FLAG_e */ + 100, /* dItemNo_PINWHEEL_e */ + 100, /* dItemNo_SICKLE_MOON_FLAG_e */ + 100, /* dItemNo_SKULL_TOWER_IDOL_e */ + 20, /* dItemNo_FOUNTAIN_IDOL_e */ + 100, /* dItemNo_POSTMAN_STATUE_e */ + 100, /* dItemNo_SHOP_GURU_STATUE_e */ }; const s16 daStandItem_c::m_stop_min_time[] = { - 50, /* FLOWER_1 */ - 50, /* FLOWER_2 */ - 50, /* FLOWER_3 */ - 50, /* HEROS_FLAG */ - 50, /* TAIRYO_FLAG */ - 50, /* SALES_FLAG */ - 50, /* WIND_FLAG */ - 50, /* RED_FLAG */ - 50, /* FOSSIL_HEAD */ - 600, /* WATER_STATUE */ - 50, /* POSTMAN_STATUE */ - 0, /* PRESIDENT_STATUE */ + 50, /* dItemNo_TOWN_FLOWER_e */ + 50, /* dItemNo_SEA_FLOWER_e */ + 50, /* dItemNo_EXOTIC_FLOWER_e */ + 50, /* dItemNo_HEROS_FLAG_e */ + 50, /* dItemNo_BIG_CATCH_FLAG_e */ + 50, /* dItemNo_BIG_SALE_FLAG_e */ + 50, /* dItemNo_PINWHEEL_e */ + 50, /* dItemNo_SICKLE_MOON_FLAG_e */ + 50, /* dItemNo_SKULL_TOWER_IDOL_e */ + 600, /* dItemNo_FOUNTAIN_IDOL_e */ + 50, /* dItemNo_POSTMAN_STATUE_e */ + 0, /* dItemNo_SHOP_GURU_STATUE_e */ }; const s16 daStandItem_c::m_stop_max_time[] = { - 100, /* FLOWER_1 */ - 100, /* FLOWER_2 */ - 100, /* FLOWER_3 */ - 100, /* HEROS_FLAG */ - 100, /* TAIRYO_FLAG */ - 100, /* SALES_FLAG */ - 100, /* WIND_FLAG */ - 100, /* RED_FLAG */ - 200, /* FOSSIL_HEAD */ - 1000, /* WATER_STATUE */ - 100, /* POSTMAN_STATUE */ - 0, /* PRESIDENT_STATUE */ + 100, /* dItemNo_TOWN_FLOWER_e */ + 100, /* dItemNo_SEA_FLOWER_e */ + 100, /* dItemNo_EXOTIC_FLOWER_e */ + 100, /* dItemNo_HEROS_FLAG_e */ + 100, /* dItemNo_BIG_CATCH_FLAG_e */ + 100, /* dItemNo_BIG_SALE_FLAG_e */ + 100, /* dItemNo_PINWHEEL_e */ + 100, /* dItemNo_SICKLE_MOON_FLAG_e */ + 200, /* dItemNo_SKULL_TOWER_IDOL_e */ + 1000, /* dItemNo_FOUNTAIN_IDOL_e */ + 100, /* dItemNo_POSTMAN_STATUE_e */ + 0, /* dItemNo_SHOP_GURU_STATUE_e */ }; /* 800E3638-800E36C8 .text convItemNo__FUc */ static u32 convItemNo(u8 itemNo) { switch (itemNo) { - case FLOWER_1: return 0; - case FLOWER_2: return 1; - case FLOWER_3: return 2; - case HEROS_FLAG: return 3; - case TAIRYO_FLAG: return 4; - case SALES_FLAG: return 5; - case WIND_FLAG: return 6; - case RED_FLAG: return 7; - case FOSSIL_HEAD: return 8; - case WATER_STATUE: return 9; - case POSTMAN_STATUE: return 10; - case PRESIDENT_STATUE: return 11; + case dItemNo_TOWN_FLOWER_e: return 0; + case dItemNo_SEA_FLOWER_e: return 1; + case dItemNo_EXOTIC_FLOWER_e: return 2; + case dItemNo_HEROS_FLAG_e: return 3; + case dItemNo_BIG_CATCH_FLAG_e: return 4; + case dItemNo_BIG_SALE_FLAG_e: return 5; + case dItemNo_PINWHEEL_e: return 6; + case dItemNo_SICKLE_MOON_FLAG_e: return 7; + case dItemNo_SKULL_TOWER_IDOL_e: return 8; + case dItemNo_FOUNTAIN_IDOL_e: return 9; + case dItemNo_POSTMAN_STATUE_e: return 10; + case dItemNo_SHOP_GURU_STATUE_e: return 11; default: return 0; } } @@ -219,7 +217,7 @@ BOOL daStandItem_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname, m_bmdidx[mItemType]); JUT_ASSERT(0x239, modelData != NULL); - if (mItemNo == PRESIDENT_STATUE) { + if (mItemNo == dItemNo_SHOP_GURU_STATUE_e) { mpModel = mDoExt_J3DModel__create(modelData, 0x0, 0x11020203); } else { mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022); @@ -234,18 +232,18 @@ BOOL daStandItem_c::CreateHeap() { mpBckAnm = new mDoExt_bckAnm(); static const u32 playmode[] = { - /* FLOWER_1 */ J3DFrameCtrl::EMode_LOOP, - /* FLOWER_2 */ J3DFrameCtrl::EMode_LOOP, - /* FLOWER_3 */ J3DFrameCtrl::EMode_LOOP, - /* HEROS_FLAG */ -1, - /* TAIRYO_FLAG */ -1, - /* SALES_FLAG */ J3DFrameCtrl::EMode_LOOP, - /* WIND_FLAG */ J3DFrameCtrl::EMode_LOOP, - /* RED_FLAG */ J3DFrameCtrl::EMode_LOOP, - /* FOSSIL_HEAD */ J3DFrameCtrl::EMode_LOOP, - /* WATER_STATUE */ J3DFrameCtrl::EMode_NONE, - /* POSTMAN_STATUE */ J3DFrameCtrl::EMode_LOOP, - /* PRESIDENT_STATUE */ J3DFrameCtrl::EMode_LOOP, + /* dItemNo_TOWN_FLOWER_e */ J3DFrameCtrl::EMode_LOOP, + /* dItemNo_SEA_FLOWER_e */ J3DFrameCtrl::EMode_LOOP, + /* dItemNo_EXOTIC_FLOWER_e */ J3DFrameCtrl::EMode_LOOP, + /* dItemNo_HEROS_FLAG_e */ -1, + /* dItemNo_BIG_CATCH_FLAG_e */ -1, + /* dItemNo_BIG_SALE_FLAG_e */ J3DFrameCtrl::EMode_LOOP, + /* dItemNo_PINWHEEL_e */ J3DFrameCtrl::EMode_LOOP, + /* dItemNo_SICKLE_MOON_FLAG_e */ J3DFrameCtrl::EMode_LOOP, + /* dItemNo_SKULL_TOWER_IDOL_e */ J3DFrameCtrl::EMode_LOOP, + /* dItemNo_FOUNTAIN_IDOL_e */ J3DFrameCtrl::EMode_NONE, + /* dItemNo_POSTMAN_STATUE_e */ J3DFrameCtrl::EMode_LOOP, + /* dItemNo_SHOP_GURU_STATUE_e */ J3DFrameCtrl::EMode_LOOP, }; if (mpBckAnm == NULL || !mpBckAnm->init(modelData, pbck, TRUE, playmode[mItemType])) @@ -254,7 +252,7 @@ BOOL daStandItem_c::CreateHeap() { mpBckAnm->setPlaySpeed(0.0f); } - if (mItemNo == HEROS_FLAG || mItemNo == TAIRYO_FLAG || mItemNo == SALES_FLAG || mItemNo == RED_FLAG) { + if (mItemNo == dItemNo_HEROS_FLAG_e || mItemNo == dItemNo_BIG_CATCH_FLAG_e || mItemNo == dItemNo_BIG_SALE_FLAG_e || mItemNo == dItemNo_SICKLE_MOON_FLAG_e) { typedef dCloth_packet_c* (*ClothFunc)(ResTIMG*, ResTIMG*, dKy_tevstr_c*, cXyz**); ClothFunc clothFunc[] = { @@ -272,17 +270,17 @@ BOOL daStandItem_c::CreateHeap() { }; switch (mItemNo) { - case HEROS_FLAG: + case dItemNo_HEROS_FLAG_e: mClothType = 0; break; - case TAIRYO_FLAG: + case dItemNo_BIG_CATCH_FLAG_e: mClothType = 1; break; - case SALES_FLAG: + case dItemNo_BIG_SALE_FLAG_e: mClothType = 2; break; default: - case RED_FLAG: + case dItemNo_SICKLE_MOON_FLAG_e: mClothType = 3; break; } @@ -320,7 +318,7 @@ void daStandItem_c::CreateInit() { const char* jointName; u16 i; switch (mItemNo) { - case WIND_FLAG: + case dItemNo_PINWHEEL_e: { for (i = 0; i < mpModel->getModelData()->getJointNum(); i++) { jointName = jointNameTab->getName(i); @@ -333,7 +331,7 @@ void daStandItem_c::CreateInit() { mpModel->calc(); } break; - case WATER_STATUE: + case dItemNo_FOUNTAIN_IDOL_e: { for (i = 0; i < mpModel->getModelData()->getJointNum(); i++) { jointName = jointNameTab->getName(i); @@ -756,12 +754,12 @@ void daStandItem_c::mode_drop() { bool daStandItem_c::_draw() { g_env_light.settingTevStruct(TEV_TYPE_ACTOR, ¤t.pos, &tevStr); g_env_light.setLightTevColorType(mpModel, &tevStr); - if (mItemNo == WIND_FLAG) + if (mItemNo == dItemNo_PINWHEEL_e) mDoExt_bckAnmRemove(mpModel->getModelData()); else if (mpBckAnm != NULL) mpBckAnm->entry(mpModel->getModelData()); - if (mItemNo == PRESIDENT_STATUE) + if (mItemNo == dItemNo_SHOP_GURU_STATUE_e) dDlst_texSpecmapST(&eyePos, &tevStr, mpModel->getModelData(), 1.0f); mDoExt_modelUpdateDL(mpModel); @@ -805,18 +803,18 @@ static actor_method_class daStandItemMethodTable = { }; actor_process_profile_definition g_profile_STANDITEM = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0008, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_STANDITEM, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0008, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_STANDITEM_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daStandItem_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_STANDITEM, + /* Draw Prio */ fpcDwPi_STANDITEM_e, /* Actor SubMtd */ &daStandItemMethodTable, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_daiocta.cpp b/src/d/actor/d_a_daiocta.cpp index 0210ad41c..c420aebb0 100644 --- a/src/d/actor/d_a_daiocta.cpp +++ b/src/d/actor/d_a_daiocta.cpp @@ -13,8 +13,6 @@ #include "d/d_cc_d.h" #include "d/d_jnt_hit.h" #include "d/d_lib.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_s_play.h" #include "d/d_snap.h" #include "d/res/res_daiocta.h" @@ -168,7 +166,7 @@ static void coHit_CB(fopAc_ac_c* i_this, dCcD_GObjInf*, fopAc_ac_c* i_actor, dCc /* 00000358-000003DC .text _coHit__11daDaiocta_cFP10fopAc_ac_c */ void daDaiocta_c::_coHit(fopAc_ac_c* i_actor) { - if (i_actor != NULL && fpcM_GetName(i_actor) == PROC_BOMB) { + if (i_actor != NULL && fpcM_GetName(i_actor) == fpcNm_BOMB_e) { daBomb_c* bomb_p = (daBomb_c *) i_actor; if ((mMode == MODE_WAIT || mMode == MODE_DAMAGE_BOMB || mMode == MODE_APPEAR || mMode == MODE_DAMAGE) && @@ -908,7 +906,7 @@ void daDaiocta_c::modeAppearInit() { } #else int auzu_parameters = 0x1100FF; - mAuzuId = fopAcM_create(PROC_Obj_Auzu, auzu_parameters, &auzu_pos, tevStr.mRoomNo); + mAuzuId = fopAcM_create(fpcNm_Obj_Auzu_e, auzu_parameters, &auzu_pos, tevStr.mRoomNo); #endif setEffect(dPa_name::ID_IT_SN_DO_APPSHIBUKI00); @@ -1092,7 +1090,7 @@ void daDaiocta_c::modeDemoInit() { /* 000028FC-00003150 .text modeDemo__11daDaiocta_cFv */ void daDaiocta_c::modeDemo() { current.pos.y = mWaterY; - daShip_c* ship_p_1 = (daShip_c *) fopAcM_SearchByName(PROC_SHIP); + daShip_c* ship_p_1 = (daShip_c *) fopAcM_SearchByName(fpcNm_SHIP_e); m21F4 = ship_p_1->current.pos; m2200 = ship_p_1->current.angle; @@ -1145,7 +1143,7 @@ void daDaiocta_c::modeDemo() { m21F4.x += (dist / (REG12_F(1) + 60.0f)) * cM_ssin(target_angle_y); } - daShip_c* ship_p_2 = (daShip_c *) fopAcM_SearchByName(PROC_SHIP); + daShip_c* ship_p_2 = (daShip_c *) fopAcM_SearchByName(fpcNm_SHIP_e); ship_p_2->initStartPos(&m21F4, m2200.y); } @@ -1159,7 +1157,7 @@ void daDaiocta_c::modeDemo() { cLib_chasePosXZ(&m21F4, current.pos, m2208); cLib_addCalcAngleS2(&m2200.y, target_angle_y + 0x8000, 4, 0x800); - daShip_c* ship_p_2 = (daShip_c *) fopAcM_SearchByName(PROC_SHIP); + daShip_c* ship_p_2 = (daShip_c *) fopAcM_SearchByName(fpcNm_SHIP_e); ship_p_2->initStartPos(&m21F4, m2200.y); if ((current.pos - m21F4).absXZ() < 10.0f && (mpMorf->isStop() || mPrmIdx == 2)) { @@ -1653,7 +1651,7 @@ void daDaiocta_c::createInit() { for (int i = 0; i < ARRAY_SSIZE(mDaioctaEyePcId); i++) { if (mEyeAlloc[i] == true) { mDaioctaEyePcId[i] = fopAcM_createChild( - PROC_DAIOCTA_EYE, fpcM_GetID(this), + fpcNm_DAIOCTA_EYE_e, fpcM_GetID(this), -1, ¤t.pos, tevStr.mRoomNo, NULL ); @@ -1662,7 +1660,7 @@ void daDaiocta_c::createInit() { #if VERSION > VERSION_JPN mAuzuId = fopAcM_create( - PROC_Obj_Auzu, + fpcNm_Obj_Auzu_e, 0x1100FF, ¤t.pos, tevStr.mRoomNo @@ -1760,18 +1758,18 @@ static actor_method_class daDaioctaMethodTable = { }; actor_process_profile_definition g_profile_DAIOCTA = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_DAIOCTA, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_DAIOCTA_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daDaiocta_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_DAIOCTA, + /* Draw Prio */ fpcDwPi_DAIOCTA_e, /* Actor SubMtd */ &daDaioctaMethodTable, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ENEMY_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_daiocta_eye.cpp b/src/d/actor/d_a_daiocta_eye.cpp index c9c679ed8..b96c14ba6 100644 --- a/src/d/actor/d_a_daiocta_eye.cpp +++ b/src/d/actor/d_a_daiocta_eye.cpp @@ -11,8 +11,6 @@ #include "d/d_bg_s_func.h" #include "d/d_cc_d.h" #include "d/d_lib.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/res/res_daiocta.h" const s32 daDaiocta_Eye_c::m_heapsize = 2848; @@ -184,7 +182,7 @@ void coHit_CB(fopAc_ac_c* i_this, dCcD_GObjInf*, fopAc_ac_c* i_actor, dCcD_GObjI /* 00000510-000005D0 .text _coHit__15daDaiocta_Eye_cFP10fopAc_ac_c */ void daDaiocta_Eye_c::_coHit(fopAc_ac_c* i_actor) { - if (fpcM_GetName(i_actor) == PROC_BOMB) { + if (fpcM_GetName(i_actor) == fpcNm_BOMB_e) { daBomb_c* bomb_p = (daBomb_c *) i_actor; if (bomb_p->chk_state(daBomb_c::STATE_4)) { if (!mbIsDead) { @@ -461,7 +459,7 @@ void daDaiocta_Eye_c::createInit() { mEyeScale.setall(1.0f); if (parentActorID != fpcM_ERROR_PROCESS_ID_e) { fopAc_ac_c* parent_p = fopAcM_SearchByID(parentActorID); - if (parent_p && fopAc_IsActor(parent_p) && fpcM_GetName(parent_p) == PROC_DAIOCTA) { + if (parent_p && fopAc_IsActor(parent_p) && fpcM_GetName(parent_p) == fpcNm_DAIOCTA_e) { mpParentActor = (daDaiocta_c *) parent_p; } } @@ -521,18 +519,18 @@ static actor_method_class daDaiocta_EyeMethodTable = { }; actor_process_profile_definition g_profile_DAIOCTA_EYE = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_DAIOCTA_EYE, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_DAIOCTA_EYE_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daDaiocta_Eye_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_DAIOCTA_EYE, + /* Draw Prio */ fpcDwPi_DAIOCTA_EYE_e, /* Actor SubMtd */ &daDaiocta_EyeMethodTable, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_4_e, + /* Cull Type */ fopAc_CULLBOX_4_e, }; diff --git a/src/d/actor/d_a_deku_item.cpp b/src/d/actor/d_a_deku_item.cpp index 016fd1627..e96657dd7 100644 --- a/src/d/actor/d_a_deku_item.cpp +++ b/src/d/actor/d_a_deku_item.cpp @@ -7,8 +7,6 @@ #include "d/actor/d_a_deku_item.h" #include "d/res/res_deku.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" const char daDekuItem_c::m_arcname[] = "Deku"; @@ -202,7 +200,7 @@ void daDekuItem_c::mode_getdemo_init() { /* 00000CB8-00000D34 .text mode_getdemo_wait__12daDekuItem_cFv */ void daDekuItem_c::mode_getdemo_wait() { if (!unk630) { - mItemPID = fopAcM_createItemForTrBoxDemo(¤t.pos, dItem_DEKU_LEAF_e, -1, fopAcM_GetRoomNo(this)); + mItemPID = fopAcM_createItemForTrBoxDemo(¤t.pos, dItemNo_DEKU_LEAF_e, -1, fopAcM_GetRoomNo(this)); if (mItemPID != fpcM_ERROR_PROCESS_ID_e) { dComIfGp_event_setItemPartnerId(mItemPID); @@ -283,18 +281,18 @@ static actor_method_class daDekuItemMethodTable = { }; actor_process_profile_definition g_profile_DEKU_ITEM = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_DEKU_ITEM, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_DEKU_ITEM_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daDekuItem_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_DEKU_ITEM, + /* Draw Prio */ fpcDwPi_DEKU_ITEM_e, /* Actor SubMtd */ &daDekuItemMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_demo00.cpp b/src/d/actor/d_a_demo00.cpp index c1685e422..e125d6b98 100644 --- a/src/d/actor/d_a_demo00.cpp +++ b/src/d/actor/d_a_demo00.cpp @@ -15,8 +15,6 @@ #include "d/d_item.h" #include "d/d_kankyo.h" #include "d/d_kankyo_demo.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_graphic.h" @@ -715,16 +713,16 @@ BOOL daDemo00_c::execute() { } } else if (field_0x29c == 5) { static const u8 l_itemNo[] = { - dItem_MASTER_SWORD_1_e, - dItem_MASTER_SWORD_2_e, - dItem_MASTER_SWORD_3_e, - dItem_PEARL_DIN_e, - dItem_PEARL_FARORE_e, - dItem_PEARL_NAYRU_e, - dItem_DELIVERY_BAG_e, - dItem_SHIELD_e, - dItem_MAGIC_ARROW_e, - dItem_NONE_e, + dItemNo_MASTER_SWORD_1_e, + dItemNo_MASTER_SWORD_2_e, + dItemNo_MASTER_SWORD_3_e, + dItemNo_PEARL_DIN_e, + dItemNo_PEARL_FARORE_e, + dItemNo_PEARL_NAYRU_e, + dItemNo_DELIVERY_BAG_e, + dItemNo_SHIELD_e, + dItemNo_MAGIC_ARROW_e, + dItemNo_NONE_e, }; dDemo_prm_data* data = demo_actor->getPrm()->getData(); JStudio::stb::TParseData_fixed<49, TValueIterator_raw > spB8(data); @@ -732,7 +730,7 @@ BOOL daDemo00_c::execute() { TValueIterator_raw it = spB8.begin(); int argID = *it; JUT_ASSERT(VERSION_SELECT(797, 844, 858, 858), argID < (sizeof(l_itemNo)/sizeof(u8))); - if (l_itemNo[argID] != dItem_NONE_e) { + if (l_itemNo[argID] != dItemNo_NONE_e) { execItemGet(l_itemNo[argID]); } } @@ -849,18 +847,18 @@ static actor_method_class l_daDemo00_Method = { }; actor_process_profile_definition g_profile_DEMO00 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_DEMO00, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_DEMO00_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daDemo00_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_DEMO00, + /* Draw Prio */ fpcDwPi_DEMO00_e, /* Actor SubMtd */ &l_daDemo00_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_demo_dk.cpp b/src/d/actor/d_a_demo_dk.cpp index 2ad26bda0..531dfdde4 100644 --- a/src/d/actor/d_a_demo_dk.cpp +++ b/src/d/actor/d_a_demo_dk.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_demo_dk.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "f_op/f_op_actor_mng.h" #include "d/d_com_inf_game.h" #include "m_Do/m_Do_ext.h" @@ -157,18 +155,18 @@ static actor_method_class l_daDEMO_DK_Method = { }; actor_process_profile_definition g_profile_DEMO_DK = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_DEMO_DK, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_DEMO_DK_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(demo_dk_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_DEMO_DK, + /* Draw Prio */ fpcDwPi_DEMO_DK_e, /* Actor SubMtd */ &l_daDEMO_DK_Method, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ENV_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_demo_item.cpp b/src/d/actor/d_a_demo_item.cpp index 6f0d78e8a..23cf2aa88 100644 --- a/src/d/actor/d_a_demo_item.cpp +++ b/src/d/actor/d_a_demo_item.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_demo_item.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_drawlist.h" #include "f_op/f_op_actor_mng.h" #include "f_op/f_op_actor_mng.h" @@ -19,262 +17,262 @@ const int daDitem_c::m_rot_time = 8*30; u8 daDitem_c::m_effect_type[0x100] = { - 0x04, // dItem_HEART_e - 0x03, // dItem_GREEN_RUPEE_e - 0x03, // dItem_BLUE_RUPEE_e - 0x03, // dItem_YELLOW_RUPEE_e - 0x03, // dItem_RED_RUPEE_e - 0x03, // dItem_PURPLE_RUPEE_e - 0x03, // dItem_ORANGE_RUPEE_e - DEMO_SELECT(0x01, 0x00), // dItem_HEART_PIECE_e - 0x00, // dItem_HEART_CONTAINER_e - 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 - DEMO_SELECT(0x04, 0x03), // dItem_SILVER_RUPEE_e - 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, // dItem_RECOVER_FAIRY_e - 0x04, // noentry23 - 0x04, // noentry24 - 0x04, // noentry25 - 0x03, // dItem_SUB_DUN_RUPEE_e - 0x04, // noentry27 - 0x04, // noentry28 - 0x04, // noentry29 - 0x04, // dItem_TRIPLE_HEART_e - 0x01, // dItem_JOY_PENDANT_e - 0x00, // dItem_TELESCOPE_e - 0x00, // dItem_TINGLE_TUNER_e - 0x00, // dItem_WIND_WAKER_e - 0x00, // CAMERA - 0x00, // dItem_SPOILS_BAG_e - 0x00, // dItem_GRAPPLING_HOOK_e - 0x00, // CAMERA2 - 0x00, // dItem_BOW_e - 0x00, // dItem_POWER_BRACELETS_e - 0x00, // dItem_IRON_BOOTS_e - 0x00, // dItem_MAGIC_ARMOR_e - 0x04, // WATER_BOOTS - 0x00, // dItem_BAIT_BAG_e - 0x00, // dItem_BOOMERANG_e - 0x04, // BARE_HAND - 0x00, // dItem_HOOKSHOT_e - 0x00, // dItem_DELIVERY_BAG_e - 0x00, // dItem_BOMB_BAG_e - 0x03, // dItem_FUKU_e - 0x00, // dItem_SKULL_HAMMER_e - 0x00, // dItem_DEKU_LEAF_e - 0x00, // dItem_MAGIC_ARROW_e - 0x00, // dItem_LIGHT_ARROW_e - 0x04, // dItem_NEW_FUKU_e - 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 - DEMO_SELECT(0x04, 0x00), // dItem_DROPPED_SWORD_e - 0x04, // dItem_MASTER_SWORD_3_e - 0x01, // KAKERA_HEART2 - 0x04, // noentry64 - 0x04, // noentry65 - 0x00, // dItem_PIRATES_CHARM_e - 0x00, // dItem_HEROS_CHARM_e - 0x04, // GRASS_BALL - 0x01, // dItem_SKULL_NECKLACE_e - 0x01, // dItem_BOKOBABA_SEED_e - 0x01, // dItem_GOLDEN_FEATHER_e - 0x01, // dItem_KNIGHTS_CREST_e - 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, // dItem_EMPTY_BOTTLE_e - 0x02, // dItem_RED_POTION_e - 0x02, // dItem_GREEN_POTION_e - 0x02, // dItem_BLUE_POTION_e - DEMO_SELECT(0x04, 0x00), // dItem_HALF_SOUP_BOTTLE_e - 0x00, // dItem_SOUP_BOTTLE_e - 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 - 0x04, // UNK_BOTTLE_5D - 0x04, // UNK_BOTTLE_5E - 0x04, // UNK_BOTTLE_5F - 0x04, // UNK_BOTTLE_60 - 0x00, // dItem_TRIFORCE1_e - 0x00, // dItem_TRIFORCE2_e - 0x00, // dItem_TRIFORCE3_e - 0x00, // dItem_TRIFORCE4_e - 0x00, // dItem_TRIFORCE5_e - 0x00, // dItem_TRIFORCE6_e - 0x00, // dItem_TRIFORCE7_e - 0x00, // dItem_TRIFORCE8_e - 0x00, // dItem_PEARL_NAYRU_e - 0x00, // dItem_PEARL_DIN_e - 0x00, // dItem_PEARL_FARORE_e - 0x04, // KNOWLEDGE_TF - 0x04, // TACT_SONG1 - 0x04, // TACT_SONG2 - 0x04, // TACT_SONG3 - 0x04, // TACT_SONG4 - 0x04, // TACT_SONG5 - 0x04, // TACT_SONG6 - 0x04, // noentry115 - 0x04, // noentry116 - 0x04, // noentry117 - 0x04, // noentry118 - 0x04, // noentry119 - 0x00, // NORMAL_SAIL - 0x00, // TRIFORCE_MAP1 - 0x00, // TRIFORCE_MAP2 - 0x00, // TRIFORCE_MAP3 - 0x00, // TRIFORCE_MAP4 - 0x00, // TRIFORCE_MAP5 - 0x00, // TRIFORCE_MAP6 - 0x00, // TRIFORCE_MAP7 - 0x00, // TRIFORCE_MAP8 - 0x04, // noentry129 - 0x02, // dItem_BIRD_BAIT_5_e - 0x02, // dItem_HYOI_PEAR_e - 0x04, // ESA1 - 0x04, // ESA2 - 0x04, // ESA3 - 0x04, // ESA4 - 0x04, // ESA5 - 0x04, // MAGIC_BEAN - 0x04, // BIRD_ESA_10 - 0x04, // noentry139 - 0x02, // FLOWER_1 - 0x02, // FLOWER_2 - 0x02, // FLOWER_3 - 0x02, // HEROS_FLAG - 0x02, // TAIRYO_FLAG - 0x02, // SALES_FLAG - 0x02, // WIND_FLAG - 0x02, // RED_FLAG - 0x02, // FOSSIL_HEAD - 0x02, // WATER_STATUE - 0x02, // POSTMAN_STATUE - 0x02, // PRESIDENT_STATUE - 0x02, // dItem_FATHER_LETTER_e - 0x02, // dItem_NOTE_TO_MOM_e - 0x02, // MAGYS_LETTER - 0x02, // MO_LETTER - DEMO_SELECT(0x04, 0x00), // COTTAGE_PAPER - 0x02, // KAISEN_PRESENT1 - 0x02, // KAISEN_PRESENT2 - DEMO_SELECT(0x04, 0x00), // SALVAGE_ITEM1 - 0x04, // SALVAGE_ITEM2 - 0x04, // SALVAGE_ITEM3 - 0x04, // XXX_039 - 0x00, // TINGLE_STATUE1 - 0x00, // TINGLE_STATUE2 - 0x00, // TINGLE_STATUE3 - 0x00, // TINGLE_STATUE4 - 0x00, // TINGLE_STATUE5 - 0x00, // TINGLE_STATUE6 - 0x04, // noentry169 - 0x04, // dItem_HURRICANE_SPIN_e - 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 - 0x03, // TINCLE_RUPEE4 - 0x03, // TINCLE_RUPEE5 - 0x03, // TINCLE_RUPEE6 - 0x04, // LITHOGRAPH1 - 0x04, // LITHOGRAPH2 - 0x04, // LITHOGRAPH3 - 0x04, // LITHOGRAPH4 - 0x04, // LITHOGRAPH5 - 0x04, // LITHOGRAPH6 - 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 + 0x04, // dItemNo_HEART_e + 0x03, // dItemNo_GREEN_RUPEE_e + 0x03, // dItemNo_BLUE_RUPEE_e + 0x03, // dItemNo_YELLOW_RUPEE_e + 0x03, // dItemNo_RED_RUPEE_e + 0x03, // dItemNo_PURPLE_RUPEE_e + 0x03, // dItemNo_ORANGE_RUPEE_e + DEMO_SELECT(0x01, 0x00), // dItemNo_HEART_PIECE_e + 0x00, // dItemNo_HEART_CONTAINER_e + 0x04, // dItemNo_SMALL_MAGIC_e + 0x04, // dItemNo_LARGE_MAGIC_e + 0x04, // dItemNo_BOMB_5_e + 0x04, // dItemNo_BOMB_10_e + 0x04, // dItemNo_BOMB_20_e + 0x04, // dItemNo_BOMB_30_e + DEMO_SELECT(0x04, 0x03), // dItemNo_SILVER_RUPEE_e + 0x04, // dItemNo_ARROW_10_e + 0x04, // dItemNo_ARROW_20_e + 0x04, // dItemNo_ARROW_30_e + 0x04, // dItemNo_NOENTRY_19_e + 0x04, // dItemNo_NOENTRY_20_e + 0x02, // dItemNo_SMALL_KEY_e + 0x04, // dItemNo_RECOVER_FAIRY_e + 0x04, // dItemNo_NOENTRY_23_e + 0x04, // dItemNo_NOENTRY_24_e + 0x04, // dItemNo_NOENTRY_25_e + 0x03, // dItemNo_SUB_DUN_RUPEE_e + 0x04, // dItemNo_NOENTRY_27_e + 0x04, // dItemNo_NOENTRY_28_e + 0x04, // dItemNo_NOENTRY_29_e + 0x04, // dItemNo_TRIPLE_HEART_e + 0x01, // dItemNo_JOY_PENDANT_e + 0x00, // dItemNo_TELESCOPE_e + 0x00, // dItemNo_TINGLE_TUNER_e + 0x00, // dItemNo_WIND_WAKER_e + 0x00, // dItemNo_PICTO_BOX_e + 0x00, // dItemNo_SPOILS_BAG_e + 0x00, // dItemNo_GRAPPLING_HOOK_e + 0x00, // dItemNo_DELUXE_PICTO_BOX_e + 0x00, // dItemNo_BOW_e + 0x00, // dItemNo_POWER_BRACELETS_e + 0x00, // dItemNo_IRON_BOOTS_e + 0x00, // dItemNo_MAGIC_ARMOR_e + 0x04, // dItemNo_WATER_BOOTS_e + 0x00, // dItemNo_BAIT_BAG_e + 0x00, // dItemNo_BOOMERANG_e + 0x04, // dItemNo_BARE_HAND_e + 0x00, // dItemNo_HOOKSHOT_e + 0x00, // dItemNo_DELIVERY_BAG_e + 0x00, // dItemNo_BOMB_BAG_e + 0x03, // dItemNo_FUKU_e + 0x00, // dItemNo_SKULL_HAMMER_e + 0x00, // dItemNo_DEKU_LEAF_e + 0x00, // dItemNo_MAGIC_ARROW_e + 0x00, // dItemNo_LIGHT_ARROW_e + 0x04, // dItemNo_NEW_FUKU_e + 0x00, // dItemNo_SWORD_e + 0x00, // dItemNo_MASTER_SWORD_1_e + 0x04, // dItemNo_MASTER_SWORD_2_e + 0x00, // dItemNo_SHIELD_e + 0x00, // dItemNo_MIRROR_SHIELD_e + DEMO_SELECT(0x04, 0x00), // dItemNo_DROPPED_SWORD_e + 0x04, // dItemNo_MASTER_SWORD_3_e + 0x01, // dItemNo_HEART_PIECE_ALT_e + 0x04, // dItemNo_NOENTRY_64_e + 0x04, // dItemNo_NOENTRY_65_e + 0x00, // dItemNo_PIRATES_CHARM_e + 0x00, // dItemNo_HEROS_CHARM_e + 0x04, // dItemNo_GRASS_BALL_e + 0x01, // dItemNo_SKULL_NECKLACE_e + 0x01, // dItemNo_BOKOBABA_SEED_e + 0x01, // dItemNo_GOLDEN_FEATHER_e + 0x01, // dItemNo_KNIGHTS_CREST_e + 0x01, // dItemNo_RED_JELLY_e + 0x01, // dItemNo_GREEN_JELLY_e + 0x01, // dItemNo_BLUE_JELLY_e + 0x01, // dItemNo_MAP_e + 0x01, // dItemNo_COMPASS_e + 0x00, // dItemNo_BOSS_KEY_e + 0x04, // dItemNo_EMPTY_BSHIP_e + 0x00, // dItemNo_EMPTY_BOTTLE_e + 0x02, // dItemNo_RED_POTION_e + 0x02, // dItemNo_GREEN_POTION_e + 0x02, // dItemNo_BLUE_POTION_e + DEMO_SELECT(0x04, 0x00), // dItemNo_HALF_SOUP_BOTTLE_e + 0x00, // dItemNo_SOUP_BOTTLE_e + 0x02, // dItemNo_WATER_BOTTLE_e + 0x02, // dItemNo_FAIRY_BOTTLE_e + 0x00, // dItemNo_FIREFLY_BOTTLE_e + 0x02, // dItemNo_FOREST_WATER_e + 0x04, // dItemNo_UNK_BOTTLE_5A_e + 0x04, // dItemNo_UNK_BOTTLE_5B_e + 0x04, // dItemNo_UNK_BOTTLE_5C_e + 0x04, // dItemNo_UNK_BOTTLE_5D_e + 0x04, // dItemNo_UNK_BOTTLE_5E_e + 0x04, // dItemNo_UNK_BOTTLE_5F_e + 0x04, // dItemNo_UNK_BOTTLE_60_e + 0x00, // dItemNo_TRIFORCE1_e + 0x00, // dItemNo_TRIFORCE2_e + 0x00, // dItemNo_TRIFORCE3_e + 0x00, // dItemNo_TRIFORCE4_e + 0x00, // dItemNo_TRIFORCE5_e + 0x00, // dItemNo_TRIFORCE6_e + 0x00, // dItemNo_TRIFORCE7_e + 0x00, // dItemNo_TRIFORCE8_e + 0x00, // dItemNo_PEARL_NAYRU_e + 0x00, // dItemNo_PEARL_DIN_e + 0x00, // dItemNo_PEARL_FARORE_e + 0x04, // dItemNo_KNOWLEDGE_TF_e + 0x04, // dItemNo_WINDS_REQUIEM_e + 0x04, // dItemNo_BALLAD_OF_GALES_e + 0x04, // dItemNo_COMMAND_MELODY_e + 0x04, // dItemNo_EARTH_GODS_LYRIC_e + 0x04, // dItemNo_WIND_GODS_ARIA_e + 0x04, // dItemNo_SONG_OF_PASSING_e + 0x04, // dItemNo_NOENTRY_115_e + 0x04, // dItemNo_NOENTRY_116_e + 0x04, // dItemNo_NOENTRY_117_e + 0x04, // dItemNo_NOENTRY_118_e + 0x04, // dItemNo_NOENTRY_119_e + 0x00, // dItemNo_SAIL_e + 0x00, // dItemNo_TRIFORCE_MAP_1_e + 0x00, // dItemNo_TRIFORCE_MAP_2_e + 0x00, // dItemNo_TRIFORCE_MAP_3_e + 0x00, // dItemNo_TRIFORCE_MAP_4_e + 0x00, // dItemNo_TRIFORCE_MAP_5_e + 0x00, // dItemNo_TRIFORCE_MAP_6_e + 0x00, // dItemNo_TRIFORCE_MAP_7_e + 0x00, // dItemNo_TRIFORCE_MAP_8_e + 0x04, // dItemNo_NOENTRY_129_e + 0x02, // dItemNo_BIRD_BAIT_5_e + 0x02, // dItemNo_HYOI_PEAR_e + 0x04, // dItemNo_ESA_1_e + 0x04, // dItemNo_ESA_2_e + 0x04, // dItemNo_ESA_3_e + 0x04, // dItemNo_ESA_4_e + 0x04, // dItemNo_ESA_5_e + 0x04, // dItemNo_MAGIC_BEAN_e + 0x04, // dItemNo_BIRD_ESA_10_e + 0x04, // dItemNo_NOENTRY_139_e + 0x02, // dItemNo_TOWN_FLOWER_e + 0x02, // dItemNo_SEA_FLOWER_e + 0x02, // dItemNo_EXOTIC_FLOWER_e + 0x02, // dItemNo_HEROS_FLAG_e + 0x02, // dItemNo_BIG_CATCH_FLAG_e + 0x02, // dItemNo_BIG_SALE_FLAG_e + 0x02, // dItemNo_PINWHEEL_e + 0x02, // dItemNo_SICKLE_MOON_FLAG_e + 0x02, // dItemNo_SKULL_TOWER_IDOL_e + 0x02, // dItemNo_FOUNTAIN_IDOL_e + 0x02, // dItemNo_POSTMAN_STATUE_e + 0x02, // dItemNo_SHOP_GURU_STATUE_e + 0x02, // dItemNo_FATHER_LETTER_e + 0x02, // dItemNo_NOTE_TO_MOM_e + 0x02, // dItemNo_MAGGIES_LETTER_e + 0x02, // dItemNo_MOBLINS_LETTER_e + DEMO_SELECT(0x04, 0x00), // dItemNo_CABANA_DEED_e + 0x02, // dItemNo_COMPLIMENTARY_ID_e + 0x02, // dItemNo_FILL_UP_COUPON_e + DEMO_SELECT(0x04, 0x00), // dItemNo_LEGENDARY_PICTOGRAPH_e + 0x04, // dItemNo_SALVAGE_ITEM_2_e + 0x04, // dItemNo_SALVAGE_ITEM_3_e + 0x04, // dItemNo_XXX_039_e + 0x00, // dItemNo_TINGLE_STATUE_1_e + 0x00, // dItemNo_TINGLE_STATUE_2_e + 0x00, // dItemNo_TINGLE_STATUE_3_e + 0x00, // dItemNo_TINGLE_STATUE_4_e + 0x00, // dItemNo_TINGLE_STATUE_5_e + 0x00, // dItemNo_TINGLE_STATUE_6_e + 0x04, // dItemNo_NOENTRY_169_e + 0x04, // dItemNo_HURRICANE_SPIN_e + 0x00, // dItemNo_MAX_RUPEE_UP1_e + 0x00, // dItemNo_MAX_RUPEE_UP2_e + 0x00, // dItemNo_MAX_BOMB_UP1_e + 0x00, // dItemNo_MAX_BOMB_UP2_e + 0x00, // dItemNo_MAX_ARROW_UP1_e + 0x00, // dItemNo_MAX_ARROW_UP2_e + 0x04, // dItemNo_MAGIC_POWER_e + 0x04, // dItemNo_MAX_MP_UP1_e + 0x03, // dItemNo_TINGLE_RUPEE_1_e + 0x03, // dItemNo_TINGLE_RUPEE_2_e + 0x03, // dItemNo_TINGLE_RUPEE_3_e + 0x03, // dItemNo_TINGLE_RUPEE_4_e + 0x03, // dItemNo_TINGLE_RUPEE_5_e + 0x03, // dItemNo_TINGLE_RUPEE_6_e + 0x04, // dItemNo_LITHOGRAPH_1_e + 0x04, // dItemNo_LITHOGRAPH_2_e + 0x04, // dItemNo_LITHOGRAPH_3_e + 0x04, // dItemNo_LITHOGRAPH_4_e + 0x04, // dItemNo_LITHOGRAPH_5_e + 0x04, // dItemNo_LITHOGRAPH_6_e + 0x04, // dItemNo_COLLECT_MAP_64_e + 0x04, // dItemNo_COLLECT_MAP_63_e + 0x04, // dItemNo_COLLECT_MAP_62_e + 0x00, // dItemNo_COLLECT_MAP_61_e + 0x00, // dItemNo_COLLECT_MAP_60_e + 0x00, // dItemNo_COLLECT_MAP_59_e + 0x00, // dItemNo_COLLECT_MAP_58_e + 0x00, // dItemNo_COLLECT_MAP_57_e + 0x00, // dItemNo_COLLECT_MAP_56_e + 0x00, // dItemNo_COLLECT_MAP_55_e + 0x00, // dItemNo_COLLECT_MAP_54_e + 0x00, // dItemNo_COLLECT_MAP_53_e + 0x00, // dItemNo_COLLECT_MAP_52_e + 0x00, // dItemNo_COLLECT_MAP_51_e + 0x00, // dItemNo_COLLECT_MAP_50_e + 0x00, // dItemNo_COLLECT_MAP_49_e + 0x00, // dItemNo_COLLECT_MAP_48_e + 0x00, // dItemNo_COLLECT_MAP_47_e + 0x00, // dItemNo_COLLECT_MAP_46_e + 0x00, // dItemNo_COLLECT_MAP_45_e + 0x00, // dItemNo_COLLECT_MAP_44_e + 0x00, // dItemNo_COLLECT_MAP_43_e + 0x00, // dItemNo_COLLECT_MAP_42_e + 0x00, // dItemNo_COLLECT_MAP_41_e + 0x00, // dItemNo_COLLECT_MAP_40_e + 0x00, // dItemNo_COLLECT_MAP_39_e + 0x00, // dItemNo_COLLECT_MAP_38_e + 0x00, // dItemNo_COLLECT_MAP_37_e + 0x00, // dItemNo_COLLECT_MAP_36_e + 0x00, // dItemNo_COLLECT_MAP_35_e + 0x00, // dItemNo_COLLECT_MAP_34_e + 0x00, // dItemNo_COLLECT_MAP_33_e + 0x00, // dItemNo_COLLECT_MAP_32_e + 0x00, // dItemNo_COLLECT_MAP_31_e + 0x00, // dItemNo_COLLECT_MAP_30_e + 0x00, // dItemNo_COLLECT_MAP_29_e + 0x00, // dItemNo_COLLECT_MAP_28_e + 0x00, // dItemNo_COLLECT_MAP_27_e + 0x00, // dItemNo_COLLECT_MAP_26_e + 0x00, // dItemNo_COLLECT_MAP_25_e + 0x00, // dItemNo_COLLECT_MAP_24_e + 0x00, // dItemNo_COLLECT_MAP_23_e + 0x00, // dItemNo_COLLECT_MAP_22_e + 0x00, // dItemNo_COLLECT_MAP_21_e + 0x00, // dItemNo_COLLECT_MAP_20_e + 0x00, // dItemNo_COLLECT_MAP_19_e + 0x00, // dItemNo_COLLECT_MAP_18_e + 0x00, // dItemNo_COLLECT_MAP_17_e + 0x00, // dItemNo_COLLECT_MAP_16_e + 0x00, // dItemNo_COLLECT_MAP_15_e + 0x00, // dItemNo_COLLECT_MAP_14_e + 0x00, // dItemNo_COLLECT_MAP_13_e + 0x00, // dItemNo_COLLECT_MAP_12_e + 0x00, // dItemNo_COLLECT_MAP_11_e + 0x00, // dItemNo_COLLECT_MAP_10_e + 0x00, // dItemNo_COLLECT_MAP_09_e + 0x00, // dItemNo_COLLECT_MAP_08_e + 0x00, // dItemNo_COLLECT_MAP_07_e + 0x00, // dItemNo_COLLECT_MAP_06_e + 0x00, // dItemNo_COLLECT_MAP_05_e + 0x00, // dItemNo_COLLECT_MAP_04_e + 0x00, // dItemNo_COLLECT_MAP_03_e + 0x00, // dItemNo_COLLECT_MAP_02_e + 0x00, // dItemNo_COLLECT_MAP_01_e + 0x04, // dItemNo_NONE_e }; /* 000000EC-00000320 .text setParticle__9daDitem_cFv */ @@ -378,24 +376,24 @@ void daDitem_c::set_pos() { /* 000006E4-00000760 .text anim_control__9daDitem_cFv */ void daDitem_c::anim_control() { switch (m_itemNo) { - case EMPTY_BSHIP: - 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 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: - case UNK_BOTTLE_5D: - case UNK_BOTTLE_5E: - case UNK_BOTTLE_5F: - case UNK_BOTTLE_60: + case dItemNo_EMPTY_BSHIP_e: + case dItemNo_EMPTY_BOTTLE_e: + case dItemNo_RED_POTION_e: + case dItemNo_GREEN_POTION_e: + case dItemNo_BLUE_POTION_e: + case dItemNo_HALF_SOUP_BOTTLE_e: + case dItemNo_SOUP_BOTTLE_e: + case dItemNo_WATER_BOTTLE_e: + case dItemNo_FAIRY_BOTTLE_e: + case dItemNo_FIREFLY_BOTTLE_e: + case dItemNo_FOREST_WATER_e: + case dItemNo_UNK_BOTTLE_5A_e: + case dItemNo_UNK_BOTTLE_5B_e: + case dItemNo_UNK_BOTTLE_5C_e: + case dItemNo_UNK_BOTTLE_5D_e: + case dItemNo_UNK_BOTTLE_5E_e: + case dItemNo_UNK_BOTTLE_5F_e: + case dItemNo_UNK_BOTTLE_60_e: if (m_timer > 30) { animPlay(1.0f, 1.0f, 1.0f, 1.0f, 1.0f); } @@ -428,7 +426,7 @@ void daDitem_c::set_mtx() { /* 00000880-000008F0 .text settingBeforeDraw__9daDitem_cFv */ void daDitem_c::settingBeforeDraw() { - if (isBomb(m_itemNo) || m_itemNo == dItem_BOMB_BAG_e || m_itemNo == dItem_SKULL_HAMMER_e || m_itemNo == dItem_SMALL_KEY_e) { + if (isBomb(m_itemNo) || m_itemNo == dItemNo_BOMB_BAG_e || m_itemNo == dItemNo_SKULL_HAMMER_e || m_itemNo == dItemNo_SMALL_KEY_e) { dDlst_texSpecmapST(&eyePos, &tevStr, mpModel->getModelData(), 1.0f); } } @@ -460,7 +458,7 @@ cPhs_State daDitem_c::create() { char* arcName = dItem_data::getArcname(m_itemNo); if (dItem_data::getBmdIdx(m_itemNo) == -1 || arcName == NULL) { - m_itemNo = dItem_GREEN_RUPEE_e; + m_itemNo = dItemNo_GREEN_RUPEE_e; } cPhs_State phase_state = dComIfG_resLoad(&mPhs, dItem_data::getArcname(m_itemNo)); @@ -541,18 +539,18 @@ static actor_method_class l_daDitem_Method = { }; actor_process_profile_definition g_profile_Demo_Item = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Demo_Item, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Demo_Item_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daDitem_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Demo_Item, + /* Draw Prio */ fpcDwPi_Demo_Item_e, /* Actor SubMtd */ &l_daDitem_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_demo_kmm.cpp b/src/d/actor/d_a_demo_kmm.cpp index f9c040ff7..dfdc75a13 100644 --- a/src/d/actor/d_a_demo_kmm.cpp +++ b/src/d/actor/d_a_demo_kmm.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_demo_kmm.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "f_op/f_op_actor_mng.h" #include "d/d_com_inf_game.h" #include "m_Do/m_Do_ext.h" @@ -129,18 +127,18 @@ static actor_method_class l_daDemo_Kmm_Method = { }; actor_process_profile_definition g_profile_DEMO_KMM = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_DEMO_KMM, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_DEMO_KMM_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daDemo_Kmm_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_DEMO_KMM, + /* Draw Prio */ fpcDwPi_DEMO_KMM_e, /* Actor SubMtd */ &l_daDemo_Kmm_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_6_e, + /* Cull Type */ fopAc_CULLBOX_6_e, }; diff --git a/src/d/actor/d_a_disappear.cpp b/src/d/actor/d_a_disappear.cpp index 23f5da4d3..38a1f8bfe 100644 --- a/src/d/actor/d_a_disappear.cpp +++ b/src/d/actor/d_a_disappear.cpp @@ -7,8 +7,6 @@ #include "d/actor/d_a_disappear.h" #include "f_op/f_op_actor.h" #include "f_op/f_op_actor_mng.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "d/d_s_play.h" @@ -33,9 +31,9 @@ static BOOL daDisappear_Execute(disappear_class* i_this) { // Special type for Keese (ki) spawned in the Puppet Ganon fight. // This also seems to be used by several other enemies, such as Molgera's spawn. static u32 ki_item_d[] = { - dItem_HEART_e, - dItem_LARGE_MAGIC_e, - dItem_ARROW_10_e, + dItemNo_HEART_e, + dItemNo_LARGE_MAGIC_e, + dItemNo_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); @@ -125,18 +123,18 @@ static actor_method_class l_daDisappear_Method = { }; actor_process_profile_definition g_profile_DISAPPEAR = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_DISAPPEAR, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_DISAPPEAR_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(disappear_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_DISAPPEAR, + /* Draw Prio */ fpcDwPi_DISAPPEAR_e, /* Actor SubMtd */ &l_daDisappear_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_dk.cpp b/src/d/actor/d_a_dk.cpp index e3a48fd25..01c377b8f 100644 --- a/src/d/actor/d_a_dk.cpp +++ b/src/d/actor/d_a_dk.cpp @@ -9,11 +9,9 @@ #include "d/d_com_inf_game.h" #include "d/d_s_play.h" #include "m_Do/m_Do_ext.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "f_op/f_op_actor_mng.h" -daDk_HIO_c l_HIO; +static daDk_HIO_c l_HIO; /* 000000EC-00000130 .text __ct__10daDk_HIO_cFv */ daDk_HIO_c::daDk_HIO_c() { @@ -408,18 +406,18 @@ static actor_method_class l_daDk_Method = { }; actor_process_profile_definition g_profile_DK = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_DK, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_DK_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(dk_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_DK, + /* Draw Prio */ fpcDwPi_DK_e, /* Actor SubMtd */ &l_daDk_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_door10.cpp b/src/d/actor/d_a_door10.cpp index 3df40d9f9..0338e3779 100644 --- a/src/d/actor/d_a_door10.cpp +++ b/src/d/actor/d_a_door10.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_door10.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "f_op/f_op_actor_mng.h" #include "d/d_com_inf_game.h" #include "d/res/res_doorbs.h" @@ -881,18 +879,18 @@ static actor_method_class l_daDoor10_Method = { }; actor_process_profile_definition g_profile_DOOR10 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_DOOR10, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_DOOR10_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daDoor10_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_DOOR10, + /* Draw Prio */ fpcDwPi_DOOR10_e, /* Actor SubMtd */ &l_daDoor10_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_6_e, + /* Cull Type */ fopAc_CULLBOX_6_e, }; diff --git a/src/d/actor/d_a_door12.cpp b/src/d/actor/d_a_door12.cpp index b3b5f0a3b..1d0a9dbef 100644 --- a/src/d/actor/d_a_door12.cpp +++ b/src/d/actor/d_a_door12.cpp @@ -7,8 +7,6 @@ #include "d/actor/d_a_door12.h" #include "d/actor/d_a_player.h" #include "d/res/res_door12.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" @@ -907,18 +905,18 @@ static actor_method_class l_daDoor12_Method = { }; actor_process_profile_definition g_profile_DOOR12 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_DOOR12, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_DOOR12_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daDoor12_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_DOOR12, + /* Draw Prio */ fpcDwPi_DOOR12_e, /* Actor SubMtd */ &l_daDoor12_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_6_e, + /* Cull Type */ fopAc_CULLBOX_6_e, }; diff --git a/src/d/actor/d_a_dr.cpp b/src/d/actor/d_a_dr.cpp index 77a5479aa..82944d090 100644 --- a/src/d/actor/d_a_dr.cpp +++ b/src/d/actor/d_a_dr.cpp @@ -7,8 +7,6 @@ #include "d/actor/d_a_dr.h" #include "d/res/res_dr.h" #include "f_op/f_op_actor_mng.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" #include "m_Do/m_Do_hostIO.h" @@ -276,18 +274,18 @@ static actor_method_class l_daDr_Method = { }; actor_process_profile_definition g_profile_DR = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_DR, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_DR_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(dr_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_DR, + /* Draw Prio */ fpcDwPi_DR_e, /* Actor SubMtd */ &l_daDr_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_dr2.cpp b/src/d/actor/d_a_dr2.cpp index c3a12c21c..3f211ffe9 100644 --- a/src/d/actor/d_a_dr2.cpp +++ b/src/d/actor/d_a_dr2.cpp @@ -7,8 +7,6 @@ #include "d/actor/d_a_dr2.h" #include "d/res/res_dr2.h" #include "m_Do/m_Do_ext.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_bg_w.h" #include "d/d_s_play.h" #include "d/actor/d_a_player.h" @@ -187,7 +185,7 @@ static BOOL daDr2_Draw(dr2_class* i_this) { /* 000006D4-00000720 .text s_a_d_sub__FPvPv */ void* s_a_d_sub(void* ac1, void* ac2) { UNUSED(ac2); - if (fopAcM_IsActor(ac1) && fopAcM_GetName(ac1) == PROC_BTD) { + if (fopAcM_IsActor(ac1) && fopAcM_GetName(ac1) == fpcNm_BTD_e) { return ac1; } return NULL; @@ -804,7 +802,7 @@ static cPhs_State daDr2_Create(fopAc_ac_c* a_this) { params->base.parameters = 0x511; params->room_no = a_this->current.roomNo; - i_this->unk_3FC = fopAcM_Create(PROC_KUI, NULL, params); + i_this->unk_3FC = fopAcM_Create(fpcNm_KUI_e, NULL, params); i_this->unk_4A8.x = a_this->home.pos.x; i_this->unk_4A8.y = a_this->home.pos.y + REG0_F(7) - 50.0f; i_this->unk_4A8.z = a_this->home.pos.z; @@ -821,18 +819,18 @@ static actor_method_class l_daDr2_Method = { }; actor_process_profile_definition g_profile_DR2 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_DR2, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_DR2_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(dr2_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_DR2, + /* Draw Prio */ fpcDwPi_DR2_e, /* Actor SubMtd */ &l_daDr2_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_dummy.cpp b/src/d/actor/d_a_dummy.cpp index c3259cc35..c48a8f2f9 100644 --- a/src/d/actor/d_a_dummy.cpp +++ b/src/d/actor/d_a_dummy.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_dummy.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_mtx.h" @@ -87,18 +85,18 @@ namespace daDummy { } actor_process_profile_definition g_profile_Dummy = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Dummy, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Dummy_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daDummy::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Dummy, + /* Draw Prio */ fpcDwPi_Dummy_e, /* Actor SubMtd */ &daDummy::Mthd_Table, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_ep.cpp b/src/d/actor/d_a_ep.cpp index 9cc8a7cb9..5d507f989 100644 --- a/src/d/actor/d_a_ep.cpp +++ b/src/d/actor/d_a_ep.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_ep.h" #include "d/res/res_ep.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" #include "f_op/f_op_actor_mng.h" #include "d/d_com_inf_game.h" @@ -271,7 +269,7 @@ void ep_move(ep_class* i_this) { if (hitObj != NULL && hitObj->ChkAtType(0x600000)) { fopAc_ac_c* ac = hitObj->GetAc(); - if (fopAcM_GetName(ac) == PROC_BDK) { + if (fopAcM_GetName(ac) == fpcNm_BDK_e) { i_this->m7DC = ac->shape_angle.y; } else { i_this->m7DC = player->shape_angle.y; @@ -711,18 +709,18 @@ static actor_method_class l_daEp_Method = { }; actor_process_profile_definition g_profile_EP = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_EP, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_EP_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(ep_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_EP, + /* Draw Prio */ fpcDwPi_EP_e, /* Actor SubMtd */ &l_daEp_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e | fopAcStts_UNK200000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_esa.cpp b/src/d/actor/d_a_esa.cpp index ff13d909d..989457af2 100644 --- a/src/d/actor/d_a_esa.cpp +++ b/src/d/actor/d_a_esa.cpp @@ -11,8 +11,6 @@ #include "d/d_bg_s_lin_chk.h" #include "d/d_s_play.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_bg_s_func.h" #include "d/res/res_link.h" #include "f_op/f_op_actor_mng.h" @@ -268,7 +266,7 @@ static cPhs_State daEsa_Create(fopAc_ac_c* i_actor) { params->base.angle.y = i_this->current.angle.y; params->base.angle.z = cM_rndF(65536.0f); params->base.parameters = 0x000000FF; - fpcM_Create(PROC_ESA, 0, params); + fpcM_Create(fpcNm_ESA_e, 0, params); } } } @@ -291,18 +289,18 @@ static actor_method_class l_daEsa_Method = { }; actor_process_profile_definition g_profile_ESA = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_ESA, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_ESA_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(esa_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_ESA, + /* Draw Prio */ fpcDwPi_ESA_e, /* Actor SubMtd */ &l_daEsa_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_fallrock.cpp b/src/d/actor/d_a_fallrock.cpp index 85a1dcb62..70fb21271 100644 --- a/src/d/actor/d_a_fallrock.cpp +++ b/src/d/actor/d_a_fallrock.cpp @@ -7,8 +7,6 @@ #include "d/actor/d_a_fallrock.h" #include "d/res/res_always.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" #include "f_op/f_op_actor_mng.h" #include "f_op/f_op_kankyo_mng.h" @@ -300,18 +298,18 @@ static actor_method_class l_daFallRock_Method = { }; actor_process_profile_definition g_profile_FallRock = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_FallRock, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_FallRock_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daFallRock_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_FallRock, + /* Draw Prio */ fpcDwPi_FallRock_e, /* Actor SubMtd */ &l_daFallRock_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_fallrock_tag.cpp b/src/d/actor/d_a_fallrock_tag.cpp index bff25578c..15ac69fae 100644 --- a/src/d/actor/d_a_fallrock_tag.cpp +++ b/src/d/actor/d_a_fallrock_tag.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_fallrock_tag.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 00000078-00000080 .text daFallRockTag_Draw__FP15daFallRockTag_c */ static BOOL daFallRockTag_Draw(daFallRockTag_c*) { @@ -52,18 +50,18 @@ static actor_method_class l_daFallRockTag_Method = { }; actor_process_profile_definition g_profile_TagRock = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_TagRock, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TagRock_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daFallRockTag_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_TagRock, + /* Draw Prio */ fpcDwPi_TagRock_e, /* Actor SubMtd */ &l_daFallRockTag_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_fan.cpp b/src/d/actor/d_a_fan.cpp index df4c8ab79..34b02d276 100644 --- a/src/d/actor/d_a_fan.cpp +++ b/src/d/actor/d_a_fan.cpp @@ -11,8 +11,6 @@ #include "f_op/f_op_kankyo_mng.h" #include "d/d_com_inf_game.h" #include "d/d_level_se.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "m_Do/m_Do_mtx.h" #include "JSystem/JUtility/JUTAssert.h" @@ -132,7 +130,7 @@ BOOL daFan_c::Create() { } mModel->calc(); - mWindSePId = fopKyM_create(PROC_LEVEL_SE, JA_SE_OBJ_WIND_TAG, &eyePos); + mWindSePId = fopKyM_create(fpcNm_LEVEL_SE_e, JA_SE_OBJ_WIND_TAG, &eyePos); return TRUE; } @@ -296,18 +294,18 @@ static actor_method_class daFanMethodTable = { }; actor_process_profile_definition g_profile_FAN = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_FAN, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_FAN_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daFan_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_FAN, + /* Draw Prio */ fpcDwPi_FAN_e, /* Actor SubMtd */ &daFanMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_ff.cpp b/src/d/actor/d_a_ff.cpp index 28ae95ad3..2a4e4609d 100644 --- a/src/d/actor/d_a_ff.cpp +++ b/src/d/actor/d_a_ff.cpp @@ -8,8 +8,6 @@ #include "d/actor/d_a_player.h" #include "d/d_bg_s_gnd_chk.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_s_play.h" #include "m_Do/m_Do_lib.h" #include "d/res/res_ff.h" @@ -306,7 +304,7 @@ static cPhs_State daFf_Create(fopAc_ac_c* i_this) { pfVar4->base.angle.y = 0; pfVar4->base.angle.x = 0; pfVar4->base.parameters = fopAcM_GetParam(a_this); - fopAcM_create(PROC_FF, NULL, pfVar4); + fopAcM_create(fpcNm_FF_e, NULL, pfVar4); } } a_this->mbNoUseGroundY = fopAcM_GetParam(a_this) >> 8; @@ -363,18 +361,18 @@ static actor_method_class l_daFf_Method = { }; actor_process_profile_definition g_profile_FF = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_FF, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_FF_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(ff_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_FF, + /* Draw Prio */ fpcDwPi_FF_e, /* Actor SubMtd */ &l_daFf_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_fganon.cpp b/src/d/actor/d_a_fganon.cpp index aec2ce148..da84dc3af 100644 --- a/src/d/actor/d_a_fganon.cpp +++ b/src/d/actor/d_a_fganon.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_fganon.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "JSystem/JUtility/JUTReport.h" #include "d/actor/d_a_boko.h" #include "d/actor/d_a_mant.h" @@ -23,7 +21,7 @@ fganon_class* master; u8 hio_set; -daFganon_HIO_c l_HIO; +static daFganon_HIO_c l_HIO; /* 000000EC-000001A0 .text __ct__14daFganon_HIO_cFv */ daFganon_HIO_c::daFganon_HIO_c() { @@ -572,7 +570,7 @@ void tama_set(fganon_class* i_this) { void mahou_set(fganon_class* i_this) { fopAc_ac_c* a_this = &i_this->actor; for (int i = 0; i < 8; i++) { - fopAcM_create(PROC_FGMAHOU, i, &i_this->m664, fopAcM_GetRoomNo(a_this)); + fopAcM_create(fpcNm_FGMAHOU_e, i, &i_this->m664, fopAcM_GetRoomNo(a_this)); } i_this->m670 = 0; } @@ -699,7 +697,7 @@ void spinattack2(fganon_class* i_this) { i_this->mMode = 1; if (i_this->m68F == 0) { for (int i = 1; i < 5; i++) { - fopAcM_create(PROC_FGANON, (i * 16) | 3, &a_this->current.pos, fopAcM_GetRoomNo(a_this)); + fopAcM_create(fpcNm_FGANON_e, (i * 16) | 3, &a_this->current.pos, fopAcM_GetRoomNo(a_this)); } } } @@ -1033,7 +1031,7 @@ void fail(fganon_class* i_this) { kieru_brk(i_this, 2); i_this->m3A4[0] = 10; i_this->mMode = 4; - i_this->mBokoID = fopAcM_create(PROC_BOKO, daBoko_c::Type_PGANON_SWORD_e, &a_this->current.pos, fopAcM_GetRoomNo(a_this)); + i_this->mBokoID = fopAcM_create(fpcNm_BOKO_e, daBoko_c::Type_PGANON_SWORD_e, &a_this->current.pos, fopAcM_GetRoomNo(a_this)); } break; } @@ -1065,12 +1063,12 @@ void standby(fganon_class* i_this) { switch(i_this->mMode) { case -1: { if (i_this->m2BC == 2) { - if (!dComIfGs_checkGetItem(dItem_LIGHT_ARROW_e)) { + if (!dComIfGs_checkGetItem(dItemNo_LIGHT_ARROW_e)) { a_this->current.pos.y = -20000.0f; break; } } - else if ((i_this->m2BC == 1) && dComIfGs_checkGetItem(dItem_LIGHT_ARROW_e)) { + else if ((i_this->m2BC == 1) && dComIfGs_checkGetItem(dItemNo_LIGHT_ARROW_e)) { a_this->current.pos.y = -20000.0f; break; } @@ -1273,7 +1271,7 @@ void last_end(fganon_class* i_this) { case 4: { if (i_this->m3A4[1] <= 4) { if (i_this->m3A4[1] == 4) { - i_this->mBokoID = fopAcM_create(PROC_BOKO, daBoko_c::Type_PGANON_SWORD_e, &a_this->current.pos, fopAcM_GetRoomNo(a_this)); + i_this->mBokoID = fopAcM_create(fpcNm_BOKO_e, daBoko_c::Type_PGANON_SWORD_e, &a_this->current.pos, fopAcM_GetRoomNo(a_this)); } daBoko_c* boko = (daBoko_c*)fopAcM_SearchByID(i_this->mBokoID); if (boko != NULL) { @@ -1396,7 +1394,7 @@ void damage_check(fganon_class* i_this) { return; } - if (atInfo.mpActor && (fopAcM_GetName(atInfo.mpActor) == PROC_FGMAHOU)) { + if (atInfo.mpActor && (fopAcM_GetName(atInfo.mpActor) == fpcNm_FGMAHOU_e)) { i_this->m670++; anm_init(i_this, FGANON_BCK_DAMAGE1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); @@ -1457,9 +1455,9 @@ void damage_check(fganon_class* i_this) { pPos = i_this->mCyl.GetTgHitPosP(); atInfo.pParticlePos = pPos; atInfo.mpActor = at_power_check(&atInfo); - if((atInfo.mpObj != NULL) && (atInfo.mpObj->ChkAtType(AT_TYPE_SWORD)) && (dComIfGs_getSelectEquip(0) == dItem_MASTER_SWORD_1_e || - dComIfGs_getSelectEquip(0) == dItem_MASTER_SWORD_3_e || - dComIfGs_getSelectEquip(0) == dItem_MASTER_SWORD_2_e)) { + if((atInfo.mpObj != NULL) && (atInfo.mpObj->ChkAtType(AT_TYPE_SWORD)) && (dComIfGs_getSelectEquip(0) == dItemNo_MASTER_SWORD_1_e || + dComIfGs_getSelectEquip(0) == dItemNo_MASTER_SWORD_3_e || + dComIfGs_getSelectEquip(0) == dItemNo_MASTER_SWORD_2_e)) { atInfo.mpActor = cc_at_check(a_this, &atInfo); if (atInfo.mbDead) { dComIfGp_particle_set(dPa_name::ID_AK_JN_CRITICALHITFLASH, &a_this->eyePos, NULL); @@ -2204,9 +2202,9 @@ void energy_ball_move(fganon_class* i_this) { atInfo.mpObj = NULL; } if ((atInfo.mpObj && atInfo.mResultingAttackType == 1 && atInfo.mpObj->ChkAtType(AT_TYPE_SWORD) && - (dComIfGs_getSelectEquip(0) == dItem_MASTER_SWORD_1_e || - dComIfGs_getSelectEquip(0) == dItem_MASTER_SWORD_3_e || - dComIfGs_getSelectEquip(0) == dItem_MASTER_SWORD_2_e)) || + (dComIfGs_getSelectEquip(0) == dItemNo_MASTER_SWORD_1_e || + dComIfGs_getSelectEquip(0) == dItemNo_MASTER_SWORD_3_e || + dComIfGs_getSelectEquip(0) == dItemNo_MASTER_SWORD_2_e)) || bVar3) { local_5c = a_this->eyePos - i_this->m3E0; @@ -2340,7 +2338,7 @@ void energy_ball_move(fganon_class* i_this) { if (i_this->mBallAtSph.ChkAtHit() != 0) { atInfo.mpActor = i_this->mBallAtSph.GetAtHitObj()->GetAc(); - if ((atInfo.mpActor && (fopAcM_GetName(atInfo.mpActor) == PROC_PLAYER)) && (i_this->mAction != 22)) { + if ((atInfo.mpActor && (fopAcM_GetName(atInfo.mpActor) == fpcNm_PLAYER_e)) && (i_this->mAction != 22)) { i_this->m68B = 1; i_this->mAction = 5; i_this->mMode = 1; @@ -2361,7 +2359,7 @@ void energy_ball_move(fganon_class* i_this) { void* mahou_se_set(void* i_act, void* i_other) { fganon_class* i_this = (fganon_class*)i_act; fopAc_ac_c* a_this = &i_this->actor; - if ((fopAc_IsActor(i_this)) && fopAcM_GetName(a_this) == PROC_FGMAHOU) { + if ((fopAc_IsActor(i_this)) && fopAcM_GetName(a_this) == fpcNm_FGMAHOU_e) { if (a_this->health == 0) { fopAcM_seStartCurrent(a_this, JA_SE_OBJ_PG_EBALL_FLY_L, 0); } @@ -2744,7 +2742,7 @@ static cPhs_State daFganon_Create(fopAc_ac_c* a_this) { if ((i_this->mSwitchNo != 0xFF) && (dComIfGs_isSwitch(i_this->mSwitchNo, dComIfGp_roomControl_getStayNo()) != 0)) { if (((fopAcM_GetParam(a_this) & 0xF) == 2) && !(dComIfGs_isEventBit(dSv_event_flag_c::UNK_3A08))) { // Probably a flag to do with beating FF1 so PG spawns? - fopAcM_create(PROC_BOKO, daBoko_c::Type_PGANON_SWORD_e, &a_this->current.pos, fopAcM_GetRoomNo(a_this)); + fopAcM_create(fpcNm_BOKO_e, daBoko_c::Type_PGANON_SWORD_e, &a_this->current.pos, fopAcM_GetRoomNo(a_this)); } return cPhs_ERROR_e; } @@ -2947,7 +2945,7 @@ static cPhs_State daFganon_Create(fopAc_ac_c* a_this) { deru_brk(i_this); } e_this->initBt(REG8_F(8) + 300.0f, 300.0f); - i_this->mCapeID = fopAcM_create(PROC_MANT, 1, &a_this->current.pos, fopAcM_GetRoomNo(a_this)); + i_this->mCapeID = fopAcM_create(fpcNm_MANT_e, 1, &a_this->current.pos, fopAcM_GetRoomNo(a_this)); daFganon_Execute(i_this); } return res2; @@ -2963,18 +2961,18 @@ static actor_method_class l_daFganon_Method = { }; actor_process_profile_definition g_profile_FGANON = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_FGANON, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_FGANON_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(fganon_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_FGANON, + /* Draw Prio */ fpcDwPi_FGANON_e, /* Actor SubMtd */ &l_daFganon_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ENEMY_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_fgmahou.cpp b/src/d/actor/d_a_fgmahou.cpp index 94c5a0a4b..f3ffd9ad7 100644 --- a/src/d/actor/d_a_fgmahou.cpp +++ b/src/d/actor/d_a_fgmahou.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_fgmahou.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" #include "d/d_s_play.h" #include "d/d_particle_name.h" @@ -25,7 +23,7 @@ static BOOL daFgmahou_Draw(fgmahou_class* i_this) { /* 000000E4-00000130 .text boss_s_sub__FPvPv */ static void* boss_s_sub(void* param_1, void*) { - if(fopAc_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_FGANON) { + if(fopAc_IsActor(param_1) && fopAcM_GetName(param_1) == fpcNm_FGANON_e) { return param_1; } @@ -435,18 +433,18 @@ static actor_method_class l_daFgmahou_Method = { }; actor_process_profile_definition g_profile_FGMAHOU = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_FGMAHOU, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_FGMAHOU_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(fgmahou_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_FGMAHOU, + /* Draw Prio */ fpcDwPi_FGMAHOU_e, /* Actor SubMtd */ &l_daFgmahou_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ENEMY_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_fire.cpp b/src/d/actor/d_a_fire.cpp index 9646d3c8f..4cb7e49d0 100644 --- a/src/d/actor/d_a_fire.cpp +++ b/src/d/actor/d_a_fire.cpp @@ -7,8 +7,6 @@ #include "d/actor/d_a_fire.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" -#include "d/d_procname.h" -#include "d/d_priority.h" static dCcD_SrcCyl l_cyl_src = { // dCcD_SrcGObjInf @@ -250,7 +248,7 @@ bool daFire_c::_execute() { /* 00000A70-00000AD8 .text search_wind__8daFire_cFv */ void daFire_c::search_wind() { - fopAc_ac_c* pActor = fopAcM_SearchByName(PROC_WindTag); + fopAc_ac_c* pActor = fopAcM_SearchByName(fpcNm_WindTag_e); if (pActor) { field_0x8F0 = fopAcM_GetID(pActor); } else { @@ -539,18 +537,18 @@ static actor_method_class daFireMethodTable = { }; actor_process_profile_definition g_profile_Fire = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Fire, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Fire_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daFire_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Fire, + /* Draw Prio */ fpcDwPi_Fire_e, /* Actor SubMtd */ &daFireMethodTable, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_floor.cpp b/src/d/actor/d_a_floor.cpp index 3e7db4d0c..370476038 100644 --- a/src/d/actor/d_a_floor.cpp +++ b/src/d/actor/d_a_floor.cpp @@ -8,8 +8,6 @@ #include "d/res/res_hhyu1.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_player.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "m_Do/m_Do_mtx.h" namespace daFloor_prm { @@ -20,9 +18,9 @@ const char daFloor_c::m_arcname[6] = "Hhyu1"; /* 00000078-000000DC .text rideCallBack__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c */ void rideCallBack(dBgW*, fopAc_ac_c* i_this, fopAc_ac_c* i_other) { - if (fopAcM_GetName(i_other) == PROC_PLAYER && !((daPy_py_c*)i_other)->checkEquipHeavyBoots()) { + if (fopAcM_GetName(i_other) == fpcNm_PLAYER_e && !((daPy_py_c*)i_other)->checkEquipHeavyBoots()) { ((daFloor_c*)i_this)->field_0x2d9 = 1; - } else if (fopAcM_GetName(i_other) == PROC_PLAYER && ((daFloor_c*)i_this)->field_0x2d9 && ((daPy_py_c*)i_other)->checkEquipHeavyBoots() && !((daFloor_c*)i_this)->field_0x2d8) { + } else if (fopAcM_GetName(i_other) == fpcNm_PLAYER_e && ((daFloor_c*)i_this)->field_0x2d9 && ((daPy_py_c*)i_other)->checkEquipHeavyBoots() && !((daFloor_c*)i_this)->field_0x2d8) { ((daFloor_c*)i_this)->field_0x2d8 = 1; ((daFloor_c*)i_this)->field_0x2da = 6; } @@ -152,18 +150,18 @@ static actor_method_class daFloorMethodTable = { }; actor_process_profile_definition g_profile_FLOOR = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_FLOOR, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_FLOOR_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daFloor_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_FLOOR, + /* Draw Prio */ fpcDwPi_FLOOR_e, /* Actor SubMtd */ &daFloorMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_fm.cpp b/src/d/actor/d_a_fm.cpp index aeef89652..eff68df93 100644 --- a/src/d/actor/d_a_fm.cpp +++ b/src/d/actor/d_a_fm.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_fm.h" #include "d/actor/d_a_player_main.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" #include "d/d_lib.h" #include "d/d_jnt_hit.h" @@ -571,12 +569,12 @@ fopAc_ac_c* daFm_c::searchNearOtherActor(fopAc_ac_c* i_actor) { f32 dist = fopAcM_searchActorDistanceXZ(this, i_actor); if(dist < l_HIO.field_0x0E4) { - if(fopAcM_GetName(i_actor) == PROC_BOMB) { + if(fopAcM_GetName(i_actor) == fpcNm_BOMB_e) { mpActorTarget = i_actor; if(!((daBomb_c*)mpActorTarget)->chk_state(daBomb_c::STATE_0)) { return i_actor; } - } else if(fopAcM_GetName(i_actor) == PROC_TSUBO) { + } else if(fopAcM_GetName(i_actor) == fpcNm_TSUBO_e) { daPy_lk_c* pLink = daPy_getPlayerLinkActorClass(); f32 dist2 = fopAcM_searchActorDistanceXZ(this, dComIfGp_getPlayer(0)); @@ -611,7 +609,7 @@ static void* searchNearFm_CB(void* param_1, void* param_2) { /* 00000F44-00001150 .text searchNearFm__6daFm_cFP10fopAc_ac_c */ void* daFm_c::searchNearFm(fopAc_ac_c* i_actor) { f32 dist; - if(fopAc_IsActor(i_actor) && fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_FM) { // redundant isactor check? + if(fopAc_IsActor(i_actor) && fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_FM_e) { // redundant isactor check? f32 abs = (field_0x3E4 - current.pos).absXZ(); dist = fopAcM_searchActorDistanceXZ(this, i_actor); if(dist != 0.0f) { @@ -969,7 +967,7 @@ void daFm_c::setGrabPos() { if (bomb == NULL) { mGrabPos = current.pos; } else { - if (fopAcM_GetName(bomb) == PROC_BOMB && bomb->chk_state(daBomb_c::STATE_0)) { + if (fopAcM_GetName(bomb) == fpcNm_BOMB_e && bomb->chk_state(daBomb_c::STATE_0)) { mGrabPos = current.pos; return; } @@ -996,24 +994,24 @@ cXyz daFm_c::getOffsetPos() { } else { s16 procName = fopAcM_GetName(mpActorTarget); - if(procName == PROC_NPC_CB1) { + if(procName == fpcNm_NPC_CB1_e) { if(fopAcM_checkCarryNow(mpActorTarget)) { offset.set(0.0f, 20.0f, 0.0f); } else { offset.set(0.0f, 80.0f, 0.0f); } - } else if(procName == PROC_NPC_MD) { + } else if(procName == fpcNm_NPC_MD_e) { if(fopAcM_checkCarryNow(mpActorTarget)) { offset.set(0.0f, 20.0f, 0.0f); } else { offset.set(0.0f, 140.0f, 0.0f); } - } else if(procName == PROC_BOMB) { + } else if(procName == fpcNm_BOMB_e) { offset.set(0.0f, 80.0f, 0.0f); - } else if(procName == PROC_TSUBO) { + } else if(procName == fpcNm_TSUBO_e) { switch(((daTsubo::Act_c*)mpActorTarget)->prm_get_type()) { case 5: @@ -1043,7 +1041,7 @@ u8 daFm_c::checkPlayerGrabBomb() { if(ac == NULL) { return false; } - return fopAcM_GetName(ac) == PROC_BOMB; + return fopAcM_GetName(ac) == fpcNm_BOMB_e; } /* 000028D4-00002954 .text checkPlayerGrabNpc__6daFm_cFv */ @@ -1592,11 +1590,11 @@ void daFm_c::modeAttack() { fopAcM_setCarryNow(mpActorTarget, 0); field_0x684 = 4; - if (fopAcM_GetName(mpActorTarget) == PROC_NPC_CB1) { + if (fopAcM_GetName(mpActorTarget) == fpcNm_NPC_CB1_e) { ((daNpc_Cb1_c*)mpActorTarget)->noCarryAction(); } - if (fopAcM_GetName(mpActorTarget) == PROC_NPC_MD) { + if (fopAcM_GetName(mpActorTarget) == fpcNm_NPC_MD_e) { ((daNpc_Md_c*)mpActorTarget)->noCarryAction(); } @@ -1626,7 +1624,7 @@ void daFm_c::modeAttack() { fopAc_ac_c* actor = mpActorTarget; s16 procName = fopAcM_GetName(actor); - if (procName == PROC_BOMB) { + if (procName == fpcNm_BOMB_e) { if (!fopAcM_CheckStatus(actor, fopAcStts_CARRY_e)) { fopAcM_setCarryNow(actor, 0); field_0x684 = 2; @@ -1636,7 +1634,7 @@ void daFm_c::modeAttack() { } else { modeProcInit(7); } - } else if (procName == PROC_TSUBO) { + } else if (procName == fpcNm_TSUBO_e) { if (!fopAcM_CheckStatus(actor, fopAcStts_CARRY_e)) { fopAcM_setCarryNow(actor, 0); field_0x684 = 3; @@ -1714,7 +1712,7 @@ void daFm_c::modeThrow() { field_0x684 = 0; mGrabPos = current.pos; } else { - if(fopAcM_GetName(mpActorTarget) == PROC_BOMB || fopAcM_GetName(mpActorTarget) == PROC_TSUBO) { + if(fopAcM_GetName(mpActorTarget) == fpcNm_BOMB_e || fopAcM_GetName(mpActorTarget) == fpcNm_TSUBO_e) { mpActorTarget->current.angle.y = shape_angle.y; mpActorTarget->shape_angle.y = shape_angle.y; mpActorTarget->speedF = l_HIO.field_0x0F0; @@ -1729,7 +1727,7 @@ void daFm_c::modeThrow() { f32 dropspeed = temp *= l_HIO.field_0x0F4; daTsubo::Act_c* tsubo = (daTsubo::Act_c*)mpActorTarget; - if(fopAcM_GetName(mpActorTarget) == PROC_TSUBO) { + if(fopAcM_GetName(mpActorTarget) == fpcNm_TSUBO_e) { switch(tsubo->prm_get_type()) { case 0: case 1: @@ -1897,7 +1895,7 @@ void daFm_c::modeGrabInit() { setAnm(0xC, false); } else { s16 procName = fopAcM_GetName(mpActorTarget); - if(procName == PROC_BOMB || procName == PROC_TSUBO) { + if(procName == fpcNm_BOMB_e || procName == fpcNm_TSUBO_e) { setAnm(9, false); } } @@ -2007,7 +2005,7 @@ void daFm_c::modeGrab() { } } else { s16 procName = fopAcM_GetName(mpActorTarget); - if (procName == PROC_BOMB || procName == PROC_TSUBO) { + if (procName == fpcNm_BOMB_e || procName == fpcNm_TSUBO_e) { moveRndBack(); mGrabPos = field_0x61C; if (!daPy_getPlayerLinkActorClass()->checkPlayerGuard()) { @@ -2068,13 +2066,13 @@ void daFm_c::modeGrabDemo() { } else { if (mAnmPrmIdx == 6 && mpMorf->getFrame() == 40.0f) { s16 procName = fopAcM_GetName(mpActorTarget); - if (procName == PROC_NPC_MD) { + if (procName == fpcNm_NPC_MD_e) { fopAcM_monsSeStart(this, JA_SE_CV_MD_DAMAGE, 0); - } else if (procName == PROC_NPC_CB1) { + } else if (procName == fpcNm_NPC_CB1_e) { fopAcM_monsSeStart(this, JA_SE_CV_CB_DAMAGE, 0); } } - if (fopAcM_GetName((daNpc_Md_c *)mpActorTarget) == PROC_NPC_MD) { // ghidra shows cast here but unnecessary + if (fopAcM_GetName((daNpc_Md_c *)mpActorTarget) == fpcNm_NPC_MD_e) { // ghidra shows cast here but unnecessary ((daNpc_Md_c *)mpActorTarget)->changeCaught02(); field_0x688 = true; } @@ -2082,11 +2080,11 @@ void daFm_c::modeGrabDemo() { if (dComIfGp_evmng_endCheck("DEFAULT_FM_SUIKOMI_NPC")) { if (field_0x2C8 != 0xff) { cancelGrab(); - if (fopAcM_GetName(mpActorTarget) == PROC_NPC_CB1) { + if (fopAcM_GetName(mpActorTarget) == fpcNm_NPC_CB1_e) { dComIfGs_onEventBit(dSv_event_flag_c::UNK_3408); ((daPy_npc_c *)mpActorTarget)->setPointRestart(field_0x2C8, 1); } - if (fopAcM_GetName(mpActorTarget) == PROC_NPC_MD) { + if (fopAcM_GetName(mpActorTarget) == fpcNm_NPC_MD_e) { dComIfGs_onEventBit(dSv_event_flag_c::UNK_3404); ((daPy_npc_c *)mpActorTarget)->setPointRestart(field_0x2C8, 2); } @@ -2145,7 +2143,7 @@ void daFm_c::modePrepareItem() { if(temp == 3) { if(mpMorf->isStop()) { u32 skullPrm = daTsubo::Act_c::prm_make_skull(); - mProcId2 = fopAcM_create(PROC_TSUBO, skullPrm, &field_0x61C, tevStr.mRoomNo); + mProcId2 = fopAcM_create(fpcNm_TSUBO_e, skullPrm, &field_0x61C, tevStr.mRoomNo); return; } } @@ -2678,7 +2676,7 @@ void daFm_c::resetInvKine() { /* 000070F4-000071E0 .text grabBomb__6daFm_cFv */ void daFm_c::grabBomb() { - if (fopAcM_GetName(mpActorTarget) == PROC_BOMB) { + if (fopAcM_GetName(mpActorTarget) == fpcNm_BOMB_e) { cXyz temp_pos(5.0f, -10.0f, 5.0f); cXyz pos = l_HIO.field_0x038 + temp_pos; mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(5)); @@ -2693,7 +2691,7 @@ void daFm_c::grabBomb() { /* 000071E0-0000743C .text grabTsubo__6daFm_cFv */ void daFm_c::grabTsubo() { - if(fopAcM_GetName(mpActorTarget) == PROC_TSUBO) { + if(fopAcM_GetName(mpActorTarget) == fpcNm_TSUBO_e) { daTsubo::Act_c* tsubo = (daTsubo::Act_c*)mpActorTarget; cXyz pos(0.0f, 0.0f, 0.0f); @@ -2771,14 +2769,14 @@ void daFm_c::grabNPC() { if(isNpc(mpActorTarget) == true) { cXyz temp(0.0f, 0.0f, 0.0f); csXyz angle(0, 0, 0); - if(fopAcM_GetName(mpActorTarget) == PROC_NPC_CB1) { + if(fopAcM_GetName(mpActorTarget) == fpcNm_NPC_CB1_e) { temp.set(-15.0f, -10.0f, 8.0f); angle.x = 0; angle.y = 16000; angle.z = -4000; } - if(fopAcM_GetName(mpActorTarget) == PROC_NPC_MD) { + if(fopAcM_GetName(mpActorTarget) == fpcNm_NPC_MD_e) { temp.set(10.0f, 0.0f, 5.0f); angle.x = 4000; angle.y = 18000; @@ -2799,9 +2797,9 @@ void daFm_c::searchTarget() { if(!dComIfGp_event_runCheck() || field_0x2E4 != 0) { fopAc_ac_c* actor = mpActorTarget = (fopAc_ac_c*)fopAcM_Search(searchNearOtherActor_CB, this); if(mpActorTarget == NULL) { - actor = fopAcM_SearchByName(PROC_NPC_CB1); + actor = fopAcM_SearchByName(fpcNm_NPC_CB1_e); if(actor == NULL) { - actor = fopAcM_SearchByName(PROC_NPC_MD); + actor = fopAcM_SearchByName(fpcNm_NPC_MD_e); } if(actor != NULL) { @@ -2846,8 +2844,8 @@ void daFm_c::setBaseTarget() { fopAc_ac_c* pMdActor; switch(field_0x2DC) { case 0: - fopAcM_SearchByName(PROC_NPC_CB1); - pMdActor = fopAcM_SearchByName(PROC_NPC_MD); + fopAcM_SearchByName(fpcNm_NPC_CB1_e); + pMdActor = fopAcM_SearchByName(fpcNm_NPC_MD_e); pLink = daPy_getPlayerLinkActorClass(); if (field_0x2D0 == 1 || field_0x2D0 == 2) { @@ -2874,12 +2872,12 @@ void daFm_c::setBaseTarget() { mBaseTarget = daPy_getPlayerLinkActorClass(); break; case 2: - fopAc_ac_c* actor = fopAcM_SearchByName(PROC_NPC_CB1); + fopAc_ac_c* actor = fopAcM_SearchByName(fpcNm_NPC_CB1_e); if(actor != NULL) { mBaseTarget = actor; } else { - actor = fopAcM_SearchByName(PROC_NPC_MD); + actor = fopAcM_SearchByName(fpcNm_NPC_MD_e); if(actor != NULL) { mBaseTarget = actor; } @@ -2906,7 +2904,7 @@ bool daFm_c::isNpc(fopAc_ac_c* i_actor) { if(i_actor == NULL) { return false; } - return fopAcM_GetName(i_actor) == PROC_NPC_CB1 || fopAcM_GetName(i_actor) == PROC_NPC_MD; + return fopAcM_GetName(i_actor) == fpcNm_NPC_CB1_e || fopAcM_GetName(i_actor) == fpcNm_NPC_MD_e; } /* 00007C7C-00007CD0 .text checkHeight__6daFm_cFP10fopAc_ac_c */ @@ -3026,7 +3024,7 @@ bool daFm_c::_execute() { holeExecute(); fopAcM_SearchByID(mProcId, &mpActorTarget); daBomb_c* bomb = (daBomb_c*)mpActorTarget; - if(bomb != NULL && fopAcM_GetName(bomb) == PROC_BOMB && bomb->chk_state(daBomb_c::STATE_0)) { + if(bomb != NULL && fopAcM_GetName(bomb) == fpcNm_BOMB_e && bomb->chk_state(daBomb_c::STATE_0)) { mpActorTarget = NULL; mProcId = 0; modeProcInit(7); @@ -3519,18 +3517,18 @@ static actor_method_class daFmMethodTable = { }; actor_process_profile_definition g_profile_FM = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_FM, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_FM_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daFm_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_FM, + /* Draw Prio */ fpcDwPi_FM_e, /* Actor SubMtd */ &daFmMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e | fopAcStts_UNK200000_e, /* Group */ fopAc_ENEMY_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_ghostship.cpp b/src/d/actor/d_a_ghostship.cpp index 755896bea..6ccb59389 100644 --- a/src/d/actor/d_a_ghostship.cpp +++ b/src/d/actor/d_a_ghostship.cpp @@ -8,8 +8,6 @@ #include "d/res/res_ayush.h" #include "SSystem/SComponent/c_math.h" #include "m_Do/m_Do_mtx.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "d/d_s_play.h" #include "d/d_kankyo_wether.h" @@ -478,18 +476,18 @@ static actor_method_class daGhostshipMethodTable = { }; actor_process_profile_definition g_profile_AYUSH = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_AYUSH, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_AYUSH_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daGhostship_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_AYUSH, + /* Draw Prio */ fpcDwPi_AYUSH_e, /* Actor SubMtd */ &daGhostshipMethodTable, /* Status */ 0x03 | fopAcStts_SHOWMAP_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_4_e, + /* Cull Type */ fopAc_CULLBOX_4_e, }; diff --git a/src/d/actor/d_a_gm.cpp b/src/d/actor/d_a_gm.cpp index 3d1300229..f25ff23c6 100644 --- a/src/d/actor/d_a_gm.cpp +++ b/src/d/actor/d_a_gm.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_gm.h" #include "m_Do/m_Do_ext.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" /* 000000EC-0000032C .text nodeCallBack__FP7J3DNodei */ @@ -259,18 +257,18 @@ static actor_method_class l_daGM_Method = { }; actor_process_profile_definition g_profile_GM = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_GM, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_GM_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(gm_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_GM, + /* Draw Prio */ fpcDwPi_GM_e, /* Actor SubMtd */ &l_daGM_Method, /* Status */ fopAcStts_SHOWMAP_e | fopAcStts_UNK40000_e | fopAcStts_UNK80000_e, /* Group */ fopAc_ENEMY_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_gnd.cpp b/src/d/actor/d_a_gnd.cpp index 71a5ef5d0..d9729db23 100644 --- a/src/d/actor/d_a_gnd.cpp +++ b/src/d/actor/d_a_gnd.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_gnd.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" /* 000000EC-0000023C .text __ct__11daGnd_HIO_cFv */ @@ -321,18 +319,18 @@ static actor_method_class l_daGnd_Method = { }; actor_process_profile_definition g_profile_GND = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_GND, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_GND_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(gnd_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_GND, + /* Draw Prio */ fpcDwPi_GND_e, /* Actor SubMtd */ &l_daGnd_Method, /* Status */ fopAcStts_UNK40000_e | fopAcStts_BOSS_e, /* Group */ fopAc_ENEMY_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_goal_flag.cpp b/src/d/actor/d_a_goal_flag.cpp index ff77b1de0..5dd16ec47 100644 --- a/src/d/actor/d_a_goal_flag.cpp +++ b/src/d/actor/d_a_goal_flag.cpp @@ -15,8 +15,6 @@ #include "d/res/res_gflag.h" #include "d/res/res_tgflag.h" #include "d/d_path.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "assets/l_txa_dummy_hataTEX.h" #include "m_Do/m_Do_controller_pad.h" @@ -436,7 +434,7 @@ BOOL daGoal_Flag_c::CreateBuoyRaces() { rope_points_p->m_position.z ); fopAcM_createChild( - PROC_Obj_Buoyrace, + fpcNm_Obj_Buoyrace_e, fopAcM_GetID(this), j | (i << 8), &rope_point_pos, fopAcM_GetRoomNo(this), @@ -662,7 +660,7 @@ cPhs_State daGoal_Flag_c::_create() { u16 time_limit_modifier = (u16)dComIfGs_getEventReg(dSv_event_flag_c::UNK_AAFF) * 10; time_limit -= time_limit_modifier; mTimerProcID = fopMsgM_Timer_create( - PROC_TIMER, + fpcNm_TIMER_e, 2, time_limit, 3, @@ -675,7 +673,7 @@ cPhs_State daGoal_Flag_c::_create() { ); mMgameStartProcID = fopMsgM_MiniGameStarter_create( - PROC_MINIGAME_STARTER, + fpcNm_MINIGAME_STARTER_e, 0, 0x200, NULL @@ -935,7 +933,7 @@ BOOL daGoal_Flag_c::TimerExecute() { rupees_collected = dComIfGp_getMiniGameRupee(); remaining_time = timer_p->getRestTimeMs() / 10; mMgameTermProcID = fopMsgM_MiniGameTerminater_create( - PROC_MINIGAME_TERMINATER, + fpcNm_MINIGAME_TERMINATER_e, 0, finish_type, remaining_time, @@ -1063,18 +1061,18 @@ static actor_method_class daGoal_FlagMethodTable = { }; actor_process_profile_definition g_profile_Goal_Flag = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Goal_Flag, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Goal_Flag_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daGoal_Flag_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Goal_Flag, + /* Draw Prio */ fpcDwPi_Goal_Flag_e, /* Actor SubMtd */ &daGoal_FlagMethodTable, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_grass.cpp b/src/d/actor/d_a_grass.cpp index 65fea62f7..6ade83e69 100644 --- a/src/d/actor/d_a_grass.cpp +++ b/src/d/actor/d_a_grass.cpp @@ -10,8 +10,6 @@ #include "d/d_com_inf_game.h" #include "d/d_flower.h" #include "d/d_grass.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_tree.h" #include "SSystem/SComponent/c_sxyz.h" @@ -203,18 +201,18 @@ static actor_method_class daGrass_METHODS = { }; actor_process_profile_definition g_profile_GRASS = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_GRASS, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_GRASS_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(grass_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_GRASS, + /* Draw Prio */ fpcDwPi_GRASS_e, /* Actor SubMtd */ &daGrass_METHODS, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_grid.cpp b/src/d/actor/d_a_grid.cpp index 11f2bd6f9..1944daab7 100644 --- a/src/d/actor/d_a_grid.cpp +++ b/src/d/actor/d_a_grid.cpp @@ -6,8 +6,6 @@ #include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_grid.h" #include "JSystem/J3DGraphBase/J3DPacket.h" -#include "d/d_procname.h" -#include "d/d_priority.h" static daHo_HIO_c l_HIO; @@ -95,18 +93,18 @@ static actor_method_class l_daGrid_Method = { }; actor_process_profile_definition g_profile_GRID = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_GRID, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_GRID_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daGrid_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_GRID, + /* Draw Prio */ fpcDwPi_GRID_e, /* Actor SubMtd */ &l_daGrid_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_gy.cpp b/src/d/actor/d_a_gy.cpp index 67a335162..090f1dde4 100644 --- a/src/d/actor/d_a_gy.cpp +++ b/src/d/actor/d_a_gy.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_gy.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" static dCcD_SrcSph l_sph_head_src = { @@ -344,18 +342,18 @@ static actor_method_class daGyMethodTable = { }; actor_process_profile_definition g_profile_GY = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_GY, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_GY_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daGy_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_GY, + /* Draw Prio */ fpcDwPi_GY_e, /* Actor SubMtd */ &daGyMethodTable, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ENEMY_e, - /* CullType */ fopAc_CULLBOX_4_e, + /* Cull Type */ fopAc_CULLBOX_4_e, }; diff --git a/src/d/actor/d_a_gy_ctrl.cpp b/src/d/actor/d_a_gy_ctrl.cpp index 083ade20c..e39778795 100644 --- a/src/d/actor/d_a_gy_ctrl.cpp +++ b/src/d/actor/d_a_gy_ctrl.cpp @@ -9,8 +9,6 @@ #if VERSION > VERSION_DEMO #include "d/actor/d_a_gy.h" #endif -#include "d/d_procname.h" -#include "d/d_priority.h" #if VERSION > VERSION_DEMO #include "d/d_s_play.h" #endif @@ -72,11 +70,11 @@ void* searchNearActor_CB(void* arg0, void* arg1) { void* daGy_Ctrl_c::searchNearActor(fopAc_ac_c* arg1) { if (fopAc_IsActor(arg1)) { f32 dVar3 = fopAcM_searchActorDistanceXZ(this, arg1); - if (m328 == 0 && fpcM_GetName(arg1) == PROC_GY_CTRLB && dVar3 < 6000.0f) { + if (m328 == 0 && fpcM_GetName(arg1) == fpcNm_GY_CTRLB_e && dVar3 < 6000.0f) { return arg1; } - if (fpcM_GetName(arg1) == PROC_DAIOCTA || fpcM_GetName(arg1) == PROC_OBJ_IKADA || fpcM_GetName(arg1) == PROC_NPC_SO) { + if (fpcM_GetName(arg1) == fpcNm_DAIOCTA_e || fpcM_GetName(arg1) == fpcNm_OBJ_IKADA_e || fpcM_GetName(arg1) == fpcNm_NPC_SO_e) { if (dVar3 < 6000.0f) { return arg1; } @@ -344,7 +342,7 @@ void daGy_Ctrl_c::modeCreate() { sp10.y = m308[m31C]; sp18.y = -1000.0f; - m360[m31C] = fopAcM_createChild(PROC_GY, fopAcM_GetID(this), 0xffffffff, &sp18, tevStr.mRoomNo, &sp10); + m360[m31C] = fopAcM_createChild(fpcNm_GY_e, fopAcM_GetID(this), 0xffffffff, &sp18, tevStr.mRoomNo, &sp10); m374[m31C] = true; m350 = l_HIO.m08; } @@ -521,7 +519,7 @@ void daGy_Ctrl_c::getArg() { /* 000013F8-00001458 .text checkGyCtrlExist__11daGy_Ctrl_cFv */ bool daGy_Ctrl_c::checkGyCtrlExist() { - s32 local_8 = PROC_GY_CTRL; + s32 local_8 = fpcNm_GY_CTRL_e; daGy_Ctrl_c* pfVar1 = (daGy_Ctrl_c*)fopAcM_SearchByName(local_8); if ((pfVar1 != NULL) && (pfVar1->m328 == 0) && (pfVar1->m331 == 1)) { return true; @@ -539,7 +537,7 @@ cPhs_State daGy_Ctrl_c::_create() { return cPhs_ERROR_e; } - if (!dComIfGs_checkGetItem(dItem_BOOMERANG_e)) { + if (!dComIfGs_checkGetItem(dItemNo_BOOMERANG_e)) { return cPhs_ERROR_e; } @@ -586,35 +584,35 @@ static actor_method_class daGy_CtrlMethodTable = { }; actor_process_profile_definition g_profile_GY_CTRL = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_GY_CTRL, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_GY_CTRL_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daGy_Ctrl_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_GY_CTRL, + /* Draw Prio */ fpcDwPi_GY_CTRL_e, /* Actor SubMtd */ &daGy_CtrlMethodTable, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_4_e, + /* Cull Type */ fopAc_CULLBOX_4_e, }; actor_process_profile_definition g_profile_GY_CTRLB = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_GY_CTRLB, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_GY_CTRLB_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daGy_Ctrl_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_GY_CTRLB, + /* Draw Prio */ fpcDwPi_GY_CTRLB_e, /* Actor SubMtd */ &daGy_CtrlMethodTable, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_4_e, + /* Cull Type */ fopAc_CULLBOX_4_e, }; diff --git a/src/d/actor/d_a_himo2.cpp b/src/d/actor/d_a_himo2.cpp index 2483877e5..c9e35b575 100644 --- a/src/d/actor/d_a_himo2.cpp +++ b/src/d/actor/d_a_himo2.cpp @@ -12,8 +12,6 @@ #include "d/actor/d_a_dr2.h" #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" #include "d/d_s_play.h" #include "d/res/res_link.h" @@ -53,7 +51,7 @@ public: /* 0x20 */ f32 m20; }; -himo2HIO_c l_himo2HIO; +static himo2HIO_c l_himo2HIO; f32 rope_scale; #if VERSION > VERSION_DEMO static btd_class* btd; @@ -514,7 +512,7 @@ static BOOL daHimo2_Draw(himo2_class* i_this) { /* 800ECBE8-800ECC54 .text s_a_d_sub__FPvPv */ void* s_a_d_sub(void* param_1, void* param_2) { - if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == PROC_KUI)) { + if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_KUI_e)) { himo2_class* rope = (himo2_class*)param_2; rope->m218C[rope->m24AC] = (fopAc_ac_c*)param_1; rope->m24AC++; @@ -658,7 +656,7 @@ BOOL himo2_class::setTargetPos(cXyz* param_1, f32* param_2, f32* param_3) { /* 800ED2E0-800ED32C .text dr_a_sub__FPvPv */ void* dr_a_sub(void* param_1, void* param_2) { - if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == PROC_DR2)) { + if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_DR2_e)) { return param_1; } else { return param_2 = NULL; @@ -667,7 +665,7 @@ void* dr_a_sub(void* param_1, void* param_2) { /* 800ED32C-800ED378 .text b_a_sub__FPvPv */ void* b_a_sub(void* param_1, void* param_2) { - if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == PROC_BTD)) { + if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_BTD_e)) { return param_1; } else { return param_2 = NULL; @@ -850,7 +848,7 @@ void new_himo2_move(himo2_class* i_this) { } else { i_this->m02DC = 9; } - if ((i_this->m217C != NULL) && (fopAcM_GetName(i_this->m217C) == PROC_KUI)) { + if ((i_this->m217C != NULL) && (fopAcM_GetName(i_this->m217C) == fpcNm_KUI_e)) { i_this->m217C->health = 0; } #endif @@ -1110,7 +1108,7 @@ void new_himo2_move(himo2_class* i_this) { } if ((CPad_CHECK_TRIG_X(0) || CPad_CHECK_TRIG_Y(0)) || CPad_CHECK_TRIG_Z(0)) { i_this->m02DC = 5; - if (fopAcM_GetName(r4_r27) == PROC_BK) { + if (fopAcM_GetName(r4_r27) == fpcNm_BK_e) { bk_class* bk = (bk_class*)r4_r27; bk->dr.mAction = 0; bk->dr.mMode = 0; @@ -1859,18 +1857,18 @@ static actor_method_class l_daHimo2_Method = { }; actor_process_profile_definition g_profile_HIMO2 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0008, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_HIMO2, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0008, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_HIMO2_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(himo2_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_HIMO2, + /* Draw Prio */ fpcDwPi_HIMO2_e, /* Actor SubMtd */ &l_daHimo2_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_himo3.cpp b/src/d/actor/d_a_himo3.cpp index 92ae4b262..26ccb1e5c 100644 --- a/src/d/actor/d_a_himo3.cpp +++ b/src/d/actor/d_a_himo3.cpp @@ -13,8 +13,6 @@ #include "d/res/res_link.h" #include "d/res/res_himo3.h" #include "d/d_s_play.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "d/d_kankyo_wether.h" #include "f_op/f_op_actor_mng.h" @@ -859,18 +857,18 @@ static actor_method_class l_daHimo3_Method = { }; actor_process_profile_definition g_profile_HIMO3 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0008, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_HIMO3, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0008, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_HIMO3_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(himo3_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_HIMO3, + /* Draw Prio */ fpcDwPi_HIMO3_e, /* Actor SubMtd */ &l_daHimo3_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_hitobj.cpp b/src/d/actor/d_a_hitobj.cpp index 25a672f0f..f4fc0ea92 100644 --- a/src/d/actor/d_a_hitobj.cpp +++ b/src/d/actor/d_a_hitobj.cpp @@ -9,8 +9,6 @@ #include "f_op/f_op_actor.h" #include "f_op/f_op_kankyo_mng.h" #include "f_op/f_op_actor_mng.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 00000078-00000080 .text daHitobj_Draw__FP12hitobj_class */ static BOOL daHitobj_Draw(hitobj_class* i_this) { @@ -98,18 +96,18 @@ static actor_method_class l_daHitobj_Method = { }; actor_process_profile_definition g_profile_HITOBJ = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_HITOBJ, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_HITOBJ_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(hitobj_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_HITOBJ, + /* Draw Prio */ fpcDwPi_HITOBJ_e, /* Actor SubMtd */ &l_daHitobj_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_hmlif.cpp b/src/d/actor/d_a_hmlif.cpp index b63fc4e1c..bdd60341c 100644 --- a/src/d/actor/d_a_hmlif.cpp +++ b/src/d/actor/d_a_hmlif.cpp @@ -8,8 +8,6 @@ #include "d/res/res_hmlif.h" #include "d/res/res_hyuf1.h" #include "d/res/res_hyuf2.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_path.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" @@ -545,18 +543,18 @@ static actor_method_class daHmlifMethodTable = { }; actor_process_profile_definition g_profile_Hmlif = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0002, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Hmlif, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0002, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Hmlif_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daHmlif_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Hmlif, + /* Draw Prio */ fpcDwPi_Hmlif_e, /* Actor SubMtd */ &daHmlifMethodTable, /* Status */ 0x04 | fopAcStts_SHOWMAP_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_hookshot.cpp b/src/d/actor/d_a_hookshot.cpp index 6e74e37f7..a8f74f017 100644 --- a/src/d/actor/d_a_hookshot.cpp +++ b/src/d/actor/d_a_hookshot.cpp @@ -10,8 +10,6 @@ #include "SSystem/SComponent/c_counter.h" #include "d/actor/d_a_player_main.h" #include "d/actor/d_a_ship.h" // IWYU pragma: keep -#include "d/d_procname.h" -#include "d/d_priority.h" #include "assets/l_chainS3TCTEX__d_hookshot.h" const u16 l_chainS3TCTEX__width = 32; @@ -576,18 +574,18 @@ static actor_method_class l_daHookshot_Method = { }; actor_process_profile_definition g_profile_HOOKSHOT = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0006, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_HOOKSHOT, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0006, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_HOOKSHOT_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daHookshot_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_HOOKSHOT, + /* Draw Prio */ fpcDwPi_HOOKSHOT_e, /* Actor SubMtd */ &l_daHookshot_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_hot_floor.cpp b/src/d/actor/d_a_hot_floor.cpp index 157e20956..25864f321 100644 --- a/src/d/actor/d_a_hot_floor.cpp +++ b/src/d/actor/d_a_hot_floor.cpp @@ -10,8 +10,6 @@ #include "JSystem/JUtility/JUTAssert.h" #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" @@ -134,18 +132,18 @@ static actor_method_class daHot_FloorMethodTable = { }; actor_process_profile_definition g_profile_Hot_Floor = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Hot_Floor, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Hot_Floor_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daHot_Floor_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Hot_Floor, + /* Draw Prio */ fpcDwPi_Hot_Floor_e, /* Actor SubMtd */ &daHot_FloorMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_hys.cpp b/src/d/actor/d_a_hys.cpp index 7c638a9d8..914b0e94f 100644 --- a/src/d/actor/d_a_hys.cpp +++ b/src/d/actor/d_a_hys.cpp @@ -8,8 +8,6 @@ #include "d/res/res_hys.h" #include "d/d_com_inf_game.h" #include "m_Do/m_Do_mtx.h" -#include "d/d_procname.h" -#include "d/d_priority.h" const char* daHys_c::m_arcname[2] = {"Hys", "Hys"}; @@ -241,18 +239,18 @@ static actor_method_class daHysMethodTable = { }; actor_process_profile_definition g_profile_Hys = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0008, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Hys, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0008, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Hys_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daHys_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Hys, + /* Draw Prio */ fpcDwPi_Hys_e, /* Actor SubMtd */ &daHysMethodTable, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_ib.cpp b/src/d/actor/d_a_ib.cpp index 16c642901..70e9144fc 100644 --- a/src/d/actor/d_a_ib.cpp +++ b/src/d/actor/d_a_ib.cpp @@ -5,8 +5,6 @@ #include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_ib.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "JSystem/JUtility/JUTAssert.h" #include "d/d_com_inf_game.h" #include "d/d_s_play.h" @@ -136,11 +134,11 @@ BOOL daIball_c::createItem() { itemBitNo = daIball_prm::getItemBitNo(this); if ((itemBitNo == 0x1F || itemBitNo == 0xFF || itemBitNo == -1) || fopAcM_isItemForIb(itemBitNo, items[i], current.roomNo)) { itemBitNo = -1; - items[i] = dItem_YELLOW_RUPEE_e; + items[i] = dItemNo_YELLOW_RUPEE_e; } } else if (isNonSavedEmono(items[i])) { if (daIball_prm::getItemBitNo(this) != 0) { - items[i] = dItem_YELLOW_RUPEE_e; + items[i] = dItemNo_YELLOW_RUPEE_e; } itemBitNo = -1; } @@ -520,18 +518,18 @@ static actor_method_class l_daIball_Method = { }; actor_process_profile_definition g_profile_Iball = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Iball, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Iball_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daIball_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Iball, + /* Draw Prio */ fpcDwPi_Iball_e, /* Actor SubMtd */ &l_daIball_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_icelift.cpp b/src/d/actor/d_a_icelift.cpp index f6f911b3f..6c0b39cc6 100644 --- a/src/d/actor/d_a_icelift.cpp +++ b/src/d/actor/d_a_icelift.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_icelift.h" #include "d/d_bg_w.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 00000078-000000E0 .text _delete__9daIlift_cFv */ bool daIlift_c::_delete() { @@ -108,18 +106,18 @@ static actor_method_class daIliftMethodTable = { }; actor_process_profile_definition g_profile_ICE_LIFT = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_ICE_LIFT, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_ICE_LIFT_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daIlift_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_ICE_LIFT, + /* Draw Prio */ fpcDwPi_ICE_LIFT_e, /* Actor SubMtd */ &daIliftMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_ikari.cpp b/src/d/actor/d_a_ikari.cpp index 5078e0cd9..851849efe 100644 --- a/src/d/actor/d_a_ikari.cpp +++ b/src/d/actor/d_a_ikari.cpp @@ -7,12 +7,10 @@ #include "d/actor/d_a_ikari.h" #include "d/res/res_ikari.h" #include "d/d_kankyo_wether.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_s_play.h" #include "m_Do/m_Do_mtx.h" -daObjIkariHIO_c l_HIO; +static daObjIkariHIO_c l_HIO; const char daIkari_c::M_arcname[6] = "Ikari"; @@ -193,18 +191,18 @@ static actor_method_class daIkariMethodTable = { }; actor_process_profile_definition g_profile_IKARI = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_IKARI, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_IKARI_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daIkari_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_IKARI, + /* Draw Prio */ fpcDwPi_IKARI_e, /* Actor SubMtd */ &daIkariMethodTable, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_item.cpp b/src/d/actor/d_a_item.cpp index 5b9fefe79..8fac4867b 100644 --- a/src/d/actor/d_a_item.cpp +++ b/src/d/actor/d_a_item.cpp @@ -10,8 +10,6 @@ #include "d/actor/d_a_player_main.h" #include "d/actor/d_a_sea.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "f_op/f_op_camera.h" #include "m_Do/m_Do_mtx.h" #include "m_Do/m_Do_controller_pad.h" @@ -34,39 +32,39 @@ cXyz setArrowTrans(s16 yRot, cXyz offset) { /* 800F4C4C-800F4CD8 .text getYOffset__8daItem_cFv */ float daItem_c::getYOffset() { switch (m_itemNo) { - case dItem_KNIGHTS_CREST_e: + case dItemNo_KNIGHTS_CREST_e: return 0.0f; - case dItem_SKULL_NECKLACE_e: + case dItemNo_SKULL_NECKLACE_e: return 0.0f; - case dItem_BOKOBABA_SEED_e: + case dItemNo_BOKOBABA_SEED_e: return 0.0f; - case dItem_GOLDEN_FEATHER_e: + case dItemNo_GOLDEN_FEATHER_e: return 0.0f; - case dItem_RED_JELLY_e: - case dItem_GREEN_JELLY_e: - case dItem_BLUE_JELLY_e: + case dItemNo_RED_JELLY_e: + case dItemNo_GREEN_JELLY_e: + case dItemNo_BLUE_JELLY_e: return 0.0f; - case dItem_SMALL_KEY_e: - case dItem_BOSS_KEY_e: + case dItemNo_SMALL_KEY_e: + case dItemNo_BOSS_KEY_e: return 0.0f; - case dItem_SHIELD_e: + case dItemNo_SHIELD_e: return 23.0f; - case dItem_SWORD_e: + case dItemNo_SWORD_e: return 20.0f; - case dItem_DROPPED_SWORD_e: + case dItemNo_DROPPED_SWORD_e: return 10.0f; - case dItem_HEART_PIECE_e: - case dItem_HEART_CONTAINER_e: + case dItemNo_HEART_PIECE_e: + case dItemNo_HEART_CONTAINER_e: return 0.0f; - case dItem_GREEN_RUPEE_e: - case dItem_BLUE_RUPEE_e: - case dItem_YELLOW_RUPEE_e: - case dItem_RED_RUPEE_e: - case dItem_PURPLE_RUPEE_e: - case dItem_ORANGE_RUPEE_e: - case dItem_SILVER_RUPEE_e: + case dItemNo_GREEN_RUPEE_e: + case dItemNo_BLUE_RUPEE_e: + case dItemNo_YELLOW_RUPEE_e: + case dItemNo_RED_RUPEE_e: + case dItemNo_PURPLE_RUPEE_e: + case dItemNo_ORANGE_RUPEE_e: + case dItemNo_SILVER_RUPEE_e: return 0.0f; - case dItem_HEART_e: + case dItemNo_HEART_e: return 0.0f; default: return 0.0f; @@ -78,7 +76,7 @@ void daItem_c::set_mtx() { cXyz pos = current.pos; csXyz rot = current.angle; #if VERSION > VERSION_DEMO - if (m_itemNo == dItem_HEART_CONTAINER_e) { + if (m_itemNo == dItemNo_HEART_CONTAINER_e) { rot.y = shape_angle.y; } #endif @@ -168,16 +166,16 @@ void daItem_c::CreateInit() { show(); - if (dItem_data::checkSpecialEffect(m_itemNo) && (m_itemNo != dItem_SMALL_KEY_e || (m_itemNo == dItem_SMALL_KEY_e && checkFlag(FLAG_UNK02)))) { + if (dItem_data::checkSpecialEffect(m_itemNo) && (m_itemNo != dItemNo_SMALL_KEY_e || (m_itemNo == dItemNo_SMALL_KEY_e && checkFlag(FLAG_UNK02)))) { u16 particleID = dItem_data::getSpecialEffect(m_itemNo); dComIfGp_particle_set(particleID, ¤t.pos, NULL, NULL, 0xFF, &mPtclFollowCb); } switch (m_itemNo) { - case dItem_BOMB_5_e: - case dItem_BOMB_10_e: - case dItem_BOMB_20_e: - case dItem_BOMB_30_e: + case dItemNo_BOMB_5_e: + case dItemNo_BOMB_10_e: + case dItemNo_BOMB_20_e: + case dItemNo_BOMB_30_e: mScaleTarget.setall(0.6f); break; default: @@ -197,11 +195,11 @@ void daItem_c::CreateInit() { initAction(); switch (m_itemNo) { - case dItem_SWORD_e: - case dItem_SHIELD_e: + case dItemNo_SWORD_e: + case dItemNo_SHIELD_e: fopAcM_OnStatus(this, fopAcStts_UNK4000_e); break; - case dItem_DROPPED_SWORD_e: + case dItemNo_DROPPED_SWORD_e: current.angle.x = 0x4000; break; } @@ -209,7 +207,7 @@ void daItem_c::CreateInit() { set_mtx(); animPlay(1.0f, 1.0f, 1.0f, 1.0f, 1.0f); - if (fopAcM_SearchByName(PROC_BST)) { // Gohdan + if (fopAcM_SearchByName(fpcNm_BST_e)) { // Gohdan mpParticleEmitter = dComIfGp_particle_set(dPa_name::ID_AK_SN_BSTKIRAKIRAARROW00, ¤t.pos); } } @@ -227,7 +225,7 @@ cPhs_State daItem_c::_daItem_create() { mItemBitNo = daItem_prm::getItemBitNo(this); #if VERSION > VERSION_DEMO - if (m_itemNo != dItem_BLUE_JELLY_e) // Blue Chu Jelly uses mItemBitNo as if it was a switch. + if (m_itemNo != dItemNo_BLUE_JELLY_e) // Blue Chu Jelly uses mItemBitNo as if it was a switch. #endif { mItemBitNo &= 0x7F; @@ -324,7 +322,7 @@ void daItem_c::mode_proc_call() { } if (checkFlag(FLAG_BOOMERANG)) { - fopAc_ac_c* boomerang = (fopAc_ac_c*)fopAcM_SearchByName(PROC_BOOMERANG); + fopAc_ac_c* boomerang = (fopAc_ac_c*)fopAcM_SearchByName(fpcNm_BOOMERANG_e); if (boomerang) { current.pos = boomerang->current.pos; } else { @@ -333,7 +331,7 @@ void daItem_c::mode_proc_call() { } if (checkFlag(FLAG_HOOK)) { - fopAc_ac_c* grappling_hook = (fopAc_ac_c*)fopAcM_SearchByName(PROC_HIMO2); + fopAc_ac_c* grappling_hook = (fopAc_ac_c*)fopAcM_SearchByName(fpcNm_HIMO2_e); if (grappling_hook) { current.pos = grappling_hook->current.pos; } else { @@ -588,72 +586,72 @@ void daItem_c::itemGetExecute() { mItemStatus = STATUS_INIT_NORMAL; switch (m_itemNo) { - case dItem_HEART_e: + case dItemNo_HEART_e: mDoAud_seStart(JA_SE_HEART_PIECE); execItemGet(m_itemNo); break; - case dItem_GREEN_RUPEE_e: + case dItemNo_GREEN_RUPEE_e: mDoAud_seStart(JA_SE_LUPY_GET); execItemGet(m_itemNo); break; - case dItem_BLUE_RUPEE_e: + case dItemNo_BLUE_RUPEE_e: mDoAud_seStart(JA_SE_BLUE_LUPY_GET); execItemGet(m_itemNo); break; - case dItem_YELLOW_RUPEE_e: + case dItemNo_YELLOW_RUPEE_e: mDoAud_seStart(JA_SE_BLUE_LUPY_GET); execItemGet(m_itemNo); break; - case dItem_RED_RUPEE_e: + case dItemNo_RED_RUPEE_e: mDoAud_seStart(JA_SE_RED_LUPY_GET); execItemGet(m_itemNo); break; - case dItem_PURPLE_RUPEE_e: + case dItemNo_PURPLE_RUPEE_e: mDoAud_seStart(JA_SE_RED_LUPY_GET); execItemGet(m_itemNo); break; - case dItem_ORANGE_RUPEE_e: + case dItemNo_ORANGE_RUPEE_e: mDoAud_seStart(JA_SE_RED_LUPY_GET); execItemGet(m_itemNo); break; - case dItem_SILVER_RUPEE_e: + case dItemNo_SILVER_RUPEE_e: mDoAud_seStart(JA_SE_RED_LUPY_GET); execItemGet(m_itemNo); break; - case dItem_HEART_PIECE_e: + case dItemNo_HEART_PIECE_e: mDoAud_seStart(JA_SE_HEART_PIECE); mItemStatus = STATUS_INIT_GET_DEMO; break; - case dItem_HEART_CONTAINER_e: + case dItemNo_HEART_CONTAINER_e: mDoAud_seStart(JA_SE_HEART_PIECE); mItemStatus = STATUS_INIT_GET_DEMO; break; - case dItem_SMALL_MAGIC_e: + case dItemNo_SMALL_MAGIC_e: mDoAud_seStart(JA_SE_MAGIC_POT_GET_S); execItemGet(m_itemNo); break; - case dItem_LARGE_MAGIC_e: + case dItemNo_LARGE_MAGIC_e: mDoAud_seStart(JA_SE_MAGIC_POT_GET_L); execItemGet(m_itemNo); break; - 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 dItemNo_BOMB_5_e: + case dItemNo_BOMB_10_e: + case dItemNo_BOMB_20_e: + case dItemNo_BOMB_30_e: + case dItemNo_ARROW_10_e: + case dItemNo_ARROW_20_e: + case dItemNo_ARROW_30_e: mDoAud_seStart(JA_SE_CONSUMP_ITEM_GET); execItemGet(m_itemNo); break; - case dItem_SMALL_KEY_e: + case dItemNo_SMALL_KEY_e: mItemStatus = STATUS_INIT_GET_DEMO; break; - case dItem_TRIPLE_HEART_e: + case dItemNo_TRIPLE_HEART_e: mDoAud_seStart(JA_SE_HEART_PIECE); execItemGet(m_itemNo); break; - case dItem_JOY_PENDANT_e: + case dItemNo_JOY_PENDANT_e: mDoAud_seStart(JA_SE_SPOILS_GET); if (!dComIfGs_isGetItemBeast(dBeastIdx_JOY_PENDANT_e)) { mItemStatus = STATUS_INIT_GET_DEMO; @@ -662,29 +660,29 @@ void daItem_c::itemGetExecute() { execItemGet(m_itemNo); } break; - case dItem_DEKU_LEAF_e: + case dItemNo_DEKU_LEAF_e: mItemStatus = STATUS_INIT_GET_DEMO; break; - case dItem_SWORD_e: { - daItem_c* item = (daItem_c*)fopAcM_SearchByName(PROC_ITEM); - if (item && item->m_itemNo == dItem_SHIELD_e) { + case dItemNo_SWORD_e: { + daItem_c* item = (daItem_c*)fopAcM_SearchByName(fpcNm_ITEM_e); + if (item && item->m_itemNo == dItemNo_SHIELD_e) { item->itemGetExecute(); } mItemStatus = STATUS_INIT_GET_DEMO; break; } - case dItem_SHIELD_e: { - daItem_c* item = (daItem_c*)fopAcM_SearchByName(PROC_ITEM); - if (item && item->m_itemNo == dItem_SWORD_e) { + case dItemNo_SHIELD_e: { + daItem_c* item = (daItem_c*)fopAcM_SearchByName(fpcNm_ITEM_e); + if (item && item->m_itemNo == dItemNo_SWORD_e) { item->itemGetExecute(); } mItemStatus = STATUS_INIT_GET_DEMO; break; } - case dItem_DROPPED_SWORD_e: + case dItemNo_DROPPED_SWORD_e: mItemStatus = STATUS_INIT_GET_DEMO; break; - case dItem_SKULL_NECKLACE_e: + case dItemNo_SKULL_NECKLACE_e: mDoAud_seStart(JA_SE_SPOILS_GET); if (!dComIfGs_isGetItemBeast(dBeastIdx_SKULL_NECKLACE_e)) { mItemStatus = STATUS_INIT_GET_DEMO; @@ -693,7 +691,7 @@ void daItem_c::itemGetExecute() { execItemGet(m_itemNo); } break; - case dItem_BOKOBABA_SEED_e: + case dItemNo_BOKOBABA_SEED_e: mDoAud_seStart(JA_SE_SPOILS_GET); if (!dComIfGs_isGetItemBeast(dBeastIdx_BOKOBABA_SEED_e)) { mItemStatus = STATUS_INIT_GET_DEMO; @@ -702,7 +700,7 @@ void daItem_c::itemGetExecute() { execItemGet(m_itemNo); } break; - case dItem_GOLDEN_FEATHER_e: + case dItemNo_GOLDEN_FEATHER_e: mDoAud_seStart(JA_SE_SPOILS_GET); if (!dComIfGs_isGetItemBeast(dBeastIdx_GOLDEN_FEATHER_e)) { mItemStatus = STATUS_INIT_GET_DEMO; @@ -711,7 +709,7 @@ void daItem_c::itemGetExecute() { execItemGet(m_itemNo); } break; - case dItem_KNIGHTS_CREST_e: + case dItemNo_KNIGHTS_CREST_e: mDoAud_seStart(JA_SE_SPOILS_GET); if (!dComIfGs_isGetItemBeast(dBeastIdx_KNIGHTS_CREST_e)) { mItemStatus = STATUS_INIT_GET_DEMO; @@ -720,7 +718,7 @@ void daItem_c::itemGetExecute() { execItemGet(m_itemNo); } break; - case dItem_RED_JELLY_e: + case dItemNo_RED_JELLY_e: mDoAud_seStart(JA_SE_SPOILS_GET); if (!dComIfGs_isGetItemBeast(dBeastIdx_RED_JELLY_e)) { mItemStatus = STATUS_INIT_GET_DEMO; @@ -729,7 +727,7 @@ void daItem_c::itemGetExecute() { execItemGet(m_itemNo); } break; - case dItem_GREEN_JELLY_e: + case dItemNo_GREEN_JELLY_e: mDoAud_seStart(JA_SE_SPOILS_GET); if (!dComIfGs_isGetItemBeast(dBeastIdx_GREEN_JELLY_e)) { mItemStatus = STATUS_INIT_GET_DEMO; @@ -738,7 +736,7 @@ void daItem_c::itemGetExecute() { execItemGet(m_itemNo); } break; - case dItem_BLUE_JELLY_e: + case dItemNo_BLUE_JELLY_e: mDoAud_seStart(JA_SE_SPOILS_GET); if (!dComIfGs_isGetItemBeast(dBeastIdx_BLUE_JELLY_e)) { mItemStatus = STATUS_INIT_GET_DEMO; @@ -747,7 +745,7 @@ void daItem_c::itemGetExecute() { execItemGet(m_itemNo); } break; - case dItem_BIRD_BAIT_5_e: + case dItemNo_BIRD_BAIT_5_e: mDoAud_seStart(JA_SE_ESA_GET); if (!dComIfGs_isGetItemBait(0)) { mItemStatus = STATUS_INIT_GET_DEMO; @@ -756,7 +754,7 @@ void daItem_c::itemGetExecute() { execItemGet(m_itemNo); } break; - case dItem_HYOI_PEAR_e: + case dItemNo_HYOI_PEAR_e: mDoAud_seStart(JA_SE_ESA_GET); if (!dComIfGs_isGetItemBait(1)) { mItemStatus = STATUS_INIT_GET_DEMO; @@ -991,11 +989,11 @@ BOOL daItem_c::itemActionForSword() { f32 temp = field_0x650 * 0.9f; fopAcM_SetSpeed(this, 0.0f, -temp, 0.0f); - if (m_itemNo == dItem_SWORD_e) { + if (m_itemNo == dItemNo_SWORD_e) { if (m_get_timer > 15) { fopAcM_seStart(this, JA_SE_OBJ_LNK_SWORD_FALL, 0); } - } else if (m_itemNo == dItem_SHIELD_e) { + } else if (m_itemNo == dItemNo_SHIELD_e) { if (m_get_timer > 15) { fopAcM_seStart(this, JA_SE_OBJ_LNK_SHIELD_FALL, 0); } @@ -1048,7 +1046,7 @@ BOOL daItem_c::itemActionForSword() { BOOL daItem_c::itemActionForArrow() { mAcch.CrrPos(*dComIfG_Bgsp()); - if (mOnGroundTimer == 0 && mpParticleEmitter && fopAcM_SearchByName(PROC_BST)) { // Gohdan + if (mOnGroundTimer == 0 && mpParticleEmitter && fopAcM_SearchByName(fpcNm_BST_e)) { // Gohdan mpParticleEmitter->setGlobalTranslation(current.pos); } @@ -1063,7 +1061,7 @@ BOOL daItem_c::itemActionForArrow() { mOnGroundTimer++; - if (mOnGroundTimer == 1 && fopAcM_SearchByName(PROC_BST)) { // Gohdan + if (mOnGroundTimer == 1 && fopAcM_SearchByName(fpcNm_BST_e)) { // Gohdan JPABaseEmitter* emitter = dComIfGp_particle_set(dPa_name::ID_AK_ST_BSTDROPARROWSMOKE00, ¤t.pos, NULL, NULL, 0xFF, &mPtclSmokeCb, fopAcM_GetRoomNo(this)); if (emitter) { emitter->setMaxFrame(1); @@ -1080,7 +1078,7 @@ BOOL daItem_c::itemActionForArrow() { speedF = 0.0f; #if VERSION > VERSION_DEMO - if (m_itemNo != dItem_HEART_CONTAINER_e) + if (m_itemNo != dItemNo_HEART_CONTAINER_e) #endif { itemDefaultRotateY(); @@ -1088,7 +1086,7 @@ BOOL daItem_c::itemActionForArrow() { } #if VERSION > VERSION_DEMO - if (m_itemNo == dItem_HEART_CONTAINER_e) { + if (m_itemNo == dItemNo_HEART_CONTAINER_e) { if (mOnGroundTimer != 0) { getData(); s16 rotationSpeed = 0xFFFF / getData()->mRotateYSpeed; @@ -1141,33 +1139,33 @@ void daItem_c::set_bound_se() { } switch (m_itemNo) { - case dItem_GREEN_RUPEE_e: - case dItem_BLUE_RUPEE_e: - case dItem_YELLOW_RUPEE_e: - case dItem_RED_RUPEE_e: - case dItem_PURPLE_RUPEE_e: - case dItem_ORANGE_RUPEE_e: + case dItemNo_GREEN_RUPEE_e: + case dItemNo_BLUE_RUPEE_e: + case dItemNo_YELLOW_RUPEE_e: + case dItemNo_RED_RUPEE_e: + case dItemNo_PURPLE_RUPEE_e: + case dItemNo_ORANGE_RUPEE_e: fopAcM_seStart(this, JA_SE_OBJ_LUPY_BOUND, temp); break; - case dItem_SMALL_MAGIC_e: - case dItem_LARGE_MAGIC_e: + case dItemNo_SMALL_MAGIC_e: + case dItemNo_LARGE_MAGIC_e: fopAcM_seStart(this, JA_SE_OBJ_M_POT_BOUND, temp); break; - 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: + case dItemNo_ARROW_10_e: + case dItemNo_ARROW_20_e: + case dItemNo_ARROW_30_e: + case dItemNo_MAGIC_ARROW_e: + case dItemNo_LIGHT_ARROW_e: fopAcM_seStart(this, JA_SE_CM_BST_ARROW_BOUND, temp); break; - case dItem_HEART_PIECE_e: - case dItem_HEART_CONTAINER_e: + case dItemNo_HEART_PIECE_e: + case dItemNo_HEART_CONTAINER_e: fopAcM_seStart(this, JA_SE_CM_BST_HEART_BOUND, temp); break; - case dItem_BOMB_5_e: - case dItem_BOMB_10_e: - case dItem_BOMB_20_e: - case dItem_BOMB_30_e: + case dItemNo_BOMB_5_e: + case dItemNo_BOMB_10_e: + case dItemNo_BOMB_20_e: + case dItemNo_BOMB_30_e: fopAcM_seStart(this, JA_SE_CM_BST_BOMB_BOUND, temp); break; } @@ -1244,7 +1242,7 @@ void daItem_c::mode_water_init() { scale.set(mScaleTarget.x, mScaleTarget.y, mScaleTarget.z); cXyz particleScale; - f32 temp3 = (f32)dItem_data::getShadowSize(m_itemNo) / dItem_data::getShadowSize(dItem_GREEN_RUPEE_e); + f32 temp3 = (f32)dItem_data::getShadowSize(m_itemNo) / dItem_data::getShadowSize(dItemNo_GREEN_RUPEE_e); temp3 *= scale.x; particleScale.setall(temp3); @@ -1260,43 +1258,43 @@ void daItem_c::mode_wait() { } switch (m_itemNo) { - case dItem_HEART_e: - case dItem_TRIPLE_HEART_e: + case dItemNo_HEART_e: + case dItemNo_TRIPLE_HEART_e: itemActionForHeart(); break; - case dItem_HEART_PIECE_e: - case dItem_HEART_CONTAINER_e: - 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: + case dItemNo_HEART_PIECE_e: + case dItemNo_HEART_CONTAINER_e: + case dItemNo_BOMB_5_e: + case dItemNo_BOMB_10_e: + case dItemNo_BOMB_20_e: + case dItemNo_BOMB_30_e: + case dItemNo_ARROW_10_e: + case dItemNo_ARROW_20_e: + case dItemNo_ARROW_30_e: + case dItemNo_MAGIC_ARROW_e: + case dItemNo_LIGHT_ARROW_e: itemActionForArrow(); break; - case dItem_SMALL_KEY_e: + case dItemNo_SMALL_KEY_e: itemActionForKey(); break; - case dItem_SMALL_MAGIC_e: - case dItem_LARGE_MAGIC_e: + case dItemNo_SMALL_MAGIC_e: + case dItemNo_LARGE_MAGIC_e: #if VERSION > VERSION_DEMO - case dItem_JOY_PENDANT_e: + case dItemNo_JOY_PENDANT_e: #endif - case dItem_SKULL_NECKLACE_e: - case dItem_BOKOBABA_SEED_e: - case dItem_GOLDEN_FEATHER_e: - case dItem_KNIGHTS_CREST_e: - case dItem_RED_JELLY_e: - case dItem_GREEN_JELLY_e: - case dItem_BLUE_JELLY_e: + case dItemNo_SKULL_NECKLACE_e: + case dItemNo_BOKOBABA_SEED_e: + case dItemNo_GOLDEN_FEATHER_e: + case dItemNo_KNIGHTS_CREST_e: + case dItemNo_RED_JELLY_e: + case dItemNo_GREEN_JELLY_e: + case dItemNo_BLUE_JELLY_e: itemActionForEmono(); break; - case dItem_SWORD_e: - case dItem_SHIELD_e: - case dItem_DROPPED_SWORD_e: + case dItemNo_SWORD_e: + case dItemNo_SHIELD_e: + case dItemNo_DROPPED_SWORD_e: itemActionForSword(); break; default: @@ -1523,18 +1521,18 @@ static actor_method_class l_daItem_Method = { }; actor_process_profile_definition g_profile_ITEM = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_ITEM, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_ITEM_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daItem_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_ITEM, + /* Draw Prio */ fpcDwPi_ITEM_e, /* Actor SubMtd */ &l_daItem_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e | fopAcStts_UNK80000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_itembase.cpp b/src/d/actor/d_a_itembase.cpp index b08b6eda0..8cdfbb754 100644 --- a/src/d/actor/d_a_itembase.cpp +++ b/src/d/actor/d_a_itembase.cpp @@ -40,12 +40,12 @@ BOOL daItemBase_c::CreateItemHeap(const char* resName, s16 resIdx, s16 btkAnm1, } switch (m_itemNo) { - case dItem_ARROW_30_e: + case dItemNo_ARROW_30_e: mpModelArrow[0] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000002); if (!mpModelArrow[0]) { return FALSE; } - case dItem_ARROW_20_e: + case dItemNo_ARROW_20_e: mpModelArrow[1] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000002); if (!mpModelArrow[1]) { return FALSE; @@ -165,7 +165,7 @@ void daItemBase_c::settingBeforeDraw() { mpModel->getModelData()->getJointNodePointer(0)->setMtxCalc(NULL); } - if (m_itemNo == dItem_BOMB_BAG_e || m_itemNo == dItem_SKULL_HAMMER_e || m_itemNo == dItem_SMALL_KEY_e) { + if (m_itemNo == dItemNo_BOMB_BAG_e || m_itemNo == dItemNo_SKULL_HAMMER_e || m_itemNo == dItemNo_SMALL_KEY_e) { dDlst_texSpecmapST(&eyePos, &tevStr, mpModel->getModelData(), 1.0f); } } diff --git a/src/d/actor/d_a_jbo.cpp b/src/d/actor/d_a_jbo.cpp index 7face9714..ad9efb002 100644 --- a/src/d/actor/d_a_jbo.cpp +++ b/src/d/actor/d_a_jbo.cpp @@ -9,10 +9,8 @@ #include "d/d_com_inf_game.h" #include "d/d_kankyo.h" #include "d/d_s_play.h" -#include "d/d_procname.h" #include "d/res/res_jbo.h" #include "f_op/f_op_actor_mng.h" -#include "d/d_priority.h" #define JUMP_ANIMATION_TIME 70 @@ -265,18 +263,18 @@ static actor_method_class l_daJBO_Method = { }; actor_process_profile_definition g_profile_JBO = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_JBO, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_JBO_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(jbo_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_JBO, + /* Draw Prio */ fpcDwPi_JBO_e, /* Actor SubMtd */ &l_daJBO_Method, /* Status */ fopAcStts_SHOWMAP_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ENV_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_kaji.cpp b/src/d/actor/d_a_kaji.cpp index d1df1de4b..ccf78180b 100644 --- a/src/d/actor/d_a_kaji.cpp +++ b/src/d/actor/d_a_kaji.cpp @@ -12,8 +12,6 @@ #include "d/d_com_inf_game.h" #include "d/d_s_play.h" #include "d/actor/d_a_obj_pirateship.h" -#include "d/d_procname.h" -#include "d/d_priority.h" static daObjPirateship::Act_c* l_p_ship; @@ -134,18 +132,18 @@ static actor_method_class daKajiMethodTable = { }; actor_process_profile_definition g_profile_Kaji = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Kaji, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Kaji_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daKaji_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Kaji, + /* Draw Prio */ fpcDwPi_Kaji_e, /* Actor SubMtd */ &daKajiMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_kamome.cpp b/src/d/actor/d_a_kamome.cpp index 9763e2a19..8be8e3bb3 100644 --- a/src/d/actor/d_a_kamome.cpp +++ b/src/d/actor/d_a_kamome.cpp @@ -9,9 +9,7 @@ #include "d/actor/d_a_sea.h" #include "d/res/res_kamome.h" #include "m_Do/m_Do_ext.h" -#include "d/d_procname.h" #include "d/d_snap.h" -#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "d/d_s_play.h" #include "d/d_kankyo.h" @@ -62,7 +60,7 @@ void* s_a_d_sub(void* ac1, void* ac2) { dBgS_LinChk linChk; fopAc_ac_c* actor2 = (fopAc_ac_c*)ac2; - if ((esa_check_count < 100) && fopAc_IsActor(ac1) && fpcM_GetName(ac1) == PROC_ESA) { + if ((esa_check_count < 100) && fopAc_IsActor(ac1) && fpcM_GetName(ac1) == fpcNm_ESA_e) { esa_class* esa = (esa_class*)ac1; if (esa->field_0x298 == 0) { cXyz sp14; @@ -115,7 +113,7 @@ fopAc_ac_c* search_esa(kamome_class* i_this) { /* 00000A44-00000A90 .text s_a_i_sub__FPvPv */ void* s_a_i_sub(void* ac1, void* ac2) { UNUSED(ac2); - if (fopAc_IsActor(ac1) && fpcM_GetName(ac1) == PROC_NPC_LS1) { + if (fopAc_IsActor(ac1) && fpcM_GetName(ac1) == fpcNm_NPC_LS1_e) { return ac1; } return NULL; @@ -260,7 +258,7 @@ void kamome_ground_pos_move(kamome_class* i_this) { void* ko_s_sub(void* ac1, void* ac2) { UNUSED(ac2); kamome_class* i_this = (kamome_class*)ac1; - if (fopAcM_IsActor(&i_this->actor) && fopAcM_GetName(&i_this->actor) == PROC_KAMOME && (fopAcM_GetParam(&i_this->actor) & 0xf) == 7) { + if (fopAcM_IsActor(&i_this->actor) && fopAcM_GetName(&i_this->actor) == fpcNm_KAMOME_e && (fopAcM_GetParam(&i_this->actor) & 0xf) == 7) { ko_count++; } return NULL; @@ -286,7 +284,7 @@ void heisou_control(kamome_class* i_this) { if (ko < i_this->mKoMaxCount) { cXyz sp08 = player->current.pos; sp08.y += 4000.0f; - fopAcM_create(PROC_KAMOME, ko << 8 | 0xffff0007, &sp08, fopAcM_GetRoomNo(&i_this->actor)); + fopAcM_create(fpcNm_KAMOME_e, ko << 8 | 0xffff0007, &sp08, fopAcM_GetRoomNo(&i_this->actor)); } } } @@ -296,7 +294,7 @@ void heisou_control(kamome_class* i_this) { void* h_s_sub(void* ac1, void* ac2) { UNUSED(ac2); kamome_class* i_this = (kamome_class*)ac1; - if (fopAcM_IsActor(&i_this->actor) && fopAcM_GetName(&i_this->actor) == PROC_KAMOME && (fopAcM_GetParam(&i_this->actor) & 0xf) == 6) { + if (fopAcM_IsActor(&i_this->actor) && fopAcM_GetName(&i_this->actor) == fpcNm_KAMOME_e && (fopAcM_GetParam(&i_this->actor) & 0xf) == 6) { return &i_this->actor; } return NULL; @@ -1567,18 +1565,18 @@ static actor_method_class l_daKamome_Method = { }; actor_process_profile_definition g_profile_KAMOME = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_KAMOME, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KAMOME_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(kamome_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_KAMOME, + /* Draw Prio */ fpcDwPi_KAMOME_e, /* Actor SubMtd */ &l_daKamome_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_kamome2.cpp b/src/d/actor/d_a_kamome2.cpp index da1aa8a9e..70d4ab0cb 100644 --- a/src/d/actor/d_a_kamome2.cpp +++ b/src/d/actor/d_a_kamome2.cpp @@ -2,9 +2,7 @@ #include "d/actor/d_a_kamome2.h" #include "d/res/res_kamome.h" #include "m_Do/m_Do_ext.h" -#include "d/d_procname.h" #include "d/d_camera.h" -#include "d/d_priority.h" #include "d/d_meter.h" #include "d/d_snap.h" #include "d/d_s_play.h" @@ -365,19 +363,19 @@ static actor_method_class l_daKamome2_Method = { #if VERSION == VERSION_DEMO actor_process_profile_definition g_profile_KAMOME2 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_KAMOME2, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KAMOME2_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(kamome2_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_KAMOME2, + /* Draw Prio */ fpcDwPi_KAMOME2_e, /* Actor SubMtd */ &l_daKamome2_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; #endif diff --git a/src/d/actor/d_a_kanban.cpp b/src/d/actor/d_a_kanban.cpp index 5165fc396..5c5aad8c2 100644 --- a/src/d/actor/d_a_kanban.cpp +++ b/src/d/actor/d_a_kanban.cpp @@ -10,8 +10,6 @@ #include "d/actor/d_a_bomb2.h" #include "d/actor/d_a_sea.h" #include "JSystem/J3DGraphAnimator/J3DModel.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_s_play.h" #include "d/d_cc_d.h" #include "f_op/f_op_actor_mng.h" @@ -248,12 +246,12 @@ void* bom_search_sub(void* ac, void*) { bool bVar2 = false; s16 proc = fopAcM_GetName(ac); - if (proc == PROC_BOMB) { + if (proc == fpcNm_BOMB_e) { daBomb_c* bomb = (daBomb_c*)ac; if (bomb->chk_state(daBomb_c::STATE_0)) { bVar2 = true; } - } else if (proc == PROC_Bomb2) { + } else if (proc == fpcNm_Bomb2_e) { daBomb2::Act_c* bomb2 = (daBomb2::Act_c*)ac; if (bomb2->chk_explode()) { bVar2 = true; @@ -357,7 +355,7 @@ void cut_point_check(kanban_class* i_this) { dScnPly_ply_c::setPauseTimer(1); a_this->current.angle.z = i_this->m2C4; - fpc_ProcID fVar6 = fopAcM_createChild(PROC_KANBAN, fopAcM_GetID(a_this), parameters, &a_this->current.pos, fopAcM_GetRoomNo(a_this), &a_this->current.angle, &a_this->scale, 0, NULL); + fpc_ProcID fVar6 = fopAcM_createChild(fpcNm_KANBAN_e, fopAcM_GetID(a_this), parameters, &a_this->current.pos, fopAcM_GetRoomNo(a_this), &a_this->current.angle, &a_this->scale, 0, NULL); if (fVar6 != fpcM_ERROR_PROCESS_ID_e) { fopAcM_seStart(a_this, JA_SE_OBJ_BREAK_BOARD, 0); @@ -1174,18 +1172,18 @@ static actor_method_class l_daKanban_Method = { }; actor_process_profile_definition g_profile_KANBAN = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_KANBAN, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KANBAN_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(kanban_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_KANBAN, + /* Draw Prio */ fpcDwPi_KANBAN_e, /* Actor SubMtd */ &l_daKanban_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_kantera.cpp b/src/d/actor/d_a_kantera.cpp index 9c91e59a4..b09b9d40d 100644 --- a/src/d/actor/d_a_kantera.cpp +++ b/src/d/actor/d_a_kantera.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_kantera.h" #include "d/res/res_kantera.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_kankyo.h" #include "d/d_s_play.h" #include "d/d_com_inf_game.h" @@ -435,18 +433,18 @@ static actor_method_class l_daKantera_Method = { }; actor_process_profile_definition g_profile_KANTERA = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_KANTERA, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KANTERA_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(kantera_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_KANTERA, + /* Draw Prio */ fpcDwPi_KANTERA_e, /* Actor SubMtd */ &l_daKantera_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_kb.cpp b/src/d/actor/d_a_kb.cpp index f2d2472f8..2108664b6 100644 --- a/src/d/actor/d_a_kb.cpp +++ b/src/d/actor/d_a_kb.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_kb.h" #include "m_Do/m_Do_ext.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" /* 00000078-000001A4 .text anm_init__FP8kb_classifUcfi */ @@ -222,18 +220,18 @@ static actor_method_class l_daKb_Method = { }; actor_process_profile_definition g_profile_KB = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_KB, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KB_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(kb_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_KB, + /* Draw Prio */ fpcDwPi_KB_e, /* Actor SubMtd */ &l_daKb_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ENV_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_kddoor.cpp b/src/d/actor/d_a_kddoor.cpp index 9b40cc932..8cbc5a1fa 100644 --- a/src/d/actor/d_a_kddoor.cpp +++ b/src/d/actor/d_a_kddoor.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_kddoor.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" /* 00000078-000000A8 .text chkMakeKey__10daKddoor_cFv */ @@ -327,18 +325,18 @@ static actor_method_class l_daKddoor_Method = { }; actor_process_profile_definition g_profile_KDDOOR = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_KDDOOR, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KDDOOR_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daKddoor_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_KDDOOR, + /* Draw Prio */ fpcDwPi_KDDOOR_e, /* Actor SubMtd */ &l_daKddoor_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_6_e, + /* Cull Type */ fopAc_CULLBOX_6_e, }; diff --git a/src/d/actor/d_a_ki.cpp b/src/d/actor/d_a_ki.cpp index 6e7235709..1ef5e415c 100644 --- a/src/d/actor/d_a_ki.cpp +++ b/src/d/actor/d_a_ki.cpp @@ -7,9 +7,7 @@ #include "d/actor/d_a_ki.h" #include "d/actor/d_a_player.h" #include "m_Do/m_Do_ext.h" -#include "d/d_procname.h" #include "d/d_com_inf_game.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" #include "d/d_s_play.h" #include "d/d_path.h" @@ -115,7 +113,7 @@ static BOOL nodeCallBack(J3DNode* node, int calcTiming) { /* 000001B4-0000023C .text ki_a_d_sub__FPvPv */ void* ki_a_d_sub(void* ac1, void*) { - if (fopAcM_IsActor(ac1) && fopAcM_GetName(ac1) == PROC_KI) { + if (fopAcM_IsActor(ac1) && fopAcM_GetName(ac1) == fpcNm_KI_e) { ki_class* ki = (ki_class*)ac1; ki_all_count++; if (ki->mAction == ki_class::ACT_ATTACK_MOVE_INDEX_e && ki->mBehaviorType < 10) { @@ -817,7 +815,7 @@ void ki_damage_move(ki_class* i_this) { } void* bgn_s_sub(void* ac1, void*) { - if (fopAcM_IsActor(ac1) && fopAcM_GetName(ac1) == PROC_BGN) { + if (fopAcM_IsActor(ac1) && fopAcM_GetName(ac1) == fpcNm_BGN_e) { return ac1; } return NULL; @@ -1126,7 +1124,7 @@ static BOOL daKi_Execute(ki_class* i_this) { atInfo.mpActor = cc_at_check(&i_this->actor, &atInfo); if (atInfo.mpActor != NULL) { - if (fpcM_GetName(atInfo.mpActor) == PROC_BGN || fpcM_GetName(atInfo.mpActor) == PROC_BGN2 || fpcM_GetName(atInfo.mpActor) == PROC_BGN3) { + if (fpcM_GetName(atInfo.mpActor) == fpcNm_BGN_e || fpcM_GetName(atInfo.mpActor) == fpcNm_BGN2_e || fpcM_GetName(atInfo.mpActor) == fpcNm_BGN3_e) { i_this->actor.health = -10; } } @@ -1492,18 +1490,18 @@ static actor_method_class l_daKi_Method = { }; actor_process_profile_definition g_profile_KI = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_KI, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KI_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(ki_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_KI, + /* Draw Prio */ fpcDwPi_KI_e, /* Actor SubMtd */ &l_daKi_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ENEMY_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_kita.cpp b/src/d/actor/d_a_kita.cpp index 298108b58..04ab704a3 100644 --- a/src/d/actor/d_a_kita.cpp +++ b/src/d/actor/d_a_kita.cpp @@ -10,8 +10,6 @@ #include "d/actor/d_a_shand.h" #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_s_play.h" #include "d/res/res_kita.h" #include "dolphin/types.h" @@ -30,7 +28,7 @@ void ride_call_back(dBgW* bgw, fopAc_ac_c* i_ac, fopAc_ac_c* i_pt) { MtxPosition(&delta_pos,&local_44); delta_pos = i_pt->old.pos - pActor->current.pos; MtxPosition(&delta_pos, &local_50); - if (fopAcM_GetName(i_pt) == PROC_PLAYER) { + if (fopAcM_GetName(i_pt) == fpcNm_PLAYER_e) { pActor->mExecuteCount = 10; } s16 xAngle_target = local_44.z * ((REG0_F(0) + 10.0f) / pActor->scale.z); @@ -260,7 +258,7 @@ BOOL himo_create(kita_class* i_this) param->base.angle.y = yad[i]; param->base.parameters = 0xFFFFFF35; param->room_no = i_this->current.roomNo; - i_this->field_2D4[i] = fopAcM_Create(PROC_SHAND, NULL, param); + i_this->field_2D4[i] = fopAcM_Create(fpcNm_SHAND_e, NULL, param); i_this->field_2E4[i]++; case 1: @@ -496,18 +494,18 @@ static actor_method_class l_daKita_Method = { }; actor_process_profile_definition g_profile_KITA = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_KITA, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KITA_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(kita_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_KITA, + /* Draw Prio */ fpcDwPi_KITA_e, /* Actor SubMtd */ &l_daKita_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_klft.cpp b/src/d/actor/d_a_klft.cpp index 80ac44afc..7623cb79b 100644 --- a/src/d/actor/d_a_klft.cpp +++ b/src/d/actor/d_a_klft.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_klft.h" #include "m_Do/m_Do_ext.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" /* 00000078-00000374 .text ride_call_back__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c */ @@ -136,18 +134,18 @@ static actor_method_class l_daKlft_Method = { }; actor_process_profile_definition g_profile_KLFT = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_KLFT, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KLFT_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(klft_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_KLFT, + /* Draw Prio */ fpcDwPi_KLFT_e, /* Actor SubMtd */ &l_daKlft_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_kmon.cpp b/src/d/actor/d_a_kmon.cpp index 88db917e2..db4e5d468 100644 --- a/src/d/actor/d_a_kmon.cpp +++ b/src/d/actor/d_a_kmon.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_kmon.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" const char daKmon_c::m_arcname[] = "Always"; @@ -166,18 +164,18 @@ static actor_method_class daKmonMethodTable = { }; actor_process_profile_definition g_profile_Kmon = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Kmon, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Kmon_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daKmon_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Kmon, + /* Draw Prio */ fpcDwPi_Kmon_e, /* Actor SubMtd */ &daKmonMethodTable, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_4_e, + /* Cull Type */ fopAc_CULLBOX_4_e, }; diff --git a/src/d/actor/d_a_kn.cpp b/src/d/actor/d_a_kn.cpp index 4a0533192..262761f5a 100644 --- a/src/d/actor/d_a_kn.cpp +++ b/src/d/actor/d_a_kn.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_kn.h" #include "d/res/res_kn.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_s_play.h" #include "d/d_snap.h" #include "d/d_com_inf_game.h" @@ -373,7 +371,7 @@ void oya_kn_move(kn_class* i_this) { } puVar1->base.parameters = 2; puVar1->room_no = fopAcM_GetRoomNo(&i_this->actor); - fopAcM_Create(PROC_KN, NULL, puVar1); + fopAcM_Create(fpcNm_KN_e, NULL, puVar1); i_this->m2C2[0] = 10; i_this->m2D4--; if (i_this->m2D4 <= 0) { @@ -586,18 +584,18 @@ static actor_method_class l_daKN_Method = { }; actor_process_profile_definition g_profile_KN = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_KN, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KN_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(kn_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_KN, + /* Draw Prio */ fpcDwPi_KN_e, /* Actor SubMtd */ &l_daKN_Method, /* Status */ DEMO_SELECT(fopAcStts_CULL_e | fopAcStts_UNK40000_e | fopAcStts_NOCULLEXEC_e, fopAcStts_CULL_e | fopAcStts_UNK40000_e), /* Group */ fopAc_ENV_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_knob00.cpp b/src/d/actor/d_a_knob00.cpp index b760ff491..ff9a0abb4 100644 --- a/src/d/actor/d_a_knob00.cpp +++ b/src/d/actor/d_a_knob00.cpp @@ -10,9 +10,7 @@ #include "d/actor/d_a_npc_mt.h" #include "d/d_kankyo.h" #include "d/res/res_knob.h" -#include "d/d_procname.h" #include "m_Do/m_Do_graphic.h" -#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "ctype.h" @@ -356,7 +354,7 @@ BOOL daKnob00_c::CreateInit() { mDoorType = getType(); if (getShapeType() == 4 && mDoorType == 1) { mDoorType = 5; - fopAcM_create(PROC_TAG_MK, 0xffffff03, ¤t.pos, fopAcM_GetRoomNo(this), ¤t.angle, NULL, 0, NULL); + fopAcM_create(fpcNm_TAG_MK_e, 0xffffff03, ¤t.pos, fopAcM_GetRoomNo(this), ¤t.angle, NULL, 0, NULL); attention_info.position.y += 60.0f; eyePos.y += 60.0f; } @@ -716,7 +714,7 @@ BOOL daKnob00_c::actionInit() { return TRUE; } - if (dComIfGs_checkGetItem(dItem_BOMB_BAG_e)) { + if (dComIfGs_checkGetItem(dItemNo_BOMB_BAG_e)) { setAction(11); return TRUE; } @@ -780,7 +778,7 @@ BOOL daKnob00_c::draw() { fpc_ProcID iVar1 = fopAcM_GetLinkId(this); if (iVar1 != fpcM_ERROR_PROCESS_ID_e) { fopAc_ac_c* ac = fopAcM_SearchByID(iVar1); - if (fopAcM_IsActor(ac) && fopAcM_GetName(ac) == PROC_Obj_Pirateship) { + if (fopAcM_IsActor(ac) && fopAcM_GetName(ac) == fpcNm_Obj_Pirateship_e) { daObjPirateship::Act_c* pirateShip = (daObjPirateship::Act_c*)ac; if (pirateShip->m2CC == 0) { return TRUE; @@ -929,18 +927,18 @@ static actor_method_class l_daKnob00_Method = { }; actor_process_profile_definition g_profile_KNOB00 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_KNOB00, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KNOB00_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daKnob00_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_KNOB00, + /* Draw Prio */ fpcDwPi_KNOB00_e, /* Actor SubMtd */ &l_daKnob00_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_6_e, + /* Cull Type */ fopAc_CULLBOX_6_e, }; diff --git a/src/d/actor/d_a_kokiie.cpp b/src/d/actor/d_a_kokiie.cpp index c8e5059dd..c5d3df5d5 100644 --- a/src/d/actor/d_a_kokiie.cpp +++ b/src/d/actor/d_a_kokiie.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_kokiie.h" #include "d/actor/d_a_shand.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_s_play.h" #include "d/d_com_inf_game.h" #include "d/d_bg_s_movebg_actor.h" @@ -88,7 +86,7 @@ void kokiie_move(kokiie_class* i_this) { sVar1 = himo_off_ya[uVar6]; target = himo_off_xa[uVar6]; cLib_addCalc2(&i_this->m2D0, REG8_F(4) - himo_off_yp[uVar6], 0.1f, i_this->m338 * 50.0f); - if ((uVar6 == 0x1f) && dComIfGs_checkGetItem(dItem_BOOMERANG_e)) { + if ((uVar6 == 0x1f) && dComIfGs_checkGetItem(dItemNo_BOOMERANG_e)) { i_this->m29A = 1; actor->health = 0; i_this->m378 = 1; @@ -189,7 +187,7 @@ BOOL himo_create(kokiie_class* i_this) { pfVar3->base.angle.y = actor->current.angle.y + i * 0x3333 + -13000; pfVar3->base.parameters = 0xffffff01; pfVar3->room_no = actor->current.roomNo; - i_this->m2D4[i] = fopAcM_create(PROC_SHAND, NULL, pfVar3); + i_this->m2D4[i] = fopAcM_create(fpcNm_SHAND_e, NULL, pfVar3); i_this->m2E8[i]++; case 1: @@ -466,18 +464,18 @@ static actor_method_class l_daKokiie_Method = { }; actor_process_profile_definition g_profile_KOKIIE = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_KOKIIE, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KOKIIE_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(kokiie_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_KOKIIE, + /* Draw Prio */ fpcDwPi_KOKIIE_e, /* Actor SubMtd */ &l_daKokiie_Method, /* Status */ fopAcStts_CULL_e | DEMO_SELECT(0, fopAcStts_UNK4000_e) | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_komore.cpp b/src/d/actor/d_a_komore.cpp index 75a2bc071..b136939cd 100644 --- a/src/d/actor/d_a_komore.cpp +++ b/src/d/actor/d_a_komore.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_komore.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/res/res_frlt.h" const char daKomore::Act_c::M_arcname[] = "frLt"; @@ -128,18 +126,18 @@ static actor_method_class Mthd_Table = { }; // namespace daKomore actor_process_profile_definition g_profile_Komore = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Komore, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Komore_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daKomore::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Komore, + /* Draw Prio */ fpcDwPi_Komore_e, /* Actor SubMtd */ &daKomore::Mthd_Table, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_ks.cpp b/src/d/actor/d_a_ks.cpp index 34f667fea..79f2a930c 100644 --- a/src/d/actor/d_a_ks.cpp +++ b/src/d/actor/d_a_ks.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_ks.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "d/d_s_play.h" #include "f_op/f_op_camera.h" @@ -213,7 +211,7 @@ BOOL ks_kuttuki_check(ks_class* i_this) { void gm_birth_delet(ks_class* i_this) { if (i_this->mGmID) { gm_class* i_gm = (gm_class*)fopAcM_SearchByID(i_this->mGmID); - if (i_gm && fopAc_IsActor(i_gm) && fopAcM_GetName(i_gm) == PROC_GM && i_gm->m31E > 0) { + if (i_gm && fopAc_IsActor(i_gm) && fopAcM_GetName(i_gm) == fpcNm_GM_e && i_gm->m31E > 0) { i_gm->m31E--; } } @@ -1187,7 +1185,7 @@ void* tsubo_search(void* param_1, void* i_data) { ks_class* i_this = (ks_class*)i_data; fopAc_ac_c* actor = &i_this->actor; int r0 = 0; - if (r0 < 100 && fopAc_IsActor(param_1) && (fopAcM_GetName(param_1) == PROC_TSUBO)) { + if (r0 < 100 && fopAc_IsActor(param_1) && (fopAcM_GetName(param_1) == fpcNm_TSUBO_e)) { fopAc_ac_c* tsubo_actor = (fopAc_ac_c*)param_1; if (std::fabsf(tsubo_actor->current.pos.x - actor->current.pos.x) < 20.0f && @@ -1277,7 +1275,7 @@ void action_tubo_search(ks_class* i_this) { actor->shape_angle = actor->current.angle; actor->shape_angle.x = 0; - fopAcM_create(PROC_KS, 3, &local_24, fopAcM_GetRoomNo(actor), &actor->shape_angle, &actor->scale, 0); + fopAcM_create(fpcNm_KS_e, 3, &local_24, fopAcM_GetRoomNo(actor), &actor->shape_angle, &actor->scale, 0); } fopAcM_delete(actor); @@ -1360,7 +1358,7 @@ static BOOL daKS_Execute(ks_class* i_this) { bool bVar5 = false; if (gmActor && ((fopAcM_GetParam(gmActor) & 0xff0000) == 0xff0000 || (fopAcM_GetParam(gmActor) & 0xff0000) == 0)) { - if (fopAcM_GetName(gmActor) == PROC_GM) { + if (fopAcM_GetName(gmActor) == fpcNm_GM_e) { if (gmActor->health <= 0) { bVar5 = true; } @@ -1604,7 +1602,7 @@ static cPhs_State daKS_Create(fopAc_ac_c* i_this) { i_this->shape_angle = i_this->current.angle; i_this->shape_angle.x = 0; - fopAcM_create(PROC_KS, param, &local_4c, fopAcM_GetRoomNo(i_this), &i_this->shape_angle, &i_this->scale, 0); + fopAcM_create(fpcNm_KS_e, param, &local_4c, fopAcM_GetRoomNo(i_this), &i_this->shape_angle, &i_this->scale, 0); } return cPhs_ERROR_e; @@ -1719,7 +1717,7 @@ static cPhs_State daKS_Create(fopAc_ac_c* i_this) { } fopAc_ac_c* gm_actor = fopAcM_SearchByID(a_this->mGmID); - if (gm_actor && fopAc_IsActor(gm_actor) && fopAcM_GetName(gm_actor) == PROC_GM && a_this->m2C8 == 5) { + if (gm_actor && fopAc_IsActor(gm_actor) && fopAcM_GetName(gm_actor) == fpcNm_GM_e && a_this->m2C8 == 5) { i_this->current.angle.y += cM_rndFX(8192.0f); i_this->speedF = cM_rndF(6.0f) + 34.0f; i_this->speed.y = cM_rndF(8.0f) + 22.0f; @@ -1775,18 +1773,18 @@ static actor_method_class l_daKS_Method = { }; actor_process_profile_definition g_profile_KS = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_KS, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KS_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(ks_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_KS, + /* Draw Prio */ fpcDwPi_KS_e, /* Actor SubMtd */ &l_daKS_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ENV_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_kt.cpp b/src/d/actor/d_a_kt.cpp index 435f4d488..28a7aae15 100644 --- a/src/d/actor/d_a_kt.cpp +++ b/src/d/actor/d_a_kt.cpp @@ -8,8 +8,6 @@ #include "d/res/res_kt.h" #include "d/d_bg_s_gnd_chk.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_s_play.h" #include "d/actor/d_a_player.h" #include "f_op/f_op_actor_mng.h" @@ -343,7 +341,7 @@ static cPhs_State daKt_Create(fopAc_ac_c* i_ac) { params->base.position = i_this->current.pos; params->base.angle.set(0, 0, 0); params->base.parameters = 1001 + i; - fpcM_Create(PROC_KT, NULL, params); + fpcM_Create(fpcNm_KT_e, NULL, params); } } @@ -369,18 +367,18 @@ static actor_method_class l_daKt_Method = { }; actor_process_profile_definition g_profile_KT = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_KT, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KT_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(kt_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_KT, + /* Draw Prio */ fpcDwPi_KT_e, /* Actor SubMtd */ &l_daKt_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_kui.cpp b/src/d/actor/d_a_kui.cpp index 50c4f11bd..4da99d8e8 100644 --- a/src/d/actor/d_a_kui.cpp +++ b/src/d/actor/d_a_kui.cpp @@ -11,8 +11,6 @@ #include "d/d_bg_s_movebg_actor.h" #include "d/d_com_inf_game.h" #include "d/d_kankyo_rain.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_s_play.h" #include "d/res/res_kui.h" #include "f_op/f_op_camera.h" @@ -24,7 +22,7 @@ class J3DModelData; /* 00000078-000000C4 .text s_a_i_sub__FPvPv */ static void* s_a_i_sub(void* search, void*) { - if (fopAcM_IsActor(search) && fopAcM_GetName(search) == PROC_DR2) { + if (fopAcM_IsActor(search) && fopAcM_GetName(search) == fpcNm_DR2_e) { return search; } return NULL; @@ -37,7 +35,7 @@ static dr2_class* search_dragontail(kui_class* i_this) { /* 000000F0-0000013C .text b_a_i_sub__FPvPv */ static void* b_a_i_sub(void* search, void*) { - if (fopAcM_IsActor(search) && fopAcM_GetName(search) == PROC_BTD) { + if (fopAcM_IsActor(search) && fopAcM_GetName(search) == fpcNm_BTD_e) { return search; } return NULL; @@ -550,18 +548,18 @@ static actor_method_class l_daKui_Method = { }; actor_process_profile_definition g_profile_KUI = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_KUI, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KUI_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(kui_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_KUI, + /* Draw Prio */ fpcDwPi_KUI_e, /* Actor SubMtd */ &l_daKui_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_kytag00.cpp b/src/d/actor/d_a_kytag00.cpp index 5de1f688c..aa7ced209 100644 --- a/src/d/actor/d_a_kytag00.cpp +++ b/src/d/actor/d_a_kytag00.cpp @@ -8,8 +8,6 @@ #include "f_op/f_op_actor_mng.h" #include "f_op/f_op_camera.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_kankyo.h" #include "SSystem/SComponent/c_lib.h" @@ -410,18 +408,18 @@ static actor_method_class l_daKytag00_Method = { }; actor_process_profile_definition g_profile_KYTAG00 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_KYTAG00, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KYTAG00_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(kytag00_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_KYTAG00, + /* Draw Prio */ fpcDwPi_KYTAG00_e, /* Actor SubMtd */ &l_daKytag00_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_kytag01.cpp b/src/d/actor/d_a_kytag01.cpp index df80447b8..d8651f901 100644 --- a/src/d/actor/d_a_kytag01.cpp +++ b/src/d/actor/d_a_kytag01.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_kytag01.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "f_op/f_op_actor_mng.h" /* 00000078-0000007C .text wether_tag_move__FP13kytag01_class */ @@ -114,18 +112,18 @@ static actor_method_class l_daKytag01_Method = { }; actor_process_profile_definition g_profile_KYTAG01 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_KYTAG01, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KYTAG01_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(kytag01_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_KYTAG01, + /* Draw Prio */ fpcDwPi_KYTAG01_e, /* Actor SubMtd */ &l_daKytag01_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_kytag02.cpp b/src/d/actor/d_a_kytag02.cpp index 5d059fd92..83073b013 100644 --- a/src/d/actor/d_a_kytag02.cpp +++ b/src/d/actor/d_a_kytag02.cpp @@ -7,8 +7,6 @@ #include "d/actor/d_a_kytag02.h" #include "d/d_com_inf_game.h" #include "d/d_kankyo_rain.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "f_op/f_op_actor_mng.h" /* 00000078-000000C0 .text set_path_info__FP10fopAc_ac_c */ @@ -128,18 +126,18 @@ static actor_method_class l_daKytag02_Method = { }; actor_process_profile_definition g_profile_KYTAG02 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_KYTAG02, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KYTAG02_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(kytag02_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_KYTAG02, + /* Draw Prio */ fpcDwPi_KYTAG02_e, /* Actor SubMtd */ &l_daKytag02_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_kytag03.cpp b/src/d/actor/d_a_kytag03.cpp index e1798f7fe..9d48c5439 100644 --- a/src/d/actor/d_a_kytag03.cpp +++ b/src/d/actor/d_a_kytag03.cpp @@ -7,8 +7,6 @@ #include "d/actor/d_a_kytag03.h" #include "d/d_com_inf_game.h" #include "d/d_kankyo.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/res/res_m_door.h" /* 00000078-0000015C .text useHeapInit__FP10fopAc_ac_c */ @@ -157,18 +155,18 @@ static actor_method_class l_daKytag03_Method = { }; actor_process_profile_definition g_profile_KYTAG03 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_KYTAG03, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KYTAG03_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(kytag03_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_KYTAG03, + /* Draw Prio */ fpcDwPi_KYTAG03_e, /* Actor SubMtd */ &l_daKytag03_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_kytag04.cpp b/src/d/actor/d_a_kytag04.cpp index 4dc614b55..be10605ff 100644 --- a/src/d/actor/d_a_kytag04.cpp +++ b/src/d/actor/d_a_kytag04.cpp @@ -7,8 +7,6 @@ #include "d/actor/d_a_kytag04.h" #include "f_op/f_op_actor_mng.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 00000078-00000080 .text daKytag04_Draw__FP13kytag04_class */ static BOOL daKytag04_Draw(kytag04_class*) { @@ -70,18 +68,18 @@ static actor_method_class l_daKytag04_Method = { }; actor_process_profile_definition g_profile_KYTAG04 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_KYTAG04, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KYTAG04_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(kytag04_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_KYTAG04, + /* Draw Prio */ fpcDwPi_KYTAG04_e, /* Actor SubMtd */ &l_daKytag04_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_kytag05.cpp b/src/d/actor/d_a_kytag05.cpp index eefa91788..ff97514e6 100644 --- a/src/d/actor/d_a_kytag05.cpp +++ b/src/d/actor/d_a_kytag05.cpp @@ -12,8 +12,6 @@ #include "d/actor/d_a_ykgr.h" #include "f_op/f_op_camera.h" #include "m_Do/m_Do_audio.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 00000078-00000080 .text daKytag05_Draw__FP13kytag05_class */ static BOOL daKytag05_Draw(kytag05_class*) { @@ -155,18 +153,18 @@ static actor_method_class l_daKytag05_Method = { }; actor_process_profile_definition g_profile_KYTAG05 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_KYTAG05, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KYTAG05_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(kytag05_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_KYTAG05, + /* Draw Prio */ fpcDwPi_KYTAG05_e, /* Actor SubMtd */ &l_daKytag05_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_kytag06.cpp b/src/d/actor/d_a_kytag06.cpp index 883bc5870..8d52dc7f8 100644 --- a/src/d/actor/d_a_kytag06.cpp +++ b/src/d/actor/d_a_kytag06.cpp @@ -10,8 +10,6 @@ #include "d/d_com_inf_game.h" #include "d/d_kankyo.h" #include "d/d_kankyo_wether.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 00000078-00000080 .text daKytag06_Draw__FP13kytag06_class */ static BOOL daKytag06_Draw(kytag06_class*) { @@ -84,18 +82,18 @@ static actor_method_class l_daKytag06_Method = { }; actor_process_profile_definition g_profile_KYTAG06 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_KYTAG06, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KYTAG06_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(kytag06_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_KYTAG06, + /* Draw Prio */ fpcDwPi_KYTAG06_e, /* Actor SubMtd */ &l_daKytag06_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_kytag07.cpp b/src/d/actor/d_a_kytag07.cpp index afaad4e39..527029ed6 100644 --- a/src/d/actor/d_a_kytag07.cpp +++ b/src/d/actor/d_a_kytag07.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_kytag07.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 00000078-00000080 .text daKytag07_Draw__FP13kytag07_class */ static BOOL daKytag07_Draw(kytag07_class* i_this) { @@ -105,18 +103,18 @@ static actor_method_class l_daKytag07_Method = { }; actor_process_profile_definition g_profile_KYTAG07 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_KYTAG07, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KYTAG07_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(kytag07_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_KYTAG07, + /* Draw Prio */ fpcDwPi_KYTAG07_e, /* Actor SubMtd */ &l_daKytag07_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_lamp.cpp b/src/d/actor/d_a_lamp.cpp index f5b16d94e..081f7bd88 100644 --- a/src/d/actor/d_a_lamp.cpp +++ b/src/d/actor/d_a_lamp.cpp @@ -7,8 +7,6 @@ #include "d/actor/d_a_lamp.h" #include "d/res/res_lamp.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "m_Do/m_Do_mtx.h" /* 000000EC-00000158 .text daLamp_Draw__FP10lamp_class */ @@ -211,18 +209,18 @@ static actor_method_class l_daLamp_Method = { }; actor_process_profile_definition g_profile_LAMP = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_LAMP, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_LAMP_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(lamp_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_LAMP, + /* Draw Prio */ fpcDwPi_LAMP_e, /* Actor SubMtd */ &l_daLamp_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_lbridge.cpp b/src/d/actor/d_a_lbridge.cpp index a2f5c7082..bdbfc9e3f 100644 --- a/src/d/actor/d_a_lbridge.cpp +++ b/src/d/actor/d_a_lbridge.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_lbridge.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/res/res_gbrg00.h" const char daLbridge_c::m_arcname[] = "Gbrg00"; @@ -348,18 +346,18 @@ static actor_method_class daLbridgeMethodTable = { }; actor_process_profile_definition g_profile_LIGHTBRIDGE = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_LIGHTBRIDGE, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_LIGHTBRIDGE_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daLbridge_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_LIGHTBRIDGE, + /* Draw Prio */ fpcDwPi_LIGHTBRIDGE_e, /* Actor SubMtd */ &daLbridgeMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_leaflift.cpp b/src/d/actor/d_a_leaflift.cpp index a3ff67e77..f9e36fa65 100644 --- a/src/d/actor/d_a_leaflift.cpp +++ b/src/d/actor/d_a_leaflift.cpp @@ -9,8 +9,6 @@ #include "d/d_bg_s_movebg_actor.h" #include "d/d_com_inf_game.h" #include "d/d_lib.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/res/res_olift.h" #include "m_Do/m_Do_ext.h" @@ -195,7 +193,7 @@ static void rideCallBack(dBgW* param1, fopAc_ac_c* i_act, fopAc_ac_c* i_other) { cXyz posOffset = i_other->current.pos - i_this->current.pos; tiltFactor = 2.0f; - if (fopAcM_GetName(i_other) == PROC_PLAYER) { + if (fopAcM_GetName(i_other) == fpcNm_PLAYER_e) { i_this->m43C = TRUE; i_this->m43E = TRUE; posOffset = posOffset.outprod(up_vec); @@ -363,18 +361,18 @@ static actor_method_class daLliftMethodTable = { }; actor_process_profile_definition g_profile_LEAF_LIFT = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_LEAF_LIFT, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_LEAF_LIFT_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daLlift_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_LEAF_LIFT, + /* Draw Prio */ fpcDwPi_LEAF_LIFT_e, /* Actor SubMtd */ &daLliftMethodTable, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_lod_bg.cpp b/src/d/actor/d_a_lod_bg.cpp index f82494eae..12dbafeb4 100644 --- a/src/d/actor/d_a_lod_bg.cpp +++ b/src/d/actor/d_a_lod_bg.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_lod_bg.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/actor/d_a_obj_light.h" #include "m_Do/m_Do_dvd_thread.h" #include "m_Do/m_Do_lib.h" @@ -423,18 +421,18 @@ static actor_method_class l_daLodbg_Method = { }; actor_process_profile_definition g_profile_LODBG = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0008, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_LODBG, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0008, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_LODBG_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daLodbg_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_LODBG, + /* Draw Prio */ fpcDwPi_LODBG_e, /* Actor SubMtd */ &l_daLodbg_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_lstair.cpp b/src/d/actor/d_a_lstair.cpp index adf75f2df..bb3b1b565 100644 --- a/src/d/actor/d_a_lstair.cpp +++ b/src/d/actor/d_a_lstair.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_lstair.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 00000078-000000D4 .text _delete__10daLStair_cFv */ bool daLStair_c::_delete() { @@ -117,18 +115,18 @@ static actor_method_class daLStairMethodTable = { }; actor_process_profile_definition g_profile_LIGHTSTAIR = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_LIGHTSTAIR, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_LIGHTSTAIR_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daLStair_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_LIGHTSTAIR, + /* Draw Prio */ fpcDwPi_LIGHTSTAIR_e, /* Actor SubMtd */ &daLStairMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_lwood.cpp b/src/d/actor/d_a_lwood.cpp index e7e3d3191..88c31c7ef 100644 --- a/src/d/actor/d_a_lwood.cpp +++ b/src/d/actor/d_a_lwood.cpp @@ -7,8 +7,6 @@ #include "d/actor/d_a_lwood.h" #include "d/d_a_obj.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/res/res_lwood.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_graphic.h" @@ -184,18 +182,18 @@ static actor_method_class daLwoodMethodTable = { }; actor_process_profile_definition g_profile_Lwood = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Lwood, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Lwood_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daLwood_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Lwood, + /* Draw Prio */ fpcDwPi_Lwood_e, /* Actor SubMtd */ &daLwoodMethodTable, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_machine.cpp b/src/d/actor/d_a_machine.cpp index 42d459b1f..cf08f411f 100644 --- a/src/d/actor/d_a_machine.cpp +++ b/src/d/actor/d_a_machine.cpp @@ -9,8 +9,6 @@ #include "f_op/f_op_actor_mng.h" #include "d/d_com_inf_game.h" #include "m_Do/m_Do_ext.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/res/res_hkikai1.h" static dCcD_SrcSph l_sph_src_at = { @@ -230,7 +228,7 @@ void daMachine_c::set_next_pnt() { /* 00000700-00000734 .text search_wind_mill__11daMachine_cFv */ daWindMill_c* daMachine_c::search_wind_mill() { - return (daWindMill_c*)fopAcM_SearchByName(PROC_WINDMILL); + return (daWindMill_c*)fopAcM_SearchByName(fpcNm_WINDMILL_e); } /* 00000734-000007F8 .text set_speed__11daMachine_cFv */ @@ -433,18 +431,18 @@ static actor_method_class daMachineMethodTable = { }; actor_process_profile_definition g_profile_MACHINE = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_MACHINE, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_MACHINE_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daMachine_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_MACHINE, + /* Draw Prio */ fpcDwPi_MACHINE_e, /* Actor SubMtd */ &daMachineMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_magma.cpp b/src/d/actor/d_a_magma.cpp index 3ddb19ba4..edecfc569 100644 --- a/src/d/actor/d_a_magma.cpp +++ b/src/d/actor/d_a_magma.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_magma.h" #include "f_op/f_op_actor_mng.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "d/d_magma.h" @@ -60,18 +58,18 @@ static actor_method_class l_daMagma_Method = { }; actor_process_profile_definition g_profile_MAGMA = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_MAGMA, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_MAGMA_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daMagma_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_MAGMA, + /* Draw Prio */ fpcDwPi_MAGMA_e, /* Actor SubMtd */ &l_daMagma_Method, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_majuu_flag.cpp b/src/d/actor/d_a_majuu_flag.cpp index f45f2053f..e525bd3d7 100644 --- a/src/d/actor/d_a_majuu_flag.cpp +++ b/src/d/actor/d_a_majuu_flag.cpp @@ -7,9 +7,7 @@ #include "d/actor/d_a_majuu_flag.h" #include "d/d_com_inf_game.h" #include "d/d_kankyo_wether.h" -#include "d/d_priority.h" #include "d/d_s_play.h" -#include "d/d_procname.h" #include "d/res/res_cloth.h" #include "d/res/res_matif.h" #include "d/res/res_vsvfg.h" @@ -1070,18 +1068,18 @@ static actor_method_class l_daMajuu_Flag_Method = { }; actor_process_profile_definition g_profile_MAJUU_FLAG = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_MAJUU_FLAG, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_MAJUU_FLAG_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daMajuu_Flag_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_MAJUU_FLAG, + /* Draw Prio */ fpcDwPi_MAJUU_FLAG_e, /* Actor SubMtd */ &l_daMajuu_Flag_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_mant.cpp b/src/d/actor/d_a_mant.cpp index 987b618d8..00e707166 100644 --- a/src/d/actor/d_a_mant.cpp +++ b/src/d/actor/d_a_mant.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_mant.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" /* 000000EC-000003EC .text draw__15daMant_packet_cFv */ @@ -124,18 +122,18 @@ static actor_method_class l_daMant_Method = { }; actor_process_profile_definition g_profile_MANT = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_MANT, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_MANT_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(mant_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_MANT, + /* Draw Prio */ fpcDwPi_MANT_e, /* Actor SubMtd */ &l_daMant_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_mbdoor.cpp b/src/d/actor/d_a_mbdoor.cpp index 75af4d4d3..47992a3dd 100644 --- a/src/d/actor/d_a_mbdoor.cpp +++ b/src/d/actor/d_a_mbdoor.cpp @@ -8,8 +8,6 @@ #include "d/res/res_mbdoor.h" #include "d/res/res_gbdoor.h" #include "f_op/f_op_actor_mng.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" @@ -596,18 +594,18 @@ static actor_method_class l_daMbdoor_Method = { }; actor_process_profile_definition g_profile_MBDOOR = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_MBDOOR, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_MBDOOR_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daMbdoor_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_MBDOOR, + /* Draw Prio */ fpcDwPi_MBDOOR_e, /* Actor SubMtd */ &l_daMbdoor_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_6_e, + /* Cull Type */ fopAc_CULLBOX_6_e, }; diff --git a/src/d/actor/d_a_mdoor.cpp b/src/d/actor/d_a_mdoor.cpp index f2d1340b1..bfa17bece 100644 --- a/src/d/actor/d_a_mdoor.cpp +++ b/src/d/actor/d_a_mdoor.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_mdoor.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" #include "d/res/res_mdoor.h" @@ -459,18 +457,18 @@ static actor_method_class l_daMdoor_Method = { }; actor_process_profile_definition g_profile_MDOOR = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_MDOOR, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_MDOOR_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daMdoor_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_MDOOR, + /* Draw Prio */ fpcDwPi_MDOOR_e, /* Actor SubMtd */ &l_daMdoor_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_6_e, + /* Cull Type */ fopAc_CULLBOX_6_e, }; diff --git a/src/d/actor/d_a_mflft.cpp b/src/d/actor/d_a_mflft.cpp index d1180e561..0ef48a3bc 100644 --- a/src/d/actor/d_a_mflft.cpp +++ b/src/d/actor/d_a_mflft.cpp @@ -8,8 +8,6 @@ #include "d/res/res_mflft.h" #include "d/res/res_always.h" #include "d/d_bg_w.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "d/d_bg_s_movebg_actor.h" #include "d/d_kankyo_wether.h" @@ -688,18 +686,18 @@ static actor_method_class l_daMflft_Method = { }; actor_process_profile_definition g_profile_MFLFT = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_MFLFT, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_MFLFT_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(mflft_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_MFLFT, + /* Draw Prio */ fpcDwPi_MFLFT_e, /* Actor SubMtd */ &l_daMflft_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_mgameboard.cpp b/src/d/actor/d_a_mgameboard.cpp index 7c277e899..1f6f05156 100644 --- a/src/d/actor/d_a_mgameboard.cpp +++ b/src/d/actor/d_a_mgameboard.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_mgameboard.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 000000EC-0000010C .text CheckCreateHeap__FP10fopAc_ac_c */ static BOOL CheckCreateHeap(fopAc_ac_c*) { @@ -102,18 +100,18 @@ static actor_method_class daMgBoardMethodTable = { }; actor_process_profile_definition g_profile_MGBOARD = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_MGBOARD, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_MGBOARD_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daMgBoard_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_MGBOARD, + /* Draw Prio */ fpcDwPi_MGBOARD_e, /* Actor SubMtd */ &daMgBoardMethodTable, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_mmusic.cpp b/src/d/actor/d_a_mmusic.cpp index 63167fa97..92a2553e9 100644 --- a/src/d/actor/d_a_mmusic.cpp +++ b/src/d/actor/d_a_mmusic.cpp @@ -7,8 +7,6 @@ #include "d/actor/d_a_mmusic.h" #include "d/d_com_inf_game.h" #include "d/d_item_data.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "m_Do/m_Do_mtx.h" namespace daMmusic { @@ -43,7 +41,7 @@ BOOL daMmusic::Act_c::Macore_is_playing() { dComIfGs_isEventBit(dSv_event_flag_c::UNK_2910) || dComIfGs_isEventBit(dSv_event_flag_c::UNK_2E02) || dComIfGs_isEventBit(dSv_event_flag_c::UNK_1610) || - !dComIfGs_checkGetItem(dItem_MASTER_SWORD_2_e)) + !dComIfGs_checkGetItem(dItemNo_MASTER_SWORD_2_e)) return FALSE; return TRUE; @@ -187,18 +185,18 @@ namespace daMmusic { } actor_process_profile_definition g_profile_Mmusic = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Mmusic, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Mmusic_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daMmusic::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Mmusic, + /* Draw Prio */ fpcDwPi_Mmusic_e, /* Actor SubMtd */ &daMmusic::Mthd_Table, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLSPHERE_CUSTOM_e, + /* Cull Type */ fopAc_CULLSPHERE_CUSTOM_e, }; diff --git a/src/d/actor/d_a_mo2.cpp b/src/d/actor/d_a_mo2.cpp index 0d5047572..a2ec3124a 100644 --- a/src/d/actor/d_a_mo2.cpp +++ b/src/d/actor/d_a_mo2.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_mo2.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" /* 000000EC-000001E8 .text tex_anm_set__FP9mo2_classUs */ @@ -523,18 +521,18 @@ static actor_method_class l_daMo2_Method = { }; actor_process_profile_definition g_profile_MO2 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_MO2, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_MO2_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(mo2_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_MO2, + /* Draw Prio */ fpcDwPi_MO2_e, /* Actor SubMtd */ &l_daMo2_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e | fopAcStts_UNK200000_e, /* Group */ fopAc_ENEMY_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_movie_player.cpp b/src/d/actor/d_a_movie_player.cpp index c7cdedde4..91b5be4de 100644 --- a/src/d/actor/d_a_movie_player.cpp +++ b/src/d/actor/d_a_movie_player.cpp @@ -14,8 +14,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_movie_player.h" #include "f_op/f_op_actor_mng.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "m_Do/m_Do_graphic.h" #include "dolphin/os/OSMessage.h" @@ -4317,18 +4315,18 @@ static actor_method_class daMP_METHODS = { }; actor_process_profile_definition g_profile_MP = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_MP, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_MP_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daMP_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_MP, + /* Draw Prio */ fpcDwPi_MP_e, /* Actor SubMtd */ &daMP_METHODS, /* Status */ fopAcStts_NOPAUSE_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_mozo.cpp b/src/d/actor/d_a_mozo.cpp index 95f6117ae..37d8492d4 100644 --- a/src/d/actor/d_a_mozo.cpp +++ b/src/d/actor/d_a_mozo.cpp @@ -10,8 +10,6 @@ #include "JSystem/JUtility/JUTAssert.h" #include "d/d_com_inf_game.h" #include "d/d_kankyo.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_lib.h" #include "m_Do/m_Do_mtx.h" #include "m_Do/m_Do_ext.h" @@ -267,7 +265,7 @@ fopAc_ac_c* daMozo_c::getBeamActor(fpc_ProcID apid) { fopAc_ac_c* ac = fopAcM_SearchByID(apid); if (ac == NULL) return NULL; - if (fopAc_IsActor(ac) && fopAcM_GetProfName(ac) == PROC_Beam) + if (fopAc_IsActor(ac) && fopAcM_GetProfName(ac) == fpcNm_Beam_e) return ac; return NULL; } @@ -336,18 +334,18 @@ static actor_method_class l_daMozo_Method = { }; actor_process_profile_definition g_profile_MOZO = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_MOZO, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_MOZO_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daMozo_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_MOZO, + /* Draw Prio */ fpcDwPi_MOZO_e, /* Actor SubMtd */ &l_daMozo_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_msw.cpp b/src/d/actor/d_a_msw.cpp index 2d7c00ef7..64ba982d8 100644 --- a/src/d/actor/d_a_msw.cpp +++ b/src/d/actor/d_a_msw.cpp @@ -7,8 +7,6 @@ #include "d/actor/d_a_msw.h" #include "d/res/res_msw.h" #include "d/d_bg_s_movebg_actor.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "m_Do/m_Do_ext.h" #include "d/d_com_inf_game.h" #include "d/d_s_play.h" @@ -351,18 +349,18 @@ static actor_method_class l_daMsw_Method = { }; actor_process_profile_definition g_profile_MSW = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_MSW, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_MSW_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(msw_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_MSW, + /* Draw Prio */ fpcDwPi_MSW_e, /* Actor SubMtd */ &l_daMsw_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_mt.cpp b/src/d/actor/d_a_mt.cpp index 0d49f3306..c04bb63a3 100644 --- a/src/d/actor/d_a_mt.cpp +++ b/src/d/actor/d_a_mt.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_mt.h" #include "m_Do/m_Do_ext.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" /* 000000EC-000001E8 .text __ct__10daMt_HIO_cFv */ @@ -202,18 +200,18 @@ static actor_method_class l_daMt_Method = { }; actor_process_profile_definition g_profile_MT = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_MT, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_MT_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(mt_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_MT, + /* Draw Prio */ fpcDwPi_MT_e, /* Actor SubMtd */ &l_daMt_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_FREEZE_e | fopAcStts_UNK40000_e | fopAcStts_UNK8000000_e, /* Group */ fopAc_ENEMY_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_mtoge.cpp b/src/d/actor/d_a_mtoge.cpp index 94edd06f2..9b1c0e206 100644 --- a/src/d/actor/d_a_mtoge.cpp +++ b/src/d/actor/d_a_mtoge.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_mtoge.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/res/res_mtoge.h" #include "f_op/f_op_actor_mng.h" @@ -241,18 +239,18 @@ static actor_method_class l_daMtoge_Method = { }; actor_process_profile_definition g_profile_MTOGE = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_MTOGE, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_MTOGE_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daMtoge_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_MTOGE, + /* Draw Prio */ fpcDwPi_MTOGE_e, /* Actor SubMtd */ &l_daMtoge_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_6_e, + /* Cull Type */ fopAc_CULLBOX_6_e, }; diff --git a/src/d/actor/d_a_nh.cpp b/src/d/actor/d_a_nh.cpp index 4c8e21ec0..8a359b50e 100644 --- a/src/d/actor/d_a_nh.cpp +++ b/src/d/actor/d_a_nh.cpp @@ -7,8 +7,6 @@ #include "d/actor/d_a_nh.h" #include "f_op/f_op_actor_mng.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" #include "d/d_bg_s_acch.h" #include "d/d_bg_s_gnd_chk.h" @@ -214,7 +212,7 @@ BOOL daNh_c::checkBinCatch() { } dComIfGp_att_CatchRequest( - this, dItem_FIREFLY_BOTTLE_e, + this, dItemNo_FIREFLY_BOTTLE_e, l_HIO.prm.field_0x08, l_HIO.prm.field_0x0c, l_HIO.prm.field_0x10, l_HIO.prm.field_0x3c, 1 @@ -519,18 +517,18 @@ static actor_method_class l_daNh_Method = { }; actor_process_profile_definition g_profile_NH = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NH, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NH_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNh_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NH, + /* Draw Prio */ fpcDwPi_NH_e, /* Actor SubMtd */ &l_daNh_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_npc_ac1.cpp b/src/d/actor/d_a_npc_ac1.cpp index 5e57ed626..dfb69c8d6 100644 --- a/src/d/actor/d_a_npc_ac1.cpp +++ b/src/d/actor/d_a_npc_ac1.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_ac1.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 000000EC-00000150 .text __ct__15daNpc_Ac1_HIO_cFv */ daNpc_Ac1_HIO_c::daNpc_Ac1_HIO_c() { @@ -342,18 +340,18 @@ static actor_method_class l_daNpc_Ac1_Method = { }; actor_process_profile_definition g_profile_NPC_AC1 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_AC1, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_AC1_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpc_Ac1_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_AC1, + /* Draw Prio */ fpcDwPi_NPC_AC1_e, /* Actor SubMtd */ &l_daNpc_Ac1_Method, /* Status */ 0x07 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_NPC_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_ah.cpp b/src/d/actor/d_a_npc_ah.cpp index 2690dfc60..16e496462 100644 --- a/src/d/actor/d_a_npc_ah.cpp +++ b/src/d/actor/d_a_npc_ah.cpp @@ -7,8 +7,6 @@ #include "d/actor/d_a_npc_ah.h" #include "d/d_a_obj.h" #include "d/d_com_lib_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_snap.h" #include "d/res/res_ah.h" @@ -928,18 +926,18 @@ static actor_method_class daNpc_AhMethodTable = { }; actor_process_profile_definition g_profile_NPC_AH = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_AH, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_AH_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpcAh_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_AH, + /* Draw Prio */ fpcDwPi_NPC_AH_e, /* Actor SubMtd */ &daNpc_AhMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_aj1.cpp b/src/d/actor/d_a_npc_aj1.cpp index f9a292e31..43d6c9f29 100644 --- a/src/d/actor/d_a_npc_aj1.cpp +++ b/src/d/actor/d_a_npc_aj1.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_aj1.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 000000EC-00000150 .text __ct__15daNpc_Aj1_HIO_cFv */ daNpc_Aj1_HIO_c::daNpc_Aj1_HIO_c() { @@ -487,18 +485,18 @@ static actor_method_class l_daNpc_Aj1_Method = { }; actor_process_profile_definition g_profile_NPC_AJ1 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_AJ1, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_AJ1_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpc_Aj1_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_AJ1, + /* Draw Prio */ fpcDwPi_NPC_AJ1_e, /* Actor SubMtd */ &l_daNpc_Aj1_Method, /* Status */ 0x07 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_auction.cpp b/src/d/actor/d_a_npc_auction.cpp index 7f5d805b1..70a223abf 100644 --- a/src/d/actor/d_a_npc_auction.cpp +++ b/src/d/actor/d_a_npc_auction.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_auction.h" #include "m_Do/m_Do_ext.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 000000EC-00000268 .text __ct__14daNpcAuction_cFv */ daNpcAuction_c::daNpcAuction_c() { @@ -228,18 +226,18 @@ static actor_method_class daNpc_AuctionMethodTable = { }; actor_process_profile_definition g_profile_NPC_AUCTION = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_AUCTION, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_AUCTION_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpcAuction_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_AUCTION, + /* Draw Prio */ fpcDwPi_NPC_AUCTION_e, /* Actor SubMtd */ &daNpc_AuctionMethodTable, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_npc_ba1.cpp b/src/d/actor/d_a_npc_ba1.cpp index 3dabf38f5..cf37081c4 100644 --- a/src/d/actor/d_a_npc_ba1.cpp +++ b/src/d/actor/d_a_npc_ba1.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_ba1.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 000000EC-00000150 .text __ct__15daNpc_Ba1_HIO_cFv */ daNpc_Ba1_HIO_c::daNpc_Ba1_HIO_c() { @@ -532,18 +530,18 @@ static actor_method_class l_daNpc_Ba1_Method = { }; actor_process_profile_definition g_profile_NPC_BA1 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_BA1, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_BA1_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpc_Ba1_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_BA1, + /* Draw Prio */ fpcDwPi_NPC_BA1_e, /* Actor SubMtd */ &l_daNpc_Ba1_Method, /* Status */ 0x08 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_NPC_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_bj1.cpp b/src/d/actor/d_a_npc_bj1.cpp index 444d9f75b..b65e9192b 100644 --- a/src/d/actor/d_a_npc_bj1.cpp +++ b/src/d/actor/d_a_npc_bj1.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_bj1.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 000000EC-00000108 .text __ct__20daNpc_Bj1_childHIO_cFv */ daNpc_Bj1_childHIO_c::daNpc_Bj1_childHIO_c() { @@ -637,154 +635,154 @@ static actor_method_class l_daNpc_Bj1_Method = { }; actor_process_profile_definition g_profile_NPC_BJ1 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_BJ1, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_BJ1_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpc_Bj1_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_BJ1, + /* Draw Prio */ fpcDwPi_NPC_BJ1_e, /* Actor SubMtd */ &l_daNpc_Bj1_Method, /* Status */ 0x07 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_NPC_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; actor_process_profile_definition g_profile_NPC_BJ2 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_BJ2, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_BJ2_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpc_Bj1_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_BJ2, + /* Draw Prio */ fpcDwPi_NPC_BJ2_e, /* Actor SubMtd */ &l_daNpc_Bj1_Method, /* Status */ 0x07 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_NPC_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; actor_process_profile_definition g_profile_NPC_BJ3 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_BJ3, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_BJ3_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpc_Bj1_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_BJ3, + /* Draw Prio */ fpcDwPi_NPC_BJ3_e, /* Actor SubMtd */ &l_daNpc_Bj1_Method, /* Status */ 0x07 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_NPC_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; actor_process_profile_definition g_profile_NPC_BJ4 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_BJ4, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_BJ4_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpc_Bj1_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_BJ4, + /* Draw Prio */ fpcDwPi_NPC_BJ4_e, /* Actor SubMtd */ &l_daNpc_Bj1_Method, /* Status */ 0x07 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_NPC_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; actor_process_profile_definition g_profile_NPC_BJ5 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_BJ5, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_BJ5_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpc_Bj1_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_BJ5, + /* Draw Prio */ fpcDwPi_NPC_BJ5_e, /* Actor SubMtd */ &l_daNpc_Bj1_Method, /* Status */ 0x07 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_NPC_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; actor_process_profile_definition g_profile_NPC_BJ6 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_BJ6, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_BJ6_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpc_Bj1_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_BJ6, + /* Draw Prio */ fpcDwPi_NPC_BJ6_e, /* Actor SubMtd */ &l_daNpc_Bj1_Method, /* Status */ 0x07 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_NPC_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; actor_process_profile_definition g_profile_NPC_BJ7 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_BJ7, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_BJ7_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpc_Bj1_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_BJ7, + /* Draw Prio */ fpcDwPi_NPC_BJ7_e, /* Actor SubMtd */ &l_daNpc_Bj1_Method, /* Status */ 0x07 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_NPC_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; actor_process_profile_definition g_profile_NPC_BJ8 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_BJ8, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_BJ8_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpc_Bj1_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_BJ8, + /* Draw Prio */ fpcDwPi_NPC_BJ8_e, /* Actor SubMtd */ &l_daNpc_Bj1_Method, /* Status */ 0x07 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_NPC_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; actor_process_profile_definition g_profile_NPC_BJ9 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_BJ9, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_BJ9_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpc_Bj1_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_BJ9, + /* Draw Prio */ fpcDwPi_NPC_BJ9_e, /* Actor SubMtd */ &l_daNpc_Bj1_Method, /* Status */ 0x07 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_NPC_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_bm1.cpp b/src/d/actor/d_a_npc_bm1.cpp index e23e13953..c04f38bab 100644 --- a/src/d/actor/d_a_npc_bm1.cpp +++ b/src/d/actor/d_a_npc_bm1.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_bm1.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 000000EC-00000108 .text __ct__20daNpc_Bm1_childHIO_cFv */ daNpc_Bm1_childHIO_c::daNpc_Bm1_childHIO_c() { @@ -847,86 +845,86 @@ static actor_method_class l_daNpc_Bm1_Method = { }; actor_process_profile_definition g_profile_NPC_BM1 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_BM1, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_BM1_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpc_Bm1_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_BM1, + /* Draw Prio */ fpcDwPi_NPC_BM1_e, /* Actor SubMtd */ &l_daNpc_Bm1_Method, /* Status */ 0x07 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_NPC_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; actor_process_profile_definition g_profile_NPC_BM2 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_BM2, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_BM2_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpc_Bm1_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_BM2, + /* Draw Prio */ fpcDwPi_NPC_BM2_e, /* Actor SubMtd */ &l_daNpc_Bm1_Method, /* Status */ 0x07 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_NPC_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; actor_process_profile_definition g_profile_NPC_BM3 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_BM3, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_BM3_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpc_Bm1_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_BM3, + /* Draw Prio */ fpcDwPi_NPC_BM3_e, /* Actor SubMtd */ &l_daNpc_Bm1_Method, /* Status */ 0x07 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_NPC_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; actor_process_profile_definition g_profile_NPC_BM4 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_BM4, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_BM4_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpc_Bm1_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_BM4, + /* Draw Prio */ fpcDwPi_NPC_BM4_e, /* Actor SubMtd */ &l_daNpc_Bm1_Method, /* Status */ 0x07 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_NPC_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; actor_process_profile_definition g_profile_NPC_BM5 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_BM5, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_BM5_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpc_Bm1_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_BM5, + /* Draw Prio */ fpcDwPi_NPC_BM5_e, /* Actor SubMtd */ &l_daNpc_Bm1_Method, /* Status */ 0x07 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_NPC_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_bmcon1.cpp b/src/d/actor/d_a_npc_bmcon1.cpp index 6eaa44155..3a4381f81 100644 --- a/src/d/actor/d_a_npc_bmcon1.cpp +++ b/src/d/actor/d_a_npc_bmcon1.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_bmcon1.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 000000EC-000002A4 .text __ct__12daNpcBmcon_cFv */ daNpcBmcon_c::daNpcBmcon_c() { @@ -312,18 +310,18 @@ static actor_method_class daNpc_BmconMethodTable = { }; actor_process_profile_definition g_profile_NPC_BMCON1 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_BMCON1, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_BMCON1_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpcBmcon_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_BMCON1, + /* Draw Prio */ fpcDwPi_NPC_BMCON1_e, /* Actor SubMtd */ &daNpc_BmconMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_bms1.cpp b/src/d/actor/d_a_npc_bms1.cpp index 5a26019df..972168279 100644 --- a/src/d/actor/d_a_npc_bms1.cpp +++ b/src/d/actor/d_a_npc_bms1.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_bms1.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" static dCcD_SrcCyl l_cyl_src = { @@ -314,18 +312,18 @@ static actor_method_class l_daNpc_Bms1_Method = { }; actor_process_profile_definition g_profile_NPC_BMS1 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_BMS1, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_BMS1_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpc_Bms1_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_BMS1, + /* Draw Prio */ fpcDwPi_NPC_BMS1_e, /* Actor SubMtd */ &l_daNpc_Bms1_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_12_e, + /* Cull Type */ fopAc_CULLBOX_12_e, }; diff --git a/src/d/actor/d_a_npc_bmsw.cpp b/src/d/actor/d_a_npc_bmsw.cpp index b44d58b5f..d33f5a0fb 100644 --- a/src/d/actor/d_a_npc_bmsw.cpp +++ b/src/d/actor/d_a_npc_bmsw.cpp @@ -9,8 +9,6 @@ #include "d/d_shop.h" #include "d/d_snap.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" #include "SSystem/SComponent/c_angle.h" #include "f_op/f_op_camera.h" @@ -45,7 +43,7 @@ public: /* 0x54 */ f32 field_0x54; }; // Size: 0x58 -daNpc_Bmsw_HIO_c l_HIO; +static daNpc_Bmsw_HIO_c l_HIO; static dCcD_SrcCyl l_cyl_src = { @@ -1694,18 +1692,18 @@ static actor_method_class l_daNpc_Bmsw_Method = { }; actor_process_profile_definition g_profile_NPC_BMSW = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_BMSW, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_BMSW_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpc_Bmsw_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_BMSW, + /* Draw Prio */ fpcDwPi_NPC_BMSW_e, /* Actor SubMtd */ &l_daNpc_Bmsw_Method, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_12_e, + /* Cull Type */ fopAc_CULLBOX_12_e, }; diff --git a/src/d/actor/d_a_npc_bs1.cpp b/src/d/actor/d_a_npc_bs1.cpp index 2fe0e7116..49724cca2 100644 --- a/src/d/actor/d_a_npc_bs1.cpp +++ b/src/d/actor/d_a_npc_bs1.cpp @@ -15,8 +15,6 @@ #include "d/d_shop.h" #include "d/d_snap.h" #include "d/d_letter.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "f_op/f_op_actor.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_hostIO.h" @@ -150,11 +148,11 @@ s16 daNpc_Bs1_c::XyEventCB(int i_itemBtn) { s16 eventIdx = -1; u8 selectedItem = (s32)dComIfGp_getSelectItem(i_itemBtn); if (mType == 0) { - if (selectedItem == KAISEN_PRESENT1) { + if (selectedItem == dItemNo_COMPLIMENTARY_ID_e) { eventIdx = mEventIdxs[0]; m82B = 0; setAction(&daNpc_Bs1_c::event_action, NULL); - } else if (selectedItem == KAISEN_PRESENT2) { + } else if (selectedItem == dItemNo_FILL_UP_COUPON_e) { eventIdx = mEventIdxs[1]; m82B = 1; setAction(&daNpc_Bs1_c::event_action, NULL); @@ -393,25 +391,25 @@ void daNpc_Bs1_c::checkOrder() { static u32 daNpc_Bs1_getBuyItemMax(int i_itemCost, int i_itemNo) { int beastIdx; switch (i_itemNo) { - case dItem_BOKOBABA_SEED_e: + case dItemNo_BOKOBABA_SEED_e: beastIdx = dBeastIdx_BOKOBABA_SEED_e; break; - case dItem_SKULL_NECKLACE_e: + case dItemNo_SKULL_NECKLACE_e: beastIdx = dBeastIdx_SKULL_NECKLACE_e; break; - case dItem_RED_JELLY_e: + case dItemNo_RED_JELLY_e: beastIdx = dBeastIdx_RED_JELLY_e; break; - case dItem_GREEN_JELLY_e: + case dItemNo_GREEN_JELLY_e: beastIdx = dBeastIdx_GREEN_JELLY_e; break; - case dItem_BLUE_JELLY_e: + case dItemNo_BLUE_JELLY_e: beastIdx = dBeastIdx_BLUE_JELLY_e; break; - case dItem_JOY_PENDANT_e: + case dItemNo_JOY_PENDANT_e: beastIdx = dBeastIdx_JOY_PENDANT_e; break; - case dItem_GOLDEN_FEATHER_e: + case dItemNo_GOLDEN_FEATHER_e: beastIdx = dBeastIdx_GOLDEN_FEATHER_e; break; default: @@ -832,7 +830,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() == dItem_BAIT_BAG_e) { + if(mShopItems.getSelectItemNo() == dItemNo_BAIT_BAG_e) { mShopItems.SoldOutItem(mShopItems.mSelectedItemIdx); m76C[mShopItems.mSelectedItemIdx] = 1; } @@ -895,18 +893,18 @@ u16 daNpc_Bs1_c::next_msgStatus(u32* pMsgNo) { mShopItems.hideSelectItem(); dComIfGp_setItemRupeeCount(-rupee); u8 itemNo = mShopItems.getSelectItemNo(); - if(itemNo == dItem_EMPTY_BOTTLE_e || itemNo == dItem_HEART_PIECE_e || itemNo == dItem_COLLECT_MAP_30_e) { + if(itemNo == dItemNo_EMPTY_BOTTLE_e || itemNo == dItemNo_HEART_PIECE_e || itemNo == dItemNo_COLLECT_MAP_30_e) { mShopItems.SoldOutItem(mShopItems.mSelectedItemIdx); m76C[mShopItems.mSelectedItemIdx] = 1; switch(itemNo) { - case dItem_EMPTY_BOTTLE_e: + case dItemNo_EMPTY_BOTTLE_e: dComIfGs_onEventBit(dSv_event_flag_c::UNK_2020); break; - case dItem_HEART_PIECE_e: + case dItemNo_HEART_PIECE_e: dComIfGs_onEventBit(dSv_event_flag_c::UNK_2010); break; - case dItem_COLLECT_MAP_30_e: + case dItemNo_COLLECT_MAP_30_e: dComIfGs_onEventBit(dSv_event_flag_c::UNK_2008); break; } @@ -990,25 +988,25 @@ u32 daNpc_Bs1_c::getMsg() { if(isEmono(itemNo)) { m840 = itemNo; switch(itemNo) { - case dItem_BOKOBABA_SEED_e: + case dItemNo_BOKOBABA_SEED_e: msgNo = 0xF78; break; - case dItem_SKULL_NECKLACE_e: + case dItemNo_SKULL_NECKLACE_e: msgNo = 0xF80; break; - case dItem_RED_JELLY_e: + case dItemNo_RED_JELLY_e: msgNo = 0xF85; break; - case dItem_GREEN_JELLY_e: + case dItemNo_GREEN_JELLY_e: msgNo = 0xF8A; break; - case dItem_BLUE_JELLY_e: + case dItemNo_BLUE_JELLY_e: msgNo = 0xF8F; break; - case dItem_JOY_PENDANT_e: + case dItemNo_JOY_PENDANT_e: msgNo = 0xF94; break; - case dItem_GOLDEN_FEATHER_e: + case dItemNo_GOLDEN_FEATHER_e: msgNo = 0xF99; break; default: @@ -1021,17 +1019,17 @@ u32 daNpc_Bs1_c::getMsg() { break; } } - else if(itemNo == KAISEN_PRESENT1) { + else if(itemNo == dItemNo_COMPLIMENTARY_ID_e) { msgNo = 0xF6F; } - else if(itemNo == KAISEN_PRESENT2) { + else if(itemNo == dItemNo_FILL_UP_COUPON_e) { msgNo = 0xF73; } else { msgNo = 0xF75; } } - else if(itemNo == KAISEN_PRESENT1 || itemNo == KAISEN_PRESENT2) { + else if(itemNo == dItemNo_COMPLIMENTARY_ID_e || itemNo == dItemNo_FILL_UP_COUPON_e) { msgNo = 0x2F56; } else if(isEmono(itemNo)) { @@ -1046,7 +1044,7 @@ u32 daNpc_Bs1_c::getMsg() { if(mShopItems.isSoldOutItemAll()) { msgNo = 0xF3D; } - else if(dComIfGs_checkGetItem(dItem_BOMB_BAG_e) && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_1F20) && isSellBomb()) { + else if(dComIfGs_checkGetItem(dItemNo_BOMB_BAG_e) && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_1F20) && isSellBomb()) { dComIfGs_onEventBit(dSv_event_flag_c::UNK_1F20); m837 = 1; msgNo = 0xF55; @@ -1083,7 +1081,7 @@ u32 daNpc_Bs1_c::getMsg() { else if(mShopItems.isSoldOutItemAll()) { msgNo = 0x2F62; } - else if(dComIfGs_checkGetItem(dItem_BOMB_BAG_e) && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_1F20) && isSellBomb()) { + else if(dComIfGs_checkGetItem(dItemNo_BOMB_BAG_e) && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_1F20) && isSellBomb()) { dComIfGs_onEventBit(dSv_event_flag_c::UNK_1F20); m837 = 1; msgNo = 0x2F64; @@ -1473,7 +1471,7 @@ void daNpc_Bs1_c::createShopList() { for(int i = 0; i < 3; i++) { u8 itemNo = pDataSet[i]->mpItemData->mItemNo; int idx = i; - if((itemNo == dItem_BAIT_BAG_e && dComIfGs_checkGetItem(itemNo)) || (itemNo == dItem_HYOI_PEAR_e && dComIfGs_checkGetItem(dItem_BOMB_BAG_e))) { + if((itemNo == dItemNo_BAIT_BAG_e && dComIfGs_checkGetItem(itemNo)) || (itemNo == dItemNo_HYOI_PEAR_e && dComIfGs_checkGetItem(dItemNo_BOMB_BAG_e))) { itemNo = pDataSet[i + 3][0].mpItemData->mItemNo; idx += 3; } @@ -1487,21 +1485,21 @@ void daNpc_Bs1_c::createShopList() { __shop_items_set_data* dataSet[4]; int index = 0; - if(dComIfGs_checkGetItem(dItem_BOMB_BAG_e)) { + if(dComIfGs_checkGetItem(dItemNo_BOMB_BAG_e)) { dataSet[index] = &shopItems_setData_Bomb30Bs2; index = 1; } - if(dComIfGs_getItem(dInvSlot_BOW_e) != dItem_NONE_e) { + if(dComIfGs_getItem(dInvSlot_BOW_e) != dItemNo_NONE_e) { dataSet[index] = &shopItems_setData_arrow30Bs2; index++; } dataSet[index] = &shopItems_setData_red_bottleBs2; index++; - if(!dComIfGs_checkGetItem(dItem_BOMB_BAG_e)) { + if(!dComIfGs_checkGetItem(dItemNo_BOMB_BAG_e)) { dataSet[index] = &shopItems_setData_Bomb30Bs2; index++; } - if(dComIfGs_getItem(dInvSlot_BOW_e) == dItem_NONE_e) { + if(dComIfGs_getItem(dInvSlot_BOW_e) == dItemNo_NONE_e) { dataSet[index] = &shopItems_setData_arrow30Bs2; } @@ -1525,7 +1523,7 @@ void daNpc_Bs1_c::createShopList() { mShopItems.setItemSetDataList(mpItemSetList); for(int i = 0; i < 3; i++) { mShopItems.mSelectedItemIdx = i; - if((!dComIfGs_checkGetItem(dItem_BOMB_BAG_e) && isBomb(mShopItems.getSelectItemNo())) || (dComIfGs_getItem(dInvSlot_BOW_e) == dItem_NONE_e && isArrow(mShopItems.getSelectItemNo()))) { + if((!dComIfGs_checkGetItem(dItemNo_BOMB_BAG_e) && isBomb(mShopItems.getSelectItemNo())) || (dComIfGs_getItem(dInvSlot_BOW_e) == dItemNo_NONE_e && isArrow(mShopItems.getSelectItemNo()))) { mShopItems.SoldOutItem(i); m76C[i] = true; } @@ -2272,18 +2270,18 @@ static actor_method_class l_daNpc_Bs1_Method = { }; actor_process_profile_definition g_profile_NPC_BS1 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_BS1, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_BS1_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpc_Bs1_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_BS1, + /* Draw Prio */ fpcDwPi_NPC_BS1_e, /* Actor SubMtd */ &l_daNpc_Bs1_Method, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_12_e, + /* Cull Type */ fopAc_CULLBOX_12_e, }; diff --git a/src/d/actor/d_a_npc_btsw.cpp b/src/d/actor/d_a_npc_btsw.cpp index 42d0e4184..bfe09205a 100644 --- a/src/d/actor/d_a_npc_btsw.cpp +++ b/src/d/actor/d_a_npc_btsw.cpp @@ -12,8 +12,6 @@ #include "f_op/f_op_camera.h" #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_ext.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" class daNpc_Btsw_HIO_c : public JORReflexible { @@ -47,7 +45,7 @@ public: /* 0x5C */ f32 field_0x5C; }; // Size: 0x60 -daNpc_Btsw_HIO_c l_HIO; +static daNpc_Btsw_HIO_c l_HIO; static dCcD_SrcCyl l_cyl_src = { // dCcD_SrcGObjInf @@ -452,7 +450,7 @@ void daNpc_Btsw_c::anmAtr(u16 i_msgStatus) { /* 00000F0C-00000F30 .text daNpc_Btsw_XyCheckCB__FPvi */ static s16 daNpc_Btsw_XyCheckCB(void*, int i_itemBtn) { - if (dComIfGp_getSelectItem(i_itemBtn) == dItem_NOTE_TO_MOM_e) { + if (dComIfGp_getSelectItem(i_itemBtn) == dItemNo_NOTE_TO_MOM_e) { return TRUE; } return FALSE; @@ -1482,18 +1480,18 @@ static actor_method_class l_daNpc_Btsw_Method = { }; actor_process_profile_definition g_profile_NPC_BTSW = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_BTSW, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_BTSW_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpc_Btsw_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_BTSW, + /* Draw Prio */ fpcDwPi_NPC_BTSW_e, /* Actor SubMtd */ &l_daNpc_Btsw_Method, /* Status */ 0x07 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_12_e, + /* Cull Type */ fopAc_CULLBOX_12_e, }; diff --git a/src/d/actor/d_a_npc_btsw2.cpp b/src/d/actor/d_a_npc_btsw2.cpp index 29a37d1ac..1971e296a 100644 --- a/src/d/actor/d_a_npc_btsw2.cpp +++ b/src/d/actor/d_a_npc_btsw2.cpp @@ -8,8 +8,6 @@ #include "d/res/res_btsw.h" #include "d/d_com_inf_game.h" #include "d/d_item.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_snap.h" #include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_ext.h" @@ -544,7 +542,7 @@ BOOL daNpc_Btsw2_c::wait_action(void*) { cPhs_State daNpc_Btsw2_c::_create() { fopAcM_ct(this, daNpc_Btsw2_c); - if (dComIfGs_getEventReg(dSv_event_flag_c::UNK_C203) == 3 || !checkItemGet(dItem_PEARL_DIN_e, TRUE)) { + if (dComIfGs_getEventReg(dSv_event_flag_c::UNK_C203) == 3 || !checkItemGet(dItemNo_PEARL_DIN_e, TRUE)) { return cPhs_ERROR_e; } @@ -670,18 +668,18 @@ static actor_method_class l_daNpc_Btsw2_Method = { }; actor_process_profile_definition g_profile_NPC_BTSW2 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_BTSW2, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_BTSW2_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpc_Btsw2_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_BTSW2, + /* Draw Prio */ fpcDwPi_NPC_BTSW2_e, /* Actor SubMtd */ &l_daNpc_Btsw2_Method, /* Status */ 0x07 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_12_e, + /* Cull Type */ fopAc_CULLBOX_12_e, }; diff --git a/src/d/actor/d_a_npc_cb1.cpp b/src/d/actor/d_a_npc_cb1.cpp index 7252316ba..d3af077a2 100644 --- a/src/d/actor/d_a_npc_cb1.cpp +++ b/src/d/actor/d_a_npc_cb1.cpp @@ -10,8 +10,6 @@ #include "d/d_camera.h" #include "d/d_com_inf_game.h" #include "d/d_kankyo_wether.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" #include "d/d_s_play.h" #include "d/d_snap.h" @@ -268,7 +266,7 @@ cPhs_State daNpc_Cb1_c::create() { #if VERSION == VERSION_DEMO if(dComIfGs_isStageBossEnemy(dSv_save_c::STAGE_WT)) #else - if(dComIfGs_checkGetItem(dItem_MASTER_SWORD_3_e)) + if(dComIfGs_checkGetItem(dItemNo_MASTER_SWORD_3_e)) #endif { if(!isTypeKazeBoss()) { @@ -290,7 +288,7 @@ cPhs_State daNpc_Cb1_c::create() { return cPhs_ERROR_e; } } - else if(dComIfGs_checkGetItem(dItem_MASTER_SWORD_2_e)) { + else if(dComIfGs_checkGetItem(dItemNo_MASTER_SWORD_2_e)) { if(!isTypeWaterFall()) { return cPhs_ERROR_e; } @@ -298,7 +296,7 @@ cPhs_State daNpc_Cb1_c::create() { else if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_1820)) { return cPhs_ERROR_e; } - else if(dComIfGs_checkGetItem(dItem_PEARL_FARORE_e)) { + else if(dComIfGs_checkGetItem(dItemNo_PEARL_FARORE_e)) { if(!isTypeForest()) { return cPhs_ERROR_e; } @@ -3444,18 +3442,18 @@ static actor_method_class l_daNpc_Cb1_Method = { }; actor_process_profile_definition g_profile_NPC_CB1 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_CB1, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_CB1_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpc_Cb1_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_CB1, + /* Draw Prio */ fpcDwPi_NPC_CB1_e, /* Actor SubMtd */ &l_daNpc_Cb1_Method, /* Status */ 0x07 | fopAcStts_SHOWMAP_e | fopAcStts_CULL_e | fopAcStts_FREEZE_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e | fopAcStts_UNK2000000_e, /* Group */ fopAc_NPC_e, - /* CullType */ fopAc_CULLBOX_12_e, + /* Cull Type */ fopAc_CULLBOX_12_e, }; diff --git a/src/d/actor/d_a_npc_co1.cpp b/src/d/actor/d_a_npc_co1.cpp index 6fdfa9951..bf8f08f48 100644 --- a/src/d/actor/d_a_npc_co1.cpp +++ b/src/d/actor/d_a_npc_co1.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_co1.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 000000EC-00000150 .text __ct__15daNpc_Co1_HIO_cFv */ daNpc_Co1_HIO_c::daNpc_Co1_HIO_c() { @@ -377,18 +375,18 @@ static actor_method_class l_daNpc_Co1_Method = { }; actor_process_profile_definition g_profile_NPC_CO1 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_CO1, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_CO1_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpc_Co1_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_CO1, + /* Draw Prio */ fpcDwPi_NPC_CO1_e, /* Actor SubMtd */ &l_daNpc_Co1_Method, /* Status */ 0x07 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_NPC_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_de1.cpp b/src/d/actor/d_a_npc_de1.cpp index 42b388fbd..95d73a394 100644 --- a/src/d/actor/d_a_npc_de1.cpp +++ b/src/d/actor/d_a_npc_de1.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_de1.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 000000EC-00000144 .text __ct__15daNpc_De1_HIO_cFv */ daNpc_De1_HIO_c::daNpc_De1_HIO_c() { @@ -302,18 +300,18 @@ static actor_method_class l_daNpc_De1_Method = { }; actor_process_profile_definition g_profile_NPC_DE1 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_DE1, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_DE1_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpc_De1_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_DE1, + /* Draw Prio */ fpcDwPi_NPC_DE1_e, /* Actor SubMtd */ &l_daNpc_De1_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_NPC_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_npc_ds1.cpp b/src/d/actor/d_a_npc_ds1.cpp index 3548478e7..17ca81fc8 100644 --- a/src/d/actor/d_a_npc_ds1.cpp +++ b/src/d/actor/d_a_npc_ds1.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_ds1.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" static dCcD_SrcCyl l_cyl_src = { @@ -339,18 +337,18 @@ static actor_method_class l_daNpc_Ds1_Method = { }; actor_process_profile_definition g_profile_NPC_DS1 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_DS1, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_DS1_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpc_Ds1_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_DS1, + /* Draw Prio */ fpcDwPi_NPC_DS1_e, /* Actor SubMtd */ &l_daNpc_Ds1_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_12_e, + /* Cull Type */ fopAc_CULLBOX_12_e, }; diff --git a/src/d/actor/d_a_npc_fa1.cpp b/src/d/actor/d_a_npc_fa1.cpp index 0a0332ec1..cad2ba8a3 100644 --- a/src/d/actor/d_a_npc_fa1.cpp +++ b/src/d/actor/d_a_npc_fa1.cpp @@ -8,8 +8,6 @@ #include "SSystem/SComponent/c_lib.h" #include "d/d_com_inf_game.h" #include "d/d_item.h" -#include "d/d_priority.h" -#include "d/d_procname.h" #include "d/d_snap.h" #include "f_op/f_op_actor_mng.h" @@ -339,7 +337,7 @@ BOOL daNpc_Fa1_c::checkBinCatch() { } dComIfGp_att_CatchRequest( - this, dItem_FAIRY_BOTTLE_e, + this, dItemNo_FAIRY_BOTTLE_e, l_HIO.prm.m1C, l_HIO.prm.m20, l_HIO.prm.m24, l_HIO.prm.m48, 1 @@ -549,7 +547,7 @@ void daNpc_Fa1_c::get_player_move() { current.pos = player->current.pos + *local_18; BGCheck(); if (mTimer == 0) { - execItemGet(dItem_RECOVER_FAIRY_e); + execItemGet(dItemNo_RECOVER_FAIRY_e); fopAcM_delete(this); } } @@ -615,7 +613,7 @@ void daNpc_Fa1_c::init_bottle_appear_move() { setMode(Mode_BOTTLE_APPEAR_MOVE_e); init_up1(); if (isTypeLinkDown()) { - execItemGet(dItem_RECOVER_FAIRY_e); + execItemGet(dItemNo_RECOVER_FAIRY_e); } } @@ -657,7 +655,7 @@ void daNpc_Fa1_c::bottle_appear_move() { (this->*bottleMoveSubProc[getSubMode()])(); if (mTimer == 0) { if (!isTypeLinkDown()) { - execItemGet(dItem_RECOVER_FAIRY_e); + execItemGet(dItemNo_RECOVER_FAIRY_e); } fopAcM_delete(this); } @@ -732,7 +730,7 @@ void daNpc_Fa1_c::bottle_baba_wait() { /* 800FC848-800FC8E4 .text init_bottle_baba_move__11daNpc_Fa1_cFv */ void daNpc_Fa1_c::init_bottle_baba_move() { setMode(Mode_BOTTLE_BABA_MOVE_e); - fopAcM_SearchByName(PROC_NPC_BA1, &m764); + fopAcM_SearchByName(fpcNm_NPC_BA1_e, &m764); mTimer = l_HIO.m50.prm.m22; speedF = l_HIO.m50.prm.m08; m798 = 1; @@ -1016,18 +1014,18 @@ static actor_method_class l_daNpc_Fa1_Method = { }; actor_process_profile_definition g_profile_NPC_FA1 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_FA1, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_FA1_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpc_Fa1_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_FA1, + /* Draw Prio */ fpcDwPi_NPC_FA1_e, /* Actor SubMtd */ &l_daNpc_Fa1_Method, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_npc_gk1.cpp b/src/d/actor/d_a_npc_gk1.cpp index 6c6299b80..3749fc24e 100644 --- a/src/d/actor/d_a_npc_gk1.cpp +++ b/src/d/actor/d_a_npc_gk1.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_gk1.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 000000EC-00000150 .text __ct__15daNpc_Gk1_HIO_cFv */ daNpc_Gk1_HIO_c::daNpc_Gk1_HIO_c() { @@ -327,18 +325,18 @@ static actor_method_class l_daNpc_Gk1_Method = { }; actor_process_profile_definition g_profile_NPC_GK1 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_GK1, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_GK1_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpc_Gk1_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_GK1, + /* Draw Prio */ fpcDwPi_NPC_GK1_e, /* Actor SubMtd */ &l_daNpc_Gk1_Method, /* Status */ 0x08 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_gp1.cpp b/src/d/actor/d_a_npc_gp1.cpp index 833657ef9..033876371 100644 --- a/src/d/actor/d_a_npc_gp1.cpp +++ b/src/d/actor/d_a_npc_gp1.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_gp1.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 000000EC-00000150 .text __ct__15daNpc_Gp1_HIO_cFv */ daNpc_Gp1_HIO_c::daNpc_Gp1_HIO_c() { @@ -372,18 +370,18 @@ static actor_method_class l_daNpc_Gp1_Method = { }; actor_process_profile_definition g_profile_NPC_GP1 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_GP1, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_GP1_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpc_Gp1_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_GP1, + /* Draw Prio */ fpcDwPi_NPC_GP1_e, /* Actor SubMtd */ &l_daNpc_Gp1_Method, /* Status */ 0x07 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_NPC_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_hi1.cpp b/src/d/actor/d_a_npc_hi1.cpp index 0cfdfe933..a284500d7 100644 --- a/src/d/actor/d_a_npc_hi1.cpp +++ b/src/d/actor/d_a_npc_hi1.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_hi1.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/res/res_hi.h" class daNpc_Hi1_HIO_c : public mDoHIO_entry_c{ @@ -994,18 +992,18 @@ static actor_method_class l_daNpc_Hi1_Method = { }; actor_process_profile_definition g_profile_NPC_HI1 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_HI1, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_HI1_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpc_Hi1_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_HI1, + /* Draw Prio */ fpcDwPi_NPC_HI1_e, /* Actor SubMtd */ &l_daNpc_Hi1_Method, /* Status */ 0x08 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_ho.cpp b/src/d/actor/d_a_npc_ho.cpp index 255c84273..065d18d9b 100644 --- a/src/d/actor/d_a_npc_ho.cpp +++ b/src/d/actor/d_a_npc_ho.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_ho.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/res/res_ho.h" #include "d/d_snap.h" #include "m_Do/m_Do_controller_pad.h" @@ -242,7 +240,7 @@ u16 daNpc_Ho_c::next_msgStatus(u32* pMsgNo) { break; case 0x271E: mNextMessageId = 0x2748; - mItemNum = dItem_PURPLE_RUPEE_e; + mItemNum = dItemNo_PURPLE_RUPEE_e; *pMsgNo = *pMsgNo + 1; mState = HO_STATE_TALK_03; break; @@ -308,7 +306,7 @@ u16 daNpc_Ho_c::next_msgStatus(u32* pMsgNo) { break; case 0x275C: mNextMessageId = 0x275D; - mItemNum = dItem_RED_RUPEE_e; + mItemNum = dItemNo_RED_RUPEE_e; msgStatus = fopMsgStts_MSG_ENDS_e; break; case 0x2742: @@ -317,7 +315,7 @@ u16 daNpc_Ho_c::next_msgStatus(u32* pMsgNo) { break; case 0x2743: mNextMessageId = 0x2744; - mItemNum = COTTAGE_PAPER; + mItemNum = dItemNo_CABANA_DEED_e; msgStatus = fopMsgStts_MSG_ENDS_e; dComIfGs_onEventBit(dSv_event_flag_c::UNK_1C08); dComIfGs_onTmpBit(dSv_event_tmp_flag_c::UNK_0104); @@ -341,17 +339,17 @@ u16 daNpc_Ho_c::next_msgStatus(u32* pMsgNo) { int numPendantsGiven = dComIfGs_getBeastNum(7); receivePendant(numPendantsGiven); if (numPendantsGiven < 3) { - mItemNum = dItem_RED_RUPEE_e; + mItemNum = dItemNo_RED_RUPEE_e; } else if (numPendantsGiven < 5) { - mItemNum = dItem_PURPLE_RUPEE_e; + mItemNum = dItemNo_PURPLE_RUPEE_e; } else { - mItemNum = dItem_ORANGE_RUPEE_e; + mItemNum = dItemNo_ORANGE_RUPEE_e; } mNextMessageId = 0x2757; break; case 0x2751: mNextMessageId = 0x2752; - mItemNum = dItem_HEROS_CHARM_e; + mItemNum = dItemNo_HEROS_CHARM_e; msgStatus = fopMsgStts_MSG_ENDS_e; dComIfGs_onEventBit(dSv_event_flag_c::UNK_1C04); break; @@ -401,7 +399,7 @@ u32 daNpc_Ho_c::getMsg() { return (dComIfGs_getEventReg(dSv_event_flag_c::UNK_C0FF) == 0 ? 0 : 1) + 0x2712; case HO_STATE_TALK_03: - if(dComIfGp_event_getPreItemNo() != dItem_JOY_PENDANT_e || !dComIfGs_isEventBit(DEMO_SELECT(dSv_event_flag_c::UNK_1E02, dSv_event_flag_c::UNK_1E04))) { + if(dComIfGp_event_getPreItemNo() != dItemNo_JOY_PENDANT_e || !dComIfGs_isEventBit(DEMO_SELECT(dSv_event_flag_c::UNK_1E02, dSv_event_flag_c::UNK_1E04))) { return 0x2739; } @@ -613,7 +611,7 @@ bool daNpc_Ho_c::wait01() { mPrevState = mState; mState = HO_STATE_TALK_02; setAnmStatus(); - mItemNum = dItem_NONE_e; + mItemNum = dItemNo_NONE_e; } else if (chkFlag(HO_FLAG_00000001)) { mPrevState = mState; mState = HO_STATE_TALK_01; @@ -662,7 +660,7 @@ bool daNpc_Ho_c::talk02() { /* 000016E8-000017D4 .text talk03__10daNpc_Ho_cFv */ bool daNpc_Ho_c::talk03() { if (talk() == fopMsgStts_BOX_CLOSED_e) { - if (mItemNum != dItem_NONE_e) { + if (mItemNum != dItemNo_NONE_e) { mState = HO_STATE_GIVE_01; fopAcM_orderChangeEvent(dComIfGp_getLinkPlayer(), this, "DEFAULT_GIVEITEM", 0, 0xFFFF); } else { @@ -693,7 +691,7 @@ bool daNpc_Ho_c::give02() { if (dComIfGp_evmng_endCheck("DEFAULT_GIVEITEM")) { fopAcM_orderChangeEvent(dComIfGp_getLinkPlayer(), this, "DEFAULT_TALK", 0, 0xFFFF); mState = HO_STATE_TALK_03_CONTINUE; - mItemNum = dItem_NONE_e; + mItemNum = dItemNo_NONE_e; talkInit(); } return mpMorf->isMorf(); @@ -705,7 +703,7 @@ bool daNpc_Ho_c::preach() { if (dComIfGp_evmng_endCheck("HO_PREACH")) { fopAcM_orderChangeEvent(dComIfGp_getLinkPlayer(), this, "DEFAULT_TALK", 0, 0xFFFF); - mItemNum = dItem_NONE_e; + mItemNum = dItemNo_NONE_e; mState = HO_STATE_TALK_03_CONTINUE; talkInit(); } @@ -874,7 +872,7 @@ cPhs_State daNpc_Ho_c::_create() { fopAcM_ct_Demo(this, daNpc_Ho_c); switch(fopAcM_GetName(this)) { - case PROC_NPC_HO: + case fpcNm_NPC_HO_e: mType = 0; break; default: @@ -1001,18 +999,18 @@ static actor_method_class l_daNpc_Ho_Method = { }; actor_process_profile_definition g_profile_NPC_HO = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_HO, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_HO_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpc_Ho_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_HO, + /* Draw Prio */ fpcDwPi_NPC_HO_e, /* Actor SubMtd */ &l_daNpc_Ho_Method, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_12_e, + /* Cull Type */ fopAc_CULLBOX_12_e, }; diff --git a/src/d/actor/d_a_npc_hr.cpp b/src/d/actor/d_a_npc_hr.cpp index 240809c49..faca2a180 100644 --- a/src/d/actor/d_a_npc_hr.cpp +++ b/src/d/actor/d_a_npc_hr.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_hr.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/res/res_hr.h" #include "d/d_snap.h" #include "d/d_kankyo_wether.h" @@ -249,7 +247,7 @@ static s16 daNpc_hr_XyCheckCB(void* i_this, int i_itemBtn) { /* 00000838-0000085C .text XyCheckCB__10daNpc_Hr_cFi */ s16 daNpc_Hr_c::XyCheckCB(int i_itemBtn) { - return dComIfGp_getSelectItem(i_itemBtn) == dItem_WIND_WAKER_e ? TRUE : FALSE; + return dComIfGp_getSelectItem(i_itemBtn) == dItemNo_WIND_WAKER_e ? TRUE : FALSE; } /* 0000085C-000008AC .text daNpc_hr_XyEventCB__FPvi */ @@ -463,7 +461,7 @@ BOOL daNpc_Hr_c::demoProcTact0() { if (dComIfGp_checkMesgCancelButton()) { setFlag(HR_FLAG_00000200); } else { - execItemGet(TACT_SONG1); + execItemGet(dItemNo_WINDS_REQUIEM_e); } dComIfGp_evmng_cutEnd(mStaffIdx); clrFlag(HR_FLAG_00000002); @@ -2088,7 +2086,7 @@ cPhs_State daNpc_Hr_c::_create() { if (state == cPhs_COMPLEATE_e) { fopAcM_ct_Demo(this, daNpc_Hr_c); switch(fopAcM_GetName(this)) { - case PROC_NPC_HR: + case fpcNm_NPC_HR_e: switch (getShapeType()) { case 1: mType = 1; @@ -2256,18 +2254,18 @@ static actor_method_class l_daNpc_Hr_Method = { }; actor_process_profile_definition g_profile_NPC_HR = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_HR, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_HR_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpc_Hr_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_HR, + /* Draw Prio */ fpcDwPi_NPC_HR_e, /* Actor SubMtd */ &l_daNpc_Hr_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_12_e, + /* Cull Type */ fopAc_CULLBOX_12_e, }; diff --git a/src/d/actor/d_a_npc_jb1.cpp b/src/d/actor/d_a_npc_jb1.cpp index 2ed49695b..0ab278a7e 100644 --- a/src/d/actor/d_a_npc_jb1.cpp +++ b/src/d/actor/d_a_npc_jb1.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_jb1.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/res/res_jb.h" class daNpc_Jb1_HIO_c : public JORReflexible{ @@ -713,18 +711,18 @@ static actor_method_class l_daNpc_Jb1_Method = { }; actor_process_profile_definition g_profile_NPC_JB1 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_JB1, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_JB1_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpc_Jb1_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_JB1, + /* Draw Prio */ fpcDwPi_NPC_JB1_e, /* Actor SubMtd */ &l_daNpc_Jb1_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_npc_ji1.cpp b/src/d/actor/d_a_npc_ji1.cpp index ad5174ee3..43a1eebb3 100644 --- a/src/d/actor/d_a_npc_ji1.cpp +++ b/src/d/actor/d_a_npc_ji1.cpp @@ -11,8 +11,6 @@ #include "d/d_s_play.h" #include "d/res/res_ji.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_snap.h" #include "d/d_lib.h" #include "f_op/f_op_msg.h" @@ -233,7 +231,7 @@ daNpc_Ji1_HIO_c::daNpc_Ji1_HIO_c() { /* 000003C0-000003E4 .text daNpc_Ji1_XyCheckCB__FPvi */ static s16 daNpc_Ji1_XyCheckCB(void*, int i_itemBtn) { - return dComIfGp_getSelectItem(i_itemBtn) == dItem_KNIGHTS_CREST_e ? TRUE : FALSE; + return dComIfGp_getSelectItem(i_itemBtn) == dItemNo_KNIGHTS_CREST_e ? TRUE : FALSE; } /* 000003E4-00000404 .text daJi1_CoHitCallback__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */ @@ -254,7 +252,7 @@ static void daJi1_TgHitCallback(fopAc_ac_c* i_this, dCcD_GObjInf*, fopAc_ac_c* a /* 00000424-000004A0 .text daJi1_AtHitCallback__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */ static void daJi1_AtHitCallback(fopAc_ac_c* i_this, dCcD_GObjInf* param_2, fopAc_ac_c* actor, dCcD_GObjInf*) { if(fopAc_IsActor(actor)) { - if(fpcM_GetName(actor) == PROC_PLAYER) { + if(fpcM_GetName(actor) == fpcNm_PLAYER_e) { if(!param_2->ChkAtShieldHit()) { static_cast(i_this)->field_0xC3C++; } @@ -1388,7 +1386,7 @@ BOOL daNpc_Ji1_c::speakBadAction(void*) { /* 00003F54-00004050 .text initPosObject__11daNpc_Ji1_cFPvPv */ void* daNpc_Ji1_c::initPosObject(void* pActor, void* pData) { - if(fopAc_IsActor(pActor) && fopAcM_GetName(pActor) == PROC_TSUBO) { + if(fopAc_IsActor(pActor) && fopAcM_GetName(pActor) == fpcNm_TSUBO_e) { ((daTsubo::Act_c*)pActor)->pos_init(); } @@ -1412,22 +1410,22 @@ void daNpc_Ji1_c::createItem() { u8 itemNo; if(field_0xD7C) { - itemNo = dItem_SWORD_e; + itemNo = dItemNo_SWORD_e; } else if(field_0xD7B == 1) { - itemNo = dItem_HURRICANE_SPIN_e; + itemNo = dItemNo_HURRICANE_SPIN_e; } else if(dComIfGs_getEventReg(dSv_event_flag_c::UNK_D003) == 1) { - itemNo = dItem_PURPLE_RUPEE_e; + itemNo = dItemNo_PURPLE_RUPEE_e; } else if(dComIfGs_getEventReg(dSv_event_flag_c::UNK_D003) == 2) { - itemNo = dItem_ORANGE_RUPEE_e; + itemNo = dItemNo_ORANGE_RUPEE_e; } else if(field_0xD70 >= l_HIO.field_0x60[3] && dComIfGs_isEventBit(dSv_event_flag_c::UNK_0F10)) { - itemNo = dItem_SILVER_RUPEE_e; + itemNo = dItemNo_SILVER_RUPEE_e; } else { - itemNo = dItem_HEART_PIECE_e; + itemNo = dItemNo_HEART_PIECE_e; dComIfGs_onEventBit(dSv_event_flag_c::UNK_0F10); } @@ -3993,15 +3991,15 @@ BOOL daNpc_Ji1_c::battleAction(void*) { if(field_0xC78 == 0) { u8 icon; switch(dComIfGs_getSelectEquip(0)) { - case dItem_SWORD_e: + case dItemNo_SWORD_e: icon = 1; break; icon = 2; break; - case dItem_MASTER_SWORD_2_e: + case dItemNo_MASTER_SWORD_2_e: icon = 2; break; - case dItem_MASTER_SWORD_1_e: + case dItemNo_MASTER_SWORD_1_e: default: icon = 2; break; @@ -5431,18 +5429,18 @@ static actor_method_class l_daNpc_Ji1_Method = { }; actor_process_profile_definition g_profile_NPC_JI1 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_JI1, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_JI1_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpc_Ji1_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_JI1, + /* Draw Prio */ fpcDwPi_NPC_JI1_e, /* Actor SubMtd */ &l_daNpc_Ji1_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ENEMY_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_kamome.cpp b/src/d/actor/d_a_npc_kamome.cpp index 2e287464f..48d84e4c8 100644 --- a/src/d/actor/d_a_npc_kamome.cpp +++ b/src/d/actor/d_a_npc_kamome.cpp @@ -7,8 +7,6 @@ #include "d/actor/d_a_npc_kamome.h" #include "d/res/res_kamome.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "m_Do/m_Do_hostIO.h" #include "d/d_item_data.h" #include "d/actor/d_a_player_main.h" @@ -123,7 +121,7 @@ static s16 daNpc_kam_XyCheckCB(void* i_this, int i_itemBtn) { /* 00000260-000002A4 .text XyCheckCB__11daNpc_kam_cFi */ s16 daNpc_kam_c::XyCheckCB(int i_itemBtn) { - if (dComIfGp_getSelectItem(i_itemBtn) == dItem_HYOI_PEAR_e) { + if (dComIfGp_getSelectItem(i_itemBtn) == dItemNo_HYOI_PEAR_e) { return callDemoStartCheck(); } else { return FALSE; @@ -1492,18 +1490,18 @@ static actor_method_class l_daNpc_kam_Method = { }; actor_process_profile_definition g_profile_NPC_KAM = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_KAM, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_KAM_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpc_kam_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_KAM, + /* Draw Prio */ fpcDwPi_NPC_KAM_e, /* Actor SubMtd */ &l_daNpc_kam_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLSPHERE_2_e, + /* Cull Type */ fopAc_CULLSPHERE_2_e, }; diff --git a/src/d/actor/d_a_npc_kf1.cpp b/src/d/actor/d_a_npc_kf1.cpp index 9d46f7c18..4250f4e78 100644 --- a/src/d/actor/d_a_npc_kf1.cpp +++ b/src/d/actor/d_a_npc_kf1.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_kf1.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 000000EC-00000150 .text __ct__15daNpc_Kf1_HIO_cFv */ daNpc_Kf1_HIO_c::daNpc_Kf1_HIO_c() { @@ -492,18 +490,18 @@ static actor_method_class l_daNpc_Kf1_Method = { }; actor_process_profile_definition g_profile_NPC_KF1 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_KF1, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_KF1_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpc_Kf1_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_KF1, + /* Draw Prio */ fpcDwPi_NPC_KF1_e, /* Actor SubMtd */ &l_daNpc_Kf1_Method, /* Status */ 0x08 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_kg1.cpp b/src/d/actor/d_a_npc_kg1.cpp index 76c5ced90..de3cd2a0e 100644 --- a/src/d/actor/d_a_npc_kg1.cpp +++ b/src/d/actor/d_a_npc_kg1.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_kg1.h" #include "d/d_lib.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" static dCcD_SrcCyl l_cyl_src = { @@ -185,18 +183,18 @@ static actor_method_class daNpc_Kg1MethodTable = { }; actor_process_profile_definition g_profile_NPC_KG1 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_KG1, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_KG1_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpc_Kg1_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_KG1, + /* Draw Prio */ fpcDwPi_NPC_KG1_e, /* Actor SubMtd */ &daNpc_Kg1MethodTable, /* Status */ 0x07 | fopAcStts_SHOWMAP_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_npc_kg2.cpp b/src/d/actor/d_a_npc_kg2.cpp index f5db151dc..280e21298 100644 --- a/src/d/actor/d_a_npc_kg2.cpp +++ b/src/d/actor/d_a_npc_kg2.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_kg2.h" #include "m_Do/m_Do_ext.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" static dCcD_SrcCyl l_cyl_src = { @@ -245,18 +243,18 @@ static actor_method_class l_daNpc_Kg2_Method = { }; actor_process_profile_definition g_profile_NPC_KG2 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_KG2, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_KG2_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpc_Kg2_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_KG2, + /* Draw Prio */ fpcDwPi_NPC_KG2_e, /* Actor SubMtd */ &l_daNpc_Kg2_Method, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_12_e, + /* Cull Type */ fopAc_CULLBOX_12_e, }; diff --git a/src/d/actor/d_a_npc_kk1.cpp b/src/d/actor/d_a_npc_kk1.cpp index 9111c21d6..57ba77155 100644 --- a/src/d/actor/d_a_npc_kk1.cpp +++ b/src/d/actor/d_a_npc_kk1.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_kk1.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 000000EC-00000150 .text __ct__15daNpc_Kk1_HIO_cFv */ daNpc_Kk1_HIO_c::daNpc_Kk1_HIO_c() { @@ -602,18 +600,18 @@ static actor_method_class l_daNpc_Kk1_Method = { }; actor_process_profile_definition g_profile_NPC_KK1 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_KK1, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_KK1_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpc_Kk1_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_KK1, + /* Draw Prio */ fpcDwPi_NPC_KK1_e, /* Actor SubMtd */ &l_daNpc_Kk1_Method, /* Status */ 0x08 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_km1.cpp b/src/d/actor/d_a_npc_km1.cpp index a0ad78cec..d19c208e6 100644 --- a/src/d/actor/d_a_npc_km1.cpp +++ b/src/d/actor/d_a_npc_km1.cpp @@ -8,8 +8,6 @@ #include "d/d_com_inf_game.h" #include "d/d_snap.h" #include "m_Do/m_Do_ext.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/res/res_km.h" class daNpc_Km1_HIO_c : public JORReflexible{ @@ -437,7 +435,7 @@ void daNpc_Km1_c::setAttention() { bool daNpc_Km1_c::decideType(int param_1) { field_0x7D3 = 0xFF; switch(fopAcM_GetName(this)){ - case PROC_NPC_KM1: + case fpcNm_NPC_KM1_e: field_0x7D3 = 0; field_0x7D4 = 0; break; @@ -820,18 +818,18 @@ static actor_method_class l_daNpc_Km1_Method = { }; actor_process_profile_definition g_profile_NPC_KM1 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_KM1, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_KM1_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpc_Km1_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_KM1, + /* Draw Prio */ fpcDwPi_NPC_KM1_e, /* Actor SubMtd */ &l_daNpc_Km1_Method, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_ko1.cpp b/src/d/actor/d_a_npc_ko1.cpp index 3faef5a3b..f98356b23 100644 --- a/src/d/actor/d_a_npc_ko1.cpp +++ b/src/d/actor/d_a_npc_ko1.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_ko1.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 000000EC-00000108 .text __ct__20daNpc_Ko1_childHIO_cFv */ daNpc_Ko1_childHIO_c::daNpc_Ko1_childHIO_c() { @@ -712,35 +710,35 @@ static actor_method_class l_daNpc_Ko1_Method = { }; actor_process_profile_definition g_profile_NPC_KO1 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_KO1, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_KO1_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpc_Ko1_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_KO1, + /* Draw Prio */ fpcDwPi_NPC_KO1_e, /* Actor SubMtd */ &l_daNpc_Ko1_Method, /* Status */ 0x07 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_NPC_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; actor_process_profile_definition g_profile_NPC_KO2 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_KO2, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_KO2_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpc_Ko1_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_KO2, + /* Draw Prio */ fpcDwPi_NPC_KO2_e, /* Actor SubMtd */ &l_daNpc_Ko1_Method, /* Status */ 0x07 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_NPC_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_kp1.cpp b/src/d/actor/d_a_npc_kp1.cpp index 912043210..fc3ba688a 100644 --- a/src/d/actor/d_a_npc_kp1.cpp +++ b/src/d/actor/d_a_npc_kp1.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_kp1.h" #include "m_Do/m_Do_ext.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 000000EC-00000150 .text __ct__15daNpc_Kp1_HIO_cFv */ daNpc_Kp1_HIO_c::daNpc_Kp1_HIO_c() { @@ -273,18 +271,18 @@ static actor_method_class l_daNpc_Kp1_Method = { }; actor_process_profile_definition g_profile_NPC_KP1 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_KP1, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_KP1_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpc_Kp1_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_KP1, + /* Draw Prio */ fpcDwPi_NPC_KP1_e, /* Actor SubMtd */ &l_daNpc_Kp1_Method, /* Status */ 0x08 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_ls1.cpp b/src/d/actor/d_a_npc_ls1.cpp index 35caf9653..e978f1ca8 100644 --- a/src/d/actor/d_a_npc_ls1.cpp +++ b/src/d/actor/d_a_npc_ls1.cpp @@ -14,8 +14,6 @@ #include "d/res/res_link.h" #include "d/res/res_ls.h" #include "SSystem/SComponent/c_counter.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_snap.h" #include "m_Do/m_Do_lib.h" @@ -223,7 +221,7 @@ void* searchActor_Bm1(void* i_actorP, void* i_unusedP) { if ( l_check_wrk < ARRAY_SSIZE(l_check_inf) && fopAc_IsActor(i_actorP) && - fpcM_GetName(i_actorP) == PROC_NPC_BM1 + fpcM_GetName(i_actorP) == fpcNm_NPC_BM1_e ) { l_check_inf[l_check_wrk] = (fopAc_ac_c*)i_actorP; l_check_wrk++; @@ -236,7 +234,7 @@ void* searchActor_Bm1(void* i_actorP, void* i_unusedP) { void* searchActor_kamome_Set_NOSTOP_DEMO(void* i_actorP, void* i_unusedP) { UNUSED(i_unusedP); - if (fopAc_IsActor(i_actorP) && fpcM_GetName(i_actorP) == PROC_KAMOME) { + if (fopAc_IsActor(i_actorP) && fpcM_GetName(i_actorP) == fpcNm_KAMOME_e) { fopAcM_OnStatus((fopAc_ac_c*)i_actorP, fopAcStts_UNK4000_e); } @@ -247,7 +245,7 @@ void* searchActor_kamome_Set_NOSTOP_DEMO(void* i_actorP, void* i_unusedP) { void* searchActor_kamome_Clr_NOSTOP_DEMO(void* i_actorP, void* i_unused) { UNUSED(i_unused); - if (fopAc_IsActor(i_actorP) && fpcM_GetName(i_actorP) == PROC_KAMOME) { + if (fopAc_IsActor(i_actorP) && fpcM_GetName(i_actorP) == fpcNm_KAMOME_e) { fopAcM_OffStatus((fopAc_ac_c*) i_actorP, fopAcStts_UNK4000_e); } @@ -917,15 +915,15 @@ u32 daNpc_Ls1_c::getMsg_LS1_0() { } - if (dComIfGp_getSelectItem(dItemBtn_X_e) == dItem_TELESCOPE_e) { + if (dComIfGp_getSelectItem(dItemBtn_X_e) == dItemNo_TELESCOPE_e) { return 0xBCB; } - if (dComIfGp_getSelectItem(dItemBtn_Y_e) == dItem_TELESCOPE_e) { + if (dComIfGp_getSelectItem(dItemBtn_Y_e) == dItemNo_TELESCOPE_e) { return 0xBCC; } - if (dComIfGp_getSelectItem(dItemBtn_Z_e) == dItem_TELESCOPE_e) { + if (dComIfGp_getSelectItem(dItemBtn_Z_e) == dItemNo_TELESCOPE_e) { return 0xBCD; } @@ -1896,7 +1894,7 @@ BOOL daNpc_Ls1_c::wait_action1(void* param_1) { if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_0001)) { setStt(3); } else { - if (dComIfGs_checkGetItem(dItem_TELESCOPE_e)) { + if (dComIfGs_checkGetItem(dItemNo_TELESCOPE_e)) { m7A0.y = current.angle.y; setStt(2); } else { @@ -2419,18 +2417,18 @@ static actor_method_class l_daNpc_Ls1_Method = { }; actor_process_profile_definition g_profile_NPC_LS1 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_LS1, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_LS1_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpc_Ls1_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_LS1, + /* Draw Prio */ fpcDwPi_NPC_LS1_e, /* Actor SubMtd */ &l_daNpc_Ls1_Method, /* Status */ 0x08 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_md.cpp b/src/d/actor/d_a_npc_md.cpp index e2f4a4bd1..8df4779ed 100644 --- a/src/d/actor/d_a_npc_md.cpp +++ b/src/d/actor/d_a_npc_md.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_md.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "d/d_item_data.h" #include "m_Do/m_Do_controller_pad.h" @@ -511,20 +509,20 @@ static s16 daNpc_Md_XyCheckCB(void* i_this, int param_1) { s16 daNpc_Md_c::XyCheckCB(int i_itemBtn) { u8 selectItemNo = dComIfGp_getSelectItem(i_itemBtn); if (isTypeSea()) { - if (selectItemNo == dItem_WIND_WAKER_e) { + if (selectItemNo == dItemNo_WIND_WAKER_e) { return TRUE; } - if (selectItemNo == dItem_GOLDEN_FEATHER_e) { + if (selectItemNo == dItemNo_GOLDEN_FEATHER_e) { if (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2E40) || (dComIfGs_isEventBit(dSv_event_flag_c::UNK_2E40) && isSeaTalk())) { return TRUE; } } } else if (isTypeM_Dai() || isTypeEdaichi()) { - if (selectItemNo == dItem_GOLDEN_FEATHER_e && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_3B80)) { + if (selectItemNo == dItemNo_GOLDEN_FEATHER_e && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_3B80)) { return TRUE; } } - if (selectItemNo == dItem_GOLDEN_FEATHER_e) { + if (selectItemNo == dItemNo_GOLDEN_FEATHER_e) { dComIfGs_onEventBit(dSv_event_flag_c::UNK_2C08); } return FALSE; @@ -538,10 +536,10 @@ static s16 daNpc_Md_XyEventCB(void* i_this, int param_1) { /* 0000081C-00000864 .text XyEventCB__10daNpc_Md_cFi */ s16 daNpc_Md_c::XyEventCB(int i_itemBtn) { u8 selectItemNo = dComIfGp_getSelectItem(i_itemBtn); - if (selectItemNo == dItem_WIND_WAKER_e) { + if (selectItemNo == dItemNo_WIND_WAKER_e) { offDefaultTalkXY(); return mEventIdxTable[5]; - } else if (selectItemNo == dItem_GOLDEN_FEATHER_e) { + } else if (selectItemNo == dItemNo_GOLDEN_FEATHER_e) { onDefaultTalkXY(); } return -1; @@ -6272,18 +6270,18 @@ static actor_method_class l_daNpc_Md_Method = { }; actor_process_profile_definition g_profile_NPC_MD = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_MD, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_MD_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpc_Md_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_MD, + /* Draw Prio */ fpcDwPi_NPC_MD_e, /* Actor SubMtd */ &l_daNpc_Md_Method, /* Status */ 0x08 | fopAcStts_SHOWMAP_e | fopAcStts_CULL_e | fopAcStts_FREEZE_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e | fopAcStts_UNK2000000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_npc_mk.cpp b/src/d/actor/d_a_npc_mk.cpp index ff5a39373..d538aeafc 100644 --- a/src/d/actor/d_a_npc_mk.cpp +++ b/src/d/actor/d_a_npc_mk.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_mk.h" #include "m_Do/m_Do_ext.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 00000078-00000230 .text nodeCallBack_Mk__FP7J3DNodei */ static BOOL nodeCallBack_Mk(J3DNode*, int) { @@ -338,18 +336,18 @@ static actor_method_class l_daNpc_Mk_Method = { }; actor_process_profile_definition g_profile_NPC_MK = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0006, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_MK, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0006, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_MK_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpc_Mk_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_MK, + /* Draw Prio */ fpcDwPi_NPC_MK_e, /* Actor SubMtd */ &l_daNpc_Mk_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_NPC_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_mn.cpp b/src/d/actor/d_a_npc_mn.cpp index c5ad541de..7b6bcf068 100644 --- a/src/d/actor/d_a_npc_mn.cpp +++ b/src/d/actor/d_a_npc_mn.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_mn.h" #include "m_Do/m_Do_ext.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 00000078-00000230 .text __ct__9daNpcMn_cFv */ daNpcMn_c::daNpcMn_c() { @@ -413,18 +411,18 @@ static actor_method_class daNpc_MnMethodTable = { }; actor_process_profile_definition g_profile_NPC_MN = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_MN, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_MN_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpcMn_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_MN, + /* Draw Prio */ fpcDwPi_NPC_MN_e, /* Actor SubMtd */ &daNpc_MnMethodTable, /* Status */ 0x07 | fopAcStts_SHOWMAP_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_mt.cpp b/src/d/actor/d_a_npc_mt.cpp index e677f529e..3d3aef516 100644 --- a/src/d/actor/d_a_npc_mt.cpp +++ b/src/d/actor/d_a_npc_mt.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_mt.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #define TOTAL_FIGURE_COUNT 0x86 @@ -328,18 +326,18 @@ static actor_method_class daNpc_MtMethodTable = { }; actor_process_profile_definition g_profile_NPC_MT = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_MT, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_MT_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpcMt_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_MT, + /* Draw Prio */ fpcDwPi_NPC_MT_e, /* Actor SubMtd */ &daNpc_MtMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_nz.cpp b/src/d/actor/d_a_npc_nz.cpp index 7567dffee..0ef8793a5 100644 --- a/src/d/actor/d_a_npc_nz.cpp +++ b/src/d/actor/d_a_npc_nz.cpp @@ -11,8 +11,6 @@ #include "d/d_com_inf_game.h" #include "d/d_lib.h" #include "d/d_item.h" -#include "d/d_procname.h" -#include "d/d_priority.h" class daNpc_Nz_HIO_c : public JORReflexible { public: @@ -232,7 +230,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(i_actor); - if(dComIfGp_getSelectItem(i_itemBtn) == dItem_BIRD_BAIT_5_e) { + if(dComIfGp_getSelectItem(i_itemBtn) == dItemNo_BIRD_BAIT_5_e) { f32 temp2 = l_HIO.field_0x20; daPy_py_c* player = daPy_getPlayerActorClass(); cXyz temp(player->current.pos); @@ -420,22 +418,22 @@ void daNpc_Nz_c::setMtx() { cXyz temp3 = temp + temp2; switch(field_0x908) { - case dItem_BIRD_BAIT_5_e: + case dItemNo_BIRD_BAIT_5_e: temp4 = -15.0f; break; - case dItem_HYOI_PEAR_e: + case dItemNo_HYOI_PEAR_e: temp4 = -5.0f; break; - case dItem_RED_POTION_e: - case dItem_BLUE_POTION_e: + case dItemNo_RED_POTION_e: + case dItemNo_BLUE_POTION_e: temp4 = -5.0f; break; - case dItem_BOMB_10_e: - case dItem_BOMB_30_e: + case dItemNo_BOMB_10_e: + case dItemNo_BOMB_30_e: temp4 = -15.0f; break; - case dItem_ARROW_10_e: - case dItem_ARROW_30_e: + case dItemNo_ARROW_10_e: + case dItemNo_ARROW_30_e: temp4 = -10.0f; break; } @@ -522,7 +520,7 @@ static u32 daNpcNz_getShopBoughtMsg(u8 itemNo) { return 0x3405; } - if((itemNo == dItem_RED_POTION_e || itemNo == dItem_BLUE_POTION_e) && !dComIfGs_checkEmptyBottle()) { + if((itemNo == dItemNo_RED_POTION_e || itemNo == dItemNo_BLUE_POTION_e) && !dComIfGs_checkEmptyBottle()) { return 0x3406; } @@ -534,7 +532,7 @@ static u32 daNpcNz_getShopBoughtMsg(u8 itemNo) { return 0x3407; } - if((itemNo == dItem_BIRD_BAIT_5_e || itemNo == dItem_HYOI_PEAR_e) && !dComIfGs_checkBaitItemEmpty()) { + if((itemNo == dItemNo_BIRD_BAIT_5_e || itemNo == dItemNo_HYOI_PEAR_e) && !dComIfGs_checkBaitItemEmpty()) { return 0x3407; } @@ -620,20 +618,20 @@ u16 daNpc_Nz_c::next_msgStatus(u32* pMsgNo) { const u8 itemArr1[4][2] = { { - dItem_BIRD_BAIT_5_e, - dItem_HYOI_PEAR_e, + dItemNo_BIRD_BAIT_5_e, + dItemNo_HYOI_PEAR_e, }, { - dItem_RED_POTION_e, - dItem_BLUE_POTION_e, + dItemNo_RED_POTION_e, + dItemNo_BLUE_POTION_e, }, { - dItem_BOMB_10_e, - dItem_BOMB_30_e, + dItemNo_BOMB_10_e, + dItemNo_BOMB_30_e, }, { - dItem_ARROW_10_e, - dItem_ARROW_30_e, + dItemNo_ARROW_10_e, + dItemNo_ARROW_30_e, }, }; @@ -646,10 +644,10 @@ u16 daNpc_Nz_c::next_msgStatus(u32* pMsgNo) { if(dComIfGs_checkGetBottle()) { temp += 1; } - if(dComIfGs_checkGetItem(dItem_BOMB_BAG_e)) { + if(dComIfGs_checkGetItem(dItemNo_BOMB_BAG_e)) { temp += 1; } - if(dComIfGs_getItem(dInvSlot_BOW_e) != dItem_NONE_e) { + if(dComIfGs_getItem(dInvSlot_BOW_e) != dItemNo_NONE_e) { temp += 1; } @@ -1009,18 +1007,18 @@ static actor_method_class daNpc_NzMethodTable = { }; actor_process_profile_definition g_profile_NPC_NZ = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_NZ, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_NZ_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpc_Nz_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_NZ, + /* Draw Prio */ fpcDwPi_NPC_NZ_e, /* Actor SubMtd */ &daNpc_NzMethodTable, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_4_e, + /* Cull Type */ fopAc_CULLBOX_4_e, }; diff --git a/src/d/actor/d_a_npc_nz_cut.inc b/src/d/actor/d_a_npc_nz_cut.inc index 4fb97dade..9255b2f58 100644 --- a/src/d/actor/d_a_npc_nz_cut.inc +++ b/src/d/actor/d_a_npc_nz_cut.inc @@ -7,7 +7,6 @@ #include "d/actor/d_a_obj_barrel.h" #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" /* 000032BC-000032E8 .text searchEsa_CB__FPvPv */ static BOOL searchEsa_CB(void* param_1, void* i_this) { @@ -16,7 +15,7 @@ static BOOL searchEsa_CB(void* param_1, void* i_this) { /* 000032E8-000034F0 .text _searchEsa__10daNpc_Nz_cFP10fopAc_ac_c */ BOOL daNpc_Nz_c::_searchEsa(fopAc_ac_c* pActor) { - if(fopAcM_GetName(pActor) == PROC_ESA) { + if(fopAcM_GetName(pActor) == fpcNm_ESA_e) { esa_class* pBait = static_cast(pActor); if(pBait->field_0x298 == 0) { cXyz delta = pBait->current.pos - current.pos; @@ -41,7 +40,7 @@ BOOL daNpc_Nz_c::_searchEsa(fopAc_ac_c* pActor) { static BOOL searchNzAndBomb_CB(void* param_1, void*) { fopAc_ac_c* pActor = static_cast(param_1); - if(fopAcM_GetName(pActor) == PROC_NZ || fopAcM_GetName(pActor) == PROC_BOMB) { + if(fopAcM_GetName(pActor) == fpcNm_NZ_e || fopAcM_GetName(pActor) == fpcNm_BOMB_e) { fopAcM_delete(pActor); } @@ -53,15 +52,15 @@ static BOOL searchTsuboAndBarrel_CB(void* param_1, void* param_2) { fopAc_ac_c* pActor1 = static_cast(param_1); daNpc_Nz_c* i_this = static_cast(param_2); - if(fopAcM_GetName(param_1) == PROC_TSUBO || fopAcM_GetName(param_1) == PROC_Obj_Barrel) { + if(fopAcM_GetName(param_1) == fpcNm_TSUBO_e || fopAcM_GetName(param_1) == fpcNm_Obj_Barrel_e) { cXyz delta = i_this->field_0x6C4 - pActor1->current.pos; if(delta.absXZ() < 300.0f) { bool success = false; - if(fopAcM_GetName(pActor1) == PROC_TSUBO) { + if(fopAcM_GetName(pActor1) == fpcNm_TSUBO_e) { success = static_cast(pActor1)->pos_init(); } - else if(fopAcM_GetName(pActor1) == PROC_TSUBO) { + else if(fopAcM_GetName(pActor1) == fpcNm_TSUBO_e) { success = static_cast(pActor1)->pos_init(); } @@ -76,7 +75,7 @@ static BOOL searchTsuboAndBarrel_CB(void* param_1, void* param_2) { /* 0000377C-00003908 .text searchEsaInit_CB__FPvPv */ static BOOL searchEsaInit_CB(void* pActor1, void* pActor2) { - if(fopAcM_GetName(pActor1) == PROC_ESA) { + if(fopAcM_GetName(pActor1) == fpcNm_ESA_e) { esa_class* pBait = static_cast(pActor1); daNpc_Nz_c* pNz = static_cast(pActor2); diff --git a/src/d/actor/d_a_npc_ob1.cpp b/src/d/actor/d_a_npc_ob1.cpp index 80d4eb188..64081469b 100644 --- a/src/d/actor/d_a_npc_ob1.cpp +++ b/src/d/actor/d_a_npc_ob1.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_ob1.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 000000EC-00000150 .text __ct__15daNpc_Ob1_HIO_cFv */ daNpc_Ob1_HIO_c::daNpc_Ob1_HIO_c() { @@ -407,18 +405,18 @@ static actor_method_class l_daNpc_Ob1_Method = { }; actor_process_profile_definition g_profile_NPC_OB1 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_OB1, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_OB1_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpc_Ob1_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_OB1, + /* Draw Prio */ fpcDwPi_NPC_OB1_e, /* Actor SubMtd */ &l_daNpc_Ob1_Method, /* Status */ 0x08 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_NPC_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_os.cpp b/src/d/actor/d_a_npc_os.cpp index f673140cb..96ef80eed 100644 --- a/src/d/actor/d_a_npc_os.cpp +++ b/src/d/actor/d_a_npc_os.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_os.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/actor/d_a_player_main.h" #include "d/actor/d_a_pedestal.h" #include "d/res/res_os.h" @@ -2491,18 +2489,18 @@ static actor_method_class l_daNpc_Os_Method = { }; actor_process_profile_definition g_profile_NPC_OS = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_OS, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_OS_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpc_Os_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_OS, + /* Draw Prio */ fpcDwPi_NPC_OS_e, /* Actor SubMtd */ &l_daNpc_Os_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_FREEZE_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e | fopAcStts_UNK2000000_e | fopAcStts_UNK8000000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_npc_p1.cpp b/src/d/actor/d_a_npc_p1.cpp index 1119f152d..980afaf7a 100644 --- a/src/d/actor/d_a_npc_p1.cpp +++ b/src/d/actor/d_a_npc_p1.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_p1.h" #include "m_Do/m_Do_ext.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" static dCcD_SrcCyl l_cyl_src = { @@ -231,18 +229,18 @@ static actor_method_class l_daNpc_P1_Method = { }; actor_process_profile_definition g_profile_NPC_P1 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_P1, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_P1_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpc_P1_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_P1, + /* Draw Prio */ fpcDwPi_NPC_P1_e, /* Actor SubMtd */ &l_daNpc_P1_Method, /* Status */ 0x07 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_npc_p2.cpp b/src/d/actor/d_a_npc_p2.cpp index 5f4107f77..81336983c 100644 --- a/src/d/actor/d_a_npc_p2.cpp +++ b/src/d/actor/d_a_npc_p2.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_p2.h" #include "m_Do/m_Do_ext.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 000000EC-0000020C .text __ct__19daNpc_P2_childHIO_cFv */ daNpc_P2_childHIO_c::daNpc_P2_childHIO_c() { @@ -503,18 +501,18 @@ static actor_method_class daNpc_P2MethodTable = { }; actor_process_profile_definition g_profile_NPC_P2 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_P2, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_P2_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpc_P2_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_P2, + /* Draw Prio */ fpcDwPi_NPC_P2_e, /* Actor SubMtd */ &daNpc_P2MethodTable, /* Status */ 0x07 | fopAcStts_SHOWMAP_e | fopAcStts_CULL_e | fopAcStts_FREEZE_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_npc_people.cpp b/src/d/actor/d_a_npc_people.cpp index ce3b36340..fcd11823c 100644 --- a/src/d/actor/d_a_npc_people.cpp +++ b/src/d/actor/d_a_npc_people.cpp @@ -9,8 +9,6 @@ #include "d/actor/d_a_player.h" #include "d/actor/d_a_ship.h" #include "d/actor/d_a_dai.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_com_lib_game.h" #include "d/d_com_inf_game.h" #include "d/d_camera.h" @@ -3433,10 +3431,10 @@ static u16 l_item_chk_sa3[] = { }; static int l_item_id_sa3[] = { - dItem_PURPLE_RUPEE_e, - dItem_PURPLE_RUPEE_e, - dItem_RED_RUPEE_e, - dItem_RED_RUPEE_e, + dItemNo_PURPLE_RUPEE_e, + dItemNo_PURPLE_RUPEE_e, + dItemNo_RED_RUPEE_e, + dItemNo_RED_RUPEE_e, }; static u32 l_msg_sa3_night[] = { @@ -3827,15 +3825,15 @@ static u32 l_msg_ug2_out_area[] = { static int l_get_item_no[] = { #if VERSION <= VERSION_JPN - dItem_ORANGE_RUPEE_e, + dItemNo_ORANGE_RUPEE_e, #else - dItem_HEART_PIECE_e, + dItemNo_HEART_PIECE_e, #endif - dItem_COLLECT_MAP_20_e, - dItem_COLLECT_MAP_16_e, - dItem_HEART_PIECE_e, - dItem_HEART_PIECE_e, - dItem_COLLECT_MAP_15_e, + dItemNo_COLLECT_MAP_20_e, + dItemNo_COLLECT_MAP_16_e, + dItemNo_HEART_PIECE_e, + dItemNo_HEART_PIECE_e, + dItemNo_COLLECT_MAP_15_e, }; struct PsoData { @@ -4238,7 +4236,7 @@ static cPhs_State phase_1(daNpcPeople_c* i_this) { switch(i_this->getNpcNo()) { case 0x6: if(strcmp(dComIfGp_getStartStageName(), "Ocmera") == 0) { - if(dComIfGs_checkGetItem(dItem_COLLECT_MAP_20_e) || arg0 != dComIfGp_getStartStagePoint()) { + if(dComIfGs_checkGetItem(dItemNo_COLLECT_MAP_20_e) || arg0 != dComIfGp_getStartStagePoint()) { return cPhs_STOP_e; } @@ -4554,7 +4552,7 @@ cPhs_State 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(dItem_COLLECT_MAP_15_e); + dComIfGs_checkGetItem(dItemNo_COLLECT_MAP_15_e); } m79D = mpNpcDat->field_0x5A; @@ -4791,7 +4789,7 @@ bool daNpcPeople_c::_execute() { break; case 0xB: - if(!dComIfGs_checkGetItem(dItem_COLLECT_MAP_15_e) && (mAnmFlag & 0x3)) { + if(!dComIfGs_checkGetItem(dItemNo_COLLECT_MAP_15_e) && (mAnmFlag & 0x3)) { mAnmFlag &= ~0x3; u8 rand = getRand(8); if(rand == m794) { @@ -4984,7 +4982,7 @@ void daNpcPeople_c::executeWait() { m7A6 = 5; break; case 0xB: - if(mbIsNight && (!dComIfGs_isEventBit(dSv_event_flag_c::ENDLESS_NIGHT) || dComIfGs_checkGetItem(dItem_PEARL_NAYRU_e))) { + if(mbIsNight && (!dComIfGs_isEventBit(dSv_event_flag_c::ENDLESS_NIGHT) || dComIfGs_checkGetItem(dItemNo_PEARL_NAYRU_e))) { if(dComIfGp_checkPlayerStatus0(0, daPyStts0_TELESCOPE_LOOK_e)) { m748 = (s16)(mpNpcDat->field_0x28 * 2.0f); } @@ -5287,7 +5285,7 @@ void daNpcPeople_c::executeFurue() { /* 00002EC4-00002F80 .text executeKyoroInit__13daNpcPeople_cFv */ s32 daNpcPeople_c::executeKyoroInit() { fopAc_ac_c* mailbox; - if (fopAcM_SearchByName(PROC_OBJ_TORIPOST, &mailbox) == true && mailbox != NULL) { + if (fopAcM_SearchByName(fpcNm_OBJ_TORIPOST_e, &mailbox) == true && mailbox != NULL) { dNpc_calc_DisXZ_AngY(current.pos, mailbox->current.pos, NULL, &m77A); } @@ -5491,7 +5489,7 @@ void daNpcPeople_c::executeUgWalk() { if(mCyl.ChkCoHit()) { daNpcPeople_c* pActor = (daNpcPeople_c*)mCyl.GetCoHitAc(); - if(pActor && fopAcM_GetProfName(pActor) == PROC_NPC_PEOPLE) { + if(pActor && fopAcM_GetProfName(pActor) == fpcNm_NPC_PEOPLE_e) { u8 type = pActor->getNpcNo(); if((mNpcType == 0x11 && type == 0x12) || (mNpcType == 0x12 && type == 0x11)) { pActor->setEtcFlag(0x60000); @@ -5504,7 +5502,7 @@ void daNpcPeople_c::executeUgWalk() { else { if(mCyl.ChkCoHit()) { fopAc_ac_c* pActor = mCyl.GetCoHitAc(); - if(pActor && fopAcM_GetProfName(pActor) == PROC_PLAYER) { + if(pActor && fopAcM_GetProfName(pActor) == fpcNm_PLAYER_e) { diff = (pActor->current.pos - home.pos); diff.y = 0.0f; if(temp2 > diff.abs()) { @@ -5951,16 +5949,16 @@ void daNpcPeople_c::eventMesSetInit(int staffIdx) { mEtcFlag |= 0x800; dComIfGs_onTmpBit(dSv_event_tmp_flag_c::UNK_0208); - if(!dComIfGs_checkGetItem(NORMAL_SAIL)) { + if(!dComIfGs_checkGetItem(dItemNo_SAIL_e)) { setMessage(0x3594); } else if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_0B80)) { setMessage(0x3595); } - else if(!dComIfGs_checkGetItem(dItem_MAGIC_ARMOR_e)) { + else if(!dComIfGs_checkGetItem(dItemNo_MAGIC_ARMOR_e)) { setMessage(0x3596); } - else if(!dComIfGs_checkGetItem(CAMERA2)) { + else if(!dComIfGs_checkGetItem(dItemNo_DELUXE_PICTO_BOX_e)) { setMessage(0x3597); } else if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_1C08)) { @@ -6053,7 +6051,7 @@ void daNpcPeople_c::eventUb1TalkInit(int) { m73C = l_msg_ub1_1st_talk; dComIfGs_onEventBit(dSv_event_flag_c::UNK_0A40); } - else if(!dComIfGs_checkGetItem(CAMERA) && !dComIfGs_checkGetItem(CAMERA2)) { + else if(!dComIfGs_checkGetItem(dItemNo_PICTO_BOX_e) && !dComIfGs_checkGetItem(dItemNo_DELUXE_PICTO_BOX_e)) { m73C = l_msg_ub1_no_camera; } else { @@ -6648,7 +6646,7 @@ u16 daNpcPeople_c::next_msgStatus(u32* pMsgNo) { break; case 0x11: if(mpCurrMsg->mSelectNum == 0) { - if(dComIfGs_checkGetItemNum(dItem_SKULL_NECKLACE_e) < 3) { + if(dComIfGs_checkGetItemNum(dItemNo_SKULL_NECKLACE_e) < 3) { m734 = l_msg_xy_sa5_yes_ng; } else { @@ -6751,7 +6749,7 @@ u32 daNpcPeople_c::getMsg() { else if(!isColor()) { m734 = l_msg_xy_ub4_no_color; } - else if(!dComIfGs_checkGetItem(dItem_COLLECT_MAP_16_e)) { + else if(!dComIfGs_checkGetItem(dItemNo_COLLECT_MAP_16_e)) { m734 = l_msg_xy_ub4_get_item; #if VERSION > VERSION_JPN dComIfGs_onEventBit(dSv_event_flag_c::UNK_2504); @@ -6821,7 +6819,7 @@ u32 daNpcPeople_c::getMsg() { msgNo = 0x2D63; break; case 0x10: - if(itemNo != dItem_SKULL_NECKLACE_e) { + if(itemNo != dItemNo_SKULL_NECKLACE_e) { m734 = l_msg_xy_sa5_no_skull_necklace; } else if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2620)) { @@ -6838,7 +6836,7 @@ u32 daNpcPeople_c::getMsg() { cXyz diff; switch(mNpcType) { case 0: - if(!dComIfGs_checkGetItem(dItem_DELIVERY_BAG_e)) { + if(!dComIfGs_checkGetItem(dItemNo_DELIVERY_BAG_e)) { if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2501)) { dComIfGs_onEventBit(dSv_event_flag_c::UNK_2501); m734 = l_msg_uo1_1st_haitatu; @@ -6922,7 +6920,7 @@ u32 daNpcPeople_c::getMsg() { if(temp <= 500.0f) { m734 = l_msg_ub3_ship_near5; } - else if(dComIfGs_checkGetItem(dItem_WIND_WAKER_e)) { + else if(dComIfGs_checkGetItem(dItemNo_WIND_WAKER_e)) { m734 = l_msg_ub3_tact; } else { @@ -6942,7 +6940,7 @@ u32 daNpcPeople_c::getMsg() { else if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_2504)) { m734 = l_msg_ub4_color_photo; } - else if(!dComIfGs_checkGetItem(CAMERA) && !dComIfGs_checkGetItem(CAMERA2)) { + else if(!dComIfGs_checkGetItem(dItemNo_PICTO_BOX_e) && !dComIfGs_checkGetItem(dItemNo_DELUXE_PICTO_BOX_e)) { m734 = l_msg_ub4_no_photo_box; } else { @@ -6951,7 +6949,7 @@ u32 daNpcPeople_c::getMsg() { break; case 7: - if(dComIfGs_isEventBit(dSv_event_flag_c::ENDLESS_NIGHT) && !dComIfGs_checkGetItem(dItem_PEARL_NAYRU_e)) { + if(dComIfGs_isEventBit(dSv_event_flag_c::ENDLESS_NIGHT) && !dComIfGs_checkGetItem(dItemNo_PEARL_NAYRU_e)) { msgNo = 0x2DC9; } else if(!mbIsNight) { @@ -6967,8 +6965,8 @@ u32 daNpcPeople_c::getMsg() { m734 = l_msg_uw1_1st_talk_night; dComIfGs_onEventBit(dSv_event_flag_c::UNK_1E10); } - else if(dComIfGs_checkGetItem(dItem_DELIVERY_BAG_e)) { - if(dComIfGs_checkGetItem(dItem_MAGIC_ARMOR_e)) { + else if(dComIfGs_checkGetItem(dItemNo_DELIVERY_BAG_e)) { + if(dComIfGs_checkGetItem(dItemNo_MAGIC_ARMOR_e)) { m734 = l_msg_uw1_magic_shield; } else { @@ -7019,7 +7017,7 @@ u32 daNpcPeople_c::getMsg() { break; case 9: - if(dComIfGs_isEventBit(dSv_event_flag_c::ENDLESS_NIGHT) && !dComIfGs_checkGetItem(dItem_PEARL_NAYRU_e)) { + if(dComIfGs_isEventBit(dSv_event_flag_c::ENDLESS_NIGHT) && !dComIfGs_checkGetItem(dItemNo_PEARL_NAYRU_e)) { msgNo = 0x2FBD; } else if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2104)) { @@ -7089,11 +7087,11 @@ u32 daNpcPeople_c::getMsg() { break; case 0xB: - if(dComIfGs_isEventBit(dSv_event_flag_c::ENDLESS_NIGHT) && !dComIfGs_checkGetItem(dItem_PEARL_NAYRU_e)) { + if(dComIfGs_isEventBit(dSv_event_flag_c::ENDLESS_NIGHT) && !dComIfGs_checkGetItem(dItemNo_PEARL_NAYRU_e)) { msgNo = 0x347B; } else if(!mbIsNight) { - if(!dComIfGs_checkGetItem(NORMAL_SAIL)) { + if(!dComIfGs_checkGetItem(dItemNo_SAIL_e)) { m734 = l_msg_um3_not_sail; } else if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2340)) { @@ -7103,7 +7101,7 @@ u32 daNpcPeople_c::getMsg() { else if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2310)) { m734 = l_msg_um3_no_nazo_talk; } - else if(dComIfGs_checkGetItem(dItem_COLLECT_MAP_15_e)) { + else if(dComIfGs_checkGetItem(dItemNo_COLLECT_MAP_15_e)) { m734 = l_msg_um3_map15; } else { @@ -7117,7 +7115,7 @@ u32 daNpcPeople_c::getMsg() { else if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2308)) { m734 = l_msg_um3_no_look_moon; } - else if(dComIfGs_checkGetItem(dItem_COLLECT_MAP_15_e) && dComIfGs_isEventBit(dSv_event_flag_c::UNK_2280)) { + else if(dComIfGs_checkGetItem(dItemNo_COLLECT_MAP_15_e) && dComIfGs_isEventBit(dSv_event_flag_c::UNK_2280)) { m734 = l_msg_um3_map15_n; } else { @@ -7126,7 +7124,7 @@ u32 daNpcPeople_c::getMsg() { break; case 0xC: - if(dComIfGs_isEventBit(dSv_event_flag_c::ENDLESS_NIGHT) && !dComIfGs_checkGetItem(dItem_PEARL_NAYRU_e)) { + if(dComIfGs_isEventBit(dSv_event_flag_c::ENDLESS_NIGHT) && !dComIfGs_checkGetItem(dItemNo_PEARL_NAYRU_e)) { msgNo = 0x2E82; } else if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2304)) { @@ -7160,11 +7158,11 @@ u32 daNpcPeople_c::getMsg() { break; case 0xE: - if(dComIfGs_isEventBit(dSv_event_flag_c::ENDLESS_NIGHT) && !dComIfGs_checkGetItem(dItem_PEARL_NAYRU_e)) { + if(dComIfGs_isEventBit(dSv_event_flag_c::ENDLESS_NIGHT) && !dComIfGs_checkGetItem(dItemNo_PEARL_NAYRU_e)) { msgNo = 0x30E4; } else if(!mbIsNight) { - if(!dComIfGs_checkGetItem(NORMAL_SAIL)) { + if(!dComIfGs_checkGetItem(dItemNo_SAIL_e)) { m734 = l_msg_sa3_not_sail; } else if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2301)) { @@ -7181,11 +7179,11 @@ u32 daNpcPeople_c::getMsg() { break; case 0xF: - if(dComIfGs_isEventBit(dSv_event_flag_c::ENDLESS_NIGHT) && !dComIfGs_checkGetItem(dItem_PEARL_NAYRU_e)) { + if(dComIfGs_isEventBit(dSv_event_flag_c::ENDLESS_NIGHT) && !dComIfGs_checkGetItem(dItemNo_PEARL_NAYRU_e)) { msgNo = 0x321E; } else if(!mbIsNight) { - if(!dComIfGs_checkGetItem(NORMAL_SAIL)) { + if(!dComIfGs_checkGetItem(dItemNo_SAIL_e)) { m734 = l_msg_sa4_not_sail; } else if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_2480)) { @@ -7202,7 +7200,7 @@ u32 daNpcPeople_c::getMsg() { break; case 0x10: - if(dComIfGs_isEventBit(dSv_event_flag_c::ENDLESS_NIGHT) && !dComIfGs_checkGetItem(dItem_PEARL_NAYRU_e)) { + if(dComIfGs_isEventBit(dSv_event_flag_c::ENDLESS_NIGHT) && !dComIfGs_checkGetItem(dItemNo_PEARL_NAYRU_e)) { msgNo = 0x3299; } else if(!mbIsNight) { @@ -7927,7 +7925,7 @@ void daNpcPeople_c::setWaitAnm() { if(mNpcType == 5 && m789 != 0) { setAnmTbl(l_npc_anm_wait, 0); } - else if(mNpcType == 0xB && !mbIsNight && dComIfGs_checkGetItem(dItem_COLLECT_MAP_15_e)) { + else if(mNpcType == 0xB && !mbIsNight && dComIfGs_checkGetItem(dItemNo_COLLECT_MAP_15_e)) { setAnmTbl(l_npc_anm_um3_wait3, 1); } else if(mNpcType == 8 && m793 == 1) { @@ -7956,13 +7954,13 @@ s16 daNpcPeople_c::XyCheckCB(int i_itemBtn) { return true; } - if(itemNo == dItem_JOY_PENDANT_e) { + if(itemNo == dItemNo_JOY_PENDANT_e) { return true; } break; case 0x5: - if(itemNo == dItem_JOY_PENDANT_e) { + if(itemNo == dItemNo_JOY_PENDANT_e) { return true; } @@ -7972,13 +7970,13 @@ s16 daNpcPeople_c::XyCheckCB(int i_itemBtn) { return true; } - if(itemNo == dItem_JOY_PENDANT_e) { + if(itemNo == dItemNo_JOY_PENDANT_e) { return true; } break; case 0xB: - if(!mbIsNight && isPhoto(itemNo) && dComIfGs_isEventBit(dSv_event_flag_c::UNK_2310) && !dComIfGs_checkGetItem(dItem_COLLECT_MAP_15_e)) { + if(!mbIsNight && isPhoto(itemNo) && dComIfGs_isEventBit(dSv_event_flag_c::UNK_2310) && !dComIfGs_checkGetItem(dItemNo_COLLECT_MAP_15_e)) { return true; } @@ -8014,7 +8012,7 @@ s16 daNpcPeople_c::XyEventCB(int i_itemBtn) { switch(mNpcType) { case 0x3: case 0x4: - if(itemNo != dItem_JOY_PENDANT_e) { + if(itemNo != dItemNo_JOY_PENDANT_e) { ret = m766[1]; m79C = 0; @@ -8025,7 +8023,7 @@ s16 daNpcPeople_c::XyEventCB(int i_itemBtn) { break; case 0x10: - if(itemNo == dItem_SKULL_NECKLACE_e) { + if(itemNo == dItemNo_SKULL_NECKLACE_e) { ret = m766[0]; m79C = 0; @@ -8223,7 +8221,7 @@ BOOL daNpcPeople_c::chkEndEvent() { /* 000090D0-00009100 .text is1GetMap20__13daNpcPeople_cFv */ BOOL daNpcPeople_c::is1GetMap20() { - return dComIfGs_checkGetItem(dItem_COLLECT_MAP_20_e) ? TRUE : FALSE; + return dComIfGs_checkGetItem(dItemNo_COLLECT_MAP_20_e) ? TRUE : FALSE; } /* 00009100-00009144 .text is1DayGetMap20__13daNpcPeople_cFv */ @@ -8471,18 +8469,18 @@ static actor_method_class daNpc_PeopleMethodTable = { }; actor_process_profile_definition g_profile_NPC_PEOPLE = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_PEOPLE, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_PEOPLE_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpcPeople_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_PEOPLE, + /* Draw Prio */ fpcDwPi_NPC_PEOPLE_e, /* Actor SubMtd */ &daNpc_PeopleMethodTable, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_pf1.cpp b/src/d/actor/d_a_npc_pf1.cpp index 568f2ef64..4977768ef 100644 --- a/src/d/actor/d_a_npc_pf1.cpp +++ b/src/d/actor/d_a_npc_pf1.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_pf1.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 000000EC-00000150 .text __ct__15daNpc_Pf1_HIO_cFv */ daNpc_Pf1_HIO_c::daNpc_Pf1_HIO_c() { @@ -372,18 +370,18 @@ static actor_method_class l_daNpc_Pf1_Method = { }; actor_process_profile_definition g_profile_NPC_PF1 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_PF1, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_PF1_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpc_Pf1_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_PF1, + /* Draw Prio */ fpcDwPi_NPC_PF1_e, /* Actor SubMtd */ &l_daNpc_Pf1_Method, /* Status */ 0x08 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_photo.cpp b/src/d/actor/d_a_npc_photo.cpp index c0acf6247..cbd725f0e 100644 --- a/src/d/actor/d_a_npc_photo.cpp +++ b/src/d/actor/d_a_npc_photo.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_photo.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_com_lib_game.h" #include "d/d_com_inf_game.h" #include "d/d_a_obj.h" @@ -619,11 +617,11 @@ static cPhs_State phase_1(daNpcPhoto_c* i_this) { s16 arg0 = i_this->getPrmArg0(); if(arg0 != 255){ if(arg0 == 0){ - if(!dComIfGs_checkGetItem(dItem_COLLECT_MAP_20_e) && arg0 != dComIfGp_getStartStagePoint()){ + if(!dComIfGs_checkGetItem(dItemNo_COLLECT_MAP_20_e) && arg0 != dComIfGp_getStartStagePoint()){ return cPhs_STOP_e; } } else{ - if(dComIfGs_checkGetItem(dItem_COLLECT_MAP_20_e) || arg0 != dComIfGp_getStartStagePoint()) { + if(dComIfGs_checkGetItem(dItemNo_COLLECT_MAP_20_e) || arg0 != dComIfGp_getStartStagePoint()) { return cPhs_STOP_e; } i_this->field_0x9C1 = 4; @@ -967,7 +965,7 @@ void daNpcPhoto_c::executeWait() { if(mCyl.ChkCoHit()) { daNpcPhoto_c* pActor = (daNpcPhoto_c*)mCyl.GetCoHitAc(); - if(pActor && fopAcM_GetProfName(pActor) == PROC_PLAYER) { + if(pActor && fopAcM_GetProfName(pActor) == fpcNm_PLAYER_e) { field_0x9BE = 2; } @@ -994,7 +992,7 @@ void daNpcPhoto_c::executeWait() { for (int i = 0; i < 2; i++) { if (field_0x6F8[i].ChkCoHit()) { daNpcPhoto_c* pActor = (daNpcPhoto_c*)field_0x6F8[i].GetCoHitAc(); - if(pActor != NULL && fopAcM_GetProfName(pActor) == PROC_PLAYER) { + if(pActor != NULL && fopAcM_GetProfName(pActor) == fpcNm_PLAYER_e) { field_0x9CD = true; break; } @@ -1746,19 +1744,19 @@ u32 daNpcPhoto_c::getMsg() { } else if(dComIfGp_event_chkTalkXY()) { u32 itemNo = dComIfGp_event_getPreItemNo(); - if(itemNo == CAMERA2 && dComIfGs_isTmpBit(dSv_event_tmp_flag_c::UNK_0302)) { + if(itemNo == dItemNo_DELUXE_PICTO_BOX_e && dComIfGs_isTmpBit(dSv_event_tmp_flag_c::UNK_0302)) { if (dComIfGs_getPictureNum() < 3) { field_0x980 = l_msg_xy_buy_photo; - mItemNo = SALVAGE_ITEM1; + mItemNo = dItemNo_LEGENDARY_PICTOGRAPH_e; } else { msgNo = 0x3787; } - } else if(itemNo == dItem_FIREFLY_BOTTLE_e) { - if(eventReg >= 6 && !dComIfGs_checkGetItem(CAMERA2)) { + } else if(itemNo == dItemNo_FIREFLY_BOTTLE_e) { + if(eventReg >= 6 && !dComIfGs_checkGetItem(dItemNo_DELUXE_PICTO_BOX_e)) { field_0x980 = l_msg_color_xy; field_0x9D0 = 0; dComIfGs_setEquipBottleItemEmpty(); - mItemNo = CAMERA2; + mItemNo = dItemNo_DELUXE_PICTO_BOX_e; } else{ msgNo = 0x2A57; } @@ -1775,7 +1773,7 @@ u32 daNpcPhoto_c::getMsg() { if(field_0x9C1 == 1) { msgNo = mMsgNno; } else { - if(dComIfGs_checkGetItem(CAMERA2)) { + if(dComIfGs_checkGetItem(dItemNo_DELUXE_PICTO_BOX_e)) { if(dComIfGs_isTmpBit(dSv_event_tmp_flag_c::UNK_0301)) { field_0x980 = (u32*)l_msg_buy_photo; field_0x9D0 = 0; @@ -1831,7 +1829,7 @@ u32 daNpcPhoto_c::getMsg() { } } } - } else if(dComIfGs_checkGetItem(CAMERA) || dComIfGs_checkGetItem(CAMERA2)) { + } else if(dComIfGs_checkGetItem(dItemNo_PICTO_BOX_e) || dComIfGs_checkGetItem(dItemNo_DELUXE_PICTO_BOX_e)) { if(!dComIfGs_isEventBit(l_save_dat.field_0x02)) { field_0x980 = l_msg_1st_photo; field_0x9D0 = 0; @@ -2146,7 +2144,7 @@ s16 daNpcPhoto_c::XyCheckCB(int i_itemBtn) { s16 daNpcPhoto_c::XyEventCB(int i_itemBtn) { s16 eventIdx; u8 itemNo = dComIfGp_getSelectItem(i_itemBtn); - if(itemNo == CAMERA2 && dComIfGs_isTmpBit(dSv_event_tmp_flag_c::UNK_0302)){ + if(itemNo == dItemNo_DELUXE_PICTO_BOX_e && dComIfGs_isTmpBit(dSv_event_tmp_flag_c::UNK_0302)){ if(dComIfGs_getPictureNum() < 3){ eventIdx = mPhotoGetPhotoEventIdx; field_0x9C7 = false; @@ -2154,7 +2152,7 @@ s16 daNpcPhoto_c::XyEventCB(int i_itemBtn) { return dComIfGp_evmng_getEventIdx("DEFAULT_TALK_XY",0xff); } } else { - if(itemNo == dItem_FIREFLY_BOTTLE_e && dComIfGs_getEventReg(l_save_dat.field_0x06) >= 6 && !dComIfGs_checkGetItem(CAMERA2)){ + if(itemNo == dItemNo_FIREFLY_BOTTLE_e && dComIfGs_getEventReg(l_save_dat.field_0x06) >= 6 && !dComIfGs_checkGetItem(dItemNo_DELUXE_PICTO_BOX_e)){ eventIdx = mPhotoGetItem2EventIdx; field_0x9C7 = false; } else { @@ -2273,18 +2271,18 @@ static actor_method_class daNpc_PhotoMethodTable = { }; actor_process_profile_definition g_profile_NPC_PHOTO = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_PHOTO, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_PHOTO_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpcPhoto_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_PHOTO, + /* Draw Prio */ fpcDwPi_NPC_PHOTO_e, /* Actor SubMtd */ &daNpc_PhotoMethodTable, /* Status */ 0x07 | fopAcStts_SHOWMAP_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_npc_pm1.cpp b/src/d/actor/d_a_npc_pm1.cpp index 4fe0ba767..4796b7fa5 100644 --- a/src/d/actor/d_a_npc_pm1.cpp +++ b/src/d/actor/d_a_npc_pm1.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_pm1.h" #include "m_Do/m_Do_ext.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 000000EC-00000144 .text __ct__15daNpc_Pm1_HIO_cFv */ daNpc_Pm1_HIO_c::daNpc_Pm1_HIO_c() { @@ -258,18 +256,18 @@ static actor_method_class l_daNpc_Pm1_Method = { }; actor_process_profile_definition g_profile_NPC_PM1 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_PM1, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_PM1_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpc_Pm1_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_PM1, + /* Draw Prio */ fpcDwPi_NPC_PM1_e, /* Actor SubMtd */ &l_daNpc_Pm1_Method, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_roten.cpp b/src/d/actor/d_a_npc_roten.cpp index 5e9768b65..69734f15c 100644 --- a/src/d/actor/d_a_npc_roten.cpp +++ b/src/d/actor/d_a_npc_roten.cpp @@ -9,8 +9,6 @@ #include "m_Do/m_Do_ext.h" #include "d/actor/d_a_player_main.h" #include "d/actor/d_a_demo_item.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "d/d_com_lib_game.h" #include "d/d_a_obj.h" @@ -1369,7 +1367,7 @@ static u32 l_msg_try_force[] = { }; static u32 l_get_item_no[] = { - dItem_HEART_PIECE_e, + dItemNo_HEART_PIECE_e, }; static dCcD_SrcSph l_sph_src = { @@ -2321,7 +2319,7 @@ void daNpcRoten_c::eventSetItemInit() { cXyz pos(0.0f, 0.0f, 0.0f); field_0x6F8 = fopAcM_createItemForPresentDemo( &pos, - (u8)(itemIdx + FLOWER_1), + (u8)(itemIdx + dItemNo_TOWN_FLOWER_e), daDitem_c::FLAG_UNK01 | daDitem_c::FLAG_UNK08, -1, fopAcM_GetRoomNo(this) @@ -2369,7 +2367,7 @@ void daNpcRoten_c::eventGetItemInit(int staffIdx) { u32 itemIdx = temp; // fakematch? dComIfGs_onGetItemReserve(temp); - u8 itemNo = FLOWER_1; + u8 itemNo = dItemNo_TOWN_FLOWER_e; itemNo += itemIdx; // fakematch? pcId = fopAcM_createItemForPresentDemo(¤t.pos, itemNo, daDitem_c::FLAG_UNK01, -1, fopAcM_GetRoomNo(this)); } @@ -2445,7 +2443,7 @@ u16 daNpcRoten_c::next_msgStatus(u32* pMsgNo) { *pMsgNo = l_msg_xy_koukan_first[mNpcNo]; } - dComIfGs_setReserveItemChange(mShownItemBtn, temp + FLOWER_1); + dComIfGs_setReserveItemChange(mShownItemBtn, temp + dItemNo_TOWN_FLOWER_e); field_0x98C = NULL; break; } @@ -2511,7 +2509,7 @@ u32 daNpcRoten_c::getMsg() { field_0x98C = l_msg_xy_invalid_item[mNpcNo]; } else { - field_0x9BE = itemNo - FLOWER_1; + field_0x9BE = itemNo - dItemNo_TOWN_FLOWER_e; field_0x98C = l_msg_xy_koukan_item[mNpcNo][field_0x9BE]; dComIfGs_onEventBit(l_save_dat[mNpcNo].field_0x06); } @@ -2814,17 +2812,17 @@ bool daNpcRoten_c::setAnmTbl(sRotenAnmDat* param_1) { /* 00003A80-00003AA4 .text isHaitatuItem__12daNpcRoten_cFUc */ BOOL daNpcRoten_c::isHaitatuItem(u8 itemNo) { - return FLOWER_1 <= itemNo && itemNo <= XXX_039; + return dItemNo_TOWN_FLOWER_e <= itemNo && itemNo <= dItemNo_XXX_039_e; } /* 00003AA4-00003AC8 .text isKoukanItem__12daNpcRoten_cFUc */ BOOL daNpcRoten_c::isKoukanItem(u8 itemNo) { - return FLOWER_1 <= itemNo && itemNo <= PRESIDENT_STATUE; + return dItemNo_TOWN_FLOWER_e <= itemNo && itemNo <= dItemNo_SHOP_GURU_STATUE_e; } /* 00003AC8-00003B30 .text isGetMap__12daNpcRoten_cFUc */ BOOL daNpcRoten_c::isGetMap(u8 itemNo) { - if(mNpcNo == 1 && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_3E04) && itemNo == PRESIDENT_STATUE) { + if(mNpcNo == 1 && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_3E04) && itemNo == dItemNo_SHOP_GURU_STATUE_e) { return true; } @@ -2836,7 +2834,7 @@ s16 daNpcRoten_c::XyEventCB(int i_itemBtn) { s16 eventIdx; u8 itemNo = dComIfGp_getSelectItem(i_itemBtn); - field_0x9BE = itemNo - FLOWER_1; + field_0x9BE = itemNo - dItemNo_TOWN_FLOWER_e; if(isKoukanItem(itemNo) && dComIfGs_getEventReg(l_save_dat[mNpcNo].field_0x02) < 3 && !isGetMap(itemNo)) { if(dComIfGp_event_getTalkXYBtn() == dTalkBtn_X_e) { mShownItemBtn = dItemBtn_X_e; @@ -2939,18 +2937,18 @@ static actor_method_class daNpc_RotenMethodTable = { }; actor_process_profile_definition g_profile_NPC_ROTEN = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_ROTEN, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_ROTEN_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpcRoten_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_ROTEN, + /* Draw Prio */ fpcDwPi_NPC_ROTEN_e, /* Actor SubMtd */ &daNpc_RotenMethodTable, /* Status */ 0x07 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_rsh1.cpp b/src/d/actor/d_a_npc_rsh1.cpp index 28b5b3269..989afe930 100644 --- a/src/d/actor/d_a_npc_rsh1.cpp +++ b/src/d/actor/d_a_npc_rsh1.cpp @@ -13,8 +13,6 @@ #include "f_op/f_op_camera.h" #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_ext.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" class daNpc_Rsh1_HIO_c : public JORReflexible { @@ -231,7 +229,7 @@ static int daNpc_Rsh1_countShop() { if (dComIfGs_isGetItemReserve(i)) { result++; } else { - if (i == 0 && dComIfGs_checkGetItem(dItem_DELIVERY_BAG_e)) { + if (i == 0 && dComIfGs_checkGetItem(dItemNo_DELIVERY_BAG_e)) { result++; } } @@ -706,11 +704,11 @@ u32 daNpc_Rsh1_c::getMsg() { msg_no = m780; m780 = 0; } else { - if (!checkItemGet(dItem_MAGIC_ARMOR_e, TRUE) && daNpc_Rsh1_countShop() >= 3) { + if (!checkItemGet(dItemNo_MAGIC_ARMOR_e, TRUE) && daNpc_Rsh1_countShop() >= 3) { return 0x285D; } - if (!dComIfGs_checkGetItem(NORMAL_SAIL)) { + if (!dComIfGs_checkGetItem(dItemNo_SAIL_e)) { if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_2420)) { return 0x288C; } @@ -718,7 +716,7 @@ u32 daNpc_Rsh1_c::getMsg() { return 0x2886; } - if (!dComIfGs_checkGetItem(dItem_DELIVERY_BAG_e)) { + if (!dComIfGs_checkGetItem(dItemNo_DELIVERY_BAG_e)) { return 0x2890; } @@ -1010,7 +1008,7 @@ static BOOL daNpc_Rsh1_checkRotenItemGet(int i_itemNo) { if (i_itemNo != 0) { roten_item_get_check = dComIfGs_isGetItemReserve(i_itemNo); } else { - roten_item_get_check = dComIfGs_checkGetItem(dItem_DELIVERY_BAG_e) ? TRUE : FALSE; + roten_item_get_check = dComIfGs_checkGetItem(dItemNo_DELIVERY_BAG_e) ? TRUE : FALSE; } return roten_item_get_check; } @@ -1284,7 +1282,7 @@ bool daNpc_Rsh1_c::wait01() { } else { if (mCyl.ChkCoHit()) { fopAc_ac_c* actor_p = mCyl.GetCoHitAc(); - if (actor_p && fpcM_GetName(actor_p) == PROC_PLAYER) { + if (actor_p && fpcM_GetName(actor_p) == fpcNm_PLAYER_e) { m95B = 2; m793 = true; m780 = 0x2883; @@ -1327,13 +1325,13 @@ bool daNpc_Rsh1_c::talk01() { if (m778 == 0x2856) { m95B = 4; - mItemNo = FLOWER_1; + mItemNo = dItemNo_TOWN_FLOWER_e; } else if (m778 == 0x288E) { m95B = 4; - mItemNo = NORMAL_SAIL; + mItemNo = dItemNo_SAIL_e; } else if (m778 == 0x285F) { m95B = 4; - mItemNo = dItem_MAGIC_ARMOR_e; + mItemNo = dItemNo_MAGIC_ARMOR_e; } else if (m778 == 0x2883 && m793 == true) { setAction(&daNpc_Rsh1_c::pl_shop_out_action, NULL); } @@ -1373,11 +1371,11 @@ BOOL daNpc_Rsh1_c::getdemo_action(void* i_unusedP) { m95B = 1; dComIfGp_event_onEventFlag(dSv_event_flag_c::UNK_0008); - if (mItemNo == FLOWER_1) { + if (mItemNo == dItemNo_TOWN_FLOWER_e) { m780 = 0x2857; - } else if (mItemNo == NORMAL_SAIL) { + } else if (mItemNo == dItemNo_SAIL_e) { m780 = 0x288F; - } else if (mItemNo == dItem_MAGIC_ARMOR_e) { + } else if (mItemNo == dItemNo_MAGIC_ARMOR_e) { m780 = 0x2860; } @@ -1940,18 +1938,18 @@ static actor_method_class l_daNpc_Rsh1_Method = { }; actor_process_profile_definition g_profile_NPC_RSH1 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_RSH1, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_RSH1_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpc_Rsh1_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_RSH1, + /* Draw Prio */ fpcDwPi_NPC_RSH1_e, /* Actor SubMtd */ &l_daNpc_Rsh1_Method, /* Status */ 0x07 | fopAcStts_SHOWMAP_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_12_e, + /* Cull Type */ fopAc_CULLBOX_12_e, }; diff --git a/src/d/actor/d_a_npc_sarace.cpp b/src/d/actor/d_a_npc_sarace.cpp index 68c40b452..880c82a37 100644 --- a/src/d/actor/d_a_npc_sarace.cpp +++ b/src/d/actor/d_a_npc_sarace.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_sarace.h" #include "m_Do/m_Do_ext.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" static dCcD_SrcCyl l_cyl_src = { @@ -205,18 +203,18 @@ static actor_method_class l_daNpc_Sarace_Method = { }; actor_process_profile_definition g_profile_NPC_SARACE = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_SARACE, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_SARACE_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpc_Sarace_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_SARACE, + /* Draw Prio */ fpcDwPi_NPC_SARACE_e, /* Actor SubMtd */ &l_daNpc_Sarace_Method, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_12_e, + /* Cull Type */ fopAc_CULLBOX_12_e, }; diff --git a/src/d/actor/d_a_npc_so.cpp b/src/d/actor/d_a_npc_so.cpp index 8745ae718..a8c244bf8 100644 --- a/src/d/actor/d_a_npc_so.cpp +++ b/src/d/actor/d_a_npc_so.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_so.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 000000EC-000002A4 .text __ct__14daNpc_So_HIO_cFv */ daNpc_So_HIO_c::daNpc_So_HIO_c() { @@ -435,18 +433,18 @@ static actor_method_class daNpc_SoMethodTable = { }; actor_process_profile_definition g_profile_NPC_SO = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_SO, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_SO_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpc_So_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_SO, + /* Draw Prio */ fpcDwPi_NPC_SO_e, /* Actor SubMtd */ &daNpc_SoMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_sv.cpp b/src/d/actor/d_a_npc_sv.cpp index 933acd534..a61f2e53c 100644 --- a/src/d/actor/d_a_npc_sv.cpp +++ b/src/d/actor/d_a_npc_sv.cpp @@ -7,8 +7,6 @@ #include "d/actor/d_a_npc_sv.h" #include "m_Do/m_Do_ext.h" #include "d/actor/d_a_obj_ikada.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 00000078-0000021C .text __ct__9daNpcSv_cFv */ daNpcSv_c::daNpcSv_c() { @@ -264,18 +262,18 @@ static actor_method_class daNpc_PeopleMethodTable = { }; actor_process_profile_definition g_profile_NPC_SV = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_SV, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_SV_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpcSv_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_SV, + /* Draw Prio */ fpcDwPi_NPC_SV_e, /* Actor SubMtd */ &daNpc_PeopleMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_tc.cpp b/src/d/actor/d_a_npc_tc.cpp index e30c01733..0114149ee 100644 --- a/src/d/actor/d_a_npc_tc.cpp +++ b/src/d/actor/d_a_npc_tc.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_tc.h" #include "m_Do/m_Do_ext.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/res/res_tc.h" #include "d/d_s_play.h" #include "d/d_snap.h" @@ -182,7 +180,7 @@ static void* searchTower_CB(void* i_actor, void* i_this) { /* 000005C8-00000630 .text _searchTower__10daNpc_Tc_cFP10fopAc_ac_c */ fopAc_ac_c* daNpc_Tc_c::_searchTower(fopAc_ac_c* i_actor) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_Obj_Smplbg && ((daObjSmplbg::Act_c*)i_actor)->prm_get_type() == 0) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_Obj_Smplbg_e && ((daObjSmplbg::Act_c*)i_actor)->prm_get_type() == 0) { return i_actor; } return NULL; @@ -1948,18 +1946,18 @@ static actor_method_class l_daNpc_Tc_Method = { }; actor_process_profile_definition g_profile_NPC_TC = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_TC, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_TC_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpc_Tc_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_TC, + /* Draw Prio */ fpcDwPi_NPC_TC_e, /* Actor SubMtd */ &l_daNpc_Tc_Method, /* Status */ DEMO_SELECT(fopAcStts_UNK4000_e, 0) | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_12_e, + /* Cull Type */ fopAc_CULLBOX_12_e, }; diff --git a/src/d/actor/d_a_npc_tc_cut.inc b/src/d/actor/d_a_npc_tc_cut.inc index 92ea749f5..43ea9bc21 100644 --- a/src/d/actor/d_a_npc_tc_cut.inc +++ b/src/d/actor/d_a_npc_tc_cut.inc @@ -134,61 +134,61 @@ void daNpc_Tc_c::cutPresentProc(int i_staffIdx) { int itemNo; switch(temp) { case 0: - itemNo = dItem_TINGLE_TUNER_e; + itemNo = dItemNo_TINGLE_TUNER_e; break; case 1: - itemNo = dItem_COLLECT_MAP_35_e; + itemNo = dItemNo_COLLECT_MAP_35_e; break; case 2: if (mType == TYPE_RED) { if (checkAllMonumentFee()) { - itemNo = TINCLE_RUPEE6; + itemNo = dItemNo_TINGLE_RUPEE_6_e; } else { switch (checkAllMonumentPay()) { case 1: - itemNo = TINCLE_RUPEE1; + itemNo = dItemNo_TINGLE_RUPEE_1_e; break; case 2: - itemNo = TINCLE_RUPEE2; + itemNo = dItemNo_TINGLE_RUPEE_2_e; break; case 3: - itemNo = TINCLE_RUPEE3; + itemNo = dItemNo_TINGLE_RUPEE_3_e; break; case 4: - itemNo = TINCLE_RUPEE4; + itemNo = dItemNo_TINGLE_RUPEE_4_e; break; case 5: - itemNo = TINCLE_RUPEE5; + itemNo = dItemNo_TINGLE_RUPEE_5_e; break; } } } else if (mType == TYPE_NORMAL2) { switch (analysisCollectMap()) { case 1: - itemNo = TRIFORCE_MAP1; + itemNo = dItemNo_TRIFORCE_MAP_1_e; break; case 2: - itemNo = TRIFORCE_MAP2; + itemNo = dItemNo_TRIFORCE_MAP_2_e; break; case 3: - itemNo = TRIFORCE_MAP3; + itemNo = dItemNo_TRIFORCE_MAP_3_e; break; case 4: - itemNo = TRIFORCE_MAP4; + itemNo = dItemNo_TRIFORCE_MAP_4_e; break; case 5: - itemNo = TRIFORCE_MAP5; + itemNo = dItemNo_TRIFORCE_MAP_5_e; break; case 6: - itemNo = TRIFORCE_MAP6; + itemNo = dItemNo_TRIFORCE_MAP_6_e; break; case 7: - itemNo = TRIFORCE_MAP7; + itemNo = dItemNo_TRIFORCE_MAP_7_e; break; case 8: - itemNo = TRIFORCE_MAP8; + itemNo = dItemNo_TRIFORCE_MAP_8_e; break; } } diff --git a/src/d/actor/d_a_npc_tt.cpp b/src/d/actor/d_a_npc_tt.cpp index 647ec9c0b..39016019f 100644 --- a/src/d/actor/d_a_npc_tt.cpp +++ b/src/d/actor/d_a_npc_tt.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_tt.h" #include "m_Do/m_Do_ext.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 00000078-00000098 .text daNpc_tt_XyCheckCB__FPvi */ static s16 daNpc_tt_XyCheckCB(void*, int) { @@ -265,18 +263,18 @@ static actor_method_class l_daNpc_Tt_Method = { }; actor_process_profile_definition g_profile_NPC_TT = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_TT, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_TT_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpc_Tt_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_TT, + /* Draw Prio */ fpcDwPi_NPC_TT_e, /* Actor SubMtd */ &l_daNpc_Tt_Method, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_NPC_e, - /* CullType */ fopAc_CULLBOX_12_e, + /* Cull Type */ fopAc_CULLBOX_12_e, }; diff --git a/src/d/actor/d_a_npc_uk.cpp b/src/d/actor/d_a_npc_uk.cpp index b3522fa90..4cfdede4e 100644 --- a/src/d/actor/d_a_npc_uk.cpp +++ b/src/d/actor/d_a_npc_uk.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_uk.h" #include "m_Do/m_Do_ext.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 000000EC-000000F8 .text getType__10daNpc_Uk_cFv */ void daNpc_Uk_c::getType() { @@ -368,18 +366,18 @@ static actor_method_class l_daNpc_Uk_Method = { }; actor_process_profile_definition g_profile_NPC_UK = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_UK, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_UK_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpc_Uk_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_UK, + /* Draw Prio */ fpcDwPi_NPC_UK_e, /* Actor SubMtd */ &l_daNpc_Uk_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_NPC_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_ym1.cpp b/src/d/actor/d_a_npc_ym1.cpp index 4f53d6460..5d2d64521 100644 --- a/src/d/actor/d_a_npc_ym1.cpp +++ b/src/d/actor/d_a_npc_ym1.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_ym1.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 000000EC-00000108 .text __ct__20daNpc_Ym1_childHIO_cFv */ daNpc_Ym1_childHIO_c::daNpc_Ym1_childHIO_c() { @@ -447,35 +445,35 @@ static actor_method_class l_daNpc_Ym1_Method = { }; actor_process_profile_definition g_profile_NPC_YM1 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_YM1, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_YM1_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpc_Ym1_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_YM1, + /* Draw Prio */ fpcDwPi_NPC_YM1_e, /* Actor SubMtd */ &l_daNpc_Ym1_Method, /* Status */ 0x07 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; actor_process_profile_definition g_profile_NPC_YM2 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_YM2, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_YM2_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpc_Ym1_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_YM2, + /* Draw Prio */ fpcDwPi_NPC_YM2_e, /* Actor SubMtd */ &l_daNpc_Ym1_Method, /* Status */ 0x07 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_yw1.cpp b/src/d/actor/d_a_npc_yw1.cpp index c4e2e288b..e627191ab 100644 --- a/src/d/actor/d_a_npc_yw1.cpp +++ b/src/d/actor/d_a_npc_yw1.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_yw1.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 000000EC-00000108 .text __ct__20daNpc_Yw1_childHIO_cFv */ daNpc_Yw1_childHIO_c::daNpc_Yw1_childHIO_c() { @@ -427,18 +425,18 @@ static actor_method_class l_daNpc_Yw1_Method = { }; actor_process_profile_definition g_profile_NPC_YW1 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_YW1, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_YW1_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpc_Yw1_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_YW1, + /* Draw Prio */ fpcDwPi_NPC_YW1_e, /* Actor SubMtd */ &l_daNpc_Yw1_Method, /* Status */ 0x08 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_zk1.cpp b/src/d/actor/d_a_npc_zk1.cpp index 7e7c0888b..3e8ae8ff1 100644 --- a/src/d/actor/d_a_npc_zk1.cpp +++ b/src/d/actor/d_a_npc_zk1.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_zk1.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 000000EC-00000150 .text __ct__15daNpc_Zk1_HIO_cFv */ daNpc_Zk1_HIO_c::daNpc_Zk1_HIO_c() { @@ -302,18 +300,18 @@ static actor_method_class l_daNpc_Zk1_Method = { }; actor_process_profile_definition g_profile_NPC_ZK1 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_ZK1, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_ZK1_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpc_Zk1_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_ZK1, + /* Draw Prio */ fpcDwPi_NPC_ZK1_e, /* Actor SubMtd */ &l_daNpc_Zk1_Method, /* Status */ 0x08 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_zl1.cpp b/src/d/actor/d_a_npc_zl1.cpp index 895942573..1fb56b3d5 100644 --- a/src/d/actor/d_a_npc_zl1.cpp +++ b/src/d/actor/d_a_npc_zl1.cpp @@ -10,8 +10,6 @@ #include "d/d_bg_s_func.h" #include "d/d_bg_s_roof_chk.h" #include "m_Do/m_Do_ext.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "SSystem/SComponent/c_counter.h" #include "d/actor/d_a_player.h" #include "d/res/res_zl.h" @@ -212,7 +210,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* ac) { /* 00000548-000005C0 .text searchActor_Branch__FPvPv */ void* searchActor_Branch(void* i_param1, void*) { - if(l_check_wrk < 20 && fopAcM_IsActor(i_param1) && fopAcM_GetName(i_param1) == PROC_BRANCH) { + if(l_check_wrk < 20 && fopAcM_IsActor(i_param1) && fopAcM_GetName(i_param1) == fpcNm_BRANCH_e) { l_check_inf[l_check_wrk] = (fopAc_ac_c*)i_param1; l_check_wrk++; } @@ -221,7 +219,7 @@ void* searchActor_Branch(void* i_param1, void*) { /* 000005C0-00000638 .text searchActor_Bm1__FPvPv */ void* searchActor_Bm1(void* i_param1, void*) { - if(l_check_wrk < 20 && fopAcM_IsActor(i_param1) && fopAcM_GetName(i_param1) == PROC_NPC_BM1) { + if(l_check_wrk < 20 && fopAcM_IsActor(i_param1) && fopAcM_GetName(i_param1) == fpcNm_NPC_BM1_e) { l_check_inf[l_check_wrk] = (fopAc_ac_c*)i_param1; l_check_wrk++; } @@ -3060,18 +3058,18 @@ static actor_method_class l_daNpc_Zl1_Method = { }; actor_process_profile_definition g_profile_NPC_ZL1 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NPC_ZL1, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_ZL1_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daNpc_Zl1_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NPC_ZL1, + /* Draw Prio */ fpcDwPi_NPC_ZL1_e, /* Actor SubMtd */ &l_daNpc_Zl1_Method, /* Status */ 0x08 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_nz.cpp b/src/d/actor/d_a_nz.cpp index 7368b047e..d71b44c91 100644 --- a/src/d/actor/d_a_nz.cpp +++ b/src/d/actor/d_a_nz.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_nz.h" #include "m_Do/m_Do_ext.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" /* 000000EC-00000138 .text __ct__10daNZ_HIO_cFv */ @@ -218,18 +216,18 @@ static actor_method_class l_daNZ_Method = { }; actor_process_profile_definition g_profile_NZ = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NZ, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NZ_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(nz_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NZ, + /* Draw Prio */ fpcDwPi_NZ_e, /* Actor SubMtd */ &l_daNZ_Method, /* Status */ fopAcStts_SHOWMAP_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e | fopAcStts_UNK80000_e, /* Group */ fopAc_ENEMY_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_nzg.cpp b/src/d/actor/d_a_nzg.cpp index 00eab51b5..3559b1db2 100644 --- a/src/d/actor/d_a_nzg.cpp +++ b/src/d/actor/d_a_nzg.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_nzg.h" #include "d/d_path.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_s_play.h" #include "d/res/res_nzg.h" @@ -54,7 +52,7 @@ void nzg_00_move(nzg_class* i_this) { fopAc_ac_c* hit_actor = i_this->mCyl.GetCoHitAc(); if (hit_actor != NULL) { s16 hitAC_name = fopAcM_GetName(hit_actor); - if (hitAC_name != PROC_NZ && hitAC_name != PROC_BOMB && hitAC_name != PROC_Bomb2 && hitAC_name != PROC_ITEM && hitAC_name != PROC_ESA) { + if (hitAC_name != fpcNm_NZ_e && hitAC_name != fpcNm_BOMB_e && hitAC_name != fpcNm_Bomb2_e && hitAC_name != fpcNm_ITEM_e && hitAC_name != fpcNm_ESA_e) { i_this->m2D4 = fopAcM_GetID(hit_actor); i_this->m2BB = 1; return; @@ -76,7 +74,7 @@ void nzg_00_move(nzg_class* i_this) { csXyz child_angle = actor->current.angle; child_angle.y += cM_rndFX(8192.0f); - fpc_ProcID childProcID = fopAcM_createChild(PROC_NZ, fopAcM_GetID(actor), parameters, &actor->current.pos, fopAcM_GetRoomNo(actor), &child_angle, &actor->scale, NULL); + fpc_ProcID childProcID = fopAcM_createChild(fpcNm_NZ_e, fopAcM_GetID(actor), parameters, &actor->current.pos, fopAcM_GetRoomNo(actor), &child_angle, &actor->scale, NULL); if (childProcID != fpcM_ERROR_PROCESS_ID_e) { i_this->m2C2[0] = (childProcID & 3) * 10 + 20; @@ -234,18 +232,18 @@ static actor_method_class l_daNZG_Method = { }; actor_process_profile_definition g_profile_NZG = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NZG, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NZG_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(nzg_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_NZG, + /* Draw Prio */ fpcDwPi_NZG_e, /* Actor SubMtd */ &l_daNZG_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_obj_AjavW.cpp b/src/d/actor/d_a_obj_AjavW.cpp index 40b173aae..7270be69c 100644 --- a/src/d/actor/d_a_obj_AjavW.cpp +++ b/src/d/actor/d_a_obj_AjavW.cpp @@ -10,8 +10,6 @@ #include "JSystem/JUtility/JUTAssert.h" #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" @@ -137,18 +135,18 @@ static actor_method_class l_daObjAjavW_Method = { }; actor_process_profile_definition g_profile_Obj_AjavW = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_AjavW, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_AjavW_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjAjavW_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_AjavW, + /* Draw Prio */ fpcDwPi_Obj_AjavW_e, /* Actor SubMtd */ &l_daObjAjavW_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_Itnak.cpp b/src/d/actor/d_a_obj_Itnak.cpp index ccd6a4268..c16c4f2d3 100644 --- a/src/d/actor/d_a_obj_Itnak.cpp +++ b/src/d/actor/d_a_obj_Itnak.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_Itnak.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 00000078-0000009C .text solidHeapCB__Q210daObjItnak5Act_cFP10fopAc_ac_c */ void daObjItnak::Act_c::solidHeapCB(fopAc_ac_c*) { @@ -96,18 +94,18 @@ static actor_method_class Mthd_Table = { }; // namespace daObjItnak actor_process_profile_definition g_profile_Obj_Itnak = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Itnak, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Itnak_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjItnak::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Itnak, + /* Draw Prio */ fpcDwPi_Obj_Itnak_e, /* Actor SubMtd */ &daObjItnak::Mthd_Table, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_Vds.cpp b/src/d/actor/d_a_obj_Vds.cpp index 6f94284fc..38553b242 100644 --- a/src/d/actor/d_a_obj_Vds.cpp +++ b/src/d/actor/d_a_obj_Vds.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_Vds.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 00000078-00000134 .text SetLoopJointAnimation__Q28daObjVds5Act_cFP18J3DAnmTransformKeyP18J3DAnmTransformKeyff */ void daObjVds::Act_c::SetLoopJointAnimation(J3DAnmTransformKey*, J3DAnmTransformKey*, float, float) { @@ -166,18 +164,18 @@ static actor_method_class Mthd_Table = { }; // namespace daObjVds actor_process_profile_definition g_profile_Obj_Vds = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Vds, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Vds_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjVds::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Vds, + /* Draw Prio */ fpcDwPi_Obj_Vds_e, /* Actor SubMtd */ &daObjVds::Mthd_Table, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_Vteng.cpp b/src/d/actor/d_a_obj_Vteng.cpp index 5604326e8..a414636ac 100644 --- a/src/d/actor/d_a_obj_Vteng.cpp +++ b/src/d/actor/d_a_obj_Vteng.cpp @@ -10,8 +10,6 @@ #include "JSystem/JUtility/JUTAssert.h" #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" @@ -170,18 +168,18 @@ static actor_method_class l_daObjVteng_Method = { }; actor_process_profile_definition g_profile_Obj_Vteng = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Vteng, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Vteng_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjVteng_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Vteng, + /* Draw Prio */ fpcDwPi_Obj_Vteng_e, /* Actor SubMtd */ &l_daObjVteng_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_YLzou.cpp b/src/d/actor/d_a_obj_YLzou.cpp index 2c64989d5..f3c22f06b 100644 --- a/src/d/actor/d_a_obj_YLzou.cpp +++ b/src/d/actor/d_a_obj_YLzou.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_YLzou.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 000000EC-000002B8 .text set_start_type__12daObjYLzou_cFv */ void daObjYLzou_c::set_start_type() { @@ -212,18 +210,18 @@ static actor_method_class l_daObjYLzou_Method = { }; actor_process_profile_definition g_profile_Obj_YLzou = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_YLzou, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_YLzou_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjYLzou_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_YLzou, + /* Draw Prio */ fpcDwPi_Obj_YLzou_e, /* Actor SubMtd */ &l_daObjYLzou_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_Yboil.cpp b/src/d/actor/d_a_obj_Yboil.cpp index 2840466ad..e43fc2ae1 100644 --- a/src/d/actor/d_a_obj_Yboil.cpp +++ b/src/d/actor/d_a_obj_Yboil.cpp @@ -11,8 +11,6 @@ #include "d/d_kankyo.h" #include "m_Do/m_Do_mtx.h" #include "JSystem/JUtility/JUTAssert.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 00000078-00000098 .text CheckCreateHeap__FP10fopAc_ac_c */ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) { @@ -206,18 +204,18 @@ static actor_method_class daObj_YboilMethodTable = { }; actor_process_profile_definition g_profile_Obj_Yboil = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Yboil, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Yboil_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjYboil_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Yboil, + /* Draw Prio */ fpcDwPi_Obj_Yboil_e, /* Actor SubMtd */ &daObj_YboilMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_Ygush00.cpp b/src/d/actor/d_a_obj_Ygush00.cpp index 3448f5d24..6857223b7 100644 --- a/src/d/actor/d_a_obj_Ygush00.cpp +++ b/src/d/actor/d_a_obj_Ygush00.cpp @@ -10,8 +10,6 @@ #include "JSystem/JUtility/JUTAssert.h" #include "d/d_com_inf_game.h" #include "d/d_kankyo.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/actor/d_a_obj_gryw00.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" @@ -127,7 +125,7 @@ bool daObjYgush00_c::_execute() { fopAcM_seStartCurrent(this, JA_SE_OBJ_SPRING, 0); } } else { - mpGryw00 = (daObjGryw00_c*)fopAcM_SearchByName(PROC_Obj_Gryw00); + mpGryw00 = (daObjGryw00_c*)fopAcM_SearchByName(fpcNm_Obj_Gryw00_e); } } else { fopAcM_seStartCurrent(this, JA_SE_OBJ_SPRING, 0); @@ -188,18 +186,18 @@ static actor_method_class l_daObjYgush00_Method = { }; actor_process_profile_definition g_profile_Obj_Ygush00 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Ygush00, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Ygush00_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjYgush00_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Ygush00, + /* Draw Prio */ fpcDwPi_Obj_Ygush00_e, /* Actor SubMtd */ &l_daObjYgush00_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_adnno.cpp b/src/d/actor/d_a_obj_adnno.cpp index f9fd0c3d5..52b703f9e 100644 --- a/src/d/actor/d_a_obj_adnno.cpp +++ b/src/d/actor/d_a_obj_adnno.cpp @@ -10,8 +10,6 @@ #include "JSystem/JUtility/JUTAssert.h" #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" @@ -170,18 +168,18 @@ static actor_method_class daObj_AdnnoMethodTable = { }; actor_process_profile_definition g_profile_Obj_Adnno = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Adnno, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Adnno_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjAdnno_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Adnno, + /* Draw Prio */ fpcDwPi_Obj_Adnno_e, /* Actor SubMtd */ &daObj_AdnnoMethodTable, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_ajav.cpp b/src/d/actor/d_a_obj_ajav.cpp index 10a875d98..63e747d2e 100644 --- a/src/d/actor/d_a_obj_ajav.cpp +++ b/src/d/actor/d_a_obj_ajav.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_ajav.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/res/res_ajav.h" static cXyz l_daObjAjav_co_offset[3] = { @@ -906,18 +904,18 @@ static actor_method_class Mthd_Table = { }; // namespace daObjAjav actor_process_profile_definition g_profile_Obj_Ajav = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Ajav, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Ajav_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjAjav::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Ajav, + /* Draw Prio */ fpcDwPi_Obj_Ajav_e, /* Actor SubMtd */ &daObjAjav::Mthd_Table, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_akabe.cpp b/src/d/actor/d_a_obj_akabe.cpp index 0c289746c..3f261013b 100644 --- a/src/d/actor/d_a_obj_akabe.cpp +++ b/src/d/actor/d_a_obj_akabe.cpp @@ -9,8 +9,6 @@ #include "d/res/res_akabed.h" #include "d/res/res_akabek.h" #include "d/res/res_nbox.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "m_Do/m_Do_mtx.h" @@ -190,18 +188,18 @@ namespace daObjAkabe { }; actor_process_profile_definition g_profile_Obj_Akabe = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Akabe, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Akabe_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjAkabe::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Akabe, + /* Draw Prio */ fpcDwPi_Obj_Akabe_e, /* Actor SubMtd */ &daObjAkabe::Mthd_Table, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_apzl.cpp b/src/d/actor/d_a_obj_apzl.cpp index 3fc89778c..1aed07130 100644 --- a/src/d/actor/d_a_obj_apzl.cpp +++ b/src/d/actor/d_a_obj_apzl.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_apzl.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/actor/d_a_item.h" #include "m_Do/m_Do_controller_pad.h" #include "d/res/res_apzl.h" @@ -687,38 +685,38 @@ void daObjApzl_c::privateCut() { if(mPuzzleNo == 15) { f32 temp2 = cM_rndF(1000.0f); if(temp2 < 900.0) { - itemNo = dItem_GREEN_RUPEE_e; + itemNo = dItemNo_GREEN_RUPEE_e; } else if (temp2 < 980.0) { - itemNo = dItem_BLUE_RUPEE_e; + itemNo = dItemNo_BLUE_RUPEE_e; } else if (temp2 < 995.0) { - itemNo = dItem_YELLOW_RUPEE_e; + itemNo = dItemNo_YELLOW_RUPEE_e; } else if (temp2 < 999.0) { - itemNo = dItem_RED_RUPEE_e; + itemNo = dItemNo_RED_RUPEE_e; } else { - itemNo = dItem_PURPLE_RUPEE_e; + itemNo = dItemNo_PURPLE_RUPEE_e; } } else { - itemNo = dItem_GREEN_RUPEE_e; + itemNo = dItemNo_GREEN_RUPEE_e; } #else if (mPuzzleNo == 15) { u8 rupeeType = daObjApzl_Rupee_Table[mGivenRupeeCount]; if (rupeeType == 0) { - itemNo = dItem_GREEN_RUPEE_e; + itemNo = dItemNo_GREEN_RUPEE_e; } else if (rupeeType == 1) { - itemNo = dItem_BLUE_RUPEE_e; + itemNo = dItemNo_BLUE_RUPEE_e; } else if (rupeeType == 2) { - itemNo = dItem_YELLOW_RUPEE_e; + itemNo = dItemNo_YELLOW_RUPEE_e; } else if (rupeeType == 3) { - itemNo = dItem_RED_RUPEE_e; + itemNo = dItemNo_RED_RUPEE_e; } else { - itemNo = dItem_PURPLE_RUPEE_e; + itemNo = dItemNo_PURPLE_RUPEE_e; } } else if (mGivenRupeeCount % 6 == 0) { - itemNo = dItem_BLUE_RUPEE_e; + itemNo = dItemNo_BLUE_RUPEE_e; } else { - itemNo = dItem_GREEN_RUPEE_e; + itemNo = dItemNo_GREEN_RUPEE_e; } #endif @@ -1119,18 +1117,18 @@ static actor_method_class daObj_ApzlMethodTable = { }; actor_process_profile_definition g_profile_Obj_Apzl = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Apzl, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Apzl_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjApzl_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Apzl, + /* Draw Prio */ fpcDwPi_Obj_Apzl_e, /* Actor SubMtd */ &daObj_ApzlMethodTable, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_ashut.cpp b/src/d/actor/d_a_obj_ashut.cpp index 518c2012b..1f2e98f52 100644 --- a/src/d/actor/d_a_obj_ashut.cpp +++ b/src/d/actor/d_a_obj_ashut.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_ashut.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 00000078-0000012C .text CreateHeap__Q210daObjAshut5Act_cFv */ BOOL daObjAshut::Act_c::CreateHeap() { @@ -146,18 +144,18 @@ static actor_method_class Mthd_Table = { }; // namespace daObjAshut actor_process_profile_definition g_profile_Obj_Ashut = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Ashut, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Ashut_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjAshut::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Ashut, + /* Draw Prio */ fpcDwPi_Obj_Ashut_e, /* Actor SubMtd */ &daObjAshut::Mthd_Table, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_auzu.cpp b/src/d/actor/d_a_obj_auzu.cpp index 47fa415f7..c1c8ac0a7 100644 --- a/src/d/actor/d_a_obj_auzu.cpp +++ b/src/d/actor/d_a_obj_auzu.cpp @@ -8,8 +8,6 @@ #include "d/actor/d_a_kytag01.h" #include "d/actor/d_a_player_main.h" #include "d/actor/d_a_ship.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/res/res_auzu.h" namespace daObjAuzu { @@ -153,7 +151,7 @@ void daObjAuzu::Act_c::set_state_map() { /* 00000624-00000788 .text ship_whirl__Q29daObjAuzu5Act_cFv */ void daObjAuzu::Act_c::ship_whirl() { daShip_c* ship_p = dComIfGp_getShipActor(); - if (ship_p && fopAcM_GetName(ship_p) == PROC_SHIP) { + if (ship_p && fopAcM_GetName(ship_p) == fpcNm_SHIP_e) { f32 sqr_mag_xz = fopAcM_searchActorDistanceXZ2(this, ship_p); #if VERSION > VERSION_DEMO f32 inner_activation = (daObjAuzu::L_radius * attr().mInnerActivationMult) * @@ -238,7 +236,7 @@ bool daObjAuzu::Act_c::_execute() { scaleXZ.x = (mScaleAnimFactor * (daObjAuzu::L_radius * attr().mRadiusMult)) / 5000.0f; scaleXZ.z = (mScaleAnimFactor * ((daObjAuzu::L_radius + 500.0f) * attr().mRadiusMult)) / 5000.0f; mKytagPcId = fopAcM_create( - PROC_KYTAG01, -1, ¤t.pos, + fpcNm_KYTAG01_e, -1, ¤t.pos, tevStr.mRoomNo, ¤t.angle, &scaleXZ ); } else if (mScaleAnimFactor > 0.0f && fpcM_IsErrorID(mKytagPcId) == FALSE) { @@ -324,18 +322,18 @@ static actor_method_class Mthd_Table = { }; // namespace daObjAuzu actor_process_profile_definition g_profile_Obj_Auzu = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Auzu, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Auzu_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjAuzu::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Auzu, + /* Draw Prio */ fpcDwPi_Obj_Auzu_e, /* Actor SubMtd */ &daObjAuzu::Mthd_Table, /* Status */ 0x06 | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_aygr.cpp b/src/d/actor/d_a_obj_aygr.cpp index e1c408381..5c3e3a93f 100644 --- a/src/d/actor/d_a_obj_aygr.cpp +++ b/src/d/actor/d_a_obj_aygr.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_aygr.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 00000078-000002A4 .text CreateHeap__Q29daObjAygr5Act_cFv */ BOOL daObjAygr::Act_c::CreateHeap() { @@ -91,18 +89,18 @@ static actor_method_class Mthd_Aygr = { }; // namespace daObjAygr actor_process_profile_definition g_profile_Obj_Aygr = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Aygr, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Aygr_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjAygr::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Aygr, + /* Draw Prio */ fpcDwPi_Obj_Aygr_e, /* Actor SubMtd */ &daObjAygr::Mthd_Aygr, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_balancelift.cpp b/src/d/actor/d_a_obj_balancelift.cpp index 101b42e05..7177aaedd 100644 --- a/src/d/actor/d_a_obj_balancelift.cpp +++ b/src/d/actor/d_a_obj_balancelift.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_balancelift.h" #include "d/d_bg_w.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" static dCcD_SrcCyl l_cyl_src = { @@ -125,18 +123,18 @@ static actor_method_class daBalanceliftMethodTable = { }; actor_process_profile_definition g_profile_Balancelift = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Balancelift, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Balancelift_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daBalancelift_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Balancelift, + /* Draw Prio */ fpcDwPi_Balancelift_e, /* Actor SubMtd */ &daBalanceliftMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_barrel.cpp b/src/d/actor/d_a_obj_barrel.cpp index 274ba9adf..e0141998e 100644 --- a/src/d/actor/d_a_obj_barrel.cpp +++ b/src/d/actor/d_a_obj_barrel.cpp @@ -9,8 +9,6 @@ #include "d/res/res_ktaru_01.h" #include "f_op/f_op_actor_mng.h" #include "f_op/f_op_kankyo_mng.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_com_inf_game.h" const char daObjBarrel::Act_c::M_arcname[] = "Ktaru_01"; @@ -585,7 +583,7 @@ bool daObjBarrel::Act_c::damage_cc_proc() { hitNormal *= l_shape_vec; mMove.abs2(); fopAc_ac_c* hitActor = mCyl.GetTgHitAc(); - if (hitActor != NULL && fopAcM_GetProfName(hitActor) == PROC_PLAYER) { + if (hitActor != NULL && fopAcM_GetProfName(hitActor) == fpcNm_PLAYER_e) { s16 hitObjAngleY = cM_atan2s(hitNormal.x, hitNormal.z); f32 f2 = cM_scos(hitActor->shape_angle.y - hitObjAngleY); if (f2 > 0.0f) { @@ -767,18 +765,18 @@ actor_method_class daObjBarrel::Method::Table = { }; actor_process_profile_definition g_profile_Obj_Barrel = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0008, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Barrel, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0008, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Barrel_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjBarrel::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Barrel, + /* Draw Prio */ fpcDwPi_Obj_Barrel_e, /* Actor SubMtd */ &daObjBarrel::Method::Table, /* Status */ fopAcStts_CULL_e | fopAcStts_FREEZE_e | fopAcStts_UNK40000_e | fopAcStts_UNK80000_e | fopAcStts_UNK8000000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLSPHERE_CUSTOM_e, + /* Cull Type */ fopAc_CULLSPHERE_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_barrel2.cpp b/src/d/actor/d_a_obj_barrel2.cpp index a1d98c86b..8cac21edc 100644 --- a/src/d/actor/d_a_obj_barrel2.cpp +++ b/src/d/actor/d_a_obj_barrel2.cpp @@ -10,8 +10,6 @@ #include "d/actor/d_a_sea.h" #include "d/actor/d_a_ship.h" #include "d/d_com_inf_game.h" -#include "d/d_priority.h" -#include "d/d_procname.h" #include "f_op/f_op_camera_mng.h" #include "f_op/f_op_kankyo_mng.h" @@ -327,7 +325,7 @@ void daObjBarrel2::Act_c::tg_hitCB(fopAc_ac_c* a_this, dCcD_GObjInf* arg2, fopAc void daObjBarrel2::Act_c::co_hitCB(fopAc_ac_c* a_this, dCcD_GObjInf*, fopAc_ac_c* a_ship, dCcD_GObjInf*) { daObjBarrel2::Act_c* i_this = (daObjBarrel2::Act_c*)a_this; - if (fopAcM_GetProfName(a_ship) == PROC_SHIP) { + if (fopAcM_GetProfName(a_ship) == fpcNm_SHIP_e) { daShip_c* ship = (daShip_c*)a_ship; const s32 index = i_this->m410; @@ -1142,18 +1140,18 @@ actor_method_class daObjBarrel2::Method::Table = { }; actor_process_profile_definition g_profile_Obj_Barrel2 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0008, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Barrel2, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0008, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Barrel2_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjBarrel2::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Barrel2, + /* Draw Prio */ fpcDwPi_Obj_Barrel2_e, /* Actor SubMtd */ &daObjBarrel2::Method::Table, /* Status */ 0x05 | fopAcStts_SHOWMAP_e | fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLSPHERE_CUSTOM_e, + /* Cull Type */ fopAc_CULLSPHERE_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_barrier.cpp b/src/d/actor/d_a_obj_barrier.cpp index d53b970b4..32af8ae6e 100644 --- a/src/d/actor/d_a_obj_barrier.cpp +++ b/src/d/actor/d_a_obj_barrier.cpp @@ -10,8 +10,6 @@ #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" #include "d/d_item_data.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_graphic.h" #include "m_Do/m_Do_mtx.h" @@ -233,7 +231,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) == dItem_MASTER_SWORD_3_e) + dComIfGs_getSelectEquip(0) == dItemNo_MASTER_SWORD_3_e) { switch (player_p->getCutType()) { case daPy_py_c::CUT_TYPE_CUT_A: @@ -248,7 +246,7 @@ void daObjBarrier_c::break_start_wait_proc() { case daPy_py_c::CUT_TYPE_JUMPCUT_SWORD: dComIfGs_onEventBit(dSv_event_flag_c::BARRIER_BREAK); mEventID = dComIfGp_evmng_getEventIdx("seal"); - mBarrierProc = PROC_BREAK_ORDER; + mBarrierProc = PROC_BREAK_ORDER_e; break; } } @@ -258,7 +256,7 @@ void daObjBarrier_c::break_start_wait_proc() { /* 000009F0-00000A58 .text break_order_proc__14daObjBarrier_cFv */ void daObjBarrier_c::break_order_proc() { if (eventInfo.checkCommandDemoAccrpt()) { - mBarrierProc = PROC_BREAK_END_WAIT; + mBarrierProc = PROC_BREAK_END_WAIT_e; } else { fopAcM_orderOtherEventId(this, mEventID); eventInfo.onCondition(dEvtCnd_UNK2_e); @@ -293,14 +291,14 @@ bool daObjBarrier_c::break_check() { #else if (mMoya == 0) { switch (mBarrierProc) { - case PROC_BREAK_START_WAIT: + case PROC_BREAK_START_WAIT_e: break_start_wait_proc(); break; - case PROC_BREAK_ORDER: + case PROC_BREAK_ORDER_e: break_order_proc(); chk = true; break; - case PROC_BREAK_END_WAIT: + case PROC_BREAK_END_WAIT_e: break_end_wait_proc(); chk = true; break; @@ -638,18 +636,18 @@ static actor_method_class l_daObjBarrier_Method = { }; actor_process_profile_definition g_profile_Obj_Barrier = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Barrier, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Barrier_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjBarrier_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Barrier, + /* Draw Prio */ fpcDwPi_Obj_Barrier_e, /* Actor SubMtd */ &l_daObjBarrier_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_bemos.cpp b/src/d/actor/d_a_obj_bemos.cpp index 74d5838eb..5e4b484b5 100644 --- a/src/d/actor/d_a_obj_bemos.cpp +++ b/src/d/actor/d_a_obj_bemos.cpp @@ -8,8 +8,6 @@ #include "d/actor/d_a_player.h" #include "d/actor/d_a_beam.h" #include "d/actor/d_a_npc_os.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_a_obj.h" #include "d/d_s_play.h" #include "d/d_path.h" @@ -282,7 +280,7 @@ BOOL daBemos_c::CreateInit1() { m6A0 = dComIfG_Bgsp()->GroundCross(&mGndChk); cXyz pos(2.0f, 2.0f, 10.0f); - parentActorID = fopAcM_createChild(PROC_Beam, fopAcM_GetID(this), 0x1000000, &m2A4, tevStr.mRoomNo, ¤t.angle, &pos); + parentActorID = fopAcM_createChild(fpcNm_Beam_e, fopAcM_GetID(this), 0x1000000, &m2A4, tevStr.mRoomNo, ¤t.angle, &pos); m6BF = shape_angle.z & 0x3f; m6C0 = (shape_angle.z >> 6) & 0x7f; @@ -333,7 +331,7 @@ BOOL daBemos_c::CreateInit2() { m6A0 = dComIfG_Bgsp()->GroundCross(&mGndChk); cXyz pos(2.0f, 2.0f, 10.0f); - parentActorID = fopAcM_createChild(PROC_Beam, fopAcM_GetID(this), 0, &m2A4, tevStr.mRoomNo, ¤t.angle, &pos); + parentActorID = fopAcM_createChild(fpcNm_Beam_e, fopAcM_GetID(this), 0, &m2A4, tevStr.mRoomNo, ¤t.angle, &pos); m6BF = shape_angle.z & 0x3f; m6C0 = (shape_angle.z >> 6) & 0x7f; @@ -364,7 +362,7 @@ BOOL daBemos_c::CreateInit3() { current.angle = shape_angle; cXyz local_3C = pdVar3->m_points[1].m_position; - fopAcM_createChild(PROC_Bemos, fopAcM_GetID(this), m6A8 | 0x2fff0000 | m6B9 << 8, &local_3C, tevStr.mRoomNo, NULL, NULL, 2); + fopAcM_createChild(fpcNm_Bemos_e, fopAcM_GetID(this), m6A8 | 0x2fff0000 | m6B9 << 8, &local_3C, tevStr.mRoomNo, NULL, NULL, 2); m29C.y = cLib_targetAngleY(¤t.pos, &local_3C); m29C.x = cLib_targetAngleX(¤t.pos, &local_3C); current.angle.y = m29C.y; @@ -420,7 +418,7 @@ BOOL daBemos_c::CreateInit3() { } else { uVar2 |= 0x40000000; } - parentActorID = fopAcM_createChild(PROC_Beam, fopAcM_GetID(this), uVar2, &local_90, tevStr.mRoomNo, &m29C, &local_9C); + parentActorID = fopAcM_createChild(fpcNm_Beam_e, fopAcM_GetID(this), uVar2, &local_90, tevStr.mRoomNo, &m29C, &local_9C); current.angle.y = m29C.y; m6BB = 0; @@ -1416,7 +1414,7 @@ daBeam_c* daBemos_c::getBeamActor() { return NULL; } - if (fopAcM_IsActor(ac) && fopAcM_GetProfName(ac) == PROC_Beam) { + if (fopAcM_IsActor(ac) && fopAcM_GetProfName(ac) == fpcNm_Beam_e) { return static_cast(ac); } return NULL; @@ -1488,7 +1486,7 @@ bool daBemos_c::_execute() { guard_proc(); } - fopAcM_setGbaName(this, dItem_BOW_e, 0x23, 0x2c); + fopAcM_setGbaName(this, dItemNo_BOW_e, 0x23, 0x2c); return false; } @@ -1538,18 +1536,18 @@ static actor_method_class daBemosMethodTable = { }; actor_process_profile_definition g_profile_Bemos = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Bemos, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Bemos_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daBemos_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Bemos, + /* Draw Prio */ fpcDwPi_Bemos_e, /* Actor SubMtd */ &daBemosMethodTable, /* Status */ fopAcStts_SHOWMAP_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_4_e, + /* Cull Type */ fopAc_CULLBOX_4_e, }; diff --git a/src/d/actor/d_a_obj_bscurtain.cpp b/src/d/actor/d_a_obj_bscurtain.cpp index 290f1d76d..6726da1bc 100644 --- a/src/d/actor/d_a_obj_bscurtain.cpp +++ b/src/d/actor/d_a_obj_bscurtain.cpp @@ -10,12 +10,10 @@ #include "JSystem/JUtility/JUTAssert.h" #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" -daObj_Bscurtain_HIO_c l_HIO; +static daObj_Bscurtain_HIO_c l_HIO; /* 000000EC-00000118 .text __ct__21daObj_Bscurtain_HIO_cFv */ daObj_Bscurtain_HIO_c::daObj_Bscurtain_HIO_c() { @@ -129,18 +127,18 @@ static actor_method_class daObj_BscurtainMethodTable = { }; actor_process_profile_definition g_profile_Obj_Bscurtain = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Bscurtain, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Bscurtain_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObj_Bscurtain_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Bscurtain, + /* Draw Prio */ fpcDwPi_Obj_Bscurtain_e, /* Actor SubMtd */ &daObj_BscurtainMethodTable, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_4_e, + /* Cull Type */ fopAc_CULLBOX_4_e, }; diff --git a/src/d/actor/d_a_obj_buoyflag.cpp b/src/d/actor/d_a_obj_buoyflag.cpp index 5a1b77dc6..1e001c7fe 100644 --- a/src/d/actor/d_a_obj_buoyflag.cpp +++ b/src/d/actor/d_a_obj_buoyflag.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_buoyflag.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 000000EC-000001BC .text hasi_nrm_init__Q213daObjBuoyflag8Packet_cFv */ void daObjBuoyflag::Packet_c::hasi_nrm_init() { @@ -126,18 +124,18 @@ static actor_method_class Mthd_Table = { }; // namespace daObjBuoyflag actor_process_profile_definition g_profile_Obj_Buoyflag = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0009, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Buoyflag, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0009, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Buoyflag_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjBuoyflag::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Buoyflag, + /* Draw Prio */ fpcDwPi_Obj_Buoyflag_e, /* Actor SubMtd */ &daObjBuoyflag::Mthd_Table, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLSPHERE_CUSTOM_e, + /* Cull Type */ fopAc_CULLSPHERE_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_buoyrace.cpp b/src/d/actor/d_a_obj_buoyrace.cpp index 090d033c1..1035135fc 100644 --- a/src/d/actor/d_a_obj_buoyrace.cpp +++ b/src/d/actor/d_a_obj_buoyrace.cpp @@ -7,8 +7,6 @@ #include "d/actor/d_a_obj_buoyrace.h" #include "d/actor/d_a_goal_flag.h" #include "d/actor/d_a_sea.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/res/res_khasi_00.h" #include "d/res/res_kkiba_00.h" @@ -310,18 +308,18 @@ static actor_method_class Mthd_Table = { }; // namespace daObjBuoyrace actor_process_profile_definition g_profile_Obj_Buoyrace = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Buoyrace, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Buoyrace_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjBuoyrace::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Buoyrace, + /* Draw Prio */ fpcDwPi_Obj_Buoyrace_e, /* Actor SubMtd */ &daObjBuoyrace::Mthd_Table, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_cafelmp.cpp b/src/d/actor/d_a_obj_cafelmp.cpp index 48dd4cfad..6134d5e0e 100644 --- a/src/d/actor/d_a_obj_cafelmp.cpp +++ b/src/d/actor/d_a_obj_cafelmp.cpp @@ -10,8 +10,6 @@ #include "JSystem/JUtility/JUTAssert.h" #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" @@ -117,18 +115,18 @@ static actor_method_class daObj_CafelmpMethodTable = { }; actor_process_profile_definition g_profile_Obj_Cafelmp = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Cafelmp, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Cafelmp_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjCafelmp_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Cafelmp, + /* Draw Prio */ fpcDwPi_Obj_Cafelmp_e, /* Actor SubMtd */ &daObj_CafelmpMethodTable, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_canon.cpp b/src/d/actor/d_a_obj_canon.cpp index 44ea55b53..31790e83f 100644 --- a/src/d/actor/d_a_obj_canon.cpp +++ b/src/d/actor/d_a_obj_canon.cpp @@ -13,14 +13,12 @@ #include "d/d_cc_uty.h" #include "d/d_com_inf_game.h" #include "d/d_path.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" #include "d/actor/d_a_bomb.h" #include "d/d_s_play.h" #include "d/res/res_wallbom.h" -daObj_Canon_HIO_c l_HIO; +static daObj_Canon_HIO_c l_HIO; const u32 daObj_Canon_c::m_heapsize = 0x8C0; const char daObj_Canon_c::m_arc_name[] = "WallBom"; @@ -240,7 +238,7 @@ bool daObj_Canon_c::checkTgHit() { void daObj_Canon_c::attackCannon() { csXyz angle; angle.set(shape_angle.x - field_0x2CA, shape_angle.y + field_0x2C6, shape_angle.z); - daBomb_c* bomb = (daBomb_c*)fopAcM_fastCreate(PROC_BOMB, daBomb_c::prm_make(daBomb_c::STATE_4, true, true), &field_0x450, tevStr.mRoomNo, &angle); + daBomb_c* bomb = (daBomb_c*)fopAcM_fastCreate(fpcNm_BOMB_e, daBomb_c::prm_make(daBomb_c::STATE_4, true, true), &field_0x450, tevStr.mRoomNo, &angle); bomb->setNoGravityTime(l_HIO.field_0x28); bomb->speedF = l_HIO.field_0x20 * cM_scos(angle.x); bomb->speed.y = -(l_HIO.field_0x20 * cM_ssin(angle.x)); @@ -646,18 +644,18 @@ static actor_method_class daObj_CanonMethodTable = { }; actor_process_profile_definition g_profile_OBJ_CANON = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_OBJ_CANON, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_CANON_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObj_Canon_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_OBJ_CANON, + /* Draw Prio */ fpcDwPi_OBJ_CANON_e, /* Actor SubMtd */ &daObj_CanonMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_coming.cpp b/src/d/actor/d_a_obj_coming.cpp index b41a8b5fe..5da8c48f9 100644 --- a/src/d/actor/d_a_obj_coming.cpp +++ b/src/d/actor/d_a_obj_coming.cpp @@ -10,8 +10,6 @@ #include "d/actor/d_a_sea.h" #include "d/actor/d_a_ship.h" #include "d/d_com_inf_game.h" -#include "d/d_priority.h" -#include "d/d_procname.h" #include "f_op/f_op_actor_mng.h" dBgS_ObjGndChk daObjComing::Act_c::M_gnd_work; @@ -334,7 +332,7 @@ void* daObjComing::Act_c::chk_make_pos_act(void* actor, void* data) { if (fopAc_IsActor(i_this)) { s16 proc = fopAcM_GetName(i_this); - if (proc != PROC_SHIP && proc != PROC_PLAYER && (std::fabsf(i_this->current.pos.y - tmp->m0C.y) < tmp->m1C + 100.0f)) { + if (proc != fpcNm_SHIP_e && proc != fpcNm_PLAYER_e && (std::fabsf(i_this->current.pos.y - tmp->m0C.y) < tmp->m1C + 100.0f)) { if (i_this->current.pos.absXZ(tmp->m0C) < tmp->m18 + 100.0f) { return i_this; } @@ -571,18 +569,18 @@ static actor_method_class Mthd_Table = { }; // namespace daObjComing actor_process_profile_definition g_profile_Obj_Coming = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Coming, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Coming_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjComing::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Coming, + /* Draw Prio */ fpcDwPi_Obj_Coming_e, /* Actor SubMtd */ &daObjComing::Mthd_Table, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_obj_correct.cpp b/src/d/actor/d_a_obj_correct.cpp index fc69cd788..5f5bf8ba9 100644 --- a/src/d/actor/d_a_obj_correct.cpp +++ b/src/d/actor/d_a_obj_correct.cpp @@ -12,8 +12,6 @@ #include "d/actor/d_a_obj_correct.h" #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "f_op/f_op_actor_mng.h" namespace daObjCorrect { @@ -82,7 +80,7 @@ bool daObjCorrect::Act_c::_delete() { /* 000001B8-00000204 .text chk_try_actor0__Q212daObjCorrect5Act_cFP10fopAc_ac_c */ daObjTry::Act_c* daObjCorrect::Act_c::chk_try_actor0(fopAc_ac_c* actor) { - if (fopAcM_IsActor(actor) && fopAcM_GetName(actor) == PROC_Obj_Try) { + if (fopAcM_IsActor(actor) && fopAcM_GetName(actor) == fpcNm_Obj_Try_e) { return (daObjTry::Act_c*) actor; } return NULL; @@ -129,7 +127,7 @@ void* daObjCorrect::Act_c::search_movebox(void* actor, void* user_data) { fpc_ProcID proc_id = fpcM_GetID(actor); if (!fpcM_IsCreating(proc_id)) { - if (fopAcM_IsActor(actor) && fopAcM_GetName(actor) == PROC_Obj_Movebox) { + if (fopAcM_IsActor(actor) && fopAcM_GetName(actor) == fpcNm_Obj_Movebox_e) { daObjMovebox::Act_c* movebox = (daObjMovebox::Act_c*) actor; if (ac_actor->current.pos.abs2(correct->current.pos) < correct->field_0x2A4) { if (movebox->prm_get_swSave() == correct->prm_get_swSave() && movebox->prm_get_dmy() == 0) { @@ -140,7 +138,7 @@ void* daObjCorrect::Act_c::search_movebox(void* actor, void* user_data) { correct->field_0x290 = 0; } } else { - if (actor != NULL && fopAcM_GetName(actor) == PROC_Obj_Movebox) { + if (actor != NULL && fopAcM_GetName(actor) == fpcNm_Obj_Movebox_e) { correct->field_0x290 = 0; return NULL; } @@ -192,7 +190,7 @@ void* daObjCorrect::Act_c::search_tryKeyGate(void* actor, void* user_data) { void* return_val = NULL; if (fpcM_IsCreating(proc_id)) { - if (actor != NULL && fopAcM_GetName(actor) == PROC_Obj_Try) { + if (actor != NULL && fopAcM_GetName(actor) == fpcNm_Obj_Try_e) { correct->field_0x290 = 0; } } else { @@ -215,7 +213,7 @@ void* daObjCorrect::Act_c::search_tryKeyDoor(void* actor, void* user_data) { void* return_val = NULL; if (fpcM_IsCreating(proc_id)) { - if (actor != NULL && fopAcM_GetName(actor) == PROC_Obj_Try) { + if (actor != NULL && fopAcM_GetName(actor) == fpcNm_Obj_Try_e) { correct->field_0x290 = 0; } } else { @@ -428,18 +426,18 @@ static actor_method_class Mthd_Table = { }; // namespace daObjCorrect actor_process_profile_definition g_profile_Obj_Correct = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0009, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Correct, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0009, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Correct_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjCorrect::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Correct, + /* Draw Prio */ fpcDwPi_Obj_Correct_e, /* Actor SubMtd */ &daObjCorrect::Mthd_Table, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_obj_demo_barrel.cpp b/src/d/actor/d_a_obj_demo_barrel.cpp index be6b275ec..8e136541b 100644 --- a/src/d/actor/d_a_obj_demo_barrel.cpp +++ b/src/d/actor/d_a_obj_demo_barrel.cpp @@ -7,8 +7,6 @@ #include "d/actor/d_a_obj_demo_barrel.h" #include "d/d_bg_s_func.h" #include "d/d_com_inf_game.h" -#include "d/d_priority.h" -#include "d/d_procname.h" #include "d/res/res_dbarrel.h" #include "f_op/f_op_actor_mng.h" @@ -103,7 +101,7 @@ bool daObj_Demo_Barrel_c::_execute() { m2DC = 0; dComIfGs_onCollect(3, 0); dComIfGs_offCollect(0, 0); - dComIfGs_setSelectEquip(0, dItem_NONE_e); + dComIfGs_setSelectEquip(0, dItemNo_NONE_e); setParticleHahen(); } @@ -155,18 +153,18 @@ static actor_method_class daObj_Demo_BarrelMethodTable = { }; actor_process_profile_definition g_profile_Obj_Demo_Barrel = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Demo_Barrel, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Demo_Barrel_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObj_Demo_Barrel_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Demo_Barrel, + /* Draw Prio */ fpcDwPi_Obj_Demo_Barrel_e, /* Actor SubMtd */ &daObj_Demo_BarrelMethodTable, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_obj_dmgroom.cpp b/src/d/actor/d_a_obj_dmgroom.cpp index 93632c27e..72454de54 100644 --- a/src/d/actor/d_a_obj_dmgroom.cpp +++ b/src/d/actor/d_a_obj_dmgroom.cpp @@ -10,8 +10,6 @@ #include "JSystem/JUtility/JUTAssert.h" #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" @@ -139,18 +137,18 @@ static actor_method_class daObj_DmgroomMethodTable = { }; actor_process_profile_definition g_profile_Obj_Dmgroom = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Dmgroom, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Dmgroom_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjDmgroom_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Dmgroom, + /* Draw Prio */ fpcDwPi_Obj_Dmgroom_e, /* Actor SubMtd */ &daObj_DmgroomMethodTable, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_doguu.cpp b/src/d/actor/d_a_obj_doguu.cpp index 2fa86bdd3..88ab8cbb9 100644 --- a/src/d/actor/d_a_obj_doguu.cpp +++ b/src/d/actor/d_a_obj_doguu.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_doguu.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "d/d_item.h" #include "d/res/res_doguu.h" @@ -199,11 +197,11 @@ void daObjDoguu_c::CreateInit() { fopAcM_setCullSizeFar(this, 1.0f); if (field_0x894 == 0){ - mItemNo = dItem_PEARL_DIN_e; + mItemNo = dItemNo_PEARL_DIN_e; } else if(field_0x894 == 1) { - mItemNo = dItem_PEARL_FARORE_e; + mItemNo = dItemNo_PEARL_FARORE_e; } else{ - mItemNo = dItem_PEARL_NAYRU_e; + mItemNo = dItemNo_PEARL_NAYRU_e; } mStts.Init(0xff, 0xff, this); @@ -677,7 +675,7 @@ bool daObjDoguu_c::_execute() { cCcD_Obj* hitObj = mCyl.GetCoHitObj(); if (hitObj != NULL) { fopAc_ac_c *ac = hitObj->GetAc(); - if ((ac != NULL) && (fopAcM_GetName(ac) == PROC_PLAYER)) { + if ((ac != NULL) && (fopAcM_GetName(ac) == fpcNm_PLAYER_e)) { mCyl.SetR(50.0f); fopAcM_orderOtherEventId(this, mDoguuDemo1EventIdx); field_0x8AC = 1; @@ -815,18 +813,18 @@ static actor_method_class daObj_DoguuMethodTable = { }; actor_process_profile_definition g_profile_Obj_Doguu = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Doguu, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Doguu_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjDoguu_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Doguu, + /* Draw Prio */ fpcDwPi_Obj_Doguu_e, /* Actor SubMtd */ &daObj_DoguuMethodTable, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_doguu_demo.cpp b/src/d/actor/d_a_obj_doguu_demo.cpp index ad886a4fb..e35e13d86 100644 --- a/src/d/actor/d_a_obj_doguu_demo.cpp +++ b/src/d/actor/d_a_obj_doguu_demo.cpp @@ -8,8 +8,6 @@ #include "d/res/res_doguud.h" #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "f_op/f_op_actor.h" #include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_mtx.h" @@ -141,18 +139,18 @@ static actor_method_class daObj_DoguuDMethodTable = { }; actor_process_profile_definition g_profile_Obj_DoguuD = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_DoguuD, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_DoguuD_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjDoguuD_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_DoguuD, + /* Draw Prio */ fpcDwPi_Obj_DoguuD_e, /* Actor SubMtd */ &daObj_DoguuDMethodTable, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_dragonhead.cpp b/src/d/actor/d_a_obj_dragonhead.cpp index 47db89b6e..4b0df7f13 100644 --- a/src/d/actor/d_a_obj_dragonhead.cpp +++ b/src/d/actor/d_a_obj_dragonhead.cpp @@ -11,8 +11,6 @@ #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" #include "d/d_cc_d.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" @@ -238,18 +236,18 @@ static actor_method_class daObj_DragonheadMethodTable = { }; actor_process_profile_definition g_profile_Obj_Dragonhead = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Dragonhead, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Dragonhead_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjDragonhead_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Dragonhead, + /* Draw Prio */ fpcDwPi_Obj_Dragonhead_e, /* Actor SubMtd */ &daObj_DragonheadMethodTable, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_drift.cpp b/src/d/actor/d_a_obj_drift.cpp index e57a0d426..92c9bc41e 100644 --- a/src/d/actor/d_a_obj_drift.cpp +++ b/src/d/actor/d_a_obj_drift.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_drift.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 000000EC-000001A0 .text CreateHeap__Q210daObjDrift5Act_cFv */ BOOL daObjDrift::Act_c::CreateHeap() { @@ -136,18 +134,18 @@ static actor_method_class Mthd_Table = { }; // namespace daObjDrift actor_process_profile_definition g_profile_Obj_Drift = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0002, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Drift, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0002, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Drift_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjDrift::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Drift, + /* Draw Prio */ fpcDwPi_Obj_Drift_e, /* Actor SubMtd */ &daObjDrift::Mthd_Table, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_eayogn.cpp b/src/d/actor/d_a_obj_eayogn.cpp index c692f1960..e9fb7ded5 100644 --- a/src/d/actor/d_a_obj_eayogn.cpp +++ b/src/d/actor/d_a_obj_eayogn.cpp @@ -10,8 +10,6 @@ #include "JSystem/JUtility/JUTAssert.h" #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" @@ -151,18 +149,18 @@ namespace { } actor_process_profile_definition g_profile_Obj_Eayogn = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Eayogn, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Eayogn_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjEayogn_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Eayogn, + /* Draw Prio */ fpcDwPi_Obj_Eayogn_e, /* Actor SubMtd */ &Eayogn_Mthd_Table, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_ebomzo.cpp b/src/d/actor/d_a_obj_ebomzo.cpp index 20e16ee59..8d72c96a4 100644 --- a/src/d/actor/d_a_obj_ebomzo.cpp +++ b/src/d/actor/d_a_obj_ebomzo.cpp @@ -9,8 +9,6 @@ #include "d/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" #include "d/res/res_ebomzo.h" -#include "d/d_procname.h" -#include "d/d_priority.h" typedef enum { /*0*/ Ebomzo_Mode_Check = 0, @@ -246,18 +244,18 @@ namespace daObjEbomzo { } actor_process_profile_definition g_profile_Obj_Ebomzo = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Ebomzo, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Ebomzo_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjEbomzo::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Ebomzo, + /* Draw Prio */ fpcDwPi_Obj_Ebomzo_e, /* Actor SubMtd */ &daObjEbomzo::Mthd_Ebomzo, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_eff.cpp b/src/d/actor/d_a_obj_eff.cpp index eb81ea282..c84eb95d7 100644 --- a/src/d/actor/d_a_obj_eff.cpp +++ b/src/d/actor/d_a_obj_eff.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_eff.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_com_inf_game.h" const GXColor daObjEff::BarrelSmokeCB::original_color = {0xAF, 0x96, 0x64, 0xFF}; @@ -460,18 +458,18 @@ namespace daObjEff { }; // namespace daObjEff actor_process_profile_definition g_profile_Obj_Eff = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0009, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Eff, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0009, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Eff_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjEff::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Eff, + /* Draw Prio */ fpcDwPi_Obj_Eff_e, /* Actor SubMtd */ &daObjEff::Mthd_Table, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_obj_ekskz.cpp b/src/d/actor/d_a_obj_ekskz.cpp index 8f7a8d3ea..672121702 100644 --- a/src/d/actor/d_a_obj_ekskz.cpp +++ b/src/d/actor/d_a_obj_ekskz.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_ekskz.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" static dCcD_SrcCyl cyl_check_src = { @@ -123,18 +121,18 @@ static actor_method_class Mthd_Ekskz = { }; // namespace daObjEkskz actor_process_profile_definition g_profile_Obj_Ekskz = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Ekskz, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Ekskz_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjEkskz::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Ekskz, + /* Draw Prio */ fpcDwPi_Obj_Ekskz_e, /* Actor SubMtd */ &daObjEkskz::Mthd_Ekskz, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_eskban.cpp b/src/d/actor/d_a_obj_eskban.cpp index 3c46a4ff2..b314e0a88 100644 --- a/src/d/actor/d_a_obj_eskban.cpp +++ b/src/d/actor/d_a_obj_eskban.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_eskban.h" #include "d/res/res_eskban.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" @@ -274,7 +272,7 @@ BOOL daObjEskban::Act_c::Execute(Mtx** pMtx) { cCcD_Obj* hitObj = mCheckSph.GetCoHitObj(); if (hitObj) { fopAc_ac_c* hitAct = hitObj->GetAc(); - if (hitAct && fopAcM_GetName(hitAct) == PROC_NPC_MD) { + if (hitAct && fopAcM_GetName(hitAct) == fpcNm_NPC_MD_e) { cXyz dist = hitAct->current.pos - current.pos; dist.y = 0; if (dist.normalizeRS()) { @@ -297,7 +295,7 @@ BOOL daObjEskban::Act_c::Execute(Mtx** pMtx) { break; } fopAc_ac_c* hitAct = hitObj->GetAc(); - if (hitAct && fopAcM_GetName(hitAct) == PROC_Bomb2) { + if (hitAct && fopAcM_GetName(hitAct) == fpcNm_Bomb2_e) { mActorID = fopAcM_GetID(hitAct); fopAcM_orderOtherEvent(this, "Eskban"); mActorState = ST_DESTROYED; @@ -423,18 +421,18 @@ static actor_method_class Mthd_Eskban = { }; // namespace daObjEskban actor_process_profile_definition g_profile_Obj_Eskban = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Eskban, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Eskban_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjEskban::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Eskban, + /* Draw Prio */ fpcDwPi_Obj_Eskban_e, /* Actor SubMtd */ &daObjEskban::Mthd_Eskban, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_ferris.cpp b/src/d/actor/d_a_obj_ferris.cpp index 47993f0f2..2bb44f6e5 100644 --- a/src/d/actor/d_a_obj_ferris.cpp +++ b/src/d/actor/d_a_obj_ferris.cpp @@ -8,8 +8,6 @@ #include "d/d_bg_s_movebg_actor.h" #include "d/d_com_inf_game.h" #include "d/d_kankyo_wether.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/res/res_skanran.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" @@ -576,18 +574,18 @@ namespace daObjFerris { } actor_process_profile_definition g_profile_Obj_Ferris = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Ferris, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Ferris_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjFerris::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Ferris, + /* Draw Prio */ fpcDwPi_Obj_Ferris_e, /* Actor SubMtd */ &daObjFerris::Mthd_Table, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_figure.cpp b/src/d/actor/d_a_obj_figure.cpp index d058be77e..53c48e8b2 100644 --- a/src/d/actor/d_a_obj_figure.cpp +++ b/src/d/actor/d_a_obj_figure.cpp @@ -13,8 +13,6 @@ #include "d/d_snap.h" #include "d/d_camera.h" #include "d/d_a_obj.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/actor/d_a_player_main.h" #include "m_Do/m_Do_controller_pad.h" @@ -1186,18 +1184,18 @@ static actor_method_class daSampleMethodTable = { }; actor_process_profile_definition g_profile_OBJ_FIGURE = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_OBJ_FIGURE, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_FIGURE_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjFigure_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_OBJ_FIGURE, + /* Draw Prio */ fpcDwPi_OBJ_FIGURE_e, /* Actor SubMtd */ &daSampleMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_firewall.cpp b/src/d/actor/d_a_obj_firewall.cpp index e264d9c80..c6db5477f 100644 --- a/src/d/actor/d_a_obj_firewall.cpp +++ b/src/d/actor/d_a_obj_firewall.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_firewall.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 00000078-000000EC .text init_mtx__15daObjFirewall_cFv */ void daObjFirewall_c::init_mtx() { @@ -162,18 +160,18 @@ static actor_method_class l_daObjFirewall_Method = { }; actor_process_profile_definition g_profile_Obj_Firewall = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Firewall, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Firewall_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjFirewall_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Firewall, + /* Draw Prio */ fpcDwPi_Obj_Firewall_e, /* Actor SubMtd */ &l_daObjFirewall_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_flame.cpp b/src/d/actor/d_a_obj_flame.cpp index 13a421106..c5a35005e 100644 --- a/src/d/actor/d_a_obj_flame.cpp +++ b/src/d/actor/d_a_obj_flame.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_flame.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 00000078-00000110 .text set_switch__Q210daObjFlame5Act_cFv */ void daObjFlame::Act_c::set_switch() { @@ -172,18 +170,18 @@ actor_method_class daObjFlame::Method::Table = { }; actor_process_profile_definition g_profile_Obj_Flame = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Flame, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Flame_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjFlame::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Flame, + /* Draw Prio */ fpcDwPi_Obj_Flame_e, /* Actor SubMtd */ &daObjFlame::Method::Table, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_ftree.cpp b/src/d/actor/d_a_obj_ftree.cpp index a23145a7f..892230388 100644 --- a/src/d/actor/d_a_obj_ftree.cpp +++ b/src/d/actor/d_a_obj_ftree.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_ftree.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 00000078-000000DC .text search_heart_part__Q210daObjFtree5Act_cFv */ void daObjFtree::Act_c::search_heart_part() { @@ -386,18 +384,18 @@ static actor_method_class Mthd_Table = { }; // namespace daObjFtree actor_process_profile_definition g_profile_Obj_Ftree = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Ftree, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Ftree_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjFtree::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Ftree, + /* Draw Prio */ fpcDwPi_Obj_Ftree_e, /* Actor SubMtd */ &daObjFtree::Mthd_Table, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_ganonbed.cpp b/src/d/actor/d_a_obj_ganonbed.cpp index 66a273e68..e83980ecb 100644 --- a/src/d/actor/d_a_obj_ganonbed.cpp +++ b/src/d/actor/d_a_obj_ganonbed.cpp @@ -10,8 +10,6 @@ #include "JSystem/JUtility/JUTAssert.h" #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" @@ -197,18 +195,18 @@ static actor_method_class l_daObjGbed_Method = { }; actor_process_profile_definition g_profile_Obj_Gbed = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Gbed, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Gbed_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjGbed_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Gbed, + /* Draw Prio */ fpcDwPi_Obj_Gbed_e, /* Actor SubMtd */ &l_daObjGbed_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_gaship.cpp b/src/d/actor/d_a_obj_gaship.cpp index 9ca3e562f..530801df5 100644 --- a/src/d/actor/d_a_obj_gaship.cpp +++ b/src/d/actor/d_a_obj_gaship.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_gaship.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" #include "d/res/res_gaship.h" @@ -31,7 +29,7 @@ void daObjGaship::Act_c::birth_flag() { cXyz offset; mDoMtx_multVec(mtx, &flag_offset[i], &offset); csXyz angle(flag_angle[i]); - fpc_ProcID pid = fopAcM_create(PROC_MAJUU_FLAG, 0x01, &offset, fopAcM_GetRoomNo(this), &angle); + fpc_ProcID pid = fopAcM_create(fpcNm_MAJUU_FLAG_e, 0x01, &offset, fopAcM_GetRoomNo(this), &angle); if (pid != fpcM_ERROR_PROCESS_ID_e) birthFlag[i] = true; } @@ -148,18 +146,18 @@ static actor_method_class Mthd_Table = { }; // namespace daObjGaship actor_process_profile_definition g_profile_Obj_Gaship = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Gaship, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Gaship_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjGaship::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Gaship, + /* Draw Prio */ fpcDwPi_Obj_Gaship_e, /* Actor SubMtd */ &daObjGaship::Mthd_Table, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_obj_gaship2.cpp b/src/d/actor/d_a_obj_gaship2.cpp index 713e83a06..9a3ba37f1 100644 --- a/src/d/actor/d_a_obj_gaship2.cpp +++ b/src/d/actor/d_a_obj_gaship2.cpp @@ -9,8 +9,6 @@ #include "SSystem/SComponent/c_bg_w.h" #include "d/d_com_inf_game.h" #include "d/d_bg_s_movebg_actor.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "m_Do/m_Do_mtx.h" const char daObjGaship2::Act_c::M_arcname[] = "YakeRom"; @@ -143,18 +141,18 @@ namespace daObjGaship2 { } actor_process_profile_definition g_profile_Obj_Gaship2 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Gaship2, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Gaship2_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjGaship2::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Gaship2, + /* Draw Prio */ fpcDwPi_Obj_Gaship2_e, /* Actor SubMtd */ &daObjGaship2::Mthd_Table, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_obj_gnnbtltaki.cpp b/src/d/actor/d_a_obj_gnnbtltaki.cpp index 8ee83cae8..3c54440a0 100644 --- a/src/d/actor/d_a_obj_gnnbtltaki.cpp +++ b/src/d/actor/d_a_obj_gnnbtltaki.cpp @@ -4,8 +4,6 @@ */ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_gnnbtltaki.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/res/res_gnnbtltaki.h" const char daObjGnnbtaki_c::M_arcname[] = "Gnnbtltaki"; @@ -139,18 +137,18 @@ namespace { }; // namespace actor_process_profile_definition g_profile_Obj_Gnnbtaki = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Gnnbtaki, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Gnnbtaki_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjGnnbtaki_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Gnnbtaki, + /* Draw Prio */ fpcDwPi_Obj_Gnnbtaki_e, /* Actor SubMtd */ &Gnnbtaki_Mthd_Table, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_gnndemotakie.cpp b/src/d/actor/d_a_obj_gnndemotakie.cpp index 3ea86fcb6..c581b7971 100644 --- a/src/d/actor/d_a_obj_gnndemotakie.cpp +++ b/src/d/actor/d_a_obj_gnndemotakie.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_gnndemotakie.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/res/res_gnndemotakie.h" const char daObjGnntakie_c::M_arcname[] = "Gnndemotakie"; @@ -116,18 +114,18 @@ static actor_method_class Gnntakie_Mthd_Table = { }; // namespace actor_process_profile_definition g_profile_Obj_Gnntakie = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Gnntakie, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Gnntakie_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjGnntakie_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Gnntakie, + /* Draw Prio */ fpcDwPi_Obj_Gnntakie_e, /* Actor SubMtd */ &Gnntakie_Mthd_Table, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_gnndemotakis.cpp b/src/d/actor/d_a_obj_gnndemotakis.cpp index 6c8b46666..c137c3a8b 100644 --- a/src/d/actor/d_a_obj_gnndemotakis.cpp +++ b/src/d/actor/d_a_obj_gnndemotakis.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/res/res_gnndemotakis.h" #include "d/actor/d_a_obj_gnndemotakis.h" -#include "d/d_procname.h" -#include "d/d_priority.h" const char daObjGnntakis_c::M_arcname[] = "Gnndemotakis"; @@ -133,18 +131,18 @@ static actor_method_class Gnntakis_Mthd_Table = { }; // namespace actor_process_profile_definition g_profile_Obj_Gnntakis = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Gnntakis, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Gnntakis_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjGnntakis_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Gnntakis, + /* Draw Prio */ fpcDwPi_Obj_Gnntakis_e, /* Actor SubMtd */ &Gnntakis_Mthd_Table, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_gong.cpp b/src/d/actor/d_a_obj_gong.cpp index 7df124a2e..5a154c26b 100644 --- a/src/d/actor/d_a_obj_gong.cpp +++ b/src/d/actor/d_a_obj_gong.cpp @@ -12,8 +12,6 @@ #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" #include "d/d_drawlist.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" @@ -175,18 +173,18 @@ namespace daObjGong { } actor_process_profile_definition g_profile_Obj_Gong = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Gong, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Gong_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjGong::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Gong, + /* Draw Prio */ fpcDwPi_Obj_Gong_e, /* Actor SubMtd */ &daObjGong::Mthd_Table, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_gryw00.cpp b/src/d/actor/d_a_obj_gryw00.cpp index 133f2fa42..314e25378 100644 --- a/src/d/actor/d_a_obj_gryw00.cpp +++ b/src/d/actor/d_a_obj_gryw00.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/d_com_inf_game.h" #include "d/d_particle.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/actor/d_a_obj_gryw00.h" #include "d/res/res_gryw00.h" @@ -304,18 +302,18 @@ static actor_method_class l_daObjGryw00_Method = { }; actor_process_profile_definition g_profile_Obj_Gryw00 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Gryw00, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Gryw00_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjGryw00_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Gryw00, + /* Draw Prio */ fpcDwPi_Obj_Gryw00_e, /* Actor SubMtd */ &l_daObjGryw00_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_gtaki.cpp b/src/d/actor/d_a_obj_gtaki.cpp index 9b61cdae4..bee08a361 100644 --- a/src/d/actor/d_a_obj_gtaki.cpp +++ b/src/d/actor/d_a_obj_gtaki.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_gtaki.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" #include "d/res/res_gtaki.h" #include "m_Do/m_Do_graphic.h" @@ -213,18 +211,18 @@ static actor_method_class daObj_GtakiMethodTable = { }; actor_process_profile_definition g_profile_Obj_Gtaki = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Gtaki, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Gtaki_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjGtaki_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Gtaki, + /* Draw Prio */ fpcDwPi_Obj_Gtaki_e, /* Actor SubMtd */ &daObj_GtakiMethodTable, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_hami2.cpp b/src/d/actor/d_a_obj_hami2.cpp index 0032c1bbc..086dfd6b4 100644 --- a/src/d/actor/d_a_obj_hami2.cpp +++ b/src/d/actor/d_a_obj_hami2.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_hami2.h" #include "m_Do/m_Do_ext.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 00000078-0000012C .text nodeCallBack__FP7J3DNodei */ static BOOL nodeCallBack(J3DNode*, int) { @@ -127,18 +125,18 @@ static actor_method_class Mthd_Hami2 = { }; // namespace daObjHami2 actor_process_profile_definition g_profile_Obj_Hami2 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Hami2, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Hami2_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjHami2::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Hami2, + /* Draw Prio */ fpcDwPi_Obj_Hami2_e, /* Actor SubMtd */ &daObjHami2::Mthd_Hami2, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_hami3.cpp b/src/d/actor/d_a_obj_hami3.cpp index 31fca679c..67b562819 100644 --- a/src/d/actor/d_a_obj_hami3.cpp +++ b/src/d/actor/d_a_obj_hami3.cpp @@ -7,8 +7,6 @@ #include "d/actor/d_a_obj_hami3.h" #include "SSystem/SComponent/c_lib.h" #include "d/d_com_inf_game.h" -#include "d/d_priority.h" -#include "d/d_procname.h" #include "d/res/res_hami3.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" @@ -251,18 +249,18 @@ static actor_method_class Mthd_Hami3 = { }; // namespace daObjHami3 actor_process_profile_definition g_profile_Obj_Hami3 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Hami3, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Hami3_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjHami3::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Hami3, + /* Draw Prio */ fpcDwPi_Obj_Hami3_e, /* Actor SubMtd */ &daObjHami3::Mthd_Hami3, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_hami4.cpp b/src/d/actor/d_a_obj_hami4.cpp index 466c4ff1a..cba70edee 100644 --- a/src/d/actor/d_a_obj_hami4.cpp +++ b/src/d/actor/d_a_obj_hami4.cpp @@ -7,8 +7,6 @@ #include "d/actor/d_a_obj_hami4.h" #include "JSystem/J3DGraphAnimator/J3DModel.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/res/res_hami4.h" /* 00000078-00000098 .text CheckCreateHeap__FP10fopAc_ac_c */ @@ -207,18 +205,18 @@ static actor_method_class daObj_Hami4MethodTable = { }; actor_process_profile_definition g_profile_Obj_Hami4 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Hami4, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Hami4_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjHami4_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Hami4, + /* Draw Prio */ fpcDwPi_Obj_Hami4_e, /* Actor SubMtd */ &daObj_Hami4MethodTable, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_hat.cpp b/src/d/actor/d_a_obj_hat.cpp index d6a5c19c3..fb3e24b7c 100644 --- a/src/d/actor/d_a_obj_hat.cpp +++ b/src/d/actor/d_a_obj_hat.cpp @@ -9,8 +9,6 @@ #include "d/d_a_obj.h" #include "d/d_com_inf_game.h" #include "d/d_kankyo.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/res/res_ro.h" #include "JSystem/J3DGraphAnimator/J3DModel.h" @@ -246,18 +244,18 @@ static actor_method_class daSampleMethodTable = { }; actor_process_profile_definition g_profile_OBJ_HAT = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_OBJ_HAT, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_HAT_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjHat_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_OBJ_HAT, + /* Draw Prio */ fpcDwPi_OBJ_HAT_e, /* Actor SubMtd */ &daSampleMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_hbrf1.cpp b/src/d/actor/d_a_obj_hbrf1.cpp index 07af56254..115c132a7 100644 --- a/src/d/actor/d_a_obj_hbrf1.cpp +++ b/src/d/actor/d_a_obj_hbrf1.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_hbrf1.h" #include "d/res/res_hbrf1.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_com_inf_game.h" Mtx daObjHbrf1::Act_c::M_tmp_mtx; @@ -296,18 +294,18 @@ static actor_method_class Mthd_Hbrf1 = { }; // namespace daObjHbrf1 actor_process_profile_definition g_profile_Obj_Hbrf1 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Hbrf1, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Hbrf1_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjHbrf1::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Hbrf1, + /* Draw Prio */ fpcDwPi_Obj_Hbrf1_e, /* Actor SubMtd */ &daObjHbrf1::Mthd_Hbrf1, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_hcbh.cpp b/src/d/actor/d_a_obj_hcbh.cpp index 2350eed46..b4b0ecc79 100644 --- a/src/d/actor/d_a_obj_hcbh.cpp +++ b/src/d/actor/d_a_obj_hcbh.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_hcbh.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 00000078-000000D8 .text chk_appear__11daObjHcbh_cFv */ void daObjHcbh_c::chk_appear() { @@ -122,18 +120,18 @@ static actor_method_class l_daObjHcbh_Method = { }; actor_process_profile_definition g_profile_Obj_Hcbh = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Hcbh, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Hcbh_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjHcbh_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Hcbh, + /* Draw Prio */ fpcDwPi_Obj_Hcbh_e, /* Actor SubMtd */ &l_daObjHcbh_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_hfuck1.cpp b/src/d/actor/d_a_obj_hfuck1.cpp index e1751eefd..26517bdd1 100644 --- a/src/d/actor/d_a_obj_hfuck1.cpp +++ b/src/d/actor/d_a_obj_hfuck1.cpp @@ -10,8 +10,6 @@ #include "JSystem/JUtility/JUTAssert.h" #include "d/d_cc_d.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/actor/d_a_player.h" #include "m_Do/m_Do_ext.h" #if VERSION == VERSION_DEMO @@ -59,7 +57,7 @@ namespace { }; #if VERSION == VERSION_DEMO -daObjHfuck1_HIO_c l_HIO; +static daObjHfuck1_HIO_c l_HIO; daObjHfuck1_HIO_c::daObjHfuck1_HIO_c() { mNo = -1; @@ -205,7 +203,7 @@ bool daObjHfuck1_c::_execute() { #endif if (mpHookshotActor != NULL) { - if (fopAcM_IsActor(mpHookshotActor) == TRUE && fopAcM_GetName(mpHookshotActor) == PROC_HOOKSHOT) { + if (fopAcM_IsActor(mpHookshotActor) == TRUE && fopAcM_GetName(mpHookshotActor) == fpcNm_HOOKSHOT_e) { daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); if (player != NULL) { player->setHookshotCarryOffset(fopAcM_GetID(this), (const cXyz*)&l_hook_offset); @@ -262,18 +260,18 @@ static actor_method_class l_daObjHfuck1_Method = { }; actor_process_profile_definition g_profile_Obj_Hfuck1 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Hfuck1, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Hfuck1_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjHfuck1_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Hfuck1, + /* Draw Prio */ fpcDwPi_Obj_Hfuck1_e, /* Actor SubMtd */ &l_daObjHfuck1_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e | fopAcStts_UNK200000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_3_e, + /* Cull Type */ fopAc_CULLBOX_3_e, }; diff --git a/src/d/actor/d_a_obj_hha.cpp b/src/d/actor/d_a_obj_hha.cpp index 2b4861c7e..fdd3b36f4 100644 --- a/src/d/actor/d_a_obj_hha.cpp +++ b/src/d/actor/d_a_obj_hha.cpp @@ -9,12 +9,10 @@ #include "d/d_bg_s_func.h" #include "d/d_bg_s_wtr_chk.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/res/res_hha.h" #if VERSION == VERSION_DEMO -dCcD_SrcCyl l_daObjHha_cyl_data = +static dCcD_SrcCyl l_daObjHha_cyl_data = #else const dCcD_SrcCyl daObjHha_c::M_cyl_data = #endif @@ -714,18 +712,18 @@ static actor_method_class Hha_Mthd_Table = { }; // namespace actor_process_profile_definition g_profile_Obj_Hha = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Hha, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Hha_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjHha_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Hha, + /* Draw Prio */ fpcDwPi_Obj_Hha_e, /* Actor SubMtd */ &Hha_Mthd_Table, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_hlift.cpp b/src/d/actor/d_a_obj_hlift.cpp index 6a7c9ee10..3afc2aa72 100644 --- a/src/d/actor/d_a_obj_hlift.cpp +++ b/src/d/actor/d_a_obj_hlift.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_hlift.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/res/res_hlift.h" namespace daObjHlift { @@ -364,18 +362,18 @@ static actor_method_class Mthd_Table = { }; // namespace daObjHlift actor_process_profile_definition g_profile_Obj_Hlift = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Hlift, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Hlift_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjHlift::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Hlift, + /* Draw Prio */ fpcDwPi_Obj_Hlift_e, /* Actor SubMtd */ &daObjHlift::Mthd_Table, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_hole.cpp b/src/d/actor/d_a_obj_hole.cpp index 839e531a8..6d6be3c74 100644 --- a/src/d/actor/d_a_obj_hole.cpp +++ b/src/d/actor/d_a_obj_hole.cpp @@ -10,8 +10,6 @@ #include "d/d_bg_s_acch.h" #include "d/d_com_inf_game.h" #include "d/d_lib.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "f_op/f_op_actor_mng.h" #include "f_op/f_op_camera_mng.h" #include "JSystem/JUtility/JUTAssert.h" @@ -320,18 +318,18 @@ static actor_method_class daObj_HoleMethodTable = { }; actor_process_profile_definition g_profile_OBJ_HOLE = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_OBJ_HOLE, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_HOLE_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObj_Hole_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_OBJ_HOLE, + /* Draw Prio */ fpcDwPi_OBJ_HOLE_e, /* Actor SubMtd */ &daObj_HoleMethodTable, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_4_e, + /* Cull Type */ fopAc_CULLBOX_4_e, }; diff --git a/src/d/actor/d_a_obj_homen.cpp b/src/d/actor/d_a_obj_homen.cpp index cc08e798c..41a5877e4 100644 --- a/src/d/actor/d_a_obj_homen.cpp +++ b/src/d/actor/d_a_obj_homen.cpp @@ -7,8 +7,6 @@ #include "d/actor/d_a_obj_homen.h" #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/res/res_homen.h" #include "f_op/f_op_actor_mng.h" @@ -410,17 +408,17 @@ void Act_c::make_enemy() { /* 0x04 */ u32 param; }; // Size: 0x08 static const enemy_dat_s make_enemy_dat[] = { - /* 0x0 */ { PROC_BK, 0xFFFF0000 }, - /* 0x1 */ { PROC_BK, 0xFFFF0020 }, - /* 0x2 */ { PROC_BK, 0xFFFF0040 }, - /* 0x3 */ { PROC_BK, 0xFFFF0060 }, - /* 0x4 */ { PROC_BK, 0xFFFF0080 }, - /* 0x5 */ { PROC_BK, 0xFFFF00A0 }, - /* 0x6 */ { PROC_CC, 0xFF000000 }, - /* 0x7 */ { PROC_CC, 0xFF000100 }, - /* 0x8 */ { PROC_CC, 0xFF000200 }, - /* 0x9 */ { PROC_CC, 0xFF000300 }, - /* 0xA */ { PROC_CC, 0xFF000400 }, + /* 0x0 */ { fpcNm_BK_e, 0xFFFF0000 }, + /* 0x1 */ { fpcNm_BK_e, 0xFFFF0020 }, + /* 0x2 */ { fpcNm_BK_e, 0xFFFF0040 }, + /* 0x3 */ { fpcNm_BK_e, 0xFFFF0060 }, + /* 0x4 */ { fpcNm_BK_e, 0xFFFF0080 }, + /* 0x5 */ { fpcNm_BK_e, 0xFFFF00A0 }, + /* 0x6 */ { fpcNm_CC_e, 0xFF000000 }, + /* 0x7 */ { fpcNm_CC_e, 0xFF000100 }, + /* 0x8 */ { fpcNm_CC_e, 0xFF000200 }, + /* 0x9 */ { fpcNm_CC_e, 0xFF000300 }, + /* 0xA */ { fpcNm_CC_e, 0xFF000400 }, }; int enemy_idx = param_get_enemy(); @@ -626,7 +624,7 @@ void Act_c::process_falldown_main() { if (sp34.y < mGroundY) { fpc_ProcID smoke_id = fopAcM_createChild( - PROC_Obj_Homensmk, + fpcNm_Obj_Homensmk_e, fopAcM_GetID(this), field_0x7EC << 1 | mType, ¤t.pos, @@ -895,18 +893,18 @@ static actor_method_class Mthd_Table = { }; // namespace daObjHomen actor_process_profile_definition g_profile_Obj_Homen = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Homen, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Homen_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjHomen::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Homen, + /* Draw Prio */ fpcDwPi_Obj_Homen_e, /* Actor SubMtd */ &daObjHomen::Mthd_Table, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_homensmoke.cpp b/src/d/actor/d_a_obj_homensmoke.cpp index 8067e847b..c07fd1948 100644 --- a/src/d/actor/d_a_obj_homensmoke.cpp +++ b/src/d/actor/d_a_obj_homensmoke.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_homensmoke.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_particle.h" #include "m_Do/m_Do_mtx.h" #include "d/d_com_inf_game.h" @@ -168,18 +166,18 @@ namespace { }; // namespace daObjHomensmoke actor_process_profile_definition g_profile_Obj_Homensmk = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Homensmk, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Homensmk_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjHomensmoke::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Homensmk, + /* Draw Prio */ fpcDwPi_Obj_Homensmk_e, /* Actor SubMtd */ &daObjHomensmoke::Mthd_Table, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_hsehi1.cpp b/src/d/actor/d_a_obj_hsehi1.cpp index 90687c81d..263c075dc 100644 --- a/src/d/actor/d_a_obj_hsehi1.cpp +++ b/src/d/actor/d_a_obj_hsehi1.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_hsehi1.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 000000EC-00000130 .text __ct__15daObj_hsh_HIO_cFv */ daObj_hsh_HIO_c::daObj_hsh_HIO_c() { @@ -288,18 +286,18 @@ static actor_method_class l_daObj_hsh_Method = { }; actor_process_profile_definition g_profile_Obj_HSH = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_HSH, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_HSH_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObj_hsh_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_HSH, + /* Draw Prio */ fpcDwPi_Obj_HSH_e, /* Actor SubMtd */ &l_daObj_hsh_Method, /* Status */ 0x04 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_obj_htetu1.cpp b/src/d/actor/d_a_obj_htetu1.cpp index a29ef4f4d..251a33a04 100644 --- a/src/d/actor/d_a_obj_htetu1.cpp +++ b/src/d/actor/d_a_obj_htetu1.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_htetu1.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 00000078-00000178 .text create_s__19daObjHtetu1Splash_cFUsP4cXyzP5csXyzP12dKy_tevstr_c */ void daObjHtetu1Splash_c::create_s(unsigned short, cXyz*, csXyz*, dKy_tevstr_c*) { @@ -104,18 +102,18 @@ static actor_method_class Htetu1_Mthd_Table = { }; // namespace actor_process_profile_definition g_profile_Obj_Htetu1 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Htetu1, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Htetu1_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjHtetu1_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Htetu1, + /* Draw Prio */ fpcDwPi_Obj_Htetu1_e, /* Actor SubMtd */ &Htetu1_Mthd_Table, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_ice.cpp b/src/d/actor/d_a_obj_ice.cpp index 277d4677a..53ac68377 100644 --- a/src/d/actor/d_a_obj_ice.cpp +++ b/src/d/actor/d_a_obj_ice.cpp @@ -8,8 +8,6 @@ #include "d/d_camera.h" #include "d/d_com_inf_game.h" #include "d/d_kankyo_rain.h" -#include "d/d_priority.h" -#include "d/d_procname.h" #include "d/res/res_ikori.h" #include "f_op/f_op_actor_mng.h" #include "f_op/f_op_camera.h" @@ -564,18 +562,18 @@ static actor_method_class l_daObjIce_Method = { }; actor_process_profile_definition g_profile_Obj_Ice = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0008, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Ice, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0008, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Ice_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjIce_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Ice, + /* Draw Prio */ fpcDwPi_Obj_Ice_e, /* Actor SubMtd */ &l_daObjIce_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_iceisland.cpp b/src/d/actor/d_a_obj_iceisland.cpp index 3fd585877..b85fc238e 100644 --- a/src/d/actor/d_a_obj_iceisland.cpp +++ b/src/d/actor/d_a_obj_iceisland.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_iceisland.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "d/res/res_gicel.h" #include "JSystem/JKernel/JKRExpHeap.h" @@ -284,18 +282,18 @@ static actor_method_class daObj_IceislandMethodTable = { }; actor_process_profile_definition g_profile_Obj_Iceisland = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Iceisland, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Iceisland_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjIceisland_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Iceisland, + /* Draw Prio */ fpcDwPi_Obj_Iceisland_e, /* Actor SubMtd */ &daObj_IceislandMethodTable, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_ikada.cpp b/src/d/actor/d_a_obj_ikada.cpp index abfcef598..c2c92504f 100644 --- a/src/d/actor/d_a_obj_ikada.cpp +++ b/src/d/actor/d_a_obj_ikada.cpp @@ -12,8 +12,6 @@ #include "d/d_cc_d.h" #include "d/d_com_inf_game.h" #include "d/d_lib.h" -#include "d/d_priority.h" -#include "d/d_procname.h" #include "d/d_s_play.h" #include "d/d_snap.h" #include "d/res/res_always.h" @@ -192,7 +190,7 @@ void daObj_Ikada_c::_ride(fopAc_ac_c* actor) { mbIsLinkRiding = true; } - if (fopAcM_GetName(actor) == PROC_BOMB) { + if (fopAcM_GetName(actor) == fpcNm_BOMB_e) { daBomb_c* bomb = (daBomb_c*)actor; if (bomb->getBombRestTime() <= 1) { @@ -1371,7 +1369,7 @@ void daObj_Ikada_c::createInit() { static const u32 params[] = {4, 4, 4, 4, 0x2000000}; static const f32 flag_scale[] = {0.2f, 0.0f, 0.0f, 0.0f, 0.12f}; - mFlagPcId = fopAcM_create(PROC_MAJUU_FLAG, params[mType], ¤t.pos, tevStr.mRoomNo, ¤t.angle); + mFlagPcId = fopAcM_create(fpcNm_MAJUU_FLAG_e, params[mType], ¤t.pos, tevStr.mRoomNo, ¤t.angle); mFlagOffset = flag_offset[mType]; mFlagScale = flag_scale[mType]; } @@ -1576,18 +1574,18 @@ static actor_method_class daObj_IkadaMethodTable = { }; actor_process_profile_definition g_profile_OBJ_IKADA = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_OBJ_IKADA, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_IKADA_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObj_Ikada_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_OBJ_IKADA, + /* Draw Prio */ fpcDwPi_OBJ_IKADA_e, /* Actor SubMtd */ &daObj_IkadaMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_jump.cpp b/src/d/actor/d_a_obj_jump.cpp index 3f216c51e..19b48b10a 100644 --- a/src/d/actor/d_a_obj_jump.cpp +++ b/src/d/actor/d_a_obj_jump.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_jump.h" #include "d/actor/d_a_player.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/res/res_hjump.h" namespace daObjJump { @@ -252,7 +250,7 @@ void daObjJump::Act_c::rideCB(dBgW*, fopAc_ac_c* param_2, fopAc_ac_c* param_3) { Act_c* i_this = (Act_c *) param_2; daPy_py_c* player = (daPy_py_c *) param_3; i_this->mIsRide = true; - if (fopAcM_GetProfName(param_3) == PROC_PLAYER) { + if (fopAcM_GetProfName(param_3) == fpcNm_PLAYER_e) { i_this->mIsPlayerRide = true; if (player->checkEquipHeavyBoots()) { i_this->mIsHeavyRide = true; @@ -468,18 +466,18 @@ static actor_method_class Mthd_Table = { }; // namespace daObjJump actor_process_profile_definition g_profile_Obj_Jump = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0004, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Jump, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0004, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Jump_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjJump::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Jump, + /* Draw Prio */ fpcDwPi_Obj_Jump_e, /* Actor SubMtd */ &daObjJump::Mthd_Table, /* Status */ 0x04 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_kanat.cpp b/src/d/actor/d_a_obj_kanat.cpp index 86ebf1d36..49575d445 100644 --- a/src/d/actor/d_a_obj_kanat.cpp +++ b/src/d/actor/d_a_obj_kanat.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_kanat.h" #include "d/res/res_kanat.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "m_Do/m_Do_mtx.h" #include "d/d_com_inf_game.h" @@ -155,18 +153,18 @@ namespace daObjKanat { } actor_process_profile_definition g_profile_Obj_Kanat = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Kanat, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Kanat_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjKanat::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Kanat, + /* Draw Prio */ fpcDwPi_Obj_Kanat_e, /* Actor SubMtd */ &daObjKanat::Mthd_Kanat, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_kanoke.cpp b/src/d/actor/d_a_obj_kanoke.cpp index c1e9c416b..3af5cacc4 100644 --- a/src/d/actor/d_a_obj_kanoke.cpp +++ b/src/d/actor/d_a_obj_kanoke.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_kanoke.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" static dCcD_SrcCps l_cps_src_body = { @@ -225,18 +223,18 @@ static actor_method_class daObjKanokeMethodTable = { }; actor_process_profile_definition g_profile_Obj_Kanoke = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Kanoke, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Kanoke_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjKanoke_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Kanoke, + /* Draw Prio */ fpcDwPi_Obj_Kanoke_e, /* Actor SubMtd */ &daObjKanokeMethodTable, /* Status */ 0x04 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_ladder.cpp b/src/d/actor/d_a_obj_ladder.cpp index 89e2b9be7..cab25b6b7 100644 --- a/src/d/actor/d_a_obj_ladder.cpp +++ b/src/d/actor/d_a_obj_ladder.cpp @@ -7,8 +7,6 @@ #include "d/actor/d_a_obj_ladder.h" #include "d/res/res_mhsg.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" Mtx daObjLadder::Act_c::M_tmp_mtx; @@ -343,18 +341,18 @@ static actor_method_class Mthd_Table = { }; // namespace daObjLadder actor_process_profile_definition g_profile_Obj_Ladder = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Ladder, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Ladder_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjLadder::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Ladder, + /* Draw Prio */ fpcDwPi_Obj_Ladder_e, /* Actor SubMtd */ &daObjLadder::Mthd_Table, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_leaves.cpp b/src/d/actor/d_a_obj_leaves.cpp index 99e3f7fd2..ddfdbe29e 100644 --- a/src/d/actor/d_a_obj_leaves.cpp +++ b/src/d/actor/d_a_obj_leaves.cpp @@ -8,9 +8,7 @@ #include "d/actor/d_a_player.h" #include "d/res/res_vochi.h" #include "d/d_bg_w.h" -#include "d/d_procname.h" #include "d/d_com_inf_game.h" -#include "d/d_priority.h" #include "d/d_bg_w.h" #if VERSION == VERSION_DEMO @@ -259,7 +257,7 @@ void daObjLeaves_c::birthEffect(int arg1, cXyz* arg2, csXyz* arg3, GXColor* arg4 void rideCallBack(dBgW*, fopAc_ac_c* a_this, fopAc_ac_c* a_player) { daObjLeaves_c* i_this = (daObjLeaves_c*)a_this; - if (fopAcM_GetName(a_player) == PROC_PLAYER) { + if (fopAcM_GetName(a_player) == fpcNm_PLAYER_e) { daPy_py_c* player = (daPy_py_c*)a_player; #if VERSION == VERSION_DEMO if (player->speedF >= l_HIO.m14) { @@ -791,18 +789,18 @@ static actor_method_class l_daObjLeaves_Method = { }; actor_process_profile_definition g_profile_Obj_Leaves = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Leaves, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Leaves_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjLeaves_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Leaves, + /* Draw Prio */ fpcDwPi_Obj_Leaves_e, /* Actor SubMtd */ &l_daObjLeaves_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_3_e, + /* Cull Type */ fopAc_CULLBOX_3_e, }; diff --git a/src/d/actor/d_a_obj_light.cpp b/src/d/actor/d_a_obj_light.cpp index 47a1596f2..199c1882b 100644 --- a/src/d/actor/d_a_obj_light.cpp +++ b/src/d/actor/d_a_obj_light.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_light.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 000000EC-00000110 .text solidHeapCB__Q210daObjLight5Act_cFP10fopAc_ac_c */ void daObjLight::Act_c::solidHeapCB(fopAc_ac_c*) { @@ -141,18 +139,18 @@ static actor_method_class Mthd_Table = { }; // namespace daObjLight actor_process_profile_definition g_profile_Obj_Light = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Light, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Light_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjLight::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Light, + /* Draw Prio */ fpcDwPi_Obj_Light_e, /* Actor SubMtd */ &daObjLight::Mthd_Table, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lpalm.cpp b/src/d/actor/d_a_obj_lpalm.cpp index 0c67b3078..a20f239a7 100644 --- a/src/d/actor/d_a_obj_lpalm.cpp +++ b/src/d/actor/d_a_obj_lpalm.cpp @@ -7,8 +7,6 @@ #include "d/actor/d_a_obj_lpalm.h" #include "d/d_com_inf_game.h" #include "d/d_kankyo_wether.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/res/res_oyashi.h" #include "m_Do/m_Do_ext.h" @@ -202,18 +200,18 @@ static actor_method_class daObjLpalmMethodTable = { }; actor_process_profile_definition g_profile_Obj_Lpalm = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Lpalm, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lpalm_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjLpalm_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Lpalm, + /* Draw Prio */ fpcDwPi_Obj_Lpalm_e, /* Actor SubMtd */ &daObjLpalmMethodTable, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_magmarock.cpp b/src/d/actor/d_a_obj_magmarock.cpp index fe5c4c578..ae1de3ab3 100644 --- a/src/d/actor/d_a_obj_magmarock.cpp +++ b/src/d/actor/d_a_obj_magmarock.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_magmarock.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 00000078-00000128 .text set_mtx__Q214daObjMagmarock5Act_cFv */ void daObjMagmarock::Act_c::set_mtx() { @@ -152,18 +150,18 @@ actor_method_class daObjMagmarock::Method::Table = { }; actor_process_profile_definition g_profile_Obj_Magmarock = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Magmarock, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Magmarock_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjMagmarock::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Magmarock, + /* Draw Prio */ fpcDwPi_Obj_Magmarock_e, /* Actor SubMtd */ &daObjMagmarock::Method::Table, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_majyuu_door.cpp b/src/d/actor/d_a_obj_majyuu_door.cpp index aa6df1687..c3bebac6b 100644 --- a/src/d/actor/d_a_obj_majyuu_door.cpp +++ b/src/d/actor/d_a_obj_majyuu_door.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_majyuu_door.h" #include "d/d_cc_d.h" -#include "d/d_procname.h" -#include "d/d_priority.h" static dCcD_SrcCyl l_cyl_src = { // dCcD_SrcGObjInf @@ -159,18 +157,18 @@ static actor_method_class daObj_MjDoorMethodTable = { }; actor_process_profile_definition g_profile_OBJ_MJDOOR = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_OBJ_MJDOOR, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_MJDOOR_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObj_MjDoor_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_OBJ_MJDOOR, + /* Draw Prio */ fpcDwPi_OBJ_MJDOOR_e, /* Actor SubMtd */ &daObj_MjDoorMethodTable, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_4_e, + /* Cull Type */ fopAc_CULLBOX_4_e, }; diff --git a/src/d/actor/d_a_obj_mkie.cpp b/src/d/actor/d_a_obj_mkie.cpp index 41467a197..b7e34f5c1 100644 --- a/src/d/actor/d_a_obj_mkie.cpp +++ b/src/d/actor/d_a_obj_mkie.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_mkie.h" #include "d/res/res_mkieb.h" -#include "d/d_procname.h" -#include "d/d_priority.h" Mtx daObjMkie::Act_c::M_tmp_mtx; const char daObjMkie::Act_c::M_arcname[] = "MkieB"; @@ -478,18 +476,18 @@ static actor_method_class Mthd_Table = { }; // namespace daObjMkie actor_process_profile_definition g_profile_Obj_Mkie = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Mkie, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Mkie_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjMkie::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Mkie, + /* Draw Prio */ fpcDwPi_Obj_Mkie_e, /* Actor SubMtd */ &daObjMkie::Mthd_Table, /* Status */ 0x04 | fopAcStts_SHOWMAP_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_mkiek.cpp b/src/d/actor/d_a_obj_mkiek.cpp index 6946c696c..e6b7bb3a1 100644 --- a/src/d/actor/d_a_obj_mkiek.cpp +++ b/src/d/actor/d_a_obj_mkiek.cpp @@ -8,8 +8,6 @@ #include "d/d_com_inf_game.h" #include "d/d_a_obj.h" #include "d/d_particle_name.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" #include "d/res/res_mkiek.h" #include "f_op/f_op_actor_mng.h" @@ -282,18 +280,18 @@ static actor_method_class Mthd_Table = { }; // namespace daObjMkiek actor_process_profile_definition g_profile_Obj_Mkiek = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Mkiek, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Mkiek_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjMkiek::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Mkiek, + /* Draw Prio */ fpcDwPi_Obj_Mkiek_e, /* Actor SubMtd */ &daObjMkiek::Mthd_Table, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_mknjd.cpp b/src/d/actor/d_a_obj_mknjd.cpp index 0ddc32d01..92766f278 100644 --- a/src/d/actor/d_a_obj_mknjd.cpp +++ b/src/d/actor/d_a_obj_mknjd.cpp @@ -14,8 +14,6 @@ #include "JSystem/J3DGraphBase/J3DSys.h" #include "JAZelAudio/JAIZelBasic.h" #include "SSystem/SComponent/c_xyz.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "d/d_bg_s_movebg_actor.h" #include "d/d_bg_w.h" @@ -153,7 +151,7 @@ static s16 daObjMknjD_XyEventCB(void* i_this, int i_param2) { /* 000002F0-00000314 .text XyCheckCB__Q210daObjMknjD5Act_cFi */ s16 daObjMknjD::Act_c::XyCheckCB(int i_itemBtn) { - if (dComIfGp_getSelectItem(i_itemBtn) == dItem_WIND_WAKER_e) { + if (dComIfGp_getSelectItem(i_itemBtn) == dItemNo_WIND_WAKER_e) { return TRUE; } else { return FALSE; @@ -259,7 +257,7 @@ BOOL daObjMknjD::Act_c::Create() { mLessonEventIdx = dComIfGp_evmng_getEventIdx(daObjMknjD_EventName[7]); mMelodyNum = 4; - mGiveItemNo = TACT_SONG5; + mGiveItemNo = dItemNo_WIND_GODS_ARIA_e; eventInfo.setEventName("MKNJD_K_TALK"); m0430 = dSv_event_flag_c::UNK_2910; } @@ -270,7 +268,7 @@ BOOL daObjMknjD::Act_c::Create() { mLessonEventIdx = dComIfGp_evmng_getEventIdx(daObjMknjD_EventName[6]); mMelodyNum = 3; - mGiveItemNo = TACT_SONG4; + mGiveItemNo = dItemNo_EARTH_GODS_LYRIC_e; eventInfo.setEventName("MKNJD_D_TALK"); m0430 = dSv_event_flag_c::UNK_2920; } @@ -567,7 +565,7 @@ void daObjMknjD::Act_c::privateCut() { /* 00001348-00001400 .text manage_friend_draw__10daObjMknjDFi */ void daObjMknjD::manage_friend_draw(int i_param1) { - fopAc_ac_c* judgeResult = fopAcM_SearchByName(PROC_NPC_MD); + fopAc_ac_c* judgeResult = fopAcM_SearchByName(fpcNm_NPC_MD_e); if (judgeResult != NULL) { if (i_param1 == 1) { @@ -577,7 +575,7 @@ void daObjMknjD::manage_friend_draw(int i_param1) { } } - judgeResult = fopAcM_SearchByName(PROC_NPC_CB1); + judgeResult = fopAcM_SearchByName(fpcNm_NPC_CB1_e); if (judgeResult != NULL) { if (i_param1 == 1) { @@ -773,7 +771,7 @@ BOOL daObjMknjD::Act_c::Execute(Mtx** i_mtx) { fopAcM_orderChangeEventId(this, mDemoEventIdx, 0, 0xFFFF); dComIfGs_onEventBit(m0430); - s16 procMedli = PROC_NPC_MD; + s16 procMedli = fpcNm_NPC_MD_e; void* judgeResult = fopAcIt_Judge(fpcSch_JudgeForPName, &procMedli); if (judgeResult != NULL) { @@ -1051,18 +1049,18 @@ namespace daObjMknjD { } actor_process_profile_definition g_profile_Obj_MknjD = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_MknjD, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_MknjD_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjMknjD::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_MknjD, + /* Draw Prio */ fpcDwPi_Obj_MknjD_e, /* Actor SubMtd */ &daObjMknjD::Mthd_Table, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_mmrr.cpp b/src/d/actor/d_a_obj_mmrr.cpp index 0568479da..ad88d59da 100644 --- a/src/d/actor/d_a_obj_mmrr.cpp +++ b/src/d/actor/d_a_obj_mmrr.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_mmrr.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 00000078-000000AC .text end__Q29daObjMmrr5Eff_cFv */ void daObjMmrr::Eff_c::end() { @@ -136,18 +134,18 @@ static actor_method_class Mthd_Table = { }; // namespace daObjMmrr actor_process_profile_definition g_profile_Obj_Mmrr = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Mmrr, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Mmrr_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjMmrr::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Mmrr, + /* Draw Prio */ fpcDwPi_Obj_Mmrr_e, /* Actor SubMtd */ &daObjMmrr::Mthd_Table, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_monument.cpp b/src/d/actor/d_a_obj_monument.cpp index ddcff725f..e763ad063 100644 --- a/src/d/actor/d_a_obj_monument.cpp +++ b/src/d/actor/d_a_obj_monument.cpp @@ -10,8 +10,6 @@ #include "JSystem/JUtility/JUTAssert.h" #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" @@ -157,18 +155,18 @@ namespace daObjMonument { } actor_process_profile_definition g_profile_Obj_Monument = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Monument, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Monument_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjMonument::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Monument, + /* Draw Prio */ fpcDwPi_Obj_Monument_e, /* Actor SubMtd */ &daObjMonument::Mthd_Table, /* Status */ 0x18 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_obj_movebox.cpp b/src/d/actor/d_a_obj_movebox.cpp index 32086359f..10e7761ab 100644 --- a/src/d/actor/d_a_obj_movebox.cpp +++ b/src/d/actor/d_a_obj_movebox.cpp @@ -14,8 +14,6 @@ #include "d/res/res_osiblk.h" #include "d/d_path.h" #include "d/d_cc_d.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "JSystem/JUtility/JUTAssert.h" #include "d/d_com_inf_game.h" #include "m_Do/m_Do_mtx.h" @@ -132,7 +130,7 @@ namespace daObjMovebox { mGroundY[i] = dComIfG_Bgsp()->GroundCross(&M_gnd_work[i]); if (mGroundY[i] > maxGroundY) { fopAc_ac_c* groundActor = dComIfG_Bgsp()->GetActorPointer(M_gnd_work[i]); - if (!(groundActor && fopAcM_GetName(groundActor) == PROC_Obj_Movebox && ((Act_c*)groundActor)->mMode == Act_c::MODE_AFLOAT)) { + if (!(groundActor && fopAcM_GetName(groundActor) == fpcNm_Obj_Movebox_e && ((Act_c*)groundActor)->mMode == Act_c::MODE_AFLOAT)) { maxGroundY = mGroundY[i]; mMaxGroundIdx = i; } @@ -1234,7 +1232,7 @@ namespace daObjMovebox { f32 deltaZ = actor2->current.pos.z - actor1->current.pos.z; f32 f3; f32 f4; - if (fopAcM_GetProfName(actor2) == PROC_PLAYER) { + if (fopAcM_GetProfName(actor2) == fpcNm_PLAYER_e) { f3 = movebox->attr()->m2C; f4 = movebox->attr()->m74 * movebox->attr()->m44; } else { @@ -1354,13 +1352,13 @@ namespace daObjMovebox { } else if (mType == TYPE_METAL_BOX_WITH_SPRING) { u32 jumpParams = daObjJump::Act_c::prm_make_b(); mChildPID = fopAcM_createChild( - PROC_Obj_Jump, fopAcM_GetID(this), + fpcNm_Obj_Jump_e, fopAcM_GetID(this), jumpParams, ¤t.pos, fopAcM_GetRoomNo(this), &shape_angle ); } else if (mType == TYPE_MIRROR) { mChildPID = fopAcM_createChild( - PROC_Obj_Mmrr, fopAcM_GetID(this), + fpcNm_Obj_Mmrr_e, fopAcM_GetID(this), 0, ¤t.pos, fopAcM_GetRoomNo(this), &shape_angle ); @@ -1368,7 +1366,7 @@ namespace daObjMovebox { cXyz mkiePos(current.pos.x, current.pos.y + 150.0f, current.pos.z); u32 mkieParams = daObjMkie::Act_c::prm_make(prmX_get_evId(), prmZ_get_swSave2_MkieB()); mChildPID = fopAcM_createChild( - PROC_Obj_Mkie, fopAcM_GetID(this), + fpcNm_Obj_Mkie_e, fopAcM_GetID(this), mkieParams, &mkiePos, fopAcM_GetRoomNo(this), &shape_angle ); @@ -1791,7 +1789,7 @@ namespace daObjMovebox { cXyz smokeScale; smokeScale.setall(attr()->mLandSmokeScale); smokeScale *= 5.0f/3.0f; - fopAcM_create(PROC_Obj_Eff, 0x3, ¤t.pos, -1, NULL, &smokeScale); + fopAcM_create(fpcNm_Obj_Eff_e, 0x3, ¤t.pos, -1, NULL, &smokeScale); // TODO daObjEff::Act_c::make_land_smoke(cXyz*, float) } @@ -1926,18 +1924,18 @@ namespace daObjMovebox { } actor_process_profile_definition g_profile_Obj_Movebox = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Movebox, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Movebox_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjMovebox::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Movebox, + /* Draw Prio */ fpcDwPi_Obj_Movebox_e, /* Actor SubMtd */ &daObjMovebox::Mthd_Table, /* Status */ 0x04 | fopAcStts_SHOWMAP_e | fopAcStts_CULL_e | fopAcStts_FREEZE_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_msdan.cpp b/src/d/actor/d_a_obj_msdan.cpp index bfe865d11..4caf9f3cf 100644 --- a/src/d/actor/d_a_obj_msdan.cpp +++ b/src/d/actor/d_a_obj_msdan.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_msdan.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 00000078-000003D4 .text Mthd_Create__Q210daObjMsdan5Act_cFv */ cPhs_State daObjMsdan::Act_c::Mthd_Create() { @@ -61,18 +59,18 @@ static actor_method_class Mthd_Msdan = { }; // namespace daObjMsdan actor_process_profile_definition g_profile_Obj_Msdan = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Msdan, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Msdan_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjMsdan::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Msdan, + /* Draw Prio */ fpcDwPi_Obj_Msdan_e, /* Actor SubMtd */ &daObjMsdan::Mthd_Msdan, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_msdan2.cpp b/src/d/actor/d_a_obj_msdan2.cpp index 43db98a2c..d43bf61c7 100644 --- a/src/d/actor/d_a_obj_msdan2.cpp +++ b/src/d/actor/d_a_obj_msdan2.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_msdan2.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 00000078-0000024C .text Mthd_Create__Q211daObjMsdan25Act_cFv */ cPhs_State daObjMsdan2::Act_c::Mthd_Create() { @@ -61,18 +59,18 @@ static actor_method_class Mthd_Msdan2 = { }; // namespace daObjMsdan2 actor_process_profile_definition g_profile_Obj_Msdan2 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Msdan2, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Msdan2_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjMsdan2::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Msdan2, + /* Draw Prio */ fpcDwPi_Obj_Msdan2_e, /* Actor SubMtd */ &daObjMsdan2::Mthd_Msdan2, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_msdan_sub.cpp b/src/d/actor/d_a_obj_msdan_sub.cpp index 5abfe4c08..3f94a144f 100644 --- a/src/d/actor/d_a_obj_msdan_sub.cpp +++ b/src/d/actor/d_a_obj_msdan_sub.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_msdan_sub.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/res/res_msdan.h" const char daObjMsdanSub::Act_c::M_arcname[] = "Msdan"; @@ -233,18 +231,18 @@ static actor_method_class Mthd_MsdanSub = { }; // namespace daObjMsdanSub actor_process_profile_definition g_profile_Obj_MsdanSub = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_MsdanSub, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_MsdanSub_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjMsdanSub::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_MsdanSub, + /* Draw Prio */ fpcDwPi_Obj_MsdanSub_e, /* Actor SubMtd */ &daObjMsdanSub::Mthd_MsdanSub, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_msdan_sub2.cpp b/src/d/actor/d_a_obj_msdan_sub2.cpp index 65d9c5076..dded40784 100644 --- a/src/d/actor/d_a_obj_msdan_sub2.cpp +++ b/src/d/actor/d_a_obj_msdan_sub2.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_msdan_sub2.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 00000078-0000012C .text CreateHeap__Q214daObjMsdanSub25Act_cFv */ BOOL daObjMsdanSub2::Act_c::CreateHeap() { @@ -91,18 +89,18 @@ static actor_method_class Mthd_MsdanSub2 = { }; // namespace daObjMsdanSub2 actor_process_profile_definition g_profile_Obj_MsdanSub2 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_MsdanSub2, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_MsdanSub2_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjMsdanSub2::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_MsdanSub2, + /* Draw Prio */ fpcDwPi_Obj_MsdanSub2_e, /* Actor SubMtd */ &daObjMsdanSub2::Mthd_MsdanSub2, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_mshokki.cpp b/src/d/actor/d_a_obj_mshokki.cpp index 21f7c93eb..38ceeabeb 100644 --- a/src/d/actor/d_a_obj_mshokki.cpp +++ b/src/d/actor/d_a_obj_mshokki.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_mshokki.h" #include "d/res/res_mshokki.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_kankyo.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" @@ -407,18 +405,18 @@ static actor_method_class l_daObjMshokki_Method = { }; actor_process_profile_definition g_profile_Obj_Mshokki = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0008, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Mshokki, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0008, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Mshokki_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjMshokki_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Mshokki, + /* Draw Prio */ fpcDwPi_Obj_Mshokki_e, /* Actor SubMtd */ &l_daObjMshokki_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_obj_mtest.cpp b/src/d/actor/d_a_obj_mtest.cpp index 7ee45df78..f3ba5ede1 100644 --- a/src/d/actor/d_a_obj_mtest.cpp +++ b/src/d/actor/d_a_obj_mtest.cpp @@ -8,8 +8,6 @@ #include "d/res/res_mtest.h" #include "d/res/res_owater.h" #include "d/res/res_astop.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "JSystem/J3DGraphAnimator/J3DModel.h" #include "d/d_com_inf_game.h" #include "m_Do/m_Do_mtx.h" @@ -380,18 +378,18 @@ namespace daObjMtest { } actor_process_profile_definition g_profile_Obj_Mtest = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Mtest, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Mtest_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjMtest::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Mtest, + /* Draw Prio */ fpcDwPi_Obj_Mtest_e, /* Actor SubMtd */ &daObjMtest::Mthd_Table, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_nest.cpp b/src/d/actor/d_a_obj_nest.cpp index 5e7ec37ec..50f5524fa 100644 --- a/src/d/actor/d_a_obj_nest.cpp +++ b/src/d/actor/d_a_obj_nest.cpp @@ -7,8 +7,6 @@ #include "d/actor/d_a_obj_nest.h" #include "d/res/res_mtorisu.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_bg_w.h" namespace daObjNest{ namespace{ @@ -210,18 +208,18 @@ static actor_method_class Mthd_Table = { }; // namespace daObjNest actor_process_profile_definition g_profile_Obj_Nest = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Nest, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Nest_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjNest::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Nest, + /* Draw Prio */ fpcDwPi_Obj_Nest_e, /* Actor SubMtd */ &daObjNest::Mthd_Table, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLSPHERE_CUSTOM_e, + /* Cull Type */ fopAc_CULLSPHERE_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_ohatch.cpp b/src/d/actor/d_a_obj_ohatch.cpp index 342adab59..fd529a686 100644 --- a/src/d/actor/d_a_obj_ohatch.cpp +++ b/src/d/actor/d_a_obj_ohatch.cpp @@ -6,9 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_ohatch.h" #include "d/res/res_ohatch.h" -#include "d/d_procname.h" #include "d/d_bg_w.h" -#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_hostIO.h" @@ -354,18 +352,18 @@ static actor_method_class l_daObjOhatch_Method = { }; actor_process_profile_definition g_profile_Obj_Ohatch = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Ohatch, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Ohatch_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjOhatch_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Ohatch, + /* Draw Prio */ fpcDwPi_Obj_Ohatch_e, /* Actor SubMtd */ &l_daObjOhatch_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e | fopAcStts_UNK200000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_5_e, + /* Cull Type */ fopAc_CULLBOX_5_e, }; diff --git a/src/d/actor/d_a_obj_ojtree.cpp b/src/d/actor/d_a_obj_ojtree.cpp index f2db0a82c..44f99d9dc 100644 --- a/src/d/actor/d_a_obj_ojtree.cpp +++ b/src/d/actor/d_a_obj_ojtree.cpp @@ -9,8 +9,6 @@ #include "d/actor/d_a_obj_ojtree.h" #include "d/d_com_inf_game.h" #include "m_Do/m_Do_mtx.h" -#include "d/d_procname.h" -#include "d/d_priority.h" Mtx daObjOjtree::Act_c::M_tmp_mtx; const char daObjOjtree::Act_c::M_arcname[] = "Ojtree"; @@ -32,7 +30,7 @@ BOOL daObjOjtree::Act_c::Create() { fopAcM_setCullSizeBox(this, -500.0f, -1.0f, -300.0f, 251.0f, 5001.0f, 251.0f); pos.set(current.pos); pos.y += 5000.0f; - fopAcM_create(PROC_JBO, daJbo_Type_NORMAL_e, &pos, fopAcM_GetHomeRoomNo(this), &shape_angle, NULL, 0xff, NULL); + fopAcM_create(fpcNm_JBO_e, daJbo_Type_NORMAL_e, &pos, fopAcM_GetHomeRoomNo(this), &shape_angle, NULL, 0xff, NULL); mLockTimer = 2; return TRUE; } @@ -133,18 +131,18 @@ namespace daObjOjtree { } actor_process_profile_definition g_profile_Obj_Ojtree = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Ojtree, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Ojtree_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjOjtree::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Ojtree, + /* Draw Prio */ fpcDwPi_Obj_Ojtree_e, /* Actor SubMtd */ &daObjOjtree::Mthd_Table, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_ospbox.cpp b/src/d/actor/d_a_obj_ospbox.cpp index 8b5fd0457..b04d93343 100644 --- a/src/d/actor/d_a_obj_ospbox.cpp +++ b/src/d/actor/d_a_obj_ospbox.cpp @@ -8,8 +8,6 @@ #include "d/d_com_inf_game.h" #include "d/d_kankyo.h" #include "d/d_particle_name.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/res/res_ospbox.h" #include "f_op/f_op_actor_mng.h" #include "JSystem/J3DGraphBase/J3DSys.h" @@ -123,14 +121,14 @@ void daObjOspbox::Act_c::init_mtx() { /* 00000CC0-00000D7C .text make_item__Q211daObjOspbox5Act_cFv */ void daObjOspbox::Act_c::make_item() { static const s16 pf_name[] = { - PROC_Obj_Ospbox, - PROC_KB, - PROC_KB, - PROC_KB, - PROC_Obj_Ospbox, - PROC_Obj_Ospbox, - PROC_Obj_Ospbox, - PROC_Obj_Ospbox + fpcNm_Obj_Ospbox_e, + fpcNm_KB_e, + fpcNm_KB_e, + fpcNm_KB_e, + fpcNm_Obj_Ospbox_e, + fpcNm_Obj_Ospbox_e, + fpcNm_Obj_Ospbox_e, + fpcNm_Obj_Ospbox_e }; static const u32 prm[] = { 0x00000000, @@ -140,7 +138,7 @@ void daObjOspbox::Act_c::make_item() { }; int prm_index = prm_get_spec(); - if (pf_name[prm_index] == PROC_Obj_Ospbox) { + if (pf_name[prm_index] == fpcNm_Obj_Ospbox_e) { int item_no = prm_get_itemNo(); fopAcM_createItemFromTable(¤t.pos, item_no, 0x7F, @@ -284,18 +282,18 @@ static actor_method_class Mthd_Table = { }; // namespace daObjOspbox actor_process_profile_definition g_profile_Obj_Ospbox = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Ospbox, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Ospbox_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjOspbox::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Ospbox, + /* Draw Prio */ fpcDwPi_Obj_Ospbox_e, /* Actor SubMtd */ &daObjOspbox::Mthd_Table, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_otble.cpp b/src/d/actor/d_a_obj_otble.cpp index 21d676343..660e580ca 100644 --- a/src/d/actor/d_a_obj_otble.cpp +++ b/src/d/actor/d_a_obj_otble.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_otble.h" #include "d/res/res_okmono.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" @@ -178,18 +176,18 @@ actor_method_class daObj_Otble::Mthd::Table = { }; actor_process_profile_definition g_profile_OBJ_OTBLE = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_OBJ_OTBLE, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_OTBLE_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObj_Otble::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_OBJ_OTBLE, + /* Draw Prio */ fpcDwPi_OBJ_OTBLE_e, /* Actor SubMtd */ &daObj_Otble::Mthd::Table, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_paper.cpp b/src/d/actor/d_a_obj_paper.cpp index 2a2666f06..0e49f5a9d 100644 --- a/src/d/actor/d_a_obj_paper.cpp +++ b/src/d/actor/d_a_obj_paper.cpp @@ -13,8 +13,6 @@ #include "f_op/f_op_actor_mng.h" #include "f_op/f_op_msg.h" #include "f_op/f_op_msg_mng.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" #include "d/d_com_inf_game.h" #include "d/d_kankyo.h" @@ -358,18 +356,18 @@ namespace daObjPaper { } actor_process_profile_definition g_profile_Obj_Paper = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Paper, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Paper_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjPaper::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Paper, + /* Draw Prio */ fpcDwPi_Obj_Paper_e, /* Actor SubMtd */ &daObjPaper::Mthd_Table, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLSPHERE_CUSTOM_e, + /* Cull Type */ fopAc_CULLSPHERE_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_pbco.cpp b/src/d/actor/d_a_obj_pbco.cpp index 60d0c4621..1430e123a 100644 --- a/src/d/actor/d_a_obj_pbco.cpp +++ b/src/d/actor/d_a_obj_pbco.cpp @@ -8,8 +8,6 @@ #include "d/res/res_pbco.h" #include "d/d_com_inf_game.h" #include "d/d_item.h" -#include "d/d_procname.h" -#include "d/d_priority.h" static daObj_Pbco_HIO_c l_HIO; const char daObj_Pbco_c::M_arcname[] = "Pbco"; @@ -35,14 +33,14 @@ static int CheckCreateHeap(fopAc_ac_c* i_this) { /* 000001AC-00000348 .text CreateHeap__12daObj_Pbco_cFv */ BOOL daObj_Pbco_c::CreateHeap() { J3DModelData* modelData; - if (dComIfGs_isEventBit(dSv_event_flag_c::ENDLESS_NIGHT) && !checkItemGet(dItem_PEARL_NAYRU_e, TRUE)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::ENDLESS_NIGHT) && !checkItemGet(dItemNo_PEARL_NAYRU_e, TRUE)) { modelData = (J3DModelData*)(dComIfG_getObjectRes(M_arcname, PBCO_INDEX_BDL_PBCO)); } else { modelData = (J3DModelData*)(dComIfG_getObjectRes(M_arcname, PBCO_INDEX_BDL_PBC2)); } JUT_ASSERT(0xa9, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203); - if (dComIfGs_isEventBit(dSv_event_flag_c::ENDLESS_NIGHT) && !checkItemGet(dItem_PEARL_NAYRU_e, TRUE)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::ENDLESS_NIGHT) && !checkItemGet(dItemNo_PEARL_NAYRU_e, TRUE)) { mpBgW = NULL; } else { mpBgW = dBgW_NewSet((cBgD_t*)dComIfG_getObjectRes(M_arcname, PBCO_INDEX_DZB_PBCO), cBgW::MOVE_BG_e, @@ -133,18 +131,18 @@ static actor_method_class daObj_PbcoMethodTable = { }; actor_process_profile_definition g_profile_Obj_Pbco = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0002, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Pbco, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0002, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Pbco_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObj_Pbco_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Pbco, + /* Draw Prio */ fpcDwPi_Obj_Pbco_e, /* Actor SubMtd */ &daObj_PbcoMethodTable, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_pbka.cpp b/src/d/actor/d_a_obj_pbka.cpp index 49437f161..ad5362aee 100644 --- a/src/d/actor/d_a_obj_pbka.cpp +++ b/src/d/actor/d_a_obj_pbka.cpp @@ -9,8 +9,6 @@ #include "f_op/f_op_actor_mng.h" #include "d/d_com_inf_game.h" #include "m_Do/m_Do_mtx.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 00000078-00000098 .text CheckCreateHeap__FP10fopAc_ac_c */ static int CheckCreateHeap(fopAc_ac_c* i_this) { @@ -115,18 +113,18 @@ static actor_method_class daObj_PbkaMethodTable = { }; actor_process_profile_definition g_profile_Obj_Pbka = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Pbka, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Pbka_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjPbka_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Pbka, + /* Draw Prio */ fpcDwPi_Obj_Pbka_e, /* Actor SubMtd */ &daObj_PbkaMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_pfall.cpp b/src/d/actor/d_a_obj_pfall.cpp index fe25f6377..29d495397 100644 --- a/src/d/actor/d_a_obj_pfall.cpp +++ b/src/d/actor/d_a_obj_pfall.cpp @@ -5,12 +5,10 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_pfall.h" -#include "d/d_procname.h" #include "d/d_com_inf_game.h" #include "d/res/res_pfall.h" #include "d/d_lib.h" #include "d/actor/d_a_player_main.h" -#include "d/d_priority.h" static const int l_bck_ix_tbl[] = { PFALL_BCK_NZ_WAIT, @@ -485,18 +483,18 @@ static actor_method_class daObj_PfallMethodTable = { }; actor_process_profile_definition g_profile_OBJ_PFALL = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_OBJ_PFALL, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_PFALL_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObj_Pfall_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_OBJ_PFALL, + /* Draw Prio */ fpcDwPi_OBJ_PFALL_e, /* Actor SubMtd */ &daObj_PfallMethodTable, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_4_e, + /* Cull Type */ fopAc_CULLBOX_4_e, }; diff --git a/src/d/actor/d_a_obj_pirateship.cpp b/src/d/actor/d_a_obj_pirateship.cpp index b0cfe9592..4bf0df1e5 100644 --- a/src/d/actor/d_a_obj_pirateship.cpp +++ b/src/d/actor/d_a_obj_pirateship.cpp @@ -7,9 +7,7 @@ #include "d/actor/d_a_obj_pirateship.h" #include "d/actor/d_a_knob00.h" #include "d/res/res_kaizokusen.h" -#include "d/d_procname.h" #include "d/d_particle.h" -#include "d/d_priority.h" #include "d/d_path.h" #include "d/d_lib.h" #include "d/d_com_inf_game.h" @@ -219,14 +217,14 @@ void daObjPirateship::Act_c::partsCreate() { m_sail_id = fopAcM_createChild("Psail", fopAcM_GetID(this), 0, ¤t.pos, tevStr.mRoomNo, ¤t.angle); JUT_ASSERT(282, (m_sail_id != fpcM_ERROR_PROCESS_ID_e)); - m2F0 = fopAcM_createChild(PROC_PIRATE_FLAG, fopAcM_GetID(this), 0, ¤t.pos, tevStr.mRoomNo, ¤t.angle); + m2F0 = fopAcM_createChild(fpcNm_PIRATE_FLAG_e, fopAcM_GetID(this), 0, ¤t.pos, tevStr.mRoomNo, ¤t.angle); if (uVar2 != 3) { cXyz sp30 = current.pos; sp30.y += 700.0f; sp30.x += cM_ssin(current.angle.y) * 850.0f; sp30.z += cM_scos(current.angle.y) * 850.0f; - m2F8 = fopAcM_createChild(PROC_Obj_Tousekiki, fopAcM_GetID(this), 0, &sp30, tevStr.mRoomNo, ¤t.angle); + m2F8 = fopAcM_createChild(fpcNm_Obj_Tousekiki_e, fopAcM_GetID(this), 0, &sp30, tevStr.mRoomNo, ¤t.angle); } if (uVar2 != 3) { @@ -235,7 +233,7 @@ void daObjPirateship::Act_c::partsCreate() { sp24.x += cM_ssin(current.angle.y) * -788.0f; sp24.z += cM_scos(current.angle.y) * -788.0f; - m300 = fopAcM_createChild(PROC_Kaji, fopAcM_GetID(this), 0, &sp24, tevStr.mRoomNo, ¤t.angle); + m300 = fopAcM_createChild(fpcNm_Kaji_e, fopAcM_GetID(this), 0, &sp24, tevStr.mRoomNo, ¤t.angle); } cXyz sp18 = current.pos; @@ -252,7 +250,7 @@ void daObjPirateship::Act_c::partsCreate() { sp18.x += cM_ssin(current.angle.y) * 475.0f; sp18.z += cM_scos(current.angle.y) * 475.0f; - m308 = fopAcM_createChild(PROC_KNOB00, fopAcM_GetID(this), dr_prm[uVar3], &sp18, tevStr.mRoomNo, &sp10); + m308 = fopAcM_createChild(fpcNm_KNOB00_e, fopAcM_GetID(this), dr_prm[uVar3], &sp18, tevStr.mRoomNo, &sp10); m304 = NULL; } @@ -595,18 +593,18 @@ actor_method_class daObjPirateship::Method::Table = { }; actor_process_profile_definition g_profile_Obj_Pirateship = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Pirateship, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Pirateship_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjPirateship::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Pirateship, + /* Draw Prio */ fpcDwPi_Obj_Pirateship_e, /* Actor SubMtd */ &daObjPirateship::Method::Table, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_plant.cpp b/src/d/actor/d_a_obj_plant.cpp index bba5db543..ce46a4cb5 100644 --- a/src/d/actor/d_a_obj_plant.cpp +++ b/src/d/actor/d_a_obj_plant.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_plant.h" #include "m_Do/m_Do_ext.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" #include "d/res/res_plant.h" @@ -228,18 +226,18 @@ static actor_method_class daObj_PlantMethodTable = { }; actor_process_profile_definition g_profile_Obj_Plant = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Plant, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Plant_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjPlant_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Plant, + /* Draw Prio */ fpcDwPi_Obj_Plant_e, /* Actor SubMtd */ &daObj_PlantMethodTable, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_quake.cpp b/src/d/actor/d_a_obj_quake.cpp index 846c71fb4..c0fa93460 100644 --- a/src/d/actor/d_a_obj_quake.cpp +++ b/src/d/actor/d_a_obj_quake.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_quake.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_a_obj.h" #include "d/d_com_inf_game.h" @@ -225,18 +223,18 @@ static actor_method_class daObjQuakeMethodTable = { }; actor_process_profile_definition g_profile_Obj_Quake = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0002, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Quake, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0002, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Quake_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjQuake_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Quake, + /* Draw Prio */ fpcDwPi_Obj_Quake_e, /* Actor SubMtd */ &daObjQuakeMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_obj_rcloud.cpp b/src/d/actor/d_a_obj_rcloud.cpp index 0dae85703..aac298119 100644 --- a/src/d/actor/d_a_obj_rcloud.cpp +++ b/src/d/actor/d_a_obj_rcloud.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_rcloud.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "m_Do/m_Do_hostIO.h" #include "d/res/res_bvkumo.h" @@ -260,16 +258,16 @@ static actor_method_class l_daObjRcloud_Method = { }; actor_process_profile_definition g_profile_Obj_Rcloud = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Rcloud, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Rcloud_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjRcloud_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Rcloud, + /* Draw Prio */ fpcDwPi_Obj_Rcloud_e, /* Actor SubMtd */ &l_daObjRcloud_Method, #if VERSION == VERSION_DEMO /* Status */ fopAcStts_UNK40000_e, @@ -277,5 +275,5 @@ actor_process_profile_definition g_profile_Obj_Rcloud = { /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, #endif /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_rflw.cpp b/src/d/actor/d_a_obj_rflw.cpp index 78d3ea69c..336f401ed 100644 --- a/src/d/actor/d_a_obj_rflw.cpp +++ b/src/d/actor/d_a_obj_rflw.cpp @@ -8,8 +8,6 @@ #include "d/res/res_rflw.h" #include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_ext.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" static dCcD_SrcCyl l_cyl_src = { @@ -210,18 +208,18 @@ static actor_method_class daObj_RflwMethodTable = { }; actor_process_profile_definition g_profile_Obj_Rflw = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Rflw, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Rflw_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjRflw_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Rflw, + /* Draw Prio */ fpcDwPi_Obj_Rflw_e, /* Actor SubMtd */ &daObj_RflwMethodTable, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_rforce.cpp b/src/d/actor/d_a_obj_rforce.cpp index aafdcec0d..caa8c24d1 100644 --- a/src/d/actor/d_a_obj_rforce.cpp +++ b/src/d/actor/d_a_obj_rforce.cpp @@ -7,8 +7,6 @@ #include "d/actor/d_a_obj_rforce.h" #include "d/d_bg_s_movebg_actor.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/res/res_stptetu.h" const char daObjRforce::Act_c::M_arcname[] = "StpTetu"; @@ -151,18 +149,18 @@ static actor_method_class Mthd_Table = { }; // namespace daObjRforce actor_process_profile_definition g_profile_Obj_Rforce = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Rforce, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Rforce_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjRforce::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Rforce, + /* Draw Prio */ fpcDwPi_Obj_Rforce_e, /* Actor SubMtd */ &daObjRforce::Mthd_Table, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_obj_roten.cpp b/src/d/actor/d_a_obj_roten.cpp index 5acb92029..6a919b7ab 100644 --- a/src/d/actor/d_a_obj_roten.cpp +++ b/src/d/actor/d_a_obj_roten.cpp @@ -9,10 +9,8 @@ #include "m_Do/m_Do_mtx.h" #include "d/d_com_inf_game.h" #include "d/d_bg_s_movebg_actor.h" -#include "d/d_procname.h" -#include "d/d_priority.h" -daObj_Roten_HIO_c l_HIO; +static daObj_Roten_HIO_c l_HIO; /* 000000EC-00000118 .text __ct__17daObj_Roten_HIO_cFv */ daObj_Roten_HIO_c::daObj_Roten_HIO_c() { @@ -189,18 +187,18 @@ static actor_method_class daObj_RotenMethodTable = { }; actor_process_profile_definition g_profile_Obj_Roten = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Roten, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Roten_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObj_Roten_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Roten, + /* Draw Prio */ fpcDwPi_Obj_Roten_e, /* Actor SubMtd */ &daObj_RotenMethodTable, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_4_e, + /* Cull Type */ fopAc_CULLBOX_4_e, }; diff --git a/src/d/actor/d_a_obj_search.cpp b/src/d/actor/d_a_obj_search.cpp index 24181d779..ac96909be 100644 --- a/src/d/actor/d_a_obj_search.cpp +++ b/src/d/actor/d_a_obj_search.cpp @@ -5,8 +5,6 @@ #include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_search.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" static dCcD_SrcCps cps_src = { @@ -299,18 +297,18 @@ actor_method_class daObj_Search::Mthd::Table = { }; actor_process_profile_definition g_profile_OBJ_SEARCH = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_OBJ_SEARCH, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_SEARCH_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObj_Search::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_OBJ_SEARCH, + /* Draw Prio */ fpcDwPi_OBJ_SEARCH_e, /* Actor SubMtd */ &daObj_Search::Mthd::Table, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_shelf.cpp b/src/d/actor/d_a_obj_shelf.cpp index 0104889fe..6f19ae05a 100644 --- a/src/d/actor/d_a_obj_shelf.cpp +++ b/src/d/actor/d_a_obj_shelf.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_shelf.h" #include "d/res/res_otana.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_npc_ba1.h" #include "m_Do/m_Do_mtx.h" @@ -100,7 +98,7 @@ BOOL daObjShelf::Act_c::Mthd_Delete() { /* 000002F0-00000334 .text hold_event__Q210daObjShelf5Act_cCFv */ void daObjShelf::Act_c::hold_event() const { fopAc_ac_c* npc; - if (fopAcM_SearchByName(PROC_NPC_BA1, &npc) && npc) { + if (fopAcM_SearchByName(fpcNm_NPC_BA1_e, &npc) && npc) { ((daNpc_Ba1_c *) npc)->holdEventOn(); } } @@ -303,18 +301,18 @@ static actor_method_class Mthd_Table = { }; // namespace daObjShelf actor_process_profile_definition g_profile_Obj_Shelf = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Shelf, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Shelf_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjShelf::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Shelf, + /* Draw Prio */ fpcDwPi_Obj_Shelf_e, /* Actor SubMtd */ &daObjShelf::Mthd_Table, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_shmrgrd.cpp b/src/d/actor/d_a_obj_shmrgrd.cpp index 5c11ecae8..84fdd9bec 100644 --- a/src/d/actor/d_a_obj_shmrgrd.cpp +++ b/src/d/actor/d_a_obj_shmrgrd.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_shmrgrd.h" #include "d/res/res_shmrgrd.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "f_op/f_op_actor_mng.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_player.h" @@ -387,7 +385,7 @@ void daObjShmrgrd_c::set_damage() { if (mCylTg.ChkTgHit()) { cCcD_Obj *hitObj = mCylTg.GetTgHitObj(); fopAc_ac_c* hitActor = mCylTg.GetTgHitAc(); - if (hitObj->ChkAtType(AT_TYPE_SKULL_HAMMER) && fopAcM_GetProfName(hitActor) == PROC_PLAYER) { + if (hitObj->ChkAtType(AT_TYPE_SKULL_HAMMER) && fopAcM_GetProfName(hitActor) == fpcNm_PLAYER_e) { if (check_player_angle(hitActor) && (cutType == daPy_py_c::CUT_TYPE_HAMMER_FRONTSWING || cutType == daPy_py_c::CUT_TYPE_JUMPCUT_HAMMER)) { M_damage = 1; } else if (cutType == daPy_py_c::CUT_TYPE_HAMMER_SIDESWING) { @@ -636,18 +634,18 @@ static actor_method_class Shmrgrd_Mthd_Table = { }; // namespace actor_process_profile_definition g_profile_Obj_Shmrgrd = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Shmrgrd, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Shmrgrd_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjShmrgrd_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Shmrgrd, + /* Draw Prio */ fpcDwPi_Obj_Shmrgrd_e, /* Actor SubMtd */ &Shmrgrd_Mthd_Table, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_smplbg.cpp b/src/d/actor/d_a_obj_smplbg.cpp index d937b3a07..aa163bf8d 100644 --- a/src/d/actor/d_a_obj_smplbg.cpp +++ b/src/d/actor/d_a_obj_smplbg.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_smplbg.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "d/res/res_qtkhd.h" @@ -175,18 +173,18 @@ static actor_method_class Mthd_Table = { }; // namespace daObjSmplbg actor_process_profile_definition g_profile_Obj_Smplbg = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Smplbg, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Smplbg_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjSmplbg::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Smplbg, + /* Draw Prio */ fpcDwPi_Obj_Smplbg_e, /* Actor SubMtd */ &daObjSmplbg::Mthd_Table, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | DEMO_SELECT(fopAcStts_UNK4000_e, 0) | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_obj_stair.cpp b/src/d/actor/d_a_obj_stair.cpp index aa6d913e7..411118714 100644 --- a/src/d/actor/d_a_obj_stair.cpp +++ b/src/d/actor/d_a_obj_stair.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_stair.h" #include "d/d_bg_w.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" #include "d/res/res_mkdan.h" #include "d/d_com_inf_game.h" @@ -73,7 +71,7 @@ daobj_stairHIO_c::daobj_stairHIO_c() { /* 00000130-000001D8 .text ride_call_back__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c */ void ride_call_back(dBgW* i_arg0, fopAc_ac_c* i_arg1, fopAc_ac_c* i_arg2) { daObj_Stair_c* i_this = (daObj_Stair_c*)i_arg1; - if (fopAcM_GetProfName(i_arg2) == PROC_PLAYER && i_this->field_0x2E0 < l_HIO.m18){ + if (fopAcM_GetProfName(i_arg2) == fpcNm_PLAYER_e && i_this->field_0x2E0 < l_HIO.m18){ i_this->field_0x2E4 = 1; i_this->field_0x2C8.set(i_arg2->current.pos - i_arg1->current.pos); i_this->field_0x2D4.set(0.0f, -1.0f, 0.0f); @@ -270,7 +268,7 @@ bool daObj_Stair_c::_execute() { if(mCps.ChkTgHit()) { fopAc_ac_c* ac = mCps.GetTgHitAc(); if(ac) { - if(fopAcM_IsActor(ac) && fopAcM_GetProfName(ac) == PROC_BOMB){ + if(fopAcM_IsActor(ac) && fopAcM_GetProfName(ac) == fpcNm_BOMB_e){ sin = cM_ssin(current.angle.y); cos = cM_scos(current.angle.y); field_0x2E4 = 1; @@ -357,18 +355,18 @@ static actor_method_class daObj_StairMethodTable = { }; actor_process_profile_definition g_profile_Obj_Stair = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Stair, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Stair_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObj_Stair_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Stair, + /* Draw Prio */ fpcDwPi_Obj_Stair_e, /* Actor SubMtd */ &daObj_StairMethodTable, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ENV_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_obj_swflat.cpp b/src/d/actor/d_a_obj_swflat.cpp index f9c42e988..f13f075e4 100644 --- a/src/d/actor/d_a_obj_swflat.cpp +++ b/src/d/actor/d_a_obj_swflat.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_swflat.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" namespace daObjSwflat { @@ -135,18 +133,18 @@ static actor_method_class Mthd_Table = { }; // namespace daObjSwflat actor_process_profile_definition g_profile_Obj_Swflat = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0002, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Swflat, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0002, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Swflat_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjSwflat::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Swflat, + /* Draw Prio */ fpcDwPi_Obj_Swflat_e, /* Actor SubMtd */ &daObjSwflat::Mthd_Table, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLSPHERE_CUSTOM_e, + /* Cull Type */ fopAc_CULLSPHERE_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_swhammer.cpp b/src/d/actor/d_a_obj_swhammer.cpp index f28285393..24e4c80c8 100644 --- a/src/d/actor/d_a_obj_swhammer.cpp +++ b/src/d/actor/d_a_obj_swhammer.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_swhammer.h" #include "d/res/res_mhmrsw.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_player.h" @@ -213,7 +211,7 @@ void daObjSwhammer::Act_c::set_damage() { if (mCylTg.ChkTgHit()) { cCcD_Obj *hitObj = mCylTg.GetTgHitObj(); fopAc_ac_c* hitActor = mCylTg.GetTgHitAc(); - if (hitObj->ChkAtType(AT_TYPE_SKULL_HAMMER) && fopAcM_GetProfName(hitActor) == PROC_PLAYER) { + if (hitObj->ChkAtType(AT_TYPE_SKULL_HAMMER) && fopAcM_GetProfName(hitActor) == fpcNm_PLAYER_e) { if (cutType == daPy_py_c::CUT_TYPE_HAMMER_FRONTSWING || cutType == daPy_py_c::CUT_TYPE_JUMPCUT_HAMMER) { M_damage = 1; } else if (cutType == daPy_py_c::CUT_TYPE_HAMMER_SIDESWING) { @@ -476,18 +474,18 @@ static actor_method_class Mthd_Table = { }; // namespace daObjSwhammer actor_process_profile_definition g_profile_Obj_Swhammer = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0002, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Swhammer, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0002, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Swhammer_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjSwhammer::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Swhammer, + /* Draw Prio */ fpcDwPi_Obj_Swhammer_e, /* Actor SubMtd */ &daObjSwhammer::Mthd_Table, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLSPHERE_CUSTOM_e, + /* Cull Type */ fopAc_CULLSPHERE_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_swheavy.cpp b/src/d/actor/d_a_obj_swheavy.cpp index 42dfc386b..fbce8fc18 100644 --- a/src/d/actor/d_a_obj_swheavy.cpp +++ b/src/d/actor/d_a_obj_swheavy.cpp @@ -7,8 +7,6 @@ #include "d/actor/d_a_obj_swheavy.h" #include "d/res/res_hhbot.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/actor/d_a_player.h" const char daObjSwheavy::Act_c::M_arcname[] = "Hhbot"; @@ -210,7 +208,7 @@ void daObjSwheavy::Act_c::rideCB(dBgW* bgw, fopAc_ac_c* i_ac, fopAc_ac_c* i_pt) if (fopAcM_CheckStatus(i_pt, fopAcStts_FREEZE_e)) { i_this->mRiding = true; - if (fopAcM_GetProfName(i_pt) == PROC_PLAYER && ((daPy_py_c*)i_pt)->checkEquipHeavyBoots()) { + if (fopAcM_GetProfName(i_pt) == fpcNm_PLAYER_e && ((daPy_py_c*)i_pt)->checkEquipHeavyBoots()) { i_this->mHeavyRiding = true; } } @@ -470,18 +468,18 @@ static actor_method_class Mthd_Table = { }; // namespace daObjSwheavy actor_process_profile_definition g_profile_Obj_Swheavy = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0002, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Swheavy, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0002, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Swheavy_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjSwheavy::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Swheavy, + /* Draw Prio */ fpcDwPi_Obj_Swheavy_e, /* Actor SubMtd */ &daObjSwheavy::Mthd_Table, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_swlight.cpp b/src/d/actor/d_a_obj_swlight.cpp index 8164cabd9..bf06e9b23 100644 --- a/src/d/actor/d_a_obj_swlight.cpp +++ b/src/d/actor/d_a_obj_swlight.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_swlight.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/res/res_mmirror.h" namespace daObjSwlight { @@ -502,18 +500,18 @@ static actor_method_class Mthd_Table = { }; // namespace daObjSwlight actor_process_profile_definition g_profile_Obj_Swlight = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0002, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Swlight, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0002, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Swlight_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjSwlight::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Swlight, + /* Draw Prio */ fpcDwPi_Obj_Swlight_e, /* Actor SubMtd */ &daObjSwlight::Mthd_Table, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLSPHERE_CUSTOM_e, + /* Cull Type */ fopAc_CULLSPHERE_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_swpush.cpp b/src/d/actor/d_a_obj_swpush.cpp index 92e1cb3e6..88d1ddf28 100644 --- a/src/d/actor/d_a_obj_swpush.cpp +++ b/src/d/actor/d_a_obj_swpush.cpp @@ -7,8 +7,6 @@ #include "d/actor/d_a_obj_swpush.h" #include "d/res/res_kbota_00.h" #include "d/res/res_hhbot.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "d/d_bg_w_sv.h" #include "d/actor/d_a_player.h" @@ -363,7 +361,7 @@ void daObjSwpush::Act_c::rideCB(dBgW* bgw, fopAc_ac_c* i_ac, fopAc_ac_c* i_pt) { i_this->mRidingMode = 1; } - bool is_player = fopAcM_GetProfName(i_pt) == PROC_PLAYER; + bool is_player = fopAcM_GetProfName(i_pt) == fpcNm_PLAYER_e; if (is_player) { i_this->mVibTimer = 4; } @@ -813,18 +811,18 @@ static actor_method_class Mthd_Table = { }; // namespace daObjSwpush actor_process_profile_definition g_profile_Obj_Swpush = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0002, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Swpush, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0002, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Swpush_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjSwpush::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Swpush, + /* Draw Prio */ fpcDwPi_Obj_Swpush_e, /* Actor SubMtd */ &daObjSwpush::Mthd_Table, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_table.cpp b/src/d/actor/d_a_obj_table.cpp index af485d36f..80de69691 100644 --- a/src/d/actor/d_a_obj_table.cpp +++ b/src/d/actor/d_a_obj_table.cpp @@ -9,8 +9,6 @@ #include "SSystem/SComponent/c_phase.h" #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "dolphin/types.h" #include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_mtx.h" @@ -170,18 +168,18 @@ static actor_method_class Mthd_Table = { }; // namespace daObjTable actor_process_profile_definition g_profile_Obj_Table = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Table, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Table_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjTable::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Table, + /* Draw Prio */ fpcDwPi_Obj_Table_e, /* Actor SubMtd */ &daObjTable::Mthd_Table, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_tapestry.cpp b/src/d/actor/d_a_obj_tapestry.cpp index 311def9c7..3db46bf88 100644 --- a/src/d/actor/d_a_obj_tapestry.cpp +++ b/src/d/actor/d_a_obj_tapestry.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_tapestry.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 000000EC-000001E0 .text __ct__19daObjTapestry_HIO_cFv */ daObjTapestry_HIO_c::daObjTapestry_HIO_c() { @@ -352,18 +350,18 @@ static actor_method_class l_daObjTapestry_Method = { }; actor_process_profile_definition g_profile_Obj_Tapestry = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Tapestry, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Tapestry_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjTapestryPLight_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Tapestry, + /* Draw Prio */ fpcDwPi_Obj_Tapestry_e, /* Actor SubMtd */ &l_daObjTapestry_Method, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_tenmado.cpp b/src/d/actor/d_a_obj_tenmado.cpp index e65a81c0f..badbdad47 100644 --- a/src/d/actor/d_a_obj_tenmado.cpp +++ b/src/d/actor/d_a_obj_tenmado.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_tenmado.h" #include "d/res/res_tenmado.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" @@ -179,18 +177,18 @@ static actor_method_class Mthd_Tenmado = { }; // namespace daObjTenmado actor_process_profile_definition g_profile_Obj_Tenmado = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Tenmado, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Tenmado_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjTenmado::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Tenmado, + /* Draw Prio */ fpcDwPi_Obj_Tenmado_e, /* Actor SubMtd */ &daObjTenmado::Mthd_Tenmado, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_tide.cpp b/src/d/actor/d_a_obj_tide.cpp index c4063238f..91a3a1e5c 100644 --- a/src/d/actor/d_a_obj_tide.cpp +++ b/src/d/actor/d_a_obj_tide.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_tide.h" #include "d/actor/d_a_tag_waterlevel.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" #include "f_op/f_op_kankyo.h" @@ -547,19 +545,19 @@ void Act_c::se_set_gmtw() { /* 000018B0-00001934 .text se_start_gopo__Q29daObjTide5Act_cFv */ void Act_c::se_start_gopo() { JUT_ASSERT(VERSION_SELECT(1084, 1099, 1110, 1110), M_id_gopo == fpcM_ERROR_PROCESS_ID_e); - M_id_gopo = fopKyM_create(PROC_LEVEL_SE, JA_SE_ATM_MJ_WATER_GOPO, &home.pos, 0, 0); + M_id_gopo = fopKyM_create(fpcNm_LEVEL_SE_e, JA_SE_ATM_MJ_WATER_GOPO, &home.pos, 0, 0); } /* 00001934-000019B8 .text se_start_out__Q29daObjTide5Act_cFv */ void Act_c::se_start_out() { JUT_ASSERT(VERSION_SELECT(1102, 1117, 1128, 1128), M_id_out == fpcM_ERROR_PROCESS_ID_e); - M_id_out = fopKyM_create(PROC_LEVEL_SE, JA_SE_ATM_MJ_WATER_OUT, &home.pos, 0, 0); + M_id_out = fopKyM_create(fpcNm_LEVEL_SE_e, JA_SE_ATM_MJ_WATER_OUT, &home.pos, 0, 0); } /* 000019B8-00001A3C .text se_start_up__Q29daObjTide5Act_cFv */ void Act_c::se_start_up() { JUT_ASSERT(VERSION_SELECT(1120, 1135, 1146, 1146), M_id_up == fpcM_ERROR_PROCESS_ID_e); - M_id_up = fopKyM_create(PROC_LEVEL_SE, JA_SE_ATM_MJ_WATER_UP, ¤t.pos, 0, 0); + M_id_up = fopKyM_create(fpcNm_LEVEL_SE_e, JA_SE_ATM_MJ_WATER_UP, ¤t.pos, 0, 0); } /* 00001A3C-00001A8C .text se_stop_gopo__Q29daObjTide5Act_cFv */ @@ -702,18 +700,18 @@ static actor_method_class Mthd_Table = { } // namespace daObjTide actor_process_profile_definition g_profile_Obj_Tide = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0002, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Tide, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0002, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Tide_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjTide::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Tide, + /* Draw Prio */ fpcDwPi_Obj_Tide_e, /* Actor SubMtd */ &daObjTide::Mthd_Table, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_timer.cpp b/src/d/actor/d_a_obj_timer.cpp index 0e477298a..ab5cd65be 100644 --- a/src/d/actor/d_a_obj_timer.cpp +++ b/src/d/actor/d_a_obj_timer.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_timer.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_com_inf_game.h" // IWYU pragma: keep // Needed for dComIfGs_isSwitch inline definition /* 00000078-00000114 .text _create__Q210daObjTimer5Act_cFv */ @@ -126,18 +124,18 @@ static actor_method_class Mthd_Table = { }; // namespace daObjTimer actor_process_profile_definition g_profile_Obj_Timer = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x000A, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Timer, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x000A, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Timer_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjTimer::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Timer, + /* Draw Prio */ fpcDwPi_Obj_Timer_e, /* Actor SubMtd */ &daObjTimer::Mthd_Table, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_obj_tntrap.cpp b/src/d/actor/d_a_obj_tntrap.cpp index 9ca70b725..10e1a54c9 100644 --- a/src/d/actor/d_a_obj_tntrap.cpp +++ b/src/d/actor/d_a_obj_tntrap.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_tntrap.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 00000078-000002AC .text chk_appear__13daObjTnTrap_cFv */ void daObjTnTrap_c::chk_appear() { @@ -182,18 +180,18 @@ static actor_method_class l_daObjTnTrap_Method = { }; actor_process_profile_definition g_profile_Obj_TnTrap = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_TnTrap, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_TnTrap_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjTnTrap_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_TnTrap, + /* Draw Prio */ fpcDwPi_Obj_TnTrap_e, /* Actor SubMtd */ &l_daObjTnTrap_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_obj_toripost.cpp b/src/d/actor/d_a_obj_toripost.cpp index a1418d1eb..0016b4651 100644 --- a/src/d/actor/d_a_obj_toripost.cpp +++ b/src/d/actor/d_a_obj_toripost.cpp @@ -15,8 +15,6 @@ #include "d/d_item_data.h" #include "d/d_s_play.h" #include "d/d_a_obj.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" @@ -39,19 +37,19 @@ public: const char daObjTpost_c::m_arc_name[] = "Toripost"; const daObjTpost_c__letter_data daObjTpost_c::m_letter[] = { - {false, 0x1AAF, dItem_HEART_PIECE_e, dSv_event_flag_c::LETTER_BAITOS_MOM}, - {false, 0x0CF9, dItem_HEART_PIECE_e, dSv_event_flag_c::LETTER_KOMALIS_FATHER}, - {false, 0x0CFA, dItem_COLLECT_MAP_60_e, dSv_event_flag_c::LETTER_BOMBS_AD}, - {false, 0x0CFC, dItem_RED_RUPEE_e, dSv_event_flag_c::LETTER_ORCA}, - {false, 0x0805, dItem_RED_RUPEE_e, dSv_event_flag_c::LETTER_GRANDMA}, - {false, 0x0CFD, dItem_GREEN_RUPEE_e, dSv_event_flag_c::LETTER_ROCK_SPIRE_SHOP_AD}, - {true, 0x0DB6, dItem_COLLECT_MAP_52_e, dSv_event_flag_c::LETTER_TINGLE}, - {false, 0x1148, dItem_RED_RUPEE_e, dSv_event_flag_c::LETTER_ARYLL}, - {false, 0x1AAF, dItem_HEART_PIECE_e, dSv_event_flag_c::LETTER_BAITOS_MOM}, - {true, 0x0F76, KAISEN_PRESENT1, dSv_event_flag_c::LETTER_SILVER_MEMBERSHIP}, - {false, 0x19A6, KAKERA_HEART2, dSv_event_flag_c::LETTER_HOSKITS_GIRLFRIEND}, - {true, 0x0CFB, dItem_RED_RUPEE_e, dSv_event_flag_c::LETTER_BAITO}, - {true, 0x0F77, KAISEN_PRESENT2, dSv_event_flag_c::LETTER_GOLD_MEMBERSHIP}, + {false, 0x1AAF, dItemNo_HEART_PIECE_e, dSv_event_flag_c::LETTER_BAITOS_MOM}, + {false, 0x0CF9, dItemNo_HEART_PIECE_e, dSv_event_flag_c::LETTER_KOMALIS_FATHER}, + {false, 0x0CFA, dItemNo_COLLECT_MAP_60_e, dSv_event_flag_c::LETTER_BOMBS_AD}, + {false, 0x0CFC, dItemNo_RED_RUPEE_e, dSv_event_flag_c::LETTER_ORCA}, + {false, 0x0805, dItemNo_RED_RUPEE_e, dSv_event_flag_c::LETTER_GRANDMA}, + {false, 0x0CFD, dItemNo_GREEN_RUPEE_e, dSv_event_flag_c::LETTER_ROCK_SPIRE_SHOP_AD}, + {true, 0x0DB6, dItemNo_COLLECT_MAP_52_e, dSv_event_flag_c::LETTER_TINGLE}, + {false, 0x1148, dItemNo_RED_RUPEE_e, dSv_event_flag_c::LETTER_ARYLL}, + {false, 0x1AAF, dItemNo_HEART_PIECE_e, dSv_event_flag_c::LETTER_BAITOS_MOM}, + {true, 0x0F76, dItemNo_COMPLIMENTARY_ID_e, dSv_event_flag_c::LETTER_SILVER_MEMBERSHIP}, + {false, 0x19A6, dItemNo_HEART_PIECE_ALT_e, dSv_event_flag_c::LETTER_HOSKITS_GIRLFRIEND}, + {true, 0x0CFB, dItemNo_RED_RUPEE_e, dSv_event_flag_c::LETTER_BAITO}, + {true, 0x0F77, dItemNo_FILL_UP_COUPON_e, dSv_event_flag_c::LETTER_GOLD_MEMBERSHIP}, }; const dCcD_SrcCyl daObjTpost_c::m_cyl_src = { @@ -236,10 +234,10 @@ void daObjTpost_c::cutDispLetterProc(int staffIdx) { /* 000005F4-00000650 .text deliverLetter__12daObjTpost_cFv */ void daObjTpost_c::deliverLetter() { switch(mPreItemNo) { - case MAGYS_LETTER: + case dItemNo_MAGGIES_LETTER_e: dComIfGs_onEventBit(dSv_event_flag_c::UNK_1220); break; - case dItem_NOTE_TO_MOM_e: + case dItemNo_NOTE_TO_MOM_e: dLetter_send(dSv_event_flag_c::LETTER_BAITOS_MOM); break; } @@ -347,8 +345,8 @@ int daObjTpost_c::getMsgXY() { cXyz scale(2.0f, 2.0f, 2.0f); switch(mPreItemNo) { - case dItem_NOTE_TO_MOM_e: - case MAGYS_LETTER: + case dItemNo_NOTE_TO_MOM_e: + case dItemNo_MAGGIES_LETTER_e: msgId = 0xCE8; col.r = REG12_S(0) + 0x80; col.g = REG12_S(1) + 0x80; @@ -358,8 +356,8 @@ int daObjTpost_c::getMsgXY() { dComIfGp_particle_set(dPa_name::ID_IT_JN_LK_GEPPU00, &pos, &shape_angle, &scale, 0xFF, NULL, -1, &col); break; - case dItem_FATHER_LETTER_e: - case MO_LETTER: + case dItemNo_FATHER_LETTER_e: + case dItemNo_MOBLINS_LETTER_e: setAnm(AnmPrm_POST_PUTOUT, false); field_0x8EA = 1; msgId = 0xCEA; @@ -920,7 +918,7 @@ void daObjTpost_c::createInit() { dLetter_autoStock(dSv_event_flag_c::LETTER_KOMALIS_FATHER); } - if(dComIfGs_checkGetItem(dItem_BOMB_BAG_e)) { + if(dComIfGs_checkGetItem(dItemNo_BOMB_BAG_e)) { dLetter_autoStock(dSv_event_flag_c::LETTER_BOMBS_AD); } @@ -1029,18 +1027,18 @@ static actor_method_class daObjTpostMethodTable = { }; actor_process_profile_definition g_profile_OBJ_TORIPOST = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_OBJ_TORIPOST, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_TORIPOST_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjTpost_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_OBJ_TORIPOST, + /* Draw Prio */ fpcDwPi_OBJ_TORIPOST_e, /* Actor SubMtd */ &daObjTpostMethodTable, /* Status */ 0x18 | fopAcStts_SHOWMAP_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e | fopAcStts_UNK200000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_4_e, + /* Cull Type */ fopAc_CULLBOX_4_e, }; diff --git a/src/d/actor/d_a_obj_tousekiki.cpp b/src/d/actor/d_a_obj_tousekiki.cpp index 32267ec29..fa62077c8 100644 --- a/src/d/actor/d_a_obj_tousekiki.cpp +++ b/src/d/actor/d_a_obj_tousekiki.cpp @@ -7,8 +7,6 @@ #include "d/actor/d_a_obj_tousekiki.h" #include "d/actor/d_a_obj_pirateship.h" #include "d/res/res_touseki.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" @@ -151,18 +149,18 @@ static actor_method_class daObj_TousekikiMethodTable = { }; actor_process_profile_definition g_profile_Obj_Tousekiki = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Tousekiki, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Tousekiki_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObj_Tousekiki_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Tousekiki, + /* Draw Prio */ fpcDwPi_Obj_Tousekiki_e, /* Actor SubMtd */ &daObj_TousekikiMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_4_e, + /* Cull Type */ fopAc_CULLBOX_4_e, }; diff --git a/src/d/actor/d_a_obj_tower.cpp b/src/d/actor/d_a_obj_tower.cpp index 504b8f0ac..085f1b572 100644 --- a/src/d/actor/d_a_obj_tower.cpp +++ b/src/d/actor/d_a_obj_tower.cpp @@ -7,8 +7,6 @@ #include "d/actor/d_a_obj_tower.h" #include "d/res/res_x_tower.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "f_op/f_op_actor_mng.h" /* 00000078-00000098 .text CheckCreateHeap__FP10fopAc_ac_c */ @@ -149,16 +147,16 @@ static actor_method_class daObj_TowerMethodTable = { }; actor_process_profile_definition g_profile_Obj_Tower = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Tower, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Tower_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjTower_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Tower, + /* Draw Prio */ fpcDwPi_Obj_Tower_e, /* Actor SubMtd */ &daObj_TowerMethodTable, #if VERSION == VERSION_DEMO /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, @@ -166,5 +164,5 @@ actor_process_profile_definition g_profile_Obj_Tower = { /* Status */ fopAcStts_UNK40000_e, #endif /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_trap.cpp b/src/d/actor/d_a_obj_trap.cpp index b564fa3c8..d7b557ec4 100644 --- a/src/d/actor/d_a_obj_trap.cpp +++ b/src/d/actor/d_a_obj_trap.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_trap.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 000000EC-0000010C .text solidHeapCB__11daObjTrap_cFP10fopAc_ac_c */ void daObjTrap_c::solidHeapCB(fopAc_ac_c*) { @@ -144,18 +142,18 @@ static actor_method_class Trap_Mthd_Table = { }; // namespace actor_process_profile_definition g_profile_Obj_Trap = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Trap, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Trap_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjTrap_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Trap, + /* Draw Prio */ fpcDwPi_Obj_Trap_e, /* Actor SubMtd */ &Trap_Mthd_Table, /* Status */ fopAcStts_SHOWMAP_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_tribox.cpp b/src/d/actor/d_a_obj_tribox.cpp index 7ed216de0..0f2588131 100644 --- a/src/d/actor/d_a_obj_tribox.cpp +++ b/src/d/actor/d_a_obj_tribox.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_tribox.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 000000EC-000001A4 .text set_state__Q211daObjTribox5Act_cFv */ void daObjTribox::Act_c::set_state() { @@ -376,18 +374,18 @@ static actor_method_class Mthd_Table = { }; // namespace daObjTribox actor_process_profile_definition g_profile_Obj_Tribox = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Tribox, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Tribox_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjTribox::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Tribox, + /* Draw Prio */ fpcDwPi_Obj_Tribox_e, /* Actor SubMtd */ &daObjTribox::Mthd_Table, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLSPHERE_CUSTOM_e, + /* Cull Type */ fopAc_CULLSPHERE_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_try.cpp b/src/d/actor/d_a_obj_try.cpp index 715b89305..589aa0dd0 100644 --- a/src/d/actor/d_a_obj_try.cpp +++ b/src/d/actor/d_a_obj_try.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_try.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 00000078-00000090 .text prm_set_swSave__Q28daObjTry5Act_cFi */ void daObjTry::Act_c::prm_set_swSave(int) { @@ -261,18 +259,18 @@ static actor_method_class Mthd_Table = { }; // namespace daObjTry actor_process_profile_definition g_profile_Obj_Try = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0008, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Try, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0008, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Try_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjTry::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Try, + /* Draw Prio */ fpcDwPi_Obj_Try_e, /* Actor SubMtd */ &daObjTry::Mthd_Table, /* Status */ 0x04 | fopAcStts_SHOWMAP_e | fopAcStts_CULL_e | fopAcStts_FREEZE_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e | fopAcStts_UNK8000000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLSPHERE_CUSTOM_e, + /* Cull Type */ fopAc_CULLSPHERE_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_usovmc.cpp b/src/d/actor/d_a_obj_usovmc.cpp index 542083f2d..e0ed9e83d 100644 --- a/src/d/actor/d_a_obj_usovmc.cpp +++ b/src/d/actor/d_a_obj_usovmc.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_usovmc.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/res/res_usovmc.h" const char daObjUsovmc::Act_c::M_arcname[7] = "Usovmc"; @@ -123,18 +121,18 @@ static actor_method_class Mthd_Usovmc = { }; // namespace daObjUsovmc actor_process_profile_definition g_profile_Obj_Usovmc = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Usovmc, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Usovmc_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjUsovmc::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Usovmc, + /* Draw Prio */ fpcDwPi_Obj_Usovmc_e, /* Actor SubMtd */ &daObjUsovmc::Mthd_Usovmc, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_vfan.cpp b/src/d/actor/d_a_obj_vfan.cpp index e258ecbf8..7a859e7b3 100644 --- a/src/d/actor/d_a_obj_vfan.cpp +++ b/src/d/actor/d_a_obj_vfan.cpp @@ -7,8 +7,6 @@ #include "d/actor/d_a_obj_vfan.h" #include "d/res/res_vfan.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "m_Do/m_Do_mtx.h" namespace daObjVfan { @@ -247,18 +245,18 @@ static actor_method_class Mthd_Vfan = { }; // namespace daObjVfan actor_process_profile_definition g_profile_Obj_Vfan = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Vfan, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Vfan_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjVfan::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Vfan, + /* Draw Prio */ fpcDwPi_Obj_Vfan_e, /* Actor SubMtd */ &daObjVfan::Mthd_Vfan, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_vgnfd.cpp b/src/d/actor/d_a_obj_vgnfd.cpp index a8890ea2e..dc2ac0d9e 100644 --- a/src/d/actor/d_a_obj_vgnfd.cpp +++ b/src/d/actor/d_a_obj_vgnfd.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_vgnfd.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "d/res/res_vgnfd.h" #include "JSystem/JUtility/JUTAssert.h" @@ -509,18 +507,18 @@ static actor_method_class Vgnfd_Mthd_Table = { }; // namespace actor_process_profile_definition g_profile_Obj_Vgnfd = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Vgnfd, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Vgnfd_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjVgnfd_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Vgnfd, + /* Draw Prio */ fpcDwPi_Obj_Vgnfd_e, /* Actor SubMtd */ &Vgnfd_Mthd_Table, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_vmc.cpp b/src/d/actor/d_a_obj_vmc.cpp index bdb205c44..e4b27034f 100644 --- a/src/d/actor/d_a_obj_vmc.cpp +++ b/src/d/actor/d_a_obj_vmc.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_vmc.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "d/res/res_vmc.h" @@ -286,7 +284,7 @@ void daObjVmc::Act_c::daObjVmc_tree_main() { cCcD_Obj* hitObj = mCyl.GetTgHitObj(); if (hitObj != NULL) { fopAc_ac_c* at = hitObj->GetAc(); - if (at != NULL && fopAcM_GetName(at) == PROC_HOOKSHOT) + if (at != NULL && fopAcM_GetName(at) == fpcNm_HOOKSHOT_e) dComIfGs_onEventBit(dSv_event_flag_c::UNK_3420); } } @@ -336,11 +334,11 @@ bool daObjVmc::Act_c::_execute() { mLinkRangeCheck = false; } - if (mLinkRangeCheck == true && dComIfGp_getCb1Player() != NULL && fopAcM_GetName(dComIfGp_getCb1Player()) == PROC_NPC_CB1) { + if (mLinkRangeCheck == true && dComIfGp_getCb1Player() != NULL && fopAcM_GetName(dComIfGp_getCb1Player()) == fpcNm_NPC_CB1_e) { eventInfo.onCondition(dEvtCnd_CANTALK_e); } - if (mLinkRangeCheck == true && !mHasTree && fopAcM_GetName(dComIfGp_getPlayer(0)) == PROC_NPC_CB1) { + if (mLinkRangeCheck == true && !mHasTree && fopAcM_GetName(dComIfGp_getPlayer(0)) == fpcNm_NPC_CB1_e) { cLib_onBit(attention_info.flags, fopAc_Attn_UNK10000000_e | fopAc_Attn_ACTION_SPEAK_e | fopAc_Attn_LOCKON_TALK_e); } else { cLib_offBit(attention_info.flags, fopAc_Attn_UNK10000000_e | fopAc_Attn_ACTION_SPEAK_e | fopAc_Attn_LOCKON_TALK_e); @@ -407,18 +405,18 @@ static actor_method_class Mthd_Table = { }; // namespace daObjVmc actor_process_profile_definition g_profile_Obj_Vmc = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Vmc, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Vmc_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjVmc::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Vmc, + /* Draw Prio */ fpcDwPi_Obj_Vmc_e, /* Actor SubMtd */ &daObjVmc::Mthd_Table, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_obj_vmsdz.cpp b/src/d/actor/d_a_obj_vmsdz.cpp index 5da64c133..6bec73272 100644 --- a/src/d/actor/d_a_obj_vmsdz.cpp +++ b/src/d/actor/d_a_obj_vmsdz.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_vmsdz.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/res/res_vmsdz.h" const char daObjVmsdz_c::M_arcname[6] = "VmsDZ"; @@ -116,18 +114,18 @@ static actor_method_class Vmsdz_Mthd_Table = { }; // namespace actor_process_profile_definition g_profile_Obj_Vmsdz = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Vmsdz, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Vmsdz_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjVmsdz_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Vmsdz, + /* Draw Prio */ fpcDwPi_Obj_Vmsdz_e, /* Actor SubMtd */ &Vmsdz_Mthd_Table, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_vmsms.cpp b/src/d/actor/d_a_obj_vmsms.cpp index 49ed3ee61..5febba1e6 100644 --- a/src/d/actor/d_a_obj_vmsms.cpp +++ b/src/d/actor/d_a_obj_vmsms.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_vmsms.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/res/res_vmsms.h" const char daObjVmsms_c::M_arcname[6] = "VmsMS"; @@ -125,18 +123,18 @@ static actor_method_class Vmsms_Mthd_Table = { }; // namespace actor_process_profile_definition g_profile_Obj_Vmsms = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Vmsms, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Vmsms_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjVmsms_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Vmsms, + /* Draw Prio */ fpcDwPi_Obj_Vmsms_e, /* Actor SubMtd */ &Vmsms_Mthd_Table, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_volcano.cpp b/src/d/actor/d_a_obj_volcano.cpp index a55237068..850fa54aa 100644 --- a/src/d/actor/d_a_obj_volcano.cpp +++ b/src/d/actor/d_a_obj_volcano.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_volcano.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_particle_name.h" #include "d/res/res_ykzyg.h" #include "d/d_cc_d.h" @@ -513,18 +511,18 @@ static actor_method_class Mthd_Table = { }; // namespace daObjVolcano actor_process_profile_definition g_profile_Obj_Volcano = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Volcano, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Volcano_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjVolcano::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Volcano, + /* Draw Prio */ fpcDwPi_Obj_Volcano_e, /* Actor SubMtd */ &daObjVolcano::Mthd_Table, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_vtil.cpp b/src/d/actor/d_a_obj_vtil.cpp index 92cb2deec..5ea03cfca 100644 --- a/src/d/actor/d_a_obj_vtil.cpp +++ b/src/d/actor/d_a_obj_vtil.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_vtil.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 00000078-00000098 .text solidHeapCB__11daObjVtil_cFP10fopAc_ac_c */ void daObjVtil_c::solidHeapCB(fopAc_ac_c*) { @@ -209,18 +207,18 @@ static actor_method_class Vtil_Mthd_Table = { }; // namespace actor_process_profile_definition g_profile_Obj_Vtil = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0008, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Vtil, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0008, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Vtil_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjVtil_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Vtil, + /* Draw Prio */ fpcDwPi_Obj_Vtil_e, /* Actor SubMtd */ &Vtil_Mthd_Table, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_vyasi.cpp b/src/d/actor/d_a_obj_vyasi.cpp index 33e9bdb59..aacbaef47 100644 --- a/src/d/actor/d_a_obj_vyasi.cpp +++ b/src/d/actor/d_a_obj_vyasi.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_vyasi.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 000000EC-0000015C .text SetStopJointAnimation__Q210daObjVyasi5Act_cFP18J3DAnmTransformKeyff */ void daObjVyasi::Act_c::SetStopJointAnimation(J3DAnmTransformKey*, float, float) { @@ -181,18 +179,18 @@ static actor_method_class Mthd_Table = { }; // namespace daObjVyasi actor_process_profile_definition g_profile_Obj_Vyasi = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Vyasi, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Vyasi_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjVyasi::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Vyasi, + /* Draw Prio */ fpcDwPi_Obj_Vyasi_e, /* Actor SubMtd */ &daObjVyasi::Mthd_Table, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e | fopAcStts_UNK200000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_warpt.cpp b/src/d/actor/d_a_obj_warpt.cpp index c3d7af901..c0dc8e730 100644 --- a/src/d/actor/d_a_obj_warpt.cpp +++ b/src/d/actor/d_a_obj_warpt.cpp @@ -10,8 +10,6 @@ #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" #include "d/d_lib.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_a_obj.h" #include "d/d_bg_s_movebg_actor.h" #include "f_op/f_op_actor_mng.h" @@ -234,7 +232,7 @@ void ride_CB(dBgW*, fopAc_ac_c* a_this, fopAc_ac_c* arg2) { /* 00000648-00000750 .text _ride__13daObj_Warpt_cFP10fopAc_ac_c */ void daObj_Warpt_c::_ride(fopAc_ac_c* arg1) { - if (fpcM_GetName(arg1) == PROC_PLAYER) { + if (fpcM_GetName(arg1) == fpcNm_PLAYER_e) { daPy_py_c* player = (daPy_py_c*)arg1; fopAcM_searchActorAngleY(this, dComIfGp_getPlayer(0)); @@ -883,16 +881,16 @@ static actor_method_class daObj_WarptMethodTable = { }; actor_process_profile_definition g_profile_OBJ_WARPT = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_OBJ_WARPT, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_WARPT_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObj_Warpt_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_OBJ_WARPT, + /* Draw Prio */ fpcDwPi_OBJ_WARPT_e, /* Actor SubMtd */ &daObj_WarptMethodTable, #if VERSION == VERSION_DEMO /* Status */ 0x17 | fopAcStts_SHOWMAP_e | fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, @@ -900,5 +898,5 @@ actor_process_profile_definition g_profile_OBJ_WARPT = { /* Status */ 0x17 | fopAcStts_SHOWMAP_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, #endif /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_wood.cpp b/src/d/actor/d_a_obj_wood.cpp index 9a7f7776c..75a8af6c0 100644 --- a/src/d/actor/d_a_obj_wood.cpp +++ b/src/d/actor/d_a_obj_wood.cpp @@ -7,8 +7,6 @@ #include "d/actor/d_a_obj_wood.h" #include "d/d_wood.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "f_op/f_op_actor_mng.h" cPhs_State daObjWood::Act_c::_create() { @@ -65,18 +63,18 @@ actor_method_class daObjWood::Method::Table = { }; actor_process_profile_definition g_profile_Obj_Wood = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Wood, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Wood_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjWood::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Wood, + /* Draw Prio */ fpcDwPi_Obj_Wood_e, /* Actor SubMtd */ &daObjWood::Method::Table, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_obj_xfuta.cpp b/src/d/actor/d_a_obj_xfuta.cpp index 9fcf205f4..ba700106f 100644 --- a/src/d/actor/d_a_obj_xfuta.cpp +++ b/src/d/actor/d_a_obj_xfuta.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_xfuta.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/res/res_x_futa.h" #include "dolphin/types.h" @@ -141,18 +139,18 @@ static actor_method_class Mthd_Table = { } // namespace daObjXfuta actor_process_profile_definition g_profile_Obj_Xfuta = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Xfuta, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Xfuta_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjXfuta::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Xfuta, + /* Draw Prio */ fpcDwPi_Obj_Xfuta_e, /* Actor SubMtd */ &daObjXfuta::Mthd_Table, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_obj_zouK.cpp b/src/d/actor/d_a_obj_zouK.cpp index c0c3a54c4..93d6e80a7 100644 --- a/src/d/actor/d_a_obj_zouK.cpp +++ b/src/d/actor/d_a_obj_zouK.cpp @@ -10,8 +10,6 @@ #include "f_op/f_op_camera.h" #include "d/d_com_inf_game.h" #include "d/d_kankyo_rain.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "m_Do/m_Do_mtx.h" #include "JSystem/JUtility/JUTAssert.h" @@ -387,18 +385,18 @@ namespace daObjZouk { } actor_process_profile_definition g_profile_Obj_Zouk = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Zouk, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Zouk_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjZouk::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Zouk, + /* Draw Prio */ fpcDwPi_Obj_Zouk_e, /* Actor SubMtd */ &daObjZouk::Mthd_Table, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_oq.cpp b/src/d/actor/d_a_oq.cpp index f624f39cd..4c7038d47 100644 --- a/src/d/actor/d_a_oq.cpp +++ b/src/d/actor/d_a_oq.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_oq.h" #include "m_Do/m_Do_ext.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" /* 000000EC-00000208 .text nodeCallBack__FP7J3DNodei */ @@ -238,18 +236,18 @@ static actor_method_class l_daOQ_Method = { }; actor_process_profile_definition g_profile_OQ = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_OQ, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OQ_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(oq_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_OQ, + /* Draw Prio */ fpcDwPi_OQ_e, /* Actor SubMtd */ &l_daOQ_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ENEMY_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_oship.cpp b/src/d/actor/d_a_oship.cpp index 14d0657dc..2a066ab27 100644 --- a/src/d/actor/d_a_oship.cpp +++ b/src/d/actor/d_a_oship.cpp @@ -11,8 +11,6 @@ #include "d/actor/d_a_salvage.h" #include "d/actor/d_a_ship.h" #include "d/res/res_oship.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" const s32 daOship_c::m_heapsize = 0x1280; @@ -447,7 +445,7 @@ void daOship_c::attackCannon(int i_index) { int bomb_prm = daBomb_c::prm_make(daBomb_c::STATE_4, true, true); daBomb_c* bomb_p = (daBomb_c *) fopAcM_fastCreate( - PROC_BOMB, bomb_prm, + fpcNm_BOMB_e, bomb_prm, &mBombSpawnPos, tevStr.mRoomNo, &rot ); @@ -724,7 +722,7 @@ void daOship_c::modeDelete() { if (s16(std::abs(temp)) <= 0x100 && std::fabsf(temp2 - water_height) < 500.0f && mSwitchA != 0xFF) { dComIfGs_onSwitch(mSwitchA, fopAcM_GetRoomNo(this)); - daSalvage_c* salvage_p = (daSalvage_c *) fopAcM_SearchByName(PROC_Salvage); + daSalvage_c* salvage_p = (daSalvage_c *) fopAcM_SearchByName(fpcNm_Salvage_e); salvage_p->onSalvageForOship(this); mDoAud_seStart(JA_SE_READ_RIDDLE_1); } @@ -751,7 +749,7 @@ void daOship_c::modeDelete() { if (s16(std::abs(temp)) <= 0x100 && std::fabsf(temp2 - water_height) < 500.0f) { if (mSwitchA != 0xFF) { dComIfGs_onSwitch(mSwitchA, fopAcM_GetRoomNo(this)); - daSalvage_c* salvage_p = (daSalvage_c *) fopAcM_SearchByName(PROC_Salvage); + daSalvage_c* salvage_p = (daSalvage_c *) fopAcM_SearchByName(fpcNm_Salvage_e); salvage_p->onSalvageForOship(this); } @@ -932,7 +930,7 @@ void daOship_c::createInit() { if (!isSpecial()) { mFlagPcId = fopAcM_create( - PROC_MAJUU_FLAG, 4, + fpcNm_MAJUU_FLAG_e, 4, ¤t.pos, tevStr.mRoomNo, ¤t.angle ); @@ -1100,18 +1098,18 @@ static actor_method_class daOshipMethodTable = { }; actor_process_profile_definition g_profile_OSHIP = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_OSHIP, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OSHIP_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daOship_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_OSHIP, + /* Draw Prio */ fpcDwPi_OSHIP_e, /* Actor SubMtd */ &daOshipMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ENEMY_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_pedestal.cpp b/src/d/actor/d_a_pedestal.cpp index 4a61ef58d..570757756 100644 --- a/src/d/actor/d_a_pedestal.cpp +++ b/src/d/actor/d_a_pedestal.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_pedestal.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/res/res_hdai1.h" namespace daPedestal { @@ -475,18 +473,18 @@ static actor_method_class daActMethodTable = { }; // namespace daPedestal actor_process_profile_definition g_profile_PEDESTAL = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_PEDESTAL, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_PEDESTAL_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daPedestal::daPds_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_PEDESTAL, + /* Draw Prio */ fpcDwPi_PEDESTAL_e, /* Actor SubMtd */ &daPedestal::daActMethodTable, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_ph.cpp b/src/d/actor/d_a_ph.cpp index 646289bea..dddadd83e 100644 --- a/src/d/actor/d_a_ph.cpp +++ b/src/d/actor/d_a_ph.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_ph.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" /* 00000078-00000158 .text nodeCallBack_UP__FP7J3DNodei */ @@ -269,18 +267,18 @@ static actor_method_class l_daPH_Method = { }; actor_process_profile_definition g_profile_PH = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_PH, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_PH_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(ph_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_PH, + /* Draw Prio */ fpcDwPi_PH_e, /* Actor SubMtd */ &l_daPH_Method, /* Status */ fopAcStts_SHOWMAP_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e | fopAcStts_UNK80000_e, /* Group */ fopAc_ENEMY_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_pirate_flag.cpp b/src/d/actor/d_a_pirate_flag.cpp index ba336366d..6ee625054 100644 --- a/src/d/actor/d_a_pirate_flag.cpp +++ b/src/d/actor/d_a_pirate_flag.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_pirate_flag.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/res/res_kaizokusen.h" #include "d/res/res_cloth.h" #include "d/actor/d_a_obj_pirateship.h" @@ -574,18 +572,18 @@ static actor_method_class l_daPirate_Flag_Method = { }; actor_process_profile_definition g_profile_PIRATE_FLAG = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_PIRATE_FLAG, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_PIRATE_FLAG_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(pirate_flag_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_PIRATE_FLAG, + /* Draw Prio */ fpcDwPi_PIRATE_FLAG_e, /* Actor SubMtd */ &l_daPirate_Flag_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_player_boomerang.inc b/src/d/actor/d_a_player_boomerang.inc index b577b3c95..b6b9b1c22 100644 --- a/src/d/actor/d_a_player_boomerang.inc +++ b/src/d/actor/d_a_player_boomerang.inc @@ -61,7 +61,7 @@ BOOL daPy_lk_c::returnBoomerang() { { mActorKeepEquip = mActorKeepThrow; mActorKeepThrow.clearData(); - mEquipItem = dItem_BOOMERANG_e; + mEquipItem = dItemNo_BOOMERANG_e; onNoResetFlg0(daPyFlg0_UNK20); return true; } diff --git a/src/d/actor/d_a_player_bottle.inc b/src/d/actor/d_a_player_bottle.inc index d2a81fbfd..b9b7f704b 100644 --- a/src/d/actor/d_a_player_bottle.inc +++ b/src/d/actor/d_a_player_bottle.inc @@ -14,13 +14,12 @@ #include "d/actor/d_a_player_main.h" #include "d/actor/d_a_player_HIO.h" #include "d/d_camera.h" -#include "d/d_procname.h" #include "JSystem/J3DGraphLoader/J3DAnmLoader.h" #include "f_op/f_op_kankyo_mng.h" /* 80151E40-80151E60 .text changeBottleDrinkFace__9daPy_lk_cFi */ int daPy_lk_c::changeBottleDrinkFace(int param_0) { - if (param_0 == dItem_SOUP_BOTTLE_e || param_0 == dItem_HALF_SOUP_BOTTLE_e) { + if (param_0 == dItemNo_SOUP_BOTTLE_e || param_0 == dItemNo_HALF_SOUP_BOTTLE_e) { return true; } return false; @@ -37,12 +36,12 @@ void daPy_lk_c::setBottleModel(u16 param_0) { mpEquipItemBtk->setFrame(0.0f); mpEquipItemBtk->searchUpdateMaterialID(tmp_modelData); tmp_modelData->entryTexMtxAnimator(mpEquipItemBtk); - if (param_0 == dItem_RED_POTION_e || param_0 == dItem_GREEN_POTION_e || param_0 == dItem_BLUE_POTION_e || - param_0 == dItem_HALF_SOUP_BOTTLE_e || param_0 == dItem_SOUP_BOTTLE_e || param_0 == dItem_WATER_BOTTLE_e || - param_0 == dItem_FOREST_WATER_e) + if (param_0 == dItemNo_RED_POTION_e || param_0 == dItemNo_GREEN_POTION_e || param_0 == dItemNo_BLUE_POTION_e || + param_0 == dItemNo_HALF_SOUP_BOTTLE_e || param_0 == dItemNo_SOUP_BOTTLE_e || param_0 == dItemNo_WATER_BOTTLE_e || + param_0 == dItemNo_FOREST_WATER_e) { u16 bdl; - if (param_0 == dItem_HALF_SOUP_BOTTLE_e) { + if (param_0 == dItemNo_HALF_SOUP_BOTTLE_e) { bdl = LINK_BDL_BINLIQUIDH; } else { bdl = LINK_BDL_BINLIQUID; @@ -51,22 +50,22 @@ void daPy_lk_c::setBottleModel(u16 param_0) { buffer = new (0x20) u8[0x400]; JKRReadIdxResource(buffer, 0x400, LKANM_BRK_TBINLIQUID, dComIfGp_getAnmArchive()); mpEquipItemBrk = static_cast(J3DAnmLoaderDataBase::load(buffer)); - if (param_0 == dItem_RED_POTION_e) { + if (param_0 == dItemNo_RED_POTION_e) { mpEquipItemBrk->setFrame(0.0f); - } else if (param_0 == dItem_GREEN_POTION_e) { + } else if (param_0 == dItemNo_GREEN_POTION_e) { mpEquipItemBrk->setFrame(1.0f); - } else if (param_0 == dItem_BLUE_POTION_e) { + } else if (param_0 == dItemNo_BLUE_POTION_e) { mpEquipItemBrk->setFrame(2.0f); - } else if (param_0 == dItem_SOUP_BOTTLE_e || param_0 == dItem_HALF_SOUP_BOTTLE_e) { + } else if (param_0 == dItemNo_SOUP_BOTTLE_e || param_0 == dItemNo_HALF_SOUP_BOTTLE_e) { mpEquipItemBrk->setFrame(4.0f); } else { mpEquipItemBrk->setFrame(3.0f); } mpEquipItemBrk->searchUpdateMaterialID(tmp_modelData); tmp_modelData->entryTevRegAnimator(mpEquipItemBrk); - } else if (param_0 == dItem_FAIRY_BOTTLE_e) { + } else if (param_0 == dItemNo_FAIRY_BOTTLE_e) { tmp_modelData = initModel(&mpBottleContentsModel, LINK_BDL_BINFAIRY, 0x13000022); - } else if (param_0 == dItem_FIREFLY_BOTTLE_e) { + } else if (param_0 == dItemNo_FIREFLY_BOTTLE_e) { tmp_modelData = initModel(&mpBottleContentsModel, LINK_BDL_BINHO, 0x13000022); buffer = new (0x20) u8[0x400]; JKRReadIdxResource(buffer, 0x400, LKANM_BRK_TBINHO, dComIfGp_getAnmArchive()); @@ -75,12 +74,12 @@ void daPy_lk_c::setBottleModel(u16 param_0) { tmp_modelData->entryTevRegAnimator(mpEquipItemBrk); m3600 = 0.0f; } - if (param_0 != dItem_EMPTY_BOTTLE_e && mCurProc != daPyProc_BOTTLE_DRINK_e) { + if (param_0 != dItemNo_EMPTY_BOTTLE_e && mCurProc != daPyProc_BOTTLE_DRINK_e) { tmp_modelData = initModel(&mpBottleCapModel, LINK_BDL_BOTTLECAP, 0x13000022); m355E = 1; } mDoExt_setCurrentHeap(oldHeap); - if (param_0 == dItem_FOREST_WATER_e) { + if (param_0 == dItemNo_FOREST_WATER_e) { m32F0.makeEmitter(dPa_name::ID_AK_JN_FORESTWATER00, mpEquipItemModel->getBaseTRMtx(), ¤t.pos, NULL); } } @@ -89,7 +88,7 @@ void daPy_lk_c::setBottleModel(u16 param_0) { fopAc_ac_c* daPy_lk_c::makeFairy(cXyz* param_0, u32 param_1) { onResetFlg0(daPyRFlg0_FAIRY_USE); resetCurse(); - return (fopAc_ac_c*)fopAcM_fastCreate(PROC_NPC_FA1, param_1, param_0, fopAcM_GetRoomNo(this), &shape_angle); + return (fopAc_ac_c*)fopAcM_fastCreate(fpcNm_NPC_FA1_e, param_1, param_0, fopAcM_GetRoomNo(this), &shape_angle); } /* 801521A0-80152300 .text procBottleDrink_init__9daPy_lk_cFUs */ @@ -137,13 +136,13 @@ BOOL daPy_lk_c::procBottleDrink() { if (changeBottleDrinkFace(mEquipItem)) { setTextureAnime(0x86, 0); } - if (mEquipItem != dItem_GREEN_POTION_e) { + if (mEquipItem != dItemNo_GREEN_POTION_e) { dComIfGp_setItemLifeCount(dComIfGs_getMaxLife()); } - if (mEquipItem != dItem_RED_POTION_e) { + if (mEquipItem != dItemNo_RED_POTION_e) { dComIfGp_setItemMagicCount(dComIfGs_getMaxMagic()); } - if (mEquipItem == dItem_SOUP_BOTTLE_e || mEquipItem == dItem_HALF_SOUP_BOTTLE_e) { + if (mEquipItem == dItemNo_SOUP_BOTTLE_e || mEquipItem == dItemNo_HALF_SOUP_BOTTLE_e) { onNoResetFlg1(daPyFlg1_SOUP_POWER_UP); } resetCurse(); @@ -166,18 +165,18 @@ BOOL daPy_lk_c::procBottleDrink() { if (changeBottleDrinkFace(mEquipItem)) { setTextureAnime(0x87, 0); } - if (mEquipItem == dItem_SOUP_BOTTLE_e) { - setBottleModel(dItem_HALF_SOUP_BOTTLE_e); - dComIfGs_setEquipBottleItemIn(mReadyItemBtn, dItem_HALF_SOUP_BOTTLE_e); + if (mEquipItem == dItemNo_SOUP_BOTTLE_e) { + setBottleModel(dItemNo_HALF_SOUP_BOTTLE_e); + dComIfGs_setEquipBottleItemIn(mReadyItemBtn, dItemNo_HALF_SOUP_BOTTLE_e); } else { mpBottleContentsModel = NULL; dComIfGs_setEquipBottleItemEmpty(mReadyItemBtn); } const GXColor* p_Var3; - if (mEquipItem != dItem_SOUP_BOTTLE_e && mEquipItem != dItem_HALF_SOUP_BOTTLE_e) { - if (mEquipItem == dItem_RED_POTION_e) { + if (mEquipItem != dItemNo_SOUP_BOTTLE_e && mEquipItem != dItemNo_HALF_SOUP_BOTTLE_e) { + if (mEquipItem == dItemNo_RED_POTION_e) { p_Var3 = &red; - } else if (mEquipItem == dItem_GREEN_POTION_e) { + } else if (mEquipItem == dItemNo_GREEN_POTION_e) { p_Var3 = &green; } else { p_Var3 = &blue; @@ -231,7 +230,7 @@ BOOL daPy_lk_c::procBottleOpen_init(u16 param_0) { keepItemData(); setBottleModel(param_0); dComIfGp_setPlayerStatus1(0, daPyStts1_UNK4000_e); - if (mEquipItem == dItem_FAIRY_BOTTLE_e) { + if (mEquipItem == dItemNo_FAIRY_BOTTLE_e) { mProcVar6.m3570 = 3; } else { mProcVar6.m3570 = 2; @@ -255,7 +254,7 @@ BOOL daPy_lk_c::procBottleOpen() { if (m_anm_heap_under[UNDER_MOVE0_e].mIdx == LKANM_BCK_BINOPENPRE) { if (frameCtrl.getRate() < 0.01f) { - if (mEquipItem == dItem_FAIRY_BOTTLE_e) { + if (mEquipItem == dItemNo_FAIRY_BOTTLE_e) { setSingleMoveAnime( ANM_BINOPENB, 1.0f, @@ -361,23 +360,23 @@ BOOL daPy_lk_c::procBottleOpen() { } } else if (mProcVar4.m34D8 == 0) { if ( - (mEquipItem == dItem_WATER_BOTTLE_e || mEquipItem == dItem_FOREST_WATER_e) && + (mEquipItem == dItemNo_WATER_BOTTLE_e || mEquipItem == dItemNo_FOREST_WATER_e) && (frameCtrl.checkPass(9.0f)) ) { seStartOnlyReverb(JA_SE_LK_SPRINKLE_WATER); m32E4.makeEmitterColor(dPa_name::ID_AK_JN_SPILLWATER00, mpCLModel->getAnmMtx(0x08), ¤t.pos, &tevStr.mColorK0, &tevStr.mColorK0); dCcG_At_Spl spl; - if (mEquipItem == dItem_WATER_BOTTLE_e) { + if (mEquipItem == dItemNo_WATER_BOTTLE_e) { spl = dCcG_At_Spl_UNK0; - } else { // dItem_FOREST_WATER_e + } else { // dItemNo_FOREST_WATER_e spl = dCcG_At_Spl_UNK4; onNoResetFlg1(daPyFlg1_FOREST_WATER_USE); m3554 = 3; } setAtParam(AT_TYPE_WATER, 0, spl, 0, dCcG_AtHitMark_None_e, CUT_TYPE_NONE, 5.0f); } else if ( - (mEquipItem == dItem_FAIRY_BOTTLE_e && frameCtrl.getFrame() >= m_HIO->mItem.mBottle.m.field_0x58) || - (mEquipItem != dItem_FAIRY_BOTTLE_e && mEquipItem != dItem_FOREST_WATER_e && frameCtrl.getFrame() >= m_HIO->mItem.mBottle.m.field_0x4C) + (mEquipItem == dItemNo_FAIRY_BOTTLE_e && frameCtrl.getFrame() >= m_HIO->mItem.mBottle.m.field_0x58) || + (mEquipItem != dItemNo_FAIRY_BOTTLE_e && mEquipItem != dItemNo_FOREST_WATER_e && frameCtrl.getFrame() >= m_HIO->mItem.mBottle.m.field_0x4C) ) { mpBottleContentsModel = NULL; mProcVar4.m34D8 = 1; @@ -390,11 +389,11 @@ BOOL daPy_lk_c::procBottleOpen() { } else { // dTalkBtn_Z_e dComIfGs_setEquipBottleItemEmpty(dItemBtn_Z_e); } - if (mEquipItem == dItem_FAIRY_BOTTLE_e) { + if (mEquipItem == dItemNo_FAIRY_BOTTLE_e) { onModeFlg(ModeFlg_08000000); mActorKeepRope.setData(makeFairy(&mLeftHandPos, 2)); - } else if (mEquipItem == dItem_FIREFLY_BOTTLE_e) { - fopAcM_create(PROC_NH, 1, &mLeftHandPos, fopAcM_GetRoomNo(this), &shape_angle); + } else if (mEquipItem == dItemNo_FIREFLY_BOTTLE_e) { + fopAcM_create(fpcNm_NH_e, 1, &mLeftHandPos, fopAcM_GetRoomNo(this), &shape_angle); } } } else if (frameCtrl.getFrame() > 40.0f) { @@ -410,7 +409,7 @@ BOOL daPy_lk_c::procBottleOpen() { m370C.y, m370C.z + cM_rndFX(45.0f) ); - fopKyM_create(PROC_WATER_MARK, 1, &sp28); + fopKyM_create(fpcNm_WATER_MARK_e, 1, &sp28); mProcVar0.m34D0 = 3; } } @@ -424,7 +423,7 @@ BOOL daPy_lk_c::procBottleSwing_init(int param_0) { commonProcInit(daPyProc_BOTTLE_SWING_e); if (param_0 != 0) { deleteEquipItem(FALSE); - setBottleModel(dItem_EMPTY_BOTTLE_e); + setBottleModel(dItemNo_EMPTY_BOTTLE_e); } current.angle.y = shape_angle.y; mNormalSpeed = 0.0f; @@ -476,11 +475,11 @@ BOOL daPy_lk_c::procBottleSwing() { if (eventInfo.checkCommandCatch()) { mProcVar6.m3570 = 1; u8 bVar5 = dComIfGp_event_getPreItemNo(); - if (bVar5 == dItem_WATER_BOTTLE_e) { + if (bVar5 == dItemNo_WATER_BOTTLE_e) { seStartOnlyReverb(JA_SE_LK_SCOOP_WATER); if (!strcmp(dComIfGp_getStartStageName(), "Omori")) { - bVar5 = dItem_FOREST_WATER_e; - if (dComIfGs_checkBottle(dItem_FOREST_WATER_e)) { + bVar5 = dItemNo_FOREST_WATER_e; + if (dComIfGs_checkBottle(dItemNo_FOREST_WATER_e)) { m3628 = fpcM_ERROR_PROCESS_ID_e; mProcVar7.m3574 = 1; } else { @@ -496,7 +495,7 @@ BOOL daPy_lk_c::procBottleSwing() { mDemo.setSpecialDemoType(); } else { if (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() >= 1.0f && - mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() <= 4.0f && getReadyItem() == dItem_EMPTY_BOTTLE_e && + mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() <= 4.0f && getReadyItem() == dItemNo_EMPTY_BOTTLE_e && (dComIfGp_att_getCatghTarget() != NULL || mWaterY > current.pos.y + 10.0f)) { fopAcM_orderCatchEvent(this, dComIfGp_att_getCatghTarget()); @@ -549,7 +548,7 @@ BOOL daPy_lk_c::procBottleGet_init() { m3628 = fpcM_ERROR_PROCESS_ID_e; mProcVar6.m3570 = 0; dCam_getBody()->StartEventCamera(0x12, fopAcM_GetID(this), "Type", &mProcVar6.m3570, 0); - if (mEquipItem == dItem_FOREST_WATER_e) { + if (mEquipItem == dItemNo_FOREST_WATER_e) { m32F0.makeEmitter(dPa_name::ID_AK_JN_FORESTWATER00, mpEquipItemModel->getBaseTRMtx(), ¤t.pos, NULL); } initShipRideUseItem(iVar1, 2); diff --git a/src/d/actor/d_a_player_bow.inc b/src/d/actor/d_a_player_bow.inc index ca29c028c..07be27d90 100644 --- a/src/d/actor/d_a_player_bow.inc +++ b/src/d/actor/d_a_player_bow.inc @@ -15,7 +15,6 @@ #include "d/actor/d_a_npc_so.h" #include "d/actor/d_a_player_HIO.h" #include "d/actor/d_a_player_main.h" -#include "d/d_procname.h" /* 80149ECC-80149F88 .text bowJointCB__9daPy_lk_cFi */ BOOL daPy_lk_c::bowJointCB(int param_0) { @@ -70,10 +69,10 @@ BOOL daPy_lk_c::checkBowAnime() const { void daPy_lk_c::makeArrow() { if ((!checkBowMiniGame() && dComIfGs_getArrowNum() != 0) || (checkBowMiniGame() && dComIfGp_event_getPt1() && - fopAcM_GetName(dComIfGp_event_getPt1()) == PROC_NPC_SO && + fopAcM_GetName(dComIfGp_event_getPt1()) == fpcNm_NPC_SO_e && ((daNpc_So_c*)dComIfGp_event_getPt1())->getMiniGameRestArrow() > 0)) { - fopAc_ac_c* arrow_p = (fopAc_ac_c*)fopAcM_fastCreate(PROC_ARROW, 0, ¤t.pos, fopAcM_GetRoomNo(this)); + fopAc_ac_c* arrow_p = (fopAc_ac_c*)fopAcM_fastCreate(fpcNm_ARROW_e, 0, ¤t.pos, fopAcM_GetRoomNo(this)); mActorKeepEquip.setData(arrow_p); } m355C = 0; @@ -83,7 +82,7 @@ void daPy_lk_c::makeArrow() { void daPy_lk_c::deleteArrow() { fopAc_ac_c* equip_actor = mActorKeepEquip.getActor(); - if (equip_actor != NULL && fopAcM_GetName(equip_actor) == PROC_ARROW) { + if (equip_actor != NULL && fopAcM_GetName(equip_actor) == fpcNm_ARROW_e) { fopAcM_delete(equip_actor); mActorKeepEquip.clearData(); } @@ -151,7 +150,7 @@ BOOL daPy_lk_c::checkNextActionBowReady() { } m355C = 1; } else if (daArrow_c::changeArrowMp()) { - if (mEquipItem != dItem_BOW_e) { + if (mEquipItem != dItemNo_BOW_e) { dComIfGp_setRStatus(dActStts_SWAP_MODES_e); if (spActionTrigger() && arrow != NULL) { mActorKeepEquip.setData(arrow->changeArrowType()); @@ -178,7 +177,7 @@ BOOL daPy_lk_c::checkNextActionBowReady() { seStartSystem(JA_SE_ITEM_TARGET_OUT); } } else if (daArrow_c::changeArrowMp()) { - if (mEquipItem != dItem_BOW_e) { + if (mEquipItem != dItemNo_BOW_e) { dComIfGp_setRStatus(dActStts_SWAP_MODES_e); if (spActionTrigger()) { daArrow_c::changeArrowTypeNotReady(); diff --git a/src/d/actor/d_a_player_dproc.inc b/src/d/actor/d_a_player_dproc.inc index d24ede088..14c1dd452 100644 --- a/src/d/actor/d_a_player_dproc.inc +++ b/src/d/actor/d_a_player_dproc.inc @@ -22,7 +22,6 @@ #include "d/actor/d_a_ship.h" #include "d/d_gameover.h" #include "d/d_kankyo_wether.h" -#include "d/d_procname.h" #include "f_op/f_op_camera.h" #include "f_op/f_op_camera_mng.h" #include "m_Do/m_Do_graphic.h" @@ -91,7 +90,7 @@ void daPy_lk_c::setShapeAngleToTalkActor() { if (partner_p != NULL) { s16 partner_name = fopAcM_GetName(partner_p); s16 target; - if (partner_name == PROC_AGB) { + if (partner_name == fpcNm_AGB_e) { target = cLib_targetAngleY(¤t.pos, &partner_p->eyePos); } else { target = fopAcM_searchActorAngleY(this, partner_p); @@ -260,17 +259,17 @@ BOOL daPy_lk_c::dProcTool() { #endif } - u8 itemNo = dItem_NONE_e; + u8 itemNo = dItemNo_NONE_e; if (mLeftHandIdx == 0xC8) { - itemNo = dItem_SWORD_e; + itemNo = dItemNo_SWORD_e; } else if (mLeftHandIdx == 0xC9) { - itemNo = dItem_MASTER_SWORD_1_e; + itemNo = dItemNo_MASTER_SWORD_1_e; } else if (mLeftHandIdx == 0xCA) { - itemNo = dItem_MASTER_SWORD_2_e; + itemNo = dItemNo_MASTER_SWORD_2_e; } else if (mLeftHandIdx == 0xCB) { - itemNo = dItem_MASTER_SWORD_3_e; + itemNo = dItemNo_MASTER_SWORD_3_e; } - if (itemNo != dItem_NONE_e) { + if (itemNo != dItemNo_NONE_e) { mLeftHandIdx = 3; if (mEquipItem != daPyItem_SWORD_e || itemNo != dComIfGs_getSelectEquip(0)) { dComIfGs_setSelectEquip(0, itemNo); @@ -283,7 +282,7 @@ BOOL daPy_lk_c::dProcTool() { } } else { if (mLeftHandIdx == 0xCC) { - if (mEquipItem != dItem_WIND_WAKER_e) { + if (mEquipItem != dItemNo_WIND_WAKER_e) { deleteEquipItem(FALSE); } mLeftHandIdx = 5; @@ -296,9 +295,9 @@ BOOL daPy_lk_c::dProcTool() { if (mRightHandIdx == 0xC8 || mRightHandIdx == 0xC9) { mProcVar2.m34D4 = 1; if (mRightHandIdx == 0xC8) { - dComIfGs_setSelectEquip(1, dItem_SHIELD_e); + dComIfGs_setSelectEquip(1, dItemNo_SHIELD_e); } else { - dComIfGs_setSelectEquip(1, dItem_MIRROR_SHIELD_e); + dComIfGs_setSelectEquip(1, dItemNo_MIRROR_SHIELD_e); } mRightHandIdx = 0x08; } else { @@ -556,18 +555,18 @@ BOOL daPy_lk_c::dProcOpenTreasure() { #if VERSION > VERSION_DEMO /* 8012E28C-8012E418 .text setGetItemSound__9daPy_lk_cFUsi */ void daPy_lk_c::setGetItemSound(u16 param_1, BOOL param_2) { - if (param_1 == dItem_GREEN_RUPEE_e || param_1 == dItem_BLUE_RUPEE_e || param_1 == dItem_YELLOW_RUPEE_e || - param_1 == dItem_RED_RUPEE_e || param_1 == dItem_PURPLE_RUPEE_e || param_1 == TINCLE_RUPEE1) + if (param_1 == dItemNo_GREEN_RUPEE_e || param_1 == dItemNo_BLUE_RUPEE_e || param_1 == dItemNo_YELLOW_RUPEE_e || + param_1 == dItemNo_RED_RUPEE_e || param_1 == dItemNo_PURPLE_RUPEE_e || param_1 == dItemNo_TINGLE_RUPEE_1_e) { seStartSystem(JA_SE_ME_ITEM_GET_S); dComIfGp_setMesgBgmOn2(); - } else if (param_1 == dItem_HEART_CONTAINER_e || - (param_1 == dItem_HEART_PIECE_e && ((dComIfGs_getMaxLife() % 4) == 3))) + } else if (param_1 == dItemNo_HEART_CONTAINER_e || + (param_1 == dItemNo_HEART_PIECE_e && ((dComIfGs_getMaxLife() % 4) == 3))) { mDoAud_subBgmStart(JA_BGM_GET_HEART); dComIfGp_setMesgBgmOn(); - } else if (param_1 == dItem_HEART_PIECE_e || param_1 == dItem_JOY_PENDANT_e || param_1 == dItem_SMALL_KEY_e || - param_1 == dItem_SILVER_RUPEE_e || param_1 == dItem_ORANGE_RUPEE_e) + } else if (param_1 == dItemNo_HEART_PIECE_e || param_1 == dItemNo_JOY_PENDANT_e || param_1 == dItemNo_SMALL_KEY_e || + param_1 == dItemNo_SILVER_RUPEE_e || param_1 == dItemNo_ORANGE_RUPEE_e) { mDoAud_subBgmStart(JA_BGM_ITEM_GET_S); dComIfGp_setMesgBgmOn(); @@ -607,7 +606,7 @@ BOOL daPy_lk_c::setGetDemo() { if (r0 == 0xB) { fopAc_ac_c* itemPartner = fopAcM_getItemEventPartner(this); if (itemPartner != NULL && - (fopAcM_GetName(itemPartner) == PROC_ITEM || fopAcM_GetName(itemPartner) == PROC_Demo_Item)) + (fopAcM_GetName(itemPartner) == fpcNm_ITEM_e || fopAcM_GetName(itemPartner) == fpcNm_Demo_Item_e)) { daItemBase_c* item = (daItemBase_c*)itemPartner; item->hide(); @@ -618,8 +617,8 @@ BOOL daPy_lk_c::setGetDemo() { } u32 itemGetMsgNo; - if (itemNo == dItem_HEART_PIECE_e && (dComIfGs_getMaxLife() % 4) != 0) { - itemGetMsgNo = MSG_NO_FOR_ITEM(dItem_HEART_PIECE_2_e + (dComIfGs_getMaxLife() % 4) - 1); + if (itemNo == dItemNo_HEART_PIECE_e && (dComIfGs_getMaxLife() % 4) != 0) { + itemGetMsgNo = MSG_NO_FOR_ITEM(dItemNo_HEART_PIECE_2_e + (dComIfGs_getMaxLife() % 4) - 1); } else { itemGetMsgNo = MSG_NO_FOR_ITEM(itemNo); } @@ -736,22 +735,22 @@ BOOL daPy_lk_c::dProcGetItem() { if (mProcVar0.m34D0 == 0 && mProcVar2.m34D4 != -1) { mProcVar0.m34D0 = 1; #if VERSION == VERSION_DEMO - if (mProcVar2.m34D4 == dItem_GREEN_RUPEE_e || mProcVar2.m34D4 == dItem_BLUE_RUPEE_e || mProcVar2.m34D4 == dItem_YELLOW_RUPEE_e || - mProcVar2.m34D4 == dItem_RED_RUPEE_e || mProcVar2.m34D4 == dItem_PURPLE_RUPEE_e || mProcVar2.m34D4 == TINCLE_RUPEE1) + if (mProcVar2.m34D4 == dItemNo_GREEN_RUPEE_e || mProcVar2.m34D4 == dItemNo_BLUE_RUPEE_e || mProcVar2.m34D4 == dItemNo_YELLOW_RUPEE_e || + mProcVar2.m34D4 == dItemNo_RED_RUPEE_e || mProcVar2.m34D4 == dItemNo_PURPLE_RUPEE_e || mProcVar2.m34D4 == dItemNo_TINGLE_RUPEE_1_e) { seStartSystem(JA_SE_ME_ITEM_GET_S); dComIfGp_setMesgBgmOn2(); - } else if (mProcVar2.m34D4 == dItem_HEART_CONTAINER_e || - (mProcVar2.m34D4 == dItem_HEART_PIECE_e && ((dComIfGs_getMaxLife() % 4) == 3))) + } else if (mProcVar2.m34D4 == dItemNo_HEART_CONTAINER_e || + (mProcVar2.m34D4 == dItemNo_HEART_PIECE_e && ((dComIfGs_getMaxLife() % 4) == 3))) { mDoAud_subBgmStart(JA_BGM_GET_HEART); dComIfGp_setMesgBgmOn(); - } else if (mProcVar2.m34D4 == dItem_HEART_PIECE_e || mProcVar2.m34D4 == dItem_JOY_PENDANT_e || mProcVar2.m34D4 == dItem_SMALL_KEY_e || - mProcVar2.m34D4 == dItem_SILVER_RUPEE_e || mProcVar2.m34D4 == dItem_ORANGE_RUPEE_e) + } else if (mProcVar2.m34D4 == dItemNo_HEART_PIECE_e || mProcVar2.m34D4 == dItemNo_JOY_PENDANT_e || mProcVar2.m34D4 == dItemNo_SMALL_KEY_e || + mProcVar2.m34D4 == dItemNo_SILVER_RUPEE_e || mProcVar2.m34D4 == dItemNo_ORANGE_RUPEE_e) { mDoAud_subBgmStart(JA_BGM_ITEM_GET_S); dComIfGp_setMesgBgmOn(); - } else if (mProcVar5.m34DA != dItem_HEART_e) { + } else if (mProcVar5.m34DA != dItemNo_HEART_e) { seStartSystem(JA_SE_ME_ITEM_GET_S); dComIfGp_setMesgBgmOn2(); } else { @@ -781,12 +780,12 @@ BOOL daPy_lk_c::dProcGetItem() { mProcVar6.m3570 = 0; onModeFlg(ModeFlg_00000400); } - if (item != NULL && (fopAcM_GetName(item) == PROC_ITEM || (fopAcM_GetName(item) == PROC_Demo_Item))) { + if (item != NULL && (fopAcM_GetName(item) == fpcNm_ITEM_e || (fopAcM_GetName(item) == fpcNm_Demo_Item_e))) { item->hide(); } } else { if (mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.01f) { - if (item != NULL && (fopAcM_GetName(item) == PROC_ITEM || fopAcM_GetName(item) == PROC_Demo_Item)) { + if (item != NULL && (fopAcM_GetName(item) == fpcNm_ITEM_e || fopAcM_GetName(item) == fpcNm_Demo_Item_e)) { item->show(); if (m3624 == 0 && mProcVar2.m34D4 != -1) { if (mProcVar2.m34D4 == 7 && (dComIfGs_getMaxLife() % 4)) { @@ -809,7 +808,7 @@ BOOL daPy_lk_c::dProcGetItem() { setBlendMoveAnime(m_HIO->mBasic.m.field_0xC); } } - } else if (item != NULL && (fopAcM_GetName(item) == PROC_ITEM || (fopAcM_GetName(item) == PROC_Demo_Item))) { + } else if (item != NULL && (fopAcM_GetName(item) == fpcNm_ITEM_e || (fopAcM_GetName(item) == fpcNm_Demo_Item_e))) { item->hide(); } } @@ -951,7 +950,7 @@ BOOL daPy_lk_c::dProcFreezeDamage() { void daPy_lk_c::dProcDead_init_sub() { mProcVar6.m3570 = 0; dComIfGp_setPlayerStatus0(0, daPyStts0_UNK20000000_e); - m3628 = fopMsgM_create(PROC_GAMEOVER); + m3628 = fopMsgM_create(fpcNm_GAMEOVER_e); mDemo.setSpecialDemoType(); daPy_py_c::changePlayer(this); } @@ -1673,7 +1672,7 @@ BOOL daPy_lk_c::dProcPresent() { } } else { daItemBase_c* item = (daItemBase_c*)fopAcM_getItemEventPartner(this); - if (item != NULL && (fopAcM_GetName(item) == PROC_ITEM || fopAcM_GetName(item) == PROC_Demo_Item)) { + if (item != NULL && (fopAcM_GetName(item) == fpcNm_ITEM_e || fopAcM_GetName(item) == fpcNm_Demo_Item_e)) { item->show(); } } @@ -1745,7 +1744,7 @@ BOOL daPy_lk_c::dProcStandItemPut_init() { } mProcVar6.m3570 = 1; setSingleMoveAnime(ANM_GRABWAIT, m_HIO->mGrab.m.field_0x78, 0.0f, -1, -1.0f); - pfVar2 = (fopAc_ac_c*)fopAcM_fastCreate(PROC_STANDITEM, dComIfGp_event_getPreItemNo(), ¤t.pos, -1, angle); + pfVar2 = (fopAc_ac_c*)fopAcM_fastCreate(fpcNm_STANDITEM_e, dComIfGp_event_getPreItemNo(), ¤t.pos, -1, angle); if (pfVar2 != NULL) { mActorKeepGrab.setData(pfVar2); fopAcM_setCarryNow(pfVar2, FALSE); @@ -2169,7 +2168,7 @@ BOOL daPy_lk_c::dProcBottleOpenFairy_init() { m_HIO->mItem.mBottle.m.field_0x40 ); keepItemData(); - setBottleModel(dItem_FAIRY_BOTTLE_e); + setBottleModel(dItemNo_FAIRY_BOTTLE_e); dComIfGp_setPlayerStatus1(0, daPyStts1_UNK4000_e); mProcVar6.m3570 = 0; return true; @@ -2205,7 +2204,7 @@ BOOL daPy_lk_c::dProcBottleOpenFairy() { } else { dComIfGs_setEquipBottleItemEmpty(dItemBtn_Z_e); } - fopAcM_fastCreate(PROC_NPC_FA1, daNpc_Fa1_c::Type_BABA_e, &mLeftHandPos, fopAcM_GetRoomNo(this), &shape_angle); + fopAcM_fastCreate(fpcNm_NPC_FA1_e, daNpc_Fa1_c::Type_BABA_e, &mLeftHandPos, fopAcM_GetRoomNo(this), &shape_angle); } } } diff --git a/src/d/actor/d_a_player_fan.inc b/src/d/actor/d_a_player_fan.inc index cf2f55dfd..d0a0baffa 100644 --- a/src/d/actor/d_a_player_fan.inc +++ b/src/d/actor/d_a_player_fan.inc @@ -107,7 +107,7 @@ int daPy_lk_c::setShapeFanLeaf() { /* 8014BE50-8014BEEC .text checkFanGlideProc__9daPy_lk_cFi */ BOOL daPy_lk_c::checkFanGlideProc(int param_0) { - if (checkSetItemTrigger(dItem_DEKU_LEAF_e, 1)) { + if (checkSetItemTrigger(dItemNo_DEKU_LEAF_e, 1)) { if (dComIfGs_getMagic() >= 1) { return procFanGlide_init(param_0); } @@ -444,7 +444,7 @@ BOOL daPy_lk_c::procFanGlide() { gravity = m_HIO->mItem.mFan.m.field_0x3C; maxFallSpeed = m_HIO->mItem.mFan.m.field_0x38; } - if (checkSetItemTrigger(dItem_DEKU_LEAF_e, 1) && frameCtrl.getRate() < 0.01f && mProcVar6.m3570 == 0) { + if (checkSetItemTrigger(dItemNo_DEKU_LEAF_e, 1) && frameCtrl.getRate() < 0.01f && mProcVar6.m3570 == 0) { // Using the Deku Leaf while gliding to create a burst of air around you. setSingleMoveAnime( ANM_USEFANB, diff --git a/src/d/actor/d_a_player_food.inc b/src/d/actor/d_a_player_food.inc index a8b249749..9fd66bfcf 100644 --- a/src/d/actor/d_a_player_food.inc +++ b/src/d/actor/d_a_player_food.inc @@ -16,17 +16,16 @@ #include "d/d_camera.h" #include "d/d_com_inf_game.h" #include "d/d_item_data.h" -#include "d/d_procname.h" /* 80154334-801543A0 .text setHyoiModel__9daPy_lk_cFv */ void daPy_lk_c::setHyoiModel() { - if (mEquipItem == dItem_HYOI_PEAR_e) { + if (mEquipItem == dItemNo_HYOI_PEAR_e) { return; } JKRHeap* oldHeap = setItemHeap(); initModel(&mpEquipItemModel, LINK_BDL_HYOINOMI, 0x13000022); mDoExt_setCurrentHeap(oldHeap); - mEquipItem = dItem_HYOI_PEAR_e; + mEquipItem = dItemNo_HYOI_PEAR_e; } /* 801543A0-801546F4 .text procFoodThrow_init__9daPy_lk_cFv */ @@ -123,7 +122,7 @@ BOOL daPy_lk_c::procFoodThrow() { } } else if (frameCtrl.checkPass(8.0f)) { seStartOnlyReverb(JA_SE_LK_ESA_THROW); - void* esa = fopAcM_fastCreate(PROC_ESA, 0xFFFF0014, &mLeftHandPos, fopAcM_GetRoomNo(this), &shape_angle); + void* esa = fopAcM_fastCreate(fpcNm_ESA_e, 0xFFFF0014, &mLeftHandPos, fopAcM_GetRoomNo(this), &shape_angle); if (esa) { m3630 = fopAcM_GetID(esa); if (!checkSpecialDemoMode()) { @@ -147,7 +146,7 @@ BOOL daPy_lk_c::procFoodThrow() { BOOL daPy_lk_c::procFoodSet_init() { if (mCurProc == daPyProc_FOOD_SET_e) { if (mDemo.getParam0() == 1) { - if (mEquipItem == dItem_HYOI_PEAR_e) { + if (mEquipItem == dItemNo_HYOI_PEAR_e) { u8 talkBtn = dComIfGp_event_getTalkXYBtn(); if (talkBtn == dTalkBtn_X_e) { dComIfGs_setEquipBottleItemEmpty(dItemBtn_X_e); diff --git a/src/d/actor/d_a_player_grab.inc b/src/d/actor/d_a_player_grab.inc index eb91d5653..b3c6d324e 100644 --- a/src/d/actor/d_a_player_grab.inc +++ b/src/d/actor/d_a_player_grab.inc @@ -16,14 +16,13 @@ #include "d/actor/d_a_player_main.h" #include "d/actor/d_a_player_HIO.h" #include "d/d_camera.h" -#include "d/d_procname.h" #include "f_op/f_op_camera.h" /* 8013A85C-8013A890 .text checkGrabSpecialHeavyState__9daPy_lk_cFv */ BOOL daPy_lk_c::checkGrabSpecialHeavyState() { fopAc_ac_c* grab_actor = mActorKeepGrab.getActor(); if (grab_actor != NULL) { - if (fopAcM_GetName(grab_actor) == PROC_KB && ((fopAcM_GetParam(grab_actor) & 8) != 0)) { + if (fopAcM_GetName(grab_actor) == fpcNm_KB_e && ((fopAcM_GetParam(grab_actor) & 8) != 0)) { return true; } } @@ -58,7 +57,7 @@ BOOL daPy_lk_c::checkGrabBarrelSearch(int param_0) { grab_actor = mActorKeepGrab.getActor(); } - if (grab_actor != NULL && fopAcM_GetName(grab_actor) == PROC_Obj_Barrel) { + if (grab_actor != NULL && fopAcM_GetName(grab_actor) == fpcNm_Obj_Barrel_e) { return true; } else { return false; @@ -155,10 +154,10 @@ void daPy_lk_c::setGrabItemPos() { return; } } - if (fopAcM_GetName(grab_actor) == PROC_MT) { + if (fopAcM_GetName(grab_actor) == fpcNm_MT_e) { grab_actor->current.pos.y += magtail_offset * (1.0f - dVar10); } - } else if (fopAcM_GetName(grab_actor) == PROC_MT) { + } else if (fopAcM_GetName(grab_actor) == fpcNm_MT_e) { fVar1 = -magtail_offset * cM_ssin(m351C); grab_actor->current.pos.x += fVar1 * cM_scos(shape_angle.y); grab_actor->current.pos.y += magtail_offset * cM_scos(m351C); @@ -238,17 +237,17 @@ BOOL daPy_lk_c::checkNextActionGrab() { return true; } #if VERSION > VERSION_JPN - if (checkSetItemTrigger(dItem_MAGIC_ARMOR_e, 1) || - (checkNoResetFlg1(daPyFlg1_EQUIP_DRAGON_SHIELD) && checkSetItemTrigger(dItem_MAGIC_ARMOR_e, 0))) + if (checkSetItemTrigger(dItemNo_MAGIC_ARMOR_e, 1) || + (checkNoResetFlg1(daPyFlg1_EQUIP_DRAGON_SHIELD) && checkSetItemTrigger(dItemNo_MAGIC_ARMOR_e, 0))) { changeDragonShield(1); return true; } - if (checkSetItemTrigger(dItem_IRON_BOOTS_e, 1) || - (checkEquipHeavyBoots() && checkSetItemTrigger(dItem_IRON_BOOTS_e, 0))) + if (checkSetItemTrigger(dItemNo_IRON_BOOTS_e, 1) || + (checkEquipHeavyBoots() && checkSetItemTrigger(dItemNo_IRON_BOOTS_e, 0))) { - return procBootsEquip_init(dItem_IRON_BOOTS_e); - } else if (fopAcM_GetName(grab_actor) == PROC_BOMB && checkSetItemTrigger(dItem_BOMB_BAG_e, 0)) { + return procBootsEquip_init(dItemNo_IRON_BOOTS_e); + } else if (fopAcM_GetName(grab_actor) == fpcNm_BOMB_e && checkSetItemTrigger(dItemNo_BOMB_BAG_e, 0)) { return procGrabThrow_init(0); } #endif @@ -335,7 +334,7 @@ BOOL daPy_lk_c::procGrabReady_init() { mActorKeepRope.setData(mpAttnActorA); freeGrabItem(); } - if (fopAcM_GetName(mpAttnActorA) == PROC_BOKO) { + if (fopAcM_GetName(mpAttnActorA) == fpcNm_BOKO_e) { daBoko_c* boko = static_cast(mpAttnActorA); boko->setNowMode(daBoko_c::Mode_PLAYER_CARRY_e); } @@ -357,7 +356,7 @@ BOOL daPy_lk_c::procGrabReady() { procGrabUp_init(); } else if (mProcVar6.m3570 == 1 && (mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.01f)) { if (grab_actor != NULL) { - if (fopAcM_GetName(grab_actor) == PROC_BOKO) { + if (fopAcM_GetName(grab_actor) == fpcNm_BOKO_e) { mEquipItem = daPyItem_BOKO_e; mActorKeepEquip = mActorKeepGrab; mActorKeepGrab.clearData(); @@ -425,7 +424,7 @@ BOOL daPy_lk_c::procGrabUp_init() { } fopAcM_setStageLayer(mActorKeepGrab.getActor()); onResetFlg0(daPyRFlg0_GRAB_UP_START); - if (fopAcM_GetName(mActorKeepGrab.getActor()) == PROC_Stone2) { + if (fopAcM_GetName(mActorKeepGrab.getActor()) == fpcNm_Stone2_e) { dComIfGp_setPlayerStatus1(0, daPyStts1_UNK40000_e); } return true; @@ -575,7 +574,7 @@ BOOL daPy_lk_c::procGrabThrow() { dComIfGp_getCamera(mCameraInfoIdx)->mCamera.ForceLockOn(mActorKeepGrab.getID()); if (fopAcM_CheckStatus(grab_actor, fopAcStts_UNK10000_e)) { voiceStart(18); - } else if (fopAcM_GetName(grab_actor) == PROC_BOMB || fopAcM_GetName(grab_actor) == PROC_Bomb2) { + } else if (fopAcM_GetName(grab_actor) == fpcNm_BOMB_e || fopAcM_GetName(grab_actor) == fpcNm_Bomb2_e) { voiceStart(0); } else { voiceStart(17); diff --git a/src/d/actor/d_a_player_hook.inc b/src/d/actor/d_a_player_hook.inc index ce74376c8..3eae5959e 100644 --- a/src/d/actor/d_a_player_hook.inc +++ b/src/d/actor/d_a_player_hook.inc @@ -20,7 +20,7 @@ /* 8014AB5C-8014ABA0 .text checkHookshotReturn__9daPy_lk_cFv */ BOOL daPy_lk_c::checkHookshotReturn() { daHookshot_c* hookshot = (daHookshot_c*)mActorKeepEquip.getActor(); - if (mEquipItem != dItem_HOOKSHOT_e || hookshot == NULL) { + if (mEquipItem != dItemNo_HOOKSHOT_e || hookshot == NULL) { return false; } @@ -30,7 +30,7 @@ BOOL daPy_lk_c::checkHookshotReturn() { /* 8014ABA0-8014ABF4 .text setHookshotCarryOffset__9daPy_lk_cFUiPC4cXyz */ BOOL daPy_lk_c::setHookshotCarryOffset(fpc_ProcID carryActorID, const cXyz* offset) { daHookshot_c* hookshot = (daHookshot_c*)mActorKeepEquip.getActor(); - if (mEquipItem != dItem_HOOKSHOT_e || hookshot == NULL) { + if (mEquipItem != dItemNo_HOOKSHOT_e || hookshot == NULL) { return false; } if (carryActorID != hookshot->getCarryActorID()) { @@ -112,7 +112,7 @@ void daPy_lk_c::setHookshotSight() { /* 8014B02C-8014B05C .text freeHookshotItem__9daPy_lk_cFv */ void daPy_lk_c::freeHookshotItem() { - if (mEquipItem != dItem_HOOKSHOT_e) { + if (mEquipItem != dItemNo_HOOKSHOT_e) { return; } daHookshot_c* hookshot = (daHookshot_c*)mActorKeepEquip.getActor(); diff --git a/src/d/actor/d_a_player_main.cpp b/src/d/actor/d_a_player_main.cpp index 2529cdb46..0b8b3092b 100644 --- a/src/d/actor/d_a_player_main.cpp +++ b/src/d/actor/d_a_player_main.cpp @@ -19,8 +19,6 @@ #include "d/d_com_lib_game.h" #include "d/d_kankyo_wether.h" #include "d/d_path.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_kankyo.h" #include "JSystem/JKernel/JKRSolidHeap.h" #include "JSystem/JUtility/JUTAssert.h" @@ -44,19 +42,19 @@ #include "SSystem/SComponent/c_counter.h" #include "m_Do/m_Do_graphic.h" -JGeometry::TVec3 l_hammer_splash_particle_scale(0.67f, 0.67f, 0.67f); +static JGeometry::TVec3 l_hammer_splash_particle_scale(0.67f, 0.67f, 0.67f); #include "d/actor/d_a_player_main_data.inc" #include "d/actor/d_a_player_HIO_data.inc" #if DEBUG || VERSION > VERSION_DEMO -cXyz l_debug_keep_pos; -csXyz l_debug_current_angle; -csXyz l_debug_shape_angle; +static cXyz l_debug_keep_pos; +static csXyz l_debug_current_angle; +static csXyz l_debug_shape_angle; #endif -GXColor l_freeze_fade_color = {0xFF, 0xFF, 0xFF, 0xFF}; +static GXColor l_freeze_fade_color = {0xFF, 0xFF, 0xFF, 0xFF}; u8 daPy_matAnm_c::m_maba_timer; u8 daPy_matAnm_c::m_maba_flg; @@ -708,7 +706,7 @@ u16 daPy_lk_c::checkNormalFace() { if (checkUpperReadyAnime() || checkNoResetFlg1(daPyFlg1_UNK400) || (mpAttnActorLockOn != NULL && fopAcM_GetGroup(mpAttnActorLockOn) == fopAc_ENEMY_e) || checkEquipHeavyBoots() || - mEquipItem == dItem_SKULL_HAMMER_e) + mEquipItem == dItemNo_SKULL_HAMMER_e) { return daPyFace_TMABAC; } @@ -1058,7 +1056,7 @@ BOOL daPy_lk_c::checkSightLine(f32 param_1, cXyz* param_2) { cXyz local_44 = (*fopCamM_GetCenter_p(cam) - *pcVar2); *param_2 = (local_44.normalize() * param_1) + *pcVar2; dBgS_LinChk* linChk; - if (mEquipItem == dItem_BOOMERANG_e) { + if (mEquipItem == dItemNo_BOOMERANG_e) { linChk = &mBoomerangLinChk; } else { linChk = &mRopeLinChk; @@ -1134,12 +1132,12 @@ s32 daPy_lk_c::setItemModel() { mDoMtx_stack_c::XYZrotM(0, -0x4000, -0x2AAA); mDoMtx_stack_c::revConcat(mpCLModel->getAnmMtx(3)); mpEquipItemModel->setBaseTRMtx(mDoMtx_stack_c::get()); - } else if (mEquipItem == dItem_TELESCOPE_e) { + } else if (mEquipItem == dItemNo_TELESCOPE_e) { mDoMtx_stack_c::transS(8.0f, 15.0f, 1.0f); mDoMtx_stack_c::XYZrotM(-0x4000, 0x4444, -0x41F); mDoMtx_stack_c::revConcat(pMVar13); mpEquipItemModel->setBaseTRMtx(mDoMtx_stack_c::get()); - } else if (mEquipItem == dItem_HYOI_PEAR_e) { + } else if (mEquipItem == dItemNo_HYOI_PEAR_e) { if (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() < 9.0f) { mDoMtx_stack_c::transS(-1.5f, -44.0f, 16.0f); mDoMtx_stack_c::XYZrotM(-0x6EEE, 0x9BE, 0x368A); @@ -1148,19 +1146,19 @@ s32 daPy_lk_c::setItemModel() { } else { mpEquipItemModel->setBaseTRMtx(mpCLModel->getAnmMtx(0xF)); } - } else if (mEquipItem == dItem_DEKU_LEAF_e || mEquipItem == daPyItem_SWORD_e || - mEquipItem == dItem_WIND_WAKER_e || mEquipItem == dItem_SKULL_HAMMER_e || - mEquipItem == dItem_HOOKSHOT_e || mEquipItem == dItem_TINGLE_TUNER_e || + } else if (mEquipItem == dItemNo_DEKU_LEAF_e || mEquipItem == daPyItem_SWORD_e || + mEquipItem == dItemNo_WIND_WAKER_e || mEquipItem == dItemNo_SKULL_HAMMER_e || + mEquipItem == dItemNo_HOOKSHOT_e || mEquipItem == dItemNo_TINGLE_TUNER_e || checkBottleItem(mEquipItem) || checkPhotoBoxItem(mEquipItem)) { mpEquipItemModel->setBaseTRMtx(pMVar13); - if (mEquipItem == dItem_DEKU_LEAF_e && + if (mEquipItem == dItemNo_DEKU_LEAF_e && (mCurProc != daPyProc_FAN_SWING_e && mCurProc != daPyProc_FAN_GLIDE_e)) { setShapeFanLeaf(); } else if (checkBottleItem(mEquipItem)) { if (mpBottleContentsModel != NULL) { - if (mEquipItem == dItem_FIREFLY_BOTTLE_e) { + if (mEquipItem == dItemNo_FIREFLY_BOTTLE_e) { cXyz bottleScale; // ? f32 fVar1 = 1.0f + 0.1f * cM_ssin(cM_rad2s((37.699112f * mpEquipItemBrk->getFrame()) / mpEquipItemBrk->getFrameMax())); bottleScale.setall(fVar1); @@ -1176,7 +1174,7 @@ s32 daPy_lk_c::setItemModel() { if (mpBottleCapModel != NULL) { mpBottleCapModel->setBaseTRMtx(pMVar13); } - } else if (mEquipItem == dItem_HOOKSHOT_e && boko != NULL) { + } else if (mEquipItem == dItemNo_HOOKSHOT_e && boko != NULL) { if (fopAcM_GetParam(boko) != daBoko_c::Type_BOKO_STICK_e) { if (fopAcM_GetParam(boko) == daBoko_c::Type_MACHETE_e) { m35EC += 1.0f; @@ -1190,7 +1188,7 @@ s32 daPy_lk_c::setItemModel() { m35EC -= fVar2; } } - } else if (mEquipItem == dItem_WIND_WAKER_e && + } else if (mEquipItem == dItemNo_WIND_WAKER_e && mCurProc != daPyProc_TACT_WAIT_e && mpEquipItemBrk != NULL) { f32 fVar1 = mpEquipItemBrk->getFrame() - 1.0f; @@ -1240,7 +1238,7 @@ s32 daPy_lk_c::setItemModel() { ->show(); } } else { - if (dComIfGs_getSelectEquip(0) == dItem_MASTER_SWORD_2_e) { + if (dComIfGs_getSelectEquip(0) == dItemNo_MASTER_SWORD_2_e) { mSwgripmsabBckAnim.entry(mpSwgripmsModel->getModelData(), 1.0f); r27 = 4; } else { @@ -1302,7 +1300,7 @@ s32 daPy_lk_c::setItemModel() { mDoAud_setLinkShieldType(r27_2, 1); } else if ((mCurProc != daPyProc_DEMO_TOOL_e && mEquipItem == daPyItem_SWORD_e) || (mCurProc == daPyProc_DEMO_TOOL_e && mProcVar2.m34D4 == 1) || - (checkPlayerGuard() && mEquipItem != dItem_SKULL_HAMMER_e) || + (checkPlayerGuard() && mEquipItem != dItemNo_SKULL_HAMMER_e) || mCurProc == daPyProc_GUARD_CRASH_e) { mpEquippedShieldModel->setBaseTRMtx(pMVar6); @@ -1424,24 +1422,24 @@ s32 daPy_lk_c::setDrawHandModel() { } else { uVar5 = mRightHandIdx; } - } else if ((mEquipItem == dItem_GRAPPLING_HOOK_e && !checkModeFlg(ModeFlg_ROPE)) || - (mEquipItem == dItem_SKULL_HAMMER_e && mCutType == CUT_TYPE_NONE)) + } else if ((mEquipItem == dItemNo_GRAPPLING_HOOK_e && !checkModeFlg(ModeFlg_ROPE)) || + (mEquipItem == dItemNo_SKULL_HAMMER_e && mCutType == CUT_TYPE_NONE)) { uVar4 = 3; uVar5 = 8; - } else if (mEquipItem == dItem_BOOMERANG_e) { + } else if (mEquipItem == dItemNo_BOOMERANG_e) { uVar4 = 0; uVar5 = mRightHandIdx; - } else if (mEquipItem == dItem_WIND_WAKER_e) { + } else if (mEquipItem == dItemNo_WIND_WAKER_e) { uVar4 = 5; uVar5 = mRightHandIdx; - } else if (mEquipItem == dItem_HOOKSHOT_e) { + } else if (mEquipItem == dItemNo_HOOKSHOT_e) { uVar4 = 2; uVar5 = mRightHandIdx; - } else if (mEquipItem == dItem_DEKU_LEAF_e) { + } else if (mEquipItem == dItemNo_DEKU_LEAF_e) { uVar4 = 3; uVar5 = mRightHandIdx; - } else if (mEquipItem == dItem_TELESCOPE_e) { + } else if (mEquipItem == dItemNo_TELESCOPE_e) { uVar4 = 1; uVar5 = mRightHandIdx; } else { @@ -1978,7 +1976,7 @@ BOOL daPy_lk_c::draw() { #endif ) { if (!checkBowItem(mEquipItem) || !checkPlayerGuard()) { - if (mEquipItem == dItem_HOOKSHOT_e) { + if (mEquipItem == dItemNo_HOOKSHOT_e) { if (mActorKeepEquip.getActor()) { daHookshot_c* hookshot = (daHookshot_c*)mActorKeepEquip.getActor(); mpEquipItemModel->setAnmMtx(4, hookshot->getMtxTop()); @@ -2196,7 +2194,7 @@ void daPy_lk_c::setDoStatusBasic() { } else { if (!checkPlayerGuard() && (mEquipItem == daPyItem_BOKO_e || mEquipItem == daPyItem_SWORD_e || - mEquipItem == dItem_SKULL_HAMMER_e)) + mEquipItem == dItemNo_SKULL_HAMMER_e)) { if (mEquipItem == daPyItem_BOKO_e) { dComIfGp_setDoStatus(dActStts_THROW_e); @@ -2261,7 +2259,7 @@ void daPy_lk_c::setDoStatus() { } } else if (mpAttnEntryA->mType == fopAc_Attn_TYPE_CARRY_e) { if (!fopAcM_CheckStatus(mpAttnActorA, fopAcStts_CARRY_e)) { - if (fopAcM_GetName(mpAttnActorA) == PROC_BOKO) { + if (fopAcM_GetName(mpAttnActorA) == fpcNm_BOKO_e) { dComIfGp_setDoStatus(dActStts_PICK_UP_e); } else { dComIfGp_setDoStatus(dActStts_LIFT_e); @@ -2955,7 +2953,7 @@ BOOL daPy_lk_c::checkAtnWaitAnime() { mpAttnActorLockOn != NULL && ( fopAcM_GetGroup(mpAttnActorLockOn) == fopAc_ENEMY_e || - fopAcM_GetName(mpAttnActorLockOn) == PROC_BOOMERANG + fopAcM_GetName(mpAttnActorLockOn) == fpcNm_BOOMERANG_e ) ) || mDemo.getDemoMode() == daPy_demo_c::DEMO_A_WAIT_e @@ -3448,7 +3446,7 @@ void daPy_lk_c::setAnimeEquipSingleItem(u16 bckIdx) { /* 8010C158-8010C1D4 .text setAnimeEquipItem__9daPy_lk_cFv */ void daPy_lk_c::setAnimeEquipItem() { if (mActorKeepThrow.getActor() != NULL) { - if (getReadyItem() == dItem_BOOMERANG_e) { + if (getReadyItem() == dItemNo_BOOMERANG_e) { return; } daBoomerang_c* boomerang = (daBoomerang_c*)mActorKeepThrow.getActor(); @@ -3497,20 +3495,20 @@ void daPy_lk_c::setAnimeUnequipSword() { /* 8010C284-8010C3C0 .text setAnimeUnequipItem__9daPy_lk_cFUs */ void daPy_lk_c::setAnimeUnequipItem(u16 i_itemNo) { - if (i_itemNo == dItem_BOOMERANG_e || - i_itemNo == dItem_GRAPPLING_HOOK_e || - i_itemNo == dItem_TELESCOPE_e || + if (i_itemNo == dItemNo_BOOMERANG_e || + i_itemNo == dItemNo_GRAPPLING_HOOK_e || + i_itemNo == dItemNo_TELESCOPE_e || checkPhotoBoxItem(i_itemNo) || - i_itemNo == dItem_HOOKSHOT_e || - i_itemNo == dItem_DEKU_LEAF_e || - i_itemNo == dItem_TINGLE_TUNER_e || - i_itemNo == dItem_WIND_WAKER_e || + i_itemNo == dItemNo_HOOKSHOT_e || + i_itemNo == dItemNo_DEKU_LEAF_e || + i_itemNo == dItemNo_TINGLE_TUNER_e || + i_itemNo == dItemNo_WIND_WAKER_e || checkBottleItem(i_itemNo) ) { setAnimeEquipSingleItem(LKANM_BCK_TAKEL); } else if (checkBowItem(i_itemNo)) { setAnimeEquipSingleItem(LKANM_BCK_TAKER); - } else if (i_itemNo == dItem_SKULL_HAMMER_e) { + } else if (i_itemNo == dItemNo_SKULL_HAMMER_e) { setActAnimeUpper( LKANM_BCK_TAKEBOTH, UPPER_MOVE2_e, @@ -3596,9 +3594,9 @@ void daPy_lk_c::deleteEquipItem(BOOL param_1) { fopAcM_delete(equip_actor); } - if ((mEquipItem == dItem_GRAPPLING_HOOK_e && checkRopeAnime()) || - (mEquipItem == dItem_BOOMERANG_e && checkBoomerangAnime()) || - (mEquipItem == dItem_HOOKSHOT_e && checkHookshotReadyAnime()) || + if ((mEquipItem == dItemNo_GRAPPLING_HOOK_e && checkRopeAnime()) || + (mEquipItem == dItemNo_BOOMERANG_e && checkBoomerangAnime()) || + (mEquipItem == dItemNo_HOOKSHOT_e && checkHookshotReadyAnime()) || (checkBowItem(mEquipItem) && checkBowAnime()) ) { resetActAnimeUpper(UPPER_MOVE2_e, -1.0f); @@ -3680,18 +3678,18 @@ void daPy_lk_c::returnKeepItemData() { /* 8010C8D4-8010CB70 .text makeItemType__9daPy_lk_cFv */ void daPy_lk_c::makeItemType() { - if (mEquipItem == dItem_GRAPPLING_HOOK_e) { - fopAc_ac_c* rope = (fopAc_ac_c*)fopAcM_fastCreate(PROC_HIMO2, 0, ¤t.pos); + if (mEquipItem == dItemNo_GRAPPLING_HOOK_e) { + fopAc_ac_c* rope = (fopAc_ac_c*)fopAcM_fastCreate(fpcNm_HIMO2_e, 0, ¤t.pos); mActorKeepEquip.setData(rope); - } else if (mEquipItem == dItem_HOOKSHOT_e) { - fopAc_ac_c* hookshot = (fopAc_ac_c*)fopAcM_fastCreate(PROC_HOOKSHOT, 0, ¤t.pos); + } else if (mEquipItem == dItemNo_HOOKSHOT_e) { + fopAc_ac_c* hookshot = (fopAc_ac_c*)fopAcM_fastCreate(fpcNm_HOOKSHOT_e, 0, ¤t.pos); mActorKeepEquip.setData(hookshot); setHookshotModel(); - } else if (mEquipItem == dItem_BOOMERANG_e) { - fopAc_ac_c* boomerang = (fopAc_ac_c*)fopAcM_fastCreate(PROC_BOOMERANG, 0, ¤t.pos); + } else if (mEquipItem == dItemNo_BOOMERANG_e) { + fopAc_ac_c* boomerang = (fopAc_ac_c*)fopAcM_fastCreate(fpcNm_BOOMERANG_e, 0, ¤t.pos); mActorKeepEquip.setData(boomerang); - } else if (mEquipItem == dItem_BOMB_BAG_e) { - fopAc_ac_c* bomb = (fopAc_ac_c*)fopAcM_fastCreate(PROC_BOMB, daBomb_c::prm_make(daBomb_c::STATE_3, false, false), ¤t.pos); + } else if (mEquipItem == dItemNo_BOMB_BAG_e) { + fopAc_ac_c* bomb = (fopAc_ac_c*)fopAcM_fastCreate(fpcNm_BOMB_e, daBomb_c::prm_make(daBomb_c::STATE_3, false, false), ¤t.pos); mActorKeepGrab.setData(bomb); mEquipItem = daPyItem_NONE_e; if (mActorKeepGrab.getActor() != NULL) { @@ -3705,26 +3703,26 @@ void daPy_lk_c::makeItemType() { } else if (checkBowItem(mEquipItem)) { setBowModel(); return; - } else if (mEquipItem == dItem_TELESCOPE_e) { + } else if (mEquipItem == dItemNo_TELESCOPE_e) { setScopeModel(); return; } else if (checkPhotoBoxItem(mEquipItem)) { setPhotoBoxModel(); return; - } else if (mEquipItem == dItem_TINGLE_TUNER_e) { + } else if (mEquipItem == dItemNo_TINGLE_TUNER_e) { setTinkleCeiverModel(); return; - } else if (mEquipItem == dItem_DEKU_LEAF_e) { + } else if (mEquipItem == dItemNo_DEKU_LEAF_e) { setSmallFanModel(); return; - } else if (mEquipItem == dItem_WIND_WAKER_e) { - mEquipItem = dItem_NONE_e; + } else if (mEquipItem == dItemNo_WIND_WAKER_e) { + mEquipItem = dItemNo_NONE_e; setTactModel(); return; - } else if (mEquipItem == dItem_SKULL_HAMMER_e) { + } else if (mEquipItem == dItemNo_SKULL_HAMMER_e) { setHammerModel(); return; - } else if (mEquipItem == dItem_EMPTY_BOTTLE_e) { + } else if (mEquipItem == dItemNo_EMPTY_BOTTLE_e) { setBottleModel(mEquipItem); return; } else { @@ -3749,7 +3747,7 @@ void daPy_lk_c::setPhotoBoxModel() { JKRHeap* oldHeap = setItemHeap(); initModel(&mpEquipItemModel, LINK_BDL_CAMERA, 0x37221222); mDoExt_setCurrentHeap(oldHeap); - if (mEquipItem == CAMERA) { + if (mEquipItem == dItemNo_PICTO_BOX_e) { mpEquipItemModel->getModelData()->getJointNodePointer(0x02)->getMesh()->getShape()->hide(); // frash joint } else { mpEquipItemModel->getModelData()->getJointNodePointer(0x02)->getMesh()->getShape()->show(); // frash joint @@ -3780,31 +3778,31 @@ BOOL daPy_lk_c::changeDragonShield(int param_1) { BOOL daPy_lk_c::checkNewItemChange(u8 i_itemBtn) { u16 itemNo = dComIfGp_getSelectItem(i_itemBtn); - if (itemNo == dItem_MAGIC_ARMOR_e) { + if (itemNo == dItemNo_MAGIC_ARMOR_e) { return changeDragonShield(1); } - if (itemNo == dItem_IRON_BOOTS_e || itemNo == WATER_BOOTS || itemNo == dItem_TINGLE_TUNER_e || itemNo == NORMAL_SAIL || + if (itemNo == dItemNo_IRON_BOOTS_e || itemNo == dItemNo_WATER_BOOTS_e || itemNo == dItemNo_TINGLE_TUNER_e || itemNo == dItemNo_SAIL_e || isEsa(itemNo) || isDaizaItem(itemNo) || isEmono(itemNo) || checkBottleItem(itemNo) || - (itemNo >= dItem_FATHER_LETTER_e && itemNo <= KAISEN_PRESENT2)) + (itemNo >= dItemNo_FATHER_LETTER_e && itemNo <= dItemNo_FILL_UP_COUPON_e)) { if (mAcch.ChkGroundHit() && (!daPy_lk_c::checkPlayerFly())) { - if (itemNo == dItem_IRON_BOOTS_e || itemNo == WATER_BOOTS) { + if (itemNo == dItemNo_IRON_BOOTS_e || itemNo == dItemNo_WATER_BOOTS_e) { procBootsEquip_init(itemNo); } else { if (isEsa(itemNo)) { - if (itemNo == dItem_HYOI_PEAR_e) { + if (itemNo == dItemNo_HYOI_PEAR_e) { return procFoodSet_init(); } else { return procFoodThrow_init(); } - } else if (itemNo == dItem_TINGLE_TUNER_e) { + } else if (itemNo == dItemNo_TINGLE_TUNER_e) { fopAcM_orderTalkEvent(this, (fopAc_ac_c*)dComIfGp_getAgb()); } else if (checkDrinkBottleItem(itemNo)) { return procBottleDrink_init(itemNo); } else if (checkOpenBottleItem(itemNo)) { return procBottleOpen_init(itemNo); } else { - if (itemNo == dItem_EMPTY_BOTTLE_e) { + if (itemNo == dItemNo_EMPTY_BOTTLE_e) { return procBottleSwing_init(1); } else { if (dComIfGs_checkGetItemNum(itemNo) != 0) { @@ -3817,12 +3815,12 @@ BOOL daPy_lk_c::checkNewItemChange(u8 i_itemBtn) { } return true; } - if (itemNo != dItem_EMPTY_BOTTLE_e) { + if (itemNo != dItemNo_EMPTY_BOTTLE_e) { return false; } } - if (mEquipItem != itemNo && itemNo != dItem_NONE_e) { - if (itemNo == dItem_BOMB_BAG_e && + if (mEquipItem != itemNo && itemNo != dItemNo_NONE_e) { + if (itemNo == dItemNo_BOMB_BAG_e && (mActivePlayerBombs >= 3 || dComIfGs_getBombNum() == 0)) { seStartSystem(JA_SE_ITEM_TARGET_OUT); @@ -3866,15 +3864,15 @@ BOOL daPy_lk_c::checkItemChangeFromButton() { } } } else { - if (checkEquipDragonShield() && checkSetItemTrigger(dItem_MAGIC_ARMOR_e, 0)) { + if (checkEquipDragonShield() && checkSetItemTrigger(dItemNo_MAGIC_ARMOR_e, 0)) { offNoResetFlg1(daPyFlg1_EQUIP_DRAGON_SHIELD); } else if (mAcch.ChkGroundHit() && !daPy_lk_c::checkPlayerFly()) { - if (checkEquipHeavyBoots() && checkSetItemTrigger(dItem_IRON_BOOTS_e, 0)) { - return procBootsEquip_init(dItem_IRON_BOOTS_e); + if (checkEquipHeavyBoots() && checkSetItemTrigger(dItemNo_IRON_BOOTS_e, 0)) { + return procBootsEquip_init(dItemNo_IRON_BOOTS_e); } else if (checkSetItemTrigger(daPyItem_DRINK_BOTTLE_e, 0)) { return procBottleDrink_init(dComIfGp_getSelectItem(mReadyItemBtn)); - } else if (checkSetItemTrigger(dItem_FAIRY_BOTTLE_e, 0)) { - return procBottleOpen_init(dItem_FAIRY_BOTTLE_e); + } else if (checkSetItemTrigger(dItemNo_FAIRY_BOTTLE_e, 0)) { + return procBottleOpen_init(dItemNo_FAIRY_BOTTLE_e); } else if (doTrigger()) { if (dComIfGp_getDoStatus() == dActStts_PUT_AWAY_e) { setAnimeUnequip(); @@ -4018,7 +4016,7 @@ BOOL daPy_lk_c::checkJumpCutFromButton() { if (((mEquipItem == daPyItem_SWORD_e && ((checkResetFlg0(daPyRFlg0_UNK80) || swordTrigger()))) || ((mEquipItem == daPyItem_BOKO_e && swordTrigger()))) || - (((mEquipItem == dItem_SKULL_HAMMER_e && itemTrigger()) && + (((mEquipItem == dItemNo_SKULL_HAMMER_e && itemTrigger()) && mEquipItem == getReadyItem()))) { return procJumpCut_init(1); @@ -4041,7 +4039,7 @@ int daPy_lk_c::orderTalk() { itemTriggerX()) { if (((isEsa(dComIfGp_getSelectItem(dItemBtn_X_e))) && - dComIfGp_getSelectItem(dItemBtn_X_e) != dItem_HYOI_PEAR_e) && + dComIfGp_getSelectItem(dItemBtn_X_e) != dItemNo_HYOI_PEAR_e) && m3630 != fpcM_ERROR_PROCESS_ID_e) { seStartSystem(JA_SE_ITEM_TARGET_OUT); @@ -4056,7 +4054,7 @@ int daPy_lk_c::orderTalk() { itemTriggerY()) { if (((isEsa(dComIfGp_getSelectItem(dItemBtn_Y_e))) && - dComIfGp_getSelectItem(dItemBtn_Y_e) != dItem_HYOI_PEAR_e) && + dComIfGp_getSelectItem(dItemBtn_Y_e) != dItemNo_HYOI_PEAR_e) && m3630 != fpcM_ERROR_PROCESS_ID_e) { seStartSystem(JA_SE_ITEM_TARGET_OUT); @@ -4071,7 +4069,7 @@ int daPy_lk_c::orderTalk() { itemTriggerZ()))) { if (((isEsa(dComIfGp_getSelectItem(dItemBtn_Z_e))) && - dComIfGp_getSelectItem(dItemBtn_Z_e) != dItem_HYOI_PEAR_e) && + dComIfGp_getSelectItem(dItemBtn_Z_e) != dItemNo_HYOI_PEAR_e) && m3630 != fpcM_ERROR_PROCESS_ID_e) { seStartSystem(JA_SE_ITEM_TARGET_OUT); @@ -4092,25 +4090,25 @@ BOOL daPy_lk_c::checkNextActionFromButton() { resetActAnimeUpper(UPPER_MOVE2_e, -1.0f); return changeCutProc(); } - if (checkPhotoBoxItem(mEquipItem) || mEquipItem == dItem_TELESCOPE_e) { + if (checkPhotoBoxItem(mEquipItem) || mEquipItem == dItemNo_TELESCOPE_e) { return procScope_init(mEquipItem); } - if (mEquipItem == dItem_DEKU_LEAF_e) { + if (mEquipItem == dItemNo_DEKU_LEAF_e) { return procFanSwing_init(); } if (checkBowItem(mEquipItem)) { return checkNextBowMode(); } - if (mEquipItem == dItem_HOOKSHOT_e) { + if (mEquipItem == dItemNo_HOOKSHOT_e) { return checkNextHookshotMode(); } - if (mEquipItem == dItem_BOOMERANG_e) { + if (mEquipItem == dItemNo_BOOMERANG_e) { return checkNextBoomerangMode(); } - if (mEquipItem == dItem_GRAPPLING_HOOK_e) { + if (mEquipItem == dItemNo_GRAPPLING_HOOK_e) { return checkNextRopeMode(); } - if (mEquipItem == dItem_WIND_WAKER_e) { + if (mEquipItem == dItemNo_WIND_WAKER_e) { return procTactWait_init(-1); } } @@ -4225,28 +4223,28 @@ BOOL daPy_lk_c::checkNextActionFromButton() { } } if (itemTrigger() && mEquipItem == getReadyItem()) { - if (mEquipItem == dItem_HOOKSHOT_e) { + if (mEquipItem == dItemNo_HOOKSHOT_e) { if (!checkHookshotReadyAnime()) { return checkNextHookshotMode(); } - } else if (mEquipItem == dItem_GRAPPLING_HOOK_e) { + } else if (mEquipItem == dItemNo_GRAPPLING_HOOK_e) { if (!checkRopeAnime()) { return checkNextRopeMode(); } } else { - if (mEquipItem == dItem_BOOMERANG_e) { + if (mEquipItem == dItemNo_BOOMERANG_e) { return checkNextBoomerangMode(); } if (checkBowItem(mEquipItem)) { return checkNextBowMode(); } - if (mEquipItem == dItem_DEKU_LEAF_e) { + if (mEquipItem == dItemNo_DEKU_LEAF_e) { return procFanSwing_init(); } - if (mEquipItem == dItem_EMPTY_BOTTLE_e) { + if (mEquipItem == dItemNo_EMPTY_BOTTLE_e) { return procBottleSwing_init(0); } - if (mEquipItem == dItem_SKULL_HAMMER_e) { + if (mEquipItem == dItemNo_SKULL_HAMMER_e) { direction = getDirectionFromShapeAngle(); if (mStickDistance > 0.05f && ((direction == DIR_LEFT || direction == DIR_RIGHT))) @@ -4256,10 +4254,10 @@ BOOL daPy_lk_c::checkNextActionFromButton() { return procHammerFrontSwingReady_init(); } } - if (checkPhotoBoxItem(mEquipItem) || mEquipItem == dItem_TELESCOPE_e) { + if (checkPhotoBoxItem(mEquipItem) || mEquipItem == dItemNo_TELESCOPE_e) { return procScope_init(mEquipItem); } - if (mEquipItem == dItem_WIND_WAKER_e) { + if (mEquipItem == dItemNo_WIND_WAKER_e) { return procTactWait_init(-1); } } @@ -4287,7 +4285,7 @@ BOOL daPy_lk_c::checkNextActionFromButton() { m_old_fdata->initOldFrameMorf(5.0f, 0, 0x2A); return true; } - } else if (dComIfGs_getSelectEquip(1) == dItem_NONE_e || + } else if (dComIfGs_getSelectEquip(1) == dItemNo_NONE_e || mEquipItem == daPyItem_NONE_e) { if (checkModeFlg(ModeFlg_00000001)) { @@ -4347,7 +4345,7 @@ void daPy_lk_c::setShieldGuard() { dComIfGp_setRStatus(dActStts_DEFEND_e); } u16 uVar3; - if (mEquipItem == dItem_SKULL_HAMMER_e) { + if (mEquipItem == dItemNo_SKULL_HAMMER_e) { uVar3 = LKANM_BCK_ATNGHAM; } else { uVar3 = LKANM_BCK_ATNG; @@ -4414,7 +4412,7 @@ void daPy_lk_c::checkNextActionItemFly() { if (!daPy_dmEcallBack_c::checkCurse()) { if (checkBowItem(mEquipItem)) { checkNextActionBowFly(); - } else if (mEquipItem == dItem_BOOMERANG_e) { + } else if (mEquipItem == dItemNo_BOOMERANG_e) { checkNextActionBoomerangFly(); } } @@ -5016,7 +5014,7 @@ BOOL daPy_lk_c::setDamagePoint(f32 amount) { BOOL daPy_lk_c::checkNormalDamage(int param_1) { if (checkGrabAnime() || mCurProc != daPyProc_MOVE_e || (std::abs(mNormalSpeed * (m3580 == 8 ? 1.0f : cM_scos(m34E2)) / mMaxNormalSpeed) < 0.9f) || - (!checkNoDamageMode() && !dComIfGs_checkBottle(dItem_FAIRY_BOTTLE_e) && dComIfGs_getLife() <= param_1)) + (!checkNoDamageMode() && !dComIfGs_checkBottle(dItemNo_FAIRY_BOTTLE_e) && dComIfGs_getLife() <= param_1)) { return true; } @@ -5235,7 +5233,7 @@ BOOL daPy_lk_c::changeDamageProc() { } if (checkGrabWear() && - mCyl.GetTgHitAc() && fopAcM_GetName(mCyl.GetTgHitAc()) == PROC_NZ && + mCyl.GetTgHitAc() && fopAcM_GetName(mCyl.GetTgHitAc()) == fpcNm_NZ_e && grab_actor != NULL ) { cXyz* damage_vec = getDamageVec(&mCyl); @@ -5337,7 +5335,7 @@ BOOL daPy_lk_c::changeAutoJumpProc() { pcVar4 = NULL; } dVar10 = mNormalSpeed; - if (dComIfGs_getLife() != 0 || dComIfGs_checkBottle(dItem_FAIRY_BOTTLE_e)) { + if (dComIfGs_getLife() != 0 || dComIfGs_checkBottle(dItemNo_FAIRY_BOTTLE_e)) { if (m357C != 3 && !checkGrabWear() && dVar10 >= m_HIO->mAutoJump.m.field_0x14 && mStickDistance > 0.85f && cLib_distanceAngleS(sVar3, shape_angle.y) < 0x800) { @@ -5550,9 +5548,9 @@ BOOL daPy_lk_c::changeDeadProc() { if (!dComIfGp_event_runCheck() && !checkPlayerDemoMode() && dComIfGs_getLife() == 0 && !checkModeFlg(ModeFlg_DAMAGE)) { - if (dComIfGs_checkBottle(dItem_FAIRY_BOTTLE_e)) { + if (dComIfGs_checkBottle(dItemNo_FAIRY_BOTTLE_e)) { makeFairy(¤t.pos, daNpc_Fa1_c::Type_LINK_DOWN_e); - dComIfGs_setBottleItemIn(dItem_FAIRY_BOTTLE_e, dItem_EMPTY_BOTTLE_e); + dComIfGs_setBottleItemIn(dItemNo_FAIRY_BOTTLE_e, dItemNo_EMPTY_BOTTLE_e); return false; } if (mAcch.ChkGroundHit() || dComIfGp_checkPlayerStatus0(0, daPyStts0_SHIP_RIDE_e) || @@ -5638,27 +5636,27 @@ BOOL daPy_lk_c::checkHeavyStateOn() { /* 80111F5C-80111F7C .text checkBottleItem__9daPy_lk_cCFi */ BOOL daPy_lk_c::checkBottleItem(int itemNo) const { - return itemNo >= dItem_EMPTY_BOTTLE_e && itemNo <= UNK_BOTTLE_60; + return itemNo >= dItemNo_EMPTY_BOTTLE_e && itemNo <= dItemNo_UNK_BOTTLE_60_e; } /* 80111F7C-80111FEC .text checkDrinkBottleItem__9daPy_lk_cCFi */ BOOL daPy_lk_c::checkDrinkBottleItem(int itemNo) const { - 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; + return itemNo == dItemNo_RED_POTION_e || itemNo == dItemNo_GREEN_POTION_e || itemNo == dItemNo_BLUE_POTION_e || itemNo == dItemNo_SOUP_BOTTLE_e || itemNo == dItemNo_HALF_SOUP_BOTTLE_e; } /* 80111FEC-8011201C .text checkOpenBottleItem__9daPy_lk_cCFi */ BOOL daPy_lk_c::checkOpenBottleItem(int itemNo) const { - return itemNo == dItem_FIREFLY_BOTTLE_e || itemNo == dItem_WATER_BOTTLE_e || itemNo == dItem_FOREST_WATER_e || itemNo == dItem_FAIRY_BOTTLE_e; + return itemNo == dItemNo_FIREFLY_BOTTLE_e || itemNo == dItemNo_WATER_BOTTLE_e || itemNo == dItemNo_FOREST_WATER_e || itemNo == dItemNo_FAIRY_BOTTLE_e; } /* 8011201C-80112044 .text checkBowItem__9daPy_lk_cCFi */ BOOL daPy_lk_c::checkBowItem(int itemNo) const { - return itemNo == dItem_BOW_e || itemNo == dItem_MAGIC_ARROW_e || itemNo == dItem_LIGHT_ARROW_e; + return itemNo == dItemNo_BOW_e || itemNo == dItemNo_MAGIC_ARROW_e || itemNo == dItemNo_LIGHT_ARROW_e; } /* 80112044-80112064 .text checkPhotoBoxItem__9daPy_lk_cCFi */ BOOL daPy_lk_c::checkPhotoBoxItem(int itemNo) const { - return itemNo == CAMERA || itemNo == CAMERA2; + return itemNo == dItemNo_PICTO_BOX_e || itemNo == dItemNo_DELUXE_PICTO_BOX_e; } /* 80112064-80112100 .text checkScopeEnd__9daPy_lk_cFv */ @@ -5751,7 +5749,7 @@ BOOL daPy_lk_c::commonProcInit(daPy_PROC proc) { deleteEquipItem(FALSE); maxFallSpeed = m_HIO->mAutoJump.m.field_0x10; setSmallFanModel(); - mEquipItem = dItem_DEKU_LEAF_e; + mEquipItem = dItemNo_DEKU_LEAF_e; m35F0 = m3688.y; m3730 = cXyz::Zero; m34E0 = 0; @@ -5768,7 +5766,7 @@ BOOL daPy_lk_c::commonProcInit(daPy_PROC proc) { } } else if (mCurProc == daPyProc_DEMO_PRESENT_e || mCurProc == daPyProc_NOT_USE_e) { daItemBase_c* item = (daItemBase_c*)fopAcM_getItemEventPartner(this); - if (item && (fopAcM_GetName(item) == PROC_ITEM || fopAcM_GetName(item) == PROC_Demo_Item)) { + if (item && (fopAcM_GetName(item) == fpcNm_ITEM_e || fopAcM_GetName(item) == fpcNm_Demo_Item_e)) { item->dead(); } } else if (mCurProc == daPyProc_DEMO_LETTER_READ_e) { @@ -5889,7 +5887,7 @@ BOOL daPy_lk_c::commonProcInit(daPy_PROC proc) { m35EC = 0.0f; - if (mEquipItem == dItem_SKULL_HAMMER_e) { + if (mEquipItem == dItemNo_SKULL_HAMMER_e) { mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_HAMMERDAM)); } else if (checkBowItem(mEquipItem) && !checkBowAnime()) { mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_ARROWRELORDA)); @@ -6486,7 +6484,7 @@ BOOL daPy_lk_c::procCrouchDefenseSlip_init() { m35AC = m_HIO->mGuard.m.field_0x24; mProcVar6.m3570 = 0; } - if (mEquipItem == dItem_SKULL_HAMMER_e) { + if (mEquipItem == dItemNo_SKULL_HAMMER_e) { mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_ATNGAHAMA)); m35EC = mFrameCtrlUnder[UNDER_MOVE0_e].getFrame(); } else { @@ -6503,7 +6501,7 @@ BOOL daPy_lk_c::procCrouchDefenseSlip() { if (mProcVar0.m34D0 > 0) { mProcVar0.m34D0--; } - if (mEquipItem == dItem_SKULL_HAMMER_e) { + if (mEquipItem == dItemNo_SKULL_HAMMER_e) { m35EC = mFrameCtrlUnder[UNDER_MOVE0_e].getFrame(); } else { m35E8 = mFrameCtrlUnder[UNDER_MOVE0_e].getFrame(); @@ -6911,7 +6909,7 @@ BOOL daPy_lk_c::procFrontRollCrash_init() { dKy_Sound_set(current.pos, 100, fopAcM_GetID(this), 5); if (mAcch.ChkWallHit() && mAcchCir[0].ChkWallHit()) { fopAc_ac_c* actor = dComIfG_Bgsp()->GetActorPointer(mAcchCir[0]); - if (actor != 0 && fopAcM_GetName(actor) == PROC_Obj_Movebox) { + if (actor != 0 && fopAcM_GetName(actor) == fpcNm_Obj_Movebox_e) { daObjMovebox::Act_c* movebox = (daObjMovebox::Act_c*)actor; movebox->set_rollCrash(); } @@ -7193,7 +7191,7 @@ BOOL daPy_lk_c::procAutoJump() { } } } else if (speed.y < -gravity && mProcVar6.m3570 != 2) { - if (mActorKeepGrab.getActor() != NULL && fopAcM_GetName(mActorKeepGrab.getActor()) == PROC_NPC_MD && + if (mActorKeepGrab.getActor() != NULL && fopAcM_GetName(mActorKeepGrab.getActor()) == fpcNm_NPC_MD_e && dComIfGs_isEventBit(dSv_event_flag_c::UNK_1620)) { speed.y = 5.0f; @@ -8248,7 +8246,7 @@ BOOL daPy_lk_c::procGuardSlip_init() { cXyz* damage_vec = getDamageVec(&mCyl); commonProcInit(daPyProc_GUARD_SLIP_e); - if (mEquipItem == dItem_SKULL_HAMMER_e) { + if (mEquipItem == dItemNo_SKULL_HAMMER_e) { dVar5 = ANM_ATNGAHAM; mSwordAnim.changeBckOnly(getItemAnimeResource(LKANM_BCK_ATNGAHAMA)); } else if (mDirection == DIR_LEFT) { @@ -8280,7 +8278,7 @@ BOOL daPy_lk_c::procGuardSlip_init() { m35AC = m_HIO->mGuard.m.field_0x24; mProcVar6.m3570 = 0; } - if (mEquipItem == dItem_SKULL_HAMMER_e) { + if (mEquipItem == dItemNo_SKULL_HAMMER_e) { m35EC = mFrameCtrlUnder[UNDER_MOVE0_e].getFrame(); } else { m35E8 = mFrameCtrlUnder[UNDER_MOVE0_e].getFrame(); @@ -8297,7 +8295,7 @@ BOOL daPy_lk_c::procGuardSlip() { mProcVar0.m34D0--; } setShapeAngleToAtnActor(); - if (mEquipItem == dItem_SKULL_HAMMER_e) { + if (mEquipItem == dItemNo_SKULL_HAMMER_e) { m35EC = mFrameCtrlUnder[UNDER_MOVE0_e].getFrame(); } else { m35E8 = mFrameCtrlUnder[UNDER_MOVE0_e].getFrame(); @@ -8567,7 +8565,7 @@ BOOL daPy_lk_c::procNotUse() { } if (mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.01f) { daItemBase_c* item = (daItemBase_c*)fopAcM_getItemEventPartner(this); - if (item != NULL && (fopAcM_GetName(item) == PROC_ITEM || fopAcM_GetName(item) == PROC_Demo_Item)) { + if (item != NULL && (fopAcM_GetName(item) == fpcNm_ITEM_e || fopAcM_GetName(item) == fpcNm_Demo_Item_e)) { item->show(); } if (mProcVar2.m34D4 == 0 && checkBottleItem((u16)mProcVar6.mBottleItem)) { @@ -8590,7 +8588,7 @@ BOOL daPy_lk_c::procNotUse() { } } else if (msg_p->mStatus == fopMsgStts_BOX_CLOSED_e) { msg_p->mStatus = fopMsgStts_MSG_DESTROYED_e; - if (item != NULL && (fopAcM_GetName(item) == PROC_ITEM || fopAcM_GetName(item) == PROC_Demo_Item)) { + if (item != NULL && (fopAcM_GetName(item) == fpcNm_ITEM_e || fopAcM_GetName(item) == fpcNm_Demo_Item_e)) { item->dead(); } dComIfGp_event_reset(); @@ -9660,7 +9658,7 @@ void daPy_lk_c::checkLightHit() { m3438.setAngle(cM_atan2s(-lightVec.y, lightVec.absXZ()), angleY, 0); if (m3438.getEmitter() != NULL) { if (mFanLightCps.GetAtHitAc() != 0 && - (fopAcM_GetName(mFanLightCps.GetAtHitAc()) == PROC_BPW)) + (fopAcM_GetName(mFanLightCps.GetAtHitAc()) == fpcNm_BPW_e)) { m3438.getEmitter()->setGlobalScale(boss_scale); } else { @@ -11156,7 +11154,7 @@ void daPy_lk_c::checkRoofRestart() { #if VERSION > VERSION_DEMO if ( dComIfG_Bgsp()->ChkMoveBG(mAcch.m_roof) && - fopAcM_GetName(dComIfG_Bgsp()->GetActorPointer(mAcch.m_roof)) == PROC_BRIDGE + fopAcM_GetName(dComIfG_Bgsp()->GetActorPointer(mAcch.m_roof)) == fpcNm_BRIDGE_e ) { return; } @@ -11206,11 +11204,11 @@ BOOL daPy_lk_c::execute() { return TRUE; } - if (dComIfGs_checkBottle(dItem_FOREST_WATER_e)) { + if (dComIfGs_checkBottle(dItemNo_FOREST_WATER_e)) { if (dComIfGs_getFwaterTimer() == 0) { if (dComIfGp_event_compulsory(this)) { onNoResetFlg1(daPyFlg1_UNK200); - dComIfGs_setBottleItemIn(dItem_FOREST_WATER_e, dItem_WATER_BOTTLE_e); + dComIfGs_setBottleItemIn(dItemNo_FOREST_WATER_e, dItemNo_WATER_BOTTLE_e); mDemo.setSpecialDemoType(); m3628 = fpcM_ERROR_PROCESS_ID_e; #if VERSION > VERSION_JPN @@ -11238,15 +11236,15 @@ BOOL daPy_lk_c::execute() { } if (checkEquipHeavyBoots() && - dComIfGp_getSelectItem(dItemBtn_X_e) != dItem_IRON_BOOTS_e && - dComIfGp_getSelectItem(dItemBtn_Y_e) != dItem_IRON_BOOTS_e && - dComIfGp_getSelectItem(dItemBtn_Z_e) != dItem_IRON_BOOTS_e + dComIfGp_getSelectItem(dItemBtn_X_e) != dItemNo_IRON_BOOTS_e && + dComIfGp_getSelectItem(dItemBtn_Y_e) != dItemNo_IRON_BOOTS_e && + dComIfGp_getSelectItem(dItemBtn_Z_e) != dItemNo_IRON_BOOTS_e ) { offNoResetFlg0(daPyFlg0_EQUIP_HEAVY_BOOTS); } else if (checkEquipDragonShield() && - dComIfGp_getSelectItem(dItemBtn_X_e) != dItem_MAGIC_ARMOR_e && - dComIfGp_getSelectItem(dItemBtn_Y_e) != dItem_MAGIC_ARMOR_e && - dComIfGp_getSelectItem(dItemBtn_Z_e) != dItem_MAGIC_ARMOR_e + dComIfGp_getSelectItem(dItemBtn_X_e) != dItemNo_MAGIC_ARMOR_e && + dComIfGp_getSelectItem(dItemBtn_Y_e) != dItemNo_MAGIC_ARMOR_e && + dComIfGp_getSelectItem(dItemBtn_Z_e) != dItemNo_MAGIC_ARMOR_e ) { offNoResetFlg1(daPyFlg1_EQUIP_DRAGON_SHIELD); } @@ -11364,7 +11362,7 @@ BOOL daPy_lk_c::execute() { setDemoData(); setStickData(); - if (mEquipItem == dItem_GRAPPLING_HOOK_e && + if (mEquipItem == dItemNo_GRAPPLING_HOOK_e && (mCurProc == daPyProc_ROPE_SUBJECT_e || mCurProc == daPyProc_ROPE_MOVE_e) && mActorKeepEquip.getActor() != NULL && fopAcM_GetParam(mActorKeepEquip.getActor()) == 2 ) { @@ -11626,7 +11624,7 @@ BOOL daPy_lk_c::execute() { daBoko_c* boko = static_cast(mActorKeepEquip.getActor()); boko->getTopPos(&mSwordTopPos); boko->getBlurRootPos(&m36C4); - } else if (mEquipItem == dItem_SKULL_HAMMER_e) { + } else if (mEquipItem == dItemNo_SKULL_HAMMER_e) { cMtx_multVec(mpEquipItemModel->getBaseTRMtx(), &hammer_top, &mSwordTopPos); cMtx_multVec(mpEquipItemModel->getBaseTRMtx(), &hammer_root, &m36C4); } else if (mEquipItem == daPyItem_SWORD_e) { @@ -12436,7 +12434,7 @@ cPhs_State daPy_lk_c::makeBgWait() { #if VERSION > VERSION_DEMO || ( m352E != 0 && dComIfG_Bgsp()->ChkMoveBG(mAcch.m_gnd) && - fopAcM_GetName(dComIfG_Bgsp()->GetActorPointer(mAcch.m_gnd)) == PROC_TBOX + fopAcM_GetName(dComIfG_Bgsp()->GetActorPointer(mAcch.m_gnd)) == fpcNm_TBOX_e ) #endif ) { @@ -12448,7 +12446,7 @@ cPhs_State daPy_lk_c::makeBgWait() { m352E--; if (m352E != 0) { if (!dComIfG_Bgsp()->ChkMoveBG(mAcch.m_gnd) || - fopAcM_GetName(dComIfG_Bgsp()->GetActorPointer(mAcch.m_gnd)) != PROC_OBJ_IKADA) + fopAcM_GetName(dComIfG_Bgsp()->GetActorPointer(mAcch.m_gnd)) != fpcNm_OBJ_IKADA_e) { return cPhs_INIT_e; } @@ -12458,7 +12456,7 @@ cPhs_State daPy_lk_c::makeBgWait() { #else if (((fopAcM_GetParam(this) & 0x80) != 0) && m352E != 0) { if (!dComIfG_Bgsp()->ChkMoveBG(mAcch.m_gnd) || - fopAcM_GetName(dComIfG_Bgsp()->GetActorPointer(mAcch.m_gnd)) != PROC_OBJ_IKADA) + fopAcM_GetName(dComIfG_Bgsp()->GetActorPointer(mAcch.m_gnd)) != fpcNm_OBJ_IKADA_e) { return cPhs_INIT_e; } @@ -12525,7 +12523,7 @@ cPhs_State daPy_lk_c::makeBgWait() { ship->setStartModeWarp(); #if VERSION > VERSION_DEMO cXyz local_38(current.pos.x, current.pos.y + 1500.0f, current.pos.z); - fpc_ProcID uVar8 = fopAcM_create(PROC_TORNADO, 2, &local_38, fopAcM_GetRoomNo(this)); + fpc_ProcID uVar8 = fopAcM_create(fpcNm_TORNADO_e, 2, &local_38, fopAcM_GetRoomNo(this)); ship->setTactWarpID(uVar8); #endif } @@ -12598,7 +12596,7 @@ cPhs_State daPy_lk_c::makeBgWait() { mDemo.setDemoMode(daPy_demo_c::DEMO_N_WAIT_e); procWait_init(); csXyz auStack_58(0, 0, 0); - fpc_ProcID fVar11 = fopAcM_createChild(PROC_FM, fopAcM_GetID(this), 0, ¤t.pos, + fpc_ProcID fVar11 = fopAcM_createChild(fpcNm_FM_e, fopAcM_GetID(this), 0, ¤t.pos, fopAcM_GetRoomNo(this), &auStack_58, NULL, 0xFF, 0); if (fVar11 != fpcM_ERROR_PROCESS_ID_e) { onNoResetFlg0(daPyFlg0_NO_DRAW); @@ -12959,11 +12957,11 @@ const daPy_anmIndex_c* daPy_lk_c::getAnmData(daPy_ANM anm) const { if (anm < (s32)ARRAY_SIZE(mBokoAnmIndexTable)) { return &mBokoAnmIndexTable[anm]; } - } else if (mEquipItem == dItem_SKULL_HAMMER_e) { + } else if (mEquipItem == dItemNo_SKULL_HAMMER_e) { if (anm < (s32)ARRAY_SIZE(mHammerAnmIndexTable)) { return &mHammerAnmIndexTable[anm]; } - } else if (mEquipItem == dItem_BOOMERANG_e || mEquipItem == dItem_DEKU_LEAF_e || mEquipItem == dItem_TELESCOPE_e) { + } else if (mEquipItem == dItemNo_BOOMERANG_e || mEquipItem == dItemNo_DEKU_LEAF_e || mEquipItem == dItemNo_TELESCOPE_e) { if (anm == ANM_DASH) { return &mSwordAnmIndexTable[anm]; } @@ -13160,19 +13158,19 @@ static actor_method_class2 l_daPy_Method = { }; actor_process_profile_definition2 g_profile_PLAYER = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 5, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_PLAYER, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 5, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_PLAYER_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daPy_lk_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_PLAYER, + /* Draw Prio */ fpcDwPi_PLAYER_e, /* Actor SubMtd */ (actor_method_class*)&l_daPy_Method, /* Status */ fopAcStts_FREEZE_e, /* Group */ fopAc_PLAYER_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, /* field_0x30 */ 2, }; diff --git a/src/d/actor/d_a_player_npc.cpp b/src/d/actor/d_a_player_npc.cpp index b1e399b9e..d0905f9f3 100644 --- a/src/d/actor/d_a_player_npc.cpp +++ b/src/d/actor/d_a_player_npc.cpp @@ -8,7 +8,6 @@ #include "d/d_com_inf_game.h" #include "m_Do/m_Do_lib.h" #include "SSystem/SComponent/c_counter.h" -#include "d/d_procname.h" /* 8015A37C-8015A448 .text check_initialRoom__10daPy_npc_cFv */ int daPy_npc_c::check_initialRoom() { @@ -186,7 +185,7 @@ void daPy_npc_c::drawDamageFog() { /* 8015AD20-8015AEF8 .text chkMoveBlock__10daPy_npc_cFP4cXyz */ int daPy_npc_c::chkMoveBlock(cXyz* outBlockVel) { cXyz blockRelPos; - fopAc_ac_c* block = daPy_npc_SearchAreaByName(this, PROC_Obj_Movebox, 300.0f, &blockRelPos); + fopAc_ac_c* block = daPy_npc_SearchAreaByName(this, fpcNm_Obj_Movebox_e, 300.0f, &blockRelPos); if (block) { cXyz blockVel = block->current.pos - block->old.pos; if (blockVel.abs() > 0.001f) { diff --git a/src/d/actor/d_a_player_particle.inc b/src/d/actor/d_a_player_particle.inc index 0240ae271..904d72dbd 100644 --- a/src/d/actor/d_a_player_particle.inc +++ b/src/d/actor/d_a_player_particle.inc @@ -16,7 +16,6 @@ #include "d/actor/d_a_player_HIO.h" #include "d/actor/d_a_sea.h" #include "d/actor/d_a_ship.h" -#include "d/d_procname.h" #include "f_op/f_op_kankyo_mng.h" #include "m_Do/m_Do_lib.h" #include "SSystem/SComponent/c_math.h" @@ -372,7 +371,7 @@ void daPy_waterDropPcallBack_c::execute(JPABaseEmitter* emitter, JPABaseParticle pos.y = dComIfG_Bgsp()->GroundCross(&mGndChk); if (pos.y > ptclPos.y) { - fopKyM_create(PROC_WATER_MARK, 1, &pos); + fopKyM_create(fpcNm_WATER_MARK_e, 1, &pos); } } } @@ -912,11 +911,11 @@ void daPy_lk_c::setFootMark(cXyz* i_pos) { pos.y = dComIfG_Bgsp()->GroundCross(&mGndChk); if (pos.y != -G_CM3D_F_INF && dComIfG_Bgsp()->GetAttributeCode(mGndChk) == dBgS_Attr_SAND_e) { - fopKyM_create(PROC_WATER_MARK, (shape_angle.y << 16) | 2, &pos, &scale, NULL); + fopKyM_create(fpcNm_WATER_MARK_e, (shape_angle.y << 16) | 2, &pos, &scale, NULL); } if (m336C.getEmitter() != NULL) { - fopKyM_create(PROC_WATER_MARK, shape_angle.y << 16, i_pos, &scale); + fopKyM_create(fpcNm_WATER_MARK_e, shape_angle.y << 16, i_pos, &scale); } } diff --git a/src/d/actor/d_a_player_rope.inc b/src/d/actor/d_a_player_rope.inc index 859b77475..057e5f970 100644 --- a/src/d/actor/d_a_player_rope.inc +++ b/src/d/actor/d_a_player_rope.inc @@ -15,7 +15,6 @@ #include "d/actor/d_a_player_HIO.h" #include "d/actor/d_a_himo2.h" #include "d/d_attention.h" -#include "d/d_procname.h" #include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_audio.h" @@ -26,17 +25,17 @@ BOOL daPy_lk_c::checkRopeAnime() const { /* 80142D68-80142E0C .text freeRopeItem__9daPy_lk_cFv */ void daPy_lk_c::freeRopeItem() { - if (mEquipItem == dItem_GRAPPLING_HOOK_e) { + if (mEquipItem == dItemNo_GRAPPLING_HOOK_e) { fopAc_ac_c* rope = mActorKeepRope.getActor(); if (mActorKeepEquip.getActor() != NULL) { onResetFlg0(daPyRFlg0_ROPE_FORCE_END); } if (rope != NULL) { - if (fopAcM_GetName(rope) == PROC_HIMO2) { + if (fopAcM_GetName(rope) == fpcNm_HIMO2_e) { fopAcM_SetParam(rope, 4); mActorKeepRope.clearData(); onResetFlg0(daPyRFlg0_ROPE_FORCE_END); - } else if (fopAcM_GetName(rope) == PROC_HIMO3) { + } else if (fopAcM_GetName(rope) == fpcNm_HIMO3_e) { mEquipItem = daPyItem_NONE_e; fopAcM_SetParam(rope, 3); mActorKeepRope.clearData(); @@ -58,7 +57,7 @@ f32 daPy_lk_c::checkRopeRoofHit(s16 param_0) { int daPy_lk_c::changeRopeSwingProc() { if (mCyl.ChkCoHit() != 0) { fopAc_ac_c* pfVar2 = mCyl.GetCoHitAc(); - if ((pfVar2 != NULL) && (fopAcM_GetName(pfVar2) == PROC_HIMO3)) { + if ((pfVar2 != NULL) && (fopAcM_GetName(pfVar2) == fpcNm_HIMO3_e)) { cXyz local_24 = pfVar2->current.pos - current.pos; if ((local_24.abs() - 95.0f >= 100.0f) && (pfVar2->current.pos.y > current.pos.y)) { return procRopeSwing_init(pfVar2, 0x1800); @@ -536,10 +535,10 @@ BOOL daPy_lk_c::procRopeSwing_init(fopAc_ac_c* param_0, s16 param_1) { cXyz local_84; if (param_0 != NULL) { mActorKeepRope.setData(param_0); - if (fopAcM_GetName(param_0) == PROC_HIMO3) { + if (fopAcM_GetName(param_0) == fpcNm_HIMO3_e) { fopAcM_SetParam(param_0, 1); deleteEquipItem(TRUE); - mEquipItem = dItem_GRAPPLING_HOOK_e; + mEquipItem = dItemNo_GRAPPLING_HOOK_e; local_84 = param_0->current.pos - current.pos; f32 dVar8 = (local_84.abs() - 95.0f); cXyz* temp = &((himo2_class*)param_0)->m1120[34].m10; @@ -954,7 +953,7 @@ BOOL daPy_lk_c::procRopeUp_init() { dVar5 = dVar5 - 60.0f; if (dVar5 < dVar4) { dVar4 = dVar5; - } else if (fopAcM_GetName(rope) == PROC_HIMO2 || DEMO_SELECT(!strcmp(dComIfGp_getStartStageName(), "GanonK"), checkSpecialRope())) { + } else if (fopAcM_GetName(rope) == fpcNm_HIMO2_e || DEMO_SELECT(!strcmp(dComIfGp_getStartStageName(), "GanonK"), checkSpecialRope())) { mProcVar6.m3570 = 1; } } diff --git a/src/d/actor/d_a_player_ship.inc b/src/d/actor/d_a_player_ship.inc index 5e993b687..ef1851f0b 100644 --- a/src/d/actor/d_a_player_ship.inc +++ b/src/d/actor/d_a_player_ship.inc @@ -20,7 +20,6 @@ #include "d/actor/d_a_ship.h" #include "d/d_com_inf_game.h" #include "d/d_kankyo_wether.h" -#include "d/d_procname.h" #include "d/d_salvage.h" #include "f_op/f_op_camera_mng.h" @@ -38,7 +37,7 @@ BOOL daPy_lk_c::shipSpecialDemoStart() { BOOL daPy_lk_c::checkJumpRideShip() { if (mCyl.ChkCoHit()) { fopAc_ac_c* hit_ac = mCyl.GetCoHitAc(); - if (hit_ac != NULL && fopAcM_GetName(hit_ac) == PROC_SHIP) { + if (hit_ac != NULL && fopAcM_GetName(hit_ac) == fpcNm_SHIP_e) { daShip_c* ship = (daShip_c*)hit_ac; cXyz sp20; mDoMtx_multVec(ship->getBodyMtx(), &l_ship_offset, &sp20); @@ -307,7 +306,7 @@ BOOL daPy_lk_c::changeShipEndProc() { } } if (mCurProc != daPyProc_SHIP_SCOPE_e && mCurProc != daPyProc_SHIP_BOW_e && mCurProc != daPyProc_SHIP_HOOKSHOT_e && - (mCurProc != daPyProc_SHIP_BOOMERANG_e || mEquipItem != dItem_BOOMERANG_e) && !ship->getFlyFlg()) + (mCurProc != daPyProc_SHIP_BOOMERANG_e || mEquipItem != dItemNo_BOOMERANG_e) && !ship->getFlyFlg()) { setTalkStatus(); if (orderTalk()) { @@ -339,28 +338,28 @@ BOOL daPy_lk_c::changeShipEndProc() { dComIfGp_setDoStatus(dActStts_PUT_AWAY_e); } } - if (checkSetItemTrigger(NORMAL_SAIL, 1)) { + if (checkSetItemTrigger(dItemNo_SAIL_e, 1)) { daBoomerang_c* boomerang = (daBoomerang_c*)mActorKeepThrow.getActor(); if (boomerang != NULL) { boomerang->onCancelFlg(); } return procShipSteer_init(); } - if (checkSetItemTrigger(dItem_BOMB_BAG_e, 1)) { + if (checkSetItemTrigger(dItemNo_BOMB_BAG_e, 1)) { daBoomerang_c* boomerang = (daBoomerang_c*)mActorKeepThrow.getActor(); if (boomerang != NULL) { boomerang->onCancelFlg(); } return procShipCannon_init(); } - if (checkSetItemTrigger(dItem_GRAPPLING_HOOK_e, 1)) { + if (checkSetItemTrigger(dItemNo_GRAPPLING_HOOK_e, 1)) { daBoomerang_c* boomerang = (daBoomerang_c*)mActorKeepThrow.getActor(); if (boomerang != NULL) { boomerang->onCancelFlg(); } return procShipCrane_init(); } - if (checkSetItemTrigger(dItem_TELESCOPE_e, 1)) { + if (checkSetItemTrigger(dItemNo_TELESCOPE_e, 1)) { daBoomerang_c* boomerang = (daBoomerang_c*)mActorKeepThrow.getActor(); if (boomerang != NULL) { boomerang->onCancelFlg(); @@ -381,24 +380,24 @@ BOOL daPy_lk_c::changeShipEndProc() { } return procShipBow_init(); } - if (checkSetItemTrigger(dItem_BOOMERANG_e, 1) && mActorKeepThrow.getActor() == NULL) { + if (checkSetItemTrigger(dItemNo_BOOMERANG_e, 1) && mActorKeepThrow.getActor() == NULL) { return procShipBoomerang_init(); } - if (checkSetItemTrigger(dItem_HOOKSHOT_e, 1)) { + if (checkSetItemTrigger(dItemNo_HOOKSHOT_e, 1)) { daBoomerang_c* boomerang = (daBoomerang_c*)mActorKeepThrow.getActor(); if (boomerang != NULL) { boomerang->onCancelFlg(); } return procShipHookshot_init(); } - if (checkSetItemTrigger(dItem_WIND_WAKER_e, 1)) { + if (checkSetItemTrigger(dItemNo_WIND_WAKER_e, 1)) { daBoomerang_c* boomerang = (daBoomerang_c*)mActorKeepThrow.getActor(); if (boomerang != NULL) { boomerang->onCancelFlg(); } return procTactWait_init(-1); } - if (checkSetItemTrigger(dItem_TINGLE_TUNER_e, 1)) { + if (checkSetItemTrigger(dItemNo_TINGLE_TUNER_e, 1)) { fopAcM_orderTalkEvent(this, (fopAc_ac_c*)dComIfGp_getAgb()); #if VERSION > VERSION_DEMO if (checkShipNotNormalMode()) { @@ -409,7 +408,7 @@ BOOL daPy_lk_c::changeShipEndProc() { #endif return true; } - if (checkSetItemTrigger(dItem_MAGIC_ARMOR_e, 1)) { + if (checkSetItemTrigger(dItemNo_MAGIC_ARMOR_e, 1)) { #if VERSION > VERSION_DEMO if (checkShipNotNormalMode()) { setShipRidePos(0); @@ -422,16 +421,16 @@ BOOL daPy_lk_c::changeShipEndProc() { if (checkSetItemTrigger(daPyItem_DRINK_BOTTLE_e, 0)) { return procBottleDrink_init(dComIfGp_getSelectItem(mReadyItemBtn)); } - if (checkSetItemTrigger(dItem_FAIRY_BOTTLE_e, 0)) { + if (checkSetItemTrigger(dItemNo_FAIRY_BOTTLE_e, 0)) { return procBottleOpen_init(0x57); } if (checkSetItemTrigger(daPyItem_OPEN_BOTTLE_e, 1)) { return procBottleOpen_init(dComIfGp_getSelectItem(mReadyItemBtn)); } - if (checkSetItemTrigger(dItem_EMPTY_BOTTLE_e, 1)) { + if (checkSetItemTrigger(dItemNo_EMPTY_BOTTLE_e, 1)) { return procBottleSwing_init(1); } - if (checkSetItemTrigger(dItem_HYOI_PEAR_e, 1)) { + if (checkSetItemTrigger(dItemNo_HYOI_PEAR_e, 1)) { return procFoodSet_init(); } if (checkSetItemTrigger(daPyItem_ESA_e, 1)) { @@ -754,7 +753,7 @@ BOOL daPy_lk_c::procShipBoomerang_init() { deleteEquipItem(TRUE); gravity = 0.0f; ship->setPaddleMove(); - mEquipItem = dItem_BOOMERANG_e; + mEquipItem = dItemNo_BOOMERANG_e; setSingleMoveAnime(ANM_ATNRS, 0.0f, 0.0f, -1, 5.0f); setActAnimeUpper(LKANM_BCK_BOOMWAIT, UPPER_MOVE2_e, 0.0f, 0.0f, -1, -1.0f); setTextureAnime(0, 0); @@ -786,7 +785,7 @@ BOOL daPy_lk_c::procShipBoomerang() { mSightPacket.offDrawFlg(); daShip_c* ship = (daShip_c*)dComIfGp_getShipActor(); if (!checkUpperAnime(LKANM_BCK_BOOMCATCH)) { - if (mEquipItem == dItem_BOOMERANG_e) { + if (mEquipItem == dItemNo_BOOMERANG_e) { if (checkUpperAnime(LKANM_BCK_BOOMWAIT)) { setShipAttentionAnmSpeed(m_HIO->mItem.mBoom.m.field_0x18); checkNextActionBoomerangReady(); @@ -831,7 +830,7 @@ BOOL daPy_lk_c::procShipHookshot_init() { deleteEquipItem(TRUE); gravity = 0.0f; ship->setPaddleMove(); - mEquipItem = dItem_HOOKSHOT_e; + mEquipItem = dItemNo_HOOKSHOT_e; m355C = 10; setSingleMoveAnime(ANM_ATNLS, 0.0f, 0.0f, -1, 5.0f); setActAnimeUpper(LKANM_BCK_HOOKSHOTWAIT, UPPER_MOVE2_e, 0.0f, 0.0f, -1, -1.0f); @@ -909,7 +908,7 @@ BOOL daPy_lk_c::procShipBow_init() { gravity = 0.0f; ship->setPaddleMove(); if (checkBowMiniGame()) { - mEquipItem = dItem_BOW_e; + mEquipItem = dItemNo_BOW_e; } else { mEquipItem = dComIfGp_getSelectItem(mReadyItemBtn); } diff --git a/src/d/actor/d_a_player_sword.inc b/src/d/actor/d_a_player_sword.inc index aafc78008..c68310cad 100644 --- a/src/d/actor/d_a_player_sword.inc +++ b/src/d/actor/d_a_player_sword.inc @@ -374,7 +374,7 @@ void daPy_lk_c::setJumpCutAtParam() { m35FC = m_HIO->mCut.m.field_0x58; } setAtParam(AT_TYPE_SWORD, atp, dCcG_At_Spl_UNK1, dCcG_SE_UNK1, dCcG_AtHitMark_Big_e, CUT_TYPE_JUMPCUT_SWORD, radius); - } else if (mEquipItem == dItem_SKULL_HAMMER_e) { + } else if (mEquipItem == dItemNo_SKULL_HAMMER_e) { setAtParam(AT_TYPE_SKULL_HAMMER, 4, dCcG_At_Spl_UNK1, dCcG_SE_METAL, dCcG_AtHitMark_Nrm_e, CUT_TYPE_JUMPCUT_HAMMER, 50.0f); } else if (mActorKeepEquip.getActor()) { setEnemyWeaponAtParam(TRUE); @@ -468,7 +468,7 @@ int daPy_lk_c::changeCutProc() { /* 80155C3C-80156034 .text changeCutReverseProc__9daPy_lk_cFQ29daPy_lk_c8daPy_ANM */ int daPy_lk_c::changeCutReverseProc(daPy_ANM param_0) { - if (mEquipItem != dItem_SKULL_HAMMER_e) { + if (mEquipItem != dItemNo_SKULL_HAMMER_e) { if (mAtCps[0].ChkAtShieldHit() || mAtCps[1].ChkAtShieldHit() || mAtCps[2].ChkAtShieldHit()) { return procCutReverse_init(param_0); } @@ -485,7 +485,7 @@ int daPy_lk_c::changeCutReverseProc(daPy_ANM param_0) { if (!cBgW_CheckBGround(triPla->GetNP()->y) || (mCurProc == daPyProc_HAMMER_FRONT_SWING_e && triPla->GetNP()->y < 0.64278764f)) { - if (mEquipItem != dItem_DEKU_LEAF_e) { + if (mEquipItem != dItemNo_DEKU_LEAF_e) { u32 uVar7 = dComIfG_Bgsp()->GetMtrlSndId(mLinkLinChk); u32 uVar12; if (mAtCps[0].GetAtType() == AT_TYPE_BOKO_STICK) { @@ -1983,7 +1983,7 @@ BOOL daPy_lk_c::procJumpCutLand_init() { setFootEffectPosType(3); onResetFlg0(daPyRFlg0_RIGHT_FOOT_ON_GROUND); onResetFlg0(daPyRFlg0_LEFT_FOOT_ON_GROUND); - if (mEquipItem == dItem_SKULL_HAMMER_e) { + if (mEquipItem == dItemNo_SKULL_HAMMER_e) { setHammerQuake(NULL, NULL, -1); } else if (checkHeavyStateOn()) { dComIfGp_getVibration().StartShock(5, -0x31, cXyz(0.0f, 1.0f, 0.0f)); diff --git a/src/d/actor/d_a_player_tact.inc b/src/d/actor/d_a_player_tact.inc index ff9ee4e21..3997943e2 100644 --- a/src/d/actor/d_a_player_tact.inc +++ b/src/d/actor/d_a_player_tact.inc @@ -15,7 +15,6 @@ #include "d/actor/d_a_player_main_data.h" #include "JSystem/J3DGraphLoader/J3DAnmLoader.h" #include "d/d_camera.h" -#include "d/d_procname.h" #include "d/actor/d_a_ship.h" #include "d/actor/d_a_player_HIO.h" #include "JSystem/JKernel/JKRHeap.h" @@ -33,11 +32,11 @@ u32 daPy_lk_c::getDayNightParamData() { /* 8014D7D4-8014D8AC .text setTactModel__9daPy_lk_cFv */ void daPy_lk_c::setTactModel() { - if (mEquipItem == dItem_WIND_WAKER_e) + if (mEquipItem == dItemNo_WIND_WAKER_e) return; deleteEquipItem(FALSE); - mEquipItem = dItem_WIND_WAKER_e; + mEquipItem = dItemNo_WIND_WAKER_e; JKRHeap* oldHeap = setItemHeap(); J3DModelData* modelData = initModel(&mpEquipItemModel, LINK_BDL_TAKT, 0x37221222); @@ -131,7 +130,7 @@ void daPy_lk_c::setTactZev(fpc_ProcID tactZevPartnerId, int r30, char* r31) { /* 8014DA78-8014DACC .text getTactTopPos__9daPy_lk_cFP4cXyz */ BOOL daPy_lk_c::getTactTopPos(cXyz* out) { - if (mEquipItem != dItem_WIND_WAKER_e || mpEquipItemModel == NULL) { + if (mEquipItem != dItemNo_WIND_WAKER_e || mpEquipItemModel == NULL) { return FALSE; } else { MTXMultVec(mpEquipItemModel->getBaseTRMtx(), &l_tact_top, out); @@ -546,7 +545,7 @@ BOOL daPy_lk_c::procTactPlay_init(s32 r27, int r30, int r31) { stage_stag_info_class* stag_info = dComIfGp_getStageStagInfo(); if (dStage_stagInfo_GetSTType(stag_info) == dStageType_SEA_e && m34CC != 1 && r30 != 0) { daShip_c* ship = dComIfGp_getShipActor(); - fpc_ProcID warpID = fopAcM_create(PROC_TORNADO, 1, ¤t.pos, fopAcM_GetRoomNo(this)); + fpc_ProcID warpID = fopAcM_create(fpcNm_TORNADO_e, 1, ¤t.pos, fopAcM_GetRoomNo(this)); ship->setTactWarpID(warpID); } } @@ -684,7 +683,7 @@ BOOL daPy_lk_c::procTactPlayEnd_init(int r30) { mDemo.setSystemDemoType(); } else if (r30 == 0) { dCam_getBody()->EndEventCamera(fopAcM_GetID(this)); - fopAcM_create(PROC_WBIRD, NULL, ¤t.pos, dComIfGp_roomControl_getStayNo()); + fopAcM_create(fpcNm_WBIRD_e, NULL, ¤t.pos, dComIfGp_roomControl_getStayNo()); } else if (r30 == 2) { dCam_getBody()->EndEventCamera(fopAcM_GetID(this)); dComIfGp_event_setTalkPartner(dComIfGp_getCb1Player()); diff --git a/src/d/actor/d_a_player_vomit.inc b/src/d/actor/d_a_player_vomit.inc index b6a1b5029..b6e860a7b 100644 --- a/src/d/actor/d_a_player_vomit.inc +++ b/src/d/actor/d_a_player_vomit.inc @@ -13,7 +13,6 @@ #include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_player_main.h" #include "d/actor/d_a_player_HIO.h" -#include "d/d_procname.h" /* 8014F8A0-8014F994 .text checkJumpFlower__9daPy_lk_cFv */ BOOL daPy_lk_c::checkJumpFlower() { @@ -21,7 +20,7 @@ BOOL daPy_lk_c::checkJumpFlower() { short sVar3; iVar1 = mCyl.GetCoHitAc(); - if (mCyl.ChkCoHit() && iVar1 != 0 && fopAcM_GetName(iVar1) == PROC_JBO) { + if (mCyl.ChkCoHit() && iVar1 != 0 && fopAcM_GetName(iVar1) == fpcNm_JBO_e) { if (checkModeFlg(ModeFlg_MIDAIR)) { if (speed.y <= 0.0f && current.pos.y > iVar1->current.pos.y - 50.0f) { return procVomitWait_init(); diff --git a/src/d/actor/d_a_pt.cpp b/src/d/actor/d_a_pt.cpp index dc256025c..82ec69334 100644 --- a/src/d/actor/d_a_pt.cpp +++ b/src/d/actor/d_a_pt.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_pt.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" /* 000000EC-00000110 .text __ct__10daPt_HIO_cFv */ @@ -184,18 +182,18 @@ static actor_method_class l_daPt_Method = { }; actor_process_profile_definition g_profile_PT = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_PT, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_PT_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(pt_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_PT, + /* Draw Prio */ fpcDwPi_PT_e, /* Actor SubMtd */ &l_daPt_Method, /* Status */ fopAcStts_UNK40000_e | fopAcStts_UNK80000_e, /* Group */ fopAc_ENEMY_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_pw.cpp b/src/d/actor/d_a_pw.cpp index db7e2f14b..4df106e36 100644 --- a/src/d/actor/d_a_pw.cpp +++ b/src/d/actor/d_a_pw.cpp @@ -10,8 +10,6 @@ #include "d/d_com_inf_game.h" #include "d/res/res_pw.h" #include "d/d_kankyo_rain.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "f_op/f_op_camera.h" #include "f_pc/f_pc_manager.h" #include "d/d_cc_d.h" @@ -222,7 +220,7 @@ void action_dousa(pw_class* i_this) { if (i_this->mBehaviorType == InvisibleAtStart) { i_this->m38C = fopAcM_searchPlayerAngleY(i_this); } - i_this->mKanteraID = fopAcM_create(PROC_KANTERA, 0xFF000001, &i_this->m2CC, i_this->current.roomNo); + i_this->mKanteraID = fopAcM_create(fpcNm_KANTERA_e, 0xFF000001, &i_this->m2CC, i_this->current.roomNo); if (i_this->mKanteraID != fpcM_ERROR_PROCESS_ID_e) { i_this->m382 = 5; switch (i_this->mBehaviorType) { @@ -248,7 +246,7 @@ void action_dousa(pw_class* i_this) { fopAc_ac_c* kantera; if (i_this->mKanteraID != fpcM_ERROR_PROCESS_ID_e && fopAcM_SearchByID(i_this->mKanteraID, &kantera) && kantera != NULL && - fopAcM_GetName(kantera) == PROC_KANTERA) + fopAcM_GetName(kantera) == fpcNm_KANTERA_e) { kantera->current.pos = i_this->m2CC; kantera->current.angle.y = i_this->shape_angle.y; @@ -556,18 +554,18 @@ static actor_method_class l_daPW_Method = { }; actor_process_profile_definition g_profile_PW = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_PW, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_PW_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(pw_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_PW, + /* Draw Prio */ fpcDwPi_PW_e, /* Actor SubMtd */ &l_daPW_Method, /* Status */ fopAcStts_SHOWMAP_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e | fopAcStts_UNK80000_e, /* Group */ fopAc_ENEMY_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_pz.cpp b/src/d/actor/d_a_pz.cpp index 70f4fc57f..884162249 100644 --- a/src/d/actor/d_a_pz.cpp +++ b/src/d/actor/d_a_pz.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_pz.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" const dCcD_SrcCyl daPz_c::m_cyl_src = { @@ -439,18 +437,18 @@ static actor_method_class daPzMethodTable = { }; actor_process_profile_definition g_profile_PZ = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_PZ, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_PZ_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daPz_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_PZ, + /* Draw Prio */ fpcDwPi_PZ_e, /* Actor SubMtd */ &daPzMethodTable, /* Status */ 0x08 | fopAcStts_SHOWMAP_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_race_item.cpp b/src/d/actor/d_a_race_item.cpp index b369b7f39..cb26fdc57 100644 --- a/src/d/actor/d_a_race_item.cpp +++ b/src/d/actor/d_a_race_item.cpp @@ -8,8 +8,6 @@ #include "d/d_com_inf_game.h" #include "d/actor/d_a_sea.h" #include "d/d_item_data.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/actor/d_a_player_main.h" #include "m_Do/m_Do_mtx.h" @@ -233,7 +231,7 @@ BOOL daRaceItem_c::execute() { } if(cLib_checkBit(field_0x645, (u8)0x01)) { - fopAc_ac_c* boomerang = (fopAc_ac_c*)fopAcM_SearchByName(PROC_BOOMERANG); + fopAc_ac_c* boomerang = (fopAc_ac_c*)fopAcM_SearchByName(fpcNm_BOOMERANG_e); if(boomerang) { current.pos = boomerang->current.pos; } @@ -275,18 +273,18 @@ static actor_method_class l_daRaceItem_Method = { }; actor_process_profile_definition g_profile_RACEITEM = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_RACEITEM, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_RACEITEM_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daRaceItem_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_RACEITEM, + /* Draw Prio */ fpcDwPi_RACEITEM_e, /* Actor SubMtd */ &l_daRaceItem_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e | fopAcStts_UNK80000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_rd.cpp b/src/d/actor/d_a_rd.cpp index 5a40bc4b0..a5dfa4e2f 100644 --- a/src/d/actor/d_a_rd.cpp +++ b/src/d/actor/d_a_rd.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_rd.h" #include "d/res/res_rd.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "f_op/f_op_actor_mng.h" #include "d/d_com_inf_game.h" #include "m_Do/m_Do_mtx.h" @@ -147,7 +145,7 @@ static void* searchNeadDeadRd_CB(void* i_actor, void* i_this) { /* 000002A8-0000030C .text _searchNearDeadRd__6daRd_cFP10fopAc_ac_c */ fopAc_ac_c* daRd_c::_searchNearDeadRd(fopAc_ac_c* i_actor) { - if (fopAcM_GetName(i_actor) == PROC_RD) { + if (fopAcM_GetName(i_actor) == fpcNm_RD_e) { daRd_c* other = static_cast(i_actor); if (other->mMode == MODE_DEATH) { if (fopAcM_searchActorDistanceXZ(this, i_actor) < l_HIO.m34) { @@ -1631,7 +1629,7 @@ bool daRd_c::_execute() { return true; } - fopAcM_setGbaName(this, dItem_MIRROR_SHIELD_e, 0x12, 0x30); + fopAcM_setGbaName(this, dItemNo_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) @@ -1947,18 +1945,18 @@ static actor_method_class daRdMethodTable = { }; actor_process_profile_definition g_profile_RD = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_RD, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_RD_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daRd_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_RD, + /* Draw Prio */ fpcDwPi_RD_e, /* Actor SubMtd */ &daRdMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e | fopAcStts_UNK200000_e, /* Group */ fopAc_ENEMY_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_rectangle.cpp b/src/d/actor/d_a_rectangle.cpp index d310105e4..a430752d4 100644 --- a/src/d/actor/d_a_rectangle.cpp +++ b/src/d/actor/d_a_rectangle.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_rectangle.h" #include "f_op/f_op_actor.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "SSystem/SComponent/c_phase.h" /* 00000078-00000080 .text daRct_Draw__FP15RECTANGLE_class */ @@ -44,18 +42,18 @@ static actor_method_class l_daRct_Method = { }; actor_process_profile_definition g_profile_RECTANGLE = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_RECTANGLE, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_RECTANGLE_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(RECTANGLE_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_RECTANGLE, + /* Draw Prio */ fpcDwPi_RECTANGLE_e, /* Actor SubMtd */ &l_daRct_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_sail.cpp b/src/d/actor/d_a_sail.cpp index 4f311ed1c..52e83bfd4 100644 --- a/src/d/actor/d_a_sail.cpp +++ b/src/d/actor/d_a_sail.cpp @@ -10,8 +10,6 @@ #endif #include "d/res/res_kaizokusen.h" #include "d/res/res_cloth.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "d/d_kankyo_wether.h" #include "d/actor/d_a_obj_pirateship.h" @@ -57,7 +55,7 @@ public: static daObjPirateship::Act_c* l_p_ship; static daSail_HIO_c l_HIO; -Vec l_pos[] = { +static Vec l_pos[] = { {-840.0f, 0.0f, 0.0f}, {-560.0f, 0.0f, 0.0f}, {-280.0f, 0.0f, 0.0f}, @@ -144,7 +142,7 @@ Vec l_pos[] = { {840.0f, -1100.0f, 0.0f}, }; -cXy l_texCoord[] = { +static cXy l_texCoord[] = { {0.0f, 0.0f}, {0.165f, 0.0f}, {0.33f, 0.0f}, @@ -235,7 +233,7 @@ cXy l_texCoord[] = { #include "assets/l_sail_matDL.h" #include "assets/l_Txa_kizoku_mastTEX.h" -Vec l_mast_pos[] = { +static Vec l_mast_pos[] = { {900.0f, 9.676933f, -16.760941f}, {900.0f, -9.676933f, -16.760941f}, {900.0f, -19.353867f, -0.000004f}, @@ -258,7 +256,7 @@ Vec l_mast_pos[] = { {0.0f, 22.42897f, 0.0f}, }; -GXColor l_mast_color[] = { +static GXColor l_mast_color[] = { {0xA8, 0xA8, 0xA8, 0xFF}, {0x5D, 0x5D, 0x5D, 0xFF}, {0xF3, 0xF3, 0xF3, 0xFF}, @@ -269,7 +267,7 @@ GXColor l_mast_color[] = { {0xA1, 0xA1, 0xA1, 0xFF}, }; -cXy l_mast_texCoord[] = { +static cXy l_mast_texCoord[] = { {1.0f, 0.0f}, {1.0f, 1.0f}, {0.0f, 1.0f}, @@ -873,18 +871,18 @@ static actor_method_class l_daSail_Method = { }; actor_process_profile_definition g_profile_SAIL = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_SAIL, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_SAIL_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(sail_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_SAIL, + /* Draw Prio */ fpcDwPi_SAIL_e, /* Actor SubMtd */ &l_daSail_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_saku.cpp b/src/d/actor/d_a_saku.cpp index 518724525..ecaee28d5 100644 --- a/src/d/actor/d_a_saku.cpp +++ b/src/d/actor/d_a_saku.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_saku.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" const dCcD_SrcCyl daSaku_c::m_cyl_src = { @@ -197,18 +195,18 @@ static actor_method_class l_daSaku_Method = { }; actor_process_profile_definition g_profile_SAKU = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_SAKU, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_SAKU_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daSaku_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_SAKU, + /* Draw Prio */ fpcDwPi_SAKU_e, /* Actor SubMtd */ &l_daSaku_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_9_e, + /* Cull Type */ fopAc_CULLBOX_9_e, }; diff --git a/src/d/actor/d_a_salvage.cpp b/src/d/actor/d_a_salvage.cpp index 248e8ad47..37d67e2c5 100644 --- a/src/d/actor/d_a_salvage.cpp +++ b/src/d/actor/d_a_salvage.cpp @@ -15,8 +15,6 @@ #include "d/d_kankyo.h" #include "d/d_kankyo_rain.h" #include "d/d_item.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" @@ -187,7 +185,7 @@ void daSalvage_c::checkOrder() { uVar2 = 0; m301 = false; } else { - m304 = fopAcM_create(PROC_SBOX, 0, pPos, getSRoomNo(), ¤t.angle, NULL, 0xff, salvage_createCB); + m304 = fopAcM_create(fpcNm_SBOX_e, 0, pPos, getSRoomNo(), ¤t.angle, NULL, 0xff, salvage_createCB); m301 = true; if (uVar7 == 0) { uVar2 = 2; @@ -196,7 +194,7 @@ void daSalvage_c::checkOrder() { u8 itemNo = getItemNo(getSalvageId()); u32 params = (uVar2 << 8) | itemNo; - m2EC = fopAcM_create(PROC_SALVAGE_TBOX, params, pPos, getSRoomNo(), ¤t.angle, &scale, 0xff, salvage_createCB); + m2EC = fopAcM_create(fpcNm_SALVAGE_TBOX_e, params, pPos, getSRoomNo(), ¤t.angle, &scale, 0xff, salvage_createCB); m2E9 = 0; if (m2EC == fpcM_ERROR_PROCESS_ID_e || (m304 == fpcM_ERROR_PROCESS_ID_e && m301)) { dComIfGp_event_reset(); @@ -292,7 +290,7 @@ bool daSalvage_c::proc_wait() { } if (roomNo != 0xff && switchIndex != 0xff && !dComIfGs_isSwitch(switchIndex, roomNo) && !dComIfGs_isOceanSvBit(roomNo, uVar2)) { - daDaiocta_c* bigOcto = (daDaiocta_c*)fopAcM_SearchByName(PROC_DAIOCTA); + daDaiocta_c* bigOcto = (daDaiocta_c*)fopAcM_SearchByName(fpcNm_DAIOCTA_e); if (bigOcto != NULL && switchIndex == bigOcto->getSw()) { cXyz sp40 = getPos(i); @@ -468,7 +466,7 @@ BOOL daSalvage_c::checkArea(cXyz crane_pos, int salvage_id) { void daSalvage_c::createEnemy() { daPy_py_c* player = daPy_getPlayerActorClass(); - fopAcM_create(PROC_OQ, 2, &player->current.pos); + fopAcM_create(fpcNm_OQ_e, 2, &player->current.pos); } /* 00001860-000019FC .text onSalvageForOship__11daSalvage_cFP9daOship_c */ @@ -606,7 +604,7 @@ BOOL daSalvage_c::getDistance(int salvageId, float* outDist) { /* 00001E48-00001FA8 .text send_agb__11daSalvage_cFv */ void daSalvage_c::send_agb() { u8 bVar5 = 0; - fopAcM_setGbaName(this, dItem_GRAPPLING_HOOK_e, 0x40, 0x3f); + fopAcM_setGbaName(this, dItemNo_GRAPPLING_HOOK_e, 0x40, 0x3f); for (s32 i = 0; i < 160; i++) { if (getKind(i) != 5 && getKind(i) && checkRegist(i) && checkUsed(i) && getRoomNo(i) == dComIfGp_roomControl_getStayNo()) { cXyz sp14 = getPos(i); @@ -756,18 +754,18 @@ static actor_method_class daSalvageMethodTable = { }; actor_process_profile_definition g_profile_Salvage = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Salvage, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Salvage_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daSalvage_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Salvage, + /* Draw Prio */ fpcDwPi_Salvage_e, /* Actor SubMtd */ &daSalvageMethodTable, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_4_e, + /* Cull Type */ fopAc_CULLBOX_4_e, }; diff --git a/src/d/actor/d_a_salvage_tbox.cpp b/src/d/actor/d_a_salvage_tbox.cpp index 13df4d40c..d56369f53 100644 --- a/src/d/actor/d_a_salvage_tbox.cpp +++ b/src/d/actor/d_a_salvage_tbox.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_salvage_tbox.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 00000078-00000128 .text getMaxWaterY__25daSTBox_shadowEcallBack_cFPQ29JGeometry8TVec3 */ void daSTBox_shadowEcallBack_c::getMaxWaterY(JGeometry::TVec3*) { @@ -147,18 +145,18 @@ static actor_method_class daSTBoxMethodTable = { }; actor_process_profile_definition g_profile_SALVAGE_TBOX = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_SALVAGE_TBOX, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_SALVAGE_TBOX_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daSTBox_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_SALVAGE_TBOX, + /* Draw Prio */ fpcDwPi_SALVAGE_TBOX_e, /* Actor SubMtd */ &daSTBoxMethodTable, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_sbox.cpp b/src/d/actor/d_a_sbox.cpp index 95a796280..0dcf34dfd 100644 --- a/src/d/actor/d_a_sbox.cpp +++ b/src/d/actor/d_a_sbox.cpp @@ -7,9 +7,7 @@ #include "d/actor/d_a_sbox.h" #include "d/actor/d_a_ship.h" #include "d/res/res_dalways.h" -#include "d/d_procname.h" #include "d/d_kankyo.h" -#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" @@ -524,18 +522,18 @@ static actor_method_class l_daSbox_Method = { }; actor_process_profile_definition g_profile_SBOX = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_SBOX, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_SBOX_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daSbox_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_SBOX, + /* Draw Prio */ fpcDwPi_SBOX_e, /* Actor SubMtd */ &l_daSbox_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_6_e, + /* Cull Type */ fopAc_CULLBOX_6_e, }; diff --git a/src/d/actor/d_a_scene_change.cpp b/src/d/actor/d_a_scene_change.cpp index f597057f4..92a67a088 100644 --- a/src/d/actor/d_a_scene_change.cpp +++ b/src/d/actor/d_a_scene_change.cpp @@ -8,8 +8,6 @@ #include "f_op/f_op_actor.h" #include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_mtx.h" -#include "d/d_procname.h" -#include "d/d_priority.h" static daSceneChgHIO_c l_HIO; @@ -62,18 +60,18 @@ static actor_method_class daSceneChgMethodTable = { }; actor_process_profile_definition g_profile_SCENECHG = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_SCENECHG, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_SCENECHG_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(d_a_scene_change_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_SCENECHG, + /* Draw Prio */ fpcDwPi_SCENECHG_e, /* Actor SubMtd */ &daSceneChgMethodTable, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_4_e, + /* Cull Type */ fopAc_CULLBOX_4_e, }; diff --git a/src/d/actor/d_a_sea.cpp b/src/d/actor/d_a_sea.cpp index 0bc74699b..45966463a 100644 --- a/src/d/actor/d_a_sea.cpp +++ b/src/d/actor/d_a_sea.cpp @@ -6,8 +6,6 @@ #include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_sea.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_stage.h" #include "m_Do/m_Do_lib.h" #include "m_Do/m_Do_graphic.h" @@ -20,7 +18,7 @@ #define GRID_CELLS 65 #define GRID_INDEX(x, z) (x + GRID_CELLS * z) -daSea_packet_c l_cloth; +static daSea_packet_c l_cloth; f32 daSea_packet_c::BASE_HEIGHT = 1.0f; @@ -482,7 +480,7 @@ void daSea_packet_c::CheckRoomChange() { dStage_roomDt_c * room = dComIfGp_roomControl_getStatusRoomDt(dComIfGp_roomControl_getStayNo()); if (room != NULL) { mRoomNo = dComIfGp_roomControl_getStayNo(); - daDaiocta_c* octa = (daDaiocta_c *)fopAcM_SearchByName(PROC_DAIOCTA); + daDaiocta_c* octa = (daDaiocta_c *)fopAcM_SearchByName(fpcNm_DAIOCTA_e); if (octa == NULL) { if (mFlags & 0x01) { ClrFlat(); @@ -1188,18 +1186,18 @@ static actor_method_class l_daSea_Method = { }; actor_process_profile_definition g_profile_SEA = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0002, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_SEA, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0002, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_SEA_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(sea_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_SEA, + /* Draw Prio */ fpcDwPi_SEA_e, /* Actor SubMtd */ &l_daSea_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_seatag.cpp b/src/d/actor/d_a_seatag.cpp index f5d2ee12b..3d9d6a7a2 100644 --- a/src/d/actor/d_a_seatag.cpp +++ b/src/d/actor/d_a_seatag.cpp @@ -3,8 +3,6 @@ */ #include "d/actor/d_a_seatag.h" #include "f_op/f_op_actor_mng.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 00000078-00000080 .text daSeatag_Draw__FP10daSeatag_c */ static BOOL daSeatag_Draw(daSeatag_c*) { @@ -42,18 +40,18 @@ static actor_method_class l_daSeatag_Method = { }; actor_process_profile_definition g_profile_SEATAG = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0002, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_SEATAG, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0002, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_SEATAG_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daSeatag_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_SEATAG, + /* Draw Prio */ fpcDwPi_SEATAG_e, /* Actor SubMtd */ &l_daSeatag_Method, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_shand.cpp b/src/d/actor/d_a_shand.cpp index a53e651b8..a3eed252d 100644 --- a/src/d/actor/d_a_shand.cpp +++ b/src/d/actor/d_a_shand.cpp @@ -10,12 +10,10 @@ #include "d/d_bg_s_lin_chk.h" #include "d/d_cc_uty.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_s_play.h" bool hio_set; -daShand_HIO_c l_HIO; +static daShand_HIO_c l_HIO; /* 000000EC-00000114 .text __ct__13daShand_HIO_cFv */ daShand_HIO_c::daShand_HIO_c() { @@ -525,18 +523,18 @@ static actor_method_class l_daShand_Method = { }; actor_process_profile_definition g_profile_SHAND = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_SHAND, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_SHAND_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(shand_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_SHAND, + /* Draw Prio */ fpcDwPi_SHAND_e, /* Actor SubMtd */ &l_daShand_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ENEMY_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_ship.cpp b/src/d/actor/d_a_ship.cpp index a8381ec32..f10a91041 100644 --- a/src/d/actor/d_a_ship.cpp +++ b/src/d/actor/d_a_ship.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_ship.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "d/d_s_play.h" // IWYU pragma: keep #include "m_Do/m_Do_mtx.h" @@ -355,7 +353,7 @@ BOOL daShip_c::checkForceMessage() { else if (dComIfGs_isEventBit(dSv_event_flag_c::ENDLESS_NIGHT) && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_0A01)) { mNextMessageNo = 0x607; } - else if (dComIfGs_checkGetItem(dItem_BOMB_BAG_e) && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_1F02)) { + else if (dComIfGs_checkGetItem(dItemNo_BOMB_BAG_e) && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_1F02)) { mNextMessageNo = 0x624; } else if (dComIfGs_isSymbol(0) && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_2F20)) { @@ -388,7 +386,7 @@ void daShip_c::setInitMessage() { return; } #if VERSION > VERSION_DEMO - else if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_2110) && !dComIfGs_checkGetItem(dItem_BOMB_BAG_e)) { + else if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_2110) && !dComIfGs_checkGetItem(dItemNo_BOMB_BAG_e)) { mNextMessageNo = 0x623; } #endif @@ -523,7 +521,7 @@ void daShip_c::setInitMessage() { mNextMessageNo = 0x621; } else { - if (dComIfGs_checkGetItem(dItem_BOMB_BAG_e)) { + if (dComIfGs_checkGetItem(dItemNo_BOMB_BAG_e)) { mNextMessageNo = 0x624; } else { @@ -737,7 +735,7 @@ BOOL daShip_c::setNextMessage(msg_class* msg) { } else if (currMessageNo == 0x1683) { dComIfGs_onEventBit(dSv_event_flag_c::UNK_3E20); - if (dComIfGs_getItem(12) != dItem_NONE_e) { + if (dComIfGs_getItem(12) != dItemNo_NONE_e) { mNextMessageNo = 0x1685; } else { @@ -1805,9 +1803,9 @@ BOOL daShip_c::procCannon() { } if (m037A == 0 && - ((CPad_CHECK_TRIG_X(0) && dComIfGp_getSelectItem(dItemBtn_X_e) == dItem_BOMB_BAG_e) || - (CPad_CHECK_TRIG_Y(0) && dComIfGp_getSelectItem(dItemBtn_Y_e) == dItem_BOMB_BAG_e) || - (CPad_CHECK_TRIG_Z(0) && dComIfGp_getSelectItem(dItemBtn_Z_e) == dItem_BOMB_BAG_e))) { + ((CPad_CHECK_TRIG_X(0) && dComIfGp_getSelectItem(dItemBtn_X_e) == dItemNo_BOMB_BAG_e) || + (CPad_CHECK_TRIG_Y(0) && dComIfGp_getSelectItem(dItemBtn_Y_e) == dItemNo_BOMB_BAG_e) || + (CPad_CHECK_TRIG_Z(0) && dComIfGp_getSelectItem(dItemBtn_Z_e) == dItemNo_BOMB_BAG_e))) { m037A = 30; if (dComIfGs_getBombNum() == 0) { mDoAud_seStart(JA_SE_ITEM_TARGET_OUT); @@ -1903,9 +1901,9 @@ BOOL daShip_c::procCrane() { if (!dComIfGp_event_runCheck() && !daPy_getPlayerLinkActorClass()->checkNoControll()) { if (m0398 == mCraneBaseAngle) { if(std::fabsf(speedF) < 3.0f && - ((CPad_CHECK_HOLD_X(0) && dComIfGp_getSelectItem(dItemBtn_X_e) == dItem_GRAPPLING_HOOK_e) || - (CPad_CHECK_HOLD_Y(0) && dComIfGp_getSelectItem(dItemBtn_Y_e) == dItem_GRAPPLING_HOOK_e) || - (CPad_CHECK_HOLD_Z(0) && dComIfGp_getSelectItem(dItemBtn_Z_e) == dItem_GRAPPLING_HOOK_e))) { + ((CPad_CHECK_HOLD_X(0) && dComIfGp_getSelectItem(dItemBtn_X_e) == dItemNo_GRAPPLING_HOOK_e) || + (CPad_CHECK_HOLD_Y(0) && dComIfGp_getSelectItem(dItemBtn_Y_e) == dItemNo_GRAPPLING_HOOK_e) || + (CPad_CHECK_HOLD_Z(0) && dComIfGp_getSelectItem(dItemBtn_Z_e) == dItemNo_GRAPPLING_HOOK_e))) { sVar1 = mRopeCnt; incRopeCnt(2, 0); if (mRopeCnt == 250) { @@ -2693,7 +2691,7 @@ BOOL daShip_c::procStartModeWarp_init() { camera->mCamera.Set(current.pos, local_38); m037A = 0; #if VERSION == VERSION_DEMO - mTactWarpID = fopAcM_create(PROC_TORNADO, 2, ¤t.pos, fopAcM_GetRoomNo(this)); + mTactWarpID = fopAcM_create(fpcNm_TORNADO_e, 2, ¤t.pos, fopAcM_GetRoomNo(this)); #endif fopAcM_seStartCurrent(this, 0x186D, 0); return TRUE; @@ -4028,7 +4026,7 @@ BOOL daShip_c::execute() { csXyz sp1C; sp1C.set(getCannonAngleX(), getCannonAngleY(), shape_angle.z); - daBomb_c* bomb = (daBomb_c *)fopAcM_fastCreate(PROC_BOMB, daBomb_c::prm_make(daBomb_c::STATE_4, FALSE, TRUE), &spE4, tevStr.mRoomNo, &sp1C); + daBomb_c* bomb = (daBomb_c *)fopAcM_fastCreate(fpcNm_BOMB_e, daBomb_c::prm_make(daBomb_c::STATE_4, FALSE, TRUE), &spE4, tevStr.mRoomNo, &sp1C); if (bomb) { dCam_getBody()->ForceLockOn(fpcM_GetID(bomb)); @@ -4696,7 +4694,7 @@ cPhs_State daShip_c::create() { gravity = -2.5f; maxFallSpeed = -150.0f; - mGridID = fopAcM_create(PROC_GRID, 1, ¤t.pos, -1, ¤t.angle); + mGridID = fopAcM_create(fpcNm_GRID_e, 1, ¤t.pos, -1, ¤t.angle); if (mGridID == fpcM_ERROR_PROCESS_ID_e) { return cPhs_ERROR_e; @@ -4723,7 +4721,7 @@ cPhs_State daShip_c::create() { cull.box.max.y = 570.0f; cull.box.max.z = 240.0f; - fopKyM_create(PROC_WIND_ARROW, (s32)this, 0, 0, 0); + fopKyM_create(fpcNm_WIND_ARROW_e, (s32)this, 0, 0, 0); offStateFlg(daSFLG_UNK2_e); mAcch.CrrPos(*dComIfG_Bgsp()); @@ -4760,7 +4758,7 @@ cPhs_State daShip_c::create() { m19C0.mRate = 0.0f; if (dStage_stagInfo_GetSTType(dComIfGp_getStageStagInfo()) == dStageType_SEA_e) { - fopAcM_createChild(PROC_Coming2, fopAcM_GetID(this), 0, ¤t.pos, -1, NULL); + fopAcM_createChild(fpcNm_Coming2_e, fopAcM_GetID(this), 0, ¤t.pos, -1, NULL); } } return res; @@ -4780,18 +4778,18 @@ static actor_method_class l_daShip_Method = { }; actor_process_profile_definition g_profile_SHIP = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0004, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_SHIP, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0004, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_SHIP_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daShip_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_SHIP, + /* Draw Prio */ fpcDwPi_SHIP_e, /* Actor SubMtd */ &l_daShip_Method, /* Status */ 0x02 | fopAcStts_SHOWMAP_e | fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e | fopAcStts_UNK200000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_shop_item.cpp b/src/d/actor/d_a_shop_item.cpp index 41357ed9d..00b1fc5ac 100644 --- a/src/d/actor/d_a_shop_item.cpp +++ b/src/d/actor/d_a_shop_item.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_shop_item.h" #include "f_op/f_op_actor_mng.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "d/d_s_play.h" #include "d/d_item.h" @@ -83,16 +81,16 @@ BOOL daShopItem_c::clothCreate() { }; switch(m_itemNo) { - case HEROS_FLAG: + case dItemNo_HEROS_FLAG_e: field_0x648 = 0; break; - case TAIRYO_FLAG: + case dItemNo_BIG_CATCH_FLAG_e: field_0x648 = 1; break; - case SALES_FLAG: + case dItemNo_BIG_SALE_FLAG_e: field_0x648 = 2; break; - case RED_FLAG: + case dItemNo_SICKLE_MOON_FLAG_e: default: field_0x648 = 3; } @@ -158,7 +156,7 @@ bool daShopItem_c::_execute() { bool daShopItem_c::_draw() { if(!chkDraw()) return true; - if(m_itemNo == WATER_STATUE || m_itemNo == POSTMAN_STATUE) { + if(m_itemNo == dItemNo_FOUNTAIN_IDOL_e || m_itemNo == dItemNo_POSTMAN_STATUE_e) { mpModel->getModelData()->getJointNodePointer(0)->setMtxCalc(0); } DrawBase(); @@ -170,7 +168,7 @@ bool daShopItem_c::_draw() { /* 00000694-0000070C .text settingBeforeDraw__12daShopItem_cFv */ void daShopItem_c::settingBeforeDraw() { - if(isBomb(m_itemNo) || (m_itemNo == dItem_BOMB_BAG_e) || (m_itemNo == dItem_SKULL_HAMMER_e) || m_itemNo == dItem_SMALL_KEY_e || m_itemNo == PRESIDENT_STATUE) { + if(isBomb(m_itemNo) || (m_itemNo == dItemNo_BOMB_BAG_e) || (m_itemNo == dItemNo_SKULL_HAMMER_e) || m_itemNo == dItemNo_SMALL_KEY_e || m_itemNo == dItemNo_SHOP_GURU_STATUE_e) { dDlst_texSpecmapST(&eyePos, &tevStr, mpModel->getModelData(), 1.0f); } } @@ -200,7 +198,7 @@ cPhs_State daShopItem_c::_create() { const char* arcName = getShopArcname(); if (getShopBmdIdx() == -1 || arcName == 0) { - m_itemNo = dItem_GREEN_RUPEE_e; + m_itemNo = dItemNo_GREEN_RUPEE_e; } arcName = getShopArcname(); @@ -278,18 +276,18 @@ static actor_method_class daShopItemMethodTable = { }; actor_process_profile_definition g_profile_ShopItem = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_ShopItem, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_ShopItem_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daShopItem_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_ShopItem, + /* Draw Prio */ fpcDwPi_ShopItem_e, /* Actor SubMtd */ &daShopItemMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_shutter.cpp b/src/d/actor/d_a_shutter.cpp index 1e619f736..e7373b17f 100644 --- a/src/d/actor/d_a_shutter.cpp +++ b/src/d/actor/d_a_shutter.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_shutter.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "d/res/res_htobi1.h" #include "d/res/res_htobi2.h" @@ -316,18 +314,18 @@ static actor_method_class daShutterMethodTable = { }; actor_process_profile_definition g_profile_SHUTTER = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_SHUTTER, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_SHUTTER_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daShutter_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_SHUTTER, + /* Draw Prio */ fpcDwPi_SHUTTER_e, /* Actor SubMtd */ &daShutterMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_shutter2.cpp b/src/d/actor/d_a_shutter2.cpp index 265242af7..6184a6010 100644 --- a/src/d/actor/d_a_shutter2.cpp +++ b/src/d/actor/d_a_shutter2.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_shutter2.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "d/res/res_htobi3.h" @@ -250,18 +248,18 @@ static actor_method_class daShutter2MethodTable = { }; actor_process_profile_definition g_profile_SHUTTER2 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_SHUTTER2, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_SHUTTER2_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daShutter2_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_SHUTTER2, + /* Draw Prio */ fpcDwPi_SHUTTER2_e, /* Actor SubMtd */ &daShutter2MethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_sie_flag.cpp b/src/d/actor/d_a_sie_flag.cpp index e248525df..49a44598e 100644 --- a/src/d/actor/d_a_sie_flag.cpp +++ b/src/d/actor/d_a_sie_flag.cpp @@ -10,8 +10,6 @@ #include "d/d_com_inf_game.h" #include "d/d_kankyo.h" #include "d/d_kankyo_wether.h" -#include "d/d_priority.h" -#include "d/d_procname.h" #include "d/d_s_play.h" #include "d/res/res_cloth.h" #include "d/res/res_eshata.h" @@ -273,18 +271,18 @@ static actor_method_class daSie_FlagMethodTable = { }; actor_process_profile_definition g_profile_Sie_Flag = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Sie_Flag, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Sie_Flag_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daSie_Flag_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Sie_Flag, + /* Draw Prio */ fpcDwPi_Sie_Flag_e, /* Actor SubMtd */ &daSie_FlagMethodTable, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e | fopAcStts_UNK200000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_sitem.cpp b/src/d/actor/d_a_sitem.cpp index 73fcb2154..ddea94893 100644 --- a/src/d/actor/d_a_sitem.cpp +++ b/src/d/actor/d_a_sitem.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_sitem.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" /* 000000EC-000001FC .text hand_draw__FP11sitem_class */ @@ -154,18 +152,18 @@ static actor_method_class l_daSitem_Method = { }; actor_process_profile_definition g_profile_SITEM = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_SITEM, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_SITEM_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(sitem_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_SITEM, + /* Draw Prio */ fpcDwPi_SITEM_e, /* Actor SubMtd */ &l_daSitem_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ENEMY_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_sk.cpp b/src/d/actor/d_a_sk.cpp index a48add84a..6b7fa6b8f 100644 --- a/src/d/actor/d_a_sk.cpp +++ b/src/d/actor/d_a_sk.cpp @@ -7,8 +7,6 @@ #include "d/actor/d_a_sk.h" #include "d/res/res_sk.h" #include "m_Do/m_Do_ext.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_jnt_hit.h" #include "d/d_cc_d.h" #include "d/d_com_inf_game.h" @@ -353,18 +351,18 @@ static actor_method_class l_daSk_Method = { }; actor_process_profile_definition g_profile_SK = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_SK, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_SK_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(sk_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_SK, + /* Draw Prio */ fpcDwPi_SK_e, /* Actor SubMtd */ &l_daSk_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_sk2.cpp b/src/d/actor/d_a_sk2.cpp index 36661ff5f..915752404 100644 --- a/src/d/actor/d_a_sk2.cpp +++ b/src/d/actor/d_a_sk2.cpp @@ -9,8 +9,6 @@ #include "m_Do/m_Do_ext.h" #include "d/d_bg_w_deform.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_s_play.h" #include "f_op/f_op_actor_mng.h" @@ -246,18 +244,18 @@ static actor_method_class l_daSk2_Method = { }; actor_process_profile_definition g_profile_SK2 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_SK2, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_SK2_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(sk2_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_SK2, + /* Draw Prio */ fpcDwPi_SK2_e, /* Actor SubMtd */ &l_daSk2_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_spc_item01.cpp b/src/d/actor/d_a_spc_item01.cpp index 6e37d8aba..f82dd3f9f 100644 --- a/src/d/actor/d_a_spc_item01.cpp +++ b/src/d/actor/d_a_spc_item01.cpp @@ -5,11 +5,8 @@ #include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_spc_item01.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_bg_s_acch.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" #include "d/d_item.h" #include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_mtx.h" @@ -57,7 +54,7 @@ void daSpcItem01_c::set_mtx() { cXyz scaleVec = scale; f32 offsetY = 0.0f; switch (m_itemNo) { - case dItem_KNIGHTS_CREST_e: + case dItemNo_KNIGHTS_CREST_e: offsetY = -24.0f; break; } @@ -79,7 +76,7 @@ cPhs_State daSpcItem01_c::_create() { fopAcM_ct(this, daSpcItem01_c); m_itemNo = daSpcItem01_prm::getItemNo(this); - if (m_itemNo == dItem_SHIELD_e && dComIfGs_isEventBit(dSv_event_flag_c::UNK_0E20)) { + if (m_itemNo == dItemNo_SHIELD_e && dComIfGs_isEventBit(dSv_event_flag_c::UNK_0E20)) { setLoadError(); return cPhs_ERROR_e; } @@ -118,7 +115,7 @@ BOOL daSpcItem01_c::CreateInit() { field_0x644 = daSpcItem01_prm::getFlag(this); fopAcM_SetGravity(this, -4.0f); switch ((s8)m_itemNo) { - case dItem_SHIELD_e: + case dItemNo_SHIELD_e: scale.x = 1.5f; scale.y = 1.5f; scale.z = 1.5f; @@ -149,7 +146,7 @@ BOOL daSpcItem01_c::_execute() { /* 8015DFE8-8015E070 .text set_effect__13daSpcItem01_cFv */ void daSpcItem01_c::set_effect() { - if (cLib_checkBit(field_0x644, (u16)0x01) && dItem_data::checkAppearEffect(m_itemNo) && !field_0x642 && m_itemNo != dItem_KNIGHTS_CREST_e) { + if (cLib_checkBit(field_0x644, (u16)0x01) && dItem_data::checkAppearEffect(m_itemNo) && !field_0x642 && m_itemNo != dItemNo_KNIGHTS_CREST_e) { dComIfGp_particle_setSimple(dItem_data::getAppearEffect(m_itemNo), ¤t.pos); } } @@ -166,7 +163,7 @@ void daSpcItem01_c::scale_anim() { /* 8015E0D8-8015E11C .text anim_play__13daSpcItem01_cFv */ void daSpcItem01_c::anim_play() { f32 animPlayParam = 1.0f; - if (m_itemNo == dItem_KNIGHTS_CREST_e) { + if (m_itemNo == dItemNo_KNIGHTS_CREST_e) { animPlayParam = 0.0f; } animPlay(1.0f, 1.0f, 1.0f, 1.0f, animPlayParam); @@ -177,9 +174,9 @@ void daSpcItem01_c::move() { fopAcM_posMoveF(this, mStts.GetCCMoveP()); mAcch.CrrPos(*dComIfG_Bgsp()); switch (m_itemNo) { - case dItem_SHIELD_e: + case dItemNo_SHIELD_e: break; - case dItem_JOY_PENDANT_e: + case dItemNo_JOY_PENDANT_e: if (mAcch.ChkGroundLanding()) { speed.x = 0.0f; speed.y = 0.0f; @@ -231,7 +228,7 @@ BOOL daSpcItem01_c::_draw() { /* 8015E2A8-8015E368 .text setTevStr__13daSpcItem01_cFv */ void daSpcItem01_c::setTevStr() { - if (m_itemNo == dItem_KNIGHTS_CREST_e) { + if (m_itemNo == dItemNo_KNIGHTS_CREST_e) { dKy_getEnvlight().settingTevStruct(TEV_TYPE_BG1, ¤t.pos, &tevStr); } else { dKy_getEnvlight().settingTevStruct(TEV_TYPE_ACTOR, ¤t.pos, &tevStr); @@ -280,18 +277,18 @@ static actor_method_class l_daSpcItem01_Method = { }; actor_process_profile_definition g_profile_SPC_ITEM01 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_SPC_ITEM01, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_SPC_ITEM01_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daSpcItem01_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_SPC_ITEM01, + /* Draw Prio */ fpcDwPi_SPC_ITEM01_e, /* Actor SubMtd */ &l_daSpcItem01_Method, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_spotbox.cpp b/src/d/actor/d_a_spotbox.cpp index 1624a0fe9..f7d885478 100644 --- a/src/d/actor/d_a_spotbox.cpp +++ b/src/d/actor/d_a_spotbox.cpp @@ -8,8 +8,6 @@ #include "f_op/f_op_actor_mng.h" #include "d/d_com_inf_game.h" #include "m_Do/m_Do_mtx.h" -#include "d/d_procname.h" -#include "d/d_priority.h" cPhs_State daSpotbox_c::create() { fopAcM_ct(this, daSpotbox_c); @@ -75,16 +73,16 @@ static actor_method_class l_daSpotbox_Method = { }; actor_process_profile_definition g_profile_SPOTBOX = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_SPOTBOX, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_SPOTBOX_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daSpotbox_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_SPOTBOX, + /* Draw Prio */ fpcDwPi_SPOTBOX_e, /* Actor SubMtd */ &l_daSpotbox_Method, #if VERSION == VERSION_DEMO /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e, @@ -92,5 +90,5 @@ actor_process_profile_definition g_profile_SPOTBOX = { /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, #endif /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_ss.cpp b/src/d/actor/d_a_ss.cpp index 13bd7aa5a..af1d3adef 100644 --- a/src/d/actor/d_a_ss.cpp +++ b/src/d/actor/d_a_ss.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_ss.h" #include "m_Do/m_Do_ext.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" /* 000000EC-000001DC .text nodeCallBack__FP7J3DNodei */ @@ -122,18 +120,18 @@ static actor_method_class l_daSs_Method = { }; actor_process_profile_definition g_profile_SS = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_SS, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_SS_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(ss_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_SS, + /* Draw Prio */ fpcDwPi_SS_e, /* Actor SubMtd */ &l_daSs_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ENEMY_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_ssk.cpp b/src/d/actor/d_a_ssk.cpp index fd7bac42c..1862fa60c 100644 --- a/src/d/actor/d_a_ssk.cpp +++ b/src/d/actor/d_a_ssk.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_ssk.h" #include "d/res/res_ssk.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "d/d_jnt_hit.h" #include "f_op/f_op_actor_mng.h" @@ -436,18 +434,18 @@ static actor_method_class l_daSsk_Method = { }; actor_process_profile_definition g_profile_SSK = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_SSK, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_SSK_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(ssk_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_SSK, + /* Draw Prio */ fpcDwPi_SSK_e, /* Actor SubMtd */ &l_daSsk_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_sss.cpp b/src/d/actor/d_a_sss.cpp index 129bfdcaa..880585b98 100644 --- a/src/d/actor/d_a_sss.cpp +++ b/src/d/actor/d_a_sss.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_sss.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" /* 000000EC-000001F0 .text hand_draw__FP9sss_class */ @@ -164,18 +162,18 @@ static actor_method_class l_daSss_Method = { }; actor_process_profile_definition g_profile_SSS = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_SSS, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_SSS_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(sss_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_SSS, + /* Draw Prio */ fpcDwPi_SSS_e, /* Actor SubMtd */ &l_daSss_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ENEMY_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_st.cpp b/src/d/actor/d_a_st.cpp index 1308c069d..c0500d4a6 100644 --- a/src/d/actor/d_a_st.cpp +++ b/src/d/actor/d_a_st.cpp @@ -8,8 +8,6 @@ #include "d/actor/d_a_boko.h" #include "d/actor/d_a_player.h" #include "d/d_s_play.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" #include "d/d_snap.h" #include "d/res/res_st.h" @@ -1642,13 +1640,13 @@ static void damage_check(st_class* i_this) { if (atInfo.mDamage != 0) { mDoAud_onEnemyDamage(); } - if ((fopAcM_GetName(atInfo.mpActor) == PROC_HIMO2) && (actor->stealItemLeft != 0)) { + if ((fopAcM_GetName(atInfo.mpActor) == fpcNm_HIMO2_e) && (actor->stealItemLeft != 0)) { actor->stealItemLeft--; fopAcM_createStealItem(&actor->current.pos, actor->itemTableIdx, fopAcM_GetRoomNo(actor), 0, actor->stealItemBitNo); actor->stealItemBitNo++; } if ( - (fopAcM_GetName(atInfo.mpActor) == PROC_PLAYER) + (fopAcM_GetName(atInfo.mpActor) == fpcNm_PLAYER_e) #if VERSION > VERSION_DEMO || (atInfo.mResultingAttackType == 2) #endif @@ -1683,7 +1681,7 @@ static void damage_check(st_class* i_this) { #endif i_this->m0ED3 = 10; i_this->mUpperBodyEntityId = - fopAcM_create(PROC_ST, 0xe, &actor->current.pos, fopAcM_GetRoomNo(actor), &actor->home.angle, NULL, 0xff, NULL); + fopAcM_create(fpcNm_ST_e, 0xe, &actor->current.pos, fopAcM_GetRoomNo(actor), &actor->home.angle, NULL, 0xff, NULL); i_this->m1E84 = 5; #if VERSION > VERSION_DEMO i_this->m1E86 = 0; @@ -2904,7 +2902,7 @@ static cPhs_State daSt_Create(fopAc_ac_c* a_this) { i_this->m0D80.Set(wepon_sph_src); i_this->m0D80.SetStts(&i_this->mStts); if (i_this->mBehaviorType != BEHAVIOR_UPPER_BODY_ONLY) { - i_this->mHeldWeaponEntityId = fopAcM_create(PROC_BOKO, daBoko_c::Type_STALFOS_MACE_e, &a_this->current.pos, fopAcM_GetRoomNo(a_this)); + i_this->mHeldWeaponEntityId = fopAcM_create(fpcNm_BOKO_e, daBoko_c::Type_STALFOS_MACE_e, &a_this->current.pos, fopAcM_GetRoomNo(a_this)); i_this->m1DD0 = 1; a_this->health = 16; a_this->max_health = 16; @@ -2938,18 +2936,18 @@ static actor_method_class l_daSt_Method = { }; actor_process_profile_definition g_profile_ST = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_ST, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_ST_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(st_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_ST, + /* Draw Prio */ fpcDwPi_ST_e, /* Actor SubMtd */ &l_daSt_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ENEMY_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_steam_tag.cpp b/src/d/actor/d_a_steam_tag.cpp index d63eb31b6..67c790a86 100644 --- a/src/d/actor/d_a_steam_tag.cpp +++ b/src/d/actor/d_a_steam_tag.cpp @@ -10,8 +10,6 @@ #include "d/d_com_inf_game.h" #include "d/d_item.h" #include "d/d_item_data.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "dolphin/mtx/vec.h" static dCcD_SrcCps l_cps_src = { @@ -202,7 +200,7 @@ cPhs_State daSteamTag_c::create() { cPhs_State phase_state; if ((strcmp(dComIfGp_getStartStageName(),"Adanmae") == 0) && (current.roomNo == 0) && - (checkItemGet(dItem_PEARL_DIN_e, TRUE))) { + (checkItemGet(dItemNo_PEARL_DIN_e, TRUE))) { phase_state = cPhs_ERROR_e; } else { phase_state = cPhs_COMPLEATE_e; @@ -225,18 +223,18 @@ static actor_method_class l_daSteamTag_Method = { }; actor_process_profile_definition g_profile_SteamTag = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_SteamTag, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_SteamTag_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daSteamTag_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_SteamTag, + /* Draw Prio */ fpcDwPi_SteamTag_e, /* Actor SubMtd */ &l_daSteamTag_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_stone.cpp b/src/d/actor/d_a_stone.cpp index 48fccd5ac..117713564 100644 --- a/src/d/actor/d_a_stone.cpp +++ b/src/d/actor/d_a_stone.cpp @@ -8,8 +8,6 @@ #include "d/actor/d_a_sea.h" #include "d/actor/d_a_player.h" #include "d/res/res_always.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_camera.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" @@ -1011,18 +1009,18 @@ actor_method_class Method::Table = { } // namespace daStone actor_process_profile_definition g_profile_STONE = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0008, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_STONE, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0008, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_STONE_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daStone::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_STONE, + /* Draw Prio */ fpcDwPi_STONE_e, /* Actor SubMtd */ &daStone::Method::Table, /* Status */ fopAcStts_CULL_e | fopAcStts_FREEZE_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLSPHERE_CUSTOM_e, + /* Cull Type */ fopAc_CULLSPHERE_CUSTOM_e, }; diff --git a/src/d/actor/d_a_stone2.cpp b/src/d/actor/d_a_stone2.cpp index a661e9ee6..2875986df 100644 --- a/src/d/actor/d_a_stone2.cpp +++ b/src/d/actor/d_a_stone2.cpp @@ -7,8 +7,6 @@ #include "d/actor/d_a_stone2.h" #include "d/actor/d_a_player.h" #include "d/res/res_always.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "f_op/f_op_camera.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" @@ -797,18 +795,18 @@ static actor_method_class Mthd_Table = { }; // namespace daStone2 actor_process_profile_definition g_profile_Stone2 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0008, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Stone2, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0008, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Stone2_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daStone2::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Stone2, + /* Draw Prio */ fpcDwPi_Stone2_e, /* Actor SubMtd */ &daStone2::Mthd_Table, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLSPHERE_CUSTOM_e, + /* Cull Type */ fopAc_CULLSPHERE_CUSTOM_e, }; diff --git a/src/d/actor/d_a_swattack.cpp b/src/d/actor/d_a_swattack.cpp index 333aefa4d..09ed1bf5f 100644 --- a/src/d/actor/d_a_swattack.cpp +++ b/src/d/actor/d_a_swattack.cpp @@ -8,8 +8,6 @@ #include "f_op/f_op_actor_mng.h" #include "d/d_cc_d.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" static dCcD_SrcCyl l_cyl_src = { // dCcD_SrcGObjInf @@ -162,18 +160,18 @@ static actor_method_class daSwAtMethodTable = { }; actor_process_profile_definition g_profile_SW_ATTACK = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_SW_ATTACK, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_SW_ATTACK_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daSwAt_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_SW_ATTACK, + /* Draw Prio */ fpcDwPi_SW_ATTACK_e, /* Actor SubMtd */ &daSwAtMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_swc00.cpp b/src/d/actor/d_a_swc00.cpp index e3ad0bc33..8fd36a615 100644 --- a/src/d/actor/d_a_swc00.cpp +++ b/src/d/actor/d_a_swc00.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_swc00.h" #include "f_op/f_op_actor_mng.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_com_inf_game.h" /* 00000078-00000180 .text daSwc00_Execute__FP11swc00_class */ @@ -79,18 +77,18 @@ static actor_method_class l_daSwc00_Method = { }; actor_process_profile_definition g_profile_SWC00 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_SWC00, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_SWC00_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(swc00_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_SWC00, + /* Draw Prio */ fpcDwPi_SWC00_e, /* Actor SubMtd */ &l_daSwc00_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_swhit0.cpp b/src/d/actor/d_a_swhit0.cpp index 1eea428df..c4a8a0fa4 100644 --- a/src/d/actor/d_a_swhit0.cpp +++ b/src/d/actor/d_a_swhit0.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_swhit0.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "f_op/f_op_actor_mng.h" #include "JSystem/JUtility/JUTAssert.h" #include "m_Do/m_Do_mtx.h" @@ -480,18 +478,18 @@ static actor_method_class l_daSwhit0_Method = { }; actor_process_profile_definition g_profile_SWHIT0 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0008, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_SWHIT0, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0008, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_SWHIT0_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daSwhit0_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_SWHIT0, + /* Draw Prio */ fpcDwPi_SWHIT0_e, /* Actor SubMtd */ &l_daSwhit0_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_switem.cpp b/src/d/actor/d_a_switem.cpp index ee1e81437..6a0d05b62 100644 --- a/src/d/actor/d_a_switem.cpp +++ b/src/d/actor/d_a_switem.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_switem.h" #include "f_op/f_op_actor_mng.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" #include "d/d_com_inf_game.h" #include "d/d_item.h" @@ -213,18 +211,18 @@ static actor_method_class daSwItemMethodTable = { }; actor_process_profile_definition g_profile_SW_ITEM = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_SW_ITEM, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_SW_ITEM_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daSwItem_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_SW_ITEM, + /* Draw Prio */ fpcDwPi_SW_ITEM_e, /* Actor SubMtd */ &daSwItemMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_swpropeller.cpp b/src/d/actor/d_a_swpropeller.cpp index b8a9d26db..0a9d8b30f 100644 --- a/src/d/actor/d_a_swpropeller.cpp +++ b/src/d/actor/d_a_swpropeller.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_swpropeller.h" #include "m_Do/m_Do_ext.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" static dCcD_SrcCyl l_cyl_src = { @@ -120,18 +118,18 @@ static actor_method_class daSwPropMethodTable = { }; actor_process_profile_definition g_profile_SW_PROPELLER = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_SW_PROPELLER, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_SW_PROPELLER_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daSwProp_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_SW_PROPELLER, + /* Draw Prio */ fpcDwPi_SW_PROPELLER_e, /* Actor SubMtd */ &daSwPropMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_swtact.cpp b/src/d/actor/d_a_swtact.cpp index 5d89312fd..108e6b421 100644 --- a/src/d/actor/d_a_swtact.cpp +++ b/src/d/actor/d_a_swtact.cpp @@ -8,8 +8,6 @@ #include "d/res/res_itact.h" #include "f_op/f_op_actor_mng.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/actor/d_a_player.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" @@ -216,18 +214,18 @@ static actor_method_class daSwTactMethodTable = { }; actor_process_profile_definition g_profile_SW_TACT = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_SW_TACT, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_SW_TACT_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daSwTact_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_SW_TACT, + /* Draw Prio */ fpcDwPi_SW_TACT_e, /* Actor SubMtd */ &daSwTactMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_swtdoor.cpp b/src/d/actor/d_a_swtdoor.cpp index 51a7af274..6a965f76d 100644 --- a/src/d/actor/d_a_swtdoor.cpp +++ b/src/d/actor/d_a_swtdoor.cpp @@ -8,8 +8,6 @@ #include "d/res/res_swtdoor.h" #include "f_op/f_op_actor_mng.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" #include "SSystem/SComponent/c_lib.h" @@ -96,18 +94,18 @@ static actor_method_class l_daSwtdoor_Method = { }; actor_process_profile_definition g_profile_SWTDOOR = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_SWTDOOR, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_SWTDOOR_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(swtdoor_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_SWTDOOR, + /* Draw Prio */ fpcDwPi_SWTDOOR_e, /* Actor SubMtd */ &l_daSwtdoor_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_syan.cpp b/src/d/actor/d_a_syan.cpp index 0fb5f0816..71145224a 100644 --- a/src/d/actor/d_a_syan.cpp +++ b/src/d/actor/d_a_syan.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_syan.h" #include "m_Do/m_Do_ext.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "d/d_s_play.h" #include "d/res/res_syan.h" @@ -239,18 +237,18 @@ static actor_method_class l_daSyan_Method = { }; actor_process_profile_definition g_profile_SYAN = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_SYAN, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_SYAN_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(syan_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_SYAN, + /* Draw Prio */ fpcDwPi_SYAN_e, /* Actor SubMtd */ &l_daSyan_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_attention.cpp b/src/d/actor/d_a_tag_attention.cpp index 7daaec157..61599cd19 100644 --- a/src/d/actor/d_a_tag_attention.cpp +++ b/src/d/actor/d_a_tag_attention.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_attention.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "f_op/f_op_actor_mng.h" #include "d/d_com_inf_game.h" @@ -110,18 +108,18 @@ static actor_method_class Mthd_Table = { }; // namespace daTagAttention actor_process_profile_definition g_profile_Tag_Attention = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0009, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Tag_Attention, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0009, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_Attention_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daTagAttention::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Tag_Attention, + /* Draw Prio */ fpcDwPi_Tag_Attention_e, /* Actor SubMtd */ &daTagAttention::Mthd_Table, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_ba1.cpp b/src/d/actor/d_a_tag_ba1.cpp index 2ef548e85..399864003 100644 --- a/src/d/actor/d_a_tag_ba1.cpp +++ b/src/d/actor/d_a_tag_ba1.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_ba1.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 000000EC-00000144 .text __ct__15daTag_Ba1_HIO_cFv */ daTag_Ba1_HIO_c::daTag_Ba1_HIO_c() { @@ -92,18 +90,18 @@ static actor_method_class l_daTag_Ba1_Method = { }; actor_process_profile_definition g_profile_TAG_BA1 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_TAG_BA1, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TAG_BA1_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daTag_Ba1_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_TAG_BA1, + /* Draw Prio */ fpcDwPi_TAG_BA1_e, /* Actor SubMtd */ &l_daTag_Ba1_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_tag_etc.cpp b/src/d/actor/d_a_tag_etc.cpp index 871baf46f..25fa697b3 100644 --- a/src/d/actor/d_a_tag_etc.cpp +++ b/src/d/actor/d_a_tag_etc.cpp @@ -7,8 +7,6 @@ #include "d/actor/d_a_tag_etc.h" #include "d/actor/d_a_npc_md.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" enum Action { ACT_WAIT, @@ -252,18 +250,18 @@ static actor_method_class l_daTag_Etc_Method = { }; actor_process_profile_definition g_profile_TAG_ETC = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_TAG_ETC, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TAG_ETC_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daTag_Etc_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_TAG_ETC, + /* Draw Prio */ fpcDwPi_TAG_ETC_e, /* Actor SubMtd */ &l_daTag_Etc_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_6_e, + /* Cull Type */ fopAc_CULLBOX_6_e, }; diff --git a/src/d/actor/d_a_tag_event.cpp b/src/d/actor/d_a_tag_event.cpp index b0604335c..1cf0dbccc 100644 --- a/src/d/actor/d_a_tag_event.cpp +++ b/src/d/actor/d_a_tag_event.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_event.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_bk.h" #include "d/actor/d_a_dr.h" @@ -562,18 +560,18 @@ static actor_method_class l_daTag_Event_Method = { }; actor_process_profile_definition g_profile_TAG_EVENT = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_TAG_EVENT, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TAG_EVENT_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daTag_Event_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_TAG_EVENT, + /* Draw Prio */ fpcDwPi_TAG_EVENT_e, /* Actor SubMtd */ &l_daTag_Event_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_6_e, + /* Cull Type */ fopAc_CULLBOX_6_e, }; diff --git a/src/d/actor/d_a_tag_evsw.cpp b/src/d/actor/d_a_tag_evsw.cpp index b83e3eef2..6236c094e 100644 --- a/src/d/actor/d_a_tag_evsw.cpp +++ b/src/d/actor/d_a_tag_evsw.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_evsw.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_com_inf_game.h" /* 00000078-000001F8 .text _create__Q29daTagEvsw5Act_cFv */ @@ -92,18 +90,18 @@ static actor_method_class Mthd_Table = { }; // namespace daTagEvsw actor_process_profile_definition g_profile_TAG_EVSW = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0002, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_TAG_EVSW, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0002, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TAG_EVSW_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daTagEvsw::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_TAG_EVSW, + /* Draw Prio */ fpcDwPi_TAG_EVSW_e, /* Actor SubMtd */ &daTagEvsw::Mthd_Table, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_tag_ghostship.cpp b/src/d/actor/d_a_tag_ghostship.cpp index b6dc6e83d..f9069210c 100644 --- a/src/d/actor/d_a_tag_ghostship.cpp +++ b/src/d/actor/d_a_tag_ghostship.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_ghostship.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" static daTag_Gship_HIO_c l_HIO; @@ -171,18 +169,18 @@ static actor_method_class daTag_GshipMethodTable = { }; actor_process_profile_definition g_profile_TAG_GSHIP = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0008, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_TAG_GSHIP, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0008, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TAG_GSHIP_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daTag_Gship_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_TAG_GSHIP, + /* Draw Prio */ fpcDwPi_TAG_GSHIP_e, /* Actor SubMtd */ &daTag_GshipMethodTable, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_4_e, + /* Cull Type */ fopAc_CULLBOX_4_e, }; diff --git a/src/d/actor/d_a_tag_hint.cpp b/src/d/actor/d_a_tag_hint.cpp index 1bbb3bce4..5ef719ea9 100644 --- a/src/d/actor/d_a_tag_hint.cpp +++ b/src/d/actor/d_a_tag_hint.cpp @@ -7,9 +7,7 @@ #include "d/actor/d_a_tag_hint.h" #include "d/actor/d_a_player.h" #include "d/actor/d_a_npc_os.h" -#include "d/d_procname.h" #include "d/d_kankyo.h" -#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "d/d_bg_s_lin_chk.h" #include "f_op/f_op_actor_mng.h" @@ -191,7 +189,7 @@ s32 daTag_Hint_c::waitTerms() { break; case 0xb: - if (dComIfGs_getItem(dItem_BOMB_10_e) != dItem_NONE_e) { + if (dComIfGs_getItem(dItemNo_BOMB_10_e) != dItemNo_NONE_e) { return 1; } break; @@ -211,7 +209,7 @@ s32 daTag_Hint_c::waitTerms() { } break; case 0x11: - if (dComIfGs_checkGetItem(dItem_POWER_BRACELETS_e)) { + if (dComIfGs_checkGetItem(dItemNo_POWER_BRACELETS_e)) { return 1; } break; @@ -304,13 +302,13 @@ s32 daTag_Hint_c::getPriority() { switch (getType()) { case 2: #if VERSION == VERSION_DEMO - uVar2 = PRIO_OVERLAP8; + uVar2 = fpcDwPi_OVERLAP8_e; #else - uVar2 = PRIO_1EA; + uVar2 = fpcDwPi_1EA_e; #endif break; default: - uVar2 = PRIO_1FF; + uVar2 = fpcDwPi_1FF_e; break; } return uVar2; @@ -379,7 +377,7 @@ void daTag_Hint_c::deleteLight() { void* findObjectCallBack(fopAc_ac_c* actor, void* v_this) { daTag_Hint_c* i_this = (daTag_Hint_c*)v_this; - if (fopAcM_GetProfName(actor) == PROC_Obj_Movebox && i_this->rangeCheck_local(&actor->home.pos)) { + if (fopAcM_GetProfName(actor) == fpcNm_Obj_Movebox_e && i_this->rangeCheck_local(&actor->home.pos)) { cXyz sp14 = actor->current.pos - actor->home.pos; if (sp14.abs2XZ() > 0.0f) { return actor; @@ -781,18 +779,18 @@ static actor_method_class l_daTag_Hint_Method = { }; actor_process_profile_definition g_profile_TAG_HINT = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_TAG_HINT, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TAG_HINT_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daTag_Hint_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_TAG_HINT, + /* Draw Prio */ fpcDwPi_TAG_HINT_e, /* Actor SubMtd */ &l_daTag_Hint_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_6_e, + /* Cull Type */ fopAc_CULLBOX_6_e, }; diff --git a/src/d/actor/d_a_tag_island.cpp b/src/d/actor/d_a_tag_island.cpp index a613af881..688b58a5e 100644 --- a/src/d/actor/d_a_tag_island.cpp +++ b/src/d/actor/d_a_tag_island.cpp @@ -8,8 +8,6 @@ #include "d/actor/d_a_obj_ikada.h" #include "d/actor/d_a_player_main.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" static fpc_ProcID l_msgId; static msg_class* l_msg; @@ -123,7 +121,7 @@ BOOL daTag_Island_c::arrivalTerms() { case 7: if (!dKy_checkEventNightStop()) return FALSE; - if (!dComIfGs_checkGetItem(dItem_BOMB_BAG_e)) + if (!dComIfGs_checkGetItem(dItemNo_BOMB_BAG_e)) return FALSE; break; } @@ -530,18 +528,18 @@ static actor_method_class l_daTag_Island_Method = { }; actor_process_profile_definition g_profile_TAG_ISLAND = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_TAG_ISLAND, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TAG_ISLAND_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daTag_Island_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_TAG_ISLAND, + /* Draw Prio */ fpcDwPi_TAG_ISLAND_e, /* Actor SubMtd */ &l_daTag_Island_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_6_e, + /* Cull Type */ fopAc_CULLBOX_6_e, }; diff --git a/src/d/actor/d_a_tag_kb_item.cpp b/src/d/actor/d_a_tag_kb_item.cpp index 4cf6d2bad..8503c593f 100644 --- a/src/d/actor/d_a_tag_kb_item.cpp +++ b/src/d/actor/d_a_tag_kb_item.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_kb_item.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 00000078-000000C8 .text _delete__13daTagKbItem_cFv */ bool daTagKbItem_c::_delete() { @@ -95,18 +93,18 @@ static actor_method_class daTagKbItemMethodTable = { }; actor_process_profile_definition g_profile_TAG_KB_ITEM = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_TAG_KB_ITEM, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TAG_KB_ITEM_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daTagKbItem_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_TAG_KB_ITEM, + /* Draw Prio */ fpcDwPi_TAG_KB_ITEM_e, /* Actor SubMtd */ &daTagKbItemMethodTable, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_tag_kf1.cpp b/src/d/actor/d_a_tag_kf1.cpp index fdec0fd82..afe70f408 100644 --- a/src/d/actor/d_a_tag_kf1.cpp +++ b/src/d/actor/d_a_tag_kf1.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_kf1.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 000000EC-00000120 .text __ct__15daTag_Kf1_HIO_cFv */ daTag_Kf1_HIO_c::daTag_Kf1_HIO_c() { @@ -177,18 +175,18 @@ static actor_method_class l_daTag_Kf1_Method = { }; actor_process_profile_definition g_profile_TAG_KF1 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_TAG_KF1, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TAG_KF1_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daTag_Kf1_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_TAG_KF1, + /* Draw Prio */ fpcDwPi_TAG_KF1_e, /* Actor SubMtd */ &l_daTag_Kf1_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_tag_kk1.cpp b/src/d/actor/d_a_tag_kk1.cpp index 4305308cd..e2dbaa909 100644 --- a/src/d/actor/d_a_tag_kk1.cpp +++ b/src/d/actor/d_a_tag_kk1.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_kk1.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" class daTag_Kk1_HIO_c : public JORReflexible { public: @@ -85,7 +83,7 @@ cPhs_State daTag_Kk1_c::_create() { fopAcM_ct(this, daTag_Kk1_c); switch(fopAcM_GetName(this)){ - case PROC_TAG_KK1: + case fpcNm_TAG_KK1_e: mNameIsWrong = false; break; default: @@ -139,18 +137,18 @@ static actor_method_class l_daTag_Kk1_Method = { }; actor_process_profile_definition g_profile_TAG_KK1 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_TAG_KK1, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TAG_KK1_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daTag_Kk1_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_TAG_KK1, + /* Draw Prio */ fpcDwPi_TAG_KK1_e, /* Actor SubMtd */ &l_daTag_Kk1_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_tag_light.cpp b/src/d/actor/d_a_tag_light.cpp index 39f3faf40..a1ed1a4c4 100644 --- a/src/d/actor/d_a_tag_light.cpp +++ b/src/d/actor/d_a_tag_light.cpp @@ -7,8 +7,6 @@ #include "d/actor/d_a_tag_light.h" #include "d/res/res_mspot.h" #include "d/d_s_play.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_kankyo.h" #include "d/d_bg_s_lin_chk.h" #include "d/d_com_inf_game.h" @@ -555,18 +553,18 @@ static actor_method_class Mthd_Table = { }; // namespace daTagLight actor_process_profile_definition g_profile_Tag_Light = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0009, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Tag_Light, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0009, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_Light_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daTagLight::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Tag_Light, + /* Draw Prio */ fpcDwPi_Tag_Light_e, /* Actor SubMtd */ &daTagLight::Mthd_Table, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_md_cb.cpp b/src/d/actor/d_a_tag_md_cb.cpp index 4c03961f1..4a9326c4a 100644 --- a/src/d/actor/d_a_tag_md_cb.cpp +++ b/src/d/actor/d_a_tag_md_cb.cpp @@ -8,8 +8,6 @@ #include "d/actor/d_a_player_main.h" #include "d/actor/d_a_npc_md.h" #include "d/actor/d_a_npc_cb1.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "f_op/f_op_actor_mng.h" static daTag_MdCb_HIO_c l_HIO; @@ -208,7 +206,7 @@ BOOL daTag_MdCb_c::messageAction(void*) { if (npc != NULL && npc->isTagCheckOK()) { s16 sVar2 = fopAcM_GetName(npc); - if (sVar2 == PROC_NPC_MD) { + if (sVar2 == fpcNm_NPC_MD_e) { daNpc_Md_c* md = (daNpc_Md_c*)npc; if (argument == 5) { @@ -222,7 +220,7 @@ BOOL daTag_MdCb_c::messageAction(void*) { m2B4 = 0; } } - } else if (sVar2 == PROC_NPC_CB1) { + } else if (sVar2 == fpcNm_NPC_CB1_e) { daNpc_Cb1_c* cb1 = (daNpc_Cb1_c*)npc; if (argument == 9) { @@ -610,7 +608,7 @@ BOOL daTag_MdCb_c::checkCondition() { uVar3 = TRUE; } } else if (argument == 10) { - if (dComIfGs_checkGetItem(dItem_HOOKSHOT_e)) { + if (dComIfGs_checkGetItem(dItemNo_HOOKSHOT_e)) { BOOL bVar5 = FALSE; u32 i; u32 iVar2; @@ -720,18 +718,18 @@ static actor_method_class l_daTag_MdCb_Method = { }; actor_process_profile_definition g_profile_TAG_MDCB = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_TAG_MDCB, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TAG_MDCB_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daTag_MdCb_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_TAG_MDCB, + /* Draw Prio */ fpcDwPi_TAG_MDCB_e, /* Actor SubMtd */ &l_daTag_MdCb_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_6_e, + /* Cull Type */ fopAc_CULLBOX_6_e, }; diff --git a/src/d/actor/d_a_tag_mk.cpp b/src/d/actor/d_a_tag_mk.cpp index ca4d346aa..ff23be06d 100644 --- a/src/d/actor/d_a_tag_mk.cpp +++ b/src/d/actor/d_a_tag_mk.cpp @@ -6,9 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_mk.h" #include "d/actor/d_a_player.h" -#include "d/d_procname.h" #include "f_op/f_op_actor_mng.h" -#include "d/d_priority.h" static fpc_ProcID l_msgId; static msg_class* l_msg; @@ -80,7 +78,7 @@ u16 daTag_Mk_c::next_msgStatus(unsigned long* arg1) { u32 daTag_Mk_c::getMsg() { u32 msg; - if (dComIfGp_event_getPreItemNo() == COTTAGE_PAPER) { + if (dComIfGp_event_getPreItemNo() == dItemNo_CABANA_DEED_e) { dComIfGs_onEventBit(dSv_event_flag_c::UNK_2D80); msg = 0x1bC0; } else { @@ -134,7 +132,7 @@ u16 daTag_Mk_c::talk() { /* 000003BC-00000470 .text setTagWpEvId__10daTag_Mk_cFv */ void daTag_Mk_c::setTagWpEvId() { - if (dComIfGs_getSelectEquip(0) != dItem_MASTER_SWORD_3_e) { + if (dComIfGs_getSelectEquip(0) != dItemNo_MASTER_SWORD_3_e) { mEventIdx = dComIfGp_evmng_getEventIdx("tagwp2"); } else if (dComIfGs_getTriforceNum() < 8) { mEventIdx = dComIfGp_evmng_getEventIdx("tagwp"); @@ -167,7 +165,7 @@ void daTag_Mk_c::demoInitMake() { csXyz local_28; local_28.set(0, 0x4000, 0); - fopAc_ac_c* a_item = fopAcM_createItemForKP2(&local_20, dItem_JOY_PENDANT_e, fopAcM_GetRoomNo(this), &local_28, NULL, 10.0f, 10.0f, -2.1f, 0); + fopAc_ac_c* a_item = fopAcM_createItemForKP2(&local_20, dItemNo_JOY_PENDANT_e, fopAcM_GetRoomNo(this), &local_28, NULL, 10.0f, 10.0f, -2.1f, 0); JUT_ASSERT(360, a_item); m2B4 = fpcM_GetID(a_item); @@ -548,18 +546,18 @@ static actor_method_class l_daTag_Mk_Method = { }; actor_process_profile_definition g_profile_TAG_MK = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_TAG_MK, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TAG_MK_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daTag_Mk_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_TAG_MK, + /* Draw Prio */ fpcDwPi_TAG_MK_e, /* Actor SubMtd */ &l_daTag_Mk_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_6_e, + /* Cull Type */ fopAc_CULLBOX_6_e, }; diff --git a/src/d/actor/d_a_tag_msg.cpp b/src/d/actor/d_a_tag_msg.cpp index 52b47c247..b3d4b7ee1 100644 --- a/src/d/actor/d_a_tag_msg.cpp +++ b/src/d/actor/d_a_tag_msg.cpp @@ -7,8 +7,6 @@ #include "d/actor/d_a_tag_msg.h" #include "d/actor/d_a_player_main.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" static fpc_ProcID l_msgId; static msg_class* l_msg; @@ -290,18 +288,18 @@ static actor_method_class l_daTag_Msg_Method = { }; actor_process_profile_definition g_profile_TAG_MSG = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_TAG_MSG, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TAG_MSG_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daTag_Msg_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_TAG_MSG, + /* Draw Prio */ fpcDwPi_TAG_MSG_e, /* Actor SubMtd */ &l_daTag_Msg_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_6_e, + /* Cull Type */ fopAc_CULLBOX_6_e, }; diff --git a/src/d/actor/d_a_tag_photo.cpp b/src/d/actor/d_a_tag_photo.cpp index 990e7c5fd..96b24d5f5 100644 --- a/src/d/actor/d_a_tag_photo.cpp +++ b/src/d/actor/d_a_tag_photo.cpp @@ -9,8 +9,6 @@ #include "d/d_a_obj.h" #include "d/d_com_inf_game.h" #include "d/d_com_lib_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "f_op/f_op_actor_mng.h" static u32 l_msg_talk[] = { @@ -405,18 +403,18 @@ static actor_method_class daTagPhotoMethodTable = { }; actor_process_profile_definition g_profile_TAG_PHOTO = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_TAG_PHOTO, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TAG_PHOTO_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daTagPhoto_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_TAG_PHOTO, + /* Draw Prio */ fpcDwPi_TAG_PHOTO_e, /* Actor SubMtd */ &daTagPhotoMethodTable, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_tag_ret.cpp b/src/d/actor/d_a_tag_ret.cpp index 6617a5cc4..5d50c8cd1 100644 --- a/src/d/actor/d_a_tag_ret.cpp +++ b/src/d/actor/d_a_tag_ret.cpp @@ -8,8 +8,6 @@ #include "d/d_item.h" #include "d/d_item_data.h" #include "d/d_cc_d.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_player_main.h" @@ -50,7 +48,7 @@ cPhs_State Act_c::_create() { fopAcM_ct(this, daTagRet::Act_c); #if VERSION > VERSION_DEMO - if (checkItemGet(dItem_PEARL_FARORE_e, TRUE)) { + if (checkItemGet(dItemNo_PEARL_FARORE_e, TRUE)) { return cPhs_STOP_e; } #endif @@ -134,18 +132,18 @@ namespace { }; // namespace daTagRet actor_process_profile_definition g_profile_Tag_Ret = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Tag_Ret, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_Ret_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daTagRet::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Tag_Ret, + /* Draw Prio */ fpcDwPi_Tag_Ret_e, /* Actor SubMtd */ &daTagRet::Mthd_Table, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_tag_so.cpp b/src/d/actor/d_a_tag_so.cpp index f809810d7..eec515290 100644 --- a/src/d/actor/d_a_tag_so.cpp +++ b/src/d/actor/d_a_tag_so.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_so.h" #include "d/d_lib.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 000000EC-0000010C .text __ct__14daTag_So_HIO_cFv */ daTag_So_HIO_c::daTag_So_HIO_c() { @@ -100,18 +98,18 @@ static actor_method_class daTag_SoMethodTable = { }; actor_process_profile_definition g_profile_TAG_SO = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0002, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_TAG_SO, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0002, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TAG_SO_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daTag_So_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_TAG_SO, + /* Draw Prio */ fpcDwPi_TAG_SO_e, /* Actor SubMtd */ &daTag_SoMethodTable, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_4_e, + /* Cull Type */ fopAc_CULLBOX_4_e, }; diff --git a/src/d/actor/d_a_tag_volcano.cpp b/src/d/actor/d_a_tag_volcano.cpp index 39e1019f1..b6ac68dfb 100644 --- a/src/d/actor/d_a_tag_volcano.cpp +++ b/src/d/actor/d_a_tag_volcano.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_volcano.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" namespace daTagvolcano { namespace { @@ -219,18 +217,18 @@ namespace daTagvolcano { } actor_process_profile_definition g_profile_Tag_Volcano = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0002, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Tag_Volcano, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0002, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_Volcano_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daTagvolcano::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Tag_Volcano, + /* Draw Prio */ fpcDwPi_Tag_Volcano_e, /* Actor SubMtd */ &daTagvolcano::Mthd_Table, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_tag_waterlevel.cpp b/src/d/actor/d_a_tag_waterlevel.cpp index 5acfb3148..6e097c783 100644 --- a/src/d/actor/d_a_tag_waterlevel.cpp +++ b/src/d/actor/d_a_tag_waterlevel.cpp @@ -7,8 +7,6 @@ #include "d/actor/d_a_tag_waterlevel.h" #include "d/d_com_inf_game.h" #include "d/d_kankyo.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "SSystem/SComponent/c_lib.h" namespace daTagWaterlevel { @@ -146,18 +144,18 @@ namespace daTagWaterlevel { }; actor_process_profile_definition g_profile_Tag_Waterlevel = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0009, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Tag_Waterlevel, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0009, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_Waterlevel_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daTagWaterlevel::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Tag_Waterlevel, + /* Draw Prio */ fpcDwPi_Tag_Waterlevel_e, /* Actor SubMtd */ &daTagWaterlevel::Mthd_Table, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_tama.cpp b/src/d/actor/d_a_tama.cpp index 757fed165..fc91cacbc 100644 --- a/src/d/actor/d_a_tama.cpp +++ b/src/d/actor/d_a_tama.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tama.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_npc.h" static dCcD_SrcSph l_sph_src = { @@ -79,7 +77,7 @@ BOOL daTama_c::_execute() { fopAc_ac_c* hitac = hitobj->GetAc(); if (hitac != NULL) { if (hitac != partner) { - if (fopAcM_GetName(hitac) == PROC_PLAYER) { + if (fopAcM_GetName(hitac) == fpcNm_PLAYER_e) { partner->field_0x6ba = 1; } } else { @@ -148,18 +146,18 @@ static actor_method_class l_daTama_Method = { }; actor_process_profile_definition g_profile_TAMA = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0009, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_TAMA, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0009, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TAMA_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daTama_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_TAMA, + /* Draw Prio */ fpcDwPi_TAMA_e, /* Actor SubMtd */ &l_daTama_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_tbox.cpp b/src/d/actor/d_a_tbox.cpp index 0ee8e5c06..153f8c0df 100644 --- a/src/d/actor/d_a_tbox.cpp +++ b/src/d/actor/d_a_tbox.cpp @@ -14,8 +14,6 @@ #include "d/d_com_inf_game.h" #include "d/d_kankyo.h" #include "d/d_particle.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_graphic.h" @@ -1279,18 +1277,18 @@ static actor_method_class l_daTbox_Method = { }; actor_process_profile_definition g_profile_TBOX = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_TBOX, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TBOX_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daTbox_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_TBOX, + /* Draw Prio */ fpcDwPi_TBOX_e, /* Actor SubMtd */ &l_daTbox_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_title.cpp b/src/d/actor/d_a_title.cpp index c8e6f9046..10d7ae131 100644 --- a/src/d/actor/d_a_title.cpp +++ b/src/d/actor/d_a_title.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_title.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "f_op/f_op_overlap_mng.h" #include "f_op/f_op_scene_mng.h" #include "m_Do/m_Do_controller_pad.h" @@ -523,7 +521,7 @@ BOOL daTitle_c::execute() { scene_class* stageProc = fopScnM_SearchByID(dStage_roomControl_c::getProcID()); JUT_ASSERT(VERSION_SELECT(0x2B1, 0x2B1, 0x2EF, 0x2EF), stageProc != NULL); - if (!m29C && fopScnM_ChangeReq(stageProc, PROC_NAME_SCENE, 0, 5)) { + if (!m29C && fopScnM_ChangeReq(stageProc, fpcNm_NAME_SCENE_e, 0, 5)) { mDoAud_seStart(JA_SE_OP_ENTER_GAME); m29C = true; } @@ -537,7 +535,7 @@ BOOL daTitle_c::execute() { JUT_ASSERT(VERSION_SELECT(0x2BD, 0x2BD, 0x2FC, 0x2FC), stageProc != NULL); if (!m29C) { - s16 procName = fpcM_GetName(stageProc) == PROC_OPENING_SCENE ? PROC_OPEN2_SCENE : PROC_TITLE_SCENE; + s16 procName = fpcM_GetName(stageProc) == fpcNm_OPENING_SCENE_e ? fpcNm_OPEN2_SCENE_e : fpcNm_TITLE_SCENE_e; fopScnM_ChangeReq(stageProc, procName, 1, 5); m29C = true; } @@ -589,18 +587,18 @@ static actor_method_class l_daTitle_Method = { }; actor_process_profile_definition g_profile_TITLE = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_TITLE, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TITLE_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daTitle_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_TITLE, + /* Draw Prio */ fpcDwPi_TITLE_e, /* Actor SubMtd */ &l_daTitle_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_tn.cpp b/src/d/actor/d_a_tn.cpp index a84a0acd3..b06b174a2 100644 --- a/src/d/actor/d_a_tn.cpp +++ b/src/d/actor/d_a_tn.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tn.h" #include "m_Do/m_Do_ext.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" /* 000000EC-00000220 .text anm_init__FP8tn_classifUcfi */ @@ -489,18 +487,18 @@ static actor_method_class l_daTn_Method = { }; actor_process_profile_definition g_profile_TN = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_TN, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TN_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(tn_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_TN, + /* Draw Prio */ fpcDwPi_TN_e, /* Actor SubMtd */ &l_daTn_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ENEMY_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_toge.cpp b/src/d/actor/d_a_toge.cpp index 8c969d330..e966b4bec 100644 --- a/src/d/actor/d_a_toge.cpp +++ b/src/d/actor/d_a_toge.cpp @@ -8,8 +8,6 @@ #include "d/res/res_htoge1.h" #include "d/actor/d_a_wind_tag.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "m_Do/m_Do_ext.h" const char daToge_c::m_arcname[] = "Htoge1"; @@ -226,7 +224,7 @@ void daToge_c::set_collision() { /* 00000A78-00000AE0 .text search_wind__8daToge_cFv */ void daToge_c::search_wind() { - fopAc_ac_c* pActor = fopAcM_SearchByName(PROC_WindTag); + fopAc_ac_c* pActor = fopAcM_SearchByName(fpcNm_WindTag_e); if (pActor != NULL) { mWindTagId = fopAcM_GetID(pActor); @@ -331,18 +329,18 @@ static actor_method_class daTogeMethodTable = { }; actor_process_profile_definition g_profile_TOGE = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_TOGE, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TOGE_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daToge_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_TOGE, + /* Draw Prio */ fpcDwPi_TOGE_e, /* Actor SubMtd */ &daTogeMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tori_flag.cpp b/src/d/actor/d_a_tori_flag.cpp index a8caa0d7b..51ca304c0 100644 --- a/src/d/actor/d_a_tori_flag.cpp +++ b/src/d/actor/d_a_tori_flag.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tori_flag.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_kankyo_wether.h" #include "m_Do/m_Do_mtx.h" #include "d/d_com_inf_game.h" @@ -233,18 +231,18 @@ static actor_method_class daTori_FlagMethodTable = { }; actor_process_profile_definition g_profile_Tori_Flag = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Tori_Flag, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tori_Flag_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daTori_Flag_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Tori_Flag, + /* Draw Prio */ fpcDwPi_Tori_Flag_e, /* Actor SubMtd */ &daTori_FlagMethodTable, /* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_4_e, + /* Cull Type */ fopAc_CULLBOX_4_e, }; diff --git a/src/d/actor/d_a_tornado.cpp b/src/d/actor/d_a_tornado.cpp index a14d102be..84710b8b9 100644 --- a/src/d/actor/d_a_tornado.cpp +++ b/src/d/actor/d_a_tornado.cpp @@ -8,8 +8,6 @@ #include "d/res/res_trnd.h" #include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_ext.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_ship.h" #include "d/d_kankyo_wether.h" @@ -348,18 +346,18 @@ static actor_method_class l_daTornado_Method = { }; actor_process_profile_definition g_profile_TORNADO = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_TORNADO, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TORNADO_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daTornado_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_TORNADO, + /* Draw Prio */ fpcDwPi_TORNADO_e, /* Actor SubMtd */ &l_daTornado_Method, /* Status */ 0x06 | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tpota.cpp b/src/d/actor/d_a_tpota.cpp index 3f56e0961..da7f11fae 100644 --- a/src/d/actor/d_a_tpota.cpp +++ b/src/d/actor/d_a_tpota.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tpota.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "JSystem/JGeometry.h" #include "d/d_particle.h" #include "JSystem/JParticle/JPAParticle.h" @@ -161,18 +159,18 @@ static actor_method_class Tpota_Mthd_Table = { }; // namespace actor_process_profile_definition g_profile_Tpota = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Tpota, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tpota_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daTpota_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Tpota, + /* Draw Prio */ fpcDwPi_Tpota_e, /* Actor SubMtd */ &Tpota_Mthd_Table, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tsubo.cpp b/src/d/actor/d_a_tsubo.cpp index 7e96d3445..7f2642204 100644 --- a/src/d/actor/d_a_tsubo.cpp +++ b/src/d/actor/d_a_tsubo.cpp @@ -21,8 +21,6 @@ #include "d/res/res_hseki.h" #include "d/res/res_ptubo.h" #include "d/res/res_kkiba_00.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_camera.h" #include "d/d_lib.h" #include "d/d_com_inf_game.h" @@ -1421,7 +1419,7 @@ bool Act_c::_delete() { void Act_c::spec_make_boko(int arg1) { M7A0* ptr = &m7A0[0]; for (s32 i = 0; i < arg1; i++, ptr++) { - ptr->m00 = fopAcM_create(PROC_BOKO, daBoko_c::Type_BOKO_STICK_e, ¤t.pos, fopAcM_GetHomeRoomNo(this)); + ptr->m00 = fopAcM_create(fpcNm_BOKO_e, daBoko_c::Type_BOKO_STICK_e, ¤t.pos, fopAcM_GetHomeRoomNo(this)); ptr->m06 = data_spec_boko(i).m00; ptr->m08 = ptr->m06; ptr->m10 = data_spec_boko(i).m04; @@ -2301,7 +2299,7 @@ bool Act_c::damage_tg_acc() { cXyz sp28 = cXyz::Zero; if (shapeAttr->GetNVec(current.pos, &sp28)) { fopAc_ac_c* pfVar7 = mCyl.GetTgHitAc(); - if (pfVar7 != NULL && fopAcM_GetProfName(pfVar7) == PROC_PLAYER) { + if (pfVar7 != NULL && fopAcM_GetProfName(pfVar7) == fpcNm_PLAYER_e) { s16 atan = cM_atan2s(sp28.x, sp28.z); if (cM_scos(pfVar7->shape_angle.y - atan) > 0.866f) { m814 = sp28 * 1.5f; @@ -2856,7 +2854,7 @@ void Act_c::set_wind_vec() { sp3C *= 45.0f; m7F4.getSquareMag(); fopAc_ac_c* pfVar4 = mCyl.GetTgHitAc(); - if (pfVar4 != NULL && fopAcM_GetProfName(pfVar4) == PROC_PLAYER) { + if (pfVar4 != NULL && fopAcM_GetProfName(pfVar4) == fpcNm_PLAYER_e) { s16 iVar5 = cM_atan2s(sp3C.x, sp3C.z); f32 cos = cM_scos(pfVar4->shape_angle.y - iVar5); if (cos > 0.866f) { @@ -3630,18 +3628,18 @@ actor_method_class Method::Table = { } // namespace daTsubo actor_process_profile_definition g_profile_TSUBO = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0008, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_TSUBO, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0008, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TSUBO_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daTsubo::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_TSUBO, + /* Draw Prio */ fpcDwPi_TSUBO_e, /* Actor SubMtd */ &daTsubo::Method::Table, /* Status */ fopAcStts_CULL_e | fopAcStts_FREEZE_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLSPHERE_CUSTOM_e, + /* Cull Type */ fopAc_CULLSPHERE_CUSTOM_e, }; diff --git a/src/d/actor/d_a_vrbox.cpp b/src/d/actor/d_a_vrbox.cpp index 49a6cc07f..c3d2aba7e 100644 --- a/src/d/actor/d_a_vrbox.cpp +++ b/src/d/actor/d_a_vrbox.cpp @@ -7,8 +7,6 @@ #include "d/actor/d_a_vrbox.h" #include "JSystem/J3DGraphBase/J3DMatBlock.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "m_Do/m_Do_mtx.h" #include "d/d_kankyo_wether.h" @@ -205,18 +203,18 @@ static actor_method_class l_daVrbox_Method = { }; actor_process_profile_definition g_profile_VRBOX = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_VRBOX, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_VRBOX_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(vrbox_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_VRBOX, + /* Draw Prio */ fpcDwPi_VRBOX_e, /* Actor SubMtd */ &l_daVrbox_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_vrbox2.cpp b/src/d/actor/d_a_vrbox2.cpp index 1406ecb9c..ad541afbc 100644 --- a/src/d/actor/d_a_vrbox2.cpp +++ b/src/d/actor/d_a_vrbox2.cpp @@ -8,8 +8,6 @@ #include "f_op/f_op_actor_mng.h" #include "f_op/f_op_camera.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_kankyo_rain.h" #include "d/d_kankyo_wether.h" #include "m_Do/m_Do_mtx.h" @@ -86,7 +84,7 @@ static BOOL daVrbox2_Draw(vrbox2_class* i_this) { return TRUE; } -J3DZModeInfo l_zmodeInfo = { GX_FALSE, GX_LEQUAL, GX_FALSE }; +static J3DZModeInfo l_zmodeInfo = { GX_FALSE, GX_LEQUAL, GX_FALSE }; /* 8015EC30-8015F368 .text daVrbox2_color_set__FP12vrbox2_class */ BOOL daVrbox2_color_set(vrbox2_class* i_this) { @@ -308,18 +306,18 @@ static actor_method_class l_daVrbox2_Method = { }; actor_process_profile_definition g_profile_VRBOX2 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_VRBOX2, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_VRBOX2_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(vrbox2_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_VRBOX2, + /* Draw Prio */ fpcDwPi_VRBOX2_e, /* Actor SubMtd */ &l_daVrbox2_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_wall.cpp b/src/d/actor/d_a_wall.cpp index 336d83be7..821fd6d03 100644 --- a/src/d/actor/d_a_wall.cpp +++ b/src/d/actor/d_a_wall.cpp @@ -10,8 +10,6 @@ #include "d/res/res_hbw2.h" #include "d/d_cc_d.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_mtx.h" @@ -352,18 +350,18 @@ static actor_method_class daWallMethodTable = { }; actor_process_profile_definition g_profile_WALL = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_WALL, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_WALL_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daWall_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_WALL, + /* Draw Prio */ fpcDwPi_WALL_e, /* Actor SubMtd */ &daWallMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_warpdm20.cpp b/src/d/actor/d_a_warpdm20.cpp index 924540ea0..a3488957e 100644 --- a/src/d/actor/d_a_warpdm20.cpp +++ b/src/d/actor/d_a_warpdm20.cpp @@ -9,8 +9,6 @@ #include "d/actor/d_a_player.h" #include "d/actor/d_a_sea.h" #include "d/res/res_gdemo20.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_bg_s_func.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" @@ -551,18 +549,18 @@ static actor_method_class daWarpdm20MethodTable = { }; actor_process_profile_definition g_profile_WARPDEMO20 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_WARPDEMO20, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_WARPDEMO20_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daWarpdm20_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_WARPDEMO20, + /* Draw Prio */ fpcDwPi_WARPDEMO20_e, /* Actor SubMtd */ &daWarpdm20MethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_warpf.cpp b/src/d/actor/d_a_warpf.cpp index c7cbf4c9d..f296351f6 100644 --- a/src/d/actor/d_a_warpf.cpp +++ b/src/d/actor/d_a_warpf.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_warpf.h" #include "d/actor/d_a_player.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_level_se.h" #include "d/d_item.h" #include "d/d_bg_s_func.h" @@ -218,13 +216,13 @@ BOOL daWarpf_c::checkEndDemo() { break; case dSv_save_c::STAGE_DRC: - if (checkItemGet(dItem_PEARL_DIN_e, TRUE)) { + if (checkItemGet(dItemNo_PEARL_DIN_e, TRUE)) { ret = TRUE; } break; case dSv_save_c::STAGE_FW: - if (checkItemGet(dItem_PEARL_FARORE_e, TRUE)) { + if (checkItemGet(dItemNo_PEARL_FARORE_e, TRUE)) { ret = TRUE; } break; @@ -237,16 +235,16 @@ BOOL daWarpf_c::checkEndDemo() { case dSv_save_c::STAGE_ET: #if VERSION == VERSION_DEMO - if (dComIfGs_checkGetItem(dItem_MASTER_SWORD_2_e)) { + if (dComIfGs_checkGetItem(dItemNo_MASTER_SWORD_2_e)) { #else - if (checkItemGet(dItem_MASTER_SWORD_2_e, TRUE)) { + if (checkItemGet(dItemNo_MASTER_SWORD_2_e, TRUE)) { #endif ret = TRUE; } break; case dSv_save_c::STAGE_WT: - if (dComIfGs_checkGetItem(dItem_MASTER_SWORD_3_e)) { + if (dComIfGs_checkGetItem(dItemNo_MASTER_SWORD_3_e)) { ret = TRUE; } break; @@ -308,7 +306,7 @@ cPhs_State daWarpf_c::_create() { seNum = JA_SE_OBJ_BOSS_TF_WARP_SUS; } - m2E8 = (dLevelSe_c*)fopKyM_fastCreate(PROC_LEVEL_SE, seNum, ¤t.pos, NULL, NULL); + m2E8 = (dLevelSe_c*)fopKyM_fastCreate(fpcNm_LEVEL_SE_e, seNum, ¤t.pos, NULL, NULL); if (m2E8 != NULL) { m2E8->seStop(); m2E8->setReverb(0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); @@ -876,18 +874,18 @@ static actor_method_class daWarpfMethodTable = { }; actor_process_profile_definition g_profile_WARPFLOWER = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_WARPFLOWER, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_WARPFLOWER_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daWarpf_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_WARPFLOWER, + /* Draw Prio */ fpcDwPi_WARPFLOWER_e, /* Actor SubMtd */ &daWarpfMethodTable, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_warpfout.cpp b/src/d/actor/d_a_warpfout.cpp index 179e48657..3b46748ef 100644 --- a/src/d/actor/d_a_warpfout.cpp +++ b/src/d/actor/d_a_warpfout.cpp @@ -7,8 +7,6 @@ #include "d/actor/d_a_warpfout.h" #include "d/d_camera.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" static daWarpfout_c::EventActionInitFunc event_init_tbl[] = { &daWarpfout_c::initWarp1, &daWarpfout_c::initWarp2, &daWarpfout_c::initWarp3, @@ -218,18 +216,18 @@ static actor_method_class daWarpfoutMethodTable = { }; actor_process_profile_definition g_profile_WARPFOUT = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_WARPFOUT, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_WARPFOUT_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daWarpfout_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_WARPFOUT, + /* Draw Prio */ fpcDwPi_WARPFOUT_e, /* Actor SubMtd */ &daWarpfoutMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_warpgn.cpp b/src/d/actor/d_a_warpgn.cpp index 21c2f41fd..f2a7d0516 100644 --- a/src/d/actor/d_a_warpgn.cpp +++ b/src/d/actor/d_a_warpgn.cpp @@ -8,8 +8,6 @@ #include "d/actor/d_a_player.h" #include "d/actor/d_a_ship.h" #include "d/d_lib.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/res/res_gmjwp.h" const char daWarpgn_c::m_arcname[] = "Gmjwp"; @@ -581,18 +579,18 @@ static actor_method_class daWarpgnMethodTable = { }; actor_process_profile_definition g_profile_WARPGANON = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_WARPGANON, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_WARPGANON_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daWarpgn_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_WARPGANON, + /* Draw Prio */ fpcDwPi_WARPGANON_e, /* Actor SubMtd */ &daWarpgnMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_warphr.cpp b/src/d/actor/d_a_warphr.cpp index d2c9b3dc6..100a3596f 100644 --- a/src/d/actor/d_a_warphr.cpp +++ b/src/d/actor/d_a_warphr.cpp @@ -8,8 +8,6 @@ #include "d/actor/d_a_player.h" #include "d/actor/d_a_ship.h" #include "d/res/res_ghrwp.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_graphic.h" @@ -504,18 +502,18 @@ static actor_method_class daWarphrMethodTable = { }; actor_process_profile_definition g_profile_WARPHYRULE = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_WARPHYRULE, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_WARPHYRULE_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daWarphr_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_WARPHYRULE, + /* Draw Prio */ fpcDwPi_WARPHYRULE_e, /* Actor SubMtd */ &daWarphrMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_warpls.cpp b/src/d/actor/d_a_warpls.cpp index d6a921ef0..641dabcf2 100644 --- a/src/d/actor/d_a_warpls.cpp +++ b/src/d/actor/d_a_warpls.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_warpls.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 00000078-000000E0 .text _delete__10daWarpls_cFv */ bool daWarpls_c::_delete() { @@ -112,18 +110,18 @@ static actor_method_class daWarplsMethodTable = { }; actor_process_profile_definition g_profile_WARPLIGHT = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_WARPLIGHT, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_WARPLIGHT_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daWarpls_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_WARPLIGHT, + /* Draw Prio */ fpcDwPi_WARPLIGHT_e, /* Actor SubMtd */ &daWarplsMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_warpmj.cpp b/src/d/actor/d_a_warpmj.cpp index fc221b4d8..1f0dd0be0 100644 --- a/src/d/actor/d_a_warpmj.cpp +++ b/src/d/actor/d_a_warpmj.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_warpmj.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 00000078-000000A8 .text _delete__10daWarpmj_cFv */ bool daWarpmj_c::_delete() { @@ -157,18 +155,18 @@ static actor_method_class daWarpmjMethodTable = { }; actor_process_profile_definition g_profile_WARPMAJYUU = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_WARPMAJYUU, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_WARPMAJYUU_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daWarpmj_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_WARPMAJYUU, + /* Draw Prio */ fpcDwPi_WARPMAJYUU_e, /* Actor SubMtd */ &daWarpmjMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_waterfall.cpp b/src/d/actor/d_a_waterfall.cpp index cca213548..0bdfeec7b 100644 --- a/src/d/actor/d_a_waterfall.cpp +++ b/src/d/actor/d_a_waterfall.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_waterfall.h" -#include "d/d_procname.h" -#include "d/d_priority.h" /* 00000078-000000F0 .text _delete__9daWfall_cFv */ bool daWfall_c::_delete() { @@ -137,18 +135,18 @@ static actor_method_class daWfallMethodTable = { }; actor_process_profile_definition g_profile_WATERFALL = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_WATERFALL, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_WATERFALL_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daWfall_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_WATERFALL, + /* Draw Prio */ fpcDwPi_WATERFALL_e, /* Actor SubMtd */ &daWfallMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_wbird.cpp b/src/d/actor/d_a_wbird.cpp index a4ce758b2..62ac5d32c 100644 --- a/src/d/actor/d_a_wbird.cpp +++ b/src/d/actor/d_a_wbird.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_wbird.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_com_inf_game.h" #include "d/d_kankyo_wether.h" #include "SSystem/SComponent/c_angle.h" @@ -225,18 +223,18 @@ static actor_method_class l_daWbird_Method = { }; actor_process_profile_definition g_profile_WBIRD = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_WBIRD, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_WBIRD_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daWbird_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_WBIRD, + /* Draw Prio */ fpcDwPi_WBIRD_e, /* Actor SubMtd */ &l_daWbird_Method, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_6_e, + /* Cull Type */ fopAc_CULLBOX_6_e, }; diff --git a/src/d/actor/d_a_wind_tag.cpp b/src/d/actor/d_a_wind_tag.cpp index fe216c01b..7cdb3df3c 100644 --- a/src/d/actor/d_a_wind_tag.cpp +++ b/src/d/actor/d_a_wind_tag.cpp @@ -15,12 +15,10 @@ #include "d/d_com_inf_game.h" #include "d/d_level_se.h" #include "d/d_path.h" -#include "d/d_procname.h" -#include "d/d_priority.h" namespace daWindTag { -dCcD_SrcCps l_cps_src = { +static dCcD_SrcCps l_cps_src = { // dCcD_SrcGObjInf { /* Flags */ 0, @@ -177,7 +175,7 @@ void daWindTag_c::CreateInit() { if (checkSizeSpecialBig()) { seNum = JA_SE_OBJ_WIND_TAG_L; } - mLevelSeID = fopKyM_create(PROC_LEVEL_SE, seNum, &eyePos); + mLevelSeID = fopKyM_create(fpcNm_LEVEL_SE_e, seNum, &eyePos); mpEmitter = NULL; cXyz efScale(scale.x, scale.x, scale.x); if (field_0x57f) { @@ -495,18 +493,18 @@ static actor_method_class daWindTagMethodTable = { }; actor_process_profile_definition g_profile_WindTag = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_WindTag, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_WindTag_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daWindTag::daWindTag_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_WindTag, + /* Draw Prio */ fpcDwPi_WindTag_e, /* Actor SubMtd */ &daWindTagMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_windmill.cpp b/src/d/actor/d_a_windmill.cpp index 8659dd9cf..5ba9a2fda 100644 --- a/src/d/actor/d_a_windmill.cpp +++ b/src/d/actor/d_a_windmill.cpp @@ -10,8 +10,6 @@ #include "d/res/res_hpu2.h" #include "m_Do/m_Do_ext.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" #include "d/d_bg_s_movebg_actor.h" @@ -261,7 +259,7 @@ static BOOL nodeCallBack(J3DNode* node, int calcTiming) { /* 00000608-00000670 .text search_wind__12daWindMill_cFv */ void daWindMill_c::search_wind() { - fopAc_ac_c* windTag = fopAcM_SearchByName(PROC_WindTag); + fopAc_ac_c* windTag = fopAcM_SearchByName(fpcNm_WindTag_e); if (windTag != NULL) mWindTagId = fopAcM_GetID(windTag); else @@ -500,18 +498,18 @@ static actor_method_class daWindMillMethodTable = { }; actor_process_profile_definition g_profile_WINDMILL = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_WINDMILL, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_WINDMILL_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daWindMill_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_WINDMILL, + /* Draw Prio */ fpcDwPi_WINDMILL_e, /* Actor SubMtd */ &daWindMillMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_wz.cpp b/src/d/actor/d_a_wz.cpp index 47ce83a4e..da85ef510 100644 --- a/src/d/actor/d_a_wz.cpp +++ b/src/d/actor/d_a_wz.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_wz.h" #include "m_Do/m_Do_ext.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_cc_d.h" /* 00000078-00000140 .text nodeCallBack__FP7J3DNodei */ @@ -211,18 +209,18 @@ static actor_method_class l_daWZ_Method = { }; actor_process_profile_definition g_profile_WZ = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_WZ, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_WZ_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(wz_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_WZ, + /* Draw Prio */ fpcDwPi_WZ_e, /* Actor SubMtd */ &l_daWZ_Method, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ENEMY_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_ygcwp.cpp b/src/d/actor/d_a_ygcwp.cpp index fdb2fd16c..e5bf46be4 100644 --- a/src/d/actor/d_a_ygcwp.cpp +++ b/src/d/actor/d_a_ygcwp.cpp @@ -8,8 +8,6 @@ #include "d/actor/d_a_player.h" #include "d/res/res_ygcwp.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" -#include "d/d_priority.h" enum { EVENT_WARP_START, @@ -240,18 +238,18 @@ static actor_method_class Ygcwp_Mthd_Table = { }; // namespace actor_process_profile_definition g_profile_Ygcwp = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0003, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Ygcwp, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0003, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Ygcwp_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daYgcwp_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Ygcwp, + /* Draw Prio */ fpcDwPi_Ygcwp_e, /* Actor SubMtd */ &Ygcwp_Mthd_Table, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_CUSTOM_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_ykgr.cpp b/src/d/actor/d_a_ykgr.cpp index 46f627fe4..18cb1f040 100644 --- a/src/d/actor/d_a_ykgr.cpp +++ b/src/d/actor/d_a_ykgr.cpp @@ -6,8 +6,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_ykgr.h" #include "d/actor/d_a_player.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/d_path.h" #include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_hostIO.h" @@ -278,18 +276,18 @@ static actor_method_class daYkgrMethodTable = { }; actor_process_profile_definition g_profile_Ykgr = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Ykgr, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Ykgr_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daYkgr_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Ykgr, + /* Draw Prio */ fpcDwPi_Ykgr_e, /* Actor SubMtd */ &daYkgrMethodTable, /* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_yougan.cpp b/src/d/actor/d_a_yougan.cpp index e34b1db77..76f693965 100644 --- a/src/d/actor/d_a_yougan.cpp +++ b/src/d/actor/d_a_yougan.cpp @@ -5,8 +5,6 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_yougan.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "d/res/res_yougan.h" #include "m_Do/m_Do_lib.h" @@ -244,18 +242,18 @@ static actor_method_class l_daYougan_Method = { }; actor_process_profile_definition g_profile_YOUGAN = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_YOUGAN, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_YOUGAN_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daYougan_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_YOUGAN, + /* Draw Prio */ fpcDwPi_YOUGAN_e, /* Actor SubMtd */ &l_daYougan_Method, /* Status */ fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/d_a_obj.cpp b/src/d/d_a_obj.cpp index 8ad9caa1e..eb5bcd21a 100644 --- a/src/d/d_a_obj.cpp +++ b/src/d/d_a_obj.cpp @@ -10,7 +10,6 @@ #include "d/d_bg_s_gnd_chk.h" #include "d/d_com_inf_game.h" #include "d/d_lib.h" -#include "d/d_procname.h" #include "d/d_kankyo_wether.h" #include "d/d_path.h" #include "JSystem/JParticle/JPAEmitter.h" @@ -287,7 +286,7 @@ void HitSeStart(const cXyz* i_sePos, int i_roomNo, const dCcD_GObjInf* i_CcObj, } else if (hit_obj->ChkAtType(AT_TYPE_HOOKSHOT)) { sfx = JA_SE_LK_HS_REBOUND; } else { - if (fopAcM_GetProfName(hit_actor) == PROC_PLAYER) { + if (fopAcM_GetProfName(hit_actor) == fpcNm_PLAYER_e) { daPy_py_c* sp14 = (daPy_py_c*)hit_actor; if (sp14->checkMasterSwordEquip()) { master_sword_hit = true; diff --git a/src/d/d_a_race_item_static.cpp b/src/d/d_a_race_item_static.cpp index 0c5f30cb8..2d1cc5ad6 100644 --- a/src/d/d_a_race_item_static.cpp +++ b/src/d/d_a_race_item_static.cpp @@ -26,31 +26,31 @@ void daRaceItem_c::raceItemForceGet() { /* 80068AA4-80068D48 .text raceItemGet__12daRaceItem_cFv */ void daRaceItem_c::raceItemGet() { switch(m_itemNo) { - case dItem_GREEN_RUPEE_e: + case dItemNo_GREEN_RUPEE_e: mDoAud_seStart(JA_SE_LUPY_GET); dComIfGp_plusMiniGameRupee(1); break; - case dItem_BLUE_RUPEE_e: + case dItemNo_BLUE_RUPEE_e: mDoAud_seStart(JA_SE_BLUE_LUPY_GET); dComIfGp_plusMiniGameRupee(5); break; - case dItem_YELLOW_RUPEE_e: + case dItemNo_YELLOW_RUPEE_e: mDoAud_seStart(JA_SE_LUPY_GET); dComIfGp_plusMiniGameRupee(10); break; - case dItem_RED_RUPEE_e: + case dItemNo_RED_RUPEE_e: mDoAud_seStart(JA_SE_RED_LUPY_GET); dComIfGp_plusMiniGameRupee(20); break; - case dItem_PURPLE_RUPEE_e: + case dItemNo_PURPLE_RUPEE_e: mDoAud_seStart(JA_SE_LUPY_GET); dComIfGp_plusMiniGameRupee(50); break; - case dItem_ORANGE_RUPEE_e: + case dItemNo_ORANGE_RUPEE_e: mDoAud_seStart(JA_SE_LUPY_GET); dComIfGp_plusMiniGameRupee(100); break; - case dItem_SILVER_RUPEE_e: + case dItemNo_SILVER_RUPEE_e: mDoAud_seStart(JA_SE_LUPY_GET); dComIfGp_plusMiniGameRupee(200); break; @@ -66,43 +66,43 @@ void daRaceItem_c::normalItemGet() { } switch(m_itemNo) { - case dItem_GREEN_RUPEE_e: + case dItemNo_GREEN_RUPEE_e: mDoAud_seStart(JA_SE_LUPY_GET); break; - case dItem_BLUE_RUPEE_e: + case dItemNo_BLUE_RUPEE_e: mDoAud_seStart(JA_SE_BLUE_LUPY_GET); break; - case dItem_YELLOW_RUPEE_e: + case dItemNo_YELLOW_RUPEE_e: mDoAud_seStart(JA_SE_RED_LUPY_GET); break; - case dItem_RED_RUPEE_e: + case dItemNo_RED_RUPEE_e: mDoAud_seStart(JA_SE_RED_LUPY_GET); break; - case dItem_PURPLE_RUPEE_e: + case dItemNo_PURPLE_RUPEE_e: mDoAud_seStart(JA_SE_RED_LUPY_GET); break; - case dItem_ORANGE_RUPEE_e: + case dItemNo_ORANGE_RUPEE_e: mDoAud_seStart(JA_SE_RED_LUPY_GET); break; - case dItem_SILVER_RUPEE_e: + case dItemNo_SILVER_RUPEE_e: mDoAud_seStart(JA_SE_RED_LUPY_GET); break; - case dItem_SMALL_MAGIC_e: + case dItemNo_SMALL_MAGIC_e: mDoAud_seStart(JA_SE_MAGIC_POT_GET_S); break; - case dItem_LARGE_MAGIC_e: + case dItemNo_LARGE_MAGIC_e: mDoAud_seStart(JA_SE_MAGIC_POT_GET_L); break; - 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 dItemNo_BOMB_5_e: + case dItemNo_BOMB_10_e: + case dItemNo_BOMB_20_e: + case dItemNo_BOMB_30_e: + case dItemNo_ARROW_10_e: + case dItemNo_ARROW_20_e: + case dItemNo_ARROW_30_e: mDoAud_seStart(JA_SE_CONSUMP_ITEM_GET); break; - case dItem_TRIPLE_HEART_e: + case dItemNo_TRIPLE_HEART_e: mDoAud_seStart(JA_SE_HEART_PIECE); break; } diff --git a/src/d/d_a_shop_item_static.cpp b/src/d/d_a_shop_item_static.cpp index a95109e37..cbe1ce01b 100644 --- a/src/d/d_a_shop_item_static.cpp +++ b/src/d/d_a_shop_item_static.cpp @@ -540,7 +540,7 @@ cXyz* daShopItem_c::getPosP() { /* 80068A08-80068A58 .text getCenter__12daShopItem_cFv */ cXyz daShopItem_c::getCenter() { f32 height; - if(FLOWER_1 <= m_itemNo && m_itemNo <= PRESIDENT_STATUE) { + if(dItemNo_TOWN_FLOWER_e <= m_itemNo && m_itemNo <= dItemNo_SHOP_GURU_STATUE_e) { height = 80.0f; } else { diff --git a/src/d/d_attention.cpp b/src/d/d_attention.cpp index 32321a215..bd8420dd3 100644 --- a/src/d/d_attention.cpp +++ b/src/d/d_attention.cpp @@ -5,7 +5,6 @@ #include "d/dolzel.h" // IWYU pragma: keep #include "d/d_attention.h" -#include "d/d_procname.h" #include "d/actor/d_a_player_main.h" #include "d/d_s_play.h" #include "SSystem/SComponent/c_angle.h" @@ -613,7 +612,7 @@ f32 dAttention_c::EnemyDistance(fopAc_ac_c* actor) { if (actor == mpPlayer || mpPlayer == NULL) return -1.0f; - if (fopAcM_GetProfName(actor) == PROC_PLAYER) + if (fopAcM_GetProfName(actor) == fpcNm_PLAYER_e) return -1.0f; if (!(actor->attention_info.flags & fopAc_Attn_LOCKON_BATTLE_e) && !(actor->attention_info.flags & fopAc_Attn_ENEMYFLAG_NOLOCKON_e)) @@ -1105,7 +1104,7 @@ fopAc_ac_c* dAttCatch_c::convPId(fpc_ProcID i_procID) { /* 8009FBBC-8009FBDC .text init__11dAttCatch_cFv */ void dAttCatch_c::init() { - mCatchItemNo = dItem_WATER_BOTTLE_e; + mCatchItemNo = dItemNo_WATER_BOTTLE_e; mRequestActorID = fpcM_ERROR_PROCESS_ID_e; mCatghTargetID = fpcM_ERROR_PROCESS_ID_e; field_0x4 = 3; @@ -1117,7 +1116,7 @@ void dAttCatch_c::proc() { mChangeItem = mCatchItemNo; mRequestActorID = fpcM_ERROR_PROCESS_ID_e; field_0x4 = 3; - mCatchItemNo = dItem_WATER_BOTTLE_e; + mCatchItemNo = dItemNo_WATER_BOTTLE_e; } diff --git a/src/d/d_boss_magma.cpp b/src/d/d_boss_magma.cpp index d8221acf4..af236afbf 100644 --- a/src/d/d_boss_magma.cpp +++ b/src/d/d_boss_magma.cpp @@ -7,7 +7,6 @@ #include "d/d_magma.h" #include "d/actor/d_a_btd.h" #include "d/d_s_play.h" -#include "d/d_procname.h" static btd_class* btd = NULL; @@ -51,7 +50,7 @@ void dMagma_ballBoss_c::update() { /* 80076D50-80076D9C .text b_a_sub__FPvPv */ void* b_a_sub(void* param_1, void* param_2) { - if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_BTD) { + if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == fpcNm_BTD_e) { return param_1; } return NULL; diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp index 44b2b3fd0..b0ef6af30 100644 --- a/src/d/d_camera.cpp +++ b/src/d/d_camera.cpp @@ -21,7 +21,6 @@ #include "f_ap/f_ap_game.h" #include "d/actor/d_a_npc_md.h" #include "d/actor/d_a_npc_kamome.h" -#include "d/d_procname.h" #include "d/d_demo.h" #include "d/actor/d_a_sea.h" #include "m_Do/m_Do_lib.h" @@ -43,7 +42,7 @@ namespace { } inline static bool is_player(fopAc_ac_c* actor) { - return fopAcM_GetName(actor) == PROC_PLAYER; + return fopAcM_GetName(actor) == fpcNm_PLAYER_e; } inline static bool isPlayerGuarding(u32 param_0) { @@ -1131,7 +1130,7 @@ int dCamera_c::nextMode(s32 i_curMode) { clrFlag(0x4000000); } - if (mLockOnActorId != fpcM_ERROR_PROCESS_ID_e && mpLockonActor && fopAcM_GetName(mpLockonActor) == PROC_NPC_MD) { + if (mLockOnActorId != fpcM_ERROR_PROCESS_ID_e && mpLockonActor && fopAcM_GetName(mpLockonActor) == fpcNm_NPC_MD_e) { m144 = 1; i_curMode = 0; } @@ -2121,7 +2120,7 @@ bool dCamera_c::bumpCheck(u32 i_flags) { fopAc_ac_c* grab_actor = fopAcM_SearchByID(grab_actor_id); if (grab_actor != NULL) { s16 proc_name = fopAcM_GetName(grab_actor); - if (proc_name == PROC_TSUBO) { + if (proc_name == fpcNm_TSUBO_e) { switch (daObj::PrmAbstract(grab_actor, daTsubo::Act_c::PRM_TYPE_W, daTsubo::Act_c::PRM_TYPE_S)) { case 1: case 2: @@ -2140,10 +2139,10 @@ bool dCamera_c::bumpCheck(u32 i_flags) { break; } } - else if (proc_name == PROC_NPC_MD) { + else if (proc_name == fpcNm_NPC_MD_e) { wall_up_distance = 130.0f; } - else if (proc_name == PROC_Obj_Try) { + else if (proc_name == fpcNm_Obj_Try_e) { wall_up_distance = 200.0f; } else { @@ -2538,7 +2537,7 @@ void dCamera_c::checkGroundInfo() { m320 = m32C - pos; m338 = m33A - angle; - if (fopAcM_GetName(m33C) == PROC_Obj_Pirateship) { + if (fopAcM_GetName(m33C) == fpcNm_Obj_Pirateship_e) { mViewCache.mCenter.y += m320.y * mCamSetup.mManualStartCThreshold; } } @@ -3425,7 +3424,7 @@ bool dCamera_c::lockonCamera(s32 param_1) { cXyz local_f0 = attentionPos(mpLockonTarget); cXyz local_fc = attentionPos(mpPlayerActor); - if (fopAcM_GetName(mpLockonTarget) == PROC_BDK) { + if (fopAcM_GetName(mpLockonTarget) == fpcNm_BDK_e) { local_f0.x = positionOf(mpLockonTarget).x; local_f0.z = positionOf(mpLockonTarget).z; } diff --git a/src/d/d_cc_uty.cpp b/src/d/d_cc_uty.cpp index 0aea321db..a0be56ab3 100644 --- a/src/d/d_cc_uty.cpp +++ b/src/d/d_cc_uty.cpp @@ -9,7 +9,6 @@ #include "d/actor/d_a_bomb.h" #include "d/actor/d_a_tsubo.h" #include "d/actor/d_a_mt.h" -#include "d/d_procname.h" #include "d/d_s_play.h" /* 800AE938-800AE9E8 .text cc_pl_cut_bit_get__Fv */ @@ -112,7 +111,7 @@ fopAc_ac_c* at_power_check(CcAtInfo* atInfo) { if (atInfo->mpActor) { atInfo->mDamage = atInfo->mpObj->GetAtAtp(); - if (fopAcM_GetName(atInfo->mpActor) == PROC_PLAYER) { + if (fopAcM_GetName(atInfo->mpActor) == fpcNm_PLAYER_e) { if (atInfo->mpObj->ChkAtType(AT_TYPE_SKULL_HAMMER)) { atInfo->mResultingAttackType = 0x9; } else { @@ -133,7 +132,7 @@ fopAc_ac_c* at_power_check(CcAtInfo* atInfo) { atInfo->mHitSoundId = 0; } } - } else if (fopAcM_GetName(atInfo->mpActor) == PROC_BOMB) { + } else if (fopAcM_GetName(atInfo->mpActor) == fpcNm_BOMB_e) { daBomb_c* bomb = (daBomb_c*)atInfo->mpActor; if (bomb->chk_state(daBomb_c::STATE_8)) { atInfo->mResultingAttackType = 0xD; @@ -141,39 +140,39 @@ fopAc_ac_c* at_power_check(CcAtInfo* atInfo) { atInfo->mResultingAttackType = 0x2; } atInfo->mPlCutBit = 0x200; - } else if (fopAcM_GetName(atInfo->mpActor) == PROC_Bomb2) { + } else if (fopAcM_GetName(atInfo->mpActor) == fpcNm_Bomb2_e) { atInfo->mResultingAttackType = 0x2; atInfo->mPlCutBit = 0x200; - } else if (fopAcM_GetName(atInfo->mpActor) == PROC_HIMO2) { + } else if (fopAcM_GetName(atInfo->mpActor) == fpcNm_HIMO2_e) { atInfo->mResultingAttackType = 0xE; atInfo->mPlCutBit = 0x400; - } else if (fopAcM_GetName(atInfo->mpActor) == PROC_BOOMERANG) { + } else if (fopAcM_GetName(atInfo->mpActor) == fpcNm_BOOMERANG_e) { atInfo->mResultingAttackType = 0xA; atInfo->mPlCutBit = 0x800; - } else if (fopAcM_GetName(atInfo->mpActor) == PROC_ARROW) { + } else if (fopAcM_GetName(atInfo->mpActor) == fpcNm_ARROW_e) { atInfo->mPlCutBit = 0x1000; - } else if (fopAcM_GetName(atInfo->mpActor) == PROC_BDK) { + } else if (fopAcM_GetName(atInfo->mpActor) == fpcNm_BDK_e) { atInfo->mResultingAttackType = 0xB; - } else if (fopAcM_GetName(atInfo->mpActor) == PROC_TSUBO) { + } else if (fopAcM_GetName(atInfo->mpActor) == fpcNm_TSUBO_e) { daTsubo::Act_c* tsubo = (daTsubo::Act_c*)atInfo->mpActor; if (tsubo->prm_get_type() == daTsubo::Act_c::TYPE_WATER_JUG) { atInfo->mResultingAttackType = 0x4; } else { atInfo->mResultingAttackType = 0x3; } - } else if (fopAcM_GetName(atInfo->mpActor) == PROC_MO2) { + } else if (fopAcM_GetName(atInfo->mpActor) == fpcNm_MO2_e) { atInfo->mResultingAttackType = 0x7; if (atInfo->mDamage > 2) { atInfo->mDamage = 2; } - } else if (fopAcM_GetName(atInfo->mpActor) == PROC_MT) { + } else if (fopAcM_GetName(atInfo->mpActor) == fpcNm_MT_e) { atInfo->mResultingAttackType = 0x6; atInfo->mDamage = 4; } } atInfo->mbDead = false; - if (fopAcM_GetName(atInfo->mpActor) == PROC_PLAYER) { + if (fopAcM_GetName(atInfo->mpActor) == fpcNm_PLAYER_e) { dCcD_GObjInf* gObjInf = dCcD_GetGObjInf(atInfo->mpObj); if (gObjInf->GetAtSpl() == dCcG_At_Spl_UNK1) { atInfo->mbDead = true; @@ -213,7 +212,7 @@ fopAc_ac_c* cc_at_check(fopAc_ac_c* tgActor, CcAtInfo* atInfo) { } } - if (fopAcM_GetName(atInfo->mpActor) == PROC_HIMO2 && tgActor->stealItemLeft != 0) { + if (fopAcM_GetName(atInfo->mpActor) == fpcNm_HIMO2_e && tgActor->stealItemLeft != 0) { tgActor->stealItemLeft--; fopAcM_createStealItem(&tgActor->current.pos, tgActor->itemTableIdx, fopAcM_GetRoomNo(tgActor), NULL, tgActor->stealItemBitNo); tgActor->stealItemBitNo++; @@ -241,7 +240,7 @@ fopAc_ac_c* cc_at_check(fopAc_ac_c* tgActor, CcAtInfo* atInfo) { dComIfGp_particle_set(dPa_name::ID_AK_JN_OK, atInfo->pParticlePos, &angle, &scale); } } else { - u32 r29 = fopAcM_GetName(tgActor) == PROC_ST ? 0x33 : 0x20; + u32 r29 = fopAcM_GetName(tgActor) == fpcNm_ST_e ? 0x33 : 0x20; if (atInfo->mbDead) { fopAcM_seStart(tgActor, at_se_getC(atInfo->mpObj), r29); if (atInfo->mResultingAttackType == 9) { @@ -250,7 +249,7 @@ fopAc_ac_c* cc_at_check(fopAc_ac_c* tgActor, CcAtInfo* atInfo) { pauseTime = 4 + REG0_S(6); } } else { - if (fopAcM_GetName(tgActor) == PROC_MT) { + if (fopAcM_GetName(tgActor) == fpcNm_MT_e) { mt_class* mt = (mt_class*)tgActor; if (mt->m454 == 2) { fopAcM_seStart(tgActor, JA_SE_OBJ_MG_BALL_DMG, 0); diff --git a/src/d/d_com_inf_game.cpp b/src/d/d_com_inf_game.cpp index 7f4f77ebd..b9a6373c5 100644 --- a/src/d/d_com_inf_game.cpp +++ b/src/d/d_com_inf_game.cpp @@ -16,7 +16,6 @@ #include "d/d_item_data.h" #include "d/d_magma.h" #include "d/d_particle.h" -#include "d/d_procname.h" #include "d/d_tree.h" #include "d/d_wood.h" #include "f_op/f_op_scene_mng.h" @@ -126,7 +125,7 @@ void dComIfG_play_c::itemInit() { mDirection = 0; mButtonMode = 0; - if (dComIfGs_checkGetItem(dItem_TELESCOPE_e)) { + if (dComIfGs_checkGetItem(dItemNo_TELESCOPE_e)) { mButtonInfo[0] = 0; } else { mButtonInfo[0] = 0x15; @@ -480,7 +479,7 @@ void dComIfG_inf_c::ct() { /* 800531A8-8005326C .text dComIfG_changeOpeningScene__FP11scene_classs */ int dComIfG_changeOpeningScene(scene_class* i_scene, s16 i_procName) { #if VERSION == VERSION_DEMO - if (!fopScnM_ChangeReq(i_scene, i_procName, PROC_OVERLAP0, 30)) { + if (!fopScnM_ChangeReq(i_scene, i_procName, fpcNm_OVERLAP0_e, 30)) { return FALSE; } #endif @@ -493,7 +492,7 @@ int dComIfG_changeOpeningScene(scene_class* i_scene, s16 i_procName) { #if VERSION > VERSION_DEMO dComIfGs_setRestartRoomParam(0); - fopScnM_ChangeReq(i_scene, i_procName, PROC_OVERLAP0, 30); + fopScnM_ChangeReq(i_scene, i_procName, fpcNm_OVERLAP0_e, 30); fopScnM_ReRequest(i_procName, 0); #endif @@ -742,97 +741,97 @@ u8 dComIfGs_checkGetItem(u8 i_itemNo) { u8 get_item = 0; switch (i_itemNo) { - case TACT_SONG1: + case dItemNo_WINDS_REQUIEM_e: if (dComIfGs_isTact(0)) { get_item = 1; } break; - case TACT_SONG2: + case dItemNo_BALLAD_OF_GALES_e: if (dComIfGs_isTact(1)) { get_item = 1; } break; - case TACT_SONG3: + case dItemNo_COMMAND_MELODY_e: if (dComIfGs_isTact(2)) { get_item = 1; } break; - case TACT_SONG4: + case dItemNo_EARTH_GODS_LYRIC_e: if (dComIfGs_isTact(3)) { get_item = 1; } break; - case TACT_SONG5: + case dItemNo_WIND_GODS_ARIA_e: if (dComIfGs_isTact(4)) { get_item = 1; } break; - case TACT_SONG6: + case dItemNo_SONG_OF_PASSING_e: if (dComIfGs_isTact(5)) { get_item = 1; } break; - case dItem_TRIFORCE1_e: + case dItemNo_TRIFORCE1_e: if (dComIfGs_isTriforce(0)) { get_item = 1; } break; - case dItem_TRIFORCE2_e: + case dItemNo_TRIFORCE2_e: if (dComIfGs_isTriforce(1)) { get_item = 1; } break; - case dItem_TRIFORCE3_e: + case dItemNo_TRIFORCE3_e: if (dComIfGs_isTriforce(2)) { get_item = 1; } break; - case dItem_TRIFORCE4_e: + case dItemNo_TRIFORCE4_e: if (dComIfGs_isTriforce(3)) { get_item = 1; } break; - case dItem_TRIFORCE5_e: + case dItemNo_TRIFORCE5_e: if (dComIfGs_isTriforce(4)) { get_item = 1; } break; - case dItem_TRIFORCE6_e: + case dItemNo_TRIFORCE6_e: if (dComIfGs_isTriforce(5)) { get_item = 1; } break; - case dItem_TRIFORCE7_e: + case dItemNo_TRIFORCE7_e: if (dComIfGs_isTriforce(6)) { get_item = 1; } break; - case dItem_TRIFORCE8_e: + case dItemNo_TRIFORCE8_e: if (dComIfGs_isTriforce(7)) { get_item = 1; } break; - case dItem_PEARL_NAYRU_e: + case dItemNo_PEARL_NAYRU_e: if (dComIfGs_isSymbol(0)) { get_item = 1; } break; - case dItem_PEARL_DIN_e: + case dItemNo_PEARL_DIN_e: if (dComIfGs_isSymbol(1)) { get_item = 1; } break; - case dItem_PEARL_FARORE_e: + case dItemNo_PEARL_FARORE_e: if (dComIfGs_isSymbol(2)) { get_item = 1; } break; - case dItem_PIRATES_CHARM_e: + case dItemNo_PIRATES_CHARM_e: if (dComIfGs_isCollect(3, 0)) { get_item = 1; } break; - case dItem_HEROS_CHARM_e: + case dItemNo_HEROS_CHARM_e: if (dComIfGs_isCollect(4, 0)) { get_item = 1; } @@ -850,8 +849,8 @@ u8 dComIfGs_checkGetItem(u8 i_itemNo) { } } - if (i_itemNo >= 0xBF && i_itemNo <= dItem_NONE_e - 1 && - dComIfGs_isGetCollectMap(dItem_NONE_e - i_itemNo)) + if (i_itemNo >= 0xBF && i_itemNo <= dItemNo_NONE_e - 1 && + dComIfGs_isGetCollectMap(dItemNo_NONE_e - i_itemNo)) { get_item++; } @@ -866,163 +865,163 @@ u8 dComIfGs_checkGetItemNum(u8 i_itemNo) { u8 get_item = 0; switch (i_itemNo) { - case TACT_SONG1: + case dItemNo_WINDS_REQUIEM_e: if (dComIfGs_isTact(0)) { get_item = 1; } break; - case TACT_SONG2: + case dItemNo_BALLAD_OF_GALES_e: if (dComIfGs_isTact(1)) { get_item = 1; } break; - case TACT_SONG3: + case dItemNo_COMMAND_MELODY_e: if (dComIfGs_isTact(2)) { get_item = 1; } break; - case TACT_SONG4: + case dItemNo_EARTH_GODS_LYRIC_e: if (dComIfGs_isTact(3)) { get_item = 1; } break; - case TACT_SONG5: + case dItemNo_WIND_GODS_ARIA_e: if (dComIfGs_isTact(4)) { get_item = 1; } break; - case TACT_SONG6: + case dItemNo_SONG_OF_PASSING_e: if (dComIfGs_isTact(5)) { get_item = 1; } break; - case dItem_TRIFORCE1_e: + case dItemNo_TRIFORCE1_e: if (dComIfGs_isTriforce(0)) { get_item = 1; } break; - case dItem_TRIFORCE2_e: + case dItemNo_TRIFORCE2_e: if (dComIfGs_isTriforce(1)) { get_item = 1; } break; - case dItem_TRIFORCE3_e: + case dItemNo_TRIFORCE3_e: if (dComIfGs_isTriforce(2)) { get_item = 1; } break; - case dItem_TRIFORCE4_e: + case dItemNo_TRIFORCE4_e: if (dComIfGs_isTriforce(3)) { get_item = 1; } break; - case dItem_TRIFORCE5_e: + case dItemNo_TRIFORCE5_e: if (dComIfGs_isTriforce(4)) { get_item = 1; } break; - case dItem_TRIFORCE6_e: + case dItemNo_TRIFORCE6_e: if (dComIfGs_isTriforce(5)) { get_item = 1; } break; - case dItem_TRIFORCE7_e: + case dItemNo_TRIFORCE7_e: if (dComIfGs_isTriforce(6)) { get_item = 1; } break; - case dItem_TRIFORCE8_e: + case dItemNo_TRIFORCE8_e: if (dComIfGs_isTriforce(7)) { get_item = 1; } break; - case dItem_PEARL_NAYRU_e: + case dItemNo_PEARL_NAYRU_e: if (dComIfGs_isSymbol(0)) { get_item = 1; } break; - case dItem_PEARL_DIN_e: + case dItemNo_PEARL_DIN_e: if (dComIfGs_isSymbol(1)) { get_item = 1; } break; - case dItem_PEARL_FARORE_e: + case dItemNo_PEARL_FARORE_e: if (dComIfGs_isSymbol(2)) { get_item = 1; } break; - case dItem_PIRATES_CHARM_e: + case dItemNo_PIRATES_CHARM_e: if (dComIfGs_isCollect(3, 0)) { get_item = 1; } break; - case dItem_HEROS_CHARM_e: + case dItemNo_HEROS_CHARM_e: if (dComIfGs_isCollect(4, 0)) { get_item = 1; } break; - case dItem_BOW_e: - if (dComIfGs_getItem(dInvSlot_BOW_e) != dItem_HEART_e) { // Bug? + case dItemNo_BOW_e: + if (dComIfGs_getItem(dInvSlot_BOW_e) != dItemNo_HEART_e) { // Bug? get_item = dComIfGs_getArrowNum(); } break; - case dItem_BOMB_BAG_e: - if (dComIfGs_getItem(dInvSlot_BOMB_e) != dItem_HEART_e) { // Bug? + case dItemNo_BOMB_BAG_e: + if (dComIfGs_getItem(dInvSlot_BOMB_e) != dItemNo_HEART_e) { // Bug? get_item = dComIfGs_getBombNum(); } break; - case dItem_SKULL_NECKLACE_e: + case dItemNo_SKULL_NECKLACE_e: for (int beastIdx = 0; beastIdx < dBeastIdx_COUNT_e; beastIdx++) { - if (dComIfGs_getBeast(beastIdx) == dItem_SKULL_NECKLACE_e) { + if (dComIfGs_getBeast(beastIdx) == dItemNo_SKULL_NECKLACE_e) { get_item = dComIfGs_getBeastNum(dBeastIdx_SKULL_NECKLACE_e); } } break; - case dItem_BOKOBABA_SEED_e: + case dItemNo_BOKOBABA_SEED_e: for (int beastIdx = 0; beastIdx < dBeastIdx_COUNT_e; beastIdx++) { - if (dComIfGs_getBeast(beastIdx) == dItem_BOKOBABA_SEED_e) { + if (dComIfGs_getBeast(beastIdx) == dItemNo_BOKOBABA_SEED_e) { get_item = dComIfGs_getBeastNum(dBeastIdx_BOKOBABA_SEED_e); } } break; - case dItem_GOLDEN_FEATHER_e: + case dItemNo_GOLDEN_FEATHER_e: for (int beastIdx = 0; beastIdx < dBeastIdx_COUNT_e; beastIdx++) { - if (dComIfGs_getBeast(beastIdx) == dItem_GOLDEN_FEATHER_e) { + if (dComIfGs_getBeast(beastIdx) == dItemNo_GOLDEN_FEATHER_e) { get_item = dComIfGs_getBeastNum(dBeastIdx_GOLDEN_FEATHER_e); } } break; - case dItem_KNIGHTS_CREST_e: + case dItemNo_KNIGHTS_CREST_e: for (int beastIdx = 0; beastIdx < dBeastIdx_COUNT_e; beastIdx++) { - if (dComIfGs_getBeast(beastIdx) == dItem_KNIGHTS_CREST_e) { + if (dComIfGs_getBeast(beastIdx) == dItemNo_KNIGHTS_CREST_e) { get_item = dComIfGs_getBeastNum(dBeastIdx_KNIGHTS_CREST_e); } } break; - case dItem_RED_JELLY_e: + case dItemNo_RED_JELLY_e: for (int beastIdx = 0; beastIdx < dBeastIdx_COUNT_e; beastIdx++) { - if (dComIfGs_getBeast(beastIdx) == dItem_RED_JELLY_e) { + if (dComIfGs_getBeast(beastIdx) == dItemNo_RED_JELLY_e) { get_item = dComIfGs_getBeastNum(dBeastIdx_RED_JELLY_e); } } break; - case dItem_GREEN_JELLY_e: + case dItemNo_GREEN_JELLY_e: for (int beastIdx = 0; beastIdx < dBeastIdx_COUNT_e; beastIdx++) { - if (dComIfGs_getBeast(beastIdx) == dItem_GREEN_JELLY_e) { + if (dComIfGs_getBeast(beastIdx) == dItemNo_GREEN_JELLY_e) { get_item = dComIfGs_getBeastNum(dBeastIdx_GREEN_JELLY_e); } } break; - case dItem_BLUE_JELLY_e: + case dItemNo_BLUE_JELLY_e: for (int beastIdx = 0; beastIdx < dBeastIdx_COUNT_e; beastIdx++) { - if (dComIfGs_getBeast(beastIdx) == dItem_BLUE_JELLY_e) { + if (dComIfGs_getBeast(beastIdx) == dItemNo_BLUE_JELLY_e) { get_item = dComIfGs_getBeastNum(dBeastIdx_BLUE_JELLY_e); } } break; - case dItem_JOY_PENDANT_e: + case dItemNo_JOY_PENDANT_e: for (int beastIdx = 0; beastIdx < dBeastIdx_COUNT_e; beastIdx++) { - if (dComIfGs_getBeast(beastIdx) == dItem_JOY_PENDANT_e) { + if (dComIfGs_getBeast(beastIdx) == dItemNo_JOY_PENDANT_e) { get_item = dComIfGs_getBeastNum(dBeastIdx_JOY_PENDANT_e); } } @@ -1040,8 +1039,8 @@ u8 dComIfGs_checkGetItemNum(u8 i_itemNo) { } } - if (i_itemNo >= 0xBF && i_itemNo <= dItem_NONE_e - 1 && - dComIfGs_isGetCollectMap(dItem_NONE_e - i_itemNo)) + if (i_itemNo >= 0xBF && i_itemNo <= dItemNo_NONE_e - 1 && + dComIfGs_isGetCollectMap(dItemNo_NONE_e - i_itemNo)) { get_item = 1; } @@ -1305,7 +1304,7 @@ void dComIfGs_setPlayerRecollectionData() { } #if VERSION > VERSION_DEMO - if (dComIfGs_getpPlayerStatusC(tbl)->mRecollectItem.mItems[dInvSlot_TELESCOPE_e] != dItem_TELESCOPE_e) { + if (dComIfGs_getpPlayerStatusC(tbl)->mRecollectItem.mItems[dInvSlot_TELESCOPE_e] != dItemNo_TELESCOPE_e) { dComIfGs_setSelectItem(dItemBtn_X_e, dInvSlot_NONE_e); dComIfGs_setSelectItem(dItemBtn_Y_e, dInvSlot_NONE_e); dComIfGs_setSelectItem(dItemBtn_Z_e, dInvSlot_NONE_e); @@ -1627,32 +1626,32 @@ void dComIfGs_setSelectEquip(int i_type, u8 i_itemNo) { switch (i_type) { case 0: switch (i_itemNo) { - case dItem_SWORD_e: + case dItemNo_SWORD_e: dComIfGs_onCollect(i_type, 0); break; - case dItem_MASTER_SWORD_1_e: + case dItemNo_MASTER_SWORD_1_e: dComIfGs_onCollect(i_type, 1); break; - case dItem_MASTER_SWORD_2_e: + case dItemNo_MASTER_SWORD_2_e: dComIfGs_onCollect(i_type, 2); break; - case dItem_MASTER_SWORD_3_e: + case dItemNo_MASTER_SWORD_3_e: dComIfGs_onCollect(i_type, 3); break; } break; case 1: switch (i_itemNo) { - case dItem_SHIELD_e: + case dItemNo_SHIELD_e: dComIfGs_onCollect(i_type, 0); break; - case dItem_MIRROR_SHIELD_e: + case dItemNo_MIRROR_SHIELD_e: dComIfGs_onCollect(i_type, 1); break; } break; case 2: - if (i_itemNo == dItem_POWER_BRACELETS_e) { + if (i_itemNo == dItemNo_POWER_BRACELETS_e) { dComIfGs_onCollect(i_type, 0); } break; diff --git a/src/d/d_com_static.cpp b/src/d/d_com_static.cpp index a208f04a5..1d5789fbe 100644 --- a/src/d/d_com_static.cpp +++ b/src/d/d_com_static.cpp @@ -7,7 +7,6 @@ #include "dolphin/types.h" #include "d/d_com_inf_game.h" #include "d/d_salvage.h" -#include "d/d_procname.h" #include "d/actor/d_a_lod_bg.h" #include "d/actor/d_a_agb.h" #include "d/actor/d_a_agbsw0.h" @@ -405,7 +404,7 @@ void daTagKbItem_c::dig_main() { if (!fopAcM_IsActor(mpActor)) { return; } - if (fopAcM_GetName(mpActor) != PROC_KB) { + if (fopAcM_GetName(mpActor) != fpcNm_KB_e) { // Not a pig. return; } @@ -464,14 +463,14 @@ BOOL daStandItem_c::daiItemNodeCallBack(J3DNode* node, int calcTiming) { s32 jntNo = joint->getJntNo(); J3DModel* model = j3dSys.getModel(); void* userArea = (void*)model->getUserArea(); - if (userArea && fopAcM_IsActor(userArea) && fopAcM_GetName(userArea) == PROC_STANDITEM) { + if (userArea && fopAcM_IsActor(userArea) && fopAcM_GetName(userArea) == fpcNm_STANDITEM_e) { daStandItem_c* i_this = (daStandItem_c*)userArea; mDoMtx_stack_c::copy(model->getAnmMtx(jntNo)); switch (i_this->getItemNo()) { - case WIND_FLAG: + case dItemNo_PINWHEEL_e: mDoMtx_stack_c::XrotM(i_this->m6B4); break; - case WATER_STATUE: + case dItemNo_FOUNTAIN_IDOL_e: if (jntNo == 0) { mDoMtx_copy(mDoMtx_stack_c::get(), i_this->m630); } else if (jntNo == 1) { diff --git a/src/d/d_detect.cpp b/src/d/d_detect.cpp index f8723a30e..8fc197681 100644 --- a/src/d/d_detect.cpp +++ b/src/d/d_detect.cpp @@ -8,7 +8,6 @@ #include "d/d_com_inf_game.h" #include "d/actor/d_a_player.h" #include "d/actor/d_a_tag_light.h" -#include "d/d_procname.h" const dDetect_c::Attr_c dDetect_c::M_attr = { /* maxDistXZ */ 500.0f, @@ -105,7 +104,7 @@ bool dDetect_c::chk_quake_area(const cXyz* pos) const { /* 8009C32C-8009C588 .text search_tag_light__9dDetect_cFPvPv */ void* dDetect_c::search_tag_light(void* i_proc, void* i_pos) { - if (fopAc_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_Tag_Light) { + if (fopAc_IsActor(i_proc) && fopAcM_GetName(i_proc) == fpcNm_Tag_Light_e) { daTagLight::Act_c* light = (daTagLight::Act_c*)i_proc; const cXyz* pos = (const cXyz*)i_pos; if (light->chk_inside(pos)) { diff --git a/src/d/d_drawlist.cpp b/src/d/d_drawlist.cpp index 7e362f026..7f4922579 100644 --- a/src/d/d_drawlist.cpp +++ b/src/d/d_drawlist.cpp @@ -774,7 +774,7 @@ void dDlst_alphaModelData_c::set(u8 type, Mtx mtx, u8 alpha) { #include "assets/l_frontZMat.h" #include "assets/l_frontNoZSubMat.h" -Vec l_bonboriPos[] = { +static Vec l_bonboriPos[] = { {0.0f, -200.0f, 0.0f}, {0.0f, 200.0f, 0.0f}, {100.0f, -173.205093f, 0.0f}, @@ -820,7 +820,7 @@ Vec l_bonboriPos[] = { }; #include "assets/l_bonboriDL.h" -Vec l_s_beam_checkPos[] = { +static Vec l_s_beam_checkPos[] = { {-97.608604f, -300.359589f, -0.000003f}, {-255.533127f, -185.632721f, 0.000074f}, {97.596741f, -300.359589f, -0.000003f}, @@ -864,7 +864,7 @@ Vec l_s_beam_checkPos[] = { }; #include "assets/l_s_beam_checkDL.h" -Vec l_cubePos[] = { +static Vec l_cubePos[] = { {-0.5f, -0.5f, -0.5f}, {-0.5f, -0.5f, 0.5f}, {-0.5f, 0.5f, -0.5f}, @@ -876,7 +876,7 @@ Vec l_cubePos[] = { }; #include "assets/l_cubeDL.h" -Vec l_bonbori2Pos[] = { +static Vec l_bonbori2Pos[] = { {33.141357f, -92.387955f, -19.134167f}, {19.134172f, -92.387955f, -33.141354f}, {0.000003f, -92.387955f, -38.268341f}, @@ -1144,7 +1144,7 @@ BOOL dDlst_alphaModel_c::draw(Mtx mtx) { return TRUE; } -Vec l_shadowVolPos[] = { +static Vec l_shadowVolPos[] = { {-1.0f, -1.0f, 0.0f}, {-1.0f, -1.0f, -300.0f}, {-1.0f, 1.0f, 0.0f}, @@ -1161,7 +1161,7 @@ Vec l_shadowVolPos[] = { #include "assets/l_frontMat.h" #include "assets/l_backSubMat.h" -Vec l_simpleShadowPos[] = { +static Vec l_simpleShadowPos[] = { {0.0f, -1.0f, 0.0f}, {0.0f, 0.0f, 0.0f}, {1.0f, -1.0f, -1.0f}, diff --git a/src/d/d_envse.cpp b/src/d/d_envse.cpp index 1028727d4..9832cec59 100644 --- a/src/d/d_envse.cpp +++ b/src/d/d_envse.cpp @@ -5,11 +5,9 @@ #include "d/dolzel.h" // IWYU pragma: keep #include "d/d_envse.h" -#include "d/d_priority.h" #include "f_op/f_op_kankyo.h" #include "f_op/f_op_kankyo_mng.h" #include "f_op/f_op_camera.h" -#include "d/d_procname.h" #include "d/d_stage.h" #include "d/d_path.h" #include "d/d_com_inf_game.h" @@ -182,7 +180,7 @@ static cPhs_State dEnvSe_Create(kankyo_class*) { return cPhs_COMPLEATE_e; } -kankyo_method_class l_dEnvSe_Method = { +static kankyo_method_class l_dEnvSe_Method = { (process_method_func)dEnvSe_Create, (process_method_func)dEnvSe_Delete, (process_method_func)dEnvSe_Execute, @@ -191,15 +189,15 @@ kankyo_method_class l_dEnvSe_Method = { }; kankyo_process_profile_definition g_profile_ENVSE = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0002, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_ENVSE, - /* Proc SubMtd */ &g_fpcLf_Method.base, - /* Size */ sizeof(dEnvSe_c), - /* SizeOther */ 0, - /* Parameters */ 0, - /* Leaf SubMtd */ &g_fopKy_Method, - /* Priority */ PRIO_ENVSE, - /* Actor SubMtd */ &l_dEnvSe_Method, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0002, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_ENVSE_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(dEnvSe_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopKy_Method, + /* Draw Prio */ fpcDwPi_ENVSE_e, + /* Kankyo SubMtd */ &l_dEnvSe_Method, }; diff --git a/src/d/d_event.cpp b/src/d/d_event.cpp index 374168d07..59f89bd8c 100644 --- a/src/d/d_event.cpp +++ b/src/d/d_event.cpp @@ -6,7 +6,6 @@ #include "d/dolzel.h" // IWYU pragma: keep #include "d/d_event.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" #include "d/actor/d_a_itembase.h" #include "f_op/f_op_actor.h" // dEvt_info_c #include "f_op/f_op_actor_mng.h" @@ -181,7 +180,7 @@ BOOL dEvt_control_c::talkXyCheck(dEvt_order_c* order) { break; } - if (dComIfGp_getSelectItem(itemBtn) == dItem_NONE_e) { + if (dComIfGp_getSelectItem(itemBtn) == dItemNo_NONE_e) { return FALSE; } @@ -289,7 +288,7 @@ BOOL dEvt_control_c::talkEnd() { mEventId = -1; } fopAc_ac_c* itemPartner = fopAcM_getItemEventPartner(NULL); - if (itemPartner != NULL && (fopAcM_GetName(itemPartner) == PROC_ITEM || fopAcM_GetName(itemPartner) == PROC_Demo_Item)) + if (itemPartner != NULL && (fopAcM_GetName(itemPartner) == fpcNm_ITEM_e || fopAcM_GetName(itemPartner) == fpcNm_Demo_Item_e)) ((daItemBase_c*)itemPartner)->dead(); return TRUE; } @@ -592,7 +591,7 @@ BOOL dEvt_control_c::photoCheck() { } if (itemBtn != -1 && - (dComIfGp_getSelectItem(itemBtn) == CAMERA || dComIfGp_getSelectItem(itemBtn) == CAMERA2) && + (dComIfGp_getSelectItem(itemBtn) == dItemNo_PICTO_BOX_e || dComIfGp_getSelectItem(itemBtn) == dItemNo_DELUXE_PICTO_BOX_e) && dComIfGs_getPictureNum() != 0 ) { actor2 = order->mActor2; diff --git a/src/d/d_event_manager.cpp b/src/d/d_event_manager.cpp index 9ac13f268..7ddb80651 100644 --- a/src/d/d_event_manager.cpp +++ b/src/d/d_event_manager.cpp @@ -6,7 +6,6 @@ #include "d/dolzel.h" // IWYU pragma: keep #include "d/d_event_manager.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" enum { ACT_WAIT, @@ -688,13 +687,13 @@ fopAc_ac_c* dEvent_manager_c::specialCast(const char* name, int flag) { return NULL; if (strcmp(name, "SHUTTER_DOOR") == 0) { - actor = specialCast_Shutter(PROC_DOOR10, flag); + actor = specialCast_Shutter(fpcNm_DOOR10_e, flag); if (actor == NULL) - actor = specialCast_Shutter(PROC_DOOR12, flag); + actor = specialCast_Shutter(fpcNm_DOOR12_e, flag); if (actor == NULL) - actor = specialCast_Shutter(PROC_KDDOOR, flag); + actor = specialCast_Shutter(fpcNm_KDDOOR_e, flag); if (actor == NULL) - actor = specialCast_Shutter(PROC_KNOB00, flag); + actor = specialCast_Shutter(fpcNm_KNOB00_e, flag); if (actor != NULL) dComIfGp_event_onEventFlag(0x10); } diff --git a/src/d/d_gameover.cpp b/src/d/d_gameover.cpp index 37461fa31..a0f7a63bc 100644 --- a/src/d/d_gameover.cpp +++ b/src/d/d_gameover.cpp @@ -6,8 +6,6 @@ #include "d/dolzel.h" // IWYU pragma: keep #include "d/d_gameover.h" #include "d/d_meter.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "m_Do/m_Do_graphic.h" #include "m_Do/m_Do_mtx.h" #include "m_Do/m_Do_Reset.h" @@ -442,7 +440,7 @@ static cPhs_State dGameover_Create(msg_class* i_this) { return ((dGameover_c*)i_this)->_create(); } -msg_method_class l_dGameover_Method = { +static msg_method_class l_dGameover_Method = { (process_method_func)dGameover_Create, (process_method_func)dGameover_Delete, (process_method_func)dGameover_Execute, @@ -451,15 +449,15 @@ msg_method_class l_dGameover_Method = { }; msg_process_profile_definition g_profile_GAMEOVER = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 12, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_GAMEOVER, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 12, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_GAMEOVER_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(dGameover_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopMsg_Method, - /* Priority */ PRIO_GAMEOVER, + /* Draw Prio */ fpcDwPi_GAMEOVER_e, /* Msg SubMtd */ &l_dGameover_Method, }; diff --git a/src/d/d_grass.cpp b/src/d/d_grass.cpp index 37f2ec9a0..3cf4f8315 100644 --- a/src/d/d_grass.cpp +++ b/src/d/d_grass.cpp @@ -11,7 +11,6 @@ #include "d/d_com_inf_game.h" #include "d/d_kankyo.h" #include "d/d_kankyo_wether.h" -#include "d/d_procname.h" #include "m_Do/m_Do_mtx.h" #include "m_Do/m_Do_lib.h" #include "m_Do/m_Do_graphic.h" @@ -22,7 +21,7 @@ const u32 l_K_kusa_00TEX__width = 64; const u32 l_K_kusa_00TEX__height = 128; -Vec l_Vmori_pos[] = { +static Vec l_Vmori_pos[] = { {0.0f, -0.0f, 0.0f}, {-20.232309f, 2.398434f, -12.457211f}, {-22.421972f, 96.708992f, -32.329994f}, @@ -52,7 +51,7 @@ Vec l_Vmori_pos[] = { {11.278254f, 12.157036f, 6.079209f}, }; -GXColor l_Vmori_color[] = { +static GXColor l_Vmori_color[] = { {0xFF, 0xFF, 0xFF, 0xFF}, {0x41, 0x41, 0x41, 0xFF}, {0xDD, 0xCF, 0x71, 0xFF}, @@ -60,7 +59,7 @@ GXColor l_Vmori_color[] = { {0xAE, 0xA4, 0x57, 0xFF}, }; -cXy l_Vmori_texCoord[] = { +static cXy l_Vmori_texCoord[] = { {0.006063f, 0.998037f}, {0.659757f, 0.0f}, {0.974817f, 1.0f}, @@ -81,7 +80,7 @@ l_Vmori_matDL(l_K_kusa_00TEX); const u32 l_Txa_ob_kusa_aTEX__width = 64; const u32 l_Txa_ob_kusa_aTEX__height = 64; -Vec l_pos[] = { +static Vec l_pos[] = { {0.0f, -0.0f, 0.0f}, {-20.232309f, 7.048814f, -12.457211f}, {-22.421972f, 96.708992f, -32.329994f}, @@ -111,7 +110,7 @@ Vec l_pos[] = { {11.278254f, 12.157036f, 6.079209f}, }; -GXColor l_color[] = { +static GXColor l_color[] = { {0x87, 0x87, 0x87, 0xFF}, {0xFF, 0xFF, 0xFF, 0xFF}, {0x6E, 0x6E, 0x6E, 0xFF}, @@ -122,7 +121,7 @@ GXColor l_color[] = { {0xCC, 0xCC, 0xCC, 0xFF}, }; -cXy l_texCoord[] = { +static cXy l_texCoord[] = { {0.375f, 0.625f}, {1.0f, 0.0f}, {1.0f, 1.0f}, @@ -263,7 +262,7 @@ void dGrass_data_c::hitCheck(int roomNo) { dCcMassS_HitInf hitInf; fopAc_ac_c* actor; u32 ret = dComIfG_Ccsp()->ChkMass(&mPos, &actor, &hitInf); - bool checkAt = (ret & 1) && (actor != NULL && fopAcM_GetName(actor) != PROC_TSUBO && fopAcM_GetName(actor) != PROC_STONE); + bool checkAt = (ret & 1) && (actor != NULL && fopAcM_GetName(actor) != fpcNm_TSUBO_e && fopAcM_GetName(actor) != fpcNm_STONE_e); if ((ret & 2) == 0 && !checkAt) { if (mAnimIdx >= 8) { diff --git a/src/d/d_item.cpp b/src/d/d_item.cpp index 918567fc0..36e388706 100644 --- a/src/d/d_item.cpp +++ b/src/d/d_item.cpp @@ -612,28 +612,28 @@ 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, dItem_BOMB_5_e); + dComIfGp_setItem(dInvSlot_BOMB_e, dItemNo_BOMB_5_e); dComIfGp_setItemBombNumCount(5); } /* 800C3060-800C30B0 .text item_func_bomb_10__Fv */ void item_func_bomb_10() { dComIfGs_onGetItem(dInvSlot_BOMB_e, 0); - dComIfGs_setItem(dInvSlot_BOMB_e, dItem_BOMB_BAG_e); + dComIfGs_setItem(dInvSlot_BOMB_e, dItemNo_BOMB_BAG_e); dComIfGp_setItemBombNumCount(10); } /* 800C30B0-800C3100 .text item_func_bomb_20__Fv */ void item_func_bomb_20() { dComIfGs_onGetItem(dInvSlot_BOMB_e, 0); - dComIfGs_setItem(dInvSlot_BOMB_e, dItem_BOMB_BAG_e); + dComIfGs_setItem(dInvSlot_BOMB_e, dItemNo_BOMB_BAG_e); dComIfGp_setItemBombNumCount(20); } /* 800C3100-800C3150 .text item_func_bomb_30__Fv */ void item_func_bomb_30() { dComIfGs_onGetItem(dInvSlot_BOMB_e, 0); - dComIfGs_setItem(dInvSlot_BOMB_e, dItem_BOMB_BAG_e); + dComIfGs_setItem(dInvSlot_BOMB_e, dItemNo_BOMB_BAG_e); dComIfGp_setItemBombNumCount(30); } @@ -678,7 +678,7 @@ void item_func_triple_heart() { /* 800C3200-800C3258 .text item_func_pendant__Fv */ void item_func_pendant() { - dComIfGs_setBeastItem(dItem_JOY_PENDANT_e); + dComIfGs_setBeastItem(dItemNo_JOY_PENDANT_e); dComIfGs_onGetItemBeast(dBeastIdx_JOY_PENDANT_e); dComIfGp_setItemBeastNumCount(dBeastIdx_JOY_PENDANT_e, 1); } @@ -686,49 +686,49 @@ void item_func_pendant() { /* 800C3258-800C329C .text item_func_telescope__Fv */ void item_func_telescope() { dComIfGs_onGetItem(dInvSlot_TELESCOPE_e, 0); - dComIfGs_setItem(dInvSlot_TELESCOPE_e, dItem_TELESCOPE_e); + dComIfGs_setItem(dInvSlot_TELESCOPE_e, dItemNo_TELESCOPE_e); } /* 800C329C-800C32E0 .text item_func_tncl_whitsl__Fv */ void item_func_tncl_whitsl() { dComIfGs_onGetItem(dInvSlot_TINGLE_TUNER_e, 0); - dComIfGs_setItem(dInvSlot_TINGLE_TUNER_e, dItem_TINGLE_TUNER_e); + dComIfGs_setItem(dInvSlot_TINGLE_TUNER_e, dItemNo_TINGLE_TUNER_e); } /* 800C32E0-800C3324 .text item_func_wind_tact__Fv */ void item_func_wind_tact() { dComIfGs_onGetItem(dInvSlot_WIND_WAKER_e, 0); - dComIfGs_setItem(dInvSlot_WIND_WAKER_e, dItem_WIND_WAKER_e); + dComIfGs_setItem(dInvSlot_WIND_WAKER_e, dItemNo_WIND_WAKER_e); } /* 800C3324-800C3368 .text item_func_camera__Fv */ void item_func_camera() { dComIfGs_onGetItem(dInvSlot_CAMERA_e, 0); - dComIfGs_setItem(dInvSlot_CAMERA_e, CAMERA); + dComIfGs_setItem(dInvSlot_CAMERA_e, dItemNo_PICTO_BOX_e); } /* 800C3368-800C33AC .text item_func_emono_bag__Fv */ void item_func_emono_bag() { dComIfGs_onGetItem(dInvSlot_SPOILS_BAG_e, 0); - dComIfGs_setItem(dInvSlot_SPOILS_BAG_e, dItem_SPOILS_BAG_e); + dComIfGs_setItem(dInvSlot_SPOILS_BAG_e, dItemNo_SPOILS_BAG_e); } /* 800C33AC-800C33F0 .text item_func_rope__Fv */ void item_func_rope() { dComIfGs_onGetItem(dInvSlot_GRAPPLING_HOOK_e, 0); - dComIfGs_setItem(dInvSlot_GRAPPLING_HOOK_e, dItem_GRAPPLING_HOOK_e); + dComIfGs_setItem(dInvSlot_GRAPPLING_HOOK_e, dItemNo_GRAPPLING_HOOK_e); } /* 800C33F0-800C3434 .text item_func_camera2__Fv */ void item_func_camera2() { dComIfGs_onGetItem(dInvSlot_CAMERA_e, 1); - dComIfGs_setItem(dInvSlot_CAMERA_e, CAMERA2); + dComIfGs_setItem(dInvSlot_CAMERA_e, dItemNo_DELUXE_PICTO_BOX_e); } /* 800C3434-800C3484 .text item_func_bow__Fv */ void item_func_bow() { dComIfGs_onGetItem(dInvSlot_BOW_e, 0); - dComIfGs_setItem(dInvSlot_BOW_e, dItem_BOW_e); + dComIfGs_setItem(dInvSlot_BOW_e, dItemNo_BOW_e); dComIfGs_setArrowNum(30); dComIfGs_setArrowMax(30); } @@ -736,19 +736,19 @@ void item_func_bow() { /* 800C3484-800C34C4 .text item_func_pwr_groove__Fv */ void item_func_pwr_groove() { dComIfGs_onCollect(0x2, 0); - dComIfGs_setSelectEquip(0x2, dItem_POWER_BRACELETS_e); + dComIfGs_setSelectEquip(0x2, dItemNo_POWER_BRACELETS_e); } /* 800C34C4-800C3508 .text item_func_hvy_boots__Fv */ void item_func_hvy_boots() { dComIfGs_onGetItem(dInvSlot_IRON_BOOTS_e, 0); - dComIfGs_setItem(dInvSlot_IRON_BOOTS_e, dItem_IRON_BOOTS_e); + dComIfGs_setItem(dInvSlot_IRON_BOOTS_e, dItemNo_IRON_BOOTS_e); } /* 800C3508-800C354C .text item_func_drgn_shield__Fv */ void item_func_drgn_shield() { dComIfGs_onGetItem(dInvSlot_MAGIC_ARMOR_e, 0); - dComIfGs_setItem(dInvSlot_MAGIC_ARMOR_e, dItem_MAGIC_ARMOR_e); + dComIfGs_setItem(dInvSlot_MAGIC_ARMOR_e, dItemNo_MAGIC_ARMOR_e); } /* 800C354C-800C3550 .text item_func_water_boots__Fv */ @@ -758,36 +758,36 @@ void item_func_water_boots() { /* 800C3550-800C3594 .text item_func_esa_bag__Fv */ void item_func_esa_bag() { dComIfGs_onGetItem(dInvSlot_BAIT_BAG_e, 0); - dComIfGs_setItem(dInvSlot_BAIT_BAG_e, dItem_BAIT_BAG_e); + dComIfGs_setItem(dInvSlot_BAIT_BAG_e, dItemNo_BAIT_BAG_e); } /* 800C3594-800C35D8 .text item_func_boomerang__Fv */ void item_func_boomerang() { dComIfGs_onGetItem(dInvSlot_BOOMERANG_e, 0); - dComIfGs_setItem(dInvSlot_BOOMERANG_e, dItem_BOOMERANG_e); + dComIfGs_setItem(dInvSlot_BOOMERANG_e, dItemNo_BOOMERANG_e); } /* 800C35D8-800C3600 .text item_func_bare_hand__Fv */ void item_func_bare_hand() { - dComIfGs_setSelectEquip(0x02, BARE_HAND); + dComIfGs_setSelectEquip(0x02, dItemNo_BARE_HAND_e); } /* 800C3600-800C3644 .text item_func_hookshot__Fv */ void item_func_hookshot() { dComIfGs_onGetItem(dInvSlot_HOOKSHOT_e, 0); - dComIfGs_setItem(dInvSlot_HOOKSHOT_e, dItem_HOOKSHOT_e); + dComIfGs_setItem(dInvSlot_HOOKSHOT_e, dItemNo_HOOKSHOT_e); } /* 800C3644-800C3688 .text item_func_warasibe_bag__Fv */ void item_func_warasibe_bag() { dComIfGs_onGetItem(dInvSlot_DELIVERY_BAG_e, 0); - dComIfGs_setItem(dInvSlot_DELIVERY_BAG_e, dItem_DELIVERY_BAG_e); + dComIfGs_setItem(dInvSlot_DELIVERY_BAG_e, dItemNo_DELIVERY_BAG_e); } /* 800C3688-800C36D8 .text item_func_bomb_bag__Fv */ void item_func_bomb_bag() { dComIfGs_onGetItem(dInvSlot_BOMB_e, 0); - dComIfGs_setItem(dInvSlot_BOMB_e, dItem_BOMB_BAG_e); + dComIfGs_setItem(dInvSlot_BOMB_e, dItemNo_BOMB_BAG_e); dComIfGs_setBombNum(30); dComIfGs_setBombMax(30); } @@ -799,13 +799,13 @@ void item_func_fuku() { /* 800C36DC-800C3720 .text item_func_hummer__Fv */ void item_func_hummer() { dComIfGs_onGetItem(dInvSlot_SKULL_HAMMER_e, 0); - dComIfGs_setItem(dInvSlot_SKULL_HAMMER_e, dItem_SKULL_HAMMER_e); + dComIfGs_setItem(dInvSlot_SKULL_HAMMER_e, dItemNo_SKULL_HAMMER_e); } /* 800C3720-800C377C .text item_func_deku_leaf__Fv */ void item_func_deku_leaf() { dComIfGs_onGetItem(dInvSlot_DEKU_LEAF_e, 0); - dComIfGs_setItem(dInvSlot_DEKU_LEAF_e, dItem_DEKU_LEAF_e); + dComIfGs_setItem(dInvSlot_DEKU_LEAF_e, dItemNo_DEKU_LEAF_e); dComIfGp_setItemMaxMagicCount(16); dComIfGp_setItemMagicCount(16); } @@ -813,12 +813,12 @@ void item_func_deku_leaf() { /* 800C377C-800C3928 .text item_func_magic_arrow__Fv */ void item_func_magic_arrow() { dComIfGs_onGetItem(dInvSlot_BOW_e, 1); - dComIfGs_setItem(dInvSlot_BOW_e, dItem_MAGIC_ARROW_e); + dComIfGs_setItem(dInvSlot_BOW_e, dItemNo_MAGIC_ARROW_e); #if VERSION > VERSION_JPN // If the regular bow was equipped on an X/Y/Z button, force it to update. for (int itemBtn = 0; itemBtn < dItemBtn_COUNT_e; itemBtn++) { - if (dComIfGp_getSelectItem(itemBtn) == dItem_BOW_e) { + if (dComIfGp_getSelectItem(itemBtn) == dItemNo_BOW_e) { dComIfGp_setSelectItem(itemBtn); } } @@ -828,12 +828,12 @@ void item_func_magic_arrow() { /* 800C3928-800C3AD4 .text item_func_light_arrow__Fv */ void item_func_light_arrow() { dComIfGs_onGetItem(dInvSlot_BOW_e, 2); - dComIfGs_setItem(dInvSlot_BOW_e, dItem_LIGHT_ARROW_e); + dComIfGs_setItem(dInvSlot_BOW_e, dItemNo_LIGHT_ARROW_e); #if VERSION > VERSION_JPN // If the fire/ice bow was equipped on an X/Y/Z button, force it to update. for (int itemBtn = 0; itemBtn < dItemBtn_COUNT_e; itemBtn++) { - if (dComIfGp_getSelectItem(itemBtn) == dItem_MAGIC_ARROW_e) { + if (dComIfGp_getSelectItem(itemBtn) == dItemNo_MAGIC_ARROW_e) { dComIfGp_setSelectItem(itemBtn); } } @@ -843,43 +843,43 @@ void item_func_light_arrow() { /* 800C3AD4-800C3B14 .text item_func_sword__Fv */ void item_func_sword() { dComIfGs_onCollect(0x0, 0); - dComIfGs_setSelectEquip(0x0, dItem_SWORD_e); + dComIfGs_setSelectEquip(0x0, dItemNo_SWORD_e); } /* 800C3B14-800C3B54 .text item_func_master_sword__Fv */ void item_func_master_sword() { dComIfGs_onCollect(0x0, 1); - dComIfGs_setSelectEquip(0x0, dItem_MASTER_SWORD_1_e); + dComIfGs_setSelectEquip(0x0, dItemNo_MASTER_SWORD_1_e); } /* 800C3B54-800C3B94 .text item_func_lv3_sword__Fv */ void item_func_lv3_sword() { dComIfGs_onCollect(0x0, 2); - dComIfGs_setSelectEquip(0x0, dItem_MASTER_SWORD_2_e); + dComIfGs_setSelectEquip(0x0, dItemNo_MASTER_SWORD_2_e); } /* 800C3B94-800C3BD4 .text item_func_shield__Fv */ void item_func_shield() { dComIfGs_onCollect(0x1, 0); - dComIfGs_setSelectEquip(0x1, dItem_SHIELD_e); + dComIfGs_setSelectEquip(0x1, dItemNo_SHIELD_e); } /* 800C3BD4-800C3C14 .text item_func_mirror_shield__Fv */ void item_func_mirror_shield() { dComIfGs_onCollect(0x1, 1); - dComIfGs_setSelectEquip(0x1, dItem_MIRROR_SHIELD_e); + dComIfGs_setSelectEquip(0x1, dItemNo_MIRROR_SHIELD_e); } /* 800C3C14-800C3C54 .text item_func_dropped_sword__Fv */ void item_func_dropped_sword() { dComIfGs_onCollect(0x0, 0); - dComIfGs_setSelectEquip(0x0, dItem_SWORD_e); + dComIfGs_setSelectEquip(0x0, dItemNo_SWORD_e); } /* 800C3C54-800C3C94 .text item_func_master_sword_ex__Fv */ void item_func_master_sword_ex() { dComIfGs_onCollect(0x0, 3); - dComIfGs_setSelectEquip(0x0, dItem_MASTER_SWORD_3_e); + dComIfGs_setSelectEquip(0x0, dItemNo_MASTER_SWORD_3_e); } /* 800C3C94-800C3CC8 .text item_func_pirates_omamori__Fv */ @@ -898,49 +898,49 @@ void item_func_grass_ball() { /* 800C3D00-800C3D58 .text item_func_skull_necklace__Fv */ void item_func_skull_necklace() { - dComIfGs_setBeastItem(dItem_SKULL_NECKLACE_e); + dComIfGs_setBeastItem(dItemNo_SKULL_NECKLACE_e); dComIfGs_onGetItemBeast(dBeastIdx_SKULL_NECKLACE_e); dComIfGp_setItemBeastNumCount(dBeastIdx_SKULL_NECKLACE_e, 1); } /* 800C3D58-800C3DB0 .text item_func_bokobaba_seed__Fv */ void item_func_bokobaba_seed() { - dComIfGs_setBeastItem(dItem_BOKOBABA_SEED_e); + dComIfGs_setBeastItem(dItemNo_BOKOBABA_SEED_e); dComIfGs_onGetItemBeast(dBeastIdx_BOKOBABA_SEED_e); dComIfGp_setItemBeastNumCount(dBeastIdx_BOKOBABA_SEED_e, 1); } /* 800C3DB0-800C3E08 .text item_func_golden_feather__Fv */ void item_func_golden_feather() { - dComIfGs_setBeastItem(dItem_GOLDEN_FEATHER_e); + dComIfGs_setBeastItem(dItemNo_GOLDEN_FEATHER_e); dComIfGs_onGetItemBeast(dBeastIdx_GOLDEN_FEATHER_e); dComIfGp_setItemBeastNumCount(dBeastIdx_GOLDEN_FEATHER_e, 1); } /* 800C3E08-800C3E60 .text item_func_boko_belt__Fv */ void item_func_boko_belt() { - dComIfGs_setBeastItem(dItem_KNIGHTS_CREST_e); + dComIfGs_setBeastItem(dItemNo_KNIGHTS_CREST_e); dComIfGs_onGetItemBeast(dBeastIdx_KNIGHTS_CREST_e); dComIfGp_setItemBeastNumCount(dBeastIdx_KNIGHTS_CREST_e, 1); } /* 800C3E60-800C3EB8 .text item_func_red_jerry__Fv */ void item_func_red_jerry() { - dComIfGs_setBeastItem(dItem_RED_JELLY_e); + dComIfGs_setBeastItem(dItemNo_RED_JELLY_e); dComIfGs_onGetItemBeast(dBeastIdx_RED_JELLY_e); dComIfGp_setItemBeastNumCount(dBeastIdx_RED_JELLY_e, 1); } /* 800C3EB8-800C3F10 .text item_func_green_jerry__Fv */ void item_func_green_jerry() { - dComIfGs_setBeastItem(dItem_GREEN_JELLY_e); + dComIfGs_setBeastItem(dItemNo_GREEN_JELLY_e); dComIfGs_onGetItemBeast(dBeastIdx_GREEN_JELLY_e); dComIfGp_setItemBeastNumCount(dBeastIdx_GREEN_JELLY_e, 1); } /* 800C3F10-800C3F68 .text item_func_blue_jerry__Fv */ void item_func_blue_jerry() { - dComIfGs_setBeastItem(dItem_BLUE_JELLY_e); + dComIfGs_setBeastItem(dItemNo_BLUE_JELLY_e); dComIfGs_onGetItemBeast(dBeastIdx_BLUE_JELLY_e); dComIfGp_setItemBeastNumCount(dBeastIdx_BLUE_JELLY_e, 1); } @@ -962,61 +962,61 @@ void item_func_boss_key() { /* 800C3FF8-800C4028 .text item_func_empty_bship__Fv */ void item_func_empty_bship() { - dComIfGs_onGetBottleItem(EMPTY_BSHIP); + dComIfGs_onGetBottleItem(dItemNo_EMPTY_BSHIP_e); } /* 800C4028-800C4068 .text item_func_empty_bottle__Fv */ void item_func_empty_bottle() { dComIfGs_setEmptyBottle(); - dComIfGs_onGetBottleItem(dItem_EMPTY_BOTTLE_e); + dComIfGs_onGetBottleItem(dItemNo_EMPTY_BOTTLE_e); } /* 800C4068-800C40AC .text item_func_red_bottle__Fv */ void item_func_red_bottle() { - dComIfGs_setEmptyBottleItemIn(dItem_RED_POTION_e); - dComIfGs_onGetBottleItem(dItem_RED_POTION_e); + dComIfGs_setEmptyBottleItemIn(dItemNo_RED_POTION_e); + dComIfGs_onGetBottleItem(dItemNo_RED_POTION_e); } /* 800C40AC-800C40F0 .text item_func_green_bottle__Fv */ void item_func_green_bottle() { - dComIfGs_setEmptyBottleItemIn(dItem_GREEN_POTION_e); - dComIfGs_onGetBottleItem(dItem_GREEN_POTION_e); + dComIfGs_setEmptyBottleItemIn(dItemNo_GREEN_POTION_e); + dComIfGs_onGetBottleItem(dItemNo_GREEN_POTION_e); } /* 800C40F0-800C4134 .text item_func_blue_bottle__Fv */ void item_func_blue_bottle() { - dComIfGs_setEmptyBottleItemIn(dItem_BLUE_POTION_e); - dComIfGs_onGetBottleItem(dItem_BLUE_POTION_e); + dComIfGs_setEmptyBottleItemIn(dItemNo_BLUE_POTION_e); + dComIfGs_onGetBottleItem(dItemNo_BLUE_POTION_e); } /* 800C4134-800C4164 .text item_func_bottleship__Fv */ void item_func_bottleship() { - dComIfGs_onGetBottleItem(dItem_HALF_SOUP_BOTTLE_e); + dComIfGs_onGetBottleItem(dItemNo_HALF_SOUP_BOTTLE_e); } /* 800C4164-800C4194 .text item_func_soup_bottle__Fv */ void item_func_soup_bottle() { - dComIfGs_onGetBottleItem(dItem_SOUP_BOTTLE_e); + dComIfGs_onGetBottleItem(dItemNo_SOUP_BOTTLE_e); } /* 800C4194-800C41C4 .text item_func_bin_in_water__Fv */ void item_func_bin_in_water() { - dComIfGs_onGetBottleItem(dItem_WATER_BOTTLE_e); + dComIfGs_onGetBottleItem(dItemNo_WATER_BOTTLE_e); } /* 800C41C4-800C41F4 .text item_func_fairy_bottle__Fv */ void item_func_fairy_bottle() { - dComIfGs_onGetBottleItem(dItem_FAIRY_BOTTLE_e); + dComIfGs_onGetBottleItem(dItemNo_FAIRY_BOTTLE_e); } /* 800C41F4-800C4224 .text item_func_firefly_bottle__Fv */ void item_func_firefly_bottle() { - dComIfGs_onGetBottleItem(dItem_FIREFLY_BOTTLE_e); + dComIfGs_onGetBottleItem(dItemNo_FIREFLY_BOTTLE_e); } /* 800C4224-800C4254 .text item_func_fwater_bottle__Fv */ void item_func_fwater_bottle() { - dComIfGs_onGetBottleItem(dItem_FOREST_WATER_e); + dComIfGs_onGetBottleItem(dItemNo_FOREST_WATER_e); } /* 800C4254-800C4258 .text item_func_bin__Fv */ @@ -1114,7 +1114,7 @@ void item_func_tact_song6() { /* 800C458C-800C45C8 .text item_func_normal_sail__Fv */ void item_func_normal_sail() { - dComIfGs_setItem(dInvSlot_SAIL_e, NORMAL_SAIL); + dComIfGs_setItem(dInvSlot_SAIL_e, dItemNo_SAIL_e); dComIfGs_onGetItem(dInvSlot_SAIL_e, 0); } @@ -1153,13 +1153,13 @@ 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(dItem_BIRD_BAIT_5_e); + dComIfGs_setBaitItem(dItemNo_BIRD_BAIT_5_e); } /* 800C462C-800C4670 .text item_func_animal_esa__Fv */ void item_func_animal_esa() { dComIfGs_onGetItemBait(0x1); - dComIfGs_setBaitItem(dItem_HYOI_PEAR_e); + dComIfGs_setBaitItem(dItemNo_HYOI_PEAR_e); } /* 800C4670-800C4674 .text item_func_esa1__Fv */ @@ -1193,115 +1193,115 @@ void item_func_bird_esa_10() { /* 800C468C-800C46D0 .text item_func_flower_1__Fv */ void item_func_flower_1() { dComIfGs_onGetItemReserve(0x0); - dComIfGs_setReserveItem(FLOWER_1); + dComIfGs_setReserveItem(dItemNo_TOWN_FLOWER_e); } /* 800C46D0-800C4714 .text item_func_flower_2__Fv */ void item_func_flower_2() { dComIfGs_onGetItemReserve(0x1); - dComIfGs_setReserveItem(FLOWER_2); + dComIfGs_setReserveItem(dItemNo_SEA_FLOWER_e); } /* 800C4714-800C4758 .text item_func_flower_3__Fv */ void item_func_flower_3() { dComIfGs_onGetItemReserve(0x2); - dComIfGs_setReserveItem(FLOWER_3); + dComIfGs_setReserveItem(dItemNo_EXOTIC_FLOWER_e); } /* 800C4758-800C479C .text item_func_heros_flag__Fv */ void item_func_heros_flag() { dComIfGs_onGetItemReserve(0x3); - dComIfGs_setReserveItem(HEROS_FLAG); + dComIfGs_setReserveItem(dItemNo_HEROS_FLAG_e); } /* 800C479C-800C47E0 .text item_func_tairyo_flag__Fv */ void item_func_tairyo_flag() { dComIfGs_onGetItemReserve(0x4); - dComIfGs_setReserveItem(TAIRYO_FLAG); + dComIfGs_setReserveItem(dItemNo_BIG_CATCH_FLAG_e); } /* 800C47E0-800C4824 .text item_func_sales_flag__Fv */ void item_func_sales_flag() { dComIfGs_onGetItemReserve(0x5); - dComIfGs_setReserveItem(SALES_FLAG); + dComIfGs_setReserveItem(dItemNo_BIG_SALE_FLAG_e); } /* 800C4824-800C4868 .text item_func_wind_flag__Fv */ void item_func_wind_flag() { dComIfGs_onGetItemReserve(0x6); - dComIfGs_setReserveItem(WIND_FLAG); + dComIfGs_setReserveItem(dItemNo_PINWHEEL_e); } /* 800C4868-800C48AC .text item_func_red_flag__Fv */ void item_func_red_flag() { dComIfGs_onGetItemReserve(0x7); - dComIfGs_setReserveItem(RED_FLAG); + dComIfGs_setReserveItem(dItemNo_SICKLE_MOON_FLAG_e); } /* 800C48AC-800C48F0 .text item_func_fossil_head__Fv */ void item_func_fossil_head() { dComIfGs_onGetItemReserve(0x8); - dComIfGs_setReserveItem(FOSSIL_HEAD); + dComIfGs_setReserveItem(dItemNo_SKULL_TOWER_IDOL_e); } /* 800C48F0-800C4934 .text item_func_water_statue__Fv */ void item_func_water_statue() { dComIfGs_onGetItemReserve(0x9); - dComIfGs_setReserveItem(WATER_STATUE); + dComIfGs_setReserveItem(dItemNo_FOUNTAIN_IDOL_e); } /* 800C4934-800C4978 .text item_func_postman_statue__Fv */ void item_func_postman_statue() { dComIfGs_onGetItemReserve(0xA); - dComIfGs_setReserveItem(POSTMAN_STATUE); + dComIfGs_setReserveItem(dItemNo_POSTMAN_STATUE_e); } /* 800C4978-800C49BC .text item_func_president_statue__Fv */ void item_func_president_statue() { dComIfGs_onGetItemReserve(0xB); - dComIfGs_setReserveItem(PRESIDENT_STATUE); + dComIfGs_setReserveItem(dItemNo_SHOP_GURU_STATUE_e); } /* 800C49BC-800C4A00 .text item_func_letter00__Fv */ void item_func_letter00() { dComIfGs_onGetItemReserve(0xC); - dComIfGs_setReserveItem(dItem_FATHER_LETTER_e); + dComIfGs_setReserveItem(dItemNo_FATHER_LETTER_e); } /* 800C4A00-800C4A44 .text item_func_magic_seed__Fv */ void item_func_magic_seed() { dComIfGs_onGetItemReserve(0xD); - dComIfGs_setReserveItem(dItem_NOTE_TO_MOM_e); + dComIfGs_setReserveItem(dItemNo_NOTE_TO_MOM_e); } /* 800C4A44-800C4A88 .text item_func_magys_letter__Fv */ void item_func_magys_letter() { dComIfGs_onGetItemReserve(0xE); - dComIfGs_setReserveItem(MAGYS_LETTER); + dComIfGs_setReserveItem(dItemNo_MAGGIES_LETTER_e); } /* 800C4A88-800C4ACC .text item_func_mo_letter__Fv */ void item_func_mo_letter() { dComIfGs_onGetItemReserve(0xF); - dComIfGs_setReserveItem(MO_LETTER); + dComIfGs_setReserveItem(dItemNo_MOBLINS_LETTER_e); } /* 800C4ACC-800C4B10 .text item_func_cottage_paper__Fv */ void item_func_cottage_paper() { dComIfGs_onGetItemReserve(0x10); - dComIfGs_setReserveItem(COTTAGE_PAPER); + dComIfGs_setReserveItem(dItemNo_CABANA_DEED_e); } /* 800C4B10-800C4B54 .text item_func_kaisen_present1__Fv */ void item_func_kaisen_present1() { dComIfGs_onGetItemReserve(0x11); - dComIfGs_setReserveItem(KAISEN_PRESENT1); + dComIfGs_setReserveItem(dItemNo_COMPLIMENTARY_ID_e); } /* 800C4B54-800C4B98 .text item_func_kaisen_present2__Fv */ void item_func_kaisen_present2() { dComIfGs_onGetItemReserve(0x12); - dComIfGs_setReserveItem(KAISEN_PRESENT2); + dComIfGs_setReserveItem(dItemNo_FILL_UP_COUPON_e); } /* 800C4B98-800C4B9C .text item_func_salvage_item1__Fv */ @@ -1311,19 +1311,19 @@ void item_func_salvage_item1() { /* 800C4B9C-800C4BE0 .text item_func_salvage_item2__Fv */ void item_func_salvage_item2() { dComIfGs_onGetItemReserve(0x14); - dComIfGs_setReserveItem(SALVAGE_ITEM2); + dComIfGs_setReserveItem(dItemNo_SALVAGE_ITEM_2_e); } /* 800C4BE0-800C4C24 .text item_func_salvage_item3__Fv */ void item_func_salvage_item3() { dComIfGs_onGetItemReserve(0x15); - dComIfGs_setReserveItem(SALVAGE_ITEM3); + dComIfGs_setReserveItem(dItemNo_SALVAGE_ITEM_3_e); } /* 800C4C24-800C4C68 .text item_func_xxx_039__Fv */ void item_func_xxx_039() { dComIfGs_onGetItemReserve(0x16); - dComIfGs_setReserveItem(XXX_039); + dComIfGs_setReserveItem(dItemNo_XXX_039_e); } /* 800C4C68-800C4C6C .text item_func_tincle_statue01__Fv */ @@ -2222,47 +2222,47 @@ int item_getcheck_func_boss_key() { /* 800C6CE0-800C6D10 .text item_getcheck_func_empty_bship__Fv */ int item_getcheck_func_empty_bship() { - return dComIfGs_isGetBottleItem(EMPTY_BSHIP); + return dComIfGs_isGetBottleItem(dItemNo_EMPTY_BSHIP_e); } /* 800C6D10-800C6D40 .text item_getcheck_func_empty_bottle__Fv */ int item_getcheck_func_empty_bottle() { - return dComIfGs_isGetBottleItem(dItem_EMPTY_BOTTLE_e); + return dComIfGs_isGetBottleItem(dItemNo_EMPTY_BOTTLE_e); } /* 800C6D40-800C6D70 .text item_getcheck_func_red_bottle__Fv */ int item_getcheck_func_red_bottle() { - return dComIfGs_isGetBottleItem(dItem_RED_POTION_e); + return dComIfGs_isGetBottleItem(dItemNo_RED_POTION_e); } /* 800C6D70-800C6DA0 .text item_getcheck_func_green_bottle__Fv */ int item_getcheck_func_green_bottle() { - return dComIfGs_isGetBottleItem(dItem_GREEN_POTION_e); + return dComIfGs_isGetBottleItem(dItemNo_GREEN_POTION_e); } /* 800C6DA0-800C6DD0 .text item_getcheck_func_blue_bottle__Fv */ int item_getcheck_func_blue_bottle() { - return dComIfGs_isGetBottleItem(dItem_BLUE_POTION_e); + return dComIfGs_isGetBottleItem(dItemNo_BLUE_POTION_e); } /* 800C6DD0-800C6E00 .text item_getcheck_func_bottleship__Fv */ int item_getcheck_func_bottleship() { - return dComIfGs_isGetBottleItem(dItem_HALF_SOUP_BOTTLE_e); + return dComIfGs_isGetBottleItem(dItemNo_HALF_SOUP_BOTTLE_e); } /* 800C6E00-800C6E30 .text item_getcheck_func_bin_in_bottleship__Fv */ int item_getcheck_func_bin_in_bottleship() { - return dComIfGs_isGetBottleItem(dItem_SOUP_BOTTLE_e); + return dComIfGs_isGetBottleItem(dItemNo_SOUP_BOTTLE_e); } /* 800C6E30-800C6E60 .text item_getcheck_func_bin_in_water__Fv */ int item_getcheck_func_bin_in_water() { - return dComIfGs_isGetBottleItem(dItem_WATER_BOTTLE_e); + return dComIfGs_isGetBottleItem(dItemNo_WATER_BOTTLE_e); } /* 800C6E60-800C6E90 .text item_getcheck_func_bin__Fv */ int item_getcheck_func_bin() { - return dComIfGs_isGetBottleItem(dItem_FAIRY_BOTTLE_e); + return dComIfGs_isGetBottleItem(dItemNo_FAIRY_BOTTLE_e); } /* 800C6E90-800C6EC0 .text item_getcheck_func_triforce1__Fv */ @@ -2613,7 +2613,7 @@ int item_getcheck_func_lithograph16() { /* 800C7AE4-800C7B50 .text getRotenItemNumInBag__Fv */ int getRotenItemNumInBag() { int num = 0; - for (u8 i = FLOWER_1; i <= PRESIDENT_STATUE; i++) { + for (u8 i = dItemNo_TOWN_FLOWER_e; i <= dItemNo_SHOP_GURU_STATUE_e; i++) { num += dComIfGs_checkReserveItem(i); } return num; @@ -2622,10 +2622,10 @@ int getRotenItemNumInBag() { /* 800C7B50-800C7B7C .text isDaizaItem__FUc */ BOOL isDaizaItem(u8 itemNo) { BOOL isDaiza = FALSE; - if (itemNo == FLOWER_1 || itemNo == FLOWER_2 || itemNo == FLOWER_3 || - itemNo == HEROS_FLAG || itemNo == TAIRYO_FLAG || itemNo == SALES_FLAG || - itemNo == WIND_FLAG || itemNo == RED_FLAG || itemNo == FOSSIL_HEAD || - itemNo == WATER_STATUE || itemNo == POSTMAN_STATUE || itemNo == PRESIDENT_STATUE) + if (itemNo == dItemNo_TOWN_FLOWER_e || itemNo == dItemNo_SEA_FLOWER_e || itemNo == dItemNo_EXOTIC_FLOWER_e || + itemNo == dItemNo_HEROS_FLAG_e || itemNo == dItemNo_BIG_CATCH_FLAG_e || itemNo == dItemNo_BIG_SALE_FLAG_e || + itemNo == dItemNo_PINWHEEL_e || itemNo == dItemNo_SICKLE_MOON_FLAG_e || itemNo == dItemNo_SKULL_TOWER_IDOL_e || + itemNo == dItemNo_FOUNTAIN_IDOL_e || itemNo == dItemNo_POSTMAN_STATUE_e || itemNo == dItemNo_SHOP_GURU_STATUE_e) { isDaiza = TRUE; } @@ -2635,7 +2635,7 @@ BOOL isDaizaItem(u8 itemNo) { /* 800C7B7C-800C7BA8 .text isBomb__FUc */ BOOL isBomb(u8 itemNo) { BOOL isBomb = FALSE; - if (itemNo == dItem_BOMB_5_e || itemNo == dItem_BOMB_10_e || itemNo == dItem_BOMB_20_e || itemNo == dItem_BOMB_30_e) { + if (itemNo == dItemNo_BOMB_5_e || itemNo == dItemNo_BOMB_10_e || itemNo == dItemNo_BOMB_20_e || itemNo == dItemNo_BOMB_30_e) { isBomb = TRUE; } return isBomb; @@ -2644,7 +2644,7 @@ BOOL isBomb(u8 itemNo) { /* 800C7BA8-800C7BD4 .text isArrow__FUc */ BOOL isArrow(u8 itemNo) { BOOL isArrow = FALSE; - if (itemNo == dItem_ARROW_10_e || itemNo == dItem_ARROW_20_e || itemNo == dItem_ARROW_30_e) { + if (itemNo == dItemNo_ARROW_10_e || itemNo == dItemNo_ARROW_20_e || itemNo == dItemNo_ARROW_30_e) { isArrow = TRUE; } return isArrow; @@ -2653,8 +2653,8 @@ BOOL isArrow(u8 itemNo) { /* 800C7BD4-800C7C08 .text isEmono__FUc */ BOOL isEmono(u8 itemNo) { BOOL isEmono = FALSE; - if (itemNo == dItem_JOY_PENDANT_e || itemNo == dItem_SKULL_NECKLACE_e || itemNo == dItem_BOKOBABA_SEED_e || itemNo == dItem_GOLDEN_FEATHER_e || - itemNo == dItem_KNIGHTS_CREST_e || itemNo == dItem_RED_JELLY_e || itemNo == dItem_GREEN_JELLY_e || itemNo == dItem_BLUE_JELLY_e) + if (itemNo == dItemNo_JOY_PENDANT_e || itemNo == dItemNo_SKULL_NECKLACE_e || itemNo == dItemNo_BOKOBABA_SEED_e || itemNo == dItemNo_GOLDEN_FEATHER_e || + itemNo == dItemNo_KNIGHTS_CREST_e || itemNo == dItemNo_RED_JELLY_e || itemNo == dItemNo_GREEN_JELLY_e || itemNo == dItemNo_BLUE_JELLY_e) { isEmono = TRUE; } @@ -2664,7 +2664,7 @@ BOOL isEmono(u8 itemNo) { /* 800C7C08-800C7C34 .text isEsa__FUc */ BOOL isEsa(u8 itemNo) { BOOL isEsa = FALSE; - if (itemNo == dItem_BIRD_BAIT_5_e || itemNo == dItem_HYOI_PEAR_e || itemNo == MAGIC_BEAN) { + if (itemNo == dItemNo_BIRD_BAIT_5_e || itemNo == dItemNo_HYOI_PEAR_e || itemNo == dItemNo_MAGIC_BEAN_e) { isEsa = TRUE; } return isEsa; @@ -2673,8 +2673,8 @@ BOOL isEsa(u8 itemNo) { /* 800C7C34-800C7C60 .text isRupee__FUc */ BOOL isRupee(u8 itemNo) { BOOL isRupee = FALSE; - if (itemNo == dItem_GREEN_RUPEE_e || itemNo == dItem_BLUE_RUPEE_e || itemNo == dItem_YELLOW_RUPEE_e || itemNo == dItem_RED_RUPEE_e || - itemNo == dItem_PURPLE_RUPEE_e || itemNo == dItem_ORANGE_RUPEE_e || itemNo == dItem_SILVER_RUPEE_e) + if (itemNo == dItemNo_GREEN_RUPEE_e || itemNo == dItemNo_BLUE_RUPEE_e || itemNo == dItemNo_YELLOW_RUPEE_e || itemNo == dItemNo_RED_RUPEE_e || + itemNo == dItemNo_PURPLE_RUPEE_e || itemNo == dItemNo_ORANGE_RUPEE_e || itemNo == dItemNo_SILVER_RUPEE_e) { isRupee = TRUE; } @@ -2684,7 +2684,7 @@ BOOL isRupee(u8 itemNo) { /* 800C7C60-800C7C7C .text isLimitedItem__FUc */ BOOL isLimitedItem(u8 itemNo) { BOOL isLimited = FALSE; - if (itemNo == dItem_BLUE_JELLY_e) { + if (itemNo == dItemNo_BLUE_JELLY_e) { isLimited = TRUE; } return isLimited; @@ -2693,8 +2693,8 @@ BOOL isLimitedItem(u8 itemNo) { /* 800C7C7C-800C7CB0 .text isNonSavedEmono__FUc */ BOOL isNonSavedEmono(u8 itemNo) { BOOL isEmono = FALSE; - if (itemNo == dItem_JOY_PENDANT_e || itemNo == dItem_SKULL_NECKLACE_e || itemNo == dItem_BOKOBABA_SEED_e || itemNo == dItem_GOLDEN_FEATHER_e || - itemNo == dItem_KNIGHTS_CREST_e || itemNo == dItem_RED_JELLY_e || itemNo == dItem_GREEN_JELLY_e) // No dItem_BLUE_JELLY_e + if (itemNo == dItemNo_JOY_PENDANT_e || itemNo == dItemNo_SKULL_NECKLACE_e || itemNo == dItemNo_BOKOBABA_SEED_e || itemNo == dItemNo_GOLDEN_FEATHER_e || + itemNo == dItemNo_KNIGHTS_CREST_e || itemNo == dItemNo_RED_JELLY_e || itemNo == dItemNo_GREEN_JELLY_e) // No dItemNo_BLUE_JELLY_e { isEmono = TRUE; } @@ -2704,7 +2704,7 @@ BOOL isNonSavedEmono(u8 itemNo) { /* 800C7CB0-800C7CDC .text isUseClothPacket__FUc */ BOOL isUseClothPacket(u8 itemNo) { BOOL isCloth = FALSE; - if (itemNo == HEROS_FLAG || itemNo == TAIRYO_FLAG || itemNo == SALES_FLAG || itemNo == RED_FLAG) { + if (itemNo == dItemNo_HEROS_FLAG_e || itemNo == dItemNo_BIG_CATCH_FLAG_e || itemNo == dItemNo_BIG_SALE_FLAG_e || itemNo == dItemNo_SICKLE_MOON_FLAG_e) { isCloth = TRUE; } return isCloth; @@ -2713,8 +2713,8 @@ BOOL isUseClothPacket(u8 itemNo) { /* 800C7CDC-800C7D08 .text isTriforce__FUc */ BOOL isTriforce(u8 itemNo) { BOOL isTriforce = FALSE; - if (itemNo == dItem_TRIFORCE1_e || itemNo == dItem_TRIFORCE2_e || itemNo == dItem_TRIFORCE3_e || itemNo == dItem_TRIFORCE4_e || - itemNo == dItem_TRIFORCE5_e || itemNo == dItem_TRIFORCE6_e || itemNo == dItem_TRIFORCE7_e || itemNo == dItem_TRIFORCE8_e) + if (itemNo == dItemNo_TRIFORCE1_e || itemNo == dItemNo_TRIFORCE2_e || itemNo == dItemNo_TRIFORCE3_e || itemNo == dItemNo_TRIFORCE4_e || + itemNo == dItemNo_TRIFORCE5_e || itemNo == dItemNo_TRIFORCE6_e || itemNo == dItemNo_TRIFORCE7_e || itemNo == dItemNo_TRIFORCE8_e) { isTriforce = TRUE; } @@ -2724,7 +2724,7 @@ BOOL isTriforce(u8 itemNo) { /* 800C7D08-800C7D28 .text isHeart__FUc */ BOOL isHeart(u8 itemNo) { BOOL isHeart = FALSE; - if (itemNo == dItem_HEART_e || itemNo == dItem_TRIPLE_HEART_e) { + if (itemNo == dItemNo_HEART_e || itemNo == dItemNo_TRIPLE_HEART_e) { isHeart = TRUE; } return isHeart; @@ -2738,44 +2738,44 @@ u8 getItemNoByLife(u8 itemNo) { if (lifePercent != 100) { return itemNo; } - if (itemNo == dItem_HEART_e) { - itemNo = dItem_GREEN_RUPEE_e; + if (itemNo == dItemNo_HEART_e) { + itemNo = dItemNo_GREEN_RUPEE_e; } - if (itemNo == dItem_TRIPLE_HEART_e) { - return dItem_YELLOW_RUPEE_e; + if (itemNo == dItemNo_TRIPLE_HEART_e) { + return dItemNo_YELLOW_RUPEE_e; } return itemNo; } /* 800C7D70-800C7ED0 .text check_itemno__Fi */ u8 check_itemno(int itemNo) { - if (dComIfGs_getMaxMagic() == 0 && (itemNo == dItem_SMALL_MAGIC_e || itemNo == dItem_LARGE_MAGIC_e)) { - return dItem_GREEN_RUPEE_e; + if (dComIfGs_getMaxMagic() == 0 && (itemNo == dItemNo_SMALL_MAGIC_e || itemNo == dItemNo_LARGE_MAGIC_e)) { + return dItemNo_GREEN_RUPEE_e; } if (!dComIfGs_isGetItem(0xC, 0) && !dComIfGs_isGetItem(0xC, 1) && !dComIfGs_isGetItem(0xC, 2)) { // Does not own any bow. if (isArrow(itemNo)) { - return dItem_GREEN_RUPEE_e; + return dItemNo_GREEN_RUPEE_e; } } if (!dComIfGs_isGetItem(0xD, 0)) { // Does not own bombs. if (isBomb(itemNo)) { - return dItem_GREEN_RUPEE_e; + return dItemNo_GREEN_RUPEE_e; } } - if (!checkItemGet(dItem_BAIT_BAG_e, TRUE)) { + if (!checkItemGet(dItemNo_BAIT_BAG_e, TRUE)) { if (isEsa(itemNo)) { - return dItem_GREEN_RUPEE_e; + return dItemNo_GREEN_RUPEE_e; } } - if (!checkItemGet(dItem_SPOILS_BAG_e, TRUE)) { + if (!checkItemGet(dItemNo_SPOILS_BAG_e, TRUE)) { if (isEmono(itemNo)) { - return dItem_GREEN_RUPEE_e; + return dItemNo_GREEN_RUPEE_e; } } - if (itemNo == dItem_TRIPLE_HEART_e) { - itemNo = dItem_HEART_e; + if (itemNo == dItemNo_TRIPLE_HEART_e) { + itemNo = dItemNo_HEART_e; } return itemNo; } @@ -2822,7 +2822,7 @@ u8 getEmonoItemFromLifeBallTable(u16 itemTableIdx) { } } - return dItem_NONE_e; + return dItemNo_NONE_e; } /* 800C8214-800C8498 .text getItemFromLifeBallTableWithoutEmono__FUs */ @@ -2848,16 +2848,16 @@ u8 getItemFromLifeBallTableWithoutEmono(u16 itemTableIdx) { for (int i = 0; i < 8; i++) { int randIdx = cM_rndF(15.999f); - if (!isEmono(items[randIdx]) && items[randIdx] != dItem_NONE_e) { + if (!isEmono(items[randIdx]) && items[randIdx] != dItemNo_NONE_e) { return items[randIdx]; } } for (int i = 0; i < 16; i++) { - if (!isEmono(items[i]) && items[i] != dItem_NONE_e) { + if (!isEmono(items[i]) && items[i] != dItemNo_NONE_e) { return items[i]; } } - return dItem_NONE_e; + return dItemNo_NONE_e; } diff --git a/src/d/d_item_data.cpp b/src/d/d_item_data.cpp index 2d83ec5c1..4e9c0ba1a 100644 --- a/src/d/d_item_data.cpp +++ b/src/d/d_item_data.cpp @@ -588,7 +588,7 @@ enum ItemTextureIdx { /* 803842B0-803866B0 .data item_resource__10dItem_data */ dItem_data_item_resource dItem_data::item_resource[0x100] = { { - // 0x00: dItem_HEART_e + // 0x00: dItemNo_HEART_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOTTLE_00], /* mBmdIdx */ ALWAYS_BDL_VHRTL, @@ -604,7 +604,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x0B80 }, { - // 0x01: dItem_GREEN_RUPEE_e + // 0x01: dItemNo_GREEN_RUPEE_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], /* mBmdIdx */ VLUPY_BDL_VLUPY, @@ -620,7 +620,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x17C0 }, { - // 0x02: dItem_BLUE_RUPEE_e + // 0x02: dItemNo_BLUE_RUPEE_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], /* mBmdIdx */ VLUPY_BDL_VLUPY, @@ -636,7 +636,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x17C0 }, { - // 0x03: dItem_YELLOW_RUPEE_e + // 0x03: dItemNo_YELLOW_RUPEE_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], /* mBmdIdx */ VLUPY_BDL_VLUPY, @@ -652,7 +652,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x17C0 }, { - // 0x04: dItem_RED_RUPEE_e + // 0x04: dItemNo_RED_RUPEE_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], /* mBmdIdx */ VLUPY_BDL_VLUPY, @@ -668,7 +668,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x17C0 }, { - // 0x05: dItem_PURPLE_RUPEE_e + // 0x05: dItemNo_PURPLE_RUPEE_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], /* mBmdIdx */ VLUPY_BDL_VLUPY, @@ -684,7 +684,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x17C0 }, { - // 0x06: dItem_ORANGE_RUPEE_e + // 0x06: dItemNo_ORANGE_RUPEE_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], /* mBmdIdx */ VLUPY_BDL_VLUPY, @@ -700,7 +700,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x17C0 }, { - // 0x07: dItem_HEART_PIECE_e + // 0x07: dItemNo_HEART_PIECE_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VHKAK], /* mTexture */ item_texture_tbl[TEXTURE_IDX_HEART_UP_02], /* mBmdIdx */ VHKAK_BDL_VHKAK, @@ -716,7 +716,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x2420 }, { - // 0x08: dItem_HEART_CONTAINER_e + // 0x08: dItemNo_HEART_CONTAINER_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VHUTU], /* mTexture */ item_texture_tbl[TEXTURE_IDX_HEART_UP_01], /* mBmdIdx */ VHUTU_BDL_VHUTU, @@ -732,7 +732,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x2500 }, { - // 0x09: dItem_SMALL_MAGIC_e + // 0x09: dItemNo_SMALL_MAGIC_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOTTLE_00], /* mBmdIdx */ ALWAYS_BDL_MPODA, @@ -748,7 +748,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x0B80 }, { - // 0x0A: dItem_LARGE_MAGIC_e + // 0x0A: dItemNo_LARGE_MAGIC_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOTTLE_00], /* mBmdIdx */ ALWAYS_BDL_MPODB, @@ -764,7 +764,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x0B80 }, { - // 0x0B: dItem_BOMB_5_e + // 0x0B: dItemNo_BOMB_5_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_BOMB_00], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOMB_00], /* mBmdIdx */ BOMB_00_BDL_VBOMB, @@ -780,7 +780,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x3000 }, { - // 0x0C: dItem_BOMB_10_e + // 0x0C: dItemNo_BOMB_10_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_BOMB_00], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOMB_00], /* mBmdIdx */ BOMB_00_BDL_VBOMB, @@ -796,7 +796,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x3000 }, { - // 0x0D: dItem_BOMB_20_e + // 0x0D: dItemNo_BOMB_20_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_BOMB_00], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOMB_00], /* mBmdIdx */ BOMB_00_BDL_VBOMB, @@ -812,7 +812,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x3000 }, { - // 0x0E: dItem_BOMB_30_e + // 0x0E: dItemNo_BOMB_30_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_BOMB_00], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOMB_00], /* mBmdIdx */ BOMB_00_BDL_VBOMB, @@ -828,7 +828,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x3000 }, { - // 0x0F: dItem_SILVER_RUPEE_e + // 0x0F: dItemNo_SILVER_RUPEE_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], /* mBmdIdx */ VLUPY_BDL_VLUPY, @@ -844,7 +844,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x17C0 }, { - // 0x10: dItem_ARROW_10_e + // 0x10: dItemNo_ARROW_10_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOW_01], /* mBmdIdx */ ALWAYS_BDL_ARROWITEM, @@ -860,7 +860,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x11: dItem_ARROW_20_e + // 0x11: dItemNo_ARROW_20_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOW_01], /* mBmdIdx */ ALWAYS_BDL_ARROWITEM, @@ -876,7 +876,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x2000 }, { - // 0x12: dItem_ARROW_30_e + // 0x12: dItemNo_ARROW_30_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOW_01], /* mBmdIdx */ ALWAYS_BDL_ARROWITEM, @@ -892,7 +892,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x3000 }, { - // 0x13: noentry19 + // 0x13: dItemNo_NOENTRY_19_e /* mArcname */ NULL, /* mTexture */ NULL, /* mBmdIdx */ -1, @@ -908,7 +908,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x5500 }, { - // 0x14: noentry20 + // 0x14: dItemNo_NOENTRY_20_e /* mArcname */ NULL, /* mTexture */ NULL, /* mBmdIdx */ -1, @@ -924,7 +924,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x5500 }, { - // 0x15: dItem_SMALL_KEY_e + // 0x15: dItemNo_SMALL_KEY_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VKEYN], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_KEY], /* mBmdIdx */ VKEYN_BDL_VKEYN, @@ -940,7 +940,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x3500 }, { - // 0x16: dItem_RECOVER_FAIRY_e + // 0x16: dItemNo_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. @@ -956,7 +956,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x4000 }, { - // 0x17: noentry23 + // 0x17: dItemNo_NOENTRY_23_e /* mArcname */ NULL, #if VERSION == VERSION_DEMO /* mTexture */ NULL, @@ -976,7 +976,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x18: noentry24 + // 0x18: dItemNo_NOENTRY_24_e /* mArcname */ NULL, #if VERSION == VERSION_DEMO /* mTexture */ NULL, @@ -996,7 +996,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x19: noentry25 + // 0x19: dItemNo_NOENTRY_25_e /* mArcname */ NULL, #if VERSION == VERSION_DEMO /* mTexture */ NULL, @@ -1016,7 +1016,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x1A: dItem_SUB_DUN_RUPEE_e + // 0x1A: dItemNo_SUB_DUN_RUPEE_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], /* mBmdIdx */ VLUPY_BDL_VLUPY, @@ -1032,7 +1032,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x17C0 }, { - // 0x1B: noentry27 + // 0x1B: dItemNo_NOENTRY_27_e /* mArcname */ NULL, /* mTexture */ NULL, /* mBmdIdx */ -1, @@ -1048,7 +1048,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x1C: noentry28 + // 0x1C: dItemNo_NOENTRY_28_e /* mArcname */ NULL, /* mTexture */ NULL, /* mBmdIdx */ -1, @@ -1064,7 +1064,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x1D: noentry29 + // 0x1D: dItemNo_NOENTRY_29_e /* mArcname */ NULL, /* mTexture */ NULL, /* mBmdIdx */ -1, @@ -1080,7 +1080,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x1E: dItem_TRIPLE_HEART_e + // 0x1E: dItemNo_TRIPLE_HEART_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOTTLE_00], /* mBmdIdx */ ALWAYS_BDL_VHRTL, @@ -1096,7 +1096,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x0B80 }, { - // 0x1F: dItem_JOY_PENDANT_e + // 0x1F: dItemNo_JOY_PENDANT_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VHAPP], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BEAST_08], /* mBmdIdx */ VHAPP_BDL_VHAPP, @@ -1112,7 +1112,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x20: dItem_TELESCOPE_e + // 0x20: dItemNo_TELESCOPE_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_TELE_00], /* mTexture */ item_texture_tbl[TEXTURE_IDX_TELESCOPE], /* mBmdIdx */ TELE_00_BDL_VTELE, @@ -1128,7 +1128,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x3320 }, { - // 0x21: dItem_TINGLE_TUNER_e + // 0x21: dItemNo_TINGLE_TUNER_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VCHIN], /* mTexture */ item_texture_tbl[TEXTURE_IDX_WHISTLE], /* mBmdIdx */ VCHIN_BDL_VCHIN, @@ -1144,7 +1144,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x22: dItem_WIND_WAKER_e + // 0x22: dItemNo_WIND_WAKER_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VTACT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BATON], /* mBmdIdx */ VTACT_BDL_VTACT, @@ -1160,7 +1160,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x23: CAMERA + // 0x23: dItemNo_PICTO_BOX_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VBOXN], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CAMERA], /* mBmdIdx */ VBOXN_BDL_VBOXN, @@ -1176,7 +1176,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x24: dItem_SPOILS_BAG_e + // 0x24: dItemNo_SPOILS_BAG_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VBAGE], /* mTexture */ item_texture_tbl[TEXTURE_IDX_COVEROFBEAST], /* mBmdIdx */ VBAGE_BDL_VBAGE, @@ -1192,7 +1192,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x25: dItem_GRAPPLING_HOOK_e + // 0x25: dItemNo_GRAPPLING_HOOK_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VROPE], /* mTexture */ item_texture_tbl[TEXTURE_IDX_ROPE], /* mBmdIdx */ VROPE_BDL_VROPE, @@ -1208,7 +1208,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x3000 }, { - // 0x26: CAMERA2 + // 0x26: dItemNo_DELUXE_PICTO_BOX_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VBOXA], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CAMERA_2], /* mBmdIdx */ VBOXA_BDL_VBOXP, @@ -1224,7 +1224,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x2000 }, { - // 0x27: dItem_BOW_e + // 0x27: dItemNo_BOW_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VBOW], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOW_01], /* mBmdIdx */ VBOW_BDL_VBOW, @@ -1240,7 +1240,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x3000 }, { - // 0x28: dItem_POWER_BRACELETS_e + // 0x28: dItemNo_POWER_BRACELETS_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VPOWR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GLOVES_00_0x35], /* mBmdIdx */ VPOWR_BDL_VPOWR, @@ -1256,7 +1256,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x3000 }, { - // 0x29: dItem_IRON_BOOTS_e + // 0x29: dItemNo_IRON_BOOTS_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VBOOT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOOTS_00], /* mBmdIdx */ VBOOT_BDL_VBOOT, @@ -1272,7 +1272,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x3000 }, { - // 0x2A: dItem_MAGIC_ARMOR_e + // 0x2A: dItemNo_MAGIC_ARMOR_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAGS], /* mTexture */ item_texture_tbl[TEXTURE_IDX_SHIELD_02], /* mBmdIdx */ VMAGS_BDL_VMAGS, @@ -1288,7 +1288,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x2B: WATER_BOOTS + // 0x2B: dItemNo_WATER_BOOTS_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VBOML], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOOTS_01], /* mBmdIdx */ -1, @@ -1304,7 +1304,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x2C: dItem_BAIT_BAG_e + // 0x2C: dItemNo_BAIT_BAG_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VBAGF], /* mTexture */ item_texture_tbl[TEXTURE_IDX_COVEROFBAIT], /* mBmdIdx */ VBAGF_BDL_VBAGF, @@ -1320,7 +1320,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x2D: dItem_BOOMERANG_e + // 0x2D: dItemNo_BOOMERANG_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_BOOM], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOOMERANG], /* mBmdIdx */ BOOM_BDL_VBOOM, @@ -1336,7 +1336,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x3000 }, { - // 0x2E: BARE_HAND + // 0x2E: dItemNo_BARE_HAND_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VFUKU], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GLOVES_00_0x34], /* mBmdIdx */ VFUKU_BDL_VFUKU, @@ -1352,7 +1352,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x3000 }, { - // 0x2F: dItem_HOOKSHOT_e + // 0x2F: dItemNo_HOOKSHOT_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VHOOK], /* mTexture */ item_texture_tbl[TEXTURE_IDX_HOOKSHOT], /* mBmdIdx */ VHOOK_BDL_VHOOK, @@ -1368,7 +1368,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x3000 }, { - // 0x30: dItem_DELIVERY_BAG_e + // 0x30: dItemNo_DELIVERY_BAG_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VBAGH], /* mTexture */ item_texture_tbl[TEXTURE_IDX_DELIVERY], /* mBmdIdx */ VBAGH_BDL_VBAGH, @@ -1384,7 +1384,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x31: dItem_BOMB_BAG_e + // 0x31: dItemNo_BOMB_BAG_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_BOMB_00], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOMB_00], /* mBmdIdx */ BOMB_00_BDL_VBOMB, @@ -1400,7 +1400,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x3000 }, { - // 0x32: dItem_FUKU_e + // 0x32: dItemNo_FUKU_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VFUKU], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CLOTHES], /* mBmdIdx */ VFUKU_BDL_VFUKU, @@ -1416,7 +1416,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x3000 }, { - // 0x33: dItem_SKULL_HAMMER_e + // 0x33: dItemNo_SKULL_HAMMER_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VHAMM], /* mTexture */ item_texture_tbl[TEXTURE_IDX_HAMMER_01], /* mBmdIdx */ VHAMM_BDL_VHAMM, @@ -1432,7 +1432,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x3000 }, { - // 0x34: dItem_DEKU_LEAF_e + // 0x34: dItemNo_DEKU_LEAF_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLEAF], /* mTexture */ item_texture_tbl[TEXTURE_IDX_FAN], /* mBmdIdx */ VLEAF_BDL_VLEAF, @@ -1448,7 +1448,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x3000 }, { - // 0x35: dItem_MAGIC_ARROW_e + // 0x35: dItemNo_MAGIC_ARROW_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VARFI], /* mTexture */ item_texture_tbl[TEXTURE_IDX_ARROW_POWER_01], /* mBmdIdx */ VARFI_BDL_VARFI, @@ -1464,7 +1464,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x3000 }, { - // 0x36: dItem_LIGHT_ARROW_e + // 0x36: dItemNo_LIGHT_ARROW_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VARRL], /* mTexture */ item_texture_tbl[TEXTURE_IDX_ARROW_POWER_02], /* mBmdIdx */ VARRL_BDL_VARRL, @@ -1480,7 +1480,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x3000 }, { - // 0x37: dItem_NEW_FUKU_e + // 0x37: dItemNo_NEW_FUKU_e /* mArcname */ NULL, /* mTexture */ item_texture_tbl[TEXTURE_IDX_CLOTHES], /* mBmdIdx */ -1, @@ -1496,7 +1496,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x38: dItem_SWORD_e + // 0x38: dItemNo_SWORD_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VSWON], /* mTexture */ item_texture_tbl[TEXTURE_IDX_SWORD_00], /* mBmdIdx */ VSWON_BDL_VSWON, @@ -1512,7 +1512,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x3000 }, { - // 0x39: dItem_MASTER_SWORD_1_e + // 0x39: dItemNo_MASTER_SWORD_1_e /* mArcname */ NULL, /* mTexture */ item_texture_tbl[TEXTURE_IDX_SWORD_01], /* mBmdIdx */ -1, @@ -1528,7 +1528,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x5500 }, { - // 0x3A: dItem_MASTER_SWORD_2_e + // 0x3A: dItemNo_MASTER_SWORD_2_e /* mArcname */ NULL, /* mTexture */ item_texture_tbl[TEXTURE_IDX_SWORD_02], /* mBmdIdx */ -1, @@ -1544,7 +1544,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x5500 }, { - // 0x3B: dItem_SHIELD_e + // 0x3B: dItemNo_SHIELD_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VSHIN], /* mTexture */ item_texture_tbl[TEXTURE_IDX_SHIELD_00], /* mBmdIdx */ VSHIN_BDL_VSHIN, @@ -1560,7 +1560,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x5000 }, { - // 0x3C: dItem_MIRROR_SHIELD_e + // 0x3C: dItemNo_MIRROR_SHIELD_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VSHIM], /* mTexture */ item_texture_tbl[TEXTURE_IDX_SHIELD_01], /* mBmdIdx */ VSHIM_BDL_VSHIM, @@ -1576,7 +1576,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x3D: dItem_DROPPED_SWORD_e + // 0x3D: dItemNo_DROPPED_SWORD_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VSWON], /* mTexture */ item_texture_tbl[TEXTURE_IDX_SWORD_00], /* mBmdIdx */ VSWON_BDL_VSWON, @@ -1592,7 +1592,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x3000 }, { - // 0x3E: dItem_MASTER_SWORD_3_e + // 0x3E: dItemNo_MASTER_SWORD_3_e /* mArcname */ NULL, /* mTexture */ item_texture_tbl[TEXTURE_IDX_SWORD_03], /* mBmdIdx */ -1, @@ -1608,7 +1608,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x3F: KAKERA_HEART2 + // 0x3F: dItemNo_HEART_PIECE_ALT_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VHKAK], /* mTexture */ item_texture_tbl[TEXTURE_IDX_HEART_UP_02], /* mBmdIdx */ VHKAK_BDL_VHKAK, @@ -1624,7 +1624,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x2420 }, { - // 0x40: noentry64 + // 0x40: dItemNo_NOENTRY_64_e /* mArcname */ NULL, /* mTexture */ NULL, /* mBmdIdx */ -1, @@ -1640,7 +1640,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x41: noentry65 + // 0x41: dItemNo_NOENTRY_65_e /* mArcname */ NULL, /* mTexture */ NULL, /* mBmdIdx */ -1, @@ -1656,7 +1656,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x42: dItem_PIRATES_CHARM_e + // 0x42: dItemNo_PIRATES_CHARM_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VAMUK], /* mTexture */ item_texture_tbl[TEXTURE_IDX_AMULET_00], /* mBmdIdx */ VAMUK_BDL_VAMUK, @@ -1672,7 +1672,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x3000 }, { - // 0x43: dItem_HEROS_CHARM_e + // 0x43: dItemNo_HEROS_CHARM_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VAMUY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_AMULET_01], /* mBmdIdx */ VAMUY_BDL_VAMUY, @@ -1688,7 +1688,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x44: GRASS_BALL + // 0x44: dItemNo_GRASS_BALL_e /* mArcname */ NULL, /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOTTLE_00], /* mBmdIdx */ -1, @@ -1704,7 +1704,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x45: dItem_SKULL_NECKLACE_e + // 0x45: dItemNo_SKULL_NECKLACE_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VDOKU], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BEAST_01], /* mBmdIdx */ VDOKU_BDL_VDOKU, @@ -1720,7 +1720,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x2000 }, { - // 0x46: dItem_BOKOBABA_SEED_e + // 0x46: dItemNo_BOKOBABA_SEED_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VBOKO], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BEAST_02], /* mBmdIdx */ VBOKO_BDL_VBOKO, @@ -1736,7 +1736,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x47: dItem_GOLDEN_FEATHER_e + // 0x47: dItemNo_GOLDEN_FEATHER_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VHANE], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BEAST_03], /* mBmdIdx */ VHANE_BDL_VHANE, @@ -1752,7 +1752,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x2000 }, { - // 0x48: dItem_KNIGHTS_CREST_e + // 0x48: dItemNo_KNIGHTS_CREST_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VBELT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BEAST_04], /* mBmdIdx */ VBELT_BDL_VBELT, @@ -1768,7 +1768,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x2000 }, { - // 0x49: dItem_RED_JELLY_e + // 0x49: dItemNo_RED_JELLY_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VCHUJ], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BEAST_05], /* mBmdIdx */ VCHUJ_BDL_VCHUJ, @@ -1784,7 +1784,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x4A: dItem_GREEN_JELLY_e + // 0x4A: dItemNo_GREEN_JELLY_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VCHUJ], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BEAST_06], /* mBmdIdx */ VCHUJ_BDL_VCHUJ, @@ -1800,7 +1800,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x4B: dItem_BLUE_JELLY_e + // 0x4B: dItemNo_BLUE_JELLY_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VCHUJ], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BEAST_07], /* mBmdIdx */ VCHUJ_BDL_VCHUJ, @@ -1816,7 +1816,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x4C: dItem_MAP_e + // 0x4C: dItemNo_MAP_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VDUNM], /* mTexture */ item_texture_tbl[TEXTURE_IDX_DUNGEON_MAP], /* mBmdIdx */ VDUNM_BDL_VDUNM, @@ -1832,7 +1832,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x4D: dItem_COMPASS_e + // 0x4D: dItemNo_COMPASS_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VDUNC], /* mTexture */ item_texture_tbl[TEXTURE_IDX_COMPASS], /* mBmdIdx */ VDUNC_BDL_VDUNC, @@ -1848,7 +1848,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x3000 }, { - // 0x4E: dItem_BOSS_KEY_e + // 0x4E: dItemNo_BOSS_KEY_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_KEY_01], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOSS_KEY], /* mBmdIdx */ KEY_01_BDL_VKEYB, @@ -1864,7 +1864,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x54A0 }, { - // 0x4F: EMPTY_BSHIP + // 0x4F: dItemNo_EMPTY_BSHIP_e /* mArcname */ NULL, /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOTTLE_00], /* mBmdIdx */ -1, @@ -1880,7 +1880,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x50: dItem_EMPTY_BOTTLE_e + // 0x50: dItemNo_EMPTY_BOTTLE_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_BIN], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOTTLE_00], /* mBmdIdx */ BIN_BDL_VBINX, @@ -1896,7 +1896,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x3000 }, { - // 0x51: dItem_RED_POTION_e + // 0x51: dItemNo_RED_POTION_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_MED_R], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOTTLE_01], /* mBmdIdx */ MED_R_BDL_VBINR, @@ -1912,7 +1912,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x3000 }, { - // 0x52: dItem_GREEN_POTION_e + // 0x52: dItemNo_GREEN_POTION_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_MED_G], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOTTLE_02], /* mBmdIdx */ MED_G_BDL_VBING, @@ -1928,7 +1928,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x3000 }, { - // 0x53: dItem_BLUE_POTION_e + // 0x53: dItemNo_BLUE_POTION_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_MED_B], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOTTLE_03], /* mBmdIdx */ MED_B_BDL_VBINB, @@ -1944,7 +1944,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x3000 }, { - // 0x54: dItem_HALF_SOUP_BOTTLE_e + // 0x54: dItemNo_HALF_SOUP_BOTTLE_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VBINS], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOTTLE_09], /* mBmdIdx */ VBINS_BDL_VBINS, @@ -1960,7 +1960,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x3000 }, { - // 0x55: dItem_SOUP_BOTTLE_e + // 0x55: dItemNo_SOUP_BOTTLE_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VBINS], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOTTLE_04], /* mBmdIdx */ VBINS_BDL_VBINS, @@ -1976,7 +1976,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x3000 }, { - // 0x56: dItem_WATER_BOTTLE_e + // 0x56: dItemNo_WATER_BOTTLE_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VBINW], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOTTLE_05], /* mBmdIdx */ VBINW_BDL_VBINW, @@ -1992,7 +1992,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x3000 }, { - // 0x57: dItem_FAIRY_BOTTLE_e + // 0x57: dItemNo_FAIRY_BOTTLE_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VBINY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOTTLE_06], /* mBmdIdx */ VBINY_BDL_VBINY, @@ -2008,7 +2008,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x3000 }, { - // 0x58: dItem_FIREFLY_BOTTLE_e + // 0x58: dItemNo_FIREFLY_BOTTLE_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VBINH], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOTTLE_07], /* mBmdIdx */ VBINH_BDL_VBINH, @@ -2024,7 +2024,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x3000 }, { - // 0x59: dItem_FOREST_WATER_e + // 0x59: dItemNo_FOREST_WATER_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_FWBIN], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOTTLE_08], /* mBmdIdx */ FWBIN_BDL_VBINW_F, @@ -2040,7 +2040,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x3000 }, { - // 0x5A: UNK_BOTTLE_5A + // 0x5A: dItemNo_UNK_BOTTLE_5A_e /* mArcname */ NULL, /* mTexture */ NULL, /* mBmdIdx */ -1, @@ -2056,7 +2056,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x5B: UNK_BOTTLE_5B + // 0x5B: dItemNo_UNK_BOTTLE_5B_e /* mArcname */ NULL, /* mTexture */ NULL, /* mBmdIdx */ -1, @@ -2072,7 +2072,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x5C: UNK_BOTTLE_5C + // 0x5C: dItemNo_UNK_BOTTLE_5C_e /* mArcname */ NULL, /* mTexture */ NULL, /* mBmdIdx */ -1, @@ -2088,7 +2088,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x5D: UNK_BOTTLE_5D + // 0x5D: dItemNo_UNK_BOTTLE_5D_e /* mArcname */ NULL, /* mTexture */ NULL, /* mBmdIdx */ -1, @@ -2104,7 +2104,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x5E: UNK_BOTTLE_5E + // 0x5E: dItemNo_UNK_BOTTLE_5E_e /* mArcname */ NULL, /* mTexture */ NULL, /* mBmdIdx */ -1, @@ -2120,7 +2120,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x5F: UNK_BOTTLE_5F + // 0x5F: dItemNo_UNK_BOTTLE_5F_e /* mArcname */ NULL, /* mTexture */ NULL, /* mBmdIdx */ -1, @@ -2136,7 +2136,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x60: UNK_BOTTLE_60 + // 0x60: dItemNo_UNK_BOTTLE_60_e /* mArcname */ NULL, /* mTexture */ NULL, /* mBmdIdx */ -1, @@ -2152,7 +2152,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x61: dItem_TRIFORCE1_e + // 0x61: dItemNo_TRIFORCE1_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VTRI1], /* mTexture */ item_texture_tbl[TEXTURE_IDX_TRIFORCE_00], /* mBmdIdx */ VTRI1_BDL_VTRI1, @@ -2168,7 +2168,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x62: dItem_TRIFORCE2_e + // 0x62: dItemNo_TRIFORCE2_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VTRI2], /* mTexture */ item_texture_tbl[TEXTURE_IDX_TRIFORCE_01], /* mBmdIdx */ VTRI2_BDL_VTRI2, @@ -2184,7 +2184,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x63: dItem_TRIFORCE3_e + // 0x63: dItemNo_TRIFORCE3_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VTRI3], /* mTexture */ item_texture_tbl[TEXTURE_IDX_TRIFORCE_02], /* mBmdIdx */ VTRI3_BDL_VTRI3, @@ -2200,7 +2200,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x64: dItem_TRIFORCE4_e + // 0x64: dItemNo_TRIFORCE4_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VTRI4], /* mTexture */ item_texture_tbl[TEXTURE_IDX_TRIFORCE_03], /* mBmdIdx */ VTRI4_BDL_VTRI4, @@ -2216,7 +2216,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x65: dItem_TRIFORCE5_e + // 0x65: dItemNo_TRIFORCE5_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VTRI5], /* mTexture */ item_texture_tbl[TEXTURE_IDX_TRIFORCE_04], /* mBmdIdx */ VTRI5_BDL_VTRI5, @@ -2232,7 +2232,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x66: dItem_TRIFORCE6_e + // 0x66: dItemNo_TRIFORCE6_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VTRI6], /* mTexture */ item_texture_tbl[TEXTURE_IDX_TRIFORCE_05], /* mBmdIdx */ VTRI6_BDL_VTRI6, @@ -2248,7 +2248,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x67: dItem_TRIFORCE7_e + // 0x67: dItemNo_TRIFORCE7_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VTRI7], /* mTexture */ item_texture_tbl[TEXTURE_IDX_TRIFORCE_06], /* mBmdIdx */ VTRI7_BDL_VTRI7, @@ -2264,7 +2264,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x68: dItem_TRIFORCE8_e + // 0x68: dItemNo_TRIFORCE8_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VTRI8], /* mTexture */ item_texture_tbl[TEXTURE_IDX_TRIFORCE_07], /* mBmdIdx */ VTRI8_BDL_VTRI8, @@ -2280,7 +2280,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x69: dItem_PEARL_NAYRU_e + // 0x69: dItemNo_PEARL_NAYRU_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_SHINJU_N], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GOD_SYMBOL_02], /* mBmdIdx */ SHINJU_N_BDL_VPEAN, @@ -2296,7 +2296,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x3000 }, { - // 0x6A: dItem_PEARL_DIN_e + // 0x6A: dItemNo_PEARL_DIN_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_SHINJU_D], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GOD_SYMBOL_00], /* mBmdIdx */ SHINJU_D_BDL_VPEAD, @@ -2312,7 +2312,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x3000 }, { - // 0x6B: dItem_PEARL_FARORE_e + // 0x6B: dItemNo_PEARL_FARORE_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_SHINJU_F], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GOD_SYMBOL_01], /* mBmdIdx */ SHINJU_F_BDL_VPEAF, @@ -2328,7 +2328,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x3000 }, { - // 0x6C: KNOWLEDGE_TF + // 0x6C: dItemNo_KNOWLEDGE_TF_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VAMUK], /* mTexture */ item_texture_tbl[TEXTURE_IDX_AMULET_00], /* mBmdIdx */ VAMUK_BDL_VAMUK, @@ -2344,7 +2344,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x6D: TACT_SONG1 + // 0x6D: dItemNo_WINDS_REQUIEM_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VAMUK], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BATON], /* mBmdIdx */ VAMUK_BDL_VAMUK, @@ -2360,7 +2360,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x6E: TACT_SONG2 + // 0x6E: dItemNo_BALLAD_OF_GALES_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VAMUK], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BATON], /* mBmdIdx */ VAMUK_BDL_VAMUK, @@ -2376,7 +2376,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x6F: TACT_SONG3 + // 0x6F: dItemNo_COMMAND_MELODY_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VAMUK], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BATON], /* mBmdIdx */ VAMUK_BDL_VAMUK, @@ -2392,7 +2392,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x70: TACT_SONG4 + // 0x70: dItemNo_EARTH_GODS_LYRIC_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VAMUK], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BATON], /* mBmdIdx */ VAMUK_BDL_VAMUK, @@ -2408,7 +2408,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x71: TACT_SONG5 + // 0x71: dItemNo_WIND_GODS_ARIA_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VAMUK], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BATON], /* mBmdIdx */ VAMUK_BDL_VAMUK, @@ -2424,7 +2424,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x72: TACT_SONG6 + // 0x72: dItemNo_SONG_OF_PASSING_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VAMUK], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BATON], /* mBmdIdx */ VAMUK_BDL_VAMUK, @@ -2440,7 +2440,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x73: noentry115 + // 0x73: dItemNo_NOENTRY_115_e /* mArcname */ NULL, /* mTexture */ NULL, /* mBmdIdx */ -1, @@ -2456,7 +2456,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x74: noentry116 + // 0x74: dItemNo_NOENTRY_116_e /* mArcname */ NULL, /* mTexture */ NULL, /* mBmdIdx */ -1, @@ -2472,7 +2472,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x75: noentry117 + // 0x75: dItemNo_NOENTRY_117_e /* mArcname */ NULL, /* mTexture */ NULL, /* mBmdIdx */ -1, @@ -2488,7 +2488,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x76: noentry118 + // 0x76: dItemNo_NOENTRY_118_e /* mArcname */ NULL, /* mTexture */ NULL, /* mBmdIdx */ -1, @@ -2504,7 +2504,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x77: noentry119 + // 0x77: dItemNo_NOENTRY_119_e /* mArcname */ NULL, /* mTexture */ NULL, /* mBmdIdx */ -1, @@ -2520,7 +2520,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x78: NORMAL_SAIL + // 0x78: dItemNo_SAIL_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VHO], /* mTexture */ item_texture_tbl[TEXTURE_IDX_SAIL_00], /* mBmdIdx */ VHO_BDL_VHO, @@ -2536,7 +2536,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x79: TRIFORCE_MAP1 + // 0x79: dItemNo_TRIFORCE_MAP_1_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TRI2], /* mBmdIdx */ VMAPT_BDL_VMAPT, @@ -2552,7 +2552,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x7A: TRIFORCE_MAP2 + // 0x7A: dItemNo_TRIFORCE_MAP_2_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TRI2], /* mBmdIdx */ VMAPT_BDL_VMAPT, @@ -2568,7 +2568,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x7B: TRIFORCE_MAP3 + // 0x7B: dItemNo_TRIFORCE_MAP_3_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TRI2], /* mBmdIdx */ VMAPT_BDL_VMAPT, @@ -2584,7 +2584,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x7C: TRIFORCE_MAP4 + // 0x7C: dItemNo_TRIFORCE_MAP_4_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TRI2], /* mBmdIdx */ VMAPT_BDL_VMAPT, @@ -2600,7 +2600,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x7D: TRIFORCE_MAP5 + // 0x7D: dItemNo_TRIFORCE_MAP_5_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TRI2], /* mBmdIdx */ VMAPT_BDL_VMAPT, @@ -2616,7 +2616,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x7E: TRIFORCE_MAP6 + // 0x7E: dItemNo_TRIFORCE_MAP_6_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TRI2], /* mBmdIdx */ VMAPT_BDL_VMAPT, @@ -2632,7 +2632,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x7F: TRIFORCE_MAP7 + // 0x7F: dItemNo_TRIFORCE_MAP_7_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TRI2], /* mBmdIdx */ VMAPT_BDL_VMAPT, @@ -2648,7 +2648,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x80: TRIFORCE_MAP8 + // 0x80: dItemNo_TRIFORCE_MAP_8_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TRI2], /* mBmdIdx */ VMAPT_BDL_VMAPT, @@ -2664,7 +2664,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x81: noentry129 + // 0x81: dItemNo_NOENTRY_129_e /* mArcname */ NULL, /* mTexture */ NULL, /* mBmdIdx */ -1, @@ -2680,7 +2680,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x82: dItem_BIRD_BAIT_5_e + // 0x82: dItemNo_BIRD_BAIT_5_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VESA], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BAIT_01], /* mBmdIdx */ VESA_BDL_VESA, @@ -2696,7 +2696,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x2000 }, { - // 0x83: dItem_HYOI_PEAR_e + // 0x83: dItemNo_HYOI_PEAR_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VHYOI], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BAIT_02], /* mBmdIdx */ VHYOI_BDL_VHYOI, @@ -2712,7 +2712,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x84: ESA1 + // 0x84: dItemNo_ESA_1_e /* mArcname */ NULL, /* mTexture */ NULL, /* mBmdIdx */ -1, @@ -2728,7 +2728,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x85: ESA2 + // 0x85: dItemNo_ESA_2_e /* mArcname */ NULL, /* mTexture */ NULL, /* mBmdIdx */ -1, @@ -2744,7 +2744,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x86: ESA3 + // 0x86: dItemNo_ESA_3_e /* mArcname */ NULL, /* mTexture */ NULL, /* mBmdIdx */ -1, @@ -2760,7 +2760,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x87: ESA4 + // 0x87: dItemNo_ESA_4_e /* mArcname */ NULL, /* mTexture */ NULL, /* mBmdIdx */ -1, @@ -2776,7 +2776,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x88: ESA5 + // 0x88: dItemNo_ESA_5_e /* mArcname */ NULL, /* mTexture */ NULL, /* mBmdIdx */ -1, @@ -2792,7 +2792,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x89: MAGIC_BEAN + // 0x89: dItemNo_MAGIC_BEAN_e /* mArcname */ NULL, /* mTexture */ NULL, /* mBmdIdx */ -1, @@ -2808,7 +2808,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x8A: BIRD_ESA_10 + // 0x8A: dItemNo_BIRD_ESA_10_e /* mArcname */ NULL, /* mTexture */ NULL, /* mBmdIdx */ -1, @@ -2824,7 +2824,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x8B: noentry139 + // 0x8B: dItemNo_NOENTRY_139_e /* mArcname */ NULL, /* mTexture */ NULL, /* mBmdIdx */ -1, @@ -2840,7 +2840,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x8C: FLOWER_1 + // 0x8C: dItemNo_TOWN_FLOWER_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VOBJ00], /* mTexture */ item_texture_tbl[TEXTURE_IDX_DELIVERY_01], /* mBmdIdx */ VOBJ00_BDL_VOBJ00, @@ -2856,7 +2856,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x8D: FLOWER_2 + // 0x8D: dItemNo_SEA_FLOWER_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VOBJ01], /* mTexture */ item_texture_tbl[TEXTURE_IDX_DELIVERY_02], /* mBmdIdx */ VOBJ01_BDL_VOBJ01, @@ -2872,7 +2872,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x8E: FLOWER_3 + // 0x8E: dItemNo_EXOTIC_FLOWER_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VOBJ02], /* mTexture */ item_texture_tbl[TEXTURE_IDX_DELIVERY_03], /* mBmdIdx */ VOBJ02_BDL_VOBJ02, @@ -2888,7 +2888,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x8F: HEROS_FLAG + // 0x8F: dItemNo_HEROS_FLAG_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VOBJ03], /* mTexture */ item_texture_tbl[TEXTURE_IDX_DELIVERY_04], /* mBmdIdx */ VOBJ03_BDL_VOBJ03, @@ -2904,7 +2904,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x90: TAIRYO_FLAG + // 0x90: dItemNo_BIG_CATCH_FLAG_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VOBJ04], /* mTexture */ item_texture_tbl[TEXTURE_IDX_DELIVERY_05], /* mBmdIdx */ VOBJ04_BDL_VOBJ04, @@ -2920,7 +2920,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x91: SALES_FLAG + // 0x91: dItemNo_BIG_SALE_FLAG_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VOBJ05], /* mTexture */ item_texture_tbl[TEXTURE_IDX_DELIVERY_06], /* mBmdIdx */ VOBJ05_BDL_VOBJ05, @@ -2936,7 +2936,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x92: WIND_FLAG + // 0x92: dItemNo_PINWHEEL_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VOBJ06], /* mTexture */ item_texture_tbl[TEXTURE_IDX_DELIVERY_07], /* mBmdIdx */ VOBJ06_BDL_VOBJ06, @@ -2952,7 +2952,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x93: RED_FLAG + // 0x93: dItemNo_SICKLE_MOON_FLAG_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VOBJ07], /* mTexture */ item_texture_tbl[TEXTURE_IDX_DELIVERY_08], /* mBmdIdx */ VOBJ07_BDL_VOBJ07, @@ -2968,7 +2968,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x94: FOSSIL_HEAD + // 0x94: dItemNo_SKULL_TOWER_IDOL_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VOBJ08], /* mTexture */ item_texture_tbl[TEXTURE_IDX_DELIVERY_09], /* mBmdIdx */ VOBJ08_BDL_VOBJ08, @@ -2984,7 +2984,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x95: WATER_STATUE + // 0x95: dItemNo_FOUNTAIN_IDOL_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VOBJ09], /* mTexture */ item_texture_tbl[TEXTURE_IDX_DELIVERY_10], /* mBmdIdx */ VOBJ09_BDL_VOBJ09, @@ -3000,7 +3000,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x96: POSTMAN_STATUE + // 0x96: dItemNo_POSTMAN_STATUE_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VOBJ10], /* mTexture */ item_texture_tbl[TEXTURE_IDX_DELIVERY_11], /* mBmdIdx */ VOBJ10_BDL_VOBJ10, @@ -3016,7 +3016,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x97: PRESIDENT_STATUE + // 0x97: dItemNo_SHOP_GURU_STATUE_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VOBJ11], /* mTexture */ item_texture_tbl[TEXTURE_IDX_DELIVERY_12], /* mBmdIdx */ VOBJ11_BDL_VOBJ11, @@ -3032,7 +3032,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x98: dItem_FATHER_LETTER_e + // 0x98: dItemNo_FATHER_LETTER_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLETT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_DELIVERY_13], /* mBmdIdx */ VLETT_BDL_VLETT, @@ -3048,7 +3048,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x99: dItem_NOTE_TO_MOM_e + // 0x99: dItemNo_NOTE_TO_MOM_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLEOF], /* mTexture */ item_texture_tbl[TEXTURE_IDX_DELIVERY_14], /* mBmdIdx */ VLEOF_BDL_VLEOF, @@ -3064,7 +3064,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x9A: MAGYS_LETTER + // 0x9A: dItemNo_MAGGIES_LETTER_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLEMG], /* mTexture */ item_texture_tbl[TEXTURE_IDX_DELIVERY_15], /* mBmdIdx */ VLEMG_BDL_VLEMG, @@ -3080,7 +3080,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x9B: MO_LETTER + // 0x9B: dItemNo_MOBLINS_LETTER_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLEMO], /* mTexture */ item_texture_tbl[TEXTURE_IDX_DELIVERY_16], /* mBmdIdx */ VLEMO_BDL_VLEMO, @@ -3096,7 +3096,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x9C: COTTAGE_PAPER + // 0x9C: dItemNo_CABANA_DEED_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VBESO], /* mTexture */ item_texture_tbl[TEXTURE_IDX_DELIVERY_17], /* mBmdIdx */ VBESO_BDL_VBESO, @@ -3112,7 +3112,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x9D: KAISEN_PRESENT1 + // 0x9D: dItemNo_COMPLIMENTARY_ID_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VOHOM], /* mTexture */ item_texture_tbl[TEXTURE_IDX_DELIVERY_18], /* mBmdIdx */ VOHOM_BDL_VOHOM, @@ -3128,7 +3128,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x9E: KAISEN_PRESENT2 + // 0x9E: dItemNo_FILL_UP_COUPON_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMANT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_DELIVERY_19], /* mBmdIdx */ VMANT_BDL_VMANT, @@ -3144,7 +3144,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x9F: SALVAGE_ITEM1 + // 0x9F: dItemNo_LEGENDARY_PICTOGRAPH_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VBOXA], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CAMERA], /* mBmdIdx */ VBOXA_BDL_VBOXP, @@ -3160,7 +3160,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x2000 }, { - // 0xA0: SALVAGE_ITEM2 + // 0xA0: dItemNo_SALVAGE_ITEM_2_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VAMUK], /* mTexture */ item_texture_tbl[TEXTURE_IDX_AMULET_00], /* mBmdIdx */ VAMUK_BDL_VAMUK, @@ -3176,7 +3176,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xA1: SALVAGE_ITEM3 + // 0xA1: dItemNo_SALVAGE_ITEM_3_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VAMUK], /* mTexture */ item_texture_tbl[TEXTURE_IDX_AMULET_00], /* mBmdIdx */ VAMUK_BDL_VAMUK, @@ -3192,7 +3192,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xA2: XXX_039 + // 0xA2: dItemNo_XXX_039_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VAMUK], /* mTexture */ item_texture_tbl[TEXTURE_IDX_AMULET_00], /* mBmdIdx */ VAMUK_BDL_VAMUK, @@ -3208,7 +3208,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xA3: TINGLE_STATUE1 + // 0xA3: dItemNo_TINGLE_STATUE_1_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VTIN1], /* mTexture */ item_texture_tbl[TEXTURE_IDX_TINGLE_FIGURE], /* mBmdIdx */ VTIN1_BDL_VTIN1, @@ -3224,7 +3224,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x17C0 }, { - // 0xA4: TINGLE_STATUE2 + // 0xA4: dItemNo_TINGLE_STATUE_2_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VTIN2], /* mTexture */ item_texture_tbl[TEXTURE_IDX_TINGLE_FIGURE], /* mBmdIdx */ VTIN2_BDL_VTIN2, @@ -3240,7 +3240,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x17C0 }, { - // 0xA5: TINGLE_STATUE3 + // 0xA5: dItemNo_TINGLE_STATUE_3_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VTIN3], /* mTexture */ item_texture_tbl[TEXTURE_IDX_TINGLE_FIGURE], /* mBmdIdx */ VTIN3_BDL_VTIN3, @@ -3256,7 +3256,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x17C0 }, { - // 0xA6: TINGLE_STATUE4 + // 0xA6: dItemNo_TINGLE_STATUE_4_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VTIN4], /* mTexture */ item_texture_tbl[TEXTURE_IDX_TINGLE_FIGURE], /* mBmdIdx */ VTIN4_BDL_VTIN4, @@ -3272,7 +3272,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x17C0 }, { - // 0xA7: TINGLE_STATUE5 + // 0xA7: dItemNo_TINGLE_STATUE_5_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VTIN5], /* mTexture */ item_texture_tbl[TEXTURE_IDX_TINGLE_FIGURE], /* mBmdIdx */ VTIN5_BDL_VTIN5, @@ -3288,7 +3288,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x17C0 }, { - // 0xA8: TINGLE_STATUE6 + // 0xA8: dItemNo_TINGLE_STATUE_6_e /* mArcname */ NULL, /* mTexture */ NULL, /* mBmdIdx */ -1, @@ -3304,7 +3304,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xA9: noentry169 + // 0xA9: dItemNo_NOENTRY_169_e /* mArcname */ NULL, /* mTexture */ NULL, /* mBmdIdx */ -1, @@ -3320,7 +3320,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xAA: dItem_HURRICANE_SPIN_e + // 0xAA: dItemNo_HURRICANE_SPIN_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VSWON], /* mTexture */ NULL, /* mBmdIdx */ VSWON_BDL_VSWON, @@ -3336,7 +3336,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xAB: dItem_MAX_RUPEE_UP1_e + // 0xAB: dItemNo_MAX_RUPEE_UP1_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VSAIM], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BIG_PURSE], /* mBmdIdx */ VSAIM_BDL_VSAIM, @@ -3352,7 +3352,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x2000 }, { - // 0xAC: dItem_MAX_RUPEE_UP2_e + // 0xAC: dItemNo_MAX_RUPEE_UP2_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VSAIL], /* mTexture */ item_texture_tbl[TEXTURE_IDX_MAX_PURSE], /* mBmdIdx */ VSAIL_BDL_VSAIL, @@ -3368,7 +3368,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x2000 }, { - // 0xAD: dItem_MAX_BOMB_UP1_e + // 0xAD: dItemNo_MAX_BOMB_UP1_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VBOMM], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOMBPOUCH_1], /* mBmdIdx */ VBOMM_BDL_VBOMM, @@ -3384,7 +3384,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x2000 }, { - // 0xAE: dItem_MAX_BOMB_UP2_e + // 0xAE: dItemNo_MAX_BOMB_UP2_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VBOML], /* mTexture */ item_texture_tbl[TEXTURE_IDX_BOMBPOUCH_2], /* mBmdIdx */ VBOML_BDL_VBOML, @@ -3400,7 +3400,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x2000 }, { - // 0xAF: dItem_MAX_ARROW_UP1_e + // 0xAF: dItemNo_MAX_ARROW_UP1_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VYATM], /* mTexture */ item_texture_tbl[TEXTURE_IDX_ARROWCASE_1], /* mBmdIdx */ VYATM_BDL_VYATM, @@ -3416,7 +3416,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x2000 }, { - // 0xB0: dItem_MAX_ARROW_UP2_e + // 0xB0: dItemNo_MAX_ARROW_UP2_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VYATL], /* mTexture */ item_texture_tbl[TEXTURE_IDX_ARROWCASE_2], /* mBmdIdx */ VYATL_BDL_VYATL, @@ -3432,7 +3432,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x2000 }, { - // 0xB1: dItem_MAGIC_POWER_e + // 0xB1: dItemNo_MAGIC_POWER_e /* mArcname */ NULL, /* mTexture */ NULL, /* mBmdIdx */ -1, @@ -3448,7 +3448,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xB2: dItem_MAX_MP_UP1_e + // 0xB2: dItemNo_MAX_MP_UP1_e /* mArcname */ NULL, /* mTexture */ NULL, /* mBmdIdx */ -1, @@ -3464,7 +3464,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xB3: TINCLE_RUPEE1 + // 0xB3: dItemNo_TINGLE_RUPEE_1_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], /* mBmdIdx */ VLUPY_BDL_VLUPY, @@ -3480,7 +3480,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x17C0 }, { - // 0xB4: TINCLE_RUPEE2 + // 0xB4: dItemNo_TINGLE_RUPEE_2_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], /* mBmdIdx */ VLUPY_BDL_VLUPY, @@ -3496,7 +3496,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x17C0 }, { - // 0xB5: TINCLE_RUPEE3 + // 0xB5: dItemNo_TINGLE_RUPEE_3_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], /* mBmdIdx */ VLUPY_BDL_VLUPY, @@ -3512,7 +3512,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x17C0 }, { - // 0xB6: TINCLE_RUPEE4 + // 0xB6: dItemNo_TINGLE_RUPEE_4_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], /* mBmdIdx */ VLUPY_BDL_VLUPY, @@ -3528,7 +3528,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x17C0 }, { - // 0xB7: TINCLE_RUPEE5 + // 0xB7: dItemNo_TINGLE_RUPEE_5_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], /* mBmdIdx */ VLUPY_BDL_VLUPY, @@ -3544,7 +3544,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x17C0 }, { - // 0xB8: TINCLE_RUPEE6 + // 0xB8: dItemNo_TINGLE_RUPEE_6_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], /* mBmdIdx */ VLUPY_BDL_VLUPY, @@ -3560,7 +3560,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x17C0 }, { - // 0xB9: LITHOGRAPH1 + // 0xB9: dItemNo_LITHOGRAPH_1_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], /* mBmdIdx */ VLUPY_BDL_VLUPY, @@ -3576,7 +3576,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x17C0 }, { - // 0xBA: LITHOGRAPH2 + // 0xBA: dItemNo_LITHOGRAPH_2_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], /* mBmdIdx */ VLUPY_BDL_VLUPY, @@ -3592,7 +3592,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x17C0 }, { - // 0xBB: LITHOGRAPH3 + // 0xBB: dItemNo_LITHOGRAPH_3_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], /* mBmdIdx */ VLUPY_BDL_VLUPY, @@ -3608,7 +3608,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x17C0 }, { - // 0xBC: LITHOGRAPH4 + // 0xBC: dItemNo_LITHOGRAPH_4_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], /* mBmdIdx */ VLUPY_BDL_VLUPY, @@ -3624,7 +3624,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x17C0 }, { - // 0xBD: LITHOGRAPH5 + // 0xBD: dItemNo_LITHOGRAPH_5_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], /* mBmdIdx */ VLUPY_BDL_VLUPY, @@ -3640,7 +3640,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x17C0 }, { - // 0xBE: LITHOGRAPH6 + // 0xBE: dItemNo_LITHOGRAPH_6_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], /* mBmdIdx */ VLUPY_BDL_VLUPY, @@ -3656,7 +3656,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x17C0 }, { - // 0xBF: dItem_COLLECT_MAP_64_e + // 0xBF: dItemNo_COLLECT_MAP_64_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], /* mBmdIdx */ VLUPY_BDL_VLUPY, @@ -3672,7 +3672,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x17C0 }, { - // 0xC0: dItem_COLLECT_MAP_63_e + // 0xC0: dItemNo_COLLECT_MAP_63_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], /* mBmdIdx */ VLUPY_BDL_VLUPY, @@ -3688,7 +3688,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x17C0 }, { - // 0xC1: dItem_COLLECT_MAP_62_e + // 0xC1: dItemNo_COLLECT_MAP_62_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VLUPY], /* mTexture */ item_texture_tbl[TEXTURE_IDX_GET_RUPY], /* mBmdIdx */ VLUPY_BDL_VLUPY, @@ -3704,7 +3704,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x17C0 }, { - // 0xC2: dItem_COLLECT_MAP_61_e + // 0xC2: dItemNo_COLLECT_MAP_61_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPQ], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_HINT2], /* mBmdIdx */ VMAPQ_BDL_VMAPQ, @@ -3720,7 +3720,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xC3: dItem_COLLECT_MAP_60_e + // 0xC3: dItemNo_COLLECT_MAP_60_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPQ], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_HINT2], /* mBmdIdx */ VMAPQ_BDL_VMAPQ, @@ -3736,7 +3736,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xC4: dItem_COLLECT_MAP_59_e + // 0xC4: dItemNo_COLLECT_MAP_59_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPQ], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_HINT2], /* mBmdIdx */ VMAPQ_BDL_VMAPQ, @@ -3752,7 +3752,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xC5: dItem_COLLECT_MAP_58_e + // 0xC5: dItemNo_COLLECT_MAP_58_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPQ], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_HINT2], /* mBmdIdx */ VMAPQ_BDL_VMAPQ, @@ -3768,7 +3768,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xC6: dItem_COLLECT_MAP_57_e + // 0xC6: dItemNo_COLLECT_MAP_57_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPQ], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_HINT2], /* mBmdIdx */ VMAPQ_BDL_VMAPQ, @@ -3784,7 +3784,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xC7: dItem_COLLECT_MAP_56_e + // 0xC7: dItemNo_COLLECT_MAP_56_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPQ], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_HINT2], /* mBmdIdx */ VMAPQ_BDL_VMAPQ, @@ -3800,7 +3800,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xC8: dItem_COLLECT_MAP_55_e + // 0xC8: dItemNo_COLLECT_MAP_55_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPQ], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_HINT2], /* mBmdIdx */ VMAPQ_BDL_VMAPQ, @@ -3816,7 +3816,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xC9: dItem_COLLECT_MAP_54_e + // 0xC9: dItemNo_COLLECT_MAP_54_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPQ], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_HINT2], /* mBmdIdx */ VMAPQ_BDL_VMAPQ, @@ -3832,7 +3832,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xCA: dItem_COLLECT_MAP_53_e + // 0xCA: dItemNo_COLLECT_MAP_53_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPQ], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_HINT2], /* mBmdIdx */ VMAPQ_BDL_VMAPQ, @@ -3848,7 +3848,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xCB: dItem_COLLECT_MAP_52_e + // 0xCB: dItemNo_COLLECT_MAP_52_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPC], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TINGLE2], /* mBmdIdx */ VMAPC_BDL_VMAPC, @@ -3864,7 +3864,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xCC: dItem_COLLECT_MAP_51_e + // 0xCC: dItemNo_COLLECT_MAP_51_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], /* mBmdIdx */ VMAPR_BDL_VMAPL, @@ -3880,7 +3880,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xCD: dItem_COLLECT_MAP_50_e + // 0xCD: dItemNo_COLLECT_MAP_50_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], /* mBmdIdx */ VMAPR_BDL_VMAPL, @@ -3896,7 +3896,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xCE: dItem_COLLECT_MAP_49_e + // 0xCE: dItemNo_COLLECT_MAP_49_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], /* mBmdIdx */ VMAPR_BDL_VMAPL, @@ -3912,7 +3912,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xCF: dItem_COLLECT_MAP_48_e + // 0xCF: dItemNo_COLLECT_MAP_48_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], /* mBmdIdx */ VMAPR_BDL_VMAPL, @@ -3928,7 +3928,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xD0: dItem_COLLECT_MAP_47_e + // 0xD0: dItemNo_COLLECT_MAP_47_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], /* mBmdIdx */ VMAPR_BDL_VMAPL, @@ -3944,7 +3944,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xD1: dItem_COLLECT_MAP_46_e + // 0xD1: dItemNo_COLLECT_MAP_46_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], /* mBmdIdx */ VMAPR_BDL_VMAPL, @@ -3960,7 +3960,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xD2: dItem_COLLECT_MAP_45_e + // 0xD2: dItemNo_COLLECT_MAP_45_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], /* mBmdIdx */ VMAPR_BDL_VMAPL, @@ -3976,7 +3976,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xD3: dItem_COLLECT_MAP_44_e + // 0xD3: dItemNo_COLLECT_MAP_44_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], /* mBmdIdx */ VMAPR_BDL_VMAPL, @@ -3992,7 +3992,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xD4: dItem_COLLECT_MAP_43_e + // 0xD4: dItemNo_COLLECT_MAP_43_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], /* mBmdIdx */ VMAPR_BDL_VMAPL, @@ -4008,7 +4008,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xD5: dItem_COLLECT_MAP_42_e + // 0xD5: dItemNo_COLLECT_MAP_42_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], /* mBmdIdx */ VMAPR_BDL_VMAPL, @@ -4024,7 +4024,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xD6: dItem_COLLECT_MAP_41_e + // 0xD6: dItemNo_COLLECT_MAP_41_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], /* mBmdIdx */ VMAPR_BDL_VMAPL, @@ -4040,7 +4040,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xD7: dItem_COLLECT_MAP_40_e + // 0xD7: dItemNo_COLLECT_MAP_40_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], /* mBmdIdx */ VMAPR_BDL_VMAPL, @@ -4056,7 +4056,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xD8: dItem_COLLECT_MAP_39_e + // 0xD8: dItemNo_COLLECT_MAP_39_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], /* mBmdIdx */ VMAPR_BDL_VMAPL, @@ -4072,7 +4072,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xD9: dItem_COLLECT_MAP_38_e + // 0xD9: dItemNo_COLLECT_MAP_38_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], /* mBmdIdx */ VMAPR_BDL_VMAPL, @@ -4088,7 +4088,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xDA: dItem_COLLECT_MAP_37_e + // 0xDA: dItemNo_COLLECT_MAP_37_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], /* mBmdIdx */ VMAPR_BDL_VMAPL, @@ -4104,7 +4104,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xDB: dItem_COLLECT_MAP_36_e + // 0xDB: dItemNo_COLLECT_MAP_36_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPG], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_PHANTOMSHIP2], /* mBmdIdx */ VMAPG_BDL_VMAPG, @@ -4120,7 +4120,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xDC: dItem_COLLECT_MAP_35_e + // 0xDC: dItemNo_COLLECT_MAP_35_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPC], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TINGLE2], /* mBmdIdx */ VMAPC_BDL_VMAPC, @@ -4136,7 +4136,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xDD: dItem_COLLECT_MAP_34_e + // 0xDD: dItemNo_COLLECT_MAP_34_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], /* mBmdIdx */ VMAPR_BDL_VMAPL, @@ -4152,7 +4152,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xDE: dItem_COLLECT_MAP_33_e + // 0xDE: dItemNo_COLLECT_MAP_33_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], /* mBmdIdx */ VMAPR_BDL_VMAPL, @@ -4168,7 +4168,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xDF: dItem_COLLECT_MAP_32_e + // 0xDF: dItemNo_COLLECT_MAP_32_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], /* mBmdIdx */ VMAPR_BDL_VMAPL, @@ -4184,7 +4184,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xE0: dItem_COLLECT_MAP_31_e + // 0xE0: dItemNo_COLLECT_MAP_31_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], /* mBmdIdx */ VMAPR_BDL_VMAPL, @@ -4200,7 +4200,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xE1: dItem_COLLECT_MAP_30_e + // 0xE1: dItemNo_COLLECT_MAP_30_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], /* mBmdIdx */ VMAPR_BDL_VMAPL, @@ -4216,7 +4216,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xE2: dItem_COLLECT_MAP_29_e + // 0xE2: dItemNo_COLLECT_MAP_29_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], /* mBmdIdx */ VMAPR_BDL_VMAPL, @@ -4232,7 +4232,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xE3: dItem_COLLECT_MAP_28_e + // 0xE3: dItemNo_COLLECT_MAP_28_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], /* mBmdIdx */ VMAPR_BDL_VMAPL, @@ -4248,7 +4248,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xE4: dItem_COLLECT_MAP_27_e + // 0xE4: dItemNo_COLLECT_MAP_27_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], /* mBmdIdx */ VMAPR_BDL_VMAPL, @@ -4264,7 +4264,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xE5: dItem_COLLECT_MAP_26_e + // 0xE5: dItemNo_COLLECT_MAP_26_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], /* mBmdIdx */ VMAPR_BDL_VMAPL, @@ -4280,7 +4280,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xE6: dItem_COLLECT_MAP_25_e + // 0xE6: dItemNo_COLLECT_MAP_25_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], /* mBmdIdx */ VMAPR_BDL_VMAPL, @@ -4296,7 +4296,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xE7: dItem_COLLECT_MAP_24_e + // 0xE7: dItemNo_COLLECT_MAP_24_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], /* mBmdIdx */ VMAPR_BDL_VMAPL, @@ -4312,7 +4312,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xE8: dItem_COLLECT_MAP_23_e + // 0xE8: dItemNo_COLLECT_MAP_23_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], /* mBmdIdx */ VMAPR_BDL_VMAPL, @@ -4328,7 +4328,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xE9: dItem_COLLECT_MAP_22_e + // 0xE9: dItemNo_COLLECT_MAP_22_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], /* mBmdIdx */ VMAPR_BDL_VMAPL, @@ -4344,7 +4344,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xEA: dItem_COLLECT_MAP_21_e + // 0xEA: dItemNo_COLLECT_MAP_21_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], /* mBmdIdx */ VMAPR_BDL_VMAPL, @@ -4360,7 +4360,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xEB: dItem_COLLECT_MAP_20_e + // 0xEB: dItemNo_COLLECT_MAP_20_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], /* mBmdIdx */ VMAPR_BDL_VMAPL, @@ -4376,7 +4376,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xEC: dItem_COLLECT_MAP_19_e + // 0xEC: dItemNo_COLLECT_MAP_19_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPR], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x6A], /* mBmdIdx */ VMAPR_BDL_VMAPL, @@ -4392,7 +4392,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xED: dItem_COLLECT_MAP_18_e + // 0xED: dItemNo_COLLECT_MAP_18_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPH], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x69], /* mBmdIdx */ VMAPH_BDL_VMAPH, @@ -4408,7 +4408,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xEE: dItem_COLLECT_MAP_17_e + // 0xEE: dItemNo_COLLECT_MAP_17_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPH], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x69], /* mBmdIdx */ VMAPH_BDL_VMAPH, @@ -4424,7 +4424,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xEF: dItem_COLLECT_MAP_16_e + // 0xEF: dItemNo_COLLECT_MAP_16_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPH], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x69], /* mBmdIdx */ VMAPH_BDL_VMAPH, @@ -4440,7 +4440,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xF0: dItem_COLLECT_MAP_15_e + // 0xF0: dItemNo_COLLECT_MAP_15_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPH], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x69], /* mBmdIdx */ VMAPH_BDL_VMAPH, @@ -4456,7 +4456,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xF1: dItem_COLLECT_MAP_14_e + // 0xF1: dItemNo_COLLECT_MAP_14_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPH], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x69], /* mBmdIdx */ VMAPH_BDL_VMAPH, @@ -4472,7 +4472,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xF2: dItem_COLLECT_MAP_13_e + // 0xF2: dItemNo_COLLECT_MAP_13_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPH], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x69], /* mBmdIdx */ VMAPH_BDL_VMAPH, @@ -4488,7 +4488,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xF3: dItem_COLLECT_MAP_12_e + // 0xF3: dItemNo_COLLECT_MAP_12_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPH], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x69], /* mBmdIdx */ VMAPH_BDL_VMAPH, @@ -4504,7 +4504,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xF4: dItem_COLLECT_MAP_11_e + // 0xF4: dItemNo_COLLECT_MAP_11_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPH], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x69], /* mBmdIdx */ VMAPH_BDL_VMAPH, @@ -4520,7 +4520,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xF5: dItem_COLLECT_MAP_10_e + // 0xF5: dItemNo_COLLECT_MAP_10_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPH], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x69], /* mBmdIdx */ VMAPH_BDL_VMAPH, @@ -4536,7 +4536,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xF6: dItem_COLLECT_MAP_09_e + // 0xF6: dItemNo_COLLECT_MAP_09_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPH], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TREASURE2_0x69], /* mBmdIdx */ VMAPH_BDL_VMAPH, @@ -4552,7 +4552,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xF7: dItem_COLLECT_MAP_08_e + // 0xF7: dItemNo_COLLECT_MAP_08_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TRI2], /* mBmdIdx */ VMAPT_BDL_VMAPT, @@ -4568,7 +4568,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xF8: dItem_COLLECT_MAP_07_e + // 0xF8: dItemNo_COLLECT_MAP_07_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TRI2], /* mBmdIdx */ VMAPT_BDL_VMAPT, @@ -4584,7 +4584,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xF9: dItem_COLLECT_MAP_06_e + // 0xF9: dItemNo_COLLECT_MAP_06_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TRI2], /* mBmdIdx */ VMAPT_BDL_VMAPT, @@ -4600,7 +4600,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xFA: dItem_COLLECT_MAP_05_e + // 0xFA: dItemNo_COLLECT_MAP_05_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TRI2], /* mBmdIdx */ VMAPT_BDL_VMAPT, @@ -4616,7 +4616,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xFB: dItem_COLLECT_MAP_04_e + // 0xFB: dItemNo_COLLECT_MAP_04_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TRI2], /* mBmdIdx */ VMAPT_BDL_VMAPT, @@ -4632,7 +4632,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xFC: dItem_COLLECT_MAP_03_e + // 0xFC: dItemNo_COLLECT_MAP_03_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TRI2], /* mBmdIdx */ VMAPT_BDL_VMAPT, @@ -4648,7 +4648,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xFD: dItem_COLLECT_MAP_02_e + // 0xFD: dItemNo_COLLECT_MAP_02_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TRI2], /* mBmdIdx */ VMAPT_BDL_VMAPT, @@ -4664,7 +4664,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xFE: dItem_COLLECT_MAP_01_e + // 0xFE: dItemNo_COLLECT_MAP_01_e /* mArcname */ item_arcname_tbl[ARCNAME_IDX_VMAPT], /* mTexture */ item_texture_tbl[TEXTURE_IDX_CMAP_TRI2], /* mBmdIdx */ VMAPT_BDL_VMAPT, @@ -4680,7 +4680,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0xFF: dItem_NONE_e + // 0xFF: dItemNo_NONE_e /* mArcname */ NULL, /* mTexture */ NULL, /* mBmdIdx */ -1, @@ -4700,7 +4700,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = { /* 803866B0-803882B0 .data field_item_res__10dItem_data */ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { { - // 0x00: dItem_HEART_e + // 0x00: dItemNo_HEART_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], /* mBmdIdx */ ALWAYS_BDL_VHRTL, /* mSrtIdx */ -1, @@ -4717,7 +4717,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { #endif }, { - // 0x01: dItem_GREEN_RUPEE_e + // 0x01: dItemNo_GREEN_RUPEE_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], /* mBmdIdx */ ALWAYS_BDL_VLUPL, /* mSrtIdx */ ALWAYS_BTK_VLUPL, @@ -4734,7 +4734,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { #endif }, { - // 0x02: dItem_BLUE_RUPEE_e + // 0x02: dItemNo_BLUE_RUPEE_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], /* mBmdIdx */ ALWAYS_BDL_VLUPL, /* mSrtIdx */ ALWAYS_BTK_VLUPL, @@ -4751,7 +4751,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { #endif }, { - // 0x03: dItem_YELLOW_RUPEE_e + // 0x03: dItemNo_YELLOW_RUPEE_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], /* mBmdIdx */ ALWAYS_BDL_VLUPL, /* mSrtIdx */ ALWAYS_BTK_VLUPL, @@ -4768,7 +4768,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { #endif }, { - // 0x04: dItem_RED_RUPEE_e + // 0x04: dItemNo_RED_RUPEE_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], /* mBmdIdx */ ALWAYS_BDL_VLUPL, /* mSrtIdx */ ALWAYS_BTK_VLUPL, @@ -4785,7 +4785,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { #endif }, { - // 0x05: dItem_PURPLE_RUPEE_e + // 0x05: dItemNo_PURPLE_RUPEE_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], /* mBmdIdx */ ALWAYS_BDL_VLUPL, /* mSrtIdx */ ALWAYS_BTK_VLUPL, @@ -4802,7 +4802,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { #endif }, { - // 0x06: dItem_ORANGE_RUPEE_e + // 0x06: dItemNo_ORANGE_RUPEE_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], /* mBmdIdx */ ALWAYS_BDL_VLUPL, /* mSrtIdx */ ALWAYS_BTK_VLUPL, @@ -4819,7 +4819,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { #endif }, { - // 0x07: dItem_HEART_PIECE_e + // 0x07: dItemNo_HEART_PIECE_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], /* mBmdIdx */ ALWAYS_BDL_VHKAL, /* mSrtIdx */ ALWAYS_BTK_VHKAL, @@ -4836,7 +4836,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { #endif }, { - // 0x08: dItem_HEART_CONTAINER_e + // 0x08: dItemNo_HEART_CONTAINER_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], /* mBmdIdx */ ALWAYS_BDL_VHUTL, /* mSrtIdx */ ALWAYS_BTK_VHUTL, @@ -4853,7 +4853,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { #endif }, { - // 0x09: dItem_SMALL_MAGIC_e + // 0x09: dItemNo_SMALL_MAGIC_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], /* mBmdIdx */ ALWAYS_BDL_MPODA, /* mSrtIdx */ -1, @@ -4870,7 +4870,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { #endif }, { - // 0x0A: dItem_LARGE_MAGIC_e + // 0x0A: dItemNo_LARGE_MAGIC_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], /* mBmdIdx */ ALWAYS_BDL_MPODB, /* mSrtIdx */ -1, @@ -4887,7 +4887,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { #endif }, { - // 0x0B: dItem_BOMB_5_e + // 0x0B: dItemNo_BOMB_5_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_LINK], /* mBmdIdx */ LINK_BDL_BOMB, /* mSrtIdx */ -1, @@ -4904,7 +4904,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { #endif }, { - // 0x0C: dItem_BOMB_10_e + // 0x0C: dItemNo_BOMB_10_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_LINK], /* mBmdIdx */ LINK_BDL_BOMB, /* mSrtIdx */ -1, @@ -4921,7 +4921,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { #endif }, { - // 0x0D: dItem_BOMB_20_e + // 0x0D: dItemNo_BOMB_20_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_LINK], /* mBmdIdx */ LINK_BDL_BOMB, /* mSrtIdx */ -1, @@ -4938,7 +4938,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { #endif }, { - // 0x0E: dItem_BOMB_30_e + // 0x0E: dItemNo_BOMB_30_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_LINK], /* mBmdIdx */ LINK_BDL_BOMB, /* mSrtIdx */ -1, @@ -4955,7 +4955,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { #endif }, { - // 0x0F: dItem_SILVER_RUPEE_e + // 0x0F: dItemNo_SILVER_RUPEE_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], /* mBmdIdx */ ALWAYS_BDL_VLUPL, /* mSrtIdx */ ALWAYS_BTK_VLUPL, @@ -4972,7 +4972,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { #endif }, { - // 0x10: dItem_ARROW_10_e + // 0x10: dItemNo_ARROW_10_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], /* mBmdIdx */ ALWAYS_BDL_ARROWITEM, /* mSrtIdx */ -1, @@ -4989,7 +4989,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { #endif }, { - // 0x11: dItem_ARROW_20_e + // 0x11: dItemNo_ARROW_20_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], /* mBmdIdx */ ALWAYS_BDL_ARROWITEM, /* mSrtIdx */ -1, @@ -5006,7 +5006,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { #endif }, { - // 0x12: dItem_ARROW_30_e + // 0x12: dItemNo_ARROW_30_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], /* mBmdIdx */ ALWAYS_BDL_ARROWITEM, /* mSrtIdx */ -1, @@ -5023,7 +5023,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { #endif }, { - // 0x13: noentry19 + // 0x13: dItemNo_NOENTRY_19_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5036,7 +5036,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x5500 }, { - // 0x14: noentry20 + // 0x14: dItemNo_NOENTRY_20_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5049,7 +5049,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x5500 }, { - // 0x15: dItem_SMALL_KEY_e + // 0x15: dItemNo_SMALL_KEY_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], /* mBmdIdx */ ALWAYS_BDL_VKEYL, /* mSrtIdx */ -1, @@ -5066,7 +5066,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { #endif }, { - // 0x16: dItem_RECOVER_FAIRY_e + // 0x16: dItemNo_RECOVER_FAIRY_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], /* mBmdIdx */ ALWAYS_BDL_FA, /* mSrtIdx */ -1, @@ -5079,7 +5079,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x4000 }, { - // 0x17: noentry23 + // 0x17: dItemNo_NOENTRY_23_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5092,7 +5092,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x18: noentry24 + // 0x18: dItemNo_NOENTRY_24_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5105,7 +5105,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x19: noentry25 + // 0x19: dItemNo_NOENTRY_25_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5118,7 +5118,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x1A: dItem_SUB_DUN_RUPEE_e + // 0x1A: dItemNo_SUB_DUN_RUPEE_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5131,7 +5131,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x1B: noentry27 + // 0x1B: dItemNo_NOENTRY_27_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5144,7 +5144,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x1C: noentry28 + // 0x1C: dItemNo_NOENTRY_28_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5157,7 +5157,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x1D: noentry29 + // 0x1D: dItemNo_NOENTRY_29_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5170,7 +5170,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x1E: dItem_TRIPLE_HEART_e + // 0x1E: dItemNo_TRIPLE_HEART_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], /* mBmdIdx */ ALWAYS_BDL_VHRTL, /* mSrtIdx */ -1, @@ -5183,7 +5183,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0B80 }, { - // 0x1F: dItem_JOY_PENDANT_e + // 0x1F: dItemNo_JOY_PENDANT_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], /* mBmdIdx */ ALWAYS_BDL_VHAPL, /* mSrtIdx */ -1, @@ -5200,7 +5200,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { #endif }, { - // 0x20: dItem_TELESCOPE_e + // 0x20: dItemNo_TELESCOPE_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5213,7 +5213,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x21: dItem_TINGLE_TUNER_e + // 0x21: dItemNo_TINGLE_TUNER_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5226,7 +5226,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x22: dItem_WIND_WAKER_e + // 0x22: dItemNo_WIND_WAKER_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5239,7 +5239,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x23: CAMERA + // 0x23: dItemNo_PICTO_BOX_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5252,7 +5252,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x24: dItem_SPOILS_BAG_e + // 0x24: dItemNo_SPOILS_BAG_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5265,7 +5265,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x25: dItem_GRAPPLING_HOOK_e + // 0x25: dItemNo_GRAPPLING_HOOK_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5278,7 +5278,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x26: CAMERA2 + // 0x26: dItemNo_DELUXE_PICTO_BOX_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5291,7 +5291,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x27: dItem_BOW_e + // 0x27: dItemNo_BOW_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5304,7 +5304,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x28: dItem_POWER_BRACELETS_e + // 0x28: dItemNo_POWER_BRACELETS_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5317,7 +5317,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x29: dItem_IRON_BOOTS_e + // 0x29: dItemNo_IRON_BOOTS_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5330,7 +5330,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x2A: dItem_MAGIC_ARMOR_e + // 0x2A: dItemNo_MAGIC_ARMOR_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5343,7 +5343,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x2B: WATER_BOOTS + // 0x2B: dItemNo_WATER_BOOTS_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5356,7 +5356,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x2C: dItem_BAIT_BAG_e + // 0x2C: dItemNo_BAIT_BAG_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5369,7 +5369,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x2D: dItem_BOOMERANG_e + // 0x2D: dItemNo_BOOMERANG_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5382,7 +5382,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x2E: BARE_HAND + // 0x2E: dItemNo_BARE_HAND_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5395,7 +5395,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x2F: dItem_HOOKSHOT_e + // 0x2F: dItemNo_HOOKSHOT_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5408,7 +5408,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x30: dItem_DELIVERY_BAG_e + // 0x30: dItemNo_DELIVERY_BAG_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5421,7 +5421,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x31: dItem_BOMB_BAG_e + // 0x31: dItemNo_BOMB_BAG_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5434,7 +5434,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x32: dItem_FUKU_e + // 0x32: dItemNo_FUKU_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5447,7 +5447,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x33: dItem_SKULL_HAMMER_e + // 0x33: dItemNo_SKULL_HAMMER_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5460,7 +5460,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x34: dItem_DEKU_LEAF_e + // 0x34: dItemNo_DEKU_LEAF_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_VLEAF], /* mBmdIdx */ VLEAF_BDL_VLEAF, /* mSrtIdx */ -1, @@ -5473,7 +5473,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x3000 }, { - // 0x35: dItem_MAGIC_ARROW_e + // 0x35: dItemNo_MAGIC_ARROW_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_LINK], /* mBmdIdx */ LINK_BDL_ARROW, /* mSrtIdx */ -1, @@ -5486,7 +5486,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x5500 }, { - // 0x36: dItem_LIGHT_ARROW_e + // 0x36: dItemNo_LIGHT_ARROW_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_LINK], /* mBmdIdx */ LINK_BDL_ARROW, /* mSrtIdx */ -1, @@ -5499,7 +5499,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x5500 }, { - // 0x37: dItem_NEW_FUKU_e + // 0x37: dItemNo_NEW_FUKU_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5512,7 +5512,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x38: dItem_SWORD_e + // 0x38: dItemNo_SWORD_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_VSWON], /* mBmdIdx */ VSWON_BDL_VSWON, /* mSrtIdx */ -1, @@ -5525,7 +5525,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x3000 }, { - // 0x39: dItem_MASTER_SWORD_1_e + // 0x39: dItemNo_MASTER_SWORD_1_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5538,7 +5538,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x3A: dItem_MASTER_SWORD_2_e + // 0x3A: dItemNo_MASTER_SWORD_2_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5551,7 +5551,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x3B: dItem_SHIELD_e + // 0x3B: dItemNo_SHIELD_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_VSHIN], /* mBmdIdx */ VSHIN_BDL_VSHIN, /* mSrtIdx */ -1, @@ -5564,7 +5564,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x5000 }, { - // 0x3C: dItem_MIRROR_SHIELD_e + // 0x3C: dItemNo_MIRROR_SHIELD_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5577,7 +5577,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x3D: dItem_DROPPED_SWORD_e + // 0x3D: dItemNo_DROPPED_SWORD_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_VSWON], /* mBmdIdx */ VSWON_BDL_VSWON, /* mSrtIdx */ -1, @@ -5590,7 +5590,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x3000 }, { - // 0x3E: dItem_MASTER_SWORD_3_e + // 0x3E: dItemNo_MASTER_SWORD_3_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5603,7 +5603,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x3F: KAKERA_HEART2 + // 0x3F: dItemNo_HEART_PIECE_ALT_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5616,7 +5616,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x40: noentry64 + // 0x40: dItemNo_NOENTRY_64_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5629,7 +5629,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x41: noentry65 + // 0x41: dItemNo_NOENTRY_65_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5642,7 +5642,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x42: dItem_PIRATES_CHARM_e + // 0x42: dItemNo_PIRATES_CHARM_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5655,7 +5655,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x43: dItem_HEROS_CHARM_e + // 0x43: dItemNo_HEROS_CHARM_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5668,7 +5668,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x44: GRASS_BALL + // 0x44: dItemNo_GRASS_BALL_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5681,7 +5681,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x45: dItem_SKULL_NECKLACE_e + // 0x45: dItemNo_SKULL_NECKLACE_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], /* mBmdIdx */ ALWAYS_BDL_VDOKL, /* mSrtIdx */ -1, @@ -5698,7 +5698,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { #endif }, { - // 0x46: dItem_BOKOBABA_SEED_e + // 0x46: dItemNo_BOKOBABA_SEED_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], /* mBmdIdx */ ALWAYS_BDL_VBOKL, /* mSrtIdx */ -1, @@ -5715,7 +5715,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { #endif }, { - // 0x47: dItem_GOLDEN_FEATHER_e + // 0x47: dItemNo_GOLDEN_FEATHER_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], /* mBmdIdx */ ALWAYS_BDL_VHANL, /* mSrtIdx */ ALWAYS_BTK_VHANL, @@ -5732,7 +5732,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { #endif }, { - // 0x48: dItem_KNIGHTS_CREST_e + // 0x48: dItemNo_KNIGHTS_CREST_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], /* mBmdIdx */ ALWAYS_BDL_VBELL, /* mSrtIdx */ ALWAYS_BTK_VBELL, @@ -5749,7 +5749,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { #endif }, { - // 0x49: dItem_RED_JELLY_e + // 0x49: dItemNo_RED_JELLY_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], /* mBmdIdx */ ALWAYS_BDL_VCHUL, /* mSrtIdx */ -1, @@ -5766,7 +5766,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { #endif }, { - // 0x4A: dItem_GREEN_JELLY_e + // 0x4A: dItemNo_GREEN_JELLY_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], /* mBmdIdx */ ALWAYS_BDL_VCHUL, /* mSrtIdx */ -1, @@ -5783,7 +5783,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { #endif }, { - // 0x4B: dItem_BLUE_JELLY_e + // 0x4B: dItemNo_BLUE_JELLY_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], /* mBmdIdx */ ALWAYS_BDL_VCHUL, /* mSrtIdx */ -1, @@ -5800,7 +5800,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { #endif }, { - // 0x4C: dItem_MAP_e + // 0x4C: dItemNo_MAP_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5813,7 +5813,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x4D: dItem_COMPASS_e + // 0x4D: dItemNo_COMPASS_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5826,7 +5826,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x4E: dItem_BOSS_KEY_e + // 0x4E: dItemNo_BOSS_KEY_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5839,7 +5839,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x4F: EMPTY_BSHIP + // 0x4F: dItemNo_EMPTY_BSHIP_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5852,7 +5852,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x50: dItem_EMPTY_BOTTLE_e + // 0x50: dItemNo_EMPTY_BOTTLE_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5865,7 +5865,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x51: dItem_RED_POTION_e + // 0x51: dItemNo_RED_POTION_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5878,7 +5878,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x52: dItem_GREEN_POTION_e + // 0x52: dItemNo_GREEN_POTION_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5891,7 +5891,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x53: dItem_BLUE_POTION_e + // 0x53: dItemNo_BLUE_POTION_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5904,7 +5904,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x54: dItem_HALF_SOUP_BOTTLE_e + // 0x54: dItemNo_HALF_SOUP_BOTTLE_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5917,7 +5917,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x55: dItem_SOUP_BOTTLE_e + // 0x55: dItemNo_SOUP_BOTTLE_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5930,7 +5930,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x56: dItem_WATER_BOTTLE_e + // 0x56: dItemNo_WATER_BOTTLE_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5943,7 +5943,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x57: dItem_FAIRY_BOTTLE_e + // 0x57: dItemNo_FAIRY_BOTTLE_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5956,7 +5956,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x58: dItem_FIREFLY_BOTTLE_e + // 0x58: dItemNo_FIREFLY_BOTTLE_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5969,7 +5969,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x59: dItem_FOREST_WATER_e + // 0x59: dItemNo_FOREST_WATER_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5982,7 +5982,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x5A: UNK_BOTTLE_5A + // 0x5A: dItemNo_UNK_BOTTLE_5A_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -5995,7 +5995,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x5B: UNK_BOTTLE_5B + // 0x5B: dItemNo_UNK_BOTTLE_5B_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -6008,7 +6008,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x5C: UNK_BOTTLE_5C + // 0x5C: dItemNo_UNK_BOTTLE_5C_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -6021,7 +6021,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x5D: UNK_BOTTLE_5D + // 0x5D: dItemNo_UNK_BOTTLE_5D_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -6034,7 +6034,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x5E: UNK_BOTTLE_5E + // 0x5E: dItemNo_UNK_BOTTLE_5E_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -6047,7 +6047,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x5F: UNK_BOTTLE_5F + // 0x5F: dItemNo_UNK_BOTTLE_5F_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -6060,7 +6060,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x60: UNK_BOTTLE_60 + // 0x60: dItemNo_UNK_BOTTLE_60_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -6073,7 +6073,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x61: dItem_TRIFORCE1_e + // 0x61: dItemNo_TRIFORCE1_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -6086,7 +6086,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x62: dItem_TRIFORCE2_e + // 0x62: dItemNo_TRIFORCE2_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -6099,7 +6099,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x63: dItem_TRIFORCE3_e + // 0x63: dItemNo_TRIFORCE3_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -6112,7 +6112,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x64: dItem_TRIFORCE4_e + // 0x64: dItemNo_TRIFORCE4_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -6125,7 +6125,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x65: dItem_TRIFORCE5_e + // 0x65: dItemNo_TRIFORCE5_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -6138,7 +6138,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x66: dItem_TRIFORCE6_e + // 0x66: dItemNo_TRIFORCE6_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -6151,7 +6151,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x67: dItem_TRIFORCE7_e + // 0x67: dItemNo_TRIFORCE7_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -6164,7 +6164,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x68: dItem_TRIFORCE8_e + // 0x68: dItemNo_TRIFORCE8_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -6177,7 +6177,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x69: dItem_PEARL_NAYRU_e + // 0x69: dItemNo_PEARL_NAYRU_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -6190,7 +6190,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x6A: dItem_PEARL_DIN_e + // 0x6A: dItemNo_PEARL_DIN_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -6203,7 +6203,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x6B: dItem_PEARL_FARORE_e + // 0x6B: dItemNo_PEARL_FARORE_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -6216,7 +6216,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x6C: KNOWLEDGE_TF + // 0x6C: dItemNo_KNOWLEDGE_TF_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -6229,7 +6229,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x6D: TACT_SONG1 + // 0x6D: dItemNo_WINDS_REQUIEM_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -6242,7 +6242,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x6E: TACT_SONG2 + // 0x6E: dItemNo_BALLAD_OF_GALES_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -6255,7 +6255,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x6F: TACT_SONG3 + // 0x6F: dItemNo_COMMAND_MELODY_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -6268,7 +6268,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x70: TACT_SONG4 + // 0x70: dItemNo_EARTH_GODS_LYRIC_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -6281,7 +6281,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x71: TACT_SONG5 + // 0x71: dItemNo_WIND_GODS_ARIA_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -6294,7 +6294,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x72: TACT_SONG6 + // 0x72: dItemNo_SONG_OF_PASSING_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -6307,7 +6307,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x73: noentry115 + // 0x73: dItemNo_NOENTRY_115_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -6320,7 +6320,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x74: noentry116 + // 0x74: dItemNo_NOENTRY_116_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -6333,7 +6333,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x75: noentry117 + // 0x75: dItemNo_NOENTRY_117_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -6346,7 +6346,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x76: noentry118 + // 0x76: dItemNo_NOENTRY_118_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -6359,7 +6359,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x77: noentry119 + // 0x77: dItemNo_NOENTRY_119_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -6372,7 +6372,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x78: NORMAL_SAIL + // 0x78: dItemNo_SAIL_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -6385,7 +6385,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x79: TRIFORCE_MAP1 + // 0x79: dItemNo_TRIFORCE_MAP_1_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -6398,7 +6398,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x7A: TRIFORCE_MAP2 + // 0x7A: dItemNo_TRIFORCE_MAP_2_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -6411,7 +6411,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x7B: TRIFORCE_MAP3 + // 0x7B: dItemNo_TRIFORCE_MAP_3_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -6424,7 +6424,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x7C: TRIFORCE_MAP4 + // 0x7C: dItemNo_TRIFORCE_MAP_4_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -6437,7 +6437,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x7D: TRIFORCE_MAP5 + // 0x7D: dItemNo_TRIFORCE_MAP_5_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -6450,7 +6450,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x7E: TRIFORCE_MAP6 + // 0x7E: dItemNo_TRIFORCE_MAP_6_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -6463,7 +6463,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x7F: TRIFORCE_MAP7 + // 0x7F: dItemNo_TRIFORCE_MAP_7_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -6476,7 +6476,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x80: TRIFORCE_MAP8 + // 0x80: dItemNo_TRIFORCE_MAP_8_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -6489,7 +6489,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x81: noentry129 + // 0x81: dItemNo_NOENTRY_129_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -6502,7 +6502,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x82: dItem_BIRD_BAIT_5_e + // 0x82: dItemNo_BIRD_BAIT_5_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS], /* mBmdIdx */ ALWAYS_BDL_VESAL, /* mSrtIdx */ -1, @@ -6519,7 +6519,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { #endif }, { - // 0x83: dItem_HYOI_PEAR_e + // 0x83: dItemNo_HYOI_PEAR_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_VHYOI], /* mBmdIdx */ VHYOI_BDL_VHYOI, /* mSrtIdx */ -1, @@ -6536,7 +6536,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { #endif }, { - // 0x84: ESA1 + // 0x84: dItemNo_ESA_1_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -6549,7 +6549,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x85: ESA2 + // 0x85: dItemNo_ESA_2_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -6562,7 +6562,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x86: ESA3 + // 0x86: dItemNo_ESA_3_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -6575,7 +6575,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x87: ESA4 + // 0x87: dItemNo_ESA_4_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -6588,7 +6588,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x88: ESA5 + // 0x88: dItemNo_ESA_5_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -6601,7 +6601,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x89: MAGIC_BEAN + // 0x89: dItemNo_MAGIC_BEAN_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -6614,7 +6614,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x8A: BIRD_ESA_10 + // 0x8A: dItemNo_BIRD_ESA_10_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -6627,7 +6627,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x8B: noentry139 + // 0x8B: dItemNo_NOENTRY_139_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -6640,7 +6640,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x8C: FLOWER_1 + // 0x8C: dItemNo_TOWN_FLOWER_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_FDAI_0x58], /* mBmdIdx */ FDAI_BDL_FOBJ00, /* mSrtIdx */ -1, @@ -6657,7 +6657,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { #endif }, { - // 0x8D: FLOWER_2 + // 0x8D: dItemNo_SEA_FLOWER_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_FDAI_0x59], /* mBmdIdx */ FDAI_BDL_FOBJ01, /* mSrtIdx */ -1, @@ -6674,7 +6674,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { #endif }, { - // 0x8E: FLOWER_3 + // 0x8E: dItemNo_EXOTIC_FLOWER_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_FDAI_0x5B], /* mBmdIdx */ FDAI_BDL_FOBJ02, /* mSrtIdx */ -1, @@ -6691,7 +6691,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { #endif }, { - // 0x8F: HEROS_FLAG + // 0x8F: dItemNo_HEROS_FLAG_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_FDAI_0x5B], /* mBmdIdx */ FDAI_BDL_FOBJ03, /* mSrtIdx */ -1, @@ -6708,7 +6708,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { #endif }, { - // 0x90: TAIRYO_FLAG + // 0x90: dItemNo_BIG_CATCH_FLAG_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_FDAI_0x5B], /* mBmdIdx */ FDAI_BDL_FOBJ04, /* mSrtIdx */ -1, @@ -6725,7 +6725,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { #endif }, { - // 0x91: SALES_FLAG + // 0x91: dItemNo_BIG_SALE_FLAG_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_FDAI_0x5B], /* mBmdIdx */ FDAI_BDL_FOBJ05, /* mSrtIdx */ -1, @@ -6738,7 +6738,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x1200 }, { - // 0x92: WIND_FLAG + // 0x92: dItemNo_PINWHEEL_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_FDAI_0x5A], /* mBmdIdx */ FDAI_BDL_FOBJ06, /* mSrtIdx */ -1, @@ -6755,7 +6755,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { #endif }, { - // 0x93: RED_FLAG + // 0x93: dItemNo_SICKLE_MOON_FLAG_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_FDAI_0x5B], /* mBmdIdx */ FDAI_BDL_FOBJ07, /* mSrtIdx */ -1, @@ -6768,7 +6768,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x1200 }, { - // 0x94: FOSSIL_HEAD + // 0x94: dItemNo_SKULL_TOWER_IDOL_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_FDAI_0x5C], /* mBmdIdx */ FDAI_BDL_FOBJ08, /* mSrtIdx */ -1, @@ -6781,7 +6781,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x95: WATER_STATUE + // 0x95: dItemNo_FOUNTAIN_IDOL_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_FDAI_0x64], /* mBmdIdx */ FDAI_BDL_FOBJ09, /* mSrtIdx */ -1, @@ -6794,7 +6794,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x96: POSTMAN_STATUE + // 0x96: dItemNo_POSTMAN_STATUE_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_FDAI_0x5A], /* mBmdIdx */ FDAI_BDL_FOBJ10, /* mSrtIdx */ -1, @@ -6807,7 +6807,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x97: PRESIDENT_STATUE + // 0x97: dItemNo_SHOP_GURU_STATUE_e /* mArc */ item_arcname_tbl[ARCNAME_IDX_FDAI_0x5A], /* mBmdIdx */ FDAI_BDL_FOBJ11, /* mSrtIdx */ -1, @@ -6820,7 +6820,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x1000 }, { - // 0x98: dItem_FATHER_LETTER_e + // 0x98: dItemNo_FATHER_LETTER_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -6833,7 +6833,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x99: dItem_NOTE_TO_MOM_e + // 0x99: dItemNo_NOTE_TO_MOM_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -6846,7 +6846,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x9A: MAGYS_LETTER + // 0x9A: dItemNo_MAGGIES_LETTER_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -6859,7 +6859,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x9B: MO_LETTER + // 0x9B: dItemNo_MOBLINS_LETTER_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -6872,7 +6872,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x9C: COTTAGE_PAPER + // 0x9C: dItemNo_CABANA_DEED_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -6885,7 +6885,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x9D: KAISEN_PRESENT1 + // 0x9D: dItemNo_COMPLIMENTARY_ID_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -6898,7 +6898,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x9E: KAISEN_PRESENT2 + // 0x9E: dItemNo_FILL_UP_COUPON_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -6911,7 +6911,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0x9F: SALVAGE_ITEM1 + // 0x9F: dItemNo_LEGENDARY_PICTOGRAPH_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -6924,7 +6924,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xA0: SALVAGE_ITEM2 + // 0xA0: dItemNo_SALVAGE_ITEM_2_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -6937,7 +6937,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xA1: SALVAGE_ITEM3 + // 0xA1: dItemNo_SALVAGE_ITEM_3_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -6950,7 +6950,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xA2: XXX_039 + // 0xA2: dItemNo_XXX_039_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -6963,7 +6963,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xA3: TINGLE_STATUE1 + // 0xA3: dItemNo_TINGLE_STATUE_1_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -6976,7 +6976,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xA4: TINGLE_STATUE2 + // 0xA4: dItemNo_TINGLE_STATUE_2_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -6989,7 +6989,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xA5: TINGLE_STATUE3 + // 0xA5: dItemNo_TINGLE_STATUE_3_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7002,7 +7002,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xA6: TINGLE_STATUE4 + // 0xA6: dItemNo_TINGLE_STATUE_4_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7015,7 +7015,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xA7: TINGLE_STATUE5 + // 0xA7: dItemNo_TINGLE_STATUE_5_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7028,7 +7028,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xA8: TINGLE_STATUE6 + // 0xA8: dItemNo_TINGLE_STATUE_6_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7041,7 +7041,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xA9: noentry169 + // 0xA9: dItemNo_NOENTRY_169_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7054,7 +7054,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xAA: dItem_HURRICANE_SPIN_e + // 0xAA: dItemNo_HURRICANE_SPIN_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7067,7 +7067,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xAB: dItem_MAX_RUPEE_UP1_e + // 0xAB: dItemNo_MAX_RUPEE_UP1_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7080,7 +7080,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xAC: dItem_MAX_RUPEE_UP2_e + // 0xAC: dItemNo_MAX_RUPEE_UP2_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7093,7 +7093,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xAD: dItem_MAX_BOMB_UP1_e + // 0xAD: dItemNo_MAX_BOMB_UP1_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7106,7 +7106,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xAE: dItem_MAX_BOMB_UP2_e + // 0xAE: dItemNo_MAX_BOMB_UP2_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7119,7 +7119,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xAF: dItem_MAX_ARROW_UP1_e + // 0xAF: dItemNo_MAX_ARROW_UP1_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7132,7 +7132,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xB0: dItem_MAX_ARROW_UP2_e + // 0xB0: dItemNo_MAX_ARROW_UP2_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7145,7 +7145,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xB1: dItem_MAGIC_POWER_e + // 0xB1: dItemNo_MAGIC_POWER_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7158,7 +7158,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xB2: dItem_MAX_MP_UP1_e + // 0xB2: dItemNo_MAX_MP_UP1_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7171,7 +7171,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xB3: TINCLE_RUPEE1 + // 0xB3: dItemNo_TINGLE_RUPEE_1_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7184,7 +7184,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xB4: TINCLE_RUPEE2 + // 0xB4: dItemNo_TINGLE_RUPEE_2_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7197,7 +7197,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xB5: TINCLE_RUPEE3 + // 0xB5: dItemNo_TINGLE_RUPEE_3_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7210,7 +7210,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xB6: TINCLE_RUPEE4 + // 0xB6: dItemNo_TINGLE_RUPEE_4_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7223,7 +7223,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xB7: TINCLE_RUPEE5 + // 0xB7: dItemNo_TINGLE_RUPEE_5_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7236,7 +7236,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xB8: TINCLE_RUPEE6 + // 0xB8: dItemNo_TINGLE_RUPEE_6_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7249,7 +7249,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xB9: LITHOGRAPH1 + // 0xB9: dItemNo_LITHOGRAPH_1_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7262,7 +7262,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xBA: LITHOGRAPH2 + // 0xBA: dItemNo_LITHOGRAPH_2_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7275,7 +7275,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xBB: LITHOGRAPH3 + // 0xBB: dItemNo_LITHOGRAPH_3_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7288,7 +7288,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xBC: LITHOGRAPH4 + // 0xBC: dItemNo_LITHOGRAPH_4_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7301,7 +7301,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xBD: LITHOGRAPH5 + // 0xBD: dItemNo_LITHOGRAPH_5_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7314,7 +7314,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xBE: LITHOGRAPH6 + // 0xBE: dItemNo_LITHOGRAPH_6_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7327,7 +7327,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xBF: dItem_COLLECT_MAP_64_e + // 0xBF: dItemNo_COLLECT_MAP_64_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7340,7 +7340,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xC0: dItem_COLLECT_MAP_63_e + // 0xC0: dItemNo_COLLECT_MAP_63_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7353,7 +7353,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xC1: dItem_COLLECT_MAP_62_e + // 0xC1: dItemNo_COLLECT_MAP_62_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7366,7 +7366,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xC2: dItem_COLLECT_MAP_61_e + // 0xC2: dItemNo_COLLECT_MAP_61_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7379,7 +7379,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xC3: dItem_COLLECT_MAP_60_e + // 0xC3: dItemNo_COLLECT_MAP_60_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7392,7 +7392,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xC4: dItem_COLLECT_MAP_59_e + // 0xC4: dItemNo_COLLECT_MAP_59_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7405,7 +7405,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xC5: dItem_COLLECT_MAP_58_e + // 0xC5: dItemNo_COLLECT_MAP_58_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7418,7 +7418,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xC6: dItem_COLLECT_MAP_57_e + // 0xC6: dItemNo_COLLECT_MAP_57_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7431,7 +7431,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xC7: dItem_COLLECT_MAP_56_e + // 0xC7: dItemNo_COLLECT_MAP_56_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7444,7 +7444,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xC8: dItem_COLLECT_MAP_55_e + // 0xC8: dItemNo_COLLECT_MAP_55_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7457,7 +7457,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xC9: dItem_COLLECT_MAP_54_e + // 0xC9: dItemNo_COLLECT_MAP_54_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7470,7 +7470,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xCA: dItem_COLLECT_MAP_53_e + // 0xCA: dItemNo_COLLECT_MAP_53_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7483,7 +7483,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xCB: dItem_COLLECT_MAP_52_e + // 0xCB: dItemNo_COLLECT_MAP_52_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7496,7 +7496,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xCC: dItem_COLLECT_MAP_51_e + // 0xCC: dItemNo_COLLECT_MAP_51_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7509,7 +7509,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xCD: dItem_COLLECT_MAP_50_e + // 0xCD: dItemNo_COLLECT_MAP_50_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7522,7 +7522,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xCE: dItem_COLLECT_MAP_49_e + // 0xCE: dItemNo_COLLECT_MAP_49_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7535,7 +7535,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xCF: dItem_COLLECT_MAP_48_e + // 0xCF: dItemNo_COLLECT_MAP_48_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7548,7 +7548,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xD0: dItem_COLLECT_MAP_47_e + // 0xD0: dItemNo_COLLECT_MAP_47_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7561,7 +7561,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xD1: dItem_COLLECT_MAP_46_e + // 0xD1: dItemNo_COLLECT_MAP_46_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7574,7 +7574,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xD2: dItem_COLLECT_MAP_45_e + // 0xD2: dItemNo_COLLECT_MAP_45_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7587,7 +7587,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xD3: dItem_COLLECT_MAP_44_e + // 0xD3: dItemNo_COLLECT_MAP_44_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7600,7 +7600,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xD4: dItem_COLLECT_MAP_43_e + // 0xD4: dItemNo_COLLECT_MAP_43_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7613,7 +7613,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xD5: dItem_COLLECT_MAP_42_e + // 0xD5: dItemNo_COLLECT_MAP_42_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7626,7 +7626,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xD6: dItem_COLLECT_MAP_41_e + // 0xD6: dItemNo_COLLECT_MAP_41_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7639,7 +7639,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xD7: dItem_COLLECT_MAP_40_e + // 0xD7: dItemNo_COLLECT_MAP_40_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7652,7 +7652,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xD8: dItem_COLLECT_MAP_39_e + // 0xD8: dItemNo_COLLECT_MAP_39_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7665,7 +7665,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xD9: dItem_COLLECT_MAP_38_e + // 0xD9: dItemNo_COLLECT_MAP_38_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7678,7 +7678,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xDA: dItem_COLLECT_MAP_37_e + // 0xDA: dItemNo_COLLECT_MAP_37_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7691,7 +7691,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xDB: dItem_COLLECT_MAP_36_e + // 0xDB: dItemNo_COLLECT_MAP_36_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7704,7 +7704,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xDC: dItem_COLLECT_MAP_35_e + // 0xDC: dItemNo_COLLECT_MAP_35_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7717,7 +7717,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xDD: dItem_COLLECT_MAP_34_e + // 0xDD: dItemNo_COLLECT_MAP_34_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7730,7 +7730,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xDE: dItem_COLLECT_MAP_33_e + // 0xDE: dItemNo_COLLECT_MAP_33_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7743,7 +7743,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xDF: dItem_COLLECT_MAP_32_e + // 0xDF: dItemNo_COLLECT_MAP_32_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7756,7 +7756,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xE0: dItem_COLLECT_MAP_31_e + // 0xE0: dItemNo_COLLECT_MAP_31_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7769,7 +7769,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xE1: dItem_COLLECT_MAP_30_e + // 0xE1: dItemNo_COLLECT_MAP_30_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7782,7 +7782,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xE2: dItem_COLLECT_MAP_29_e + // 0xE2: dItemNo_COLLECT_MAP_29_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7795,7 +7795,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xE3: dItem_COLLECT_MAP_28_e + // 0xE3: dItemNo_COLLECT_MAP_28_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7808,7 +7808,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xE4: dItem_COLLECT_MAP_27_e + // 0xE4: dItemNo_COLLECT_MAP_27_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7821,7 +7821,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xE5: dItem_COLLECT_MAP_26_e + // 0xE5: dItemNo_COLLECT_MAP_26_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7834,7 +7834,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xE6: dItem_COLLECT_MAP_25_e + // 0xE6: dItemNo_COLLECT_MAP_25_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7847,7 +7847,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xE7: dItem_COLLECT_MAP_24_e + // 0xE7: dItemNo_COLLECT_MAP_24_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7860,7 +7860,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xE8: dItem_COLLECT_MAP_23_e + // 0xE8: dItemNo_COLLECT_MAP_23_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7873,7 +7873,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xE9: dItem_COLLECT_MAP_22_e + // 0xE9: dItemNo_COLLECT_MAP_22_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7886,7 +7886,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xEA: dItem_COLLECT_MAP_21_e + // 0xEA: dItemNo_COLLECT_MAP_21_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7899,7 +7899,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xEB: dItem_COLLECT_MAP_20_e + // 0xEB: dItemNo_COLLECT_MAP_20_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7912,7 +7912,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xEC: dItem_COLLECT_MAP_19_e + // 0xEC: dItemNo_COLLECT_MAP_19_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7925,7 +7925,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xED: dItem_COLLECT_MAP_18_e + // 0xED: dItemNo_COLLECT_MAP_18_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7938,7 +7938,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xEE: dItem_COLLECT_MAP_17_e + // 0xEE: dItemNo_COLLECT_MAP_17_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7951,7 +7951,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xEF: dItem_COLLECT_MAP_16_e + // 0xEF: dItemNo_COLLECT_MAP_16_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7964,7 +7964,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xF0: dItem_COLLECT_MAP_15_e + // 0xF0: dItemNo_COLLECT_MAP_15_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7977,7 +7977,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xF1: dItem_COLLECT_MAP_14_e + // 0xF1: dItemNo_COLLECT_MAP_14_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -7990,7 +7990,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xF2: dItem_COLLECT_MAP_13_e + // 0xF2: dItemNo_COLLECT_MAP_13_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -8003,7 +8003,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xF3: dItem_COLLECT_MAP_12_e + // 0xF3: dItemNo_COLLECT_MAP_12_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -8016,7 +8016,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xF4: dItem_COLLECT_MAP_11_e + // 0xF4: dItemNo_COLLECT_MAP_11_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -8029,7 +8029,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xF5: dItem_COLLECT_MAP_10_e + // 0xF5: dItemNo_COLLECT_MAP_10_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -8042,7 +8042,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xF6: dItem_COLLECT_MAP_09_e + // 0xF6: dItemNo_COLLECT_MAP_09_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -8055,7 +8055,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xF7: dItem_COLLECT_MAP_08_e + // 0xF7: dItemNo_COLLECT_MAP_08_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -8068,7 +8068,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xF8: dItem_COLLECT_MAP_07_e + // 0xF8: dItemNo_COLLECT_MAP_07_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -8081,7 +8081,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xF9: dItem_COLLECT_MAP_06_e + // 0xF9: dItemNo_COLLECT_MAP_06_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -8094,7 +8094,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xFA: dItem_COLLECT_MAP_05_e + // 0xFA: dItemNo_COLLECT_MAP_05_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -8107,7 +8107,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xFB: dItem_COLLECT_MAP_04_e + // 0xFB: dItemNo_COLLECT_MAP_04_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -8120,7 +8120,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xFC: dItem_COLLECT_MAP_03_e + // 0xFC: dItemNo_COLLECT_MAP_03_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -8133,7 +8133,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xFD: dItem_COLLECT_MAP_02_e + // 0xFD: dItemNo_COLLECT_MAP_02_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -8146,7 +8146,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xFE: dItem_COLLECT_MAP_01_e + // 0xFE: dItemNo_COLLECT_MAP_01_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -8159,7 +8159,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* mHeapSize */ 0x0000 }, { - // 0xFF: dItem_NONE_e + // 0xFF: dItemNo_NONE_e /* mArc */ NULL, /* mBmdIdx */ -1, /* mSrtIdx */ -1, @@ -8176,1792 +8176,1792 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = { /* 803882B0-803886B0 .data item_info__10dItem_data */ dItem_data_item_info dItem_data::item_info[0x100] = { { - // 0x00: dItem_HEART_e + // 0x00: dItemNo_HEART_e 0x0F, 0x28, 0x1E, 0x00, }, { - // 0x01: dItem_GREEN_RUPEE_e + // 0x01: dItemNo_GREEN_RUPEE_e 0x19, 0x37, 0x23, 0x00, }, { - // 0x02: dItem_BLUE_RUPEE_e + // 0x02: dItemNo_BLUE_RUPEE_e 0x19, 0x37, 0x23, 0x00, }, { - // 0x03: dItem_YELLOW_RUPEE_e + // 0x03: dItemNo_YELLOW_RUPEE_e 0x19, 0x37, 0x23, 0x00, }, { - // 0x04: dItem_RED_RUPEE_e + // 0x04: dItemNo_RED_RUPEE_e 0x19, 0x37, 0x23, 0x00, }, { - // 0x05: dItem_PURPLE_RUPEE_e + // 0x05: dItemNo_PURPLE_RUPEE_e 0x19, 0x37, 0x23, 0x00, }, { - // 0x06: dItem_ORANGE_RUPEE_e + // 0x06: dItemNo_ORANGE_RUPEE_e 0x19, 0x37, 0x23, 0x00, }, { - // 0x07: dItem_HEART_PIECE_e + // 0x07: dItemNo_HEART_PIECE_e 0x32, 0x50, 0x32, 0x01, }, { - // 0x08: dItem_HEART_CONTAINER_e + // 0x08: dItemNo_HEART_CONTAINER_e 0x32, 0x50, 0x32, 0x01, }, { - // 0x09: dItem_SMALL_MAGIC_e + // 0x09: dItemNo_SMALL_MAGIC_e 0x14, 0x28, 0x1E, 0x00, }, { - // 0x0A: dItem_LARGE_MAGIC_e + // 0x0A: dItemNo_LARGE_MAGIC_e 0x19, 0x50, 0x1E, 0x00, }, { - // 0x0B: dItem_BOMB_5_e + // 0x0B: dItemNo_BOMB_5_e 0x28, 0x3C, 0x1E, 0x00, }, { - // 0x0C: dItem_BOMB_10_e + // 0x0C: dItemNo_BOMB_10_e 0x28, 0x3C, 0x1E, 0x00, }, { - // 0x0D: dItem_BOMB_20_e + // 0x0D: dItemNo_BOMB_20_e 0x28, 0x3C, 0x1E, 0x00, }, { - // 0x0E: dItem_BOMB_30_e + // 0x0E: dItemNo_BOMB_30_e 0x28, 0x3C, 0x1E, 0x00, }, { - // 0x0F: dItem_SILVER_RUPEE_e + // 0x0F: dItemNo_SILVER_RUPEE_e 0x19, 0x37, 0x23, 0x00, }, { - // 0x10: dItem_ARROW_10_e + // 0x10: dItemNo_ARROW_10_e 0x14, 0x50, 0x32, 0x00, }, { - // 0x11: dItem_ARROW_20_e + // 0x11: dItemNo_ARROW_20_e 0x14, 0x50, 0x32, 0x00, }, { - // 0x12: dItem_ARROW_30_e + // 0x12: dItemNo_ARROW_30_e 0x14, 0x50, 0x32, 0x00, }, { - // 0x13: noentry19 + // 0x13: dItemNo_NOENTRY_19_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x14: noentry20 + // 0x14: dItemNo_NOENTRY_20_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x15: dItem_SMALL_KEY_e + // 0x15: dItemNo_SMALL_KEY_e 0x14, 0x28, 0x1E, 0x05, }, { - // 0x16: dItem_RECOVER_FAIRY_e + // 0x16: dItemNo_RECOVER_FAIRY_e 0x1E, 0x3C, 0x1E, 0x00, }, { - // 0x17: noentry23 + // 0x17: dItemNo_NOENTRY_23_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x18: noentry24 + // 0x18: dItemNo_NOENTRY_24_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x19: noentry25 + // 0x19: dItemNo_NOENTRY_25_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x1A: dItem_SUB_DUN_RUPEE_e + // 0x1A: dItemNo_SUB_DUN_RUPEE_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x1B: noentry27 + // 0x1B: dItemNo_NOENTRY_27_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x1C: noentry28 + // 0x1C: dItemNo_NOENTRY_28_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x1D: noentry29 + // 0x1D: dItemNo_NOENTRY_29_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x1E: dItem_TRIPLE_HEART_e + // 0x1E: dItemNo_TRIPLE_HEART_e 0x0F, 0x28, 0x1E, 0x00, }, { - // 0x1F: dItem_JOY_PENDANT_e + // 0x1F: dItemNo_JOY_PENDANT_e 0x1E, 0x46, 0x23, 0x00, }, { - // 0x20: dItem_TELESCOPE_e + // 0x20: dItemNo_TELESCOPE_e 0x28, 0x00, 0x00, 0x05, }, { - // 0x21: dItem_TINGLE_TUNER_e + // 0x21: dItemNo_TINGLE_TUNER_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x22: dItem_WIND_WAKER_e + // 0x22: dItemNo_WIND_WAKER_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x23: CAMERA + // 0x23: dItemNo_PICTO_BOX_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x24: dItem_SPOILS_BAG_e + // 0x24: dItemNo_SPOILS_BAG_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x25: dItem_GRAPPLING_HOOK_e + // 0x25: dItemNo_GRAPPLING_HOOK_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x26: CAMERA2 + // 0x26: dItemNo_DELUXE_PICTO_BOX_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x27: dItem_BOW_e + // 0x27: dItemNo_BOW_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x28: dItem_POWER_BRACELETS_e + // 0x28: dItemNo_POWER_BRACELETS_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x29: dItem_IRON_BOOTS_e + // 0x29: dItemNo_IRON_BOOTS_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x2A: dItem_MAGIC_ARMOR_e + // 0x2A: dItemNo_MAGIC_ARMOR_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x2B: WATER_BOOTS + // 0x2B: dItemNo_WATER_BOOTS_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x2C: dItem_BAIT_BAG_e + // 0x2C: dItemNo_BAIT_BAG_e 0x00, 0x28, 0x28, 0x00, }, { - // 0x2D: dItem_BOOMERANG_e + // 0x2D: dItemNo_BOOMERANG_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x2E: BARE_HAND + // 0x2E: dItemNo_BARE_HAND_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x2F: dItem_HOOKSHOT_e + // 0x2F: dItemNo_HOOKSHOT_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x30: dItem_DELIVERY_BAG_e + // 0x30: dItemNo_DELIVERY_BAG_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x31: dItem_BOMB_BAG_e + // 0x31: dItemNo_BOMB_BAG_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x32: dItem_FUKU_e + // 0x32: dItemNo_FUKU_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x33: dItem_SKULL_HAMMER_e + // 0x33: dItemNo_SKULL_HAMMER_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x34: dItem_DEKU_LEAF_e + // 0x34: dItemNo_DEKU_LEAF_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x35: dItem_MAGIC_ARROW_e + // 0x35: dItemNo_MAGIC_ARROW_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x36: dItem_LIGHT_ARROW_e + // 0x36: dItemNo_LIGHT_ARROW_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x37: dItem_NEW_FUKU_e + // 0x37: dItemNo_NEW_FUKU_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x38: dItem_SWORD_e + // 0x38: dItemNo_SWORD_e 0x1E, 0x32, 0x1E, 0x10, }, { - // 0x39: dItem_MASTER_SWORD_1_e + // 0x39: dItemNo_MASTER_SWORD_1_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x3A: dItem_MASTER_SWORD_2_e + // 0x3A: dItemNo_MASTER_SWORD_2_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x3B: dItem_SHIELD_e + // 0x3B: dItemNo_SHIELD_e 0x28, 0x3C, 0x28, 0x10, }, { - // 0x3C: dItem_MIRROR_SHIELD_e + // 0x3C: dItemNo_MIRROR_SHIELD_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x3D: dItem_DROPPED_SWORD_e + // 0x3D: dItemNo_DROPPED_SWORD_e 0x00, 0x32, 0x1E, 0x10, }, { - // 0x3E: dItem_MASTER_SWORD_3_e + // 0x3E: dItemNo_MASTER_SWORD_3_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x3F: KAKERA_HEART2 + // 0x3F: dItemNo_HEART_PIECE_ALT_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x40: noentry64 + // 0x40: dItemNo_NOENTRY_64_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x41: noentry65 + // 0x41: dItemNo_NOENTRY_65_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x42: dItem_PIRATES_CHARM_e + // 0x42: dItemNo_PIRATES_CHARM_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x43: dItem_HEROS_CHARM_e + // 0x43: dItemNo_HEROS_CHARM_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x44: GRASS_BALL + // 0x44: dItemNo_GRASS_BALL_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x45: dItem_SKULL_NECKLACE_e + // 0x45: dItemNo_SKULL_NECKLACE_e 0x28, 0x5A, 0x32, 0x00, }, { - // 0x46: dItem_BOKOBABA_SEED_e + // 0x46: dItemNo_BOKOBABA_SEED_e 0x1E, 0x50, 0x28, 0x00, }, { - // 0x47: dItem_GOLDEN_FEATHER_e + // 0x47: dItemNo_GOLDEN_FEATHER_e 0x1E, 0x5A, 0x28, 0x00, }, { - // 0x48: dItem_KNIGHTS_CREST_e + // 0x48: dItemNo_KNIGHTS_CREST_e 0x32, 0x46, 0x28, 0x00, }, { - // 0x49: dItem_RED_JELLY_e + // 0x49: dItemNo_RED_JELLY_e 0x19, 0x46, 0x28, 0x00, }, { - // 0x4A: dItem_GREEN_JELLY_e + // 0x4A: dItemNo_GREEN_JELLY_e 0x19, 0x46, 0x28, 0x00, }, { - // 0x4B: dItem_BLUE_JELLY_e + // 0x4B: dItemNo_BLUE_JELLY_e 0x19, 0x46, 0x28, 0x00, }, { - // 0x4C: dItem_MAP_e + // 0x4C: dItemNo_MAP_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x4D: dItem_COMPASS_e + // 0x4D: dItemNo_COMPASS_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x4E: dItem_BOSS_KEY_e + // 0x4E: dItemNo_BOSS_KEY_e 0x00, 0x00, 0x00, 0x05, }, { - // 0x4F: EMPTY_BSHIP + // 0x4F: dItemNo_EMPTY_BSHIP_e 0x00, 0x28, 0x28, 0x00, }, { - // 0x50: dItem_EMPTY_BOTTLE_e + // 0x50: dItemNo_EMPTY_BOTTLE_e 0x00, 0x28, 0x28, 0x00, }, { - // 0x51: dItem_RED_POTION_e + // 0x51: dItemNo_RED_POTION_e 0x00, 0x28, 0x28, 0x00, }, { - // 0x52: dItem_GREEN_POTION_e + // 0x52: dItemNo_GREEN_POTION_e 0x00, 0x28, 0x28, 0x00, }, { - // 0x53: dItem_BLUE_POTION_e + // 0x53: dItemNo_BLUE_POTION_e 0x00, 0x28, 0x28, 0x00, }, { - // 0x54: dItem_HALF_SOUP_BOTTLE_e + // 0x54: dItemNo_HALF_SOUP_BOTTLE_e 0x00, 0x28, 0x28, 0x00, }, { - // 0x55: dItem_SOUP_BOTTLE_e + // 0x55: dItemNo_SOUP_BOTTLE_e 0x00, 0x28, 0x28, 0x00, }, { - // 0x56: dItem_WATER_BOTTLE_e + // 0x56: dItemNo_WATER_BOTTLE_e 0x00, 0x28, 0x28, 0x00, }, { - // 0x57: dItem_FAIRY_BOTTLE_e + // 0x57: dItemNo_FAIRY_BOTTLE_e 0x00, 0x28, 0x28, 0x00, }, { - // 0x58: dItem_FIREFLY_BOTTLE_e + // 0x58: dItemNo_FIREFLY_BOTTLE_e 0x00, 0x28, 0x28, 0x00, }, { - // 0x59: dItem_FOREST_WATER_e + // 0x59: dItemNo_FOREST_WATER_e 0x00, 0x28, 0x28, 0x00, }, { - // 0x5A: UNK_BOTTLE_5A + // 0x5A: dItemNo_UNK_BOTTLE_5A_e 0x00, 0x28, 0x28, 0x00, }, { - // 0x5B: UNK_BOTTLE_5B + // 0x5B: dItemNo_UNK_BOTTLE_5B_e 0x00, 0x28, 0x28, 0x00, }, { - // 0x5C: UNK_BOTTLE_5C + // 0x5C: dItemNo_UNK_BOTTLE_5C_e 0x00, 0x28, 0x28, 0x00, }, { - // 0x5D: UNK_BOTTLE_5D + // 0x5D: dItemNo_UNK_BOTTLE_5D_e 0x00, 0x28, 0x28, 0x00, }, { - // 0x5E: UNK_BOTTLE_5E + // 0x5E: dItemNo_UNK_BOTTLE_5E_e 0x00, 0x28, 0x28, 0x00, }, { - // 0x5F: UNK_BOTTLE_5F + // 0x5F: dItemNo_UNK_BOTTLE_5F_e 0x00, 0x28, 0x28, 0x00, }, { - // 0x60: UNK_BOTTLE_60 + // 0x60: dItemNo_UNK_BOTTLE_60_e 0x00, 0x28, 0x28, 0x00, }, { - // 0x61: dItem_TRIFORCE1_e + // 0x61: dItemNo_TRIFORCE1_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x62: dItem_TRIFORCE2_e + // 0x62: dItemNo_TRIFORCE2_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x63: dItem_TRIFORCE3_e + // 0x63: dItemNo_TRIFORCE3_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x64: dItem_TRIFORCE4_e + // 0x64: dItemNo_TRIFORCE4_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x65: dItem_TRIFORCE5_e + // 0x65: dItemNo_TRIFORCE5_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x66: dItem_TRIFORCE6_e + // 0x66: dItemNo_TRIFORCE6_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x67: dItem_TRIFORCE7_e + // 0x67: dItemNo_TRIFORCE7_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x68: dItem_TRIFORCE8_e + // 0x68: dItemNo_TRIFORCE8_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x69: dItem_PEARL_NAYRU_e + // 0x69: dItemNo_PEARL_NAYRU_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x6A: dItem_PEARL_DIN_e + // 0x6A: dItemNo_PEARL_DIN_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x6B: dItem_PEARL_FARORE_e + // 0x6B: dItemNo_PEARL_FARORE_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x6C: KNOWLEDGE_TF + // 0x6C: dItemNo_KNOWLEDGE_TF_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x6D: TACT_SONG1 + // 0x6D: dItemNo_WINDS_REQUIEM_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x6E: TACT_SONG2 + // 0x6E: dItemNo_BALLAD_OF_GALES_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x6F: TACT_SONG3 + // 0x6F: dItemNo_COMMAND_MELODY_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x70: TACT_SONG4 + // 0x70: dItemNo_EARTH_GODS_LYRIC_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x71: TACT_SONG5 + // 0x71: dItemNo_WIND_GODS_ARIA_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x72: TACT_SONG6 + // 0x72: dItemNo_SONG_OF_PASSING_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x73: noentry115 + // 0x73: dItemNo_NOENTRY_115_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x74: noentry116 + // 0x74: dItemNo_NOENTRY_116_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x75: noentry117 + // 0x75: dItemNo_NOENTRY_117_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x76: noentry118 + // 0x76: dItemNo_NOENTRY_118_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x77: noentry119 + // 0x77: dItemNo_NOENTRY_119_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x78: NORMAL_SAIL + // 0x78: dItemNo_SAIL_e 0x00, 0x28, 0x28, 0x00, }, { - // 0x79: TRIFORCE_MAP1 + // 0x79: dItemNo_TRIFORCE_MAP_1_e 0x00, 0x28, 0x28, 0x00, }, { - // 0x7A: TRIFORCE_MAP2 + // 0x7A: dItemNo_TRIFORCE_MAP_2_e 0x00, 0x28, 0x28, 0x00, }, { - // 0x7B: TRIFORCE_MAP3 + // 0x7B: dItemNo_TRIFORCE_MAP_3_e 0x00, 0x28, 0x28, 0x00, }, { - // 0x7C: TRIFORCE_MAP4 + // 0x7C: dItemNo_TRIFORCE_MAP_4_e 0x00, 0x28, 0x28, 0x00, }, { - // 0x7D: TRIFORCE_MAP5 + // 0x7D: dItemNo_TRIFORCE_MAP_5_e 0x00, 0x28, 0x28, 0x00, }, { - // 0x7E: TRIFORCE_MAP6 + // 0x7E: dItemNo_TRIFORCE_MAP_6_e 0x00, 0x28, 0x28, 0x00, }, { - // 0x7F: TRIFORCE_MAP7 + // 0x7F: dItemNo_TRIFORCE_MAP_7_e 0x00, 0x28, 0x28, 0x00, }, { - // 0x80: TRIFORCE_MAP8 + // 0x80: dItemNo_TRIFORCE_MAP_8_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x81: noentry129 + // 0x81: dItemNo_NOENTRY_129_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x82: dItem_BIRD_BAIT_5_e + // 0x82: dItemNo_BIRD_BAIT_5_e 0x19, 0x37, 0x23, 0x00, }, { - // 0x83: dItem_HYOI_PEAR_e + // 0x83: dItemNo_HYOI_PEAR_e 0x19, 0x28, 0x28, 0x00, }, { - // 0x84: ESA1 + // 0x84: dItemNo_ESA_1_e 0x00, 0x28, 0x28, 0x00, }, { - // 0x85: ESA2 + // 0x85: dItemNo_ESA_2_e 0x00, 0x28, 0x28, 0x00, }, { - // 0x86: ESA3 + // 0x86: dItemNo_ESA_3_e 0x00, 0x28, 0x28, 0x00, }, { - // 0x87: ESA4 + // 0x87: dItemNo_ESA_4_e 0x00, 0x28, 0x28, 0x00, }, { - // 0x88: ESA5 + // 0x88: dItemNo_ESA_5_e 0x00, 0x28, 0x28, 0x00, }, { - // 0x89: MAGIC_BEAN + // 0x89: dItemNo_MAGIC_BEAN_e 0x00, 0x28, 0x28, 0x00, }, { - // 0x8A: BIRD_ESA_10 + // 0x8A: dItemNo_BIRD_ESA_10_e 0x19, 0x28, 0x28, 0x00, }, { - // 0x8B: noentry139 + // 0x8B: dItemNo_NOENTRY_139_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x8C: FLOWER_1 + // 0x8C: dItemNo_TOWN_FLOWER_e 0x00, 0x28, 0x28, 0x00, }, { - // 0x8D: FLOWER_2 + // 0x8D: dItemNo_SEA_FLOWER_e 0x00, 0x28, 0x28, 0x00, }, { - // 0x8E: FLOWER_3 + // 0x8E: dItemNo_EXOTIC_FLOWER_e 0x00, 0x28, 0x28, 0x00, }, { - // 0x8F: HEROS_FLAG + // 0x8F: dItemNo_HEROS_FLAG_e 0x00, 0x28, 0x28, 0x00, }, { - // 0x90: TAIRYO_FLAG + // 0x90: dItemNo_BIG_CATCH_FLAG_e 0x00, 0x28, 0x28, 0x00, }, { - // 0x91: SALES_FLAG + // 0x91: dItemNo_BIG_SALE_FLAG_e 0x00, 0x28, 0x28, 0x00, }, { - // 0x92: WIND_FLAG + // 0x92: dItemNo_PINWHEEL_e 0x00, 0x28, 0x28, 0x00, }, { - // 0x93: RED_FLAG + // 0x93: dItemNo_SICKLE_MOON_FLAG_e 0x00, 0x28, 0x28, 0x00, }, { - // 0x94: FOSSIL_HEAD + // 0x94: dItemNo_SKULL_TOWER_IDOL_e 0x00, 0x28, 0x28, 0x00, }, { - // 0x95: WATER_STATUE + // 0x95: dItemNo_FOUNTAIN_IDOL_e 0x00, 0x28, 0x28, 0x00, }, { - // 0x96: POSTMAN_STATUE + // 0x96: dItemNo_POSTMAN_STATUE_e 0x00, 0x28, 0x28, 0x00, }, { - // 0x97: PRESIDENT_STATUE + // 0x97: dItemNo_SHOP_GURU_STATUE_e 0x00, 0x28, 0x28, 0x00, }, { - // 0x98: dItem_FATHER_LETTER_e + // 0x98: dItemNo_FATHER_LETTER_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x99: dItem_NOTE_TO_MOM_e + // 0x99: dItemNo_NOTE_TO_MOM_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x9A: MAGYS_LETTER + // 0x9A: dItemNo_MAGGIES_LETTER_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x9B: MO_LETTER + // 0x9B: dItemNo_MOBLINS_LETTER_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x9C: COTTAGE_PAPER + // 0x9C: dItemNo_CABANA_DEED_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x9D: KAISEN_PRESENT1 + // 0x9D: dItemNo_COMPLIMENTARY_ID_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x9E: KAISEN_PRESENT2 + // 0x9E: dItemNo_FILL_UP_COUPON_e 0x00, 0x00, 0x00, 0x00, }, { - // 0x9F: SALVAGE_ITEM1 + // 0x9F: dItemNo_LEGENDARY_PICTOGRAPH_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xA0: SALVAGE_ITEM2 + // 0xA0: dItemNo_SALVAGE_ITEM_2_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xA1: SALVAGE_ITEM3 + // 0xA1: dItemNo_SALVAGE_ITEM_3_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xA2: XXX_039 + // 0xA2: dItemNo_XXX_039_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xA3: TINGLE_STATUE1 + // 0xA3: dItemNo_TINGLE_STATUE_1_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xA4: TINGLE_STATUE2 + // 0xA4: dItemNo_TINGLE_STATUE_2_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xA5: TINGLE_STATUE3 + // 0xA5: dItemNo_TINGLE_STATUE_3_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xA6: TINGLE_STATUE4 + // 0xA6: dItemNo_TINGLE_STATUE_4_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xA7: TINGLE_STATUE5 + // 0xA7: dItemNo_TINGLE_STATUE_5_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xA8: TINGLE_STATUE6 + // 0xA8: dItemNo_TINGLE_STATUE_6_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xA9: noentry169 + // 0xA9: dItemNo_NOENTRY_169_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xAA: dItem_HURRICANE_SPIN_e + // 0xAA: dItemNo_HURRICANE_SPIN_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xAB: dItem_MAX_RUPEE_UP1_e + // 0xAB: dItemNo_MAX_RUPEE_UP1_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xAC: dItem_MAX_RUPEE_UP2_e + // 0xAC: dItemNo_MAX_RUPEE_UP2_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xAD: dItem_MAX_BOMB_UP1_e + // 0xAD: dItemNo_MAX_BOMB_UP1_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xAE: dItem_MAX_BOMB_UP2_e + // 0xAE: dItemNo_MAX_BOMB_UP2_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xAF: dItem_MAX_ARROW_UP1_e + // 0xAF: dItemNo_MAX_ARROW_UP1_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xB0: dItem_MAX_ARROW_UP2_e + // 0xB0: dItemNo_MAX_ARROW_UP2_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xB1: dItem_MAGIC_POWER_e + // 0xB1: dItemNo_MAGIC_POWER_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xB2: dItem_MAX_MP_UP1_e + // 0xB2: dItemNo_MAX_MP_UP1_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xB3: TINCLE_RUPEE1 + // 0xB3: dItemNo_TINGLE_RUPEE_1_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xB4: TINCLE_RUPEE2 + // 0xB4: dItemNo_TINGLE_RUPEE_2_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xB5: TINCLE_RUPEE3 + // 0xB5: dItemNo_TINGLE_RUPEE_3_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xB6: TINCLE_RUPEE4 + // 0xB6: dItemNo_TINGLE_RUPEE_4_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xB7: TINCLE_RUPEE5 + // 0xB7: dItemNo_TINGLE_RUPEE_5_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xB8: TINCLE_RUPEE6 + // 0xB8: dItemNo_TINGLE_RUPEE_6_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xB9: LITHOGRAPH1 + // 0xB9: dItemNo_LITHOGRAPH_1_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xBA: LITHOGRAPH2 + // 0xBA: dItemNo_LITHOGRAPH_2_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xBB: LITHOGRAPH3 + // 0xBB: dItemNo_LITHOGRAPH_3_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xBC: LITHOGRAPH4 + // 0xBC: dItemNo_LITHOGRAPH_4_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xBD: LITHOGRAPH5 + // 0xBD: dItemNo_LITHOGRAPH_5_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xBE: LITHOGRAPH6 + // 0xBE: dItemNo_LITHOGRAPH_6_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xBF: dItem_COLLECT_MAP_64_e + // 0xBF: dItemNo_COLLECT_MAP_64_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xC0: dItem_COLLECT_MAP_63_e + // 0xC0: dItemNo_COLLECT_MAP_63_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xC1: dItem_COLLECT_MAP_62_e + // 0xC1: dItemNo_COLLECT_MAP_62_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xC2: dItem_COLLECT_MAP_61_e + // 0xC2: dItemNo_COLLECT_MAP_61_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xC3: dItem_COLLECT_MAP_60_e + // 0xC3: dItemNo_COLLECT_MAP_60_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xC4: dItem_COLLECT_MAP_59_e + // 0xC4: dItemNo_COLLECT_MAP_59_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xC5: dItem_COLLECT_MAP_58_e + // 0xC5: dItemNo_COLLECT_MAP_58_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xC6: dItem_COLLECT_MAP_57_e + // 0xC6: dItemNo_COLLECT_MAP_57_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xC7: dItem_COLLECT_MAP_56_e + // 0xC7: dItemNo_COLLECT_MAP_56_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xC8: dItem_COLLECT_MAP_55_e + // 0xC8: dItemNo_COLLECT_MAP_55_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xC9: dItem_COLLECT_MAP_54_e + // 0xC9: dItemNo_COLLECT_MAP_54_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xCA: dItem_COLLECT_MAP_53_e + // 0xCA: dItemNo_COLLECT_MAP_53_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xCB: dItem_COLLECT_MAP_52_e + // 0xCB: dItemNo_COLLECT_MAP_52_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xCC: dItem_COLLECT_MAP_51_e + // 0xCC: dItemNo_COLLECT_MAP_51_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xCD: dItem_COLLECT_MAP_50_e + // 0xCD: dItemNo_COLLECT_MAP_50_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xCE: dItem_COLLECT_MAP_49_e + // 0xCE: dItemNo_COLLECT_MAP_49_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xCF: dItem_COLLECT_MAP_48_e + // 0xCF: dItemNo_COLLECT_MAP_48_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xD0: dItem_COLLECT_MAP_47_e + // 0xD0: dItemNo_COLLECT_MAP_47_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xD1: dItem_COLLECT_MAP_46_e + // 0xD1: dItemNo_COLLECT_MAP_46_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xD2: dItem_COLLECT_MAP_45_e + // 0xD2: dItemNo_COLLECT_MAP_45_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xD3: dItem_COLLECT_MAP_44_e + // 0xD3: dItemNo_COLLECT_MAP_44_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xD4: dItem_COLLECT_MAP_43_e + // 0xD4: dItemNo_COLLECT_MAP_43_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xD5: dItem_COLLECT_MAP_42_e + // 0xD5: dItemNo_COLLECT_MAP_42_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xD6: dItem_COLLECT_MAP_41_e + // 0xD6: dItemNo_COLLECT_MAP_41_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xD7: dItem_COLLECT_MAP_40_e + // 0xD7: dItemNo_COLLECT_MAP_40_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xD8: dItem_COLLECT_MAP_39_e + // 0xD8: dItemNo_COLLECT_MAP_39_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xD9: dItem_COLLECT_MAP_38_e + // 0xD9: dItemNo_COLLECT_MAP_38_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xDA: dItem_COLLECT_MAP_37_e + // 0xDA: dItemNo_COLLECT_MAP_37_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xDB: dItem_COLLECT_MAP_36_e + // 0xDB: dItemNo_COLLECT_MAP_36_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xDC: dItem_COLLECT_MAP_35_e + // 0xDC: dItemNo_COLLECT_MAP_35_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xDD: dItem_COLLECT_MAP_34_e + // 0xDD: dItemNo_COLLECT_MAP_34_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xDE: dItem_COLLECT_MAP_33_e + // 0xDE: dItemNo_COLLECT_MAP_33_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xDF: dItem_COLLECT_MAP_32_e + // 0xDF: dItemNo_COLLECT_MAP_32_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xE0: dItem_COLLECT_MAP_31_e + // 0xE0: dItemNo_COLLECT_MAP_31_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xE1: dItem_COLLECT_MAP_30_e + // 0xE1: dItemNo_COLLECT_MAP_30_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xE2: dItem_COLLECT_MAP_29_e + // 0xE2: dItemNo_COLLECT_MAP_29_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xE3: dItem_COLLECT_MAP_28_e + // 0xE3: dItemNo_COLLECT_MAP_28_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xE4: dItem_COLLECT_MAP_27_e + // 0xE4: dItemNo_COLLECT_MAP_27_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xE5: dItem_COLLECT_MAP_26_e + // 0xE5: dItemNo_COLLECT_MAP_26_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xE6: dItem_COLLECT_MAP_25_e + // 0xE6: dItemNo_COLLECT_MAP_25_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xE7: dItem_COLLECT_MAP_24_e + // 0xE7: dItemNo_COLLECT_MAP_24_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xE8: dItem_COLLECT_MAP_23_e + // 0xE8: dItemNo_COLLECT_MAP_23_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xE9: dItem_COLLECT_MAP_22_e + // 0xE9: dItemNo_COLLECT_MAP_22_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xEA: dItem_COLLECT_MAP_21_e + // 0xEA: dItemNo_COLLECT_MAP_21_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xEB: dItem_COLLECT_MAP_20_e + // 0xEB: dItemNo_COLLECT_MAP_20_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xEC: dItem_COLLECT_MAP_19_e + // 0xEC: dItemNo_COLLECT_MAP_19_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xED: dItem_COLLECT_MAP_18_e + // 0xED: dItemNo_COLLECT_MAP_18_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xEE: dItem_COLLECT_MAP_17_e + // 0xEE: dItemNo_COLLECT_MAP_17_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xEF: dItem_COLLECT_MAP_16_e + // 0xEF: dItemNo_COLLECT_MAP_16_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xF0: dItem_COLLECT_MAP_15_e + // 0xF0: dItemNo_COLLECT_MAP_15_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xF1: dItem_COLLECT_MAP_14_e + // 0xF1: dItemNo_COLLECT_MAP_14_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xF2: dItem_COLLECT_MAP_13_e + // 0xF2: dItemNo_COLLECT_MAP_13_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xF3: dItem_COLLECT_MAP_12_e + // 0xF3: dItemNo_COLLECT_MAP_12_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xF4: dItem_COLLECT_MAP_11_e + // 0xF4: dItemNo_COLLECT_MAP_11_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xF5: dItem_COLLECT_MAP_10_e + // 0xF5: dItemNo_COLLECT_MAP_10_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xF6: dItem_COLLECT_MAP_09_e + // 0xF6: dItemNo_COLLECT_MAP_09_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xF7: dItem_COLLECT_MAP_08_e + // 0xF7: dItemNo_COLLECT_MAP_08_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xF8: dItem_COLLECT_MAP_07_e + // 0xF8: dItemNo_COLLECT_MAP_07_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xF9: dItem_COLLECT_MAP_06_e + // 0xF9: dItemNo_COLLECT_MAP_06_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xFA: dItem_COLLECT_MAP_05_e + // 0xFA: dItemNo_COLLECT_MAP_05_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xFB: dItem_COLLECT_MAP_04_e + // 0xFB: dItemNo_COLLECT_MAP_04_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xFC: dItem_COLLECT_MAP_03_e + // 0xFC: dItemNo_COLLECT_MAP_03_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xFD: dItem_COLLECT_MAP_02_e + // 0xFD: dItemNo_COLLECT_MAP_02_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xFE: dItem_COLLECT_MAP_01_e + // 0xFE: dItemNo_COLLECT_MAP_01_e 0x00, 0x00, 0x00, 0x00, }, { - // 0xFF: dItem_NONE_e + // 0xFF: dItemNo_NONE_e 0x00, 0x00, 0x00, @@ -9972,647 +9972,647 @@ dItem_data_item_info dItem_data::item_info[0x100] = { /* 803886B0-803888B4 .data effect_info__10dItem_data */ dItem_data_effect_info dItem_data::effect_info[] = { { - // 0x00: dItem_HEART_e + // 0x00: dItemNo_HEART_e dPa_name::ID_AK_JN_O_APPEARHEART, dPa_name::ID_SCENE_END, }, { - // 0x01: dItem_GREEN_RUPEE_e + // 0x01: dItemNo_GREEN_RUPEE_e dPa_name::ID_AK_JN_O_APPEARLUPY, dPa_name::ID_SCENE_END, }, { - // 0x02: dItem_BLUE_RUPEE_e + // 0x02: dItemNo_BLUE_RUPEE_e dPa_name::ID_AK_JN_O_APPEARLUPY, dPa_name::ID_SCENE_END, }, { - // 0x03: dItem_YELLOW_RUPEE_e + // 0x03: dItemNo_YELLOW_RUPEE_e dPa_name::ID_AK_JN_O_APPEARLUPY, dPa_name::ID_SCENE_END, }, { - // 0x04: dItem_RED_RUPEE_e + // 0x04: dItemNo_RED_RUPEE_e dPa_name::ID_AK_JN_O_APPEARLUPY, dPa_name::ID_SCENE_END, }, { - // 0x05: dItem_PURPLE_RUPEE_e + // 0x05: dItemNo_PURPLE_RUPEE_e dPa_name::ID_AK_JN_O_APPEARLUPY, dPa_name::ID_SCENE_END, }, { - // 0x06: dItem_ORANGE_RUPEE_e + // 0x06: dItemNo_ORANGE_RUPEE_e dPa_name::ID_AK_JN_O_APPEARHEART, dPa_name::ID_SCENE_END, }, { - // 0x07: dItem_HEART_PIECE_e + // 0x07: dItemNo_HEART_PIECE_e dPa_name::ID_SCENE_END, dPa_name::ID_AK_JN_HEARTVESSEL, }, { - // 0x08: dItem_HEART_CONTAINER_e + // 0x08: dItemNo_HEART_CONTAINER_e dPa_name::ID_SCENE_END, dPa_name::ID_AK_JN_HEARTVESSEL, }, { - // 0x09: dItem_SMALL_MAGIC_e + // 0x09: dItemNo_SMALL_MAGIC_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x0A: dItem_LARGE_MAGIC_e + // 0x0A: dItemNo_LARGE_MAGIC_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x0B: dItem_BOMB_5_e + // 0x0B: dItemNo_BOMB_5_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x0C: dItem_BOMB_10_e + // 0x0C: dItemNo_BOMB_10_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x0D: dItem_BOMB_20_e + // 0x0D: dItemNo_BOMB_20_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x0E: dItem_BOMB_30_e + // 0x0E: dItemNo_BOMB_30_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x0F: dItem_SILVER_RUPEE_e + // 0x0F: dItemNo_SILVER_RUPEE_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x10: dItem_ARROW_10_e + // 0x10: dItemNo_ARROW_10_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x11: dItem_ARROW_20_e + // 0x11: dItemNo_ARROW_20_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x12: dItem_ARROW_30_e + // 0x12: dItemNo_ARROW_30_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x13: noentry19 + // 0x13: dItemNo_NOENTRY_19_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x14: noentry20 + // 0x14: dItemNo_NOENTRY_20_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x15: dItem_SMALL_KEY_e + // 0x15: dItemNo_SMALL_KEY_e dPa_name::ID_AK_JN_O_APPEARLUPY, dPa_name::ID_SCENE_END, }, { - // 0x16: dItem_RECOVER_FAIRY_e + // 0x16: dItemNo_RECOVER_FAIRY_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x17: noentry23 + // 0x17: dItemNo_NOENTRY_23_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x18: noentry24 + // 0x18: dItemNo_NOENTRY_24_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x19: noentry25 + // 0x19: dItemNo_NOENTRY_25_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x1A: dItem_SUB_DUN_RUPEE_e + // 0x1A: dItemNo_SUB_DUN_RUPEE_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x1B: noentry27 + // 0x1B: dItemNo_NOENTRY_27_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x1C: noentry28 + // 0x1C: dItemNo_NOENTRY_28_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x1D: noentry29 + // 0x1D: dItemNo_NOENTRY_29_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x1E: dItem_TRIPLE_HEART_e + // 0x1E: dItemNo_TRIPLE_HEART_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x1F: dItem_JOY_PENDANT_e + // 0x1F: dItemNo_JOY_PENDANT_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x20: dItem_TELESCOPE_e + // 0x20: dItemNo_TELESCOPE_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x21: dItem_TINGLE_TUNER_e + // 0x21: dItemNo_TINGLE_TUNER_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x22: dItem_WIND_WAKER_e + // 0x22: dItemNo_WIND_WAKER_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x23: CAMERA + // 0x23: dItemNo_PICTO_BOX_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x24: dItem_SPOILS_BAG_e + // 0x24: dItemNo_SPOILS_BAG_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x25: dItem_GRAPPLING_HOOK_e + // 0x25: dItemNo_GRAPPLING_HOOK_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x26: CAMERA2 + // 0x26: dItemNo_DELUXE_PICTO_BOX_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x27: dItem_BOW_e + // 0x27: dItemNo_BOW_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x28: dItem_POWER_BRACELETS_e + // 0x28: dItemNo_POWER_BRACELETS_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x29: dItem_IRON_BOOTS_e + // 0x29: dItemNo_IRON_BOOTS_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x2A: dItem_MAGIC_ARMOR_e + // 0x2A: dItemNo_MAGIC_ARMOR_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x2B: WATER_BOOTS + // 0x2B: dItemNo_WATER_BOOTS_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x2C: dItem_BAIT_BAG_e + // 0x2C: dItemNo_BAIT_BAG_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x2D: dItem_BOOMERANG_e + // 0x2D: dItemNo_BOOMERANG_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x2E: BARE_HAND + // 0x2E: dItemNo_BARE_HAND_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x2F: dItem_HOOKSHOT_e + // 0x2F: dItemNo_HOOKSHOT_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x30: dItem_DELIVERY_BAG_e + // 0x30: dItemNo_DELIVERY_BAG_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x31: dItem_BOMB_BAG_e + // 0x31: dItemNo_BOMB_BAG_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x32: dItem_FUKU_e + // 0x32: dItemNo_FUKU_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x33: dItem_SKULL_HAMMER_e + // 0x33: dItemNo_SKULL_HAMMER_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x34: dItem_DEKU_LEAF_e + // 0x34: dItemNo_DEKU_LEAF_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x35: dItem_MAGIC_ARROW_e + // 0x35: dItemNo_MAGIC_ARROW_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x36: dItem_LIGHT_ARROW_e + // 0x36: dItemNo_LIGHT_ARROW_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x37: dItem_NEW_FUKU_e + // 0x37: dItemNo_NEW_FUKU_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x38: dItem_SWORD_e + // 0x38: dItemNo_SWORD_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x39: dItem_MASTER_SWORD_1_e + // 0x39: dItemNo_MASTER_SWORD_1_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x3A: dItem_MASTER_SWORD_2_e + // 0x3A: dItemNo_MASTER_SWORD_2_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x3B: dItem_SHIELD_e + // 0x3B: dItemNo_SHIELD_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x3C: dItem_MIRROR_SHIELD_e + // 0x3C: dItemNo_MIRROR_SHIELD_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x3D: dItem_DROPPED_SWORD_e + // 0x3D: dItemNo_DROPPED_SWORD_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x3E: dItem_MASTER_SWORD_3_e + // 0x3E: dItemNo_MASTER_SWORD_3_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x3F: KAKERA_HEART2 + // 0x3F: dItemNo_HEART_PIECE_ALT_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x40: noentry64 + // 0x40: dItemNo_NOENTRY_64_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x41: noentry65 + // 0x41: dItemNo_NOENTRY_65_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x42: dItem_PIRATES_CHARM_e + // 0x42: dItemNo_PIRATES_CHARM_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x43: dItem_HEROS_CHARM_e + // 0x43: dItemNo_HEROS_CHARM_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x44: GRASS_BALL + // 0x44: dItemNo_GRASS_BALL_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x45: dItem_SKULL_NECKLACE_e + // 0x45: dItemNo_SKULL_NECKLACE_e dPa_name::ID_SCENE_END, dPa_name::ID_AK_JN_HEARTVESSEL, }, { - // 0x46: dItem_BOKOBABA_SEED_e + // 0x46: dItemNo_BOKOBABA_SEED_e dPa_name::ID_SCENE_END, dPa_name::ID_AK_JN_HEARTVESSEL, }, { - // 0x47: dItem_GOLDEN_FEATHER_e + // 0x47: dItemNo_GOLDEN_FEATHER_e dPa_name::ID_SCENE_END, dPa_name::ID_AK_JN_HEARTVESSEL, }, { - // 0x48: dItem_KNIGHTS_CREST_e + // 0x48: dItemNo_KNIGHTS_CREST_e dPa_name::ID_SCENE_END, dPa_name::ID_AK_JN_HEARTVESSEL, }, { - // 0x49: dItem_RED_JELLY_e + // 0x49: dItemNo_RED_JELLY_e dPa_name::ID_SCENE_END, dPa_name::ID_AK_JN_HEARTVESSEL, }, { - // 0x4A: dItem_GREEN_JELLY_e + // 0x4A: dItemNo_GREEN_JELLY_e dPa_name::ID_SCENE_END, dPa_name::ID_AK_JN_HEARTVESSEL, }, { - // 0x4B: dItem_BLUE_JELLY_e + // 0x4B: dItemNo_BLUE_JELLY_e dPa_name::ID_SCENE_END, dPa_name::ID_AK_JN_HEARTVESSEL, }, { - // 0x4C: dItem_MAP_e + // 0x4C: dItemNo_MAP_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x4D: dItem_COMPASS_e + // 0x4D: dItemNo_COMPASS_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x4E: dItem_BOSS_KEY_e + // 0x4E: dItemNo_BOSS_KEY_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x4F: EMPTY_BSHIP + // 0x4F: dItemNo_EMPTY_BSHIP_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x50: dItem_EMPTY_BOTTLE_e + // 0x50: dItemNo_EMPTY_BOTTLE_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x51: dItem_RED_POTION_e + // 0x51: dItemNo_RED_POTION_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x52: dItem_GREEN_POTION_e + // 0x52: dItemNo_GREEN_POTION_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x53: dItem_BLUE_POTION_e + // 0x53: dItemNo_BLUE_POTION_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x54: dItem_HALF_SOUP_BOTTLE_e + // 0x54: dItemNo_HALF_SOUP_BOTTLE_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x55: dItem_SOUP_BOTTLE_e + // 0x55: dItemNo_SOUP_BOTTLE_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x56: dItem_WATER_BOTTLE_e + // 0x56: dItemNo_WATER_BOTTLE_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x57: dItem_FAIRY_BOTTLE_e + // 0x57: dItemNo_FAIRY_BOTTLE_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x58: dItem_FIREFLY_BOTTLE_e + // 0x58: dItemNo_FIREFLY_BOTTLE_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x59: dItem_FOREST_WATER_e + // 0x59: dItemNo_FOREST_WATER_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x5A: UNK_BOTTLE_5A + // 0x5A: dItemNo_UNK_BOTTLE_5A_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x5B: UNK_BOTTLE_5B + // 0x5B: dItemNo_UNK_BOTTLE_5B_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x5C: UNK_BOTTLE_5C + // 0x5C: dItemNo_UNK_BOTTLE_5C_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x5D: UNK_BOTTLE_5D + // 0x5D: dItemNo_UNK_BOTTLE_5D_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x5E: UNK_BOTTLE_5E + // 0x5E: dItemNo_UNK_BOTTLE_5E_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x5F: UNK_BOTTLE_5F + // 0x5F: dItemNo_UNK_BOTTLE_5F_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x60: UNK_BOTTLE_60 + // 0x60: dItemNo_UNK_BOTTLE_60_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x61: dItem_TRIFORCE1_e + // 0x61: dItemNo_TRIFORCE1_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x62: dItem_TRIFORCE2_e + // 0x62: dItemNo_TRIFORCE2_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x63: dItem_TRIFORCE3_e + // 0x63: dItemNo_TRIFORCE3_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x64: dItem_TRIFORCE4_e + // 0x64: dItemNo_TRIFORCE4_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x65: dItem_TRIFORCE5_e + // 0x65: dItemNo_TRIFORCE5_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x66: dItem_TRIFORCE6_e + // 0x66: dItemNo_TRIFORCE6_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x67: dItem_TRIFORCE7_e + // 0x67: dItemNo_TRIFORCE7_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x68: dItem_TRIFORCE8_e + // 0x68: dItemNo_TRIFORCE8_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x69: dItem_PEARL_NAYRU_e + // 0x69: dItemNo_PEARL_NAYRU_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x6A: dItem_PEARL_DIN_e + // 0x6A: dItemNo_PEARL_DIN_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x6B: dItem_PEARL_FARORE_e + // 0x6B: dItemNo_PEARL_FARORE_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x6C: KNOWLEDGE_TF + // 0x6C: dItemNo_KNOWLEDGE_TF_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x6D: TACT_SONG1 + // 0x6D: dItemNo_WINDS_REQUIEM_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x6E: TACT_SONG2 + // 0x6E: dItemNo_BALLAD_OF_GALES_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x6F: TACT_SONG3 + // 0x6F: dItemNo_COMMAND_MELODY_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x70: TACT_SONG4 + // 0x70: dItemNo_EARTH_GODS_LYRIC_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x71: TACT_SONG5 + // 0x71: dItemNo_WIND_GODS_ARIA_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x72: TACT_SONG6 + // 0x72: dItemNo_SONG_OF_PASSING_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x73: noentry115 + // 0x73: dItemNo_NOENTRY_115_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x74: noentry116 + // 0x74: dItemNo_NOENTRY_116_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x75: noentry117 + // 0x75: dItemNo_NOENTRY_117_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x76: noentry118 + // 0x76: dItemNo_NOENTRY_118_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x77: noentry119 + // 0x77: dItemNo_NOENTRY_119_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x78: NORMAL_SAIL + // 0x78: dItemNo_SAIL_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x79: TRIFORCE_MAP1 + // 0x79: dItemNo_TRIFORCE_MAP_1_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x7A: TRIFORCE_MAP2 + // 0x7A: dItemNo_TRIFORCE_MAP_2_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x7B: TRIFORCE_MAP3 + // 0x7B: dItemNo_TRIFORCE_MAP_3_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x7C: TRIFORCE_MAP4 + // 0x7C: dItemNo_TRIFORCE_MAP_4_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x7D: TRIFORCE_MAP5 + // 0x7D: dItemNo_TRIFORCE_MAP_5_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x7E: TRIFORCE_MAP6 + // 0x7E: dItemNo_TRIFORCE_MAP_6_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x7F: TRIFORCE_MAP7 + // 0x7F: dItemNo_TRIFORCE_MAP_7_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, { - // 0x80: TRIFORCE_MAP8 + // 0x80: dItemNo_TRIFORCE_MAP_8_e dPa_name::ID_SCENE_END, dPa_name::ID_SCENE_END, }, diff --git a/src/d/d_kankyo.cpp b/src/d/d_kankyo.cpp index 15c9fe4fa..ffa2211f8 100644 --- a/src/d/d_kankyo.cpp +++ b/src/d/d_kankyo.cpp @@ -10,8 +10,6 @@ #include "d/d_kankyo_data.h" #include "d/d_kankyo_rain.h" #include "d/d_kankyo_wether.h" -#include "d/d_priority.h" -#include "d/d_procname.h" #include "d/d_s_play.h" #include "d/d_stage.h" #include "dolphin/gf/GF.h" @@ -2439,7 +2437,7 @@ static cPhs_State dKy_Create(void*) { return cPhs_COMPLEATE_e; } -kankyo_method_class l_dKy_Method = { +static kankyo_method_class l_dKy_Method = { (process_method_func)dKy_Create, (process_method_func)dKy_Delete, (process_method_func)dKy_Execute, @@ -2448,17 +2446,17 @@ kankyo_method_class l_dKy_Method = { }; kankyo_process_profile_definition g_profile_KANKYO = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0001, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_KANKYO, - /* Proc SubMtd */ &g_fpcLf_Method.base, - /* Size */ sizeof(sub_kankyo__class), - /* SizeOther */ 0, - /* Parameters */ 0, - /* Leaf SubMtd */ &g_fopKy_Method, - /* Priority */ PRIO_KANKYO, - /* Actor SubMtd */ &l_dKy_Method, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0001, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KANKYO_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(sub_kankyo__class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopKy_Method, + /* Draw Prio */ fpcDwPi_KANKYO_e, + /* Kankyo SubMtd */ &l_dKy_Method, }; /* 80194974-80194BDC .text dKy_setLight_init__Fv */ diff --git a/src/d/d_kankyo_dayproc.inc b/src/d/d_kankyo_dayproc.inc index a4180862e..8c7e5a20d 100644 --- a/src/d/d_kankyo_dayproc.inc +++ b/src/d/d_kankyo_dayproc.inc @@ -23,7 +23,7 @@ static void dKankyo_DayProc() { clamped = cLib_maxLimit(dComIfGs_getEventReg(dSv_event_flag_c::UNK_AB03) + 1, 3); dComIfGs_setEventReg(dSv_event_flag_c::UNK_AB03, clamped); - if (dComIfGs_isGetItemReserve(0x0F) && dComIfGs_checkReserveItem(MO_LETTER) == 0) { + if (dComIfGs_isGetItemReserve(0x0F) && dComIfGs_checkReserveItem(dItemNo_MOBLINS_LETTER_e) == 0) { clamped = cLib_maxLimit(dComIfGs_getEventReg(dSv_event_flag_c::UNK_CCFF) + 1, 2); dComIfGs_setEventReg(dSv_event_flag_c::UNK_CCFF, clamped); } diff --git a/src/d/d_kankyo_rain.cpp b/src/d/d_kankyo_rain.cpp index daabeed96..9cbb0d7ac 100644 --- a/src/d/d_kankyo_rain.cpp +++ b/src/d/d_kankyo_rain.cpp @@ -11,7 +11,6 @@ #include "d/d_com_inf_game.h" #include "d/d_kankyo.h" #include "d/d_kankyo_wether.h" -#include "d/d_procname.h" #include "d/d_snap.h" #include "f_op/f_op_camera.h" #include "f_op/f_op_kankyo_mng.h" @@ -3626,7 +3625,7 @@ void dKyr_thunder_move() { } if (cM_rndF(1.0f) < 0.18f) - fopKyM_create(PROC_KY_THUNDER, -1); + fopKyM_create(fpcNm_KY_THUNDER_e, -1); } break; case 2: diff --git a/src/d/d_ky_thunder.cpp b/src/d/d_ky_thunder.cpp index 62ed62159..5a58c553b 100644 --- a/src/d/d_ky_thunder.cpp +++ b/src/d/d_ky_thunder.cpp @@ -5,13 +5,11 @@ #include "d/dolzel.h" // IWYU pragma: keep #include "d/d_ky_thunder.h" -#include "d/d_priority.h" #include "f_op/f_op_kankyo.h" #include "f_op/f_op_kankyo_mng.h" #include "f_op/f_op_camera.h" #include "d/d_com_inf_game.h" #include "d/d_kankyo_rain.h" -#include "d/d_procname.h" #include "JSystem/JKernel/JKRSolidHeap.h" #include "JSystem/J3DGraphAnimator/J3DModel.h" #include "SSystem/SComponent/c_phase.h" @@ -195,7 +193,7 @@ cPhs_State dThunder_c::create() { return cPhs_COMPLEATE_e; } -kankyo_method_class l_dThunder_Method = { +static kankyo_method_class l_dThunder_Method = { (process_method_func)dThunder_Create, (process_method_func)dThunder_Delete, (process_method_func)dThunder_Execute, @@ -204,15 +202,15 @@ kankyo_method_class l_dThunder_Method = { }; kankyo_process_profile_definition g_profile_KY_THUNDER = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0007, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_KY_THUNDER, - /* Proc SubMtd */ &g_fpcLf_Method.base, - /* Size */ sizeof(dThunder_c), - /* SizeOther */ 0, - /* Parameters */ 0, - /* Leaf SubMtd */ &g_fopKy_Method, - /* Priority */ PRIO_KY_THUNDER, - /* Actor SubMtd */ &l_dThunder_Method, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0007, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KY_THUNDER_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(dThunder_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopKy_Method, + /* Draw Prio */ fpcDwPi_KY_THUNDER_e, + /* Kankyo SubMtd */ &l_dThunder_Method, }; diff --git a/src/d/d_kyeff.cpp b/src/d/d_kyeff.cpp index fe9ed9bb1..7b781b40d 100644 --- a/src/d/d_kyeff.cpp +++ b/src/d/d_kyeff.cpp @@ -5,14 +5,12 @@ #include "d/dolzel.h" // IWYU pragma: keep #include "d/d_kyeff.h" -#include "d/d_priority.h" #include "f_op/f_op_kankyo.h" #include "f_op/f_op_camera.h" #include "d/d_com_inf_game.h" #include "d/d_kankyo.h" #include "d/d_kankyo_data.h" #include "d/d_kankyo_wether.h" -#include "d/d_procname.h" #include "d/d_stage.h" #include "m_Do/m_Do_audio.h" #include "dolphin/os/OS.h" @@ -164,7 +162,7 @@ static cPhs_State dKyeff_Create(kankyo_class* i_ky) { return cPhs_COMPLEATE_e; } -kankyo_method_class l_dKyeff_Method = { +static kankyo_method_class l_dKyeff_Method = { (process_method_func)dKyeff_Create, (process_method_func)dKyeff_Delete, (process_method_func)dKyeff_Execute, @@ -173,15 +171,15 @@ kankyo_method_class l_dKyeff_Method = { }; kankyo_process_profile_definition g_profile_KYEFF = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x000C, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_KYEFF, - /* Proc SubMtd */ &g_fpcLf_Method.base, - /* Size */ sizeof(dKyeff_c), - /* SizeOther */ 0, - /* Parameters */ 0, - /* Leaf SubMtd */ &g_fopKy_Method, - /* Priority */ PRIO_KYEFF, - /* Actor SubMtd */ &l_dKyeff_Method, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x000C, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KYEFF_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(dKyeff_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopKy_Method, + /* Draw Prio */ fpcDwPi_KYEFF_e, + /* Kankyo SubMtd */ &l_dKyeff_Method, }; diff --git a/src/d/d_kyeff2.cpp b/src/d/d_kyeff2.cpp index 1ac112f3d..0be8e7123 100644 --- a/src/d/d_kyeff2.cpp +++ b/src/d/d_kyeff2.cpp @@ -5,11 +5,9 @@ #include "d/dolzel.h" // IWYU pragma: keep #include "d/d_kyeff2.h" -#include "d/d_priority.h" #include "f_op/f_op_kankyo.h" #include "f_op/f_op_camera.h" #include "d/d_kankyo_wether.h" -#include "d/d_procname.h" /* 80198758-8019877C .text dKyeff2_Draw__FP9dKyeff2_c */ static BOOL dKyeff2_Draw(dKyeff2_c* i_this) { @@ -45,7 +43,7 @@ static cPhs_State dKyeff2_Create(kankyo_class*) { return cPhs_COMPLEATE_e; } -kankyo_method_class l_dKyeff2_Method = { +static kankyo_method_class l_dKyeff2_Method = { (process_method_func)dKyeff2_Create, (process_method_func)dKyeff2_Delete, (process_method_func)dKyeff2_Execute, @@ -54,15 +52,15 @@ kankyo_method_class l_dKyeff2_Method = { }; kankyo_process_profile_definition g_profile_KYEFF2 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x000C, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_KYEFF2, - /* Proc SubMtd */ &g_fpcLf_Method.base, - /* Size */ sizeof(dKyeff2_c), - /* SizeOther */ 0, - /* Parameters */ 0, - /* Leaf SubMtd */ &g_fopKy_Method, - /* Priority */ PRIO_KYEFF2, - /* Actor SubMtd */ &l_dKyeff2_Method, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x000C, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KYEFF2_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(dKyeff2_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopKy_Method, + /* Draw Prio */ fpcDwPi_KYEFF2_e, + /* Kankyo SubMtd */ &l_dKyeff2_Method, }; diff --git a/src/d/d_level_se.cpp b/src/d/d_level_se.cpp index ad37473e4..823621a0a 100644 --- a/src/d/d_level_se.cpp +++ b/src/d/d_level_se.cpp @@ -5,10 +5,8 @@ #include "d/dolzel.h" // IWYU pragma: keep #include "d/d_level_se.h" -#include "d/d_priority.h" #include "f_op/f_op_kankyo.h" #include "f_op/f_op_kankyo_mng.h" -#include "d/d_procname.h" #include "m_Do/m_Do_audio.h" /* 80199308-801993CC .text dLevelSe_Execute__FP10dLevelSe_c */ @@ -43,7 +41,7 @@ static cPhs_State dLevelSe_Create(kankyo_class*) { return cPhs_COMPLEATE_e; } -kankyo_method_class l_dLevelSe_Method = { +static kankyo_method_class l_dLevelSe_Method = { (process_method_func)dLevelSe_Create, (process_method_func)dLevelSe_Delete, (process_method_func)dLevelSe_Execute, @@ -51,15 +49,15 @@ kankyo_method_class l_dLevelSe_Method = { }; kankyo_process_profile_definition g_profile_LEVEL_SE = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0002, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_LEVEL_SE, - /* Proc SubMtd */ &g_fpcLf_Method.base, - /* Size */ sizeof(dLevelSe_c), - /* SizeOther */ 0, - /* Parameters */ 0, - /* Leaf SubMtd */ &g_fopKy_Method, - /* Priority */ PRIO_LEVEL_SE, - /* Actor SubMtd */ &l_dLevelSe_Method, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0002, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_LEVEL_SE_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(dLevelSe_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopKy_Method, + /* Draw Prio */ fpcDwPi_LEVEL_SE_e, + /* Kankyo SubMtd */ &l_dLevelSe_Method, }; diff --git a/src/d/d_magma.cpp b/src/d/d_magma.cpp index 98e5cb4f6..7dd4a77f5 100644 --- a/src/d/d_magma.cpp +++ b/src/d/d_magma.cpp @@ -11,10 +11,10 @@ #include "m_Do/m_Do_mtx.h" #include "m_Do/m_Do_lib.h" -Mtx l_kuroOrthoMtx; -Mtx l_colOrthoMtx; +static Mtx l_kuroOrthoMtx; +static Mtx l_colOrthoMtx; -Vec l_YfloorPos[] = { +static Vec l_YfloorPos[] = { { -500.0f, -0.0f, 500.0f }, { 500.0f, -0.0f, 500.0f }, { -500.0f, 0.0f, -500.0f }, @@ -24,7 +24,7 @@ Vec l_YfloorPos[] = { #include "assets/l_YfloorDL.h" #include "assets/l_YfloorMatDL.h" -Vec l_YballPos[] = { +static Vec l_YballPos[] = { {172.280487f, -7.398514f, -167.445663f}, {0.000006f, -7.398514f, -236.803879f}, {-172.280487f, -7.398515f, -167.445648f}, diff --git a/src/d/d_menu_cloth.cpp b/src/d/d_menu_cloth.cpp index e0ad3dca2..ab0af1f4b 100644 --- a/src/d/d_menu_cloth.cpp +++ b/src/d/d_menu_cloth.cpp @@ -5,8 +5,6 @@ #include "d/dolzel.h" // IWYU pragma: keep #include "d/d_menu_cloth.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "assets/l_matDL__d_menu_cloth.h" @@ -979,15 +977,15 @@ static msg_method_class dMenu_ClothMethodTable = { }; msg_process_profile_definition g_profile_Menu_Cloth = { - /* LayerID */ (uint)fpcLy_CURRENT_e, - /* ListID */ 0x000C, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Menu_Cloth, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x000C, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Menu_Cloth_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(menu_cloth_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopMsg_Method, - /* Priority */ PRIO_Menu_Cloth, + /* Draw Prio */ fpcDwPi_Menu_Cloth_e, /* Msg SubMtd */ &dMenu_ClothMethodTable, }; diff --git a/src/d/d_menu_window.cpp b/src/d/d_menu_window.cpp index c1bf62509..c526a0972 100644 --- a/src/d/d_menu_window.cpp +++ b/src/d/d_menu_window.cpp @@ -18,8 +18,6 @@ #include "d/d_menu_save.h" #include "d/d_meter.h" #include "d/d_name.h" -#include "d/d_priority.h" -#include "d/d_procname.h" #include "d/actor/d_a_player_main.h" #include "f_op/f_op_overlap_mng.h" #include "m_Do/m_Do_controller_pad.h" @@ -1559,7 +1557,7 @@ static cPhs_State dMs_Create(msg_class* i_this) { return cPhs_COMPLEATE_e; } -msg_method_class l_dMs_Method = { +static msg_method_class l_dMs_Method = { /* Create */ (process_method_func)dMs_Create, /* Delete */ (process_method_func)dMs_Delete, /* Execute */ (process_method_func)dMs_Execute, @@ -1568,15 +1566,15 @@ msg_method_class l_dMs_Method = { }; msg_process_profile_definition g_profile_MENUWINDOW = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x000C, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_MENUWINDOW, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x000C, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_MENUWINDOW_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(sub_ms_screen_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopMsg_Method, - /* Priority */ PRIO_MENUWINDOW, + /* Draw Prio */ fpcDwPi_MENUWINDOW_e, /* Msg SubMtd */ &l_dMs_Method, }; diff --git a/src/d/d_mesg.cpp b/src/d/d_mesg.cpp index 933125148..212e64aa8 100644 --- a/src/d/d_mesg.cpp +++ b/src/d/d_mesg.cpp @@ -14,8 +14,6 @@ #include "JSystem/JUtility/JUTAssert.h" #include "d/d_com_inf_game.h" #include "d/d_meter.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #if VERSION == VERSION_DEMO #include "d/d_s_play.h" #endif @@ -2245,15 +2243,15 @@ static msg_method_class l_dMesg_Method = { }; msg_process_profile_definition g_profile_MESG = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 12, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_MESG, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 12, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_MESG_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(sub_mesg_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopMsg_Method, - /* Priority */ PRIO_MESG, + /* Draw Prio */ fpcDwPi_MESG_e, /* Msg SubMtd */ &l_dMesg_Method, }; diff --git a/src/d/d_meter.cpp b/src/d/d_meter.cpp index 08310fc14..30f447e80 100644 --- a/src/d/d_meter.cpp +++ b/src/d/d_meter.cpp @@ -11,7 +11,6 @@ #include "d/d_camera.h" #include "d/d_file_error.h" #include "d/d_kankyo_wether.h" -#include "d/d_priority.h" #include "d/actor/d_a_arrow.h" #include "d/actor/d_a_npc_cb1.h" #include "d/actor/d_a_npc_ji1.h" @@ -27,7 +26,6 @@ #include "d/d_com_inf_game.h" #include "d/d_drawlist.h" #include "d/d_metronome.h" -#include "d/d_procname.h" #include "d/d_timer.h" #include "m_Do/m_Do_lib.h" #include "stdio.h" @@ -2407,7 +2405,7 @@ void dMeter_actionAlpha(sub_meter_class* i_Meter) { } dVar2 = fopMsgM_valueIncrease(5, (int)alphaNowFrame, 0); if (dComIfGp_getMiniGameType() == 8) { - pfVar2 = (daNpc_So_c*)fopAcM_SearchByName(PROC_NPC_SO); + pfVar2 = (daNpc_So_c*)fopAcM_SearchByName(fpcNm_NPC_SO_e); if (pfVar2 != NULL) { iVar1 = pfVar2->getMiniGameRestArrow(); if (iVar1 < 10) { @@ -2544,9 +2542,9 @@ void dMeter_xyMove(sub_meter_class* i_Meter) { dMeter_xyItemChange(i_Meter, itemBtn); bVar2 = false; #if VERSION == VERSION_DEMO - if ((i_Meter->field_0x3021[itemBtn] == dItem_MAGIC_ARROW_e) || (i_Meter->field_0x3021[itemBtn] == dItem_LIGHT_ARROW_e)) + if ((i_Meter->field_0x3021[itemBtn] == dItemNo_MAGIC_ARROW_e) || (i_Meter->field_0x3021[itemBtn] == dItemNo_LIGHT_ARROW_e)) #else - if ((dComIfGp_getSelectItem(itemBtn) != dItem_MAGIC_ARROW_e) && (dComIfGp_getSelectItem(itemBtn) != dItem_LIGHT_ARROW_e)) + if ((dComIfGp_getSelectItem(itemBtn) != dItemNo_MAGIC_ARROW_e) && (dComIfGp_getSelectItem(itemBtn) != dItemNo_LIGHT_ARROW_e)) #endif { i_Meter->field_0x2320[itemBtn].pane->hide(); @@ -2563,9 +2561,9 @@ void dMeter_xyMove(sub_meter_class* i_Meter) { dMeter_xyTrans(i_Meter); for (int itemBtn = 0; itemBtn < dItemBtn_COUNT_e; itemBtn++) { dVar1 = dComIfGp_getSelectItem(itemBtn); - if ((dVar1 == dItem_MAGIC_ARROW_e) || (dVar1 == dItem_LIGHT_ARROW_e)) { + if ((dVar1 == dItemNo_MAGIC_ARROW_e) || (dVar1 == dItemNo_LIGHT_ARROW_e)) { dMeter_xyBowLightAnime(i_Meter, itemBtn); - } else if (dVar1 == dItem_FOREST_WATER_e) { + } else if (dVar1 == dItemNo_FOREST_WATER_e) { bVar3 = true; local_38.set(i_Meter->field_0x2080[itemBtn].mPosCenter.x - 320.0f, i_Meter->field_0x2080[itemBtn].mPosCenter.y - 240.0f, 0.0f); for (s32 j = 0; j < 2; j++) { @@ -2616,28 +2614,28 @@ int dMeter_xyEquipItem(int i_itemBtn) { u8 itemNo = dComIfGs_getItem(invIdx); u8 beastIdx = 0; switch (itemNo) { - case dItem_SKULL_NECKLACE_e: + case dItemNo_SKULL_NECKLACE_e: beastIdx = dBeastIdx_SKULL_NECKLACE_e; break; - case dItem_BOKOBABA_SEED_e: + case dItemNo_BOKOBABA_SEED_e: beastIdx = dBeastIdx_BOKOBABA_SEED_e; break; - case dItem_GOLDEN_FEATHER_e: + case dItemNo_GOLDEN_FEATHER_e: beastIdx = dBeastIdx_GOLDEN_FEATHER_e; break; - case dItem_KNIGHTS_CREST_e: + case dItemNo_KNIGHTS_CREST_e: beastIdx = dBeastIdx_KNIGHTS_CREST_e; break; - case dItem_RED_JELLY_e: + case dItemNo_RED_JELLY_e: beastIdx = dBeastIdx_RED_JELLY_e; break; - case dItem_GREEN_JELLY_e: + case dItemNo_GREEN_JELLY_e: beastIdx = dBeastIdx_GREEN_JELLY_e; break; - case dItem_BLUE_JELLY_e: + case dItemNo_BLUE_JELLY_e: beastIdx = dBeastIdx_BLUE_JELLY_e; break; - case dItem_JOY_PENDANT_e: + case dItemNo_JOY_PENDANT_e: beastIdx = dBeastIdx_JOY_PENDANT_e; break; } @@ -2646,13 +2644,13 @@ int dMeter_xyEquipItem(int i_itemBtn) { /* 801F543C-801F57B0 .text dMeter_xyItemNumberSet__FP15sub_meter_classi */ void dMeter_xyItemNumberSet(sub_meter_class* i_Meter, int i_itemBtn) { - if ((dComIfGp_getSelectItem(i_itemBtn) == CAMERA) || (dComIfGp_getSelectItem(i_itemBtn) == CAMERA2)) { + if ((dComIfGp_getSelectItem(i_itemBtn) == dItemNo_PICTO_BOX_e) || (dComIfGp_getSelectItem(i_itemBtn) == dItemNo_DELUXE_PICTO_BOX_e)) { dMeter_PaneHide(&i_Meter->field_0x1f30[i_itemBtn]); dMeter_PaneShow(&i_Meter->field_0x1fd8[i_itemBtn]); dMeter_numberSet(i_Meter->field_0x1fd8[i_itemBtn].pane, dComIfGs_getPictureNum()); dMeter_numberColor((J2DPicture*)i_Meter->field_0x1fd8[i_itemBtn].pane, dComIfGs_getPictureNum(), 3); - } else if ((dComIfGp_getSelectItem(i_itemBtn) == dItem_BOW_e) || - (dComIfGp_getSelectItem(i_itemBtn) == dItem_MAGIC_ARROW_e || (dComIfGp_getSelectItem(i_itemBtn) == dItem_LIGHT_ARROW_e))) + } else if ((dComIfGp_getSelectItem(i_itemBtn) == dItemNo_BOW_e) || + (dComIfGp_getSelectItem(i_itemBtn) == dItemNo_MAGIC_ARROW_e || (dComIfGp_getSelectItem(i_itemBtn) == dItemNo_LIGHT_ARROW_e))) { dMeter_PaneShow(&i_Meter->field_0x1f30[i_itemBtn]); dMeter_PaneShow(&i_Meter->field_0x1fd8[i_itemBtn]); @@ -2664,7 +2662,7 @@ void dMeter_xyItemNumberSet(sub_meter_class* i_Meter, int i_itemBtn) { } dMeter_numberSet(i_Meter->field_0x1fd8[i_itemBtn].pane, dComIfGs_getArrowNum() % 10); dMeter_numberColor((J2DPicture*)i_Meter->field_0x1fd8[i_itemBtn].pane, dComIfGs_getArrowNum(), dComIfGs_getArrowMax()); - } else if (dComIfGp_getSelectItem(i_itemBtn) == dItem_BOMB_BAG_e) { + } else if (dComIfGp_getSelectItem(i_itemBtn) == dItemNo_BOMB_BAG_e) { dMeter_PaneShow(&i_Meter->field_0x1f30[i_itemBtn]); dMeter_PaneShow(&i_Meter->field_0x1fd8[i_itemBtn]); if (dComIfGs_getBombNum() < 10) { @@ -2689,7 +2687,7 @@ void dMeter_xyItemNumberSet(sub_meter_class* i_Meter, int i_itemBtn) { dMeter_numberColor((J2DPicture*)i_Meter->field_0x1fd8[i_itemBtn].pane, dComIfGs_getBeastNum(beastIdx), 99); } else { if ((dComIfGs_getSelectItem(i_itemBtn) >= dInvSlot_BaitFirst_e) && (dComIfGs_getSelectItem(i_itemBtn) <= dInvSlot_BaitLast_e - 1)) { - if (dComIfGp_getSelectItem(i_itemBtn) == dItem_HYOI_PEAR_e) { + if (dComIfGp_getSelectItem(i_itemBtn) == dItemNo_HYOI_PEAR_e) { dMeter_PaneHide(&i_Meter->field_0x1f30[i_itemBtn]); dMeter_PaneHide(&i_Meter->field_0x1fd8[i_itemBtn]); } else { @@ -2755,7 +2753,7 @@ void dMeter_xyItemCountUp(sub_meter_class* i_Meter) { dComIfGs_setPictureNum(sVar4); bVar3 = true; } - if ((((dComIfGs_checkGetItem(dItem_BOW_e)) || (dComIfGs_checkGetItem(dItem_MAGIC_ARROW_e)) || (dComIfGs_checkGetItem(dItem_LIGHT_ARROW_e))) && + if ((((dComIfGs_checkGetItem(dItemNo_BOW_e)) || (dComIfGs_checkGetItem(dItemNo_MAGIC_ARROW_e)) || (dComIfGs_checkGetItem(dItemNo_LIGHT_ARROW_e))) && (dComIfGp_getItemArrowNumCount() != 0)) || (arrowMax != dComIfGs_getArrowMax())) { @@ -2774,7 +2772,7 @@ void dMeter_xyItemCountUp(sub_meter_class* i_Meter) { arrowMax = dComIfGs_getArrowMax(); bVar3 = 1; } - if (((dComIfGs_checkGetItem(dItem_BOMB_BAG_e)) && (dComIfGp_getItemBombNumCount() != 0)) || (bombMax != dComIfGs_getBombMax())) { + if (((dComIfGs_checkGetItem(dItemNo_BOMB_BAG_e)) && (dComIfGp_getItemBombNumCount() != 0)) || (bombMax != dComIfGs_getBombMax())) { if (g_meterHIO.field_0x63 != 0) { g_dComIfG_gameInfo.play.mItemBombNumCount = 0; } @@ -2822,7 +2820,7 @@ void dMeter_xyItemCountUp(sub_meter_class* i_Meter) { } #if VERSION > VERSION_DEMO for (int itemBtn = 0; itemBtn < dItemBtn_COUNT_e; itemBtn++) { - if (dComIfGp_getSelectItem(itemBtn) == dItem_BIRD_BAIT_5_e) { + if (dComIfGp_getSelectItem(itemBtn) == dItemNo_BIRD_BAIT_5_e) { bVar3 = true; } } @@ -2839,7 +2837,7 @@ void dMeter_xyItemChange(sub_meter_class* i_Meter, int i_itemBtn) { JKRArchive* pArc; const char* pFilename; - if (dComIfGp_getSelectItem(i_itemBtn) != dItem_NONE_e) { + if (dComIfGp_getSelectItem(i_itemBtn) != dItemNo_NONE_e) { if (dComIfGs_getSelectItem(i_itemBtn) >= dInvSlot_ReserveFirst_e) { dMeter_PaneShow(&i_Meter->field_0x2080[i_itemBtn]); dMeter_PaneShow(&i_Meter->field_0x2128[i_itemBtn]); @@ -2872,19 +2870,19 @@ void dMeter_xyItemChange(sub_meter_class* i_Meter, int i_itemBtn) { dMeter_PaneShow(&i_Meter->field_0x2128[i_itemBtn]); u8 uVar2 = dComIfGp_getSelectItem(i_itemBtn); u8 var_r4 = uVar2; - if (uVar2 == dItem_MAGIC_ARROW_e) { + if (uVar2 == dItemNo_MAGIC_ARROW_e) { i_Meter->field_0x2320[i_itemBtn].pane->show(); i_Meter->field_0x23c8[i_itemBtn].pane->show(); i_Meter->field_0x2470[i_itemBtn].pane->hide(); - var_r4 = dItem_BOW_e; - } else if (uVar2 == dItem_LIGHT_ARROW_e) { + var_r4 = dItemNo_BOW_e; + } else if (uVar2 == dItemNo_LIGHT_ARROW_e) { i_Meter->field_0x2320[i_itemBtn].pane->show(); i_Meter->field_0x23c8[i_itemBtn].pane->show(); i_Meter->field_0x2470[i_itemBtn].pane->show(); - var_r4 = dItem_BOW_e; + var_r4 = dItemNo_BOW_e; } - if ((var_r4 == dItem_MAGIC_ARROW_e) || (var_r4 == dItem_LIGHT_ARROW_e)) { - var_r4 = dItem_BOW_e; + if ((var_r4 == dItemNo_MAGIC_ARROW_e) || (var_r4 == dItemNo_LIGHT_ARROW_e)) { + var_r4 = dItemNo_BOW_e; } pArc = dComIfGp_getItemIconArchive(); pFilename = dItem_data::getTexture(var_r4); @@ -2967,42 +2965,42 @@ void dMeter_xyAlpha(sub_meter_class* i_Meter) { } } else { for (int itemBtn = 0; itemBtn < dItemBtn_COUNT_e; itemBtn++) { - if (((i_Meter->mStatusFlags & dMtrStts_UNK1000_e) && (dComIfGp_getSelectItem(itemBtn) != dItem_GRAPPLING_HOOK_e)) || - ((i_Meter->mStatusFlags & dMtrStts_UNK80_e) && (dComIfGp_getSelectItem(itemBtn) != dItem_TELESCOPE_e)) || + if (((i_Meter->mStatusFlags & dMtrStts_UNK1000_e) && (dComIfGp_getSelectItem(itemBtn) != dItemNo_GRAPPLING_HOOK_e)) || + ((i_Meter->mStatusFlags & dMtrStts_UNK80_e) && (dComIfGp_getSelectItem(itemBtn) != dItemNo_TELESCOPE_e)) || ((i_Meter->mStatusFlags & dMtrStts_UNK20000_e) && - ((dVar2 = dComIfGp_getSelectItem(itemBtn), ((dVar2 == CAMERA) == 0)) || (dVar2 != CAMERA2))) || + ((dVar2 = dComIfGp_getSelectItem(itemBtn), ((dVar2 == dItemNo_PICTO_BOX_e) == 0)) || (dVar2 != dItemNo_DELUXE_PICTO_BOX_e))) || ((i_Meter->mStatusFlags & dMtrStts_UNK400_e) && (dComIfGp_getMiniGameType() != 1) && - (dVar2 = dComIfGp_getSelectItem(itemBtn), ((dVar2 == NORMAL_SAIL) == 0)) && (dVar2 != dItem_TELESCOPE_e) && - (dVar2 != dItem_WIND_WAKER_e) && (dVar2 != dItem_GRAPPLING_HOOK_e) && (dVar2 != dItem_BOOMERANG_e) && - (dVar2 != dItem_TINGLE_TUNER_e) && (dVar2 != CAMERA) && (dVar2 != CAMERA2) && (dVar2 != dItem_MAGIC_ARMOR_e) && - (dVar2 != dItem_BAIT_BAG_e) && (dVar2 != dItem_HYOI_PEAR_e) && (dVar2 != dItem_BIRD_BAIT_5_e) && (dVar2 != dItem_BOW_e) && - (dVar2 != dItem_MAGIC_ARROW_e) && (dVar2 != dItem_LIGHT_ARROW_e) && (dVar2 != dItem_BOMB_BAG_e) && (dVar2 != dItem_HOOKSHOT_e) && - (dVar2 != dItem_EMPTY_BOTTLE_e) && (dVar2 != dItem_RED_POTION_e) && (dVar2 != dItem_GREEN_POTION_e) && - (dVar2 != dItem_BLUE_POTION_e) && (dVar2 != dItem_HALF_SOUP_BOTTLE_e) && (dVar2 != dItem_SOUP_BOTTLE_e) && - (dVar2 != dItem_WATER_BOTTLE_e) && (dVar2 != dItem_FAIRY_BOTTLE_e) && (dVar2 != dItem_FIREFLY_BOTTLE_e) && - (dVar2 != dItem_FOREST_WATER_e)) || - ((dComIfGp_getMiniGameType() == 1) && (dVar2 = dComIfGp_getSelectItem(itemBtn), ((dVar2 == NORMAL_SAIL) == 0)) && - (dVar2 != dItem_TELESCOPE_e)) || + (dVar2 = dComIfGp_getSelectItem(itemBtn), ((dVar2 == dItemNo_SAIL_e) == 0)) && (dVar2 != dItemNo_TELESCOPE_e) && + (dVar2 != dItemNo_WIND_WAKER_e) && (dVar2 != dItemNo_GRAPPLING_HOOK_e) && (dVar2 != dItemNo_BOOMERANG_e) && + (dVar2 != dItemNo_TINGLE_TUNER_e) && (dVar2 != dItemNo_PICTO_BOX_e) && (dVar2 != dItemNo_DELUXE_PICTO_BOX_e) && (dVar2 != dItemNo_MAGIC_ARMOR_e) && + (dVar2 != dItemNo_BAIT_BAG_e) && (dVar2 != dItemNo_HYOI_PEAR_e) && (dVar2 != dItemNo_BIRD_BAIT_5_e) && (dVar2 != dItemNo_BOW_e) && + (dVar2 != dItemNo_MAGIC_ARROW_e) && (dVar2 != dItemNo_LIGHT_ARROW_e) && (dVar2 != dItemNo_BOMB_BAG_e) && (dVar2 != dItemNo_HOOKSHOT_e) && + (dVar2 != dItemNo_EMPTY_BOTTLE_e) && (dVar2 != dItemNo_RED_POTION_e) && (dVar2 != dItemNo_GREEN_POTION_e) && + (dVar2 != dItemNo_BLUE_POTION_e) && (dVar2 != dItemNo_HALF_SOUP_BOTTLE_e) && (dVar2 != dItemNo_SOUP_BOTTLE_e) && + (dVar2 != dItemNo_WATER_BOTTLE_e) && (dVar2 != dItemNo_FAIRY_BOTTLE_e) && (dVar2 != dItemNo_FIREFLY_BOTTLE_e) && + (dVar2 != dItemNo_FOREST_WATER_e)) || + ((dComIfGp_getMiniGameType() == 1) && (dVar2 = dComIfGp_getSelectItem(itemBtn), ((dVar2 == dItemNo_SAIL_e) == 0)) && + (dVar2 != dItemNo_TELESCOPE_e)) || ((dStage_stagInfo_GetSTType(dComIfGp_getStageStagInfo()) == dStageType_BOSS_e) && ((strcmp(dComIfGp_getStartStageName(), "Xboss0") == 0) || (strcmp(dComIfGp_getStartStageName(), "Xboss1") == 0) || (strcmp(dComIfGp_getStartStageName(), "Xboss2") == 0) || (strcmp(dComIfGp_getStartStageName(), "Xboss3") == 0)) && - ((dVar2 = dComIfGp_getSelectItem(itemBtn), (dVar2 == dItem_WATER_BOTTLE_e)) || ((u8)dVar2 == dItem_FIREFLY_BOTTLE_e) || - (dVar2 == dItem_FOREST_WATER_e))) || - ((i_Meter->mStatusFlags & dMtrStts_UNK2_e) && (dVar2 = dComIfGp_getSelectItem(itemBtn), (dVar2 == dItem_TINGLE_TUNER_e) == 0) && - ((dVar2 != dItem_WIND_WAKER_e) || (strcmp(dComIfGp_getStartStageName(), "Otkura") != 0)) && - ((dComIfGp_getSelectItem(itemBtn) != dItem_GRAPPLING_HOOK_e) || (strcmp(dComIfGp_getStartStageName(), "Abesso") != 0)) && - (dVar2 = dComIfGp_getSelectItem(itemBtn), ((dVar2 == CAMERA) == 0)) && (dVar2 != CAMERA2) && (dVar2 != dItem_SPOILS_BAG_e) && - (dVar2 != dItem_SKULL_NECKLACE_e) && (dVar2 != dItem_BOKOBABA_SEED_e) && (dVar2 != dItem_GOLDEN_FEATHER_e) && - (dVar2 != dItem_KNIGHTS_CREST_e) && (dVar2 != dItem_RED_JELLY_e) && (dVar2 != dItem_GREEN_JELLY_e) && (dVar2 != dItem_BLUE_JELLY_e) && - (dVar2 != dItem_JOY_PENDANT_e) && (dVar2 != dItem_BAIT_BAG_e) && (dVar2 != dItem_BIRD_BAIT_5_e) && (dVar2 != dItem_HYOI_PEAR_e) && - (dVar2 != dItem_EMPTY_BOTTLE_e) && (dVar2 != dItem_RED_POTION_e) && (dVar2 != dItem_GREEN_POTION_e) && - (dVar2 != dItem_BLUE_POTION_e) && (dVar2 != dItem_HALF_SOUP_BOTTLE_e) && (dVar2 != dItem_SOUP_BOTTLE_e) && - (dVar2 != dItem_WATER_BOTTLE_e) && (dVar2 != dItem_FAIRY_BOTTLE_e) && (dVar2 != dItem_FIREFLY_BOTTLE_e) && - (dVar2 != dItem_FOREST_WATER_e) && (dVar2 != dItem_DELIVERY_BAG_e) && (dVar2 != FLOWER_1) && (dVar2 != FLOWER_2) && - (dVar2 != FLOWER_3) && (dVar2 != HEROS_FLAG) && (dVar2 != TAIRYO_FLAG) && (dVar2 != SALES_FLAG) && (dVar2 != WIND_FLAG) && - (dVar2 != RED_FLAG) && (dVar2 != FOSSIL_HEAD) && (dVar2 != WATER_STATUE) && (dVar2 != POSTMAN_STATUE) && - (dVar2 != PRESIDENT_STATUE) && (dVar2 != dItem_FATHER_LETTER_e) && (dVar2 != dItem_NOTE_TO_MOM_e) && (dVar2 != MAGYS_LETTER) && - (dVar2 != MO_LETTER) && (dVar2 != COTTAGE_PAPER) && (dVar2 != KAISEN_PRESENT1) && (dVar2 != KAISEN_PRESENT2))) + ((dVar2 = dComIfGp_getSelectItem(itemBtn), (dVar2 == dItemNo_WATER_BOTTLE_e)) || ((u8)dVar2 == dItemNo_FIREFLY_BOTTLE_e) || + (dVar2 == dItemNo_FOREST_WATER_e))) || + ((i_Meter->mStatusFlags & dMtrStts_UNK2_e) && (dVar2 = dComIfGp_getSelectItem(itemBtn), (dVar2 == dItemNo_TINGLE_TUNER_e) == 0) && + ((dVar2 != dItemNo_WIND_WAKER_e) || (strcmp(dComIfGp_getStartStageName(), "Otkura") != 0)) && + ((dComIfGp_getSelectItem(itemBtn) != dItemNo_GRAPPLING_HOOK_e) || (strcmp(dComIfGp_getStartStageName(), "Abesso") != 0)) && + (dVar2 = dComIfGp_getSelectItem(itemBtn), ((dVar2 == dItemNo_PICTO_BOX_e) == 0)) && (dVar2 != dItemNo_DELUXE_PICTO_BOX_e) && (dVar2 != dItemNo_SPOILS_BAG_e) && + (dVar2 != dItemNo_SKULL_NECKLACE_e) && (dVar2 != dItemNo_BOKOBABA_SEED_e) && (dVar2 != dItemNo_GOLDEN_FEATHER_e) && + (dVar2 != dItemNo_KNIGHTS_CREST_e) && (dVar2 != dItemNo_RED_JELLY_e) && (dVar2 != dItemNo_GREEN_JELLY_e) && (dVar2 != dItemNo_BLUE_JELLY_e) && + (dVar2 != dItemNo_JOY_PENDANT_e) && (dVar2 != dItemNo_BAIT_BAG_e) && (dVar2 != dItemNo_BIRD_BAIT_5_e) && (dVar2 != dItemNo_HYOI_PEAR_e) && + (dVar2 != dItemNo_EMPTY_BOTTLE_e) && (dVar2 != dItemNo_RED_POTION_e) && (dVar2 != dItemNo_GREEN_POTION_e) && + (dVar2 != dItemNo_BLUE_POTION_e) && (dVar2 != dItemNo_HALF_SOUP_BOTTLE_e) && (dVar2 != dItemNo_SOUP_BOTTLE_e) && + (dVar2 != dItemNo_WATER_BOTTLE_e) && (dVar2 != dItemNo_FAIRY_BOTTLE_e) && (dVar2 != dItemNo_FIREFLY_BOTTLE_e) && + (dVar2 != dItemNo_FOREST_WATER_e) && (dVar2 != dItemNo_DELIVERY_BAG_e) && (dVar2 != dItemNo_TOWN_FLOWER_e) && (dVar2 != dItemNo_SEA_FLOWER_e) && + (dVar2 != dItemNo_EXOTIC_FLOWER_e) && (dVar2 != dItemNo_HEROS_FLAG_e) && (dVar2 != dItemNo_BIG_CATCH_FLAG_e) && (dVar2 != dItemNo_BIG_SALE_FLAG_e) && (dVar2 != dItemNo_PINWHEEL_e) && + (dVar2 != dItemNo_SICKLE_MOON_FLAG_e) && (dVar2 != dItemNo_SKULL_TOWER_IDOL_e) && (dVar2 != dItemNo_FOUNTAIN_IDOL_e) && (dVar2 != dItemNo_POSTMAN_STATUE_e) && + (dVar2 != dItemNo_SHOP_GURU_STATUE_e) && (dVar2 != dItemNo_FATHER_LETTER_e) && (dVar2 != dItemNo_NOTE_TO_MOM_e) && (dVar2 != dItemNo_MAGGIES_LETTER_e) && + (dVar2 != dItemNo_MOBLINS_LETTER_e) && (dVar2 != dItemNo_CABANA_DEED_e) && (dVar2 != dItemNo_COMPLIMENTARY_ID_e) && (dVar2 != dItemNo_FILL_UP_COUPON_e))) { if (alphaNowFrame[itemBtn] > 3) { alphaNowFrame[itemBtn]--; @@ -3460,14 +3458,14 @@ void dMeter_enemyMove(sub_meter_class* i_Meter) { if (((!dMenu_flag()) && (!dComIfGp_event_runCheck())) && (attention->LockonTarget(0) != NULL) && ((((((attention->LockonTarget(0)->max_health > 0.0f) && (dComIfGs_isCollect(4, 1) != 0)) && ((attention->LockonTruth() & 0xff) != 0 && - (attention->LockonTarget(0)->group == fopAc_ENEMY_e && (fopAcM_GetName(attention->LockonTarget(0)) != PROC_BTD)))) && - (fopAcM_GetName(attention->LockonTarget(0)) != PROC_BMD)) && - (((fopAcM_GetName(attention->LockonTarget(0)) != PROC_BDK && (fopAcM_GetName(attention->LockonTarget(0)) != PROC_BPW)) && - (fopAcM_GetName(attention->LockonTarget(0)) != PROC_BGN)) && - (fopAcM_GetName(attention->LockonTarget(0)) != PROC_BGN2 && (fopAcM_GetName(attention->LockonTarget(0)) != PROC_BGN3)))) && - ((fopAcM_GetName(attention->LockonTarget(0)) != PROC_GND && - (fopAcM_GetName(attention->LockonTarget(0)) != PROC_BST || ((fopAcM_GetParam(attention->LockonTarget(0)) & 0xfU) != 0))) && - (fopAcM_GetName(attention->LockonTarget(0)) != PROC_BWD)))) + (attention->LockonTarget(0)->group == fopAc_ENEMY_e && (fopAcM_GetName(attention->LockonTarget(0)) != fpcNm_BTD_e)))) && + (fopAcM_GetName(attention->LockonTarget(0)) != fpcNm_BMD_e)) && + (((fopAcM_GetName(attention->LockonTarget(0)) != fpcNm_BDK_e && (fopAcM_GetName(attention->LockonTarget(0)) != fpcNm_BPW_e)) && + (fopAcM_GetName(attention->LockonTarget(0)) != fpcNm_BGN_e)) && + (fopAcM_GetName(attention->LockonTarget(0)) != fpcNm_BGN2_e && (fopAcM_GetName(attention->LockonTarget(0)) != fpcNm_BGN3_e)))) && + ((fopAcM_GetName(attention->LockonTarget(0)) != fpcNm_GND_e && + (fopAcM_GetName(attention->LockonTarget(0)) != fpcNm_BST_e || ((fopAcM_GetParam(attention->LockonTarget(0)) & 0xfU) != 0))) && + (fopAcM_GetName(attention->LockonTarget(0)) != fpcNm_BWD_e)))) { dMeter_zakoEnemyMove(i_Meter); } else { @@ -3476,7 +3474,7 @@ void dMeter_enemyMove(sub_meter_class* i_Meter) { } if ((((!dMenu_flag()) && (dComIfGs_isCollect(4, 1) != 0)) && (!dComIfGp_event_runCheck())) && ((!(i_Meter->mStatusFlags & dMtrStts_UNK80_e)) && (!(i_Meter->mStatusFlags & dMtrStts_UNK20000_e))) && - ((dStage_stagInfo_GetSTType(stage_info) == dStageType_BOSS_e) || (fopAcM_SearchByName(PROC_BDK) != NULL))) + ((dStage_stagInfo_GetSTType(stage_info) == dStageType_BOSS_e) || (fopAcM_SearchByName(fpcNm_BDK_e) != NULL))) { if (((dComIfGs_isStageBossDemo() != 0) && (dComIfGs_isStageBossEnemy() == 0)) || (strcmp(dComIfGp_getStartStageName(), "Xboss0") == 0 || @@ -3484,18 +3482,18 @@ void dMeter_enemyMove(sub_meter_class* i_Meter) { (strcmp(dComIfGp_getStartStageName(), "Xboss3") == 0)))) { fopAc_ac_c* pfVar3; - if (fopAcM_SearchByName(PROC_BTD) != NULL) { - pfVar3 = fopAcM_SearchByName(PROC_BTD); - } else if (fopAcM_SearchByName(PROC_BMD) != NULL) { - pfVar3 = fopAcM_SearchByName(PROC_BMD); - } else if (fopAcM_SearchByName(PROC_BDK) != NULL) { - pfVar3 = fopAcM_SearchByName(PROC_BDK); - } else if (fopAcM_SearchByName(PROC_BST) != NULL) { - pfVar3 = fopAcM_SearchByName(PROC_BST); - } else if (fopAcM_SearchByName(PROC_BWD) != NULL) { - pfVar3 = fopAcM_SearchByName(PROC_BWD); - } else if (fopAcM_SearchByName(PROC_BPW) != NULL) { - pfVar3 = fopAcM_SearchByName(PROC_BPW); + if (fopAcM_SearchByName(fpcNm_BTD_e) != NULL) { + pfVar3 = fopAcM_SearchByName(fpcNm_BTD_e); + } else if (fopAcM_SearchByName(fpcNm_BMD_e) != NULL) { + pfVar3 = fopAcM_SearchByName(fpcNm_BMD_e); + } else if (fopAcM_SearchByName(fpcNm_BDK_e) != NULL) { + pfVar3 = fopAcM_SearchByName(fpcNm_BDK_e); + } else if (fopAcM_SearchByName(fpcNm_BST_e) != NULL) { + pfVar3 = fopAcM_SearchByName(fpcNm_BST_e); + } else if (fopAcM_SearchByName(fpcNm_BWD_e) != NULL) { + pfVar3 = fopAcM_SearchByName(fpcNm_BWD_e); + } else if (fopAcM_SearchByName(fpcNm_BPW_e) != NULL) { + pfVar3 = fopAcM_SearchByName(fpcNm_BPW_e); } else { pfVar3 = NULL; } @@ -3810,12 +3808,12 @@ void dMeter_magicInit(sub_meter_class* i_Meter) { /* 801F8F28-801F9048 .text dMeter_magicMove__FP15sub_meter_class */ void dMeter_magicMove(sub_meter_class* i_Meter) { if (i_Meter->mStatusFlags & dMtrStts_UNK40000_e) { - if (dComIfGp_getCb1Player() == fopAcM_SearchByName(PROC_NPC_CB1)) { + if (dComIfGp_getCb1Player() == fopAcM_SearchByName(fpcNm_NPC_CB1_e)) { int iVar4 = daNpc_Cb1_c::m_flyingTimer; u8 uVar2 = daNpc_Cb1_c::m_flying; s16 uVar3 = daNpc_Cb1_c::getMaxFlyingTimer(); dMeter_flyGaugeMove(i_Meter, uVar2, uVar3, iVar4); - } else if (dComIfGp_getCb1Player() == fopAcM_SearchByName(PROC_NPC_MD)) { + } else if (dComIfGp_getCb1Player() == fopAcM_SearchByName(fpcNm_NPC_MD_e)) { int iVar4 = daNpc_Md_c::m_flyingTimer; u8 uVar2 = daNpc_Md_c::m_flying; s16 uVar3 = daNpc_Md_c::getMaxFlyingTimer(); @@ -4665,7 +4663,7 @@ void dMeter_metronomeInit(sub_meter_class* i_Meter) { void dMeter_windMove(sub_meter_class* i_Meter) { if (dMeter_windStatus != dComIfGp_getOperateWind()) { if (dComIfGp_getOperateWind() == 2) { - dMeter_windID = fopMsgM_Create(PROC_OPERATE_WIND, NULL, NULL); + dMeter_windID = fopMsgM_Create(fpcNm_OPERATE_WIND_e, NULL, NULL); } dMeter_windStatus = dComIfGp_getOperateWind(); } else { @@ -5100,7 +5098,7 @@ void dMeter_compassGetOnProc(sub_meter_class* i_Meter) { dMeter_compassAnimeMove(i_Meter); break; } - f32 dVar3 = (-(s16)(fopAcM_SearchByName(PROC_SHIP)->shape_angle.y + 0x8000) * 180.0f) / 32768.0f; + f32 dVar3 = (-(s16)(fopAcM_SearchByName(fpcNm_SHIP_e)->shape_angle.y + 0x8000) * 180.0f) / 32768.0f; dMeter_compassRotate(&i_Meter->field_0x1670, &i_Meter->field_0x16a8, (-dComIfGs_getTime() - 90.0f)); dMeter_compassRotate(&i_Meter->field_0x1248, &i_Meter->field_0x12f0, dVar3); dMeter_compassRotate(&i_Meter->field_0x1280, &i_Meter->field_0x12f0, dVar3); @@ -6585,7 +6583,7 @@ void dMeter_swimLightAnime(sub_meter_class* i_Meter, s16 param_2) { void dMeter_placeNameMove() { if (!dMeter_place_name) { if (dComIfGp_checkStageName() == 2) { - fopMsgM_create(PROC_PLACE_NAME); + fopMsgM_create(fpcNm_PLACE_NAME_e); dMeter_place_name = true; } } else { @@ -7320,14 +7318,14 @@ static cPhs_State dMeter_Create(msg_class* i_this) { } #if VERSION == VERSION_DEMO - fopMsgM_Create(PROC_MENUWINDOW, NULL, NULL); + fopMsgM_Create(fpcNm_MENUWINDOW_e, NULL, NULL); #else if (strcmp(dComIfGp_getStartStageName(), "sea_T") != 0) { - fopMsgM_Create(PROC_MENUWINDOW, NULL, NULL); + fopMsgM_Create(fpcNm_MENUWINDOW_e, NULL, NULL); } #endif - fopMsgM_Create(PROC_MESG, NULL, NULL); + fopMsgM_Create(fpcNm_MESG_e, NULL, NULL); dComIfGp_setDoStatusForce(dActStts_BLANK_e); dComIfGp_setRStatusForce(dActStts_BLANK_e); @@ -7489,7 +7487,7 @@ void mapCtrlDisp_c::moveMapCtrlDisp() { dMeter_map_HIO_c::~dMeter_map_HIO_c() { } -msg_method_class l_dMeter_Method = { +static msg_method_class l_dMeter_Method = { (process_method_func)dMeter_Create, (process_method_func)dMeter_Delete, (process_method_func)dMeter_Execute, @@ -7498,15 +7496,15 @@ msg_method_class l_dMeter_Method = { }; msg_process_profile_definition g_profile_METER = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 12, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_METER, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 12, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_METER_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(sub_meter_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopMsg_Method, - /* Priority */ PRIO_METER, + /* Draw Prio */ fpcDwPi_METER_e, /* Msg SubMtd */ &l_dMeter_Method, }; diff --git a/src/d/d_msg.cpp b/src/d/d_msg.cpp index fde8d7155..611bc181e 100644 --- a/src/d/d_msg.cpp +++ b/src/d/d_msg.cpp @@ -15,8 +15,6 @@ #include "d/d_s_play.h" #include "f_op/f_op_msg_mng.h" #include "d/actor/d_a_npc_bs1.h" -#include "d/d_priority.h" -#include "d/d_procname.h" #include "dolphin/types.h" #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_lib.h" @@ -3176,15 +3174,15 @@ static msg_method_class l_dMsg_Method = { }; msg_process_profile_definition g_profile_MSG = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 12, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_MSG, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 12, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_MSG_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(sub_msg_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopMsg_Method, - /* Priority */ PRIO_MSG, + /* Draw Prio */ fpcDwPi_MSG_e, /* Msg SubMtd */ &l_dMsg_Method, }; diff --git a/src/d/d_npc.cpp b/src/d/d_npc.cpp index 174c4cc77..138d6cb6b 100644 --- a/src/d/d_npc.cpp +++ b/src/d/d_npc.cpp @@ -646,7 +646,7 @@ bool dNpc_chkArasoi() { bool dNpc_chkLetterPassed() { bool ret = false; if(dComIfGs_isGetItemReserve(0xC)) { - ret = dComIfGs_checkReserveItem(dItem_FATHER_LETTER_e) == 0; + ret = dComIfGs_checkReserveItem(dItemNo_FATHER_LETTER_e) == 0; } return ret; } diff --git a/src/d/d_ovlp_fade.cpp b/src/d/d_ovlp_fade.cpp index da90b7b59..ea11e2264 100644 --- a/src/d/d_ovlp_fade.cpp +++ b/src/d/d_ovlp_fade.cpp @@ -5,11 +5,9 @@ #include "d/dolzel.h" // IWYU pragma: keep #include "d/d_ovlp_fade.h" -#include "d/d_priority.h" #include "f_op/f_op_overlap.h" #include "f_op/f_op_overlap_mng.h" #include "f_pc/f_pc_manager.h" -#include "d/d_procname.h" #include "m_Do/m_Do_graphic.h" BOOL (*dOvlpFd_execute_f)(overlap1_class*); @@ -22,7 +20,7 @@ static BOOL dOvlpFd_Draw(overlap1_class* i_this) { /* 802235D4-802236AC .text dOvlpFd_FadeOut__FP14overlap1_class */ BOOL dOvlpFd_FadeOut(overlap1_class* i_this) { if (i_this->mFadeOutTime == 0) { - if (fpcM_GetProfName(i_this) != PROC_OVERLAP6) { + if (fpcM_GetProfName(i_this) != fpcNm_OVERLAP6_e) { if (!JFWDisplay::getManager()->getFader()->startFadeIn(26)) return TRUE; i_this->mFadeOutTime = 26; @@ -61,7 +59,7 @@ BOOL dOvlpFd_Wait(overlap1_class* i_this) { BOOL dOvlpFd_FadeIn(overlap1_class* i_this) { if (i_this->mFadeInTime == 0) { i_this->mFadeInTime = 26; - if (fpcM_GetProfName(i_this) == PROC_OVERLAP0 || fpcM_GetProfName(i_this) == PROC_OVERLAP7) { + if (fpcM_GetProfName(i_this) == fpcNm_OVERLAP0_e || fpcM_GetProfName(i_this) == fpcNm_OVERLAP7_e) { mDoGph_gInf_c::startFadeOut(26); } } @@ -101,7 +99,7 @@ static cPhs_State dOvlpFd_Create(void* i_this) { #endif } -overlap_method_class l_dOvlpFd_Method = { +static overlap_method_class l_dOvlpFd_Method = { (process_method_func)dOvlpFd_Create, (process_method_func)dOvlpFd_Delete, (process_method_func)dOvlpFd_Execute, @@ -110,71 +108,71 @@ overlap_method_class l_dOvlpFd_Method = { }; overlap_process_profile_definition g_profile_OVERLAP0 = { - fpcLy_ROOT_e, - 0, - fpcPi_CURRENT_e, - PROC_OVERLAP0, - &g_fpcLf_Method.base, - sizeof(overlap1_class), - 0, - 0, - &g_fopOvlp_Method, - PRIO_OVERLAP0, - &l_dOvlpFd_Method, + /* Layer ID */ fpcLy_ROOT_e, + /* List ID */ 0, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OVERLAP0_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(overlap1_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopOvlp_Method, + /* Draw Prio */ fpcDwPi_OVERLAP0_e, + /* Ovlp SubMtd */ &l_dOvlpFd_Method, }; overlap_process_profile_definition g_profile_OVERLAP1 = { - fpcLy_ROOT_e, - 0, - fpcPi_CURRENT_e, - PROC_OVERLAP1, - &g_fpcLf_Method.base, - sizeof(overlap1_class), - 0, - 0, - &g_fopOvlp_Method, - PRIO_OVERLAP1, - &l_dOvlpFd_Method, + /* Layer ID */ fpcLy_ROOT_e, + /* List ID */ 0, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OVERLAP1_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(overlap1_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopOvlp_Method, + /* Draw Prio */ fpcDwPi_OVERLAP1_e, + /* Ovlp SubMtd */ &l_dOvlpFd_Method, }; overlap_process_profile_definition g_profile_OVERLAP6 = { - fpcLy_ROOT_e, - 0, - fpcPi_CURRENT_e, - PROC_OVERLAP6, - &g_fpcLf_Method.base, - sizeof(overlap1_class), - 0, - 0, - &g_fopOvlp_Method, - PRIO_OVERLAP6, - &l_dOvlpFd_Method, + /* Layer ID */ fpcLy_ROOT_e, + /* List ID */ 0, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OVERLAP6_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(overlap1_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopOvlp_Method, + /* Draw Prio */ fpcDwPi_OVERLAP6_e, + /* Ovlp SubMtd */ &l_dOvlpFd_Method, }; overlap_process_profile_definition g_profile_OVERLAP7 = { - fpcLy_ROOT_e, - 0, - fpcPi_CURRENT_e, - PROC_OVERLAP7, - &g_fpcLf_Method.base, - sizeof(overlap1_class), - 0, - 0, - &g_fopOvlp_Method, - PRIO_OVERLAP7, - &l_dOvlpFd_Method, + /* Layer ID */ fpcLy_ROOT_e, + /* List ID */ 0, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OVERLAP7_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(overlap1_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopOvlp_Method, + /* Draw Prio */ fpcDwPi_OVERLAP7_e, + /* Ovlp SubMtd */ &l_dOvlpFd_Method, }; overlap_process_profile_definition g_profile_OVERLAP8 = { - fpcLy_ROOT_e, - 0, - fpcPi_CURRENT_e, - PROC_OVERLAP8, - &g_fpcLf_Method.base, - sizeof(overlap1_class), - 0, - 0, - &g_fopOvlp_Method, - PRIO_OVERLAP8, - &l_dOvlpFd_Method, + /* Layer ID */ fpcLy_ROOT_e, + /* List ID */ 0, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OVERLAP8_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(overlap1_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopOvlp_Method, + /* Draw Prio */ fpcDwPi_OVERLAP8_e, + /* Ovlp SubMtd */ &l_dOvlpFd_Method, }; diff --git a/src/d/d_ovlp_fade2.cpp b/src/d/d_ovlp_fade2.cpp index 1e913229e..8d35706d5 100644 --- a/src/d/d_ovlp_fade2.cpp +++ b/src/d/d_ovlp_fade2.cpp @@ -6,8 +6,6 @@ #include "d/dolzel.h" // IWYU pragma: keep #include "d/d_ovlp_fade2.h" #include "d/d_com_inf_game.h" -#include "d/d_priority.h" -#include "d/d_procname.h" #include "d/d_s_play.h" #include "f_ap/f_ap_game.h" #include "f_op/f_op_overlap.h" @@ -237,7 +235,7 @@ static cPhs_State dOvlpFd2_Create(void* i_this) { return cPhs_COMPLEATE_e; } -overlap_method_class l_dOvlpFd2_Method = { +static overlap_method_class l_dOvlpFd2_Method = { (process_method_func)dOvlpFd2_Create, (process_method_func)dOvlpFd2_Delete, (process_method_func)dOvlpFd2_Execute, @@ -246,31 +244,31 @@ overlap_method_class l_dOvlpFd2_Method = { }; overlap_process_profile_definition g_profile_OVERLAP2 = { - fpcLy_ROOT_e, - 2, - fpcPi_CURRENT_e, - PROC_OVERLAP2, - &g_fpcLf_Method.base, - sizeof(dOvlpFd2_c), - 0, - 0, - &g_fopOvlp_Method, - PRIO_OVERLAP2, - &l_dOvlpFd2_Method, + /* Layer ID */ fpcLy_ROOT_e, + /* List ID */ 2, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OVERLAP2_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(dOvlpFd2_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopOvlp_Method, + /* Draw Prio */ fpcDwPi_OVERLAP2_e, + /* Ovlp SubMtd */ &l_dOvlpFd2_Method, }; #if VERSION > VERSION_JPN overlap_process_profile_definition g_profile_OVERLAP3 = { - fpcLy_ROOT_e, - 2, - fpcPi_CURRENT_e, - PROC_OVERLAP3, - &g_fpcLf_Method.base, - sizeof(dOvlpFd2_c), - 0, - 0, - &g_fopOvlp_Method, - PRIO_OVERLAP3, - &l_dOvlpFd2_Method, + /* Layer ID */ fpcLy_ROOT_e, + /* List ID */ 2, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OVERLAP3_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(dOvlpFd2_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopOvlp_Method, + /* Draw Prio */ fpcDwPi_OVERLAP3_e, + /* Ovlp SubMtd */ &l_dOvlpFd2_Method, }; #endif diff --git a/src/d/d_ovlp_fade4.cpp b/src/d/d_ovlp_fade4.cpp index cff860527..9354390da 100644 --- a/src/d/d_ovlp_fade4.cpp +++ b/src/d/d_ovlp_fade4.cpp @@ -6,8 +6,6 @@ #include "d/dolzel.h" // IWYU pragma: keep #include "d/d_ovlp_fade4.h" #include "d/d_com_inf_game.h" -#include "d/d_priority.h" -#include "d/d_procname.h" #include "f_op/f_op_overlap.h" #include "m_Do/m_Do_graphic.h" @@ -187,7 +185,7 @@ dOvlpFd4_c::dOvlpFd4_c() { first = true; setExecute(&dOvlpFd4_c::execFirstSnap); setDraw(&dOvlpFd4_c::drawFadeOut); - if (fopOvlpM_GetName(this) == PROC_OVERLAP4) { + if (fopOvlpM_GetName(this) == fpcNm_OVERLAP4_e) { fadeOutComposite_dlst.init(mDoGph_gInf_c::getFrameBufferTimg(), 0.0f, 0.0f, 640.0f, 480.0f, g_saftyWhiteColor); } else { fadeOutComposite_dlst.init(mDoGph_gInf_c::getFrameBufferTimg(), 0.0f, 0.0f, 640.0f, 480.0f, (GXColor){ 0x00, 0x00, 0x00, 0x00 }); @@ -369,7 +367,7 @@ cPhs_State dOvlpFd4_Create(void* i_this) { return cPhs_COMPLEATE_e; } -overlap_method_class l_dOvlpFd4_Method = { +static overlap_method_class l_dOvlpFd4_Method = { (process_method_func)dOvlpFd4_Create, (process_method_func)dOvlpFd4_Delete, (process_method_func)dOvlpFd4_Execute, @@ -378,29 +376,29 @@ overlap_method_class l_dOvlpFd4_Method = { }; overlap_process_profile_definition g_profile_OVERLAP4 = { - fpcLy_ROOT_e, - 2, - fpcPi_CURRENT_e, - PROC_OVERLAP4, - &g_fpcLf_Method.base, - sizeof(dOvlpFd4_c), - 0, - 0, - &g_fopOvlp_Method, - PRIO_OVERLAP4, - &l_dOvlpFd4_Method, + /* Layer ID */ fpcLy_ROOT_e, + /* List ID */ 2, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OVERLAP4_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(dOvlpFd4_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopOvlp_Method, + /* Draw Prio */ fpcDwPi_OVERLAP4_e, + /* Ovlp SubMtd */ &l_dOvlpFd4_Method, }; overlap_process_profile_definition g_profile_OVERLAP5 = { - fpcLy_ROOT_e, - 2, - fpcPi_CURRENT_e, - PROC_OVERLAP5, - &g_fpcLf_Method.base, - sizeof(dOvlpFd4_c), - 0, - 0, - &g_fopOvlp_Method, - PRIO_OVERLAP5, - &l_dOvlpFd4_Method, + /* Layer ID */ fpcLy_ROOT_e, + /* List ID */ 2, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OVERLAP5_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(dOvlpFd4_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopOvlp_Method, + /* Draw Prio */ fpcDwPi_OVERLAP5_e, + /* Ovlp SubMtd */ &l_dOvlpFd4_Method, }; diff --git a/src/d/d_particle.cpp b/src/d/d_particle.cpp index c26a7457d..3976e160f 100644 --- a/src/d/d_particle.cpp +++ b/src/d/d_particle.cpp @@ -569,7 +569,7 @@ void dPa_windPcallBack::execute(JPABaseEmitter* emtr, JPABaseParticle* ptcl) { dPa_setWindPower(ptcl); } -GXColor l_lifeBallColor[] = { +static GXColor l_lifeBallColor[] = { 0xeb, 0x20, 0x78, 0xff, 0x20, 0xf1, 0x9b, 0xff, 0xeb, 0xd7, 0x2f, 0xff diff --git a/src/d/d_picture_box.cpp b/src/d/d_picture_box.cpp index a4bab1f09..c3584d391 100644 --- a/src/d/d_picture_box.cpp +++ b/src/d/d_picture_box.cpp @@ -5,8 +5,6 @@ #include "d/dolzel.h" // IWYU pragma: keep #include "d/d_picture_box.h" -#include "d/d_priority.h" -#include "d/d_procname.h" #include "f_op/f_op_msg.h" /* 802258C8-80225954 .text dPb_erasePicture__Fv */ @@ -290,7 +288,7 @@ static cPhs_State dPb_Create(msg_class* i_this) { /* Nonmatching */ } -msg_method_class l_dPb_Method = { +static msg_method_class l_dPb_Method = { (process_method_func)dPb_Create, (process_method_func)dPb_Delete, (process_method_func)dPb_Execute, @@ -299,15 +297,15 @@ msg_method_class l_dPb_Method = { }; msg_process_profile_definition g_profile_PB = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x000C, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_PB, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x000C, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_PB_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(sub_pb_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopMsg_Method, - /* Priority */ PRIO_PB, - /* Actor SubMtd */ &l_dPb_Method, + /* Draw Prio */ fpcDwPi_PB_e, + /* Msg SubMtd */ &l_dPb_Method, }; diff --git a/src/d/d_place_name.cpp b/src/d/d_place_name.cpp index 445d13943..0e2c83daa 100644 --- a/src/d/d_place_name.cpp +++ b/src/d/d_place_name.cpp @@ -5,13 +5,11 @@ #include "d/dolzel.h" // IWYU pragma: keep #include "d/d_place_name.h" -#include "d/d_priority.h" #include "f_op/f_op_msg.h" #include "f_op/f_op_msg_mng.h" #include "d/d_com_inf_game.h" #include "d/d_drawlist.h" #include "d/d_meter.h" -#include "d/d_procname.h" #include "m_Do/m_Do_dvd_thread.h" #include "m_Do/m_Do_ext.h" #include "JSystem/JKernel/JKRArchive.h" @@ -245,7 +243,7 @@ static cPhs_State dPn_Create(msg_class* i_msg) { return i_this->_create(); } -msg_method_class l_dPlace_name_Method = { +static msg_method_class l_dPlace_name_Method = { (process_method_func)dPn_Create, (process_method_func)dPn_Delete, (process_method_func)dPn_Execute, @@ -254,15 +252,15 @@ msg_method_class l_dPlace_name_Method = { }; msg_process_profile_definition g_profile_PLACE_NAME = { - fpcLy_CURRENT_e, - 12, - fpcPi_CURRENT_e, - PROC_PLACE_NAME, - &g_fpcLf_Method.base, - sizeof(dPn_c), - 0, - 0, - &g_fopMsg_Method, - PRIO_PLACE_NAME, - &l_dPlace_name_Method, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 12, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_PLACE_NAME_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(dPn_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopMsg_Method, + /* Draw Prio */ fpcDwPi_PLACE_NAME_e, + /* Msg SubMtd */ &l_dPlace_name_Method, }; diff --git a/src/d/d_s_logo.cpp b/src/d/d_s_logo.cpp index cf8910f94..de30ecc1f 100644 --- a/src/d/d_s_logo.cpp +++ b/src/d/d_s_logo.cpp @@ -12,7 +12,6 @@ #include "c/c_dylink.h" #include "d/d_com_inf_game.h" #include "d/d_com_lib_game.h" -#include "d/d_procname.h" #include "d/d_s_play.h" #include "m_Do/m_Do_MemCardRWmng.h" #include "m_Do/m_Do_audio.h" @@ -444,7 +443,7 @@ BOOL dvdWaitDraw(dScnLogo_c* i_this) { #endif ) { - dComIfG_changeOpeningScene(i_this, PROC_OPENING_SCENE); + dComIfG_changeOpeningScene(i_this, fpcNm_OPENING_SCENE_e); } return TRUE; } @@ -474,7 +473,7 @@ static BOOL dScnLogo_Draw(dScnLogo_c* i_this) { /* 8022D1DC-8022D21C .text dScnLogo_Execute__FP10dScnLogo_c */ static BOOL dScnLogo_Execute(dScnLogo_c* i_this) { if (mDoRst::isReset()) - fopScnM_ChangeReq(i_this, PROC_LOGO_SCENE, PROC_OVERLAP0, 5); + fopScnM_ChangeReq(i_this, fpcNm_LOGO_SCENE_e, fpcNm_OVERLAP0_e, 5); return TRUE; } @@ -937,7 +936,7 @@ static cPhs_State dScnLogo_Create(scene_class* i_scn) { return dComLbG_PhaseHandler(&i_this->mPhs, l_method, i_this); } -scene_method_class l_dScnLogo_Method = { +static scene_method_class l_dScnLogo_Method = { (process_method_func)dScnLogo_Create, (process_method_func)dScnLogo_Delete, (process_method_func)dScnLogo_Execute, @@ -946,13 +945,13 @@ scene_method_class l_dScnLogo_Method = { }; scene_process_profile_definition g_profile_LOGO_SCENE = { - /* LayerID */ fpcLy_ROOT_e, - /* ListID */ 1, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_LOGO_SCENE, + /* Layer ID */ fpcLy_ROOT_e, + /* List ID */ 1, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_LOGO_SCENE_e, /* Proc SubMtd */ &g_fpcNd_Method.base, /* Size */ sizeof(dScnLogo_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Node SubMtd */ &g_fopScn_Method.base, /* Scene SubMtd */ &l_dScnLogo_Method, diff --git a/src/d/d_s_menu.cpp b/src/d/d_s_menu.cpp index 52b07e7e6..2819e4863 100644 --- a/src/d/d_s_menu.cpp +++ b/src/d/d_s_menu.cpp @@ -12,7 +12,6 @@ #include "JSystem/JUtility/JUTReport.h" #include "d/d_com_inf_game.h" #include "d/d_com_lib_game.h" -#include "d/d_procname.h" #include "f_ap/f_ap_game.h" #include "f_op/f_op_scene_mng.h" #if VERSION == VERSION_PAL @@ -26,13 +25,13 @@ #include "stdio.h" #endif -s32 l_startID; -s32 l_cursolID; -int l_timepat; -s16 l_weekpat; -s16 l_demo23; -s8* l_groupPoint; -u8 l_languageType; +static s32 l_startID; +static s32 l_cursolID; +static int l_timepat; +static s16 l_weekpat; +static s16 l_demo23; +static s8* l_groupPoint; +static u8 l_languageType; #if VERSION == VERSION_PAL static mDoDvdThd_mountXArchive_c* l_bmgData2; @@ -195,14 +194,14 @@ static BOOL dScnMenu_Execute(menu_of_scene_class* i_this) { dComIfGp_setNextStage(room->stageName, startCode, room->roomNo, room->layerNo); #if VERSION > VERSION_DEMO if (strcmp(dComIfGp_getNextStageName(), "ENDING") == 0) { - fopScnM_ChangeReq(i_this, PROC_ENDING_SCENE, PROC_OVERLAP0, 5); + fopScnM_ChangeReq(i_this, fpcNm_ENDING_SCENE_e, fpcNm_OVERLAP0_e, 5); mDoAud_bgmStop(30); } else #else if (CPad_CHECK_TRIG_START(0)) #endif { - fopScnM_ChangeReq(i_this, PROC_PLAY_SCENE, PROC_OVERLAP0, 5); + fopScnM_ChangeReq(i_this, fpcNm_PLAY_SCENE_e, fpcNm_OVERLAP0_e, 5); dComIfGs_setRestartRoomParam(0); mDoAud_setSceneName(dComIfGp_getNextStageName(), dComIfGp_getNextStageRoomNo(), dComIfGp_getNextStageLayer()); } @@ -374,7 +373,7 @@ f32 myFontClass::drawChar_scale(f32 param_1, f32 param_2, f32 param_3, f32 param return JUTResFont::drawChar_scale(param_1, param_2, 12.0f, param_4, param_5, param_6); } -scene_method_class l_dScnMenu_Method = { +static scene_method_class l_dScnMenu_Method = { (process_method_func)dScnMenu_Create, (process_method_func)dScnMenu_Delete, (process_method_func)dScnMenu_Execute, @@ -383,13 +382,13 @@ scene_method_class l_dScnMenu_Method = { }; scene_process_profile_definition g_profile_MENU_SCENE = { - /* LayerID */ fpcLy_ROOT_e, - /* ListID */ 1, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_MENU_SCENE, + /* Layer ID */ fpcLy_ROOT_e, + /* List ID */ 1, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_MENU_SCENE_e, /* Proc SubMtd */ &g_fpcNd_Method.base, /* Size */ sizeof(menu_of_scene_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Node SubMtd */ &g_fopScn_Method.base, /* Scene SubMtd */ &l_dScnMenu_Method, diff --git a/src/d/d_s_name.cpp b/src/d/d_s_name.cpp index 6df187eee..e4e749382 100644 --- a/src/d/d_s_name.cpp +++ b/src/d/d_s_name.cpp @@ -9,7 +9,6 @@ #include "d/d_com_lib_game.h" #include "d/d_file_error.h" #include "d/d_file_select.h" -#include "d/d_procname.h" #include "d/d_menu_cloth.h" #include "d/d_menu_save.h" #include "d/d_name.h" @@ -120,7 +119,7 @@ cPhs_State dScnName_c::create() { dFs_c->field_0x0 = mArchive; savePicDatabuf = new (0x20) card_pictdata[3 * 3]; JUT_ASSERT(476, savePicDatabuf != NULL); - if (fpcM_GetName(this) == PROC_NAME_SCENE) { + if (fpcM_GetName(this) == fpcNm_NAME_SCENE_e) { dFs_c->setUseType(0); dNm_c = new dName_c(); JUT_ASSERT(484, dNm_c != NULL); @@ -132,7 +131,7 @@ cPhs_State dScnName_c::create() { dComIfGs_setNoFile(0); dComIfGs_setNewFile(0); } - if (fpcM_GetName(this) == PROC_NAMEEX_SCENE) { + if (fpcM_GetName(this) == fpcNm_NAMEEX_SCENE_e) { dComIfGs_setClearCount(1); dFs_c->setUseType(1); dMs_c = new dMenu_save_c(); @@ -166,10 +165,10 @@ cPhs_State dScnName_c::create() { mDoGph_gInf_c::offAutoForcus(); setView(); dKy_setLight_init(); - fopKyM_Create(PROC_KYEFF, 0, 0); - fopKyM_Create(PROC_KYEFF2, 0, 0); - fpcSCtRq_Request(fpcLy_CurrentLayer(), PROC_VRBOX, NULL, NULL, NULL); - fpcSCtRq_Request(fpcLy_CurrentLayer(), PROC_VRBOX2, NULL, NULL, NULL); + fopKyM_Create(fpcNm_KYEFF_e, 0, 0); + fopKyM_Create(fpcNm_KYEFF2_e, 0, 0); + fpcSCtRq_Request(fpcLy_CurrentLayer(), fpcNm_VRBOX_e, NULL, NULL, NULL); + fpcSCtRq_Request(fpcLy_CurrentLayer(), fpcNm_VRBOX2_e, NULL, NULL, NULL); g_env_light.mVrSkyColor.r = 0x50; g_env_light.mVrSkyColor.g = 0x78; g_env_light.mVrSkyColor.b = 0xff; @@ -184,11 +183,11 @@ cPhs_State dScnName_c::create() { g_env_light.mVrKasumiMaeColor.a = 0xff; field_0x558 = g_snHIO.field_0x5; field_0x1bb8 = 0; - if (fpcM_GetName(this) == PROC_NAME_SCENE) { + if (fpcM_GetName(this) == fpcNm_NAME_SCENE_e) { mMainProc = 0; field_0x556 = 0; mDrawProc = 0; - } else if (fpcM_GetName(this) == PROC_NAMEEX_SCENE) { + } else if (fpcM_GetName(this) == fpcNm_NAMEEX_SCENE_e) { mMainProc = 10; mDrawProc = 3; } @@ -512,11 +511,11 @@ void dScnName_c::NoteOpenWait() { return; } if (g_snHIO.field_0x8 == 0) { - if (fpcM_GetName(this) == PROC_NAME_SCENE) { + if (fpcM_GetName(this) == fpcNm_NAME_SCENE_e) { dFs_c->setSaveDataPtr(saveMemory); dFs_c->setSavePicDataPtr((u8*)savePicDatabuf); } - if (fpcM_GetName(this) == PROC_NAMEEX_SCENE) { + if (fpcM_GetName(this) == fpcNm_NAMEEX_SCENE_e) { dFs_c->setSaveDataPtr(dMs_c->getDataBufPtr()); dFs_c->setSavePicDataPtr((u8*)savePicDatabuf); } @@ -631,7 +630,7 @@ void dScnName_c::FileSelOpenMain() { if (dFs_c->_open() != 1) { return; } - if (fpcM_GetName(this) == PROC_NAMEEX_SCENE) { + if (fpcM_GetName(this) == fpcNm_NAMEEX_SCENE_e) { field_0x1bb6 = 2; } else { field_0x1bb6 = 1; @@ -647,9 +646,9 @@ void dScnName_c::FileselOpenWait() {} void dScnName_c::FileSelectMain() { dFs_c->_move(); field_0x1bb6 = dFs_c->getIconMode(); - if (fpcM_GetName(this) == PROC_NAME_SCENE) + if (fpcM_GetName(this) == fpcNm_NAME_SCENE_e) FileSelectMainNormal(); - if (fpcM_GetName(this) == PROC_NAMEEX_SCENE) + if (fpcM_GetName(this) == fpcNm_NAMEEX_SCENE_e) FileSelectMainExSave(); } @@ -748,7 +747,7 @@ void dScnName_c::FileSelectClose() { if (dFs_c->_close() == 1) { switch (dFs_c->field_0x392c) { case 2: - if (fpcM_GetName(this) == PROC_NAMEEX_SCENE) { + if (fpcM_GetName(this) == fpcNm_NAMEEX_SCENE_e) { dMs_c->initialize(); dMs_c->field_0x053c = 1; dMs_c->field_0x053d = dFs_c->field_0x392f; // getErrType? @@ -911,8 +910,8 @@ void dScnName_c::changeGameScene() { return; dComIfGs_gameStart(); - u32 procName = field_0x55f ? PROC_OPEN_SCENE : PROC_PLAY_SCENE; - if (fopScnM_ChangeReq(this, procName, PROC_OVERLAP0, 5)) { + u32 procName = field_0x55f ? fpcNm_OPEN_SCENE_e : fpcNm_PLAY_SCENE_e; + if (fopScnM_ChangeReq(this, procName, fpcNm_OVERLAP0_e, 5)) { g_dComIfG_gameInfo.save.getDan().mStageNo = -1; dComIfGs_setRestartRoomParam(0); mDoAud_setSceneName(dComIfGp_getNextStageName(), dComIfGp_getNextStageRoomNo(), dComIfGp_getNextStageLayer()); @@ -964,7 +963,7 @@ void dDlst_FLSEL_CLOTH_c::draw() { dComIfGp_getCurrentGrafPort()->setPort(); } -scene_method_class l_dScnName_Method = { +static scene_method_class l_dScnName_Method = { (process_method_func)dScnName_Create, (process_method_func)dScnName_Delete, (process_method_func)dScnName_Execute, @@ -973,26 +972,26 @@ scene_method_class l_dScnName_Method = { }; scene_process_profile_definition g_profile_NAME_SCENE = { - /* LayerID */ fpcLy_ROOT_e, - /* ListID */ 1, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NAME_SCENE, + /* Layer ID */ fpcLy_ROOT_e, + /* List ID */ 1, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NAME_SCENE_e, /* Proc SubMtd */ &g_fpcNd_Method.base, /* Size */ sizeof(dScnName_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Node SubMtd */ &g_fopScn_Method.base, /* Scene SubMtd */ &l_dScnName_Method, }; scene_process_profile_definition g_profile_NAMEEX_SCENE = { - /* LayerID */ fpcLy_ROOT_e, - /* ListID */ 1, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_NAMEEX_SCENE, + /* Layer ID */ fpcLy_ROOT_e, + /* List ID */ 1, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NAMEEX_SCENE_e, /* Proc SubMtd */ &g_fpcNd_Method.base, /* Size */ sizeof(dScnName_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Node SubMtd */ &g_fopScn_Method.base, /* Scene SubMtd */ &l_dScnName_Method, diff --git a/src/d/d_s_open.cpp b/src/d/d_s_open.cpp index 09a756247..18b7fc74c 100644 --- a/src/d/d_s_open.cpp +++ b/src/d/d_s_open.cpp @@ -10,7 +10,6 @@ #include "f_op/f_op_scene_mng.h" #include "f_op/f_op_overlap_mng.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" #include "m_Do/m_Do_audio.h" #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_graphic.h" @@ -45,13 +44,13 @@ BOOL dScnOpen_c::execute() { #else if (!fopOvlpM_IsPeek() && !dComIfG_resetToOpening(this)) { #endif - if (fpcM_GetName(this) == PROC_OPEN2_SCENE && (CPad_CHECK_TRIG_A(0) || CPad_CHECK_TRIG_B(0) || CPad_CHECK_TRIG_START(0))) { + if (fpcM_GetName(this) == fpcNm_OPEN2_SCENE_e && (CPad_CHECK_TRIG_A(0) || CPad_CHECK_TRIG_B(0) || CPad_CHECK_TRIG_START(0))) { field_0x1d4 = 1; mDoAud_bgmStop(20); } if (field_0x1d4 == 1 && !mDoAud_isUsedHeapForStreamBuffer()) - dComIfG_changeOpeningScene(this, PROC_OPENING2_SCENE); + dComIfG_changeOpeningScene(this, fpcNm_OPENING2_SCENE_e); } mpProc->proc_execute(); @@ -90,10 +89,10 @@ void dScnOpen_c::changeGameScene() { if (fopOvlpM_IsPeek()) return; - if (fpcM_GetName(this) == PROC_OPEN2_SCENE) { - dComIfG_changeOpeningScene(this, PROC_OPENING2_SCENE); + if (fpcM_GetName(this) == fpcNm_OPEN2_SCENE_e) { + dComIfG_changeOpeningScene(this, fpcNm_OPENING2_SCENE_e); } else { - if (fopScnM_ChangeReq(this, PROC_PLAY_SCENE, PROC_OVERLAP0, 5)) { + if (fopScnM_ChangeReq(this, fpcNm_PLAY_SCENE_e, fpcNm_OVERLAP0_e, 5)) { dComIfGs_setRestartRoomParam(0); mDoAud_setSceneName(dComIfGp_getNextStageName(), dComIfGp_getNextStageRoomNo(), dComIfGp_getNextStageLayer()); } @@ -127,7 +126,7 @@ static cPhs_State dScnOpen_Create(scene_class* i_scn) { return i_this->create(); } -scene_method_class l_dScnOpen_Method = { +static scene_method_class l_dScnOpen_Method = { (process_method_func)dScnOpen_Create, (process_method_func)dScnOpen_Delete, (process_method_func)dScnOpen_Execute, @@ -136,26 +135,26 @@ scene_method_class l_dScnOpen_Method = { }; scene_process_profile_definition g_profile_OPEN_SCENE = { - /* LayerID */ fpcLy_ROOT_e, - /* ListID */ 1, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_OPEN_SCENE, + /* Layer ID */ fpcLy_ROOT_e, + /* List ID */ 1, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OPEN_SCENE_e, /* Proc SubMtd */ &g_fpcNd_Method.base, /* Size */ sizeof(dScnOpen_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Node SubMtd */ &g_fopScn_Method.base, /* Scene SubMtd */ &l_dScnOpen_Method, }; scene_process_profile_definition g_profile_OPEN2_SCENE = { - /* LayerID */ fpcLy_ROOT_e, - /* ListID */ 1, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_OPEN2_SCENE, + /* Layer ID */ fpcLy_ROOT_e, + /* List ID */ 1, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OPEN2_SCENE_e, /* Proc SubMtd */ &g_fpcNd_Method.base, /* Size */ sizeof(dScnOpen_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Node SubMtd */ &g_fopScn_Method.base, /* Scene SubMtd */ &l_dScnOpen_Method, diff --git a/src/d/d_s_play.cpp b/src/d/d_s_play.cpp index 6fdbd27f4..6151adfbd 100644 --- a/src/d/d_s_play.cpp +++ b/src/d/d_s_play.cpp @@ -26,7 +26,6 @@ #include "d/d_kankyo_rain.h" #include "d/d_material.h" #include "d/d_meter.h" -#include "d/d_procname.h" #include "d/d_snap.h" #include "f_op/f_op_draw_iter.h" #include "f_op/f_op_msg_mng.h" @@ -288,31 +287,31 @@ static BOOL dScnPly_Draw(dScnPly_ply_c* i_this) { dComIfG_Ccsp()->Move(); dComIfG_Bgsp()->ClrMoveFlag(); - if (!fopOvlpM_IsPeek() && !dComIfG_resetToOpening(i_this) && fpcM_GetName(i_this) == PROC_PLAY_SCENE) { + if (!fopOvlpM_IsPeek() && !dComIfG_resetToOpening(i_this) && fpcM_GetName(i_this) == fpcNm_PLAY_SCENE_e) { if (dComIfGp_isEnableNextStage()) { static s16 l_wipeType[] = { - PROC_OVERLAP0, - PROC_OVERLAP0, - PROC_OVERLAP2, - PROC_OVERLAP3, - PROC_OVERLAP4, - PROC_OVERLAP1, - PROC_OVERLAP6, - PROC_OVERLAP1, - PROC_OVERLAP7, - PROC_OVERLAP7, - PROC_OVERLAP8, - PROC_OVERLAP8, + fpcNm_OVERLAP0_e, + fpcNm_OVERLAP0_e, + fpcNm_OVERLAP2_e, + fpcNm_OVERLAP3_e, + fpcNm_OVERLAP4_e, + fpcNm_OVERLAP1_e, + fpcNm_OVERLAP6_e, + fpcNm_OVERLAP1_e, + fpcNm_OVERLAP7_e, + fpcNm_OVERLAP7_e, + fpcNm_OVERLAP8_e, + fpcNm_OVERLAP8_e, }; JUT_ASSERT(VERSION_SELECT(997, 997, 1001, 1001), dComIfGp_getNextStageWipe() < ARRAY_SIZE(l_wipeType)); if (strcmp(dComIfGp_getNextStageName(), "ENDING") == 0) { - fopScnM_ChangeReq(i_this, PROC_ENDING_SCENE, PROC_OVERLAP0, 5); + fopScnM_ChangeReq(i_this, fpcNm_ENDING_SCENE_e, fpcNm_OVERLAP0_e, 5); mDoAud_bgmStop(30); } else { - fopScnM_ChangeReq(i_this, PROC_PLAY_SCENE, l_wipeType[dComIfGp_getNextStageWipe()], 5); + fopScnM_ChangeReq(i_this, fpcNm_PLAY_SCENE_e, l_wipeType[dComIfGp_getNextStageWipe()], 5); int hour = dKy_getdaytime_hour(); BOOL isNight = FALSE; @@ -431,23 +430,23 @@ const char* M_Dai_resName[] = { STATIC_ASSERT(ARRAY_SIZE(M_Dai_resName) <= PRELOAD_RES_MAX); const s16 majroom_dylKeyTbl[] = { - PROC_DOOR10, - PROC_EP, - PROC_HIMO3, - PROC_KNOB00, - PROC_KYTAG02, - PROC_MO2, - PROC_NPC_NZ, - PROC_NZ, - PROC_NZG, - PROC_Obj_Barrel, - PROC_Obj_Mshokki, - PROC_OBJ_OTBLE, - PROC_Tag_Attention, - PROC_TAG_EVENT, - PROC_TAG_HINT, - PROC_TBOX, - PROC_TSUBO, + fpcNm_DOOR10_e, + fpcNm_EP_e, + fpcNm_HIMO3_e, + fpcNm_KNOB00_e, + fpcNm_KYTAG02_e, + fpcNm_MO2_e, + fpcNm_NPC_NZ_e, + fpcNm_NZ_e, + fpcNm_NZG_e, + fpcNm_Obj_Barrel_e, + fpcNm_Obj_Mshokki_e, + fpcNm_OBJ_OTBLE_e, + fpcNm_Tag_Attention_e, + fpcNm_TAG_EVENT_e, + fpcNm_TAG_HINT_e, + fpcNm_TBOX_e, + fpcNm_TSUBO_e, }; STATIC_ASSERT(ARRAY_SIZE(majroom_dylKeyTbl) <= PRELOAD_DYL_MAX); @@ -477,20 +476,20 @@ const char* majroom_resName[] = { STATIC_ASSERT(ARRAY_SIZE(majroom_resName) <= PRELOAD_RES_MAX); const s16 ma2room_dylKeyTbl[] = { - PROC_AGBSW0, - PROC_BK, - PROC_DOOR10, - PROC_EP, - PROC_KNOB00, - PROC_MO2, - PROC_NZ, - PROC_NZG, - PROC_Obj_Mshokki, - PROC_OBJ_OTBLE, - PROC_Tag_Attention, - PROC_TAG_EVENT, - PROC_TBOX, - PROC_TSUBO, + fpcNm_AGBSW0_e, + fpcNm_BK_e, + fpcNm_DOOR10_e, + fpcNm_EP_e, + fpcNm_KNOB00_e, + fpcNm_MO2_e, + fpcNm_NZ_e, + fpcNm_NZG_e, + fpcNm_Obj_Mshokki_e, + fpcNm_OBJ_OTBLE_e, + fpcNm_Tag_Attention_e, + fpcNm_TAG_EVENT_e, + fpcNm_TBOX_e, + fpcNm_TSUBO_e, }; STATIC_ASSERT(ARRAY_SIZE(ma2room_dylKeyTbl) <= PRELOAD_DYL_MAX); @@ -523,19 +522,19 @@ const char* ma2room_resName[] = { STATIC_ASSERT(ARRAY_SIZE(ma2room_resName) <= PRELOAD_RES_MAX); const s16 ma3room_dylKeyTbl[] = { - PROC_DOOR10, - PROC_EP, - PROC_KI, - PROC_KNOB00, - PROC_MO2, - PROC_NZ, - PROC_NZG, - PROC_Obj_Mshokki, - PROC_OBJ_OTBLE, - PROC_Tag_Attention, - PROC_TAG_EVENT, - PROC_TBOX, - PROC_TSUBO, + fpcNm_DOOR10_e, + fpcNm_EP_e, + fpcNm_KI_e, + fpcNm_KNOB00_e, + fpcNm_MO2_e, + fpcNm_NZ_e, + fpcNm_NZG_e, + fpcNm_Obj_Mshokki_e, + fpcNm_OBJ_OTBLE_e, + fpcNm_Tag_Attention_e, + fpcNm_TAG_EVENT_e, + fpcNm_TBOX_e, + fpcNm_TSUBO_e, }; STATIC_ASSERT(ARRAY_SIZE(ma3room_dylKeyTbl) <= PRELOAD_DYL_MAX); @@ -561,18 +560,18 @@ const char* ma3room_resName[] = { STATIC_ASSERT(ARRAY_SIZE(ma3room_resName) <= PRELOAD_RES_MAX); const s16 M_NewD2_dylKeyTbl[] = { - PROC_TBOX, - PROC_TAG_EVENT, - PROC_DOOR10, - PROC_AGBSW0, - PROC_Ykgr, - PROC_TSUBO, - PROC_BK, - PROC_SteamTag, - PROC_MT, - PROC_CC, - PROC_NPC_NZ, - PROC_Fire, + fpcNm_TBOX_e, + fpcNm_TAG_EVENT_e, + fpcNm_DOOR10_e, + fpcNm_AGBSW0_e, + fpcNm_Ykgr_e, + fpcNm_TSUBO_e, + fpcNm_BK_e, + fpcNm_SteamTag_e, + fpcNm_MT_e, + fpcNm_CC_e, + fpcNm_NPC_NZ_e, + fpcNm_Fire_e, }; STATIC_ASSERT(ARRAY_SIZE(M_NewD2_dylKeyTbl) <= PRELOAD_DYL_MAX); @@ -616,19 +615,19 @@ const char* M_NewD2_resName[] = { STATIC_ASSERT(ARRAY_SIZE(M_NewD2_resName) <= PRELOAD_RES_MAX); const s16 kindan_dylKeyTbl[] = { - PROC_TBOX, - PROC_TAG_EVENT, - PROC_SWC00, - PROC_DOOR10, - PROC_AGBSW0, - PROC_Tag_Attention, - PROC_TSUBO, - PROC_CC, - PROC_PH, - PROC_KLFT, - PROC_SITEM, - PROC_KITA, - PROC_Obj_Mtest, + fpcNm_TBOX_e, + fpcNm_TAG_EVENT_e, + fpcNm_SWC00_e, + fpcNm_DOOR10_e, + fpcNm_AGBSW0_e, + fpcNm_Tag_Attention_e, + fpcNm_TSUBO_e, + fpcNm_CC_e, + fpcNm_PH_e, + fpcNm_KLFT_e, + fpcNm_SITEM_e, + fpcNm_KITA_e, + fpcNm_Obj_Mtest_e, }; STATIC_ASSERT(ARRAY_SIZE(kindan_dylKeyTbl) <= PRELOAD_DYL_MAX); @@ -672,72 +671,72 @@ const char* kindan_resName[] = { STATIC_ASSERT(ARRAY_SIZE(kindan_resName) <= PRELOAD_RES_MAX); const s16 M_Dai_dylKeyTbl[] = { - PROC_ALLDIE, - PROC_Obj_Msdan2, - PROC_Obj_Msdan, - PROC_Obj_MsdanSub2, - PROC_Obj_MsdanSub, - PROC_SW_ATTACK, - PROC_Obj_Correct, - PROC_Obj_Mkiek, - PROC_Obj_Vds, - PROC_Obj_Ladder, - PROC_DOOR12, - PROC_Obj_MknjD, - PROC_Obj_Swhammer, - PROC_Obj_Swlight, - PROC_Obj_Mkie, - PROC_KANTERA, - PROC_Obj_Mmrr, - PROC_Obj_Kanoke, - PROC_BOKO, - PROC_BL, - PROC_PW, - PROC_CC, - PROC_Obj_Tapestry, - PROC_ST, - PROC_FM, - PROC_MO2, - PROC_TN, + fpcNm_ALLDIE_e, + fpcNm_Obj_Msdan2_e, + fpcNm_Obj_Msdan_e, + fpcNm_Obj_MsdanSub2_e, + fpcNm_Obj_MsdanSub_e, + fpcNm_SW_ATTACK_e, + fpcNm_Obj_Correct_e, + fpcNm_Obj_Mkiek_e, + fpcNm_Obj_Vds_e, + fpcNm_Obj_Ladder_e, + fpcNm_DOOR12_e, + fpcNm_Obj_MknjD_e, + fpcNm_Obj_Swhammer_e, + fpcNm_Obj_Swlight_e, + fpcNm_Obj_Mkie_e, + fpcNm_KANTERA_e, + fpcNm_Obj_Mmrr_e, + fpcNm_Obj_Kanoke_e, + fpcNm_BOKO_e, + fpcNm_BL_e, + fpcNm_PW_e, + fpcNm_CC_e, + fpcNm_Obj_Tapestry_e, + fpcNm_ST_e, + fpcNm_FM_e, + fpcNm_MO2_e, + fpcNm_TN_e, }; STATIC_ASSERT(ARRAY_SIZE(M_Dai_dylKeyTbl) <= PRELOAD_DYL_MAX); const s16 sea_dylKeyTbl[] = { - PROC_TAG_SO, - PROC_Salvage, - PROC_Obj_Coming, - PROC_LODBG, - PROC_Coming2, - PROC_SHIP, - PROC_NPC_SO, + fpcNm_TAG_SO_e, + fpcNm_Salvage_e, + fpcNm_Obj_Coming_e, + fpcNm_LODBG_e, + fpcNm_Coming2_e, + fpcNm_SHIP_e, + fpcNm_NPC_SO_e, }; STATIC_ASSERT(ARRAY_SIZE(sea_dylKeyTbl) <= PRELOAD_DYL_MAX); const s16 kaze_dylKeyTbl[] = { - PROC_GRASS, - PROC_PH, - PROC_FM, - PROC_TAG_MDCB, - PROC_Obj_Hfuck1, - PROC_Obj_Eff, - PROC_WindTag, - PROC_Obj_Homen, - PROC_TSUBO, - PROC_EP, - PROC_Obj_Jump, - PROC_Obj_Hami3, - PROC_WINDMILL, - PROC_Obj_Hbrf1, - PROC_Obj_Hami4, - PROC_Obj_Hami2, - PROC_MACHINE, - PROC_Obj_Vmc, - PROC_Obj_MknjD, - PROC_NPC_CB1, - PROC_Obj_Trap, - PROC_SW_PROPELLER, - PROC_TOGE, - PROC_SHUTTER2, + fpcNm_GRASS_e, + fpcNm_PH_e, + fpcNm_FM_e, + fpcNm_TAG_MDCB_e, + fpcNm_Obj_Hfuck1_e, + fpcNm_Obj_Eff_e, + fpcNm_WindTag_e, + fpcNm_Obj_Homen_e, + fpcNm_TSUBO_e, + fpcNm_EP_e, + fpcNm_Obj_Jump_e, + fpcNm_Obj_Hami3_e, + fpcNm_WINDMILL_e, + fpcNm_Obj_Hbrf1_e, + fpcNm_Obj_Hami4_e, + fpcNm_Obj_Hami2_e, + fpcNm_MACHINE_e, + fpcNm_Obj_Vmc_e, + fpcNm_Obj_MknjD_e, + fpcNm_NPC_CB1_e, + fpcNm_Obj_Trap_e, + fpcNm_SW_PROPELLER_e, + fpcNm_TOGE_e, + fpcNm_SHUTTER2_e, }; STATIC_ASSERT(ARRAY_SIZE(kaze_dylKeyTbl) <= PRELOAD_DYL_MAX); @@ -771,13 +770,13 @@ const char* kaze_resName[] = { STATIC_ASSERT(ARRAY_SIZE(kaze_resName) <= PRELOAD_RES_MAX); s16 Siren_dylKeyTbl[] = { - PROC_Obj_Hha, - PROC_Obj_Htetu1, - PROC_NPC_OS, - PROC_LIGHTSTAIR, - PROC_WALL, - PROC_Obj_Try, - PROC_Obj_Correct, + fpcNm_Obj_Hha_e, + fpcNm_Obj_Htetu1_e, + fpcNm_NPC_OS_e, + fpcNm_LIGHTSTAIR_e, + fpcNm_WALL_e, + fpcNm_Obj_Try_e, + fpcNm_Obj_Correct_e, }; STATIC_ASSERT(ARRAY_SIZE(Siren_dylKeyTbl) <= PRELOAD_DYL_MAX); @@ -796,17 +795,17 @@ const char* Siren_resName[] = { STATIC_ASSERT(ARRAY_SIZE(Siren_resName) <= PRELOAD_RES_MAX); s16 GanonJ_dylKeyTbl[] = { - PROC_TBOX, - PROC_DOOR10, - PROC_MANT, - PROC_FGANON, - PROC_TSUBO, - PROC_MO2, - PROC_BK, - PROC_TN, - PROC_PT, - PROC_Obj_Hcbh, - PROC_ANDSW0, + fpcNm_TBOX_e, + fpcNm_DOOR10_e, + fpcNm_MANT_e, + fpcNm_FGANON_e, + fpcNm_TSUBO_e, + fpcNm_MO2_e, + fpcNm_BK_e, + fpcNm_TN_e, + fpcNm_PT_e, + fpcNm_Obj_Hcbh_e, + fpcNm_ANDSW0_e, }; STATIC_ASSERT(ARRAY_SIZE(GanonJ_dylKeyTbl) <= PRELOAD_DYL_MAX); @@ -829,19 +828,19 @@ const char* GanonJ_resName[] = { STATIC_ASSERT(ARRAY_SIZE(GanonJ_resName) <= PRELOAD_RES_MAX); s16 GanonK_dylKeyTbl[] = { - PROC_TSUBO, - PROC_Obj_Vteng, - PROC_KUI, - PROC_KS, - PROC_EP, - PROC_BGN, - PROC_TAG_EVENT, - PROC_Tag_Attention, - PROC_PZ, - PROC_Obj_Gbed, - PROC_BGN3, - PROC_BGN2, - PROC_ATT, + fpcNm_TSUBO_e, + fpcNm_Obj_Vteng_e, + fpcNm_KUI_e, + fpcNm_KS_e, + fpcNm_EP_e, + fpcNm_BGN_e, + fpcNm_TAG_EVENT_e, + fpcNm_Tag_Attention_e, + fpcNm_PZ_e, + fpcNm_Obj_Gbed_e, + fpcNm_BGN3_e, + fpcNm_BGN2_e, + fpcNm_ATT_e, }; STATIC_ASSERT(ARRAY_SIZE(GanonK_dylKeyTbl) <= PRELOAD_DYL_MAX); @@ -858,11 +857,11 @@ const char* GanonK_resName[] = { STATIC_ASSERT(ARRAY_SIZE(GanonK_resName) <= PRELOAD_RES_MAX); s16 GanonM_dylKeyTbl[] = { - PROC_FGANON, - PROC_MANT, - PROC_Ygcwp, - PROC_Obj_Vfan, - PROC_WARPGANON, + fpcNm_FGANON_e, + fpcNm_MANT_e, + fpcNm_Ygcwp_e, + fpcNm_Obj_Vfan_e, + fpcNm_WARPGANON_e, }; STATIC_ASSERT(ARRAY_SIZE(GanonM_dylKeyTbl) <= PRELOAD_DYL_MAX); @@ -876,7 +875,7 @@ const char* GanonM_resName[] = { STATIC_ASSERT(ARRAY_SIZE(GanonM_resName) <= PRELOAD_RES_MAX); const s16 M_DragB_dylKeyTbl[] = { - PROC_WARPFLOWER, + fpcNm_WARPFLOWER_e, }; STATIC_ASSERT(ARRAY_SIZE(M_DragB_dylKeyTbl) <= PRELOAD_DYL_MAX); @@ -886,8 +885,8 @@ const char* M_DragB_resName[] = { STATIC_ASSERT(ARRAY_SIZE(M_DragB_resName) <= PRELOAD_RES_MAX); const s16 kinBOSS_dylKeyTbl[] = { - PROC_NPC_CB1, - PROC_WARPFLOWER, + fpcNm_NPC_CB1_e, + fpcNm_WARPFLOWER_e, }; STATIC_ASSERT(ARRAY_SIZE(kinBOSS_dylKeyTbl) <= PRELOAD_DYL_MAX); @@ -898,7 +897,7 @@ const char* kinBOSS_resName[] = { STATIC_ASSERT(ARRAY_SIZE(kinBOSS_resName) <= PRELOAD_RES_MAX); const s16 M_DaiB_dylKeyTbl[] = { - PROC_WARPFLOWER, + fpcNm_WARPFLOWER_e, }; STATIC_ASSERT(ARRAY_SIZE(M_DaiB_dylKeyTbl) <= PRELOAD_DYL_MAX); @@ -908,7 +907,7 @@ const char* M_DaiB_resName[] = { STATIC_ASSERT(ARRAY_SIZE(M_DaiB_resName) <= PRELOAD_RES_MAX); const s16 SirenB_dylKeyTbl[] = { - PROC_WARPFLOWER, + fpcNm_WARPFLOWER_e, }; STATIC_ASSERT(ARRAY_SIZE(SirenB_dylKeyTbl) <= PRELOAD_DYL_MAX); @@ -1180,7 +1179,7 @@ BOOL heapSizeCheck() { /* 802355A8-802356B0 .text phase_00__FP13dScnPly_ply_c */ cPhs_State phase_00(dScnPly_ply_c* i_this) { #if VERSION == VERSION_DEMO - if (fpcM_GetName(i_this) == PROC_OPENING_SCENE) { + if (fpcM_GetName(i_this) == fpcNm_OPENING_SCENE_e) { if (mDoRst::isReset()) { mDoRst_reset(0, 0, 0); } @@ -1193,7 +1192,7 @@ cPhs_State phase_00(dScnPly_ply_c* i_this) { mDoGph_gInf_c::offBlure(); - if (fpcM_GetName(i_this) != PROC_PLAY_SCENE) { + if (fpcM_GetName(i_this) != fpcNm_PLAY_SCENE_e) { if (!heapSizeCheck()) { mDoRst_reset(0, 0x80000000, 0); } @@ -1368,28 +1367,28 @@ cPhs_State phase_4(dScnPly_ply_c* i_this) { stage_stag_info_class* stag_info = dComIfGp_getStageStagInfo(); if (stag_info != NULL && dStage_stagInfo_GetSTType(stag_info) == dStageType_FF1_e && dComIfGs_isEventBit(dSv_event_flag_c::UNK_0801)) { - dComIfGs_setSelectEquip(0, dItem_NONE_e); - dComIfGp_setSelectEquip(0, dItem_NONE_e); + dComIfGs_setSelectEquip(0, dItemNo_NONE_e); + dComIfGp_setSelectEquip(0, dItemNo_NONE_e); dComIfGs_offCollect(0, 0); } if (strcmp(dComIfGp_getStartStageName(), "GTower") == 0) { - dComIfGs_setItem(dInvSlot_BOW_e, dItem_NONE_e); // take away the bow + dComIfGs_setItem(dInvSlot_BOW_e, dItemNo_NONE_e); // take away the bow for (int itemBtn = 0; itemBtn < dItemBtn_COUNT_e; itemBtn++) { u32 itemno = dComIfGp_getSelectItem(itemBtn); - if (itemno == dItem_BOW_e || itemno == dItem_MAGIC_ARROW_e || itemno == dItem_LIGHT_ARROW_e) { + if (itemno == dItemNo_BOW_e || itemno == dItemNo_MAGIC_ARROW_e || itemno == dItemNo_LIGHT_ARROW_e) { dComIfGs_setSelectItem(itemBtn, dInvSlot_NONE_e); dComIfGp_setSelectItem(itemBtn); } } - } else if (dComIfGs_getItem(dInvSlot_BOW_e) == dItem_NONE_e) { + } else if (dComIfGs_getItem(dInvSlot_BOW_e) == dItemNo_NONE_e) { // give the bow back if (dComIfGs_isGetItem(dInvSlot_BOW_e, 2)) - dComIfGs_setItem(dInvSlot_BOW_e, dItem_LIGHT_ARROW_e); + dComIfGs_setItem(dInvSlot_BOW_e, dItemNo_LIGHT_ARROW_e); else if (dComIfGs_isGetItem(dInvSlot_BOW_e, 1)) - dComIfGs_setItem(dInvSlot_BOW_e, dItem_MAGIC_ARROW_e); + dComIfGs_setItem(dInvSlot_BOW_e, dItemNo_MAGIC_ARROW_e); else if (dComIfGs_isGetItem(dInvSlot_BOW_e, 0)) - dComIfGs_setItem(dInvSlot_BOW_e, dItem_BOW_e); + dComIfGs_setItem(dInvSlot_BOW_e, dItemNo_BOW_e); } if (strcmp(dComIfGp_getStartStageName(), "Xboss0") == 0 || @@ -1402,7 +1401,7 @@ cPhs_State phase_4(dScnPly_ply_c* i_this) { mDoAud_monsSeInit(); - if (fpcM_GetName(i_this) == PROC_PLAY_SCENE) { + if (fpcM_GetName(i_this) == fpcNm_PLAY_SCENE_e) { mDoAud_zelAudio_c::onBgmSet(); } else { mDoAud_zelAudio_c::offBgmSet(); @@ -1528,39 +1527,39 @@ static scene_method_class l_dScnPly_Method = { }; scene_process_profile_definition g_profile_PLAY_SCENE = { - /* LayerID */ fpcLy_ROOT_e, - /* ListID */ 1, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_PLAY_SCENE, + /* Layer ID */ fpcLy_ROOT_e, + /* List ID */ 1, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_PLAY_SCENE_e, /* Proc SubMtd */ &g_fpcNd_Method.base, /* Size */ sizeof(dScnPly_ply_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Node SubMtd */ &g_fopScn_Method.base, /* Scene SubMtd */ &l_dScnPly_Method, }; scene_process_profile_definition g_profile_OPENING_SCENE = { - /* LayerID */ fpcLy_ROOT_e, - /* ListID */ 1, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_OPENING_SCENE, + /* Layer ID */ fpcLy_ROOT_e, + /* List ID */ 1, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OPENING_SCENE_e, /* Proc SubMtd */ &g_fpcNd_Method.base, /* Size */ sizeof(dScnPly_ply_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Node SubMtd */ &g_fopScn_Method.base, /* Scene SubMtd */ &l_dScnPly_Method, }; scene_process_profile_definition g_profile_OPENING2_SCENE = { - /* LayerID */ fpcLy_ROOT_e, - /* ListID */ 1, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_OPENING2_SCENE, + /* Layer ID */ fpcLy_ROOT_e, + /* List ID */ 1, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OPENING2_SCENE_e, /* Proc SubMtd */ &g_fpcNd_Method.base, /* Size */ sizeof(dScnPly_ply_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Node SubMtd */ &g_fopScn_Method.base, /* Scene SubMtd */ &l_dScnPly_Method, diff --git a/src/d/d_s_room.cpp b/src/d/d_s_room.cpp index 6b15f0c07..113d49403 100644 --- a/src/d/d_s_room.cpp +++ b/src/d/d_s_room.cpp @@ -13,7 +13,6 @@ #include "d/d_com_lib_game.h" #include "d/d_item_data.h" #include "d/d_map.h" -#include "d/d_procname.h" #include "d/d_stage.h" #include "d/actor/d_a_salvage.h" #include "d/actor/d_a_npc_md.h" @@ -72,7 +71,7 @@ void objectSetCheck(room_of_scene_class* i_this) { if (!i_this->mbReLoaded) { if (!hiddenFlag) { - fopAcM_create(PROC_BG, roomNo); + fopAcM_create(fpcNm_BG_e, roomNo); dStage_dt_c_roomReLoader(i_this->mpRoomData, i_this->mpRoomDt, roomNo); i_this->mbReLoaded = true; } @@ -257,10 +256,10 @@ cPhs_State phase_4(room_of_scene_class* i_this) { setMapImage(i_this); - if (dComIfGs_checkGetItem(dItem_PEARL_DIN_e)) + if (dComIfGs_checkGetItem(dItemNo_PEARL_DIN_e)) i_this->field_0x1dc = 1; - if (strcmp(dComIfGp_getStartStageName(), "Omori") == 0 && dComIfGs_checkGetItem(dItem_PEARL_FARORE_e)) + if (strcmp(dComIfGp_getStartStageName(), "Omori") == 0 && dComIfGs_checkGetItem(dItemNo_PEARL_FARORE_e)) i_this->field_0x1dc = 2; // Bug? The game seems to set these flags for DRI even when you're not on the sea stage. @@ -288,7 +287,7 @@ static cPhs_State dScnRoom_Create(scene_class* i_scn) { return dComLbG_PhaseHandler(&i_this->mPhs, l_method, i_this); } -scene_method_class l_dScnRoom_Method = { +static scene_method_class l_dScnRoom_Method = { (process_method_func)dScnRoom_Create, (process_method_func)dScnRoom_Delete, (process_method_func)dScnRoom_Execute, @@ -297,13 +296,13 @@ scene_method_class l_dScnRoom_Method = { }; scene_process_profile_definition g_profile_ROOM_SCENE = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_ROOM_SCENE, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_ROOM_SCENE_e, /* Proc SubMtd */ &g_fpcNd_Method.base, /* Size */ sizeof(room_of_scene_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Node SubMtd */ &g_fopScn_Method.base, /* Scene SubMtd */ &l_dScnRoom_Method, diff --git a/src/d/d_s_title.cpp b/src/d/d_s_title.cpp index 305f5b4a0..cf7d9fa29 100644 --- a/src/d/d_s_title.cpp +++ b/src/d/d_s_title.cpp @@ -13,7 +13,6 @@ #include "f_op/f_op_scene_mng.h" #include "f_pc/f_pc_leaf.h" #include "f_pc/f_pc_manager.h" -#include "d/d_procname.h" #include "d/d_com_inf_game.h" #include "d/d_meter.h" #include "m_Do/m_Do_controller_pad.h" @@ -70,22 +69,22 @@ static BOOL dScnTitle_Execute(title_of_scene_class* i_this) { if (movie->mpGetMovieRestFrame == NULL || movie->mpSetPercentMovieVol == NULL) return TRUE; - if (fpcM_GetName(i_this) == PROC_ENDING_SCENE) { + if (fpcM_GetName(i_this) == fpcNm_ENDING_SCENE_e) { if (movie->mpGetMovieRestFrame() == 0) { #if VERSION == VERSION_DEMO - fopScnM_ChangeReq(i_this, PROC_NAMEEX_SCENE, PROC_OVERLAP0, 5); + fopScnM_ChangeReq(i_this, fpcNm_NAMEEX_SCENE_e, fpcNm_OVERLAP0_e, 5); #else if (dComIfGs_getClearCount() == 0) { - fopScnM_ChangeReq(i_this, PROC_NAMEEX_SCENE, PROC_OVERLAP0, 5); + fopScnM_ChangeReq(i_this, fpcNm_NAMEEX_SCENE_e, fpcNm_OVERLAP0_e, 5); } else { - dComIfG_changeOpeningScene(i_this, PROC_OPENING_SCENE); + dComIfG_changeOpeningScene(i_this, fpcNm_OPENING_SCENE_e); } #endif movie->mpSetPercentMovieVol(0.0f); } } else { if (CPad_CHECK_TRIG_A(0) || CPad_CHECK_TRIG_B(0) || CPad_CHECK_TRIG_START(0) || movie->mpGetMovieRestFrame() == 0) { - dComIfG_changeOpeningScene(i_this, PROC_OPENING_SCENE); + dComIfG_changeOpeningScene(i_this, fpcNm_OPENING_SCENE_e); movie->mpSetPercentMovieVol(0.0f); } } @@ -119,12 +118,12 @@ static cPhs_State dScnTitle_Create(scene_class* i_scn) { dComIfGp_offEnableNextStage(); #endif - i_this->mMoviePId = fopAcM_create(PROC_MP, fpcM_GetName(i_this) == PROC_TITLE_SCENE ? 0 : 1); + i_this->mMoviePId = fopAcM_create(fpcNm_MP_e, fpcM_GetName(i_this) == fpcNm_TITLE_SCENE_e ? 0 : 1); #if VERSION == VERSION_PAL dScnTitle_c::mMp = NULL; - if (fpcM_GetName(i_this) == PROC_ENDING_SCENE) { - fopMsgM_Create(PROC_MESG, NULL, NULL); + if (fpcM_GetName(i_this) == fpcNm_ENDING_SCENE_e) { + fopMsgM_Create(fpcNm_MESG_e, NULL, NULL); } #endif @@ -140,26 +139,26 @@ static scene_method_class l_dScnTitle_Method = { }; scene_process_profile_definition g_profile_TITLE_SCENE = { - /* LayerID */ fpcLy_ROOT_e, - /* ListID */ 1, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_TITLE_SCENE, + /* Layer ID */ fpcLy_ROOT_e, + /* List ID */ 1, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TITLE_SCENE_e, /* Proc SubMtd */ &g_fpcNd_Method.base, /* Size */ sizeof(title_of_scene_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Node SubMtd */ &g_fopScn_Method.base, /* Scene SubMtd */ &l_dScnTitle_Method, }; scene_process_profile_definition g_profile_ENDING_SCENE = { - /* LayerID */ fpcLy_ROOT_e, - /* ListID */ 1, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_ENDING_SCENE, + /* Layer ID */ fpcLy_ROOT_e, + /* List ID */ 1, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_ENDING_SCENE_e, /* Proc SubMtd */ &g_fpcNd_Method.base, /* Size */ sizeof(title_of_scene_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Node SubMtd */ &g_fopScn_Method.base, /* Scene SubMtd */ &l_dScnTitle_Method, diff --git a/src/d/d_save.cpp b/src/d/d_save.cpp index 903fede5f..248214041 100644 --- a/src/d/d_save.cpp +++ b/src/d/d_save.cpp @@ -28,12 +28,12 @@ void dSv_player_status_a_c::init() { field_0x8 = 0; for (int i = 0; i < ARRAY_SIZE(mSelectItem); i++) { - mSelectItem[i] = dItem_NONE_e; + mSelectItem[i] = dItemNo_NONE_e; dComIfGp_setSelectItem(i); } for (int i = 0; i < ARRAY_SIZE(mSelectEquip); i++) { - mSelectEquip[i] = dItem_NONE_e; + mSelectEquip[i] = dItemNo_NONE_e; } mRupee = 0; @@ -78,7 +78,7 @@ void dSv_player_return_place_c::set(const char* i_name, s8 i_roomNo, u8 i_status /* 80058C60-80058C7C .text init__17dSv_player_item_cFv */ void dSv_player_item_c::init() { for (int i = 0; i < ARRAY_SIZE(mItems); i++) { - mItems[i] = dItem_NONE_e; + mItems[i] = dItemNo_NONE_e; } } @@ -99,15 +99,15 @@ 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(dItem_EMPTY_BOTTLE_e, i_itemNo); + setBottleItemIn(dItemNo_EMPTY_BOTTLE_e, i_itemNo); } /* 80058E44-80058F74 .text setEmptyBottle__17dSv_player_item_cFv */ 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, dItem_EMPTY_BOTTLE_e); + if (dComIfGs_getItem((u8)invIdx) == dItemNo_NONE_e) { + dComIfGs_setItem((u8)invIdx, dItemNo_EMPTY_BOTTLE_e); break; } } @@ -130,7 +130,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, dItem_EMPTY_BOTTLE_e); + setEquipBottleItemIn(i_itemBtn, dItemNo_EMPTY_BOTTLE_e); } /* 800591B0-80059408 .text setEquipBottleItemIn__17dSv_player_item_cFUc */ @@ -164,7 +164,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(dItem_EMPTY_BOTTLE_e); + setEquipBottleItemIn(dItemNo_EMPTY_BOTTLE_e); } /* 8005942C-8005946C .text checkBottle__17dSv_player_item_cFUc */ @@ -185,7 +185,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] == dItem_EMPTY_BOTTLE_e) { + if (mItems[i + dInvSlot_BOTTLE0_e] == dItemNo_EMPTY_BOTTLE_e) { ret++; } } @@ -223,58 +223,58 @@ BOOL dSv_player_get_item_c::isItem(int i_field, u8 i_item) { /* 800595F8-80059740 .text onBottleItem__21dSv_player_get_item_cFUc */ void dSv_player_get_item_c::onBottleItem(u8 i_item) { switch (i_item) { - case EMPTY_BSHIP: + case dItemNo_EMPTY_BSHIP_e: mItemFlags[0] |= 0x02; break; - case dItem_EMPTY_BOTTLE_e: + case dItemNo_EMPTY_BOTTLE_e: mItemFlags[0] |= 0x04; break; - case dItem_RED_POTION_e: + case dItemNo_RED_POTION_e: mItemFlags[0] |= 0x08; break; - case dItem_GREEN_POTION_e: + case dItemNo_GREEN_POTION_e: mItemFlags[0] |= 0x10; break; - case dItem_BLUE_POTION_e: + case dItemNo_BLUE_POTION_e: mItemFlags[0] |= 0x20; break; - case dItem_HALF_SOUP_BOTTLE_e: + case dItemNo_HALF_SOUP_BOTTLE_e: mItemFlags[0] |= 0x40; break; - case dItem_SOUP_BOTTLE_e: + case dItemNo_SOUP_BOTTLE_e: mItemFlags[0] |= 0x80; break; - case dItem_WATER_BOTTLE_e: + case dItemNo_WATER_BOTTLE_e: mItemFlags[1] |= 0x02; break; - case dItem_FAIRY_BOTTLE_e: + case dItemNo_FAIRY_BOTTLE_e: mItemFlags[1] |= 0x04; break; - case dItem_FIREFLY_BOTTLE_e: + case dItemNo_FIREFLY_BOTTLE_e: mItemFlags[1] |= 0x08; break; - case dItem_FOREST_WATER_e: + case dItemNo_FOREST_WATER_e: mItemFlags[1] |= 0x10; break; - case UNK_BOTTLE_5A: + case dItemNo_UNK_BOTTLE_5A_e: mItemFlags[1] |= 0x20; break; - case UNK_BOTTLE_5B: + case dItemNo_UNK_BOTTLE_5B_e: mItemFlags[1] |= 0x40; break; - case UNK_BOTTLE_5C: + case dItemNo_UNK_BOTTLE_5C_e: mItemFlags[1] |= 0x80; break; - case UNK_BOTTLE_5D: + case dItemNo_UNK_BOTTLE_5D_e: mItemFlags[2] |= 0x02; break; - case UNK_BOTTLE_5E: + case dItemNo_UNK_BOTTLE_5E_e: mItemFlags[2] |= 0x04; break; - case UNK_BOTTLE_5F: + case dItemNo_UNK_BOTTLE_5F_e: mItemFlags[2] |= 0x08; break; - case UNK_BOTTLE_60: + case dItemNo_UNK_BOTTLE_60_e: mItemFlags[2] |= 0x10; break; } @@ -283,41 +283,41 @@ void dSv_player_get_item_c::onBottleItem(u8 i_item) { /* 80059740-80059848 .text isBottleItem__21dSv_player_get_item_cFUc */ BOOL dSv_player_get_item_c::isBottleItem(u8 i_item) { switch (i_item) { - case EMPTY_BSHIP: + case dItemNo_EMPTY_BSHIP_e: return (mItemFlags[0] >> 1) & 1; - case dItem_EMPTY_BOTTLE_e: + case dItemNo_EMPTY_BOTTLE_e: return (mItemFlags[0] >> 2) & 1; - case dItem_RED_POTION_e: + case dItemNo_RED_POTION_e: return (mItemFlags[0] >> 3) & 1; - case dItem_GREEN_POTION_e: + case dItemNo_GREEN_POTION_e: return (mItemFlags[0] >> 4) & 1; - case dItem_BLUE_POTION_e: + case dItemNo_BLUE_POTION_e: return (mItemFlags[0] >> 5) & 1; - case dItem_HALF_SOUP_BOTTLE_e: + case dItemNo_HALF_SOUP_BOTTLE_e: return (mItemFlags[0] >> 6) & 1; - case dItem_SOUP_BOTTLE_e: + case dItemNo_SOUP_BOTTLE_e: return (mItemFlags[0] >> 7) & 1; - case dItem_WATER_BOTTLE_e: + case dItemNo_WATER_BOTTLE_e: return (mItemFlags[1] >> 1) & 1; - case dItem_FAIRY_BOTTLE_e: + case dItemNo_FAIRY_BOTTLE_e: return (mItemFlags[1] >> 2) & 1; - case dItem_FIREFLY_BOTTLE_e: + case dItemNo_FIREFLY_BOTTLE_e: return (mItemFlags[1] >> 3) & 1; - case dItem_FOREST_WATER_e: + case dItemNo_FOREST_WATER_e: return (mItemFlags[1] >> 4) & 1; - case UNK_BOTTLE_5A: + case dItemNo_UNK_BOTTLE_5A_e: return (mItemFlags[1] >> 5) & 1; - case UNK_BOTTLE_5B: + case dItemNo_UNK_BOTTLE_5B_e: return (mItemFlags[1] >> 6) & 1; - case UNK_BOTTLE_5C: + case dItemNo_UNK_BOTTLE_5C_e: return (mItemFlags[1] >> 7) & 1; - case UNK_BOTTLE_5D: + case dItemNo_UNK_BOTTLE_5D_e: return (mItemFlags[2] >> 1) & 1; - case UNK_BOTTLE_5E: + case dItemNo_UNK_BOTTLE_5E_e: return (mItemFlags[2] >> 2) & 1; - case UNK_BOTTLE_5F: + case dItemNo_UNK_BOTTLE_5F_e: return (mItemFlags[2] >> 3) & 1; - case UNK_BOTTLE_60: + case dItemNo_UNK_BOTTLE_60_e: return (mItemFlags[2] >> 4) & 1; default: return false; @@ -374,15 +374,15 @@ void dSv_player_item_max_c::init() { /* 80059908-80059968 .text init__21dSv_player_bag_item_cFv */ void dSv_player_bag_item_c::init() { for (int i = 0; i < ARRAY_SIZE(mBeast); i++) { - mBeast[i] = dItem_NONE_e; + mBeast[i] = dItemNo_NONE_e; } for (int i = 0; i < ARRAY_SIZE(mBait); i++) { - mBait[i] = dItem_NONE_e; + mBait[i] = dItemNo_NONE_e; } for (int i = 0; i < ARRAY_SIZE(mReserve); i++) { - mReserve[i] = dItem_NONE_e; + mReserve[i] = dItemNo_NONE_e; } } @@ -390,7 +390,7 @@ void dSv_player_bag_item_c::init() { void dSv_player_bag_item_c::setBeastItem(u8 i_itemNo) { if (!checkBeastItem(i_itemNo)) { for (int i = 0; i < ARRAY_SIZE(mBeast); i++) { - if (mBeast[i] == dItem_NONE_e) { + if (mBeast[i] == dItemNo_NONE_e) { mBeast[i] = i_itemNo; return; } @@ -403,11 +403,11 @@ void dSv_player_bag_item_c::setBeastItemEmpty(u8 i_itemNo) { if (checkBeastItem(i_itemNo)) { for (int i = 0; i < ARRAY_SIZE(mBeast); i++) { if (mBeast[i] == i_itemNo) { - mBeast[i] = dItem_NONE_e; + mBeast[i] = dItemNo_NONE_e; for (int itemBtn = 0; itemBtn < dItemBtn_COUNT_e; itemBtn++) { if (dComIfGp_getSelectItem(itemBtn) == i_itemNo) { - dComIfGs_setItem(dComIfGs_getSelectItem(itemBtn), dItem_NONE_e); - dComIfGp_setItem(dComIfGs_getSelectItem(itemBtn), dItem_NONE_e); + dComIfGs_setItem(dComIfGs_getSelectItem(itemBtn), dItemNo_NONE_e); + dComIfGp_setItem(dComIfGs_getSelectItem(itemBtn), dItemNo_NONE_e); dComIfGp_setSelectItem(itemBtn); } } @@ -500,17 +500,17 @@ void dSv_player_bag_item_c::setBaitItemEmpty() { u8 num = dComIfGs_getBaitNum(baitSlotIdx); u8 itemNo = dComIfGp_getSelectItem(itemBtn); - if (itemNo == dItem_HYOI_PEAR_e) { + if (itemNo == dItemNo_HYOI_PEAR_e) { u8 num = dComIfGs_getBaitNum(baitSlotIdx); - setBaitItemChange(dItem_NONE_e); - } else if (itemNo == dItem_BIRD_BAIT_5_e) { + setBaitItemChange(dItemNo_NONE_e); + } else if (itemNo == dItemNo_BIRD_BAIT_5_e) { num = dComIfGs_getBaitNum(baitSlotIdx); if (num > 0) { num = num - 1; } dComIfGs_setBaitNum(baitSlotIdx, num); if (num == 0) { - setBaitItemChange(dItem_NONE_e); + setBaitItemChange(dItemNo_NONE_e); } } } @@ -533,17 +533,17 @@ void dSv_player_bag_item_c::setBaitItemEmpty(u8 i_itemBtn) { u8 num = dComIfGs_getBaitNum(baitSlotIdx); u8 itemNo = dComIfGp_getSelectItem(i_itemBtn); - if (itemNo == dItem_HYOI_PEAR_e) { + if (itemNo == dItemNo_HYOI_PEAR_e) { u8 num = dComIfGs_getBaitNum(baitSlotIdx); - setBaitItemChange(i_itemBtn, dItem_NONE_e); - } else if (itemNo == dItem_BIRD_BAIT_5_e) { + setBaitItemChange(i_itemBtn, dItemNo_NONE_e); + } else if (itemNo == dItemNo_BIRD_BAIT_5_e) { num = dComIfGs_getBaitNum(baitSlotIdx); if (num > 0) { num = num - 1; } dComIfGs_setBaitNum(baitSlotIdx, num); if (num == 0) { - setBaitItemChange(i_itemBtn, dItem_NONE_e); + setBaitItemChange(i_itemBtn, dItemNo_NONE_e); } } } @@ -552,7 +552,7 @@ void dSv_player_bag_item_c::setBaitItemEmpty(u8 i_itemBtn) { void dSv_player_bag_item_c::setBaitItem(u8 i_itemNo) { if (checkBaitItemEmpty()) { for (int i = 0; i < 8; i++) { - if (mBait[i] == dItem_NONE_e) { + if (mBait[i] == dItemNo_NONE_e) { mBait[i] = i_itemNo; dComIfGs_setBaitNum(i, 3); return; @@ -563,7 +563,7 @@ void dSv_player_bag_item_c::setBaitItem(u8 i_itemNo) { /* 8005A2D0-8005A2F4 .text checkBaitItemEmpty__21dSv_player_bag_item_cFv */ u8 dSv_player_bag_item_c::checkBaitItemEmpty() { - return checkBaitItem(dItem_NONE_e); + return checkBaitItem(dItemNo_NONE_e); } /* 8005A2F4-8005A334 .text checkBaitItem__21dSv_player_bag_item_cFUc */ @@ -627,19 +627,19 @@ void dSv_player_bag_item_c::setReserveItemChange(u8 i_itemBtn, u8 i_itemNo) { /* 8005A79C-8005A7C0 .text setReserveItemEmpty__21dSv_player_bag_item_cFv */ void dSv_player_bag_item_c::setReserveItemEmpty() { - setReserveItemChange(dItem_NONE_e); + setReserveItemChange(dItemNo_NONE_e); } /* 8005A7C0-8005A7E4 .text setReserveItemEmpty__21dSv_player_bag_item_cFUc */ void dSv_player_bag_item_c::setReserveItemEmpty(u8 i_itemBtn) { - setReserveItemChange(i_itemBtn, dItem_NONE_e); + setReserveItemChange(i_itemBtn, dItemNo_NONE_e); } /* 8005A7E4-8005A854 .text setReserveItem__21dSv_player_bag_item_cFUc */ void dSv_player_bag_item_c::setReserveItem(u8 i_itemNo) { if (checkReserveItemEmpty()) { for (int i = 0; i < 8; i++) { - if (mReserve[i] == dItem_NONE_e) { + if (mReserve[i] == dItemNo_NONE_e) { mReserve[i] = i_itemNo; return; } @@ -649,7 +649,7 @@ void dSv_player_bag_item_c::setReserveItem(u8 i_itemNo) { /* 8005A854-8005A878 .text checkReserveItemEmpty__21dSv_player_bag_item_cFv */ u8 dSv_player_bag_item_c::checkReserveItemEmpty() { - return checkReserveItem(dItem_NONE_e); + return checkReserveItem(dItemNo_NONE_e); } /* 8005A878-8005A8B8 .text checkReserveItem__21dSv_player_bag_item_cFUc */ @@ -1459,8 +1459,8 @@ void dSv_info_c::reinit() { dComIfGs_setRandomSalvagePoint(3); - dComIfGs_setItem(dInvSlot_CAMERA_e, CAMERA2); - dComIfGp_setItem(dInvSlot_CAMERA_e, CAMERA2); + dComIfGs_setItem(dInvSlot_CAMERA_e, dItemNo_DELUXE_PICTO_BOX_e); + dComIfGp_setItem(dInvSlot_CAMERA_e, dItemNo_DELUXE_PICTO_BOX_e); #if VERSION > VERSION_DEMO dComIfGs_onGetItem(dInvSlot_CAMERA_e, 0); diff --git a/src/d/d_scope.cpp b/src/d/d_scope.cpp index 159e886ce..42dedd028 100644 --- a/src/d/d_scope.cpp +++ b/src/d/d_scope.cpp @@ -5,8 +5,6 @@ #include "d/dolzel.h" // IWYU pragma: keep #include "d/d_scope.h" -#include "d/d_priority.h" -#include "d/d_procname.h" #include "f_op/f_op_msg.h" /* 80237568-802375E8 .text draw__13dDlst_2DSCP_cFv */ @@ -214,7 +212,7 @@ static cPhs_State dScp_Create(msg_class* i_this) { /* Nonmatching */ } -msg_method_class l_dPb_Method = { +static msg_method_class l_dPb_Method = { (process_method_func)dScp_Create, (process_method_func)dScp_Delete, (process_method_func)dScp_Execute, @@ -223,15 +221,15 @@ msg_method_class l_dPb_Method = { }; msg_process_profile_definition g_profile_SCP = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x000C, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_SCP, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x000C, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_SCP_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(sub_scp_class), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopMsg_Method, - /* Priority */ PRIO_SCP, - /* Actor SubMtd */ &l_dPb_Method, + /* Draw Prio */ fpcDwPi_SCP_e, + /* Msg SubMtd */ &l_dPb_Method, }; diff --git a/src/d/d_shop.cpp b/src/d/d_shop.cpp index b0ce7868c..52eec53fa 100644 --- a/src/d/d_shop.cpp +++ b/src/d/d_shop.cpp @@ -31,184 +31,184 @@ u32 default_select_msg[] = { }; ShopItems_c__ItemData shopItemData_Feedbag = { - /* mItemNo */ dItem_BAIT_BAG_e, - /* mMustNotOwnItemNo */ dItem_BAIT_BAG_e, + /* mItemNo */ dItemNo_BAIT_BAG_e, + /* mMustNotOwnItemNo */ dItemNo_BAIT_BAG_e, /* mMustOwnItemNo */ -1, /* mBuyConditions */ Shop_BuyCond_RUPEES_e | Shop_BuyCond_MUST_NOT_OWN_ITEM_e, }; ShopItems_c__ItemData shopItemData_FoodAll = { - /* mItemNo */ dItem_BIRD_BAIT_5_e, - /* mMustNotOwnItemNo */ dItem_BIRD_BAIT_5_e, - /* mMustOwnItemNo */ dItem_BAIT_BAG_e, + /* mItemNo */ dItemNo_BIRD_BAIT_5_e, + /* mMustNotOwnItemNo */ dItemNo_BIRD_BAIT_5_e, + /* mMustOwnItemNo */ dItemNo_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 */ dItem_BAIT_BAG_e, + /* mItemNo */ dItemNo_HYOI_PEAR_e, + /* mMustNotOwnItemNo */ dItemNo_HYOI_PEAR_e, + /* mMustOwnItemNo */ dItemNo_BAIT_BAG_e, /* mBuyConditions */ Shop_BuyCond_RUPEES_e | Shop_BuyCond_MAXIMUM_e | Shop_BuyCond_MUST_OWN_ITEM_e, }; ShopItems_c__ItemData shopItemData_arrow10 = { - /* mItemNo */ dItem_ARROW_10_e, - /* mMustNotOwnItemNo */ dItem_ARROW_10_e, - /* mMustOwnItemNo */ dItem_BOW_e, + /* mItemNo */ dItemNo_ARROW_10_e, + /* mMustNotOwnItemNo */ dItemNo_ARROW_10_e, + /* mMustOwnItemNo */ dItemNo_BOW_e, /* mBuyConditions */ Shop_BuyCond_RUPEES_e | Shop_BuyCond_MAXIMUM_e | Shop_BuyCond_MUST_OWN_ITEM_e, }; ShopItems_c__ItemData shopItemData_arrow30 = { - /* mItemNo */ dItem_ARROW_30_e, - /* mMustNotOwnItemNo */ dItem_ARROW_30_e, - /* mMustOwnItemNo */ dItem_BOW_e, + /* mItemNo */ dItemNo_ARROW_30_e, + /* mMustNotOwnItemNo */ dItemNo_ARROW_30_e, + /* mMustOwnItemNo */ dItemNo_BOW_e, /* mBuyConditions */ Shop_BuyCond_RUPEES_e | Shop_BuyCond_MAXIMUM_e | Shop_BuyCond_MUST_OWN_ITEM_e, }; ShopItems_c__ItemData shopItemData_red_bottle = { - /* mItemNo */ dItem_RED_POTION_e, - /* mMustNotOwnItemNo */ dItem_RED_POTION_e, - /* mMustOwnItemNo */ dItem_EMPTY_BOTTLE_e, + /* mItemNo */ dItemNo_RED_POTION_e, + /* mMustNotOwnItemNo */ dItemNo_RED_POTION_e, + /* mMustOwnItemNo */ dItemNo_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 */ dItem_BLUE_POTION_e, - /* mMustNotOwnItemNo */ dItem_BLUE_POTION_e, - /* mMustOwnItemNo */ dItem_EMPTY_BOTTLE_e, + /* mItemNo */ dItemNo_BLUE_POTION_e, + /* mMustNotOwnItemNo */ dItemNo_BLUE_POTION_e, + /* mMustOwnItemNo */ dItemNo_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 */ dItem_GREEN_POTION_e, - /* mMustNotOwnItemNo */ dItem_GREEN_POTION_e, - /* mMustOwnItemNo */ dItem_EMPTY_BOTTLE_e, + /* mItemNo */ dItemNo_GREEN_POTION_e, + /* mMustNotOwnItemNo */ dItemNo_GREEN_POTION_e, + /* mMustOwnItemNo */ dItemNo_EMPTY_BOTTLE_e, /* mBuyConditions */ Shop_BuyCond_RUPEES_e | Shop_BuyCond_EMPTY_BOTTLE_e | Shop_BuyCond_ANY_BOTTLE_e, }; ShopItems_c__ItemData shopItemData_bomb10 = { - /* mItemNo */ dItem_BOMB_10_e, - /* mMustNotOwnItemNo */ dItem_BOMB_10_e, - /* mMustOwnItemNo */ dItem_BOMB_BAG_e, + /* mItemNo */ dItemNo_BOMB_10_e, + /* mMustNotOwnItemNo */ dItemNo_BOMB_10_e, + /* mMustOwnItemNo */ dItemNo_BOMB_BAG_e, /* mBuyConditions */ Shop_BuyCond_RUPEES_e | Shop_BuyCond_MAXIMUM_e, }; ShopItems_c__ItemData shopItemData_bomb20 = { - /* mItemNo */ dItem_BOMB_20_e, - /* mMustNotOwnItemNo */ dItem_BOMB_20_e, - /* mMustOwnItemNo */ dItem_BOMB_BAG_e, + /* mItemNo */ dItemNo_BOMB_20_e, + /* mMustNotOwnItemNo */ dItemNo_BOMB_20_e, + /* mMustOwnItemNo */ dItemNo_BOMB_BAG_e, /* mBuyConditions */ Shop_BuyCond_RUPEES_e | Shop_BuyCond_MAXIMUM_e, }; ShopItems_c__ItemData shopItemData_bomb30 = { - /* mItemNo */ dItem_BOMB_30_e, - /* mMustNotOwnItemNo */ dItem_BOMB_30_e, - /* mMustOwnItemNo */ dItem_BOMB_BAG_e, + /* mItemNo */ dItemNo_BOMB_30_e, + /* mMustNotOwnItemNo */ dItemNo_BOMB_30_e, + /* mMustOwnItemNo */ dItemNo_BOMB_BAG_e, /* mBuyConditions */ Shop_BuyCond_RUPEES_e | Shop_BuyCond_MAXIMUM_e, }; ShopItems_c__ItemData shopItemData_emptybottle = { - /* mItemNo */ dItem_EMPTY_BOTTLE_e, - /* mMustNotOwnItemNo */ dItem_EMPTY_BOTTLE_e, - /* mMustOwnItemNo */ dItem_EMPTY_BOTTLE_e, + /* mItemNo */ dItemNo_EMPTY_BOTTLE_e, + /* mMustNotOwnItemNo */ dItemNo_EMPTY_BOTTLE_e, + /* mMustOwnItemNo */ dItemNo_EMPTY_BOTTLE_e, /* mBuyConditions */ Shop_BuyCond_RUPEES_e, }; ShopItems_c__ItemData shopItemData_kakera_heart = { - /* mItemNo */ dItem_HEART_PIECE_e, - /* mMustNotOwnItemNo */ dItem_HEART_PIECE_e, + /* mItemNo */ dItemNo_HEART_PIECE_e, + /* mMustNotOwnItemNo */ dItemNo_HEART_PIECE_e, /* mMustOwnItemNo */ -1, /* mBuyConditions */ Shop_BuyCond_RUPEES_e | Shop_BuyCond_MUST_NOT_OWN_ITEM_e, }; ShopItems_c__ItemData shopItemData_map = { - /* mItemNo */ dItem_COLLECT_MAP_30_e, - /* mMustNotOwnItemNo */ dItem_COLLECT_MAP_30_e, - /* mMustOwnItemNo */ dItem_COLLECT_MAP_30_e, + /* mItemNo */ dItemNo_COLLECT_MAP_30_e, + /* mMustNotOwnItemNo */ dItemNo_COLLECT_MAP_30_e, + /* mMustOwnItemNo */ dItemNo_COLLECT_MAP_30_e, /* mBuyConditions */ Shop_BuyCond_RUPEES_e | Shop_BuyCond_MUST_NOT_OWN_ITEM_e, }; ShopItems_c__ItemData shopItemData_RotenItem0 = { - /* mItemNo */ FLOWER_1, - /* mMustNotOwnItemNo */ FLOWER_1, - /* mMustOwnItemNo */ FLOWER_1, + /* mItemNo */ dItemNo_TOWN_FLOWER_e, + /* mMustNotOwnItemNo */ dItemNo_TOWN_FLOWER_e, + /* mMustOwnItemNo */ dItemNo_TOWN_FLOWER_e, /* mBuyConditions */ Shop_BuyCond_RUPEES_e | Shop_BuyCond_MAXIMUM_e, }; ShopItems_c__ItemData shopItemData_RotenItem1 = { - /* mItemNo */ FLOWER_2, - /* mMustNotOwnItemNo */ FLOWER_2, - /* mMustOwnItemNo */ FLOWER_2, + /* mItemNo */ dItemNo_SEA_FLOWER_e, + /* mMustNotOwnItemNo */ dItemNo_SEA_FLOWER_e, + /* mMustOwnItemNo */ dItemNo_SEA_FLOWER_e, /* mBuyConditions */ Shop_BuyCond_RUPEES_e | Shop_BuyCond_MAXIMUM_e, }; ShopItems_c__ItemData shopItemData_RotenItem2 = { - /* mItemNo */ FLOWER_3, - /* mMustNotOwnItemNo */ FLOWER_3, - /* mMustOwnItemNo */ FLOWER_3, + /* mItemNo */ dItemNo_EXOTIC_FLOWER_e, + /* mMustNotOwnItemNo */ dItemNo_EXOTIC_FLOWER_e, + /* mMustOwnItemNo */ dItemNo_EXOTIC_FLOWER_e, /* mBuyConditions */ Shop_BuyCond_RUPEES_e | Shop_BuyCond_MAXIMUM_e, }; ShopItems_c__ItemData shopItemData_RotenItem3 = { - /* mItemNo */ HEROS_FLAG, - /* mMustNotOwnItemNo */ HEROS_FLAG, - /* mMustOwnItemNo */ HEROS_FLAG, + /* mItemNo */ dItemNo_HEROS_FLAG_e, + /* mMustNotOwnItemNo */ dItemNo_HEROS_FLAG_e, + /* mMustOwnItemNo */ dItemNo_HEROS_FLAG_e, /* mBuyConditions */ Shop_BuyCond_RUPEES_e | Shop_BuyCond_MAXIMUM_e, }; ShopItems_c__ItemData shopItemData_RotenItem4 = { - /* mItemNo */ TAIRYO_FLAG, - /* mMustNotOwnItemNo */ TAIRYO_FLAG, - /* mMustOwnItemNo */ TAIRYO_FLAG, + /* mItemNo */ dItemNo_BIG_CATCH_FLAG_e, + /* mMustNotOwnItemNo */ dItemNo_BIG_CATCH_FLAG_e, + /* mMustOwnItemNo */ dItemNo_BIG_CATCH_FLAG_e, /* mBuyConditions */ Shop_BuyCond_RUPEES_e | Shop_BuyCond_MAXIMUM_e, }; ShopItems_c__ItemData shopItemData_RotenItem5 = { - /* mItemNo */ SALES_FLAG, - /* mMustNotOwnItemNo */ SALES_FLAG, - /* mMustOwnItemNo */ SALES_FLAG, + /* mItemNo */ dItemNo_BIG_SALE_FLAG_e, + /* mMustNotOwnItemNo */ dItemNo_BIG_SALE_FLAG_e, + /* mMustOwnItemNo */ dItemNo_BIG_SALE_FLAG_e, /* mBuyConditions */ Shop_BuyCond_RUPEES_e | Shop_BuyCond_MAXIMUM_e, }; ShopItems_c__ItemData shopItemData_RotenItem6 = { - /* mItemNo */ WIND_FLAG, - /* mMustNotOwnItemNo */ WIND_FLAG, - /* mMustOwnItemNo */ WIND_FLAG, + /* mItemNo */ dItemNo_PINWHEEL_e, + /* mMustNotOwnItemNo */ dItemNo_PINWHEEL_e, + /* mMustOwnItemNo */ dItemNo_PINWHEEL_e, /* mBuyConditions */ Shop_BuyCond_RUPEES_e | Shop_BuyCond_MAXIMUM_e, }; ShopItems_c__ItemData shopItemData_RotenItem7 = { - /* mItemNo */ RED_FLAG, - /* mMustNotOwnItemNo */ RED_FLAG, - /* mMustOwnItemNo */ RED_FLAG, + /* mItemNo */ dItemNo_SICKLE_MOON_FLAG_e, + /* mMustNotOwnItemNo */ dItemNo_SICKLE_MOON_FLAG_e, + /* mMustOwnItemNo */ dItemNo_SICKLE_MOON_FLAG_e, /* mBuyConditions */ Shop_BuyCond_RUPEES_e | Shop_BuyCond_MAXIMUM_e, }; ShopItems_c__ItemData shopItemData_RotenItem8 = { - /* mItemNo */ FOSSIL_HEAD, - /* mMustNotOwnItemNo */ FOSSIL_HEAD, - /* mMustOwnItemNo */ FOSSIL_HEAD, + /* mItemNo */ dItemNo_SKULL_TOWER_IDOL_e, + /* mMustNotOwnItemNo */ dItemNo_SKULL_TOWER_IDOL_e, + /* mMustOwnItemNo */ dItemNo_SKULL_TOWER_IDOL_e, /* mBuyConditions */ Shop_BuyCond_RUPEES_e | Shop_BuyCond_MAXIMUM_e, }; ShopItems_c__ItemData shopItemData_RotenItem9 = { - /* mItemNo */ WATER_STATUE, - /* mMustNotOwnItemNo */ WATER_STATUE, - /* mMustOwnItemNo */ WATER_STATUE, + /* mItemNo */ dItemNo_FOUNTAIN_IDOL_e, + /* mMustNotOwnItemNo */ dItemNo_FOUNTAIN_IDOL_e, + /* mMustOwnItemNo */ dItemNo_FOUNTAIN_IDOL_e, /* mBuyConditions */ Shop_BuyCond_RUPEES_e | Shop_BuyCond_MAXIMUM_e, }; ShopItems_c__ItemData shopItemData_RotenItem10 = { - /* mItemNo */ POSTMAN_STATUE, - /* mMustNotOwnItemNo */ POSTMAN_STATUE, - /* mMustOwnItemNo */ POSTMAN_STATUE, + /* mItemNo */ dItemNo_POSTMAN_STATUE_e, + /* mMustNotOwnItemNo */ dItemNo_POSTMAN_STATUE_e, + /* mMustOwnItemNo */ dItemNo_POSTMAN_STATUE_e, /* mBuyConditions */ Shop_BuyCond_RUPEES_e | Shop_BuyCond_MAXIMUM_e, }; ShopItems_c__ItemData shopItemData_RotenItem11 = { - /* mItemNo */ PRESIDENT_STATUE, - /* mMustNotOwnItemNo */ PRESIDENT_STATUE, - /* mMustOwnItemNo */ PRESIDENT_STATUE, + /* mItemNo */ dItemNo_SHOP_GURU_STATUE_e, + /* mMustNotOwnItemNo */ dItemNo_SHOP_GURU_STATUE_e, + /* mMustOwnItemNo */ dItemNo_SHOP_GURU_STATUE_e, /* mBuyConditions */ Shop_BuyCond_RUPEES_e | Shop_BuyCond_MAXIMUM_e, }; @@ -1318,20 +1318,20 @@ 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 == dItem_BIRD_BAIT_5_e || itemNo == dItem_HYOI_PEAR_e) { + if (itemNo == dItemNo_BIRD_BAIT_5_e || itemNo == dItemNo_HYOI_PEAR_e) { if (!dComIfGs_checkBaitItemEmpty()) { return TRUE; } - // Bug: This check is probably supposed to be (itemNo >= FLOWER_1 && itemNo <= PRESIDENT_STATUE) - } else if (itemNo == FLOWER_1 && itemNo == PRESIDENT_STATUE) { + // Bug: This check is probably supposed to be (itemNo >= dItemNo_TOWN_FLOWER_e && itemNo <= dItemNo_SHOP_GURU_STATUE_e) + } else if (itemNo == dItemNo_TOWN_FLOWER_e && itemNo == dItemNo_SHOP_GURU_STATUE_e) { if (dComIfGs_checkReserveItemEmpty() == 0) { return TRUE; } - } else if (itemNo >= dItem_ARROW_10_e && itemNo <= dItem_ARROW_30_e) { + } else if (itemNo >= dItemNo_ARROW_10_e && itemNo <= dItemNo_ARROW_30_e) { if (dComIfGs_getArrowNum() == dComIfGs_getArrowMax()) { return TRUE; } - } else if (itemNo >= dItem_BOMB_5_e && itemNo <= dItem_BOMB_30_e) { + } else if (itemNo >= dItemNo_BOMB_5_e && itemNo <= dItemNo_BOMB_30_e) { if (dComIfGs_getBombNum() == dComIfGs_getBombMax()) { return TRUE; } @@ -1348,8 +1348,8 @@ u8 dShop_BoughtErrorStatus(ShopItems_c* shopItems, int param_2, int param_3) { u8 errorStatus = 0x00; if (buyCond & Shop_BuyCond_MUST_OWN_ITEM_e) { - if (itemData->mMustOwnItemNo == dItem_BOW_e) { - if (dComIfGs_getItem(dInvSlot_BOW_e) == dItem_NONE_e) { + if (itemData->mMustOwnItemNo == dItemNo_BOW_e) { + if (dComIfGs_getItem(dInvSlot_BOW_e) == dItemNo_NONE_e) { errorStatus |= Shop_BuyCond_MUST_OWN_ITEM_e; } } else { diff --git a/src/d/d_snap.cpp b/src/d/d_snap.cpp index 997057b6f..620687dac 100644 --- a/src/d/d_snap.cpp +++ b/src/d/d_snap.cpp @@ -31,7 +31,7 @@ int (dSnap_packet::*dSnap_packet::m_judge_tbl[])() = { &dSnap_packet::JudgeTestM, }; -dSnap_packet l_snap; +static dSnap_packet l_snap; struct CharaData { /* 0x00 */ SVec offset; diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp index fde9e8e15..902decf0d 100644 --- a/src/d/d_stage.cpp +++ b/src/d/d_stage.cpp @@ -14,7 +14,6 @@ #include "d/d_bg_s.h" #include "d/d_com_inf_game.h" #include "d/d_path.h" -#include "d/d_procname.h" #include "f_op/f_op_actor_mng.h" #include "f_op/f_op_camera_mng.h" #include "f_op/f_op_kankyo_mng.h" @@ -199,7 +198,7 @@ int createRoomScene(int param_0) { } *ptr = param_0; - return fopScnM_CreateReq(PROC_ROOM_SCENE, PROC_INVALID_e, 0, (u32)ptr); + return fopScnM_CreateReq(fpcNm_ROOM_SCENE_e, fpcNm_INVALID_e, 0, (u32)ptr); } /* 80040E38-80040E6C .text checkRoomDisp__20dStage_roomControl_cCFi */ @@ -435,832 +434,832 @@ int dStage_roomInit(int i_roomNo) { name, proc, sub, gba \ } -dStage_objectNameInf l_objectName[] = { - OBJNAME("kusax1", PROC_GRASS, 255, 0), - OBJNAME("kusax7", PROC_GRASS, 255, 0), - OBJNAME("kusax21", PROC_GRASS, 255, 0), - OBJNAME("flower", PROC_GRASS, 255, 0), - OBJNAME("flwr7", PROC_GRASS, 255, 0), - OBJNAME("flwr17", PROC_GRASS, 255, 0), - OBJNAME("pflower", PROC_GRASS, 255, 0), - OBJNAME("pflwrx7", PROC_GRASS, 255, 0), - OBJNAME("swood", PROC_GRASS, 255, 0), - OBJNAME("swood3", PROC_GRASS, 255, 0), - OBJNAME("swood5", PROC_GRASS, 255, 0), - OBJNAME("woodb", PROC_Obj_Wood, 255, 0), - OBJNAME("woodbx", PROC_Obj_Wood, 255, 0), - OBJNAME("door10", PROC_DOOR10, 255, 0), - OBJNAME("door11", PROC_DOOR10, 255, 0), - OBJNAME("door20", PROC_DOOR10, 255, 0), - OBJNAME("door21", PROC_DOOR10, 255, 0), - OBJNAME("Zenshut", PROC_DOOR10, 255, 0), - OBJNAME("keyshut", PROC_DOOR10, 255, 0), - OBJNAME("K_Zshut", PROC_DOOR10, 255, 0), - OBJNAME("ATdoor", PROC_ATDOOR, 255, 0), - OBJNAME("Mori1", PROC_MDOOR, 255, 0), - OBJNAME("doorKD", PROC_KDDOOR, 255, 0), - OBJNAME("ZenshKD", PROC_KDDOOR, 255, 0), - OBJNAME("K_ZshKD", PROC_KDDOOR, 255, 0), - OBJNAME("doorSH", PROC_KDDOOR, 255, 0), - OBJNAME("doorSZ", PROC_KDDOOR, 255, 0), - OBJNAME("KNOB00", PROC_KNOB00, 255, 0), - OBJNAME("KNOB01", PROC_KNOB00, 255, 0), - OBJNAME("KNOB02", PROC_KNOB00, 255, 0), - OBJNAME("KNOB03", PROC_KNOB00, 255, 0), - OBJNAME("KNOB00D", PROC_KNOB00, 255, 0), - OBJNAME("KNOB01D", PROC_KNOB00, 255, 0), - OBJNAME("KNOB02D", PROC_KNOB00, 255, 0), - OBJNAME("KNOB03D", PROC_KNOB00, 255, 0), - OBJNAME("door12", PROC_DOOR12, 0, 0), - OBJNAME("door12M", PROC_DOOR12, 1, 0), - OBJNAME("door12B", PROC_DOOR12, 2, 0), - OBJNAME("door13", PROC_DOOR12, 3, 0), - OBJNAME("door13M", PROC_DOOR12, 4, 0), - OBJNAME("door13B", PROC_DOOR12, 5, 0), - OBJNAME("keyS12", PROC_DOOR12, 1, 0), - OBJNAME("ZenS12", PROC_DOOR12, 2, 0), - OBJNAME("bonbori", PROC_EP, 255, 0), - OBJNAME("SW_C00", PROC_SWC00, 255, 0), - OBJNAME("takara", PROC_TBOX, 255, 62), - OBJNAME("takara2", PROC_TBOX, 255, 62), - OBJNAME("takara3", PROC_TBOX, 255, 62), - OBJNAME("takara4", PROC_TBOX, 255, 62), - OBJNAME("takara5", PROC_TBOX, 255, 62), - OBJNAME("takara6", PROC_TBOX, 255, 62), - OBJNAME("takara7", PROC_TBOX, 255, 62), - OBJNAME("takara8", PROC_TBOX, 255, 62), - OBJNAME("takaraK", PROC_TBOX, 255, 62), - OBJNAME("takaraI", PROC_TBOX, 255, 62), - OBJNAME("takaraM", PROC_TBOX, 255, 62), - OBJNAME("tkrASw", PROC_TBOX, 255, 62), - OBJNAME("tkrAGc", PROC_TBOX, 255, 62), - OBJNAME("tkrAKd", PROC_TBOX, 255, 62), - OBJNAME("tkrAIk", PROC_TBOX, 255, 62), - OBJNAME("tkrBMs", PROC_TBOX, 255, 62), - OBJNAME("tkrCTf", PROC_TBOX, 255, 62), - OBJNAME("tkrAOc", PROC_TBOX, 255, 62), - OBJNAME("tkrAOs", PROC_TBOX, 255, 62), - OBJNAME("tkrSlv", PROC_SBOX, 255, 62), - OBJNAME("agbA", PROC_AGBSW0, 255, 0), - OBJNAME("agbAT", PROC_AGBSW0, 255, 0), - OBJNAME("agbA2", PROC_AGBSW0, 255, 0), - OBJNAME("agbF", PROC_AGBSW0, 255, 0), - OBJNAME("agbF2", PROC_AGBSW0, 255, 0), - OBJNAME("agbMARK", PROC_AGBSW0, 255, 0), - OBJNAME("agbMW", PROC_AGBSW0, 255, 0), - OBJNAME("agbCSW", PROC_AGBSW0, 255, 0), - OBJNAME("agbTBOX", PROC_AGBSW0, 255, 0), - OBJNAME("agbR", PROC_AGBSW0, 255, 0), - OBJNAME("agbB", PROC_AGBSW0, 255, 0), - OBJNAME("agbD", PROC_AGBSW0, 255, 0), - OBJNAME("agbFA", PROC_AGBSW0, 255, 0), - OBJNAME("NoneCam", PROC_CAMERA, 255, 0), - OBJNAME("NormCam", PROC_CAMERA, 255, 0), - OBJNAME("Link", PROC_PLAYER, 255, 0), - OBJNAME("kotubo", PROC_TSUBO, 0, 0), - OBJNAME("ootubo1", PROC_TSUBO, 1, 0), - OBJNAME("Kmtub", PROC_TSUBO, 2, 0), - OBJNAME("Ktaru", PROC_TSUBO, 3, 0), - OBJNAME("Ostool", PROC_TSUBO, 4, 0), - OBJNAME("Odokuro", PROC_TSUBO, 5, 0), - OBJNAME("Okioke", PROC_TSUBO, 6, 0), - OBJNAME("Kmi02", PROC_TSUBO, 7, 0), - OBJNAME("Ptubo", PROC_TSUBO, 8, 0), - OBJNAME("KkibaB", PROC_TSUBO, 9, 0), - OBJNAME("Kmi00", PROC_TSUBO, 10, 0), - OBJNAME("Hbox2S", PROC_TSUBO, 11, 0), - OBJNAME("SW_HIT0", PROC_SWHIT0, 255, 0), - OBJNAME("koisi1", PROC_STONE, 0, 0), - OBJNAME("koisi2", PROC_STONE, 1, 0), - OBJNAME("Aygr", PROC_Obj_Aygr, 255, 0), - OBJNAME("Salvage", PROC_Salvage, 255, 0), - OBJNAME("SwSlvg", PROC_Salvage, 255, 63), - OBJNAME("Salvag2", PROC_Salvage, 255, 63), - OBJNAME("SalvagN", PROC_Salvage, 255, 63), - OBJNAME("SalvagE", PROC_Salvage, 255, 63), - OBJNAME("SalvFM", PROC_Salvage, 255, 63), - OBJNAME("osiBLK0", PROC_Obj_Movebox, 0, 61), - OBJNAME("osiBLK1", PROC_Obj_Movebox, 1, 61), - OBJNAME("Kkiba", PROC_Obj_Movebox, 2, 61), - OBJNAME("Hseki2", PROC_Obj_Movebox, 3, 61), - OBJNAME("Hseki7", PROC_Obj_Movebox, 4, 61), - OBJNAME("Mmrr", PROC_Obj_Movebox, 5, 61), - OBJNAME("MkieBB", PROC_Obj_Movebox, 6, 61), - OBJNAME("Ecube", PROC_Obj_Movebox, 7, 61), - OBJNAME("Hjump1", PROC_Obj_Movebox, 8, 61), - OBJNAME("Hbox1", PROC_Obj_Movebox, 9, 61), - OBJNAME("MpwrB", PROC_Obj_Movebox, 10, 61), - OBJNAME("DBLK0", PROC_Obj_Movebox, 11, 61), - OBJNAME("DBLK1", PROC_Obj_Movebox, 12, 61), - OBJNAME("DKkiba", PROC_Obj_Movebox, 13, 61), - OBJNAME("Hbox2", PROC_Obj_Movebox, 14, 61), - OBJNAME("BLK_CR", PROC_Obj_Correct, 0, 0), - OBJNAME("CrTrS3", PROC_Obj_Correct, 1, 0), - OBJNAME("CrTrS4", PROC_Obj_Correct, 2, 0), - OBJNAME("CrTrS5", PROC_Obj_Correct, 3, 0), - OBJNAME("CrTrM1", PROC_Obj_Correct, 4, 0), - OBJNAME("CrTrM2", PROC_Obj_Correct, 5, 0), - OBJNAME("CrTrGr", PROC_Obj_Correct, 6, 61), - OBJNAME("CrTrBl", PROC_Obj_Correct, 7, 61), - OBJNAME("Kbota_A", PROC_Obj_Swpush, 0, 0), - OBJNAME("Kbota_B", PROC_Obj_Swpush, 1, 0), - OBJNAME("KbotaC", PROC_Obj_Swpush, 2, 0), - OBJNAME("Hhbot1", PROC_Obj_Swheavy, 0, 0), - OBJNAME("Hhbot1N", PROC_Obj_Swheavy, 1, 0), - OBJNAME("MhmrSW0", PROC_Obj_Swhammer, 255, 0), - OBJNAME("TagSo", PROC_TAG_SO, 0, 0), - OBJNAME("TagMSo", PROC_TAG_SO, 1, 0), - OBJNAME("PScnChg", PROC_TAG_GSHIP, 255, 0), - OBJNAME("ALLdie", PROC_ALLDIE, 255, 0), - OBJNAME("TagEv", PROC_TAG_EVENT, 255, 0), - OBJNAME("TagHt", PROC_TAG_HINT, 0, 0), - OBJNAME("TagHt2", PROC_TAG_HINT, 1, 0), - OBJNAME("TagMsg", PROC_TAG_MSG, 0, 0), - OBJNAME("TagMsg2", PROC_TAG_MSG, 1, 0), - OBJNAME("TagIsl", PROC_TAG_ISLAND, 0, 0), - OBJNAME("TagMd", PROC_TAG_ETC, 0, 0), - OBJNAME("TagKf1", PROC_TAG_KF1, 255, 0), - OBJNAME("TagKk1", PROC_TAG_KK1, 255, 0), - OBJNAME("TagKb", PROC_TAG_KB_ITEM, 255, 0), - OBJNAME("TagMk", PROC_TAG_MK, 0, 0), - OBJNAME("TagWp", PROC_TAG_MK, 1, 0), - OBJNAME("TagDM", PROC_TAG_MK, 2, 0), - OBJNAME("TagTy", PROC_TAG_MK, 3, 0), - OBJNAME("TagMd1", PROC_TAG_MDCB, 0, 0), - OBJNAME("TagCb1", PROC_TAG_MDCB, 1, 0), - OBJNAME("TagMd11", PROC_TAG_MDCB, 2, 0), - OBJNAME("TagMd12", PROC_TAG_MDCB, 3, 0), - OBJNAME("TagMd13", PROC_TAG_MDCB, 4, 0), - OBJNAME("TagMd14", PROC_TAG_MDCB, 5, 0), - OBJNAME("TagMd15", PROC_TAG_MDCB, 6, 0), - OBJNAME("TagMd16", PROC_TAG_MDCB, 7, 0), - OBJNAME("TagCb11", PROC_TAG_MDCB, 8, 0), - OBJNAME("TagCb12", PROC_TAG_MDCB, 9, 0), - OBJNAME("TagCb13", PROC_TAG_MDCB, 10, 0), - OBJNAME("TagCb14", PROC_TAG_MDCB, 11, 0), - OBJNAME("TagBa1", PROC_TAG_BA1, 1, 0), - OBJNAME("Evsw", PROC_TAG_EVSW, 255, 0), - OBJNAME("Search", PROC_OBJ_SEARCH, 255, 0), - OBJNAME("Otble", PROC_OBJ_OTBLE, 0, 0), - OBJNAME("OtbleL", PROC_OBJ_OTBLE, 1, 0), - OBJNAME("Warpt", PROC_OBJ_WARPT, 0, 49), - OBJNAME("Warpnt", PROC_OBJ_WARPT, 1, 49), - OBJNAME("Warpts1", PROC_OBJ_WARPT, 2, 49), - OBJNAME("Warpts2", PROC_OBJ_WARPT, 3, 49), - OBJNAME("Warpts3", PROC_OBJ_WARPT, 4, 49), - OBJNAME("Seatag", PROC_SEATAG, 255, 0), - OBJNAME("Warpf", PROC_WARPFLOWER, 255, 0), - OBJNAME("Hys", PROC_Hys, 255, 0), - OBJNAME("Hys2", PROC_Hys, 255, 0), - OBJNAME("Hsen1", PROC_FAN, 255, 0), - OBJNAME("Hsen2", PROC_FAN, 255, 0), - OBJNAME("Hsen3", PROC_FAN, 255, 0), - OBJNAME("Olift", PROC_LEAF_LIFT, 255, 0), - OBJNAME("Ylsic", PROC_ICE_LIFT, 255, 0), - OBJNAME("Yllic", PROC_ICE_LIFT, 255, 0), - OBJNAME("Ylkic", PROC_ICE_LIFT, 255, 0), - OBJNAME("Hpbot1", PROC_SW_PROPELLER, 255, 0), - OBJNAME("Vpbot", PROC_SW_PROPELLER, 255, 0), - OBJNAME("Hami1", PROC_AMI_PROP, 255, 0), - OBJNAME("HamiY", PROC_AMI_PROP, 255, 0), - OBJNAME("LTag0", PROC_Tag_Light, 0, 0), - OBJNAME("LTag1", PROC_Tag_Light, 1, 0), - OBJNAME("LTagR0", PROC_Tag_Light, 2, 0), - OBJNAME("AttTag", PROC_Tag_Attention, 0, 0), - OBJNAME("AttTagB", PROC_Tag_Attention, 1, 0), - OBJNAME("Ikori", PROC_Obj_Ice, 255, 0), - OBJNAME("MsuSW", PROC_Obj_Swlight, 0, 0), - OBJNAME("MsuSWB", PROC_Obj_Swlight, 1, 0), - OBJNAME("SWat00", PROC_SW_ATTACK, 255, 0), - OBJNAME("ITat00", PROC_SW_ITEM, 255, 0), - OBJNAME("SWtact", PROC_SW_TACT, 255, 0), - OBJNAME("SWtactB", PROC_SW_TACT, 255, 0), - OBJNAME("Hhyu1", PROC_FLOOR, 255, 0), - OBJNAME("Oyashi", PROC_Obj_Lpalm, 255, 0), - OBJNAME("Kanban", PROC_KANBAN, 255, 52), - OBJNAME("kt", PROC_KT, 255, 0), - OBJNAME("ho", PROC_FF, 255, 0), - OBJNAME("mo2", PROC_MO2, 255, 2), - OBJNAME("moZOU", PROC_MOZO, 255, 0), - OBJNAME("hotest", PROC_RECTANGLE, 255, 0), - OBJNAME("Kui", PROC_KUI, 255, 0), - OBJNAME("Kamome", PROC_KAMOME, 255, 0), - OBJNAME("item", PROC_ITEM, 255, 0), - OBJNAME("itemFLY", PROC_ITEM, 255, 0), - OBJNAME("itemDek", PROC_DEKU_ITEM, 255, 0), - OBJNAME("Ship", PROC_SHIP, 255, 0), - OBJNAME("AND_SW0", PROC_ANDSW0, 255, 0), - OBJNAME("AND_SW2", PROC_ANDSW2, 255, 0), - OBJNAME("Bb", PROC_BB, 255, 26), - OBJNAME("Ebrock", PROC_Stone2, 0, 0), - OBJNAME("Ekao", PROC_Stone2, 1, 0), - OBJNAME("Ebrock2", PROC_Stone2, 2, 0), - OBJNAME("ky_tag0", PROC_KYTAG00, 255, 0), - OBJNAME("kytag00", PROC_KYTAG00, 255, 0), - OBJNAME("ky00you", PROC_KYTAG00, 255, 0), - OBJNAME("ky_tag1", PROC_KYTAG01, 255, 0), - OBJNAME("ky_tag2", PROC_KYTAG02, 255, 0), - OBJNAME("ky_tag3", PROC_KYTAG03, 255, 0), - OBJNAME("kytag4", PROC_KYTAG04, 255, 0), - OBJNAME("kytag5", PROC_KYTAG05, 255, 0), - OBJNAME("kytag6", PROC_KYTAG06, 255, 0), - OBJNAME("kytag7", PROC_KYTAG07, 255, 0), - OBJNAME("sea", PROC_SEA, 255, 0), - OBJNAME("nezumi", PROC_NZ, 255, 24), - OBJNAME("nezuana", PROC_NZG, 255, 0), - OBJNAME("kani", PROC_KN, 255, 0), - OBJNAME("Demo_Dk", PROC_DEMO_DK, 255, 0), - OBJNAME("DmKmm", PROC_DEMO_KMM, 0, 0), - OBJNAME("DmKmm2", PROC_DEMO_KMM, 1, 0), - OBJNAME("amos", PROC_AM, 255, 12), - OBJNAME("amos2", PROC_AM2, 255, 11), - OBJNAME("gmos", PROC_GM, 255, 9), - OBJNAME("gmos_g", PROC_GM, 255, 9), - OBJNAME("gmos_f", PROC_GM, 255, 9), - OBJNAME("kuro_s", PROC_KS, 255, 20), - OBJNAME("kuro_t", PROC_KS, 255, 0), - OBJNAME("c_green", PROC_CC, 255, 22), - OBJNAME("c_red", PROC_CC, 255, 21), - OBJNAME("c_blue", PROC_CC, 255, 30), - OBJNAME("c_black", PROC_CC, 255, 16), - OBJNAME("c_kiiro", PROC_CC, 255, 10), - OBJNAME("bable", PROC_BL, 255, 15), - OBJNAME("bable_r", PROC_BL, 255, 14), - OBJNAME("wiz_r", PROC_WZ, 255, 17), - OBJNAME("wiz_s", PROC_WZ, 255, 17), - OBJNAME("wiz_m", PROC_WZ, 255, 17), - OBJNAME("wiz_o", PROC_WZ, 255, 17), - OBJNAME("p_hat", PROC_PH, 255, 8), - OBJNAME("p_zelda", PROC_PZ, 255, 60), - OBJNAME("big_pow", PROC_BPW, 255, 0), - OBJNAME("pow", PROC_PW, 255, 13), - OBJNAME("sea_hat", PROC_PH, 255, 31), - OBJNAME("jbaba", PROC_JBO, 255, 33), - OBJNAME("bbaba", PROC_BO, 255, 7), - OBJNAME("bridge", PROC_BRIDGE, 255, 0), - OBJNAME("dragon", PROC_DR, 255, 0), - OBJNAME("Nh", PROC_NH, 255, 0), - OBJNAME("NpcSo", PROC_NPC_SO, 255, 0), - OBJNAME("NpcNz", PROC_NPC_NZ, 255, 0), - OBJNAME("Os", PROC_NPC_OS, 0, 0), - OBJNAME("Os1", PROC_NPC_OS, 1, 0), - OBJNAME("Os2", PROC_NPC_OS, 2, 0), - OBJNAME("Ym1", PROC_NPC_YM1, 255, 59), - OBJNAME("Ym2", PROC_NPC_YM2, 255, 59), - OBJNAME("Yw1", PROC_NPC_YW1, 255, 60), - OBJNAME("Ji1", PROC_NPC_JI1, 255, 59), - OBJNAME("Ko1", PROC_NPC_KO1, 255, 59), - OBJNAME("Ko2", PROC_NPC_KO2, 255, 59), - OBJNAME("Ls1", PROC_NPC_LS1, 255, 60), - OBJNAME("Bm1", PROC_NPC_BM1, 255, 59), - OBJNAME("Bm2", PROC_NPC_BM2, 255, 59), - OBJNAME("Bm3", PROC_NPC_BM3, 255, 59), - OBJNAME("Bm4", PROC_NPC_BM4, 255, 59), - OBJNAME("Bm5", PROC_NPC_BM5, 255, 59), - OBJNAME("Bmcon1", PROC_NPC_BMCON1, 0, 0), - OBJNAME("Bmcon2", PROC_NPC_BMCON1, 1, 0), - OBJNAME("Bmsw", PROC_NPC_BMSW, 255, 0), - OBJNAME("Btsw", PROC_NPC_BTSW, 255, 0), - OBJNAME("Btsw2", PROC_NPC_BTSW2, 255, DEMO_SELECT(0, 59)), - OBJNAME("Zk1", PROC_NPC_ZK1, 255, 59), - OBJNAME("Zl1", PROC_NPC_ZL1, 255, 60), - OBJNAME("Ob1", PROC_NPC_OB1, 255, 60), - OBJNAME("Aj1", PROC_NPC_AJ1, 255, 59), - OBJNAME("Km1", PROC_NPC_KM1, 255, 60), - OBJNAME("Cb1", PROC_NPC_CB1, 255, 59), - OBJNAME("Ba1", PROC_NPC_BA1, 255, 60), - OBJNAME("Bj1", PROC_NPC_BJ1, 255, 59), - OBJNAME("Bj2", PROC_NPC_BJ2, 255, 59), - OBJNAME("Bj3", PROC_NPC_BJ3, 255, 59), - OBJNAME("Bj4", PROC_NPC_BJ4, 255, 59), - OBJNAME("Bj5", PROC_NPC_BJ5, 255, 59), - OBJNAME("Bj6", PROC_NPC_BJ6, 255, 59), - OBJNAME("Bj7", PROC_NPC_BJ7, 255, 59), - OBJNAME("Bj8", PROC_NPC_BJ8, 255, 59), - OBJNAME("Bj9", PROC_NPC_BJ9, 255, 59), - OBJNAME("Bs1", PROC_NPC_BS1, 0, 59), - OBJNAME("Bs2", PROC_NPC_BS1, 1, 0), - OBJNAME("Bms1", PROC_NPC_BMS1, 0, 0), - OBJNAME("Bms2", PROC_NPC_BMS1, 1, 0), - OBJNAME("Ds1", PROC_NPC_DS1, 255, 59), - OBJNAME("Rsh1", PROC_NPC_RSH1, 255, 59), - OBJNAME("Kk1", PROC_NPC_KK1, 255, 60), - OBJNAME("Pm1", PROC_NPC_PM1, 255, 60), - OBJNAME("Kp1", PROC_NPC_KP1, 255, 60), - OBJNAME("Pf1", PROC_NPC_PF1, 255, 59), - OBJNAME("Gp1", PROC_NPC_GP1, 255, 59), - OBJNAME("Jb1", PROC_NPC_JB1, 255, 0), - OBJNAME("Kf1", PROC_NPC_KF1, 255, 59), - OBJNAME("De1", PROC_NPC_DE1, 255, 59), - OBJNAME("Sfairy", PROC_NPC_FA1, 255, 0), - OBJNAME("Md1", PROC_NPC_MD, 255, 60), - OBJNAME("Uo1", PROC_NPC_PEOPLE, 0, 59), - OBJNAME("Uo2", PROC_NPC_PEOPLE, 1, 59), - OBJNAME("Uo3", PROC_NPC_PEOPLE, 2, 59), - OBJNAME("Ub1", PROC_NPC_PEOPLE, 3, 0), - OBJNAME("Ub2", PROC_NPC_PEOPLE, 4, 0), - OBJNAME("Ub3", PROC_NPC_PEOPLE, 5, 0), - OBJNAME("Ub4", PROC_NPC_PEOPLE, 6, 0), - OBJNAME("Uw1", PROC_NPC_PEOPLE, 7, 0), - OBJNAME("Uw2", PROC_NPC_PEOPLE, 8, 0), - OBJNAME("Um1", PROC_NPC_PEOPLE, 9, 0), - OBJNAME("Um2", PROC_NPC_PEOPLE, 10, 0), - OBJNAME("Um3", PROC_NPC_PEOPLE, 11, 0), - OBJNAME("Sa1", PROC_NPC_PEOPLE, 12, 0), - OBJNAME("Sa2", PROC_NPC_PEOPLE, 13, 0), - OBJNAME("Sa3", PROC_NPC_PEOPLE, 14, 0), - OBJNAME("Sa4", PROC_NPC_PEOPLE, 15, 0), - OBJNAME("Sa5", PROC_NPC_PEOPLE, 16, 0), - OBJNAME("Ug1", PROC_NPC_PEOPLE, 17, 0), - OBJNAME("Ug2", PROC_NPC_PEOPLE, 18, 0), - OBJNAME("Gk1", PROC_NPC_GK1, 255, 59), - OBJNAME("Ac1", PROC_NPC_AC1, 255, 59), - OBJNAME("Hi1", PROC_NPC_HI1, 255, 59), - OBJNAME("Pirates", PROC_Obj_Pirateship, 255, 0), - OBJNAME("keeth", PROC_KI, 255, 23), - OBJNAME("Fkeeth", PROC_KI, 255, 6), - OBJNAME("yg_awa", PROC_YOUGAN, 255, 0), - OBJNAME("magtail", PROC_MT, 255, 5), - OBJNAME("RopeR", PROC_HIMO3, 255, 0), - OBJNAME("Ktarur", PROC_Obj_Barrel2, 255, 61), - OBJNAME("Ktarux", PROC_Obj_Barrel, 255, 0), - OBJNAME("Magrock", PROC_Obj_Magmarock, 255, 0), - OBJNAME("Quake", PROC_Obj_Quake, 255, 0), - OBJNAME("Yfire00", PROC_Obj_Flame, 255, 0), - OBJNAME("Turu", PROC_SK, 0, 0), - OBJNAME("Turu2", PROC_SK2, 0, 0), - OBJNAME("Turu3", PROC_SK2, 1, 0), - OBJNAME("Kanat", PROC_Obj_Kanat, 255, 0), - OBJNAME("s_turu", PROC_SSK, 255, 0), - OBJNAME("spotbox", PROC_SPOTBOX, 255, 0), - OBJNAME("Ksaku", PROC_SAKU, 255, 0), - OBJNAME("spotbx1", PROC_SPOTBOX, 255, 0), - OBJNAME("Mswing", PROC_MSW, 255, 0), - OBJNAME("Pig", PROC_KB, 255, 0), - OBJNAME("Rdead1", PROC_RD, 0, 18), - OBJNAME("Rdead2", PROC_RD, 1, 18), - OBJNAME("Fmaster", PROC_FM, 0, 25), - OBJNAME("Fmastr1", PROC_FM, 1, 25), - OBJNAME("Fmastr2", PROC_FM, 2, 25), - OBJNAME("Daiocta", PROC_DAIOCTA, 255, 28), - OBJNAME("Daioeye", PROC_DAIOCTA_EYE, 255, 0), - OBJNAME("Oq", PROC_OQ, 0, 27), - OBJNAME("Oqw", PROC_OQ, 1, 65), - OBJNAME("Gy", PROC_GY, 255, 29), - OBJNAME("GyCtrl", PROC_GY_CTRL, 255, 0), - OBJNAME("GyCtrlB", PROC_GY_CTRLB, 255, 0), - OBJNAME("Bk", PROC_BK, 255, 1), - OBJNAME("Ypit00", PROC_OBJ_HOLE, 0, 0), - OBJNAME("Pitfall", PROC_OBJ_HOLE, 1, 0), - OBJNAME("Nzfall", PROC_OBJ_PFALL, 255, 0), - OBJNAME("ScnChg", PROC_SCENECHG, 255, 0), - OBJNAME("Oship", PROC_OSHIP, 255, 56), - OBJNAME("Ayush", PROC_AYUSH, 255, 57), - OBJNAME("Tpost", PROC_OBJ_TORIPOST, 255, 53), - OBJNAME("Ocanon", PROC_OBJ_CANON, 255, 0), - OBJNAME("Ikada", PROC_OBJ_IKADA, 0, 61), - OBJNAME("ikada_h", PROC_OBJ_IKADA, 1, 61), - OBJNAME("ikadaS", PROC_OBJ_IKADA, 2, 61), - OBJNAME("ikada_u", PROC_OBJ_IKADA, 3, 61), - OBJNAME("Svsp", PROC_OBJ_IKADA, 4, 61), - OBJNAME("Sv0", PROC_NPC_SV, 0, 0), - OBJNAME("Sv1", PROC_NPC_SV, 1, 0), - OBJNAME("Sv2", PROC_NPC_SV, 2, 0), - OBJNAME("Sv3", PROC_NPC_SV, 3, 0), - OBJNAME("MjDoor", PROC_OBJ_MJDOOR, 255, 0), - OBJNAME("Ikari", PROC_IKARI, 255, 0), - OBJNAME("MjFlag", PROC_MAJUU_FLAG, 0, 0), - OBJNAME("MtFlag", PROC_MAJUU_FLAG, 1, 0), - OBJNAME("HcFlag", PROC_MAJUU_FLAG, 3, 0), - OBJNAME("TrFlag", PROC_Tori_Flag, 0, 0), - OBJNAME("SieFlag", PROC_Sie_Flag, 0, 0), - OBJNAME("lwood", PROC_Lwood, 255, 0), - OBJNAME("Ktaruo", PROC_Obj_Demo_Barrel, 255, 0), - OBJNAME("Touseki", PROC_Obj_Tousekiki, 255, 0), - OBJNAME("frock", PROC_TagRock, 255, 0), - OBJNAME("fallrck", PROC_FallRock, 255, 0), - OBJNAME("Dr2", PROC_DR2, 255, 0), - OBJNAME("Mkdan1", PROC_Obj_Stair, 255, 0), - OBJNAME("Btd", PROC_BTD, 255, 0), - OBJNAME("Dk", PROC_DK, 255, 0), - OBJNAME("Ystm0", PROC_SteamTag, 255, 0), - OBJNAME("Ystm1", PROC_SteamTag, 255, 0), - OBJNAME("Gflag", PROC_Goal_Flag, 255, 0), - OBJNAME("Branch", PROC_BRANCH, 255, 0), - OBJNAME("P1a", PROC_NPC_P1, 0, 59), - OBJNAME("P1b", PROC_NPC_P1, 1, 59), - OBJNAME("P1c", PROC_NPC_P1, 2, 59), - OBJNAME("P2a", PROC_NPC_P2, 0, 59), - OBJNAME("P2b", PROC_NPC_P2, 1, 59), - OBJNAME("P2c", PROC_NPC_P2, 2, 59), - OBJNAME("Tc", PROC_NPC_TC, 255, 59), - OBJNAME("Throck", PROC_THROWSTONE, 255, 0), - OBJNAME("magma", PROC_MAGMA, 255, 0), - OBJNAME("Bita", PROC_BITA, 255, 0), - OBJNAME("YkgrON", PROC_Ykgr, 255, 0), - OBJNAME("YkgrOFF", PROC_Ykgr, 255, 0), - OBJNAME("Dsaku", PROC_SAKU, 255, 0), - OBJNAME("Otana", PROC_Obj_Shelf, 0, 0), - OBJNAME("OtanaG", PROC_Obj_Shelf, 1, 0), - OBJNAME("Bdk", PROC_BDK, 255, 0), - OBJNAME("Bdkobj", PROC_BDKOBJ, 255, 0), - OBJNAME("SWTdoor", PROC_SWTDOOR, 255, 0), - OBJNAME("Canon", PROC_Canon, 255, 0), - OBJNAME("GBoard", PROC_MGBOARD, 255, 0), - OBJNAME("Hlift", PROC_Obj_Hlift, 0, 0), - OBJNAME("Hliftb", PROC_Obj_Hlift, 1, 0), - OBJNAME("Hami2", PROC_Obj_Hami2, 255, 0), - OBJNAME("Hami3", PROC_Obj_Hami3, 255, 0), - OBJNAME("Hami4", PROC_Obj_Hami4, 255, 0), - OBJNAME("Hbrf1", PROC_Obj_Hbrf1, 255, 0), - OBJNAME("Mflft", PROC_MFLFT, 255, 0), - OBJNAME("ObjTime", PROC_Obj_Timer, 255, 0), - OBJNAME("Klft", PROC_KLFT, 255, 0), - OBJNAME("Kita", PROC_KITA, 255, 0), - OBJNAME("Humi0z", PROC_Obj_Tide, 0, 0), - OBJNAME("Humi4z", PROC_Obj_Tide, 1, 0), - OBJNAME("Humi5z", PROC_Obj_Tide, 2, 0), - OBJNAME("Tide3", PROC_Obj_Tide, 3, 0), - OBJNAME("Humi2z", PROC_Obj_Tide, 4, 0), - OBJNAME("Humi3z", PROC_Obj_Tide, 5, 0), - OBJNAME("WLvTag", PROC_Tag_Waterlevel, 255, 0), - OBJNAME("Fire", PROC_Fire, 255, 0), - OBJNAME("Zenfire", PROC_Fire, 255, 0), - OBJNAME("Kokiie", PROC_KOKIIE, 255, 0), - OBJNAME("Paper", PROC_Obj_Paper, 0, 0), - OBJNAME("Ppos", PROC_Obj_Paper, 1, 0), - OBJNAME("Piwa", PROC_Obj_Paper, 2, 54), - OBJNAME("Ss", PROC_SS, 255, 0), - OBJNAME("WindTag", PROC_WindTag, 255, 0), - OBJNAME("Kryu00", PROC_Obj_Drift, 255, 0), - OBJNAME("Mcube", PROC_Obj_Mtest, 0, 0), - OBJNAME("Mcyln", PROC_Obj_Mtest, 1, 0), - OBJNAME("Mcube10", PROC_Obj_Mtest, 2, 0), - OBJNAME("Mcyln10", PROC_Obj_Mtest, 3, 0), - OBJNAME("MwtrSB", PROC_Obj_Mtest, 4, 0), - OBJNAME("MygnSB", PROC_Obj_Mtest, 5, 0), - OBJNAME("Owater", PROC_Obj_Mtest, 6, 0), - OBJNAME("Astop", PROC_Obj_Mtest, 7, 0), - OBJNAME("Ojtree", PROC_Obj_Ojtree, 255, 0), - OBJNAME("Ospbox", PROC_Obj_Ospbox, 255, 0), - OBJNAME("Hmlif", PROC_Hmlif, 255, 61), - OBJNAME("Ywarp00", PROC_WARPLIGHT, 255, 0), - OBJNAME("Ysdls00", PROC_WARPLIGHT, 255, 0), - OBJNAME("Yswtr00", PROC_WATERFALL, 255, 0), - OBJNAME("Gbrg00", PROC_LIGHTBRIDGE, 255, 0), - OBJNAME("Mhsg6", PROC_Obj_Ladder, 0, 0), - OBJNAME("Mhsg9", PROC_Obj_Ladder, 1, 0), - OBJNAME("Mhsg12", PROC_Obj_Ladder, 2, 0), - OBJNAME("Mhsg15", PROC_Obj_Ladder, 3, 0), - OBJNAME("Mhsg4h", PROC_Obj_Ladder, 4, 0), - OBJNAME("Sss", PROC_SSS, 255, 0), - OBJNAME("Wall", PROC_WALL, 255, 0), - OBJNAME("Blift", PROC_Balancelift, 255, 0), - OBJNAME("MtoriSU", PROC_Obj_Nest, 255, 0), - OBJNAME("Lamp", PROC_LAMP, 255, 0), - OBJNAME("Sitem", PROC_SITEM, 255, 0), - OBJNAME("Hmos1", PROC_Bemos, 0, 35), - OBJNAME("Hmos2", PROC_Bemos, 1, 35), - OBJNAME("Hmos3", PROC_Bemos, 2, 35), - OBJNAME("Ylesr00", PROC_Beam, 255, 0), - OBJNAME("Hseki1", PROC_Obj_Try, 0, 61), - OBJNAME("Hseki6", PROC_Obj_Try, 1, 61), - OBJNAME("Hseki3", PROC_Obj_Try, 2, 61), - OBJNAME("Hseki4", PROC_Obj_Try, 3, 61), - OBJNAME("Hseki5", PROC_Obj_Try, 4, 61), - OBJNAME("Hmon1", PROC_Obj_Try, 5, 61), - OBJNAME("Hmon1d", PROC_Obj_Try, 6, 61), - OBJNAME("Hmon2", PROC_Obj_Try, 7, 61), - OBJNAME("Hmon2d", PROC_Obj_Try, 8, 61), - OBJNAME("Hseki31", PROC_Obj_Try, 9, 61), - OBJNAME("Hseki41", PROC_Obj_Try, 10, 61), - OBJNAME("Hseki51", PROC_Obj_Try, 11, 61), - OBJNAME("Hseki32", PROC_Obj_Try, 12, 61), - OBJNAME("Hseki42", PROC_Obj_Try, 13, 61), - OBJNAME("Hseki52", PROC_Obj_Try, 14, 61), - OBJNAME("Com_A", PROC_Obj_Coming, 255, 0), - OBJNAME("WBird", PROC_WBIRD, 255, 0), - OBJNAME("SMtoge", PROC_MTOGE, 255, 0), - OBJNAME("SMBdor", PROC_MBDOOR, 0, 0), - OBJNAME("KGBdor", PROC_MBDOOR, 1, 0), - OBJNAME("BFlower", PROC_BOMB_FLOWER, 255, 0), - OBJNAME("VbakH", PROC_BOMB_FLOWER, 255, 0), - OBJNAME("VigaH", PROC_ACORN_LEAF, 255, 0), - OBJNAME("Stal", PROC_ST, 255, 4), - OBJNAME("MkieBA", PROC_Obj_Mkie, 0, 61), - OBJNAME("MkieBAB", PROC_Obj_Mkie, 1, 61), - OBJNAME("MkieK", PROC_Obj_Mkiek, 255, 0), - OBJNAME("MknjD", PROC_Obj_MknjD, 255, 0), - OBJNAME("Msdan", PROC_Obj_Msdan, 255, 0), - OBJNAME("MsdanSb", PROC_Obj_MsdanSub, 255, 0), - OBJNAME("Msdan2", PROC_Obj_Msdan2, 255, 0), - OBJNAME("MsdanS2", PROC_Obj_MsdanSub2, 255, 0), - OBJNAME("Htobi1", PROC_SHUTTER, 255, 0), - OBJNAME("Htobi2", PROC_SHUTTER, 255, 0), - OBJNAME("Htobi3", PROC_SHUTTER2, 255, 0), - OBJNAME("Hfbot1A", PROC_Obj_Swflat, 0, 0), - OBJNAME("Hfbot1B", PROC_Obj_Swflat, 1, 0), - OBJNAME("Hfbot1C", PROC_Obj_Swflat, 2, 0), - OBJNAME("Ykzyg", PROC_Obj_Volcano, 255, 0), - OBJNAME("GiceL", PROC_Obj_Iceisland, 255, 0), - OBJNAME("Qdghd", PROC_Obj_Dragonhead, 255, 0), - OBJNAME("dmgroom", PROC_Obj_Dmgroom, 255, 0), - OBJNAME("Doguu", PROC_Obj_Doguu, 0, 0), - OBJNAME("MegamiD", PROC_Obj_Doguu, 1, 0), - OBJNAME("MegamiF", PROC_Obj_Doguu, 2, 0), - OBJNAME("MegamiN", PROC_Obj_Doguu, 3, 0), - OBJNAME("DoguuD", PROC_Obj_DoguuD, 255, 0), - OBJNAME("ReTag0", PROC_Tag_Ret, 255, 0), - OBJNAME("VolTag", PROC_Tag_Volcano, 255, 0), - OBJNAME("Auc7", PROC_NPC_AUCTION, 0, 0), - OBJNAME("Auc1", PROC_NPC_AUCTION, 1, 0), - OBJNAME("Auc2", PROC_NPC_AUCTION, 2, 0), - OBJNAME("Auc3", PROC_NPC_AUCTION, 3, 0), - OBJNAME("Auc4", PROC_NPC_AUCTION, 4, 0), - OBJNAME("Auc5", PROC_NPC_AUCTION, 5, 0), - OBJNAME("Auc6", PROC_NPC_AUCTION, 6, 0), - OBJNAME("Auc0", PROC_NPC_AUCTION, 7, 59), - OBJNAME("RotenA", PROC_NPC_ROTEN, 0, 59), - OBJNAME("RotenB", PROC_NPC_ROTEN, 1, 59), - OBJNAME("RotenC", PROC_NPC_ROTEN, 2, 59), - OBJNAME("Tn", PROC_TN, 255, 3), - OBJNAME("Fdai", PROC_DAI, 255, 0), - OBJNAME("Ytrnd00", PROC_TORNADO, 255, 58), - OBJNAME("Plant", PROC_Obj_Plant, 255, 0), - OBJNAME("Rflw", PROC_Obj_Rflw, 255, 0), - OBJNAME("Table", PROC_Obj_Table, 255, 0), - OBJNAME("Gtaki", PROC_Obj_Gtaki, 255, 0), - OBJNAME("Tenmado", PROC_Obj_Tenmado, 255, 0), - OBJNAME("X_tower", PROC_Obj_Tower, 255, 0), - OBJNAME("Eskban", PROC_Obj_Eskban, 255, 0), - OBJNAME("Ekskz", PROC_Obj_Ekskz, 255, 0), - OBJNAME("Pbka", PROC_Obj_Pbka, 255, 0), - OBJNAME("Yboil00", PROC_Obj_Yboil, 255, 0), - OBJNAME("Cafelmp", PROC_Obj_Cafelmp, 255, 0), - OBJNAME("MKanoke", PROC_Obj_Kanoke, 0, 61), - OBJNAME("MKanok2", PROC_Obj_Kanoke, 1, 61), - OBJNAME("Kg1", PROC_NPC_KG1, 255, 59), - OBJNAME("Kg2", PROC_NPC_KG2, 255, 0), - OBJNAME("Tt", PROC_NPC_TT, 255, 59), - OBJNAME("Hr", PROC_NPC_HR, 0, 0), - OBJNAME("Hr2", PROC_NPC_HR, 1, 0), - OBJNAME("BigElf", PROC_BIGELF, 0, 0), - OBJNAME("Ho", PROC_NPC_HO, 0, 0), - OBJNAME("Gkai00", PROC_LIGHTSTAIR, 255, 0), - OBJNAME("Mk", PROC_NPC_MK, 0, 59), - OBJNAME("UkB", PROC_NPC_UK, 1, 59), - OBJNAME("UkC", PROC_NPC_UK, 2, 59), - OBJNAME("UkD", PROC_NPC_UK, 3, 59), - OBJNAME("Mk2", PROC_NPC_MK, 4, 0), - OBJNAME("UkB2", PROC_NPC_UK, 5, 0), - OBJNAME("UkC2", PROC_NPC_UK, 6, 0), - OBJNAME("UkD2", PROC_NPC_UK, 7, 0), - OBJNAME("Co1", PROC_NPC_CO1, 255, 59), - OBJNAME("Mt", PROC_NPC_MT, 255, 0), - OBJNAME("Mn", PROC_NPC_MN, 255, DEMO_SELECT(0, 59)), - OBJNAME("Ah", PROC_NPC_AH, 255, 0), - OBJNAME("Hyuf1", PROC_Hmlif, 255, 61), - OBJNAME("Hyuf2", PROC_Hmlif, 255, 61), - OBJNAME("Hdai1", PROC_PEDESTAL, 0, 61), - OBJNAME("Hdai2", PROC_PEDESTAL, 1, 61), - OBJNAME("Hdai3", PROC_PEDESTAL, 2, 61), - OBJNAME("Auction", PROC_AUCTION, 255, 0), - OBJNAME("Auzu", PROC_Obj_Auzu, 255, 58), - OBJNAME("Hpu1", PROC_WINDMILL, 255, 0), - OBJNAME("Hpu2", PROC_WINDMILL, 255, 0), - OBJNAME("Hkikai1", PROC_MACHINE, 255, 0), - OBJNAME("Ybgaf00", PROC_WindTag, 255, 0), - OBJNAME("LOD01", PROC_LODBG, 255, 0), - OBJNAME("LOD02", PROC_LODBG, 255, 0), - OBJNAME("LOD03", PROC_LODBG, 255, 0), - OBJNAME("LOD04", PROC_LODBG, 255, 0), - OBJNAME("LOD05", PROC_LODBG, 255, 0), - OBJNAME("LOD06", PROC_LODBG, 255, 0), - OBJNAME("LOD07", PROC_LODBG, 255, 0), - OBJNAME("LOD08", PROC_LODBG, 255, 0), - OBJNAME("LOD09", PROC_LODBG, 255, 0), - OBJNAME("LOD10", PROC_LODBG, 255, 0), - OBJNAME("LOD11", PROC_LODBG, 255, 0), - OBJNAME("LOD12", PROC_LODBG, 255, 0), - OBJNAME("LOD13", PROC_LODBG, 255, 0), - OBJNAME("LOD14", PROC_LODBG, 255, 0), - OBJNAME("LOD15", PROC_LODBG, 255, 0), - OBJNAME("LOD16", PROC_LODBG, 255, 0), - OBJNAME("LOD17", PROC_LODBG, 255, 0), - OBJNAME("LOD18", PROC_LODBG, 255, 0), - OBJNAME("LOD19", PROC_LODBG, 255, 0), - OBJNAME("LOD20", PROC_LODBG, 255, 0), - OBJNAME("LOD21", PROC_LODBG, 255, 0), - OBJNAME("LOD22", PROC_LODBG, 255, 0), - OBJNAME("LOD23", PROC_LODBG, 255, 0), - OBJNAME("LOD24", PROC_LODBG, 255, 0), - OBJNAME("LOD25", PROC_LODBG, 255, 0), - OBJNAME("LOD26", PROC_LODBG, 255, 0), - OBJNAME("LOD27", PROC_LODBG, 255, 0), - OBJNAME("LOD28", PROC_LODBG, 255, 0), - OBJNAME("LOD29", PROC_LODBG, 255, 0), - OBJNAME("LOD30", PROC_LODBG, 255, 0), - OBJNAME("LOD31", PROC_LODBG, 255, 0), - OBJNAME("LOD32", PROC_LODBG, 255, 0), - OBJNAME("LOD33", PROC_LODBG, 255, 0), - OBJNAME("LOD34", PROC_LODBG, 255, 0), - OBJNAME("LOD35", PROC_LODBG, 255, 0), - OBJNAME("LOD36", PROC_LODBG, 255, 0), - OBJNAME("LOD37", PROC_LODBG, 255, 0), - OBJNAME("LOD38", PROC_LODBG, 255, 0), - OBJNAME("LOD39", PROC_LODBG, 255, 0), - OBJNAME("LOD40", PROC_LODBG, 255, 0), - OBJNAME("LOD41", PROC_LODBG, 255, 0), - OBJNAME("LOD42", PROC_LODBG, 255, 0), - OBJNAME("LOD43", PROC_LODBG, 255, 0), - OBJNAME("LOD44", PROC_LODBG, 255, 0), - OBJNAME("LOD45", PROC_LODBG, 255, 0), - OBJNAME("LOD46", PROC_LODBG, 255, 0), - OBJNAME("LOD47", PROC_LODBG, 255, 0), - OBJNAME("LOD48", PROC_LODBG, 255, 0), - OBJNAME("LOD49", PROC_LODBG, 255, 0), - OBJNAME("MtryB", PROC_Obj_Tribox, 0, 0), - OBJNAME("MtryBCr", PROC_Obj_Tribox, 1, 0), - OBJNAME("Vdora", PROC_Obj_Gong, 255, 0), - OBJNAME("Roten2", PROC_Obj_Roten, 0, 0), - OBJNAME("Roten3", PROC_Obj_Roten, 1, 0), - OBJNAME("Roten4", PROC_Obj_Roten, 2, 0), - OBJNAME("Qtkhd", PROC_Obj_Smplbg, 255, 0), - OBJNAME("Akabe", PROC_Obj_Akabe, 0, 0), - OBJNAME("Akabe10", PROC_Obj_Akabe, 1, 0), - OBJNAME("NBOX", PROC_Obj_Akabe, 2, 0), - OBJNAME("NBOX10", PROC_Obj_Akabe, 3, 0), - OBJNAME("Ashut", PROC_Obj_Ashut, 255, 0), - OBJNAME("Mcrtn", PROC_Obj_Tapestry, 255, 0), - OBJNAME("VmcBS", PROC_Obj_Vmc, 255, 0), - OBJNAME("Usovmc", PROC_Obj_Usovmc, 255, 0), - OBJNAME("Vfan", PROC_Obj_Vfan, 255, 0), - OBJNAME("Apzl", PROC_Obj_Apzl, 255, 0), - OBJNAME("Adnno", PROC_Obj_Adnno, 255, 0), - OBJNAME("Ycage00", PROC_Obj_Barrier, 255, 0), - OBJNAME("Yswdr00", PROC_Obj_Firewall, 255, 0), - OBJNAME("TnTrap", PROC_Obj_TnTrap, 255, 0), - OBJNAME("FgTrap", PROC_Obj_TnTrap, 255, 0), - OBJNAME("CmTrap", PROC_Obj_TnTrap, 255, 0), - OBJNAME("Hjump2", PROC_Obj_Jump, 255, 61), - OBJNAME("Esekh", PROC_Obj_Monument, 0, 55), - OBJNAME("Esekh2", PROC_Obj_Monument, 1, 55), - OBJNAME("Po", PROC_NPC_PHOTO, 255, 59), - OBJNAME("TagPo", PROC_TAG_PHOTO, 255, 0), - OBJNAME("Htoge1", PROC_TOGE, 255, 50), - OBJNAME("Skanran", PROC_Obj_Ferris, 255, 0), - OBJNAME("Ajav", PROC_Obj_Ajav, 255, 0), - OBJNAME("Trap", PROC_Obj_Trap, 255, 51), - OBJNAME("Hha", PROC_Obj_Hha, 255, 0), - OBJNAME("Htetu1", PROC_Obj_Htetu1, 255, 0), - OBJNAME("Tpota", PROC_Tpota, 255, 0), - OBJNAME("Stoudai", PROC_Obj_Light, 255, 0), - OBJNAME("Pbco", PROC_Obj_Pbco, 255, 0), - OBJNAME("Ebomzo", PROC_Obj_Ebomzo, 255, 0), - OBJNAME("Psail", PROC_SAIL, 0, 0), - OBJNAME("Homen1", PROC_Obj_Homen, 0, 0), - OBJNAME("Homen2", PROC_Obj_Homen, 1, 0), - OBJNAME("Xfuta", PROC_Obj_Xfuta, 1, 0), - OBJNAME("Vochi", PROC_Obj_Leaves, 0, 0), - OBJNAME("Hfuck1", PROC_Obj_Hfuck1, 0, 0), - OBJNAME("YLzou", PROC_Obj_YLzou, 0, 0), - OBJNAME("Gbed", PROC_Obj_Gbed, 0, 0), - OBJNAME("Vteng", PROC_Obj_Vteng, 0, 0), - OBJNAME("Ohatch", PROC_Obj_Ohatch, 255, 0), - OBJNAME("Rcloud", PROC_Obj_Rcloud, 0, 0), - OBJNAME("Ocloud", PROC_Obj_Rcloud, 1, 0), - OBJNAME("MPot", PROC_Obj_Mshokki, 0, 0), - OBJNAME("MOsara", PROC_Obj_Mshokki, 1, 0), - OBJNAME("MKoppu", PROC_Obj_Mshokki, 2, 0), - OBJNAME("Ptco", PROC_Obj_Bscurtain, 0, 0), - OBJNAME("Ptcu", PROC_Obj_Bscurtain, 1, 0), - OBJNAME("Kmon", PROC_Kmon, 0, 0), - OBJNAME("Sarace", PROC_NPC_SARACE, 0, 0), - OBJNAME("Hsh", PROC_Obj_HSH, 0, 54), - OBJNAME("Hsh2", PROC_Obj_HSH, 1, 54), - OBJNAME("Mmusic", PROC_Mmusic, 255, 0), - OBJNAME("Gryw00", PROC_Obj_Gryw00, 255, 0), - OBJNAME("AjavW", PROC_Obj_AjavW, 0, 0), - OBJNAME("Omensmk", PROC_Obj_Homensmk, 255, 0), - OBJNAME("Itnak", PROC_Obj_Itnak, 255, 0), - OBJNAME("Yfrlt00", PROC_Komore, 255, 0), - OBJNAME("FTree", PROC_Obj_Ftree, 255, 0), - OBJNAME("Vyasi", PROC_Obj_Vyasi, 255, 0), - OBJNAME("Vds", PROC_Obj_Vds, 255, 0), - OBJNAME("Rforce", PROC_Obj_Rforce, 255, 0), - OBJNAME("zouK", PROC_Obj_Zouk, 0, 0), - OBJNAME("zouK1", PROC_Obj_Zouk, 1, 0), - OBJNAME("zouK2", PROC_Obj_Zouk, 2, 0), - OBJNAME("zouK3", PROC_Obj_Zouk, 3, 0), - OBJNAME("zouK4", PROC_Obj_Zouk, 4, 0), - OBJNAME("Gaship1", PROC_Obj_Gaship, 255, 0), - OBJNAME("Gaship2", PROC_Obj_Gaship2, 255, 0), - OBJNAME("Ghrwp", PROC_WARPHYRULE, 255, 0), - OBJNAME("Gdemo20", PROC_WARPDEMO20, 255, 0), - OBJNAME("Warpgn", PROC_WARPGANON, 255, 0), - OBJNAME("Warpmj", PROC_WARPMAJYUU, 255, 0), - OBJNAME("Warpfo", PROC_WARPFOUT, 255, 0), - OBJNAME("Ygush00", PROC_Obj_Ygush00, 255, 0), - OBJNAME("Ygush01", PROC_Obj_Ygush00, 255, 0), - OBJNAME("Ygstp00", PROC_Obj_Ygush00, 255, 0), - OBJNAME("Ygush02", PROC_Obj_Ygush00, 255, 0), - OBJNAME("Hcbh", PROC_Obj_Hcbh, 0, 0), - OBJNAME("Com_B", PROC_Coming2, 255, 0), - OBJNAME("Com_C", PROC_Coming3, 255, 0), - OBJNAME("SPitem", PROC_SPC_ITEM01, 255, 0), - OBJNAME("HyoiKam", PROC_NPC_KAM, 255, 0), - OBJNAME("Shmrgrd", PROC_Obj_Shmrgrd, 255, 0), - OBJNAME("Vtil1", PROC_Obj_Vtil, 0, 0), - OBJNAME("Vtil2", PROC_Obj_Vtil, 1, 0), - OBJNAME("Vtil3", PROC_Obj_Vtil, 2, 0), - OBJNAME("Vtil4", PROC_Obj_Vtil, 3, 0), - OBJNAME("Vtil5", PROC_Obj_Vtil, 4, 0), - OBJNAME("Eayogn", PROC_Obj_Eayogn, 255, 0), - OBJNAME("VmsMS", PROC_Obj_Vmsms, 255, 0), - OBJNAME("VmsDZ", PROC_Obj_Vmsdz, 255, 0), - OBJNAME("VgnFD", PROC_Obj_Vgnfd, 255, 0), - OBJNAME("Ygcwp", PROC_Ygcwp, 255, 0), - OBJNAME("Figure", PROC_OBJ_FIGURE, 255, 0), - OBJNAME("RoHat", PROC_OBJ_HAT, 255, 0), - OBJNAME("Gntakis", PROC_Obj_Gnntakis, 255, 0), - OBJNAME("Gntakie", PROC_Obj_Gnntakie, 255, 0), - OBJNAME("Gnbtaki", PROC_Obj_Gnnbtaki, 255, 0), - OBJNAME("Bkm", PROC_BMD, 255, 0), - OBJNAME("Bst", PROC_BST, 255, 0), - OBJNAME("Bitem", PROC_BOSSITEM, 255, 0), - OBJNAME("Fganon", PROC_FGANON, 255, 0), - OBJNAME("Bwd", PROC_BWD, 255, 0), - OBJNAME("Bwds", PROC_BWDS, 255, 0), - OBJNAME("Bgn", PROC_BGN, 255, 0), - OBJNAME("Gnd", PROC_GND, 255, 0), - OBJNAME("Puti", PROC_PT, 255, 0), - OBJNAME("d_act0", PROC_DEMO00, 0, 0), - OBJNAME("d_act1", PROC_DEMO00, 1, 0), - OBJNAME("d_act2", PROC_DEMO00, 2, 0), - OBJNAME("d_act3", PROC_DEMO00, 3, 0), - OBJNAME("d_act4", PROC_DEMO00, 4, 0), - OBJNAME("d_act5", PROC_DEMO00, 5, 0), - OBJNAME("d_act6", PROC_DEMO00, 6, 0), - OBJNAME("d_act7", PROC_DEMO00, 7, 0), - OBJNAME("d_act8", PROC_DEMO00, 8, 0), - OBJNAME("d_act9", PROC_DEMO00, 9, 0), - OBJNAME("d_act10", PROC_DEMO00, 10, 0), - OBJNAME("d_act11", PROC_DEMO00, 11, 0), - OBJNAME("d_act12", PROC_DEMO00, 12, 0), - OBJNAME("d_act13", PROC_DEMO00, 13, 0), - OBJNAME("d_act14", PROC_DEMO00, 14, 0), - OBJNAME("d_act15", PROC_DEMO00, 15, 0), - OBJNAME("d_act16", PROC_DEMO00, 16, 0), - OBJNAME("d_act17", PROC_DEMO00, 17, 0), - OBJNAME("d_act18", PROC_DEMO00, 18, 0), - OBJNAME("d_act19", PROC_DEMO00, 19, 0), - OBJNAME("d_act20", PROC_DEMO00, 20, 0), - OBJNAME("d_act21", PROC_DEMO00, 21, 0), - OBJNAME("d_act22", PROC_DEMO00, 22, 0), - OBJNAME("d_act23", PROC_DEMO00, 23, 0), - OBJNAME("d_act24", PROC_DEMO00, 24, 0), - OBJNAME("d_act25", PROC_DEMO00, 25, 0), - OBJNAME("d_act26", PROC_DEMO00, 26, 0), - OBJNAME("d_act27", PROC_DEMO00, 27, 0), - OBJNAME("d_act28", PROC_DEMO00, 28, 0), - OBJNAME("d_act29", PROC_DEMO00, 29, 0), - OBJNAME("d_act30", PROC_DEMO00, 30, 0), - OBJNAME("d_act31", PROC_DEMO00, 31, 0), - OBJNAME("SYAN", PROC_SYAN, 255, 0), - OBJNAME("TagD1", PROC_Dummy, 0, 0), - OBJNAME("TagD2", PROC_Dummy, 1, 0), - OBJNAME("TagD3", PROC_Dummy, 2, 0), - OBJNAME("TagD4", PROC_Dummy, 3, 0), - OBJNAME("mp", PROC_MP, 255, 0), - OBJNAME("STBox", PROC_SALVAGE_TBOX, 255, 0), - OBJNAME("Fobj00", PROC_STANDITEM, 255, 0), - OBJNAME("Tama", PROC_TAMA, 255, 0), - OBJNAME("Agb", PROC_AGB, 255, 0), - OBJNAME("Bg", PROC_BG, 255, 0), - OBJNAME("Himo2", PROC_HIMO2, 255, 0), - OBJNAME("Esa", PROC_ESA, 255, 0), - OBJNAME("Boko", PROC_BOKO, 255, 0), - OBJNAME("Kantera", PROC_KANTERA, 255, 0), - OBJNAME("HShot", PROC_HOOKSHOT, 255, 0), - OBJNAME("Boom", PROC_BOOMERANG, 255, 0), - OBJNAME("Bomb", PROC_BOMB, 255, 0), - OBJNAME("Bomb2", PROC_Bomb2, 255, 0), - OBJNAME("Boko", PROC_BOKO, 255, 0), - OBJNAME("Arrow", PROC_ARROW, 255, 0), - OBJNAME("Arrow_i", PROC_ARROW_ICEEFF, 255, 0), - OBJNAME("Arrow_l", PROC_ARROW_LIGHTEFF, 255, 0), - OBJNAME("Grid", PROC_GRID, 255, 0), - OBJNAME("Kaji", PROC_Kaji, 255, 0), - OBJNAME("HFloor", PROC_Hot_Floor, 255, 0), - OBJNAME("Buoyr", PROC_Obj_Buoyrace, 255, 0), - OBJNAME("Ritem", PROC_RACEITEM, 255, 0), - OBJNAME("Sitem", PROC_ShopItem, 255, 0), - OBJNAME("Ditem", PROC_Demo_Item, 255, 0), - OBJNAME("Iball", PROC_Iball, 255, 0), - OBJNAME("Grass", PROC_GRASS, 255, 0), - OBJNAME("Vrbox", PROC_VRBOX, 255, 0), - OBJNAME("Vrbox2", PROC_VRBOX2, 255, 0), - OBJNAME("EndCode", PROC_PLAY_SCENE, 255, 0), +static dStage_objectNameInf l_objectName[] = { + OBJNAME("kusax1", fpcNm_GRASS_e, 255, 0), + OBJNAME("kusax7", fpcNm_GRASS_e, 255, 0), + OBJNAME("kusax21", fpcNm_GRASS_e, 255, 0), + OBJNAME("flower", fpcNm_GRASS_e, 255, 0), + OBJNAME("flwr7", fpcNm_GRASS_e, 255, 0), + OBJNAME("flwr17", fpcNm_GRASS_e, 255, 0), + OBJNAME("pflower", fpcNm_GRASS_e, 255, 0), + OBJNAME("pflwrx7", fpcNm_GRASS_e, 255, 0), + OBJNAME("swood", fpcNm_GRASS_e, 255, 0), + OBJNAME("swood3", fpcNm_GRASS_e, 255, 0), + OBJNAME("swood5", fpcNm_GRASS_e, 255, 0), + OBJNAME("woodb", fpcNm_Obj_Wood_e, 255, 0), + OBJNAME("woodbx", fpcNm_Obj_Wood_e, 255, 0), + OBJNAME("door10", fpcNm_DOOR10_e, 255, 0), + OBJNAME("door11", fpcNm_DOOR10_e, 255, 0), + OBJNAME("door20", fpcNm_DOOR10_e, 255, 0), + OBJNAME("door21", fpcNm_DOOR10_e, 255, 0), + OBJNAME("Zenshut", fpcNm_DOOR10_e, 255, 0), + OBJNAME("keyshut", fpcNm_DOOR10_e, 255, 0), + OBJNAME("K_Zshut", fpcNm_DOOR10_e, 255, 0), + OBJNAME("ATdoor", fpcNm_ATDOOR_e, 255, 0), + OBJNAME("Mori1", fpcNm_MDOOR_e, 255, 0), + OBJNAME("doorKD", fpcNm_KDDOOR_e, 255, 0), + OBJNAME("ZenshKD", fpcNm_KDDOOR_e, 255, 0), + OBJNAME("K_ZshKD", fpcNm_KDDOOR_e, 255, 0), + OBJNAME("doorSH", fpcNm_KDDOOR_e, 255, 0), + OBJNAME("doorSZ", fpcNm_KDDOOR_e, 255, 0), + OBJNAME("KNOB00", fpcNm_KNOB00_e, 255, 0), + OBJNAME("KNOB01", fpcNm_KNOB00_e, 255, 0), + OBJNAME("KNOB02", fpcNm_KNOB00_e, 255, 0), + OBJNAME("KNOB03", fpcNm_KNOB00_e, 255, 0), + OBJNAME("KNOB00D", fpcNm_KNOB00_e, 255, 0), + OBJNAME("KNOB01D", fpcNm_KNOB00_e, 255, 0), + OBJNAME("KNOB02D", fpcNm_KNOB00_e, 255, 0), + OBJNAME("KNOB03D", fpcNm_KNOB00_e, 255, 0), + OBJNAME("door12", fpcNm_DOOR12_e, 0, 0), + OBJNAME("door12M", fpcNm_DOOR12_e, 1, 0), + OBJNAME("door12B", fpcNm_DOOR12_e, 2, 0), + OBJNAME("door13", fpcNm_DOOR12_e, 3, 0), + OBJNAME("door13M", fpcNm_DOOR12_e, 4, 0), + OBJNAME("door13B", fpcNm_DOOR12_e, 5, 0), + OBJNAME("keyS12", fpcNm_DOOR12_e, 1, 0), + OBJNAME("ZenS12", fpcNm_DOOR12_e, 2, 0), + OBJNAME("bonbori", fpcNm_EP_e, 255, 0), + OBJNAME("SW_C00", fpcNm_SWC00_e, 255, 0), + OBJNAME("takara", fpcNm_TBOX_e, 255, 62), + OBJNAME("takara2", fpcNm_TBOX_e, 255, 62), + OBJNAME("takara3", fpcNm_TBOX_e, 255, 62), + OBJNAME("takara4", fpcNm_TBOX_e, 255, 62), + OBJNAME("takara5", fpcNm_TBOX_e, 255, 62), + OBJNAME("takara6", fpcNm_TBOX_e, 255, 62), + OBJNAME("takara7", fpcNm_TBOX_e, 255, 62), + OBJNAME("takara8", fpcNm_TBOX_e, 255, 62), + OBJNAME("takaraK", fpcNm_TBOX_e, 255, 62), + OBJNAME("takaraI", fpcNm_TBOX_e, 255, 62), + OBJNAME("takaraM", fpcNm_TBOX_e, 255, 62), + OBJNAME("tkrASw", fpcNm_TBOX_e, 255, 62), + OBJNAME("tkrAGc", fpcNm_TBOX_e, 255, 62), + OBJNAME("tkrAKd", fpcNm_TBOX_e, 255, 62), + OBJNAME("tkrAIk", fpcNm_TBOX_e, 255, 62), + OBJNAME("tkrBMs", fpcNm_TBOX_e, 255, 62), + OBJNAME("tkrCTf", fpcNm_TBOX_e, 255, 62), + OBJNAME("tkrAOc", fpcNm_TBOX_e, 255, 62), + OBJNAME("tkrAOs", fpcNm_TBOX_e, 255, 62), + OBJNAME("tkrSlv", fpcNm_SBOX_e, 255, 62), + OBJNAME("agbA", fpcNm_AGBSW0_e, 255, 0), + OBJNAME("agbAT", fpcNm_AGBSW0_e, 255, 0), + OBJNAME("agbA2", fpcNm_AGBSW0_e, 255, 0), + OBJNAME("agbF", fpcNm_AGBSW0_e, 255, 0), + OBJNAME("agbF2", fpcNm_AGBSW0_e, 255, 0), + OBJNAME("agbMARK", fpcNm_AGBSW0_e, 255, 0), + OBJNAME("agbMW", fpcNm_AGBSW0_e, 255, 0), + OBJNAME("agbCSW", fpcNm_AGBSW0_e, 255, 0), + OBJNAME("agbTBOX", fpcNm_AGBSW0_e, 255, 0), + OBJNAME("agbR", fpcNm_AGBSW0_e, 255, 0), + OBJNAME("agbB", fpcNm_AGBSW0_e, 255, 0), + OBJNAME("agbD", fpcNm_AGBSW0_e, 255, 0), + OBJNAME("agbFA", fpcNm_AGBSW0_e, 255, 0), + OBJNAME("NoneCam", fpcNm_CAMERA_e, 255, 0), + OBJNAME("NormCam", fpcNm_CAMERA_e, 255, 0), + OBJNAME("Link", fpcNm_PLAYER_e, 255, 0), + OBJNAME("kotubo", fpcNm_TSUBO_e, 0, 0), + OBJNAME("ootubo1", fpcNm_TSUBO_e, 1, 0), + OBJNAME("Kmtub", fpcNm_TSUBO_e, 2, 0), + OBJNAME("Ktaru", fpcNm_TSUBO_e, 3, 0), + OBJNAME("Ostool", fpcNm_TSUBO_e, 4, 0), + OBJNAME("Odokuro", fpcNm_TSUBO_e, 5, 0), + OBJNAME("Okioke", fpcNm_TSUBO_e, 6, 0), + OBJNAME("Kmi02", fpcNm_TSUBO_e, 7, 0), + OBJNAME("Ptubo", fpcNm_TSUBO_e, 8, 0), + OBJNAME("KkibaB", fpcNm_TSUBO_e, 9, 0), + OBJNAME("Kmi00", fpcNm_TSUBO_e, 10, 0), + OBJNAME("Hbox2S", fpcNm_TSUBO_e, 11, 0), + OBJNAME("SW_HIT0", fpcNm_SWHIT0_e, 255, 0), + OBJNAME("koisi1", fpcNm_STONE_e, 0, 0), + OBJNAME("koisi2", fpcNm_STONE_e, 1, 0), + OBJNAME("Aygr", fpcNm_Obj_Aygr_e, 255, 0), + OBJNAME("Salvage", fpcNm_Salvage_e, 255, 0), + OBJNAME("SwSlvg", fpcNm_Salvage_e, 255, 63), + OBJNAME("Salvag2", fpcNm_Salvage_e, 255, 63), + OBJNAME("SalvagN", fpcNm_Salvage_e, 255, 63), + OBJNAME("SalvagE", fpcNm_Salvage_e, 255, 63), + OBJNAME("SalvFM", fpcNm_Salvage_e, 255, 63), + OBJNAME("osiBLK0", fpcNm_Obj_Movebox_e, 0, 61), + OBJNAME("osiBLK1", fpcNm_Obj_Movebox_e, 1, 61), + OBJNAME("Kkiba", fpcNm_Obj_Movebox_e, 2, 61), + OBJNAME("Hseki2", fpcNm_Obj_Movebox_e, 3, 61), + OBJNAME("Hseki7", fpcNm_Obj_Movebox_e, 4, 61), + OBJNAME("Mmrr", fpcNm_Obj_Movebox_e, 5, 61), + OBJNAME("MkieBB", fpcNm_Obj_Movebox_e, 6, 61), + OBJNAME("Ecube", fpcNm_Obj_Movebox_e, 7, 61), + OBJNAME("Hjump1", fpcNm_Obj_Movebox_e, 8, 61), + OBJNAME("Hbox1", fpcNm_Obj_Movebox_e, 9, 61), + OBJNAME("MpwrB", fpcNm_Obj_Movebox_e, 10, 61), + OBJNAME("DBLK0", fpcNm_Obj_Movebox_e, 11, 61), + OBJNAME("DBLK1", fpcNm_Obj_Movebox_e, 12, 61), + OBJNAME("DKkiba", fpcNm_Obj_Movebox_e, 13, 61), + OBJNAME("Hbox2", fpcNm_Obj_Movebox_e, 14, 61), + OBJNAME("BLK_CR", fpcNm_Obj_Correct_e, 0, 0), + OBJNAME("CrTrS3", fpcNm_Obj_Correct_e, 1, 0), + OBJNAME("CrTrS4", fpcNm_Obj_Correct_e, 2, 0), + OBJNAME("CrTrS5", fpcNm_Obj_Correct_e, 3, 0), + OBJNAME("CrTrM1", fpcNm_Obj_Correct_e, 4, 0), + OBJNAME("CrTrM2", fpcNm_Obj_Correct_e, 5, 0), + OBJNAME("CrTrGr", fpcNm_Obj_Correct_e, 6, 61), + OBJNAME("CrTrBl", fpcNm_Obj_Correct_e, 7, 61), + OBJNAME("Kbota_A", fpcNm_Obj_Swpush_e, 0, 0), + OBJNAME("Kbota_B", fpcNm_Obj_Swpush_e, 1, 0), + OBJNAME("KbotaC", fpcNm_Obj_Swpush_e, 2, 0), + OBJNAME("Hhbot1", fpcNm_Obj_Swheavy_e, 0, 0), + OBJNAME("Hhbot1N", fpcNm_Obj_Swheavy_e, 1, 0), + OBJNAME("MhmrSW0", fpcNm_Obj_Swhammer_e, 255, 0), + OBJNAME("TagSo", fpcNm_TAG_SO_e, 0, 0), + OBJNAME("TagMSo", fpcNm_TAG_SO_e, 1, 0), + OBJNAME("PScnChg", fpcNm_TAG_GSHIP_e, 255, 0), + OBJNAME("ALLdie", fpcNm_ALLDIE_e, 255, 0), + OBJNAME("TagEv", fpcNm_TAG_EVENT_e, 255, 0), + OBJNAME("TagHt", fpcNm_TAG_HINT_e, 0, 0), + OBJNAME("TagHt2", fpcNm_TAG_HINT_e, 1, 0), + OBJNAME("TagMsg", fpcNm_TAG_MSG_e, 0, 0), + OBJNAME("TagMsg2", fpcNm_TAG_MSG_e, 1, 0), + OBJNAME("TagIsl", fpcNm_TAG_ISLAND_e, 0, 0), + OBJNAME("TagMd", fpcNm_TAG_ETC_e, 0, 0), + OBJNAME("TagKf1", fpcNm_TAG_KF1_e, 255, 0), + OBJNAME("TagKk1", fpcNm_TAG_KK1_e, 255, 0), + OBJNAME("TagKb", fpcNm_TAG_KB_ITEM_e, 255, 0), + OBJNAME("TagMk", fpcNm_TAG_MK_e, 0, 0), + OBJNAME("TagWp", fpcNm_TAG_MK_e, 1, 0), + OBJNAME("TagDM", fpcNm_TAG_MK_e, 2, 0), + OBJNAME("TagTy", fpcNm_TAG_MK_e, 3, 0), + OBJNAME("TagMd1", fpcNm_TAG_MDCB_e, 0, 0), + OBJNAME("TagCb1", fpcNm_TAG_MDCB_e, 1, 0), + OBJNAME("TagMd11", fpcNm_TAG_MDCB_e, 2, 0), + OBJNAME("TagMd12", fpcNm_TAG_MDCB_e, 3, 0), + OBJNAME("TagMd13", fpcNm_TAG_MDCB_e, 4, 0), + OBJNAME("TagMd14", fpcNm_TAG_MDCB_e, 5, 0), + OBJNAME("TagMd15", fpcNm_TAG_MDCB_e, 6, 0), + OBJNAME("TagMd16", fpcNm_TAG_MDCB_e, 7, 0), + OBJNAME("TagCb11", fpcNm_TAG_MDCB_e, 8, 0), + OBJNAME("TagCb12", fpcNm_TAG_MDCB_e, 9, 0), + OBJNAME("TagCb13", fpcNm_TAG_MDCB_e, 10, 0), + OBJNAME("TagCb14", fpcNm_TAG_MDCB_e, 11, 0), + OBJNAME("TagBa1", fpcNm_TAG_BA1_e, 1, 0), + OBJNAME("Evsw", fpcNm_TAG_EVSW_e, 255, 0), + OBJNAME("Search", fpcNm_OBJ_SEARCH_e, 255, 0), + OBJNAME("Otble", fpcNm_OBJ_OTBLE_e, 0, 0), + OBJNAME("OtbleL", fpcNm_OBJ_OTBLE_e, 1, 0), + OBJNAME("Warpt", fpcNm_OBJ_WARPT_e, 0, 49), + OBJNAME("Warpnt", fpcNm_OBJ_WARPT_e, 1, 49), + OBJNAME("Warpts1", fpcNm_OBJ_WARPT_e, 2, 49), + OBJNAME("Warpts2", fpcNm_OBJ_WARPT_e, 3, 49), + OBJNAME("Warpts3", fpcNm_OBJ_WARPT_e, 4, 49), + OBJNAME("Seatag", fpcNm_SEATAG_e, 255, 0), + OBJNAME("Warpf", fpcNm_WARPFLOWER_e, 255, 0), + OBJNAME("Hys", fpcNm_Hys_e, 255, 0), + OBJNAME("Hys2", fpcNm_Hys_e, 255, 0), + OBJNAME("Hsen1", fpcNm_FAN_e, 255, 0), + OBJNAME("Hsen2", fpcNm_FAN_e, 255, 0), + OBJNAME("Hsen3", fpcNm_FAN_e, 255, 0), + OBJNAME("Olift", fpcNm_LEAF_LIFT_e, 255, 0), + OBJNAME("Ylsic", fpcNm_ICE_LIFT_e, 255, 0), + OBJNAME("Yllic", fpcNm_ICE_LIFT_e, 255, 0), + OBJNAME("Ylkic", fpcNm_ICE_LIFT_e, 255, 0), + OBJNAME("Hpbot1", fpcNm_SW_PROPELLER_e, 255, 0), + OBJNAME("Vpbot", fpcNm_SW_PROPELLER_e, 255, 0), + OBJNAME("Hami1", fpcNm_AMI_PROP_e, 255, 0), + OBJNAME("HamiY", fpcNm_AMI_PROP_e, 255, 0), + OBJNAME("LTag0", fpcNm_Tag_Light_e, 0, 0), + OBJNAME("LTag1", fpcNm_Tag_Light_e, 1, 0), + OBJNAME("LTagR0", fpcNm_Tag_Light_e, 2, 0), + OBJNAME("AttTag", fpcNm_Tag_Attention_e, 0, 0), + OBJNAME("AttTagB", fpcNm_Tag_Attention_e, 1, 0), + OBJNAME("Ikori", fpcNm_Obj_Ice_e, 255, 0), + OBJNAME("MsuSW", fpcNm_Obj_Swlight_e, 0, 0), + OBJNAME("MsuSWB", fpcNm_Obj_Swlight_e, 1, 0), + OBJNAME("SWat00", fpcNm_SW_ATTACK_e, 255, 0), + OBJNAME("ITat00", fpcNm_SW_ITEM_e, 255, 0), + OBJNAME("SWtact", fpcNm_SW_TACT_e, 255, 0), + OBJNAME("SWtactB", fpcNm_SW_TACT_e, 255, 0), + OBJNAME("Hhyu1", fpcNm_FLOOR_e, 255, 0), + OBJNAME("Oyashi", fpcNm_Obj_Lpalm_e, 255, 0), + OBJNAME("Kanban", fpcNm_KANBAN_e, 255, 52), + OBJNAME("kt", fpcNm_KT_e, 255, 0), + OBJNAME("ho", fpcNm_FF_e, 255, 0), + OBJNAME("mo2", fpcNm_MO2_e, 255, 2), + OBJNAME("moZOU", fpcNm_MOZO_e, 255, 0), + OBJNAME("hotest", fpcNm_RECTANGLE_e, 255, 0), + OBJNAME("Kui", fpcNm_KUI_e, 255, 0), + OBJNAME("Kamome", fpcNm_KAMOME_e, 255, 0), + OBJNAME("item", fpcNm_ITEM_e, 255, 0), + OBJNAME("itemFLY", fpcNm_ITEM_e, 255, 0), + OBJNAME("itemDek", fpcNm_DEKU_ITEM_e, 255, 0), + OBJNAME("Ship", fpcNm_SHIP_e, 255, 0), + OBJNAME("AND_SW0", fpcNm_ANDSW0_e, 255, 0), + OBJNAME("AND_SW2", fpcNm_ANDSW2_e, 255, 0), + OBJNAME("Bb", fpcNm_BB_e, 255, 26), + OBJNAME("Ebrock", fpcNm_Stone2_e, 0, 0), + OBJNAME("Ekao", fpcNm_Stone2_e, 1, 0), + OBJNAME("Ebrock2", fpcNm_Stone2_e, 2, 0), + OBJNAME("ky_tag0", fpcNm_KYTAG00_e, 255, 0), + OBJNAME("kytag00", fpcNm_KYTAG00_e, 255, 0), + OBJNAME("ky00you", fpcNm_KYTAG00_e, 255, 0), + OBJNAME("ky_tag1", fpcNm_KYTAG01_e, 255, 0), + OBJNAME("ky_tag2", fpcNm_KYTAG02_e, 255, 0), + OBJNAME("ky_tag3", fpcNm_KYTAG03_e, 255, 0), + OBJNAME("kytag4", fpcNm_KYTAG04_e, 255, 0), + OBJNAME("kytag5", fpcNm_KYTAG05_e, 255, 0), + OBJNAME("kytag6", fpcNm_KYTAG06_e, 255, 0), + OBJNAME("kytag7", fpcNm_KYTAG07_e, 255, 0), + OBJNAME("sea", fpcNm_SEA_e, 255, 0), + OBJNAME("nezumi", fpcNm_NZ_e, 255, 24), + OBJNAME("nezuana", fpcNm_NZG_e, 255, 0), + OBJNAME("kani", fpcNm_KN_e, 255, 0), + OBJNAME("Demo_Dk", fpcNm_DEMO_DK_e, 255, 0), + OBJNAME("DmKmm", fpcNm_DEMO_KMM_e, 0, 0), + OBJNAME("DmKmm2", fpcNm_DEMO_KMM_e, 1, 0), + OBJNAME("amos", fpcNm_AM_e, 255, 12), + OBJNAME("amos2", fpcNm_AM2_e, 255, 11), + OBJNAME("gmos", fpcNm_GM_e, 255, 9), + OBJNAME("gmos_g", fpcNm_GM_e, 255, 9), + OBJNAME("gmos_f", fpcNm_GM_e, 255, 9), + OBJNAME("kuro_s", fpcNm_KS_e, 255, 20), + OBJNAME("kuro_t", fpcNm_KS_e, 255, 0), + OBJNAME("c_green", fpcNm_CC_e, 255, 22), + OBJNAME("c_red", fpcNm_CC_e, 255, 21), + OBJNAME("c_blue", fpcNm_CC_e, 255, 30), + OBJNAME("c_black", fpcNm_CC_e, 255, 16), + OBJNAME("c_kiiro", fpcNm_CC_e, 255, 10), + OBJNAME("bable", fpcNm_BL_e, 255, 15), + OBJNAME("bable_r", fpcNm_BL_e, 255, 14), + OBJNAME("wiz_r", fpcNm_WZ_e, 255, 17), + OBJNAME("wiz_s", fpcNm_WZ_e, 255, 17), + OBJNAME("wiz_m", fpcNm_WZ_e, 255, 17), + OBJNAME("wiz_o", fpcNm_WZ_e, 255, 17), + OBJNAME("p_hat", fpcNm_PH_e, 255, 8), + OBJNAME("p_zelda", fpcNm_PZ_e, 255, 60), + OBJNAME("big_pow", fpcNm_BPW_e, 255, 0), + OBJNAME("pow", fpcNm_PW_e, 255, 13), + OBJNAME("sea_hat", fpcNm_PH_e, 255, 31), + OBJNAME("jbaba", fpcNm_JBO_e, 255, 33), + OBJNAME("bbaba", fpcNm_BO_e, 255, 7), + OBJNAME("bridge", fpcNm_BRIDGE_e, 255, 0), + OBJNAME("dragon", fpcNm_DR_e, 255, 0), + OBJNAME("Nh", fpcNm_NH_e, 255, 0), + OBJNAME("NpcSo", fpcNm_NPC_SO_e, 255, 0), + OBJNAME("NpcNz", fpcNm_NPC_NZ_e, 255, 0), + OBJNAME("Os", fpcNm_NPC_OS_e, 0, 0), + OBJNAME("Os1", fpcNm_NPC_OS_e, 1, 0), + OBJNAME("Os2", fpcNm_NPC_OS_e, 2, 0), + OBJNAME("Ym1", fpcNm_NPC_YM1_e, 255, 59), + OBJNAME("Ym2", fpcNm_NPC_YM2_e, 255, 59), + OBJNAME("Yw1", fpcNm_NPC_YW1_e, 255, 60), + OBJNAME("Ji1", fpcNm_NPC_JI1_e, 255, 59), + OBJNAME("Ko1", fpcNm_NPC_KO1_e, 255, 59), + OBJNAME("Ko2", fpcNm_NPC_KO2_e, 255, 59), + OBJNAME("Ls1", fpcNm_NPC_LS1_e, 255, 60), + OBJNAME("Bm1", fpcNm_NPC_BM1_e, 255, 59), + OBJNAME("Bm2", fpcNm_NPC_BM2_e, 255, 59), + OBJNAME("Bm3", fpcNm_NPC_BM3_e, 255, 59), + OBJNAME("Bm4", fpcNm_NPC_BM4_e, 255, 59), + OBJNAME("Bm5", fpcNm_NPC_BM5_e, 255, 59), + OBJNAME("Bmcon1", fpcNm_NPC_BMCON1_e, 0, 0), + OBJNAME("Bmcon2", fpcNm_NPC_BMCON1_e, 1, 0), + OBJNAME("Bmsw", fpcNm_NPC_BMSW_e, 255, 0), + OBJNAME("Btsw", fpcNm_NPC_BTSW_e, 255, 0), + OBJNAME("Btsw2", fpcNm_NPC_BTSW2_e, 255, DEMO_SELECT(0, 59)), + OBJNAME("Zk1", fpcNm_NPC_ZK1_e, 255, 59), + OBJNAME("Zl1", fpcNm_NPC_ZL1_e, 255, 60), + OBJNAME("Ob1", fpcNm_NPC_OB1_e, 255, 60), + OBJNAME("Aj1", fpcNm_NPC_AJ1_e, 255, 59), + OBJNAME("Km1", fpcNm_NPC_KM1_e, 255, 60), + OBJNAME("Cb1", fpcNm_NPC_CB1_e, 255, 59), + OBJNAME("Ba1", fpcNm_NPC_BA1_e, 255, 60), + OBJNAME("Bj1", fpcNm_NPC_BJ1_e, 255, 59), + OBJNAME("Bj2", fpcNm_NPC_BJ2_e, 255, 59), + OBJNAME("Bj3", fpcNm_NPC_BJ3_e, 255, 59), + OBJNAME("Bj4", fpcNm_NPC_BJ4_e, 255, 59), + OBJNAME("Bj5", fpcNm_NPC_BJ5_e, 255, 59), + OBJNAME("Bj6", fpcNm_NPC_BJ6_e, 255, 59), + OBJNAME("Bj7", fpcNm_NPC_BJ7_e, 255, 59), + OBJNAME("Bj8", fpcNm_NPC_BJ8_e, 255, 59), + OBJNAME("Bj9", fpcNm_NPC_BJ9_e, 255, 59), + OBJNAME("Bs1", fpcNm_NPC_BS1_e, 0, 59), + OBJNAME("Bs2", fpcNm_NPC_BS1_e, 1, 0), + OBJNAME("Bms1", fpcNm_NPC_BMS1_e, 0, 0), + OBJNAME("Bms2", fpcNm_NPC_BMS1_e, 1, 0), + OBJNAME("Ds1", fpcNm_NPC_DS1_e, 255, 59), + OBJNAME("Rsh1", fpcNm_NPC_RSH1_e, 255, 59), + OBJNAME("Kk1", fpcNm_NPC_KK1_e, 255, 60), + OBJNAME("Pm1", fpcNm_NPC_PM1_e, 255, 60), + OBJNAME("Kp1", fpcNm_NPC_KP1_e, 255, 60), + OBJNAME("Pf1", fpcNm_NPC_PF1_e, 255, 59), + OBJNAME("Gp1", fpcNm_NPC_GP1_e, 255, 59), + OBJNAME("Jb1", fpcNm_NPC_JB1_e, 255, 0), + OBJNAME("Kf1", fpcNm_NPC_KF1_e, 255, 59), + OBJNAME("De1", fpcNm_NPC_DE1_e, 255, 59), + OBJNAME("Sfairy", fpcNm_NPC_FA1_e, 255, 0), + OBJNAME("Md1", fpcNm_NPC_MD_e, 255, 60), + OBJNAME("Uo1", fpcNm_NPC_PEOPLE_e, 0, 59), + OBJNAME("Uo2", fpcNm_NPC_PEOPLE_e, 1, 59), + OBJNAME("Uo3", fpcNm_NPC_PEOPLE_e, 2, 59), + OBJNAME("Ub1", fpcNm_NPC_PEOPLE_e, 3, 0), + OBJNAME("Ub2", fpcNm_NPC_PEOPLE_e, 4, 0), + OBJNAME("Ub3", fpcNm_NPC_PEOPLE_e, 5, 0), + OBJNAME("Ub4", fpcNm_NPC_PEOPLE_e, 6, 0), + OBJNAME("Uw1", fpcNm_NPC_PEOPLE_e, 7, 0), + OBJNAME("Uw2", fpcNm_NPC_PEOPLE_e, 8, 0), + OBJNAME("Um1", fpcNm_NPC_PEOPLE_e, 9, 0), + OBJNAME("Um2", fpcNm_NPC_PEOPLE_e, 10, 0), + OBJNAME("Um3", fpcNm_NPC_PEOPLE_e, 11, 0), + OBJNAME("Sa1", fpcNm_NPC_PEOPLE_e, 12, 0), + OBJNAME("Sa2", fpcNm_NPC_PEOPLE_e, 13, 0), + OBJNAME("Sa3", fpcNm_NPC_PEOPLE_e, 14, 0), + OBJNAME("Sa4", fpcNm_NPC_PEOPLE_e, 15, 0), + OBJNAME("Sa5", fpcNm_NPC_PEOPLE_e, 16, 0), + OBJNAME("Ug1", fpcNm_NPC_PEOPLE_e, 17, 0), + OBJNAME("Ug2", fpcNm_NPC_PEOPLE_e, 18, 0), + OBJNAME("Gk1", fpcNm_NPC_GK1_e, 255, 59), + OBJNAME("Ac1", fpcNm_NPC_AC1_e, 255, 59), + OBJNAME("Hi1", fpcNm_NPC_HI1_e, 255, 59), + OBJNAME("Pirates", fpcNm_Obj_Pirateship_e, 255, 0), + OBJNAME("keeth", fpcNm_KI_e, 255, 23), + OBJNAME("Fkeeth", fpcNm_KI_e, 255, 6), + OBJNAME("yg_awa", fpcNm_YOUGAN_e, 255, 0), + OBJNAME("magtail", fpcNm_MT_e, 255, 5), + OBJNAME("RopeR", fpcNm_HIMO3_e, 255, 0), + OBJNAME("Ktarur", fpcNm_Obj_Barrel2_e, 255, 61), + OBJNAME("Ktarux", fpcNm_Obj_Barrel_e, 255, 0), + OBJNAME("Magrock", fpcNm_Obj_Magmarock_e, 255, 0), + OBJNAME("Quake", fpcNm_Obj_Quake_e, 255, 0), + OBJNAME("Yfire00", fpcNm_Obj_Flame_e, 255, 0), + OBJNAME("Turu", fpcNm_SK_e, 0, 0), + OBJNAME("Turu2", fpcNm_SK2_e, 0, 0), + OBJNAME("Turu3", fpcNm_SK2_e, 1, 0), + OBJNAME("Kanat", fpcNm_Obj_Kanat_e, 255, 0), + OBJNAME("s_turu", fpcNm_SSK_e, 255, 0), + OBJNAME("spotbox", fpcNm_SPOTBOX_e, 255, 0), + OBJNAME("Ksaku", fpcNm_SAKU_e, 255, 0), + OBJNAME("spotbx1", fpcNm_SPOTBOX_e, 255, 0), + OBJNAME("Mswing", fpcNm_MSW_e, 255, 0), + OBJNAME("Pig", fpcNm_KB_e, 255, 0), + OBJNAME("Rdead1", fpcNm_RD_e, 0, 18), + OBJNAME("Rdead2", fpcNm_RD_e, 1, 18), + OBJNAME("Fmaster", fpcNm_FM_e, 0, 25), + OBJNAME("Fmastr1", fpcNm_FM_e, 1, 25), + OBJNAME("Fmastr2", fpcNm_FM_e, 2, 25), + OBJNAME("Daiocta", fpcNm_DAIOCTA_e, 255, 28), + OBJNAME("Daioeye", fpcNm_DAIOCTA_EYE_e, 255, 0), + OBJNAME("Oq", fpcNm_OQ_e, 0, 27), + OBJNAME("Oqw", fpcNm_OQ_e, 1, 65), + OBJNAME("Gy", fpcNm_GY_e, 255, 29), + OBJNAME("GyCtrl", fpcNm_GY_CTRL_e, 255, 0), + OBJNAME("GyCtrlB", fpcNm_GY_CTRLB_e, 255, 0), + OBJNAME("Bk", fpcNm_BK_e, 255, 1), + OBJNAME("Ypit00", fpcNm_OBJ_HOLE_e, 0, 0), + OBJNAME("Pitfall", fpcNm_OBJ_HOLE_e, 1, 0), + OBJNAME("Nzfall", fpcNm_OBJ_PFALL_e, 255, 0), + OBJNAME("ScnChg", fpcNm_SCENECHG_e, 255, 0), + OBJNAME("Oship", fpcNm_OSHIP_e, 255, 56), + OBJNAME("Ayush", fpcNm_AYUSH_e, 255, 57), + OBJNAME("Tpost", fpcNm_OBJ_TORIPOST_e, 255, 53), + OBJNAME("Ocanon", fpcNm_OBJ_CANON_e, 255, 0), + OBJNAME("Ikada", fpcNm_OBJ_IKADA_e, 0, 61), + OBJNAME("ikada_h", fpcNm_OBJ_IKADA_e, 1, 61), + OBJNAME("ikadaS", fpcNm_OBJ_IKADA_e, 2, 61), + OBJNAME("ikada_u", fpcNm_OBJ_IKADA_e, 3, 61), + OBJNAME("Svsp", fpcNm_OBJ_IKADA_e, 4, 61), + OBJNAME("Sv0", fpcNm_NPC_SV_e, 0, 0), + OBJNAME("Sv1", fpcNm_NPC_SV_e, 1, 0), + OBJNAME("Sv2", fpcNm_NPC_SV_e, 2, 0), + OBJNAME("Sv3", fpcNm_NPC_SV_e, 3, 0), + OBJNAME("MjDoor", fpcNm_OBJ_MJDOOR_e, 255, 0), + OBJNAME("Ikari", fpcNm_IKARI_e, 255, 0), + OBJNAME("MjFlag", fpcNm_MAJUU_FLAG_e, 0, 0), + OBJNAME("MtFlag", fpcNm_MAJUU_FLAG_e, 1, 0), + OBJNAME("HcFlag", fpcNm_MAJUU_FLAG_e, 3, 0), + OBJNAME("TrFlag", fpcNm_Tori_Flag_e, 0, 0), + OBJNAME("SieFlag", fpcNm_Sie_Flag_e, 0, 0), + OBJNAME("lwood", fpcNm_Lwood_e, 255, 0), + OBJNAME("Ktaruo", fpcNm_Obj_Demo_Barrel_e, 255, 0), + OBJNAME("Touseki", fpcNm_Obj_Tousekiki_e, 255, 0), + OBJNAME("frock", fpcNm_TagRock_e, 255, 0), + OBJNAME("fallrck", fpcNm_FallRock_e, 255, 0), + OBJNAME("Dr2", fpcNm_DR2_e, 255, 0), + OBJNAME("Mkdan1", fpcNm_Obj_Stair_e, 255, 0), + OBJNAME("Btd", fpcNm_BTD_e, 255, 0), + OBJNAME("Dk", fpcNm_DK_e, 255, 0), + OBJNAME("Ystm0", fpcNm_SteamTag_e, 255, 0), + OBJNAME("Ystm1", fpcNm_SteamTag_e, 255, 0), + OBJNAME("Gflag", fpcNm_Goal_Flag_e, 255, 0), + OBJNAME("Branch", fpcNm_BRANCH_e, 255, 0), + OBJNAME("P1a", fpcNm_NPC_P1_e, 0, 59), + OBJNAME("P1b", fpcNm_NPC_P1_e, 1, 59), + OBJNAME("P1c", fpcNm_NPC_P1_e, 2, 59), + OBJNAME("P2a", fpcNm_NPC_P2_e, 0, 59), + OBJNAME("P2b", fpcNm_NPC_P2_e, 1, 59), + OBJNAME("P2c", fpcNm_NPC_P2_e, 2, 59), + OBJNAME("Tc", fpcNm_NPC_TC_e, 255, 59), + OBJNAME("Throck", fpcNm_THROWSTONE_e, 255, 0), + OBJNAME("magma", fpcNm_MAGMA_e, 255, 0), + OBJNAME("Bita", fpcNm_BITA_e, 255, 0), + OBJNAME("YkgrON", fpcNm_Ykgr_e, 255, 0), + OBJNAME("YkgrOFF", fpcNm_Ykgr_e, 255, 0), + OBJNAME("Dsaku", fpcNm_SAKU_e, 255, 0), + OBJNAME("Otana", fpcNm_Obj_Shelf_e, 0, 0), + OBJNAME("OtanaG", fpcNm_Obj_Shelf_e, 1, 0), + OBJNAME("Bdk", fpcNm_BDK_e, 255, 0), + OBJNAME("Bdkobj", fpcNm_BDKOBJ_e, 255, 0), + OBJNAME("SWTdoor", fpcNm_SWTDOOR_e, 255, 0), + OBJNAME("Canon", fpcNm_Canon_e, 255, 0), + OBJNAME("GBoard", fpcNm_MGBOARD_e, 255, 0), + OBJNAME("Hlift", fpcNm_Obj_Hlift_e, 0, 0), + OBJNAME("Hliftb", fpcNm_Obj_Hlift_e, 1, 0), + OBJNAME("Hami2", fpcNm_Obj_Hami2_e, 255, 0), + OBJNAME("Hami3", fpcNm_Obj_Hami3_e, 255, 0), + OBJNAME("Hami4", fpcNm_Obj_Hami4_e, 255, 0), + OBJNAME("Hbrf1", fpcNm_Obj_Hbrf1_e, 255, 0), + OBJNAME("Mflft", fpcNm_MFLFT_e, 255, 0), + OBJNAME("ObjTime", fpcNm_Obj_Timer_e, 255, 0), + OBJNAME("Klft", fpcNm_KLFT_e, 255, 0), + OBJNAME("Kita", fpcNm_KITA_e, 255, 0), + OBJNAME("Humi0z", fpcNm_Obj_Tide_e, 0, 0), + OBJNAME("Humi4z", fpcNm_Obj_Tide_e, 1, 0), + OBJNAME("Humi5z", fpcNm_Obj_Tide_e, 2, 0), + OBJNAME("Tide3", fpcNm_Obj_Tide_e, 3, 0), + OBJNAME("Humi2z", fpcNm_Obj_Tide_e, 4, 0), + OBJNAME("Humi3z", fpcNm_Obj_Tide_e, 5, 0), + OBJNAME("WLvTag", fpcNm_Tag_Waterlevel_e, 255, 0), + OBJNAME("Fire", fpcNm_Fire_e, 255, 0), + OBJNAME("Zenfire", fpcNm_Fire_e, 255, 0), + OBJNAME("Kokiie", fpcNm_KOKIIE_e, 255, 0), + OBJNAME("Paper", fpcNm_Obj_Paper_e, 0, 0), + OBJNAME("Ppos", fpcNm_Obj_Paper_e, 1, 0), + OBJNAME("Piwa", fpcNm_Obj_Paper_e, 2, 54), + OBJNAME("Ss", fpcNm_SS_e, 255, 0), + OBJNAME("WindTag", fpcNm_WindTag_e, 255, 0), + OBJNAME("Kryu00", fpcNm_Obj_Drift_e, 255, 0), + OBJNAME("Mcube", fpcNm_Obj_Mtest_e, 0, 0), + OBJNAME("Mcyln", fpcNm_Obj_Mtest_e, 1, 0), + OBJNAME("Mcube10", fpcNm_Obj_Mtest_e, 2, 0), + OBJNAME("Mcyln10", fpcNm_Obj_Mtest_e, 3, 0), + OBJNAME("MwtrSB", fpcNm_Obj_Mtest_e, 4, 0), + OBJNAME("MygnSB", fpcNm_Obj_Mtest_e, 5, 0), + OBJNAME("Owater", fpcNm_Obj_Mtest_e, 6, 0), + OBJNAME("Astop", fpcNm_Obj_Mtest_e, 7, 0), + OBJNAME("Ojtree", fpcNm_Obj_Ojtree_e, 255, 0), + OBJNAME("Ospbox", fpcNm_Obj_Ospbox_e, 255, 0), + OBJNAME("Hmlif", fpcNm_Hmlif_e, 255, 61), + OBJNAME("Ywarp00", fpcNm_WARPLIGHT_e, 255, 0), + OBJNAME("Ysdls00", fpcNm_WARPLIGHT_e, 255, 0), + OBJNAME("Yswtr00", fpcNm_WATERFALL_e, 255, 0), + OBJNAME("Gbrg00", fpcNm_LIGHTBRIDGE_e, 255, 0), + OBJNAME("Mhsg6", fpcNm_Obj_Ladder_e, 0, 0), + OBJNAME("Mhsg9", fpcNm_Obj_Ladder_e, 1, 0), + OBJNAME("Mhsg12", fpcNm_Obj_Ladder_e, 2, 0), + OBJNAME("Mhsg15", fpcNm_Obj_Ladder_e, 3, 0), + OBJNAME("Mhsg4h", fpcNm_Obj_Ladder_e, 4, 0), + OBJNAME("Sss", fpcNm_SSS_e, 255, 0), + OBJNAME("Wall", fpcNm_WALL_e, 255, 0), + OBJNAME("Blift", fpcNm_Balancelift_e, 255, 0), + OBJNAME("MtoriSU", fpcNm_Obj_Nest_e, 255, 0), + OBJNAME("Lamp", fpcNm_LAMP_e, 255, 0), + OBJNAME("Sitem", fpcNm_SITEM_e, 255, 0), + OBJNAME("Hmos1", fpcNm_Bemos_e, 0, 35), + OBJNAME("Hmos2", fpcNm_Bemos_e, 1, 35), + OBJNAME("Hmos3", fpcNm_Bemos_e, 2, 35), + OBJNAME("Ylesr00", fpcNm_Beam_e, 255, 0), + OBJNAME("Hseki1", fpcNm_Obj_Try_e, 0, 61), + OBJNAME("Hseki6", fpcNm_Obj_Try_e, 1, 61), + OBJNAME("Hseki3", fpcNm_Obj_Try_e, 2, 61), + OBJNAME("Hseki4", fpcNm_Obj_Try_e, 3, 61), + OBJNAME("Hseki5", fpcNm_Obj_Try_e, 4, 61), + OBJNAME("Hmon1", fpcNm_Obj_Try_e, 5, 61), + OBJNAME("Hmon1d", fpcNm_Obj_Try_e, 6, 61), + OBJNAME("Hmon2", fpcNm_Obj_Try_e, 7, 61), + OBJNAME("Hmon2d", fpcNm_Obj_Try_e, 8, 61), + OBJNAME("Hseki31", fpcNm_Obj_Try_e, 9, 61), + OBJNAME("Hseki41", fpcNm_Obj_Try_e, 10, 61), + OBJNAME("Hseki51", fpcNm_Obj_Try_e, 11, 61), + OBJNAME("Hseki32", fpcNm_Obj_Try_e, 12, 61), + OBJNAME("Hseki42", fpcNm_Obj_Try_e, 13, 61), + OBJNAME("Hseki52", fpcNm_Obj_Try_e, 14, 61), + OBJNAME("Com_A", fpcNm_Obj_Coming_e, 255, 0), + OBJNAME("WBird", fpcNm_WBIRD_e, 255, 0), + OBJNAME("SMtoge", fpcNm_MTOGE_e, 255, 0), + OBJNAME("SMBdor", fpcNm_MBDOOR_e, 0, 0), + OBJNAME("KGBdor", fpcNm_MBDOOR_e, 1, 0), + OBJNAME("BFlower", fpcNm_BOMB_FLOWER_e, 255, 0), + OBJNAME("VbakH", fpcNm_BOMB_FLOWER_e, 255, 0), + OBJNAME("VigaH", fpcNm_ACORN_LEAF_e, 255, 0), + OBJNAME("Stal", fpcNm_ST_e, 255, 4), + OBJNAME("MkieBA", fpcNm_Obj_Mkie_e, 0, 61), + OBJNAME("MkieBAB", fpcNm_Obj_Mkie_e, 1, 61), + OBJNAME("MkieK", fpcNm_Obj_Mkiek_e, 255, 0), + OBJNAME("MknjD", fpcNm_Obj_MknjD_e, 255, 0), + OBJNAME("Msdan", fpcNm_Obj_Msdan_e, 255, 0), + OBJNAME("MsdanSb", fpcNm_Obj_MsdanSub_e, 255, 0), + OBJNAME("Msdan2", fpcNm_Obj_Msdan2_e, 255, 0), + OBJNAME("MsdanS2", fpcNm_Obj_MsdanSub2_e, 255, 0), + OBJNAME("Htobi1", fpcNm_SHUTTER_e, 255, 0), + OBJNAME("Htobi2", fpcNm_SHUTTER_e, 255, 0), + OBJNAME("Htobi3", fpcNm_SHUTTER2_e, 255, 0), + OBJNAME("Hfbot1A", fpcNm_Obj_Swflat_e, 0, 0), + OBJNAME("Hfbot1B", fpcNm_Obj_Swflat_e, 1, 0), + OBJNAME("Hfbot1C", fpcNm_Obj_Swflat_e, 2, 0), + OBJNAME("Ykzyg", fpcNm_Obj_Volcano_e, 255, 0), + OBJNAME("GiceL", fpcNm_Obj_Iceisland_e, 255, 0), + OBJNAME("Qdghd", fpcNm_Obj_Dragonhead_e, 255, 0), + OBJNAME("dmgroom", fpcNm_Obj_Dmgroom_e, 255, 0), + OBJNAME("Doguu", fpcNm_Obj_Doguu_e, 0, 0), + OBJNAME("MegamiD", fpcNm_Obj_Doguu_e, 1, 0), + OBJNAME("MegamiF", fpcNm_Obj_Doguu_e, 2, 0), + OBJNAME("MegamiN", fpcNm_Obj_Doguu_e, 3, 0), + OBJNAME("DoguuD", fpcNm_Obj_DoguuD_e, 255, 0), + OBJNAME("ReTag0", fpcNm_Tag_Ret_e, 255, 0), + OBJNAME("VolTag", fpcNm_Tag_Volcano_e, 255, 0), + OBJNAME("Auc7", fpcNm_NPC_AUCTION_e, 0, 0), + OBJNAME("Auc1", fpcNm_NPC_AUCTION_e, 1, 0), + OBJNAME("Auc2", fpcNm_NPC_AUCTION_e, 2, 0), + OBJNAME("Auc3", fpcNm_NPC_AUCTION_e, 3, 0), + OBJNAME("Auc4", fpcNm_NPC_AUCTION_e, 4, 0), + OBJNAME("Auc5", fpcNm_NPC_AUCTION_e, 5, 0), + OBJNAME("Auc6", fpcNm_NPC_AUCTION_e, 6, 0), + OBJNAME("Auc0", fpcNm_NPC_AUCTION_e, 7, 59), + OBJNAME("RotenA", fpcNm_NPC_ROTEN_e, 0, 59), + OBJNAME("RotenB", fpcNm_NPC_ROTEN_e, 1, 59), + OBJNAME("RotenC", fpcNm_NPC_ROTEN_e, 2, 59), + OBJNAME("Tn", fpcNm_TN_e, 255, 3), + OBJNAME("Fdai", fpcNm_DAI_e, 255, 0), + OBJNAME("Ytrnd00", fpcNm_TORNADO_e, 255, 58), + OBJNAME("Plant", fpcNm_Obj_Plant_e, 255, 0), + OBJNAME("Rflw", fpcNm_Obj_Rflw_e, 255, 0), + OBJNAME("Table", fpcNm_Obj_Table_e, 255, 0), + OBJNAME("Gtaki", fpcNm_Obj_Gtaki_e, 255, 0), + OBJNAME("Tenmado", fpcNm_Obj_Tenmado_e, 255, 0), + OBJNAME("X_tower", fpcNm_Obj_Tower_e, 255, 0), + OBJNAME("Eskban", fpcNm_Obj_Eskban_e, 255, 0), + OBJNAME("Ekskz", fpcNm_Obj_Ekskz_e, 255, 0), + OBJNAME("Pbka", fpcNm_Obj_Pbka_e, 255, 0), + OBJNAME("Yboil00", fpcNm_Obj_Yboil_e, 255, 0), + OBJNAME("Cafelmp", fpcNm_Obj_Cafelmp_e, 255, 0), + OBJNAME("MKanoke", fpcNm_Obj_Kanoke_e, 0, 61), + OBJNAME("MKanok2", fpcNm_Obj_Kanoke_e, 1, 61), + OBJNAME("Kg1", fpcNm_NPC_KG1_e, 255, 59), + OBJNAME("Kg2", fpcNm_NPC_KG2_e, 255, 0), + OBJNAME("Tt", fpcNm_NPC_TT_e, 255, 59), + OBJNAME("Hr", fpcNm_NPC_HR_e, 0, 0), + OBJNAME("Hr2", fpcNm_NPC_HR_e, 1, 0), + OBJNAME("BigElf", fpcNm_BIGELF_e, 0, 0), + OBJNAME("Ho", fpcNm_NPC_HO_e, 0, 0), + OBJNAME("Gkai00", fpcNm_LIGHTSTAIR_e, 255, 0), + OBJNAME("Mk", fpcNm_NPC_MK_e, 0, 59), + OBJNAME("UkB", fpcNm_NPC_UK_e, 1, 59), + OBJNAME("UkC", fpcNm_NPC_UK_e, 2, 59), + OBJNAME("UkD", fpcNm_NPC_UK_e, 3, 59), + OBJNAME("Mk2", fpcNm_NPC_MK_e, 4, 0), + OBJNAME("UkB2", fpcNm_NPC_UK_e, 5, 0), + OBJNAME("UkC2", fpcNm_NPC_UK_e, 6, 0), + OBJNAME("UkD2", fpcNm_NPC_UK_e, 7, 0), + OBJNAME("Co1", fpcNm_NPC_CO1_e, 255, 59), + OBJNAME("Mt", fpcNm_NPC_MT_e, 255, 0), + OBJNAME("Mn", fpcNm_NPC_MN_e, 255, DEMO_SELECT(0, 59)), + OBJNAME("Ah", fpcNm_NPC_AH_e, 255, 0), + OBJNAME("Hyuf1", fpcNm_Hmlif_e, 255, 61), + OBJNAME("Hyuf2", fpcNm_Hmlif_e, 255, 61), + OBJNAME("Hdai1", fpcNm_PEDESTAL_e, 0, 61), + OBJNAME("Hdai2", fpcNm_PEDESTAL_e, 1, 61), + OBJNAME("Hdai3", fpcNm_PEDESTAL_e, 2, 61), + OBJNAME("Auction", fpcNm_AUCTION_e, 255, 0), + OBJNAME("Auzu", fpcNm_Obj_Auzu_e, 255, 58), + OBJNAME("Hpu1", fpcNm_WINDMILL_e, 255, 0), + OBJNAME("Hpu2", fpcNm_WINDMILL_e, 255, 0), + OBJNAME("Hkikai1", fpcNm_MACHINE_e, 255, 0), + OBJNAME("Ybgaf00", fpcNm_WindTag_e, 255, 0), + OBJNAME("LOD01", fpcNm_LODBG_e, 255, 0), + OBJNAME("LOD02", fpcNm_LODBG_e, 255, 0), + OBJNAME("LOD03", fpcNm_LODBG_e, 255, 0), + OBJNAME("LOD04", fpcNm_LODBG_e, 255, 0), + OBJNAME("LOD05", fpcNm_LODBG_e, 255, 0), + OBJNAME("LOD06", fpcNm_LODBG_e, 255, 0), + OBJNAME("LOD07", fpcNm_LODBG_e, 255, 0), + OBJNAME("LOD08", fpcNm_LODBG_e, 255, 0), + OBJNAME("LOD09", fpcNm_LODBG_e, 255, 0), + OBJNAME("LOD10", fpcNm_LODBG_e, 255, 0), + OBJNAME("LOD11", fpcNm_LODBG_e, 255, 0), + OBJNAME("LOD12", fpcNm_LODBG_e, 255, 0), + OBJNAME("LOD13", fpcNm_LODBG_e, 255, 0), + OBJNAME("LOD14", fpcNm_LODBG_e, 255, 0), + OBJNAME("LOD15", fpcNm_LODBG_e, 255, 0), + OBJNAME("LOD16", fpcNm_LODBG_e, 255, 0), + OBJNAME("LOD17", fpcNm_LODBG_e, 255, 0), + OBJNAME("LOD18", fpcNm_LODBG_e, 255, 0), + OBJNAME("LOD19", fpcNm_LODBG_e, 255, 0), + OBJNAME("LOD20", fpcNm_LODBG_e, 255, 0), + OBJNAME("LOD21", fpcNm_LODBG_e, 255, 0), + OBJNAME("LOD22", fpcNm_LODBG_e, 255, 0), + OBJNAME("LOD23", fpcNm_LODBG_e, 255, 0), + OBJNAME("LOD24", fpcNm_LODBG_e, 255, 0), + OBJNAME("LOD25", fpcNm_LODBG_e, 255, 0), + OBJNAME("LOD26", fpcNm_LODBG_e, 255, 0), + OBJNAME("LOD27", fpcNm_LODBG_e, 255, 0), + OBJNAME("LOD28", fpcNm_LODBG_e, 255, 0), + OBJNAME("LOD29", fpcNm_LODBG_e, 255, 0), + OBJNAME("LOD30", fpcNm_LODBG_e, 255, 0), + OBJNAME("LOD31", fpcNm_LODBG_e, 255, 0), + OBJNAME("LOD32", fpcNm_LODBG_e, 255, 0), + OBJNAME("LOD33", fpcNm_LODBG_e, 255, 0), + OBJNAME("LOD34", fpcNm_LODBG_e, 255, 0), + OBJNAME("LOD35", fpcNm_LODBG_e, 255, 0), + OBJNAME("LOD36", fpcNm_LODBG_e, 255, 0), + OBJNAME("LOD37", fpcNm_LODBG_e, 255, 0), + OBJNAME("LOD38", fpcNm_LODBG_e, 255, 0), + OBJNAME("LOD39", fpcNm_LODBG_e, 255, 0), + OBJNAME("LOD40", fpcNm_LODBG_e, 255, 0), + OBJNAME("LOD41", fpcNm_LODBG_e, 255, 0), + OBJNAME("LOD42", fpcNm_LODBG_e, 255, 0), + OBJNAME("LOD43", fpcNm_LODBG_e, 255, 0), + OBJNAME("LOD44", fpcNm_LODBG_e, 255, 0), + OBJNAME("LOD45", fpcNm_LODBG_e, 255, 0), + OBJNAME("LOD46", fpcNm_LODBG_e, 255, 0), + OBJNAME("LOD47", fpcNm_LODBG_e, 255, 0), + OBJNAME("LOD48", fpcNm_LODBG_e, 255, 0), + OBJNAME("LOD49", fpcNm_LODBG_e, 255, 0), + OBJNAME("MtryB", fpcNm_Obj_Tribox_e, 0, 0), + OBJNAME("MtryBCr", fpcNm_Obj_Tribox_e, 1, 0), + OBJNAME("Vdora", fpcNm_Obj_Gong_e, 255, 0), + OBJNAME("Roten2", fpcNm_Obj_Roten_e, 0, 0), + OBJNAME("Roten3", fpcNm_Obj_Roten_e, 1, 0), + OBJNAME("Roten4", fpcNm_Obj_Roten_e, 2, 0), + OBJNAME("Qtkhd", fpcNm_Obj_Smplbg_e, 255, 0), + OBJNAME("Akabe", fpcNm_Obj_Akabe_e, 0, 0), + OBJNAME("Akabe10", fpcNm_Obj_Akabe_e, 1, 0), + OBJNAME("NBOX", fpcNm_Obj_Akabe_e, 2, 0), + OBJNAME("NBOX10", fpcNm_Obj_Akabe_e, 3, 0), + OBJNAME("Ashut", fpcNm_Obj_Ashut_e, 255, 0), + OBJNAME("Mcrtn", fpcNm_Obj_Tapestry_e, 255, 0), + OBJNAME("VmcBS", fpcNm_Obj_Vmc_e, 255, 0), + OBJNAME("Usovmc", fpcNm_Obj_Usovmc_e, 255, 0), + OBJNAME("Vfan", fpcNm_Obj_Vfan_e, 255, 0), + OBJNAME("Apzl", fpcNm_Obj_Apzl_e, 255, 0), + OBJNAME("Adnno", fpcNm_Obj_Adnno_e, 255, 0), + OBJNAME("Ycage00", fpcNm_Obj_Barrier_e, 255, 0), + OBJNAME("Yswdr00", fpcNm_Obj_Firewall_e, 255, 0), + OBJNAME("TnTrap", fpcNm_Obj_TnTrap_e, 255, 0), + OBJNAME("FgTrap", fpcNm_Obj_TnTrap_e, 255, 0), + OBJNAME("CmTrap", fpcNm_Obj_TnTrap_e, 255, 0), + OBJNAME("Hjump2", fpcNm_Obj_Jump_e, 255, 61), + OBJNAME("Esekh", fpcNm_Obj_Monument_e, 0, 55), + OBJNAME("Esekh2", fpcNm_Obj_Monument_e, 1, 55), + OBJNAME("Po", fpcNm_NPC_PHOTO_e, 255, 59), + OBJNAME("TagPo", fpcNm_TAG_PHOTO_e, 255, 0), + OBJNAME("Htoge1", fpcNm_TOGE_e, 255, 50), + OBJNAME("Skanran", fpcNm_Obj_Ferris_e, 255, 0), + OBJNAME("Ajav", fpcNm_Obj_Ajav_e, 255, 0), + OBJNAME("Trap", fpcNm_Obj_Trap_e, 255, 51), + OBJNAME("Hha", fpcNm_Obj_Hha_e, 255, 0), + OBJNAME("Htetu1", fpcNm_Obj_Htetu1_e, 255, 0), + OBJNAME("Tpota", fpcNm_Tpota_e, 255, 0), + OBJNAME("Stoudai", fpcNm_Obj_Light_e, 255, 0), + OBJNAME("Pbco", fpcNm_Obj_Pbco_e, 255, 0), + OBJNAME("Ebomzo", fpcNm_Obj_Ebomzo_e, 255, 0), + OBJNAME("Psail", fpcNm_SAIL_e, 0, 0), + OBJNAME("Homen1", fpcNm_Obj_Homen_e, 0, 0), + OBJNAME("Homen2", fpcNm_Obj_Homen_e, 1, 0), + OBJNAME("Xfuta", fpcNm_Obj_Xfuta_e, 1, 0), + OBJNAME("Vochi", fpcNm_Obj_Leaves_e, 0, 0), + OBJNAME("Hfuck1", fpcNm_Obj_Hfuck1_e, 0, 0), + OBJNAME("YLzou", fpcNm_Obj_YLzou_e, 0, 0), + OBJNAME("Gbed", fpcNm_Obj_Gbed_e, 0, 0), + OBJNAME("Vteng", fpcNm_Obj_Vteng_e, 0, 0), + OBJNAME("Ohatch", fpcNm_Obj_Ohatch_e, 255, 0), + OBJNAME("Rcloud", fpcNm_Obj_Rcloud_e, 0, 0), + OBJNAME("Ocloud", fpcNm_Obj_Rcloud_e, 1, 0), + OBJNAME("MPot", fpcNm_Obj_Mshokki_e, 0, 0), + OBJNAME("MOsara", fpcNm_Obj_Mshokki_e, 1, 0), + OBJNAME("MKoppu", fpcNm_Obj_Mshokki_e, 2, 0), + OBJNAME("Ptco", fpcNm_Obj_Bscurtain_e, 0, 0), + OBJNAME("Ptcu", fpcNm_Obj_Bscurtain_e, 1, 0), + OBJNAME("Kmon", fpcNm_Kmon_e, 0, 0), + OBJNAME("Sarace", fpcNm_NPC_SARACE_e, 0, 0), + OBJNAME("Hsh", fpcNm_Obj_HSH_e, 0, 54), + OBJNAME("Hsh2", fpcNm_Obj_HSH_e, 1, 54), + OBJNAME("Mmusic", fpcNm_Mmusic_e, 255, 0), + OBJNAME("Gryw00", fpcNm_Obj_Gryw00_e, 255, 0), + OBJNAME("AjavW", fpcNm_Obj_AjavW_e, 0, 0), + OBJNAME("Omensmk", fpcNm_Obj_Homensmk_e, 255, 0), + OBJNAME("Itnak", fpcNm_Obj_Itnak_e, 255, 0), + OBJNAME("Yfrlt00", fpcNm_Komore_e, 255, 0), + OBJNAME("FTree", fpcNm_Obj_Ftree_e, 255, 0), + OBJNAME("Vyasi", fpcNm_Obj_Vyasi_e, 255, 0), + OBJNAME("Vds", fpcNm_Obj_Vds_e, 255, 0), + OBJNAME("Rforce", fpcNm_Obj_Rforce_e, 255, 0), + OBJNAME("zouK", fpcNm_Obj_Zouk_e, 0, 0), + OBJNAME("zouK1", fpcNm_Obj_Zouk_e, 1, 0), + OBJNAME("zouK2", fpcNm_Obj_Zouk_e, 2, 0), + OBJNAME("zouK3", fpcNm_Obj_Zouk_e, 3, 0), + OBJNAME("zouK4", fpcNm_Obj_Zouk_e, 4, 0), + OBJNAME("Gaship1", fpcNm_Obj_Gaship_e, 255, 0), + OBJNAME("Gaship2", fpcNm_Obj_Gaship2_e, 255, 0), + OBJNAME("Ghrwp", fpcNm_WARPHYRULE_e, 255, 0), + OBJNAME("Gdemo20", fpcNm_WARPDEMO20_e, 255, 0), + OBJNAME("Warpgn", fpcNm_WARPGANON_e, 255, 0), + OBJNAME("Warpmj", fpcNm_WARPMAJYUU_e, 255, 0), + OBJNAME("Warpfo", fpcNm_WARPFOUT_e, 255, 0), + OBJNAME("Ygush00", fpcNm_Obj_Ygush00_e, 255, 0), + OBJNAME("Ygush01", fpcNm_Obj_Ygush00_e, 255, 0), + OBJNAME("Ygstp00", fpcNm_Obj_Ygush00_e, 255, 0), + OBJNAME("Ygush02", fpcNm_Obj_Ygush00_e, 255, 0), + OBJNAME("Hcbh", fpcNm_Obj_Hcbh_e, 0, 0), + OBJNAME("Com_B", fpcNm_Coming2_e, 255, 0), + OBJNAME("Com_C", fpcNm_Coming3_e, 255, 0), + OBJNAME("SPitem", fpcNm_SPC_ITEM01_e, 255, 0), + OBJNAME("HyoiKam", fpcNm_NPC_KAM_e, 255, 0), + OBJNAME("Shmrgrd", fpcNm_Obj_Shmrgrd_e, 255, 0), + OBJNAME("Vtil1", fpcNm_Obj_Vtil_e, 0, 0), + OBJNAME("Vtil2", fpcNm_Obj_Vtil_e, 1, 0), + OBJNAME("Vtil3", fpcNm_Obj_Vtil_e, 2, 0), + OBJNAME("Vtil4", fpcNm_Obj_Vtil_e, 3, 0), + OBJNAME("Vtil5", fpcNm_Obj_Vtil_e, 4, 0), + OBJNAME("Eayogn", fpcNm_Obj_Eayogn_e, 255, 0), + OBJNAME("VmsMS", fpcNm_Obj_Vmsms_e, 255, 0), + OBJNAME("VmsDZ", fpcNm_Obj_Vmsdz_e, 255, 0), + OBJNAME("VgnFD", fpcNm_Obj_Vgnfd_e, 255, 0), + OBJNAME("Ygcwp", fpcNm_Ygcwp_e, 255, 0), + OBJNAME("Figure", fpcNm_OBJ_FIGURE_e, 255, 0), + OBJNAME("RoHat", fpcNm_OBJ_HAT_e, 255, 0), + OBJNAME("Gntakis", fpcNm_Obj_Gnntakis_e, 255, 0), + OBJNAME("Gntakie", fpcNm_Obj_Gnntakie_e, 255, 0), + OBJNAME("Gnbtaki", fpcNm_Obj_Gnnbtaki_e, 255, 0), + OBJNAME("Bkm", fpcNm_BMD_e, 255, 0), + OBJNAME("Bst", fpcNm_BST_e, 255, 0), + OBJNAME("Bitem", fpcNm_BOSSITEM_e, 255, 0), + OBJNAME("Fganon", fpcNm_FGANON_e, 255, 0), + OBJNAME("Bwd", fpcNm_BWD_e, 255, 0), + OBJNAME("Bwds", fpcNm_BWDS_e, 255, 0), + OBJNAME("Bgn", fpcNm_BGN_e, 255, 0), + OBJNAME("Gnd", fpcNm_GND_e, 255, 0), + OBJNAME("Puti", fpcNm_PT_e, 255, 0), + OBJNAME("d_act0", fpcNm_DEMO00_e, 0, 0), + OBJNAME("d_act1", fpcNm_DEMO00_e, 1, 0), + OBJNAME("d_act2", fpcNm_DEMO00_e, 2, 0), + OBJNAME("d_act3", fpcNm_DEMO00_e, 3, 0), + OBJNAME("d_act4", fpcNm_DEMO00_e, 4, 0), + OBJNAME("d_act5", fpcNm_DEMO00_e, 5, 0), + OBJNAME("d_act6", fpcNm_DEMO00_e, 6, 0), + OBJNAME("d_act7", fpcNm_DEMO00_e, 7, 0), + OBJNAME("d_act8", fpcNm_DEMO00_e, 8, 0), + OBJNAME("d_act9", fpcNm_DEMO00_e, 9, 0), + OBJNAME("d_act10", fpcNm_DEMO00_e, 10, 0), + OBJNAME("d_act11", fpcNm_DEMO00_e, 11, 0), + OBJNAME("d_act12", fpcNm_DEMO00_e, 12, 0), + OBJNAME("d_act13", fpcNm_DEMO00_e, 13, 0), + OBJNAME("d_act14", fpcNm_DEMO00_e, 14, 0), + OBJNAME("d_act15", fpcNm_DEMO00_e, 15, 0), + OBJNAME("d_act16", fpcNm_DEMO00_e, 16, 0), + OBJNAME("d_act17", fpcNm_DEMO00_e, 17, 0), + OBJNAME("d_act18", fpcNm_DEMO00_e, 18, 0), + OBJNAME("d_act19", fpcNm_DEMO00_e, 19, 0), + OBJNAME("d_act20", fpcNm_DEMO00_e, 20, 0), + OBJNAME("d_act21", fpcNm_DEMO00_e, 21, 0), + OBJNAME("d_act22", fpcNm_DEMO00_e, 22, 0), + OBJNAME("d_act23", fpcNm_DEMO00_e, 23, 0), + OBJNAME("d_act24", fpcNm_DEMO00_e, 24, 0), + OBJNAME("d_act25", fpcNm_DEMO00_e, 25, 0), + OBJNAME("d_act26", fpcNm_DEMO00_e, 26, 0), + OBJNAME("d_act27", fpcNm_DEMO00_e, 27, 0), + OBJNAME("d_act28", fpcNm_DEMO00_e, 28, 0), + OBJNAME("d_act29", fpcNm_DEMO00_e, 29, 0), + OBJNAME("d_act30", fpcNm_DEMO00_e, 30, 0), + OBJNAME("d_act31", fpcNm_DEMO00_e, 31, 0), + OBJNAME("SYAN", fpcNm_SYAN_e, 255, 0), + OBJNAME("TagD1", fpcNm_Dummy_e, 0, 0), + OBJNAME("TagD2", fpcNm_Dummy_e, 1, 0), + OBJNAME("TagD3", fpcNm_Dummy_e, 2, 0), + OBJNAME("TagD4", fpcNm_Dummy_e, 3, 0), + OBJNAME("mp", fpcNm_MP_e, 255, 0), + OBJNAME("STBox", fpcNm_SALVAGE_TBOX_e, 255, 0), + OBJNAME("Fobj00", fpcNm_STANDITEM_e, 255, 0), + OBJNAME("Tama", fpcNm_TAMA_e, 255, 0), + OBJNAME("Agb", fpcNm_AGB_e, 255, 0), + OBJNAME("Bg", fpcNm_BG_e, 255, 0), + OBJNAME("Himo2", fpcNm_HIMO2_e, 255, 0), + OBJNAME("Esa", fpcNm_ESA_e, 255, 0), + OBJNAME("Boko", fpcNm_BOKO_e, 255, 0), + OBJNAME("Kantera", fpcNm_KANTERA_e, 255, 0), + OBJNAME("HShot", fpcNm_HOOKSHOT_e, 255, 0), + OBJNAME("Boom", fpcNm_BOOMERANG_e, 255, 0), + OBJNAME("Bomb", fpcNm_BOMB_e, 255, 0), + OBJNAME("Bomb2", fpcNm_Bomb2_e, 255, 0), + OBJNAME("Boko", fpcNm_BOKO_e, 255, 0), + OBJNAME("Arrow", fpcNm_ARROW_e, 255, 0), + OBJNAME("Arrow_i", fpcNm_ARROW_ICEEFF_e, 255, 0), + OBJNAME("Arrow_l", fpcNm_ARROW_LIGHTEFF_e, 255, 0), + OBJNAME("Grid", fpcNm_GRID_e, 255, 0), + OBJNAME("Kaji", fpcNm_Kaji_e, 255, 0), + OBJNAME("HFloor", fpcNm_Hot_Floor_e, 255, 0), + OBJNAME("Buoyr", fpcNm_Obj_Buoyrace_e, 255, 0), + OBJNAME("Ritem", fpcNm_RACEITEM_e, 255, 0), + OBJNAME("Sitem", fpcNm_ShopItem_e, 255, 0), + OBJNAME("Ditem", fpcNm_Demo_Item_e, 255, 0), + OBJNAME("Iball", fpcNm_Iball_e, 255, 0), + OBJNAME("Grass", fpcNm_GRASS_e, 255, 0), + OBJNAME("Vrbox", fpcNm_VRBOX_e, 255, 0), + OBJNAME("Vrbox2", fpcNm_VRBOX2_e, 255, 0), + OBJNAME("EndCode", fpcNm_PLAY_SCENE_e, 255, 0), }; /* 80041544-800415B4 .text dStage_searchName__FPCc */ @@ -1312,7 +1311,7 @@ void dStage_actorCreate(stage_actor_data_class* i_actorData, fopAcM_prm_class* i /* 8004169C-80041708 .text dStage_cameraCreate__FP24stage_camera2_data_classii */ int dStage_cameraCreate(stage_camera2_data_class* i_cameraData, int i_cameraIdx, int param_2) { - s16 procname = PROC_CAMERA; + s16 procname = fpcNm_CAMERA_e; if (procname < 0) { return 0; } @@ -1487,17 +1486,17 @@ int dStage_playerInit(dStage_dt_c* i_stage, void* i_data, int num, void* i_file) scene_class* stageProc = fopScnM_SearchByID(dStage_roomControl_c::getProcID()); JUT_ASSERT(DEMO_SELECT(1812, 1842), stageProc != NULL); - if (stageProc->base.base.mProcName != PROC_PLAY_SCENE) { - fopAcM_create(PROC_TITLE, 0); + if (stageProc->base.base.mProcName != fpcNm_PLAY_SCENE_e) { + fopAcM_create(fpcNm_TITLE_e, 0); } #if VERSION == VERSION_DEMO else #endif { - fopMsgM_Create(PROC_METER, NULL, NULL); + fopMsgM_Create(fpcNm_METER_e, NULL, NULL); cXyz agb_pos(appen->base.position.x, appen->base.position.y + 10.0f, appen->base.position.z); - fopAcM_create(PROC_AGB, 0, &agb_pos); + fopAcM_create(fpcNm_AGB_e, 0, &agb_pos); } dComIfGp_setAgb(NULL); @@ -1856,11 +1855,11 @@ bool dStage_setShipPos(int param_0, int i_roomNo) { if (param_0 != 0xFF) { dStage_Ship_dt_c* ship_data_p = dComIfGp_getShip(roomNo, param_0); if (ship_data_p != NULL) { - daShip_c* ship_p = (daShip_c*)fopAcM_SearchByName(PROC_SHIP); + daShip_c* ship_p = (daShip_c*)fopAcM_SearchByName(fpcNm_SHIP_e); if (ship_p != NULL) { if (dComIfGp_getStartStagePoint() == -3 ) { if (dComIfGs_getTurnRestartParam() & 0x100) { - ship_p = (daShip_c*)fopAcM_SearchByName(PROC_SHIP); + ship_p = (daShip_c*)fopAcM_SearchByName(fpcNm_SHIP_e); if (ship_p != NULL) { ship_p->initStartPos(&dComIfGs_getTurnRestartShipPos(), dComIfGs_getTurnRestartShipAngleY()); } @@ -1885,7 +1884,7 @@ bool dStage_setShipPos(int param_0, int i_roomNo) { } if (dComIfGp_getStartStagePoint() == -3 && dComIfGs_getTurnRestartHasShip()) { - daShip_c* ship_p = (daShip_c*)fopAcM_SearchByName(PROC_SHIP); + daShip_c* ship_p = (daShip_c*)fopAcM_SearchByName(fpcNm_SHIP_e); if (ship_p != NULL) { ship_p->initStartPos(&dComIfGs_getTurnRestartShipPos(), dComIfGs_getTurnRestartShipAngleY()); } @@ -1902,7 +1901,7 @@ bool dStage_setShipPos(int param_0, int i_roomNo) { } dStage_Ship_dt_c* ship_data_p = dComIfGp_getShip(roomNo, param_0); if (ship_data_p != NULL) { - daShip_c* ship_p = (daShip_c*)fopAcM_SearchByName(PROC_SHIP); + daShip_c* ship_p = (daShip_c*)fopAcM_SearchByName(fpcNm_SHIP_e); if (ship_p != NULL) { ship_p->initStartPos(&ship_data_p->m_pos, ship_data_p->m_angle); return true; @@ -2015,10 +2014,10 @@ int dStage_roomDrtgInfoInit(dStage_dt_c* i_stage, void* i_data, int i_num, void* /* 80042EB8-80042F14 .text dKankyo_create__Fv */ void dKankyo_create() { - fopKyM_Create(PROC_KANKYO); - fopKyM_Create(PROC_KYEFF); - fopKyM_Create(PROC_KYEFF2); - fopKyM_Create(PROC_ENVSE); + fopKyM_Create(fpcNm_KANKYO_e); + fopKyM_Create(fpcNm_KYEFF_e); + fopKyM_Create(fpcNm_KYEFF2_e); + fopKyM_Create(fpcNm_ENVSE_e); } /* 80042F14-80042FC4 .text dStage_dt_c_decode__FPvP11dStage_dt_cP9FuncTablei */ @@ -2238,8 +2237,8 @@ void dStage_Create() { *dStage_roomControl_c::getDemoArcName() = NULL; if (dComIfG_getStageRes("Stage", "vr_sky.bdl") != NULL) { - fopAcM_Create(PROC_VRBOX, NULL, NULL); - fopAcM_Create(PROC_VRBOX2, NULL, NULL); + fopAcM_Create(fpcNm_VRBOX_e, NULL, NULL); + fopAcM_Create(fpcNm_VRBOX2_e, NULL, NULL); } dComIfGp_evmng_create(); diff --git a/src/d/d_throwstone.cpp b/src/d/d_throwstone.cpp index 31afd1fad..5f23992a3 100644 --- a/src/d/d_throwstone.cpp +++ b/src/d/d_throwstone.cpp @@ -10,8 +10,6 @@ #include "f_op/f_op_actor_mng.h" #include "d/d_com_inf_game.h" #include "d/d_demo.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "m_Do/m_Do_mtx.h" const char daThrowstone_c::M_arcname[] = "Aisi"; @@ -122,18 +120,18 @@ static actor_method_class daThrowstoneMethodTable = { }; actor_process_profile_definition g_profile_THROWSTONE = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0002, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_THROWSTONE, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0002, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_THROWSTONE_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daThrowstone_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_THROWSTONE, + /* Draw Prio */ fpcDwPi_THROWSTONE_e, /* Actor SubMtd */ &daThrowstoneMethodTable, /* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/d_timer.cpp b/src/d/d_timer.cpp index 15ebdb71e..3e8d9a2bf 100644 --- a/src/d/d_timer.cpp +++ b/src/d/d_timer.cpp @@ -7,8 +7,6 @@ #include "d/d_timer.h" #include "d/d_com_inf_game.h" #include "d/d_meter.h" -#include "d/d_procname.h" -#include "d/d_priority.h" #include "m_Do/m_Do_audio.h" #include "JSystem/J2DGraph/J2DScreen.h" #include "JSystem/J2DGraph/J2DOrthoGraph.h" @@ -598,7 +596,7 @@ void dDlst_TimerScrnDraw_c::setIconType(void* tex, u8 type) { itemNo = dComIfGs_getSelectEquip(0); break; case 4: - itemNo = dItem_FATHER_LETTER_e; + itemNo = dItemNo_FATHER_LETTER_e; break; } @@ -754,14 +752,14 @@ static cPhs_State dTimer_Create(msg_class* i_this) { /* 8023DA28-8023DA88 .text dTimer_createTimer__FiUsUcUcffff */ fpc_ProcID dTimer_createTimer(int param_1, u16 param_2, u8 param_3, u8 param_4, f32 param_5, f32 param_6, f32 param_7, f32 param_8) { if (dComIfG_getTimerMode() == -1) - return fop_Timer_create(PROC_TIMER, param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8, NULL); + return fop_Timer_create(fpcNm_TIMER_e, param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8, NULL); return fpcM_ERROR_PROCESS_ID_e; } /* 8023DA88-8023DAEC .text dTimer_createStockTimer__Fv */ fpc_ProcID dTimer_createStockTimer() { if (dComIfG_getTimerMode() != -1) - return fop_Timer_create(PROC_TIMER, 7, 0, 3, 0, 221.0f, 439.0f, 32.0f, 419.0f, NULL); + return fop_Timer_create(fpcNm_TIMER_e, 7, 0, 3, 0, 221.0f, 439.0f, 32.0f, 419.0f, NULL); return fpcM_ERROR_PROCESS_ID_e; } @@ -769,7 +767,7 @@ fpc_ProcID dTimer_createStockTimer() { dDlst_TimerScrnDraw_c::~dDlst_TimerScrnDraw_c() { } -msg_method_class l_dTimer_Method = { +static msg_method_class l_dTimer_Method = { (process_method_func)dTimer_Create, (process_method_func)dTimer_Delete, (process_method_func)dTimer_Execute, @@ -778,15 +776,15 @@ msg_method_class l_dTimer_Method = { }; msg_process_profile_definition g_profile_TIMER = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 12, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_TIMER, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 12, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TIMER_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(dTimer_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopMsg_Method, - /* Priority */ PRIO_TIMER, + /* Draw Prio */ fpcDwPi_TIMER_e, /* Msg SubMtd */ &l_dTimer_Method, }; diff --git a/src/d/d_tree.cpp b/src/d/d_tree.cpp index 9877e0a93..3ababa53c 100644 --- a/src/d/d_tree.cpp +++ b/src/d/d_tree.cpp @@ -12,7 +12,7 @@ const u16 l_Txa_swood_aTEX__width = 64; const u16 l_Txa_swood_aTEX__height = 64; -Vec l_pos[] = { +static Vec l_pos[] = { {-10.0f, 105.608147f, 5.0f}, {10.0f, 105.608147f, 5.0f}, {0.0f, 115.841797f, 0.0f}, @@ -96,7 +96,7 @@ Vec l_pos[] = { {-23.685818f, 230.321808f, -83.511086f}, }; -GXColor l_color[] = { +static GXColor l_color[] = { {0x80, 0x80, 0x80, 0xFF}, {0x8D, 0x8D, 0x8D, 0xFF}, {0x99, 0x99, 0x99, 0xFF}, @@ -109,7 +109,7 @@ GXColor l_color[] = { {0xBF, 0xBF, 0xBF, 0xFF}, }; -cXy l_texCoord[] = { +static cXy l_texCoord[] = { {0.862864f, 0.532151f}, {0.864665f, 1.0f}, {0.878197f, 1.0f}, diff --git a/src/d/d_water_mark.cpp b/src/d/d_water_mark.cpp index 5f680e2cc..77a00dca5 100644 --- a/src/d/d_water_mark.cpp +++ b/src/d/d_water_mark.cpp @@ -5,8 +5,6 @@ #include "d/dolzel.h" // IWYU pragma: keep #include "d/d_water_mark.h" -#include "d/d_priority.h" -#include "d/d_procname.h" #include "f_op/f_op_kankyo.h" BOOL dWaterMark_c::draw() { @@ -60,7 +58,7 @@ cPhs_State dWaterMark_c::create() { /* Nonmatching */ } -kankyo_method_class l_dWaterMark_Method = { +static kankyo_method_class l_dWaterMark_Method = { (process_method_func)dWaterMark_Create, (process_method_func)dWaterMark_Delete, (process_method_func)dWaterMark_Execute, @@ -69,15 +67,15 @@ kankyo_method_class l_dWaterMark_Method = { }; kankyo_process_profile_definition g_profile_WATER_MARK = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0009, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_WATER_MARK, - /* Proc SubMtd */ &g_fpcLf_Method.base, - /* Size */ sizeof(dWaterMark_c), - /* SizeOther */ 0, - /* Parameters */ 0, - /* Leaf SubMtd */ &g_fopKy_Method, - /* Priority */ PRIO_WATER_MARK, - /* Actor SubMtd */ &l_dWaterMark_Method, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0009, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_WATER_MARK_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(dWaterMark_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopKy_Method, + /* Draw Prio */ fpcDwPi_WATER_MARK_e, + /* Kankyo SubMtd */ &l_dWaterMark_Method, }; diff --git a/src/d/d_wind_arrow.cpp b/src/d/d_wind_arrow.cpp index 2b1180cca..1f5449cb2 100644 --- a/src/d/d_wind_arrow.cpp +++ b/src/d/d_wind_arrow.cpp @@ -6,8 +6,6 @@ #include "d/dolzel.h" // IWYU pragma: keep #include "d/d_wind_arrow.h" #include "d/d_kankyo_wether.h" -#include "d/d_priority.h" -#include "d/d_procname.h" #include "d/res/res_always.h" #include "m_Do/m_Do_graphic.h" #include "f_op/f_op_kankyo_mng.h" @@ -144,7 +142,7 @@ static cPhs_State dWindArrow_Create(kankyo_class* i_k) { return phase_state; } -kankyo_method_class l_dWindArrow_Method = { +static kankyo_method_class l_dWindArrow_Method = { (process_method_func)dWindArrow_Create, (process_method_func)dWindArrow_Delete, (process_method_func)dWindArrow_Execute, @@ -153,15 +151,15 @@ kankyo_method_class l_dWindArrow_Method = { }; kankyo_process_profile_definition g_profile_WIND_ARROW = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0002, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_WIND_ARROW, - /* Proc SubMtd */ &g_fpcLf_Method.base, - /* Size */ sizeof(dWindArrow_c), - /* SizeOther */ 0, - /* Parameters */ 0, - /* Leaf SubMtd */ &g_fopKy_Method, - /* Priority */ PRIO_WIND_ARROW, - /* Actor SubMtd */ &l_dWindArrow_Method, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0002, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_WIND_ARROW_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(dWindArrow_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopKy_Method, + /* Draw Prio */ fpcDwPi_WIND_ARROW_e, + /* Kankyo SubMtd */ &l_dWindArrow_Method, }; diff --git a/src/d/d_wood.cpp b/src/d/d_wood.cpp index 452356f18..8a37725c4 100644 --- a/src/d/d_wood.cpp +++ b/src/d/d_wood.cpp @@ -12,7 +12,6 @@ #include "d/d_com_inf_game.h" #include "d/d_drawlist.h" #include "d/d_kankyo_wether.h" -#include "d/d_procname.h" #include "d/d_tree.h" #include "d/d_cc_d.h" #include "dolphin/gf/GF.h" @@ -75,7 +74,7 @@ namespace { const u16 l_Txa_swood_bTEX__width = 64; const u16 l_Txa_swood_bTEX__height = 64; -Vec l_pos[] = { +static Vec l_pos[] = { {0.000022f, 14.922843f, -89.982368f}, {-77.927017f, 14.922843f, -44.991203f}, {-77.927025f, 14.922843f, 44.991173f}, @@ -140,7 +139,7 @@ Vec l_pos[] = { {5.656257f, 22.025139f, -3.749505f}, }; -GXColor l_color[] = { +static GXColor l_color[] = { {0x7F, 0x7F, 0x7F, 0xFF}, {0x98, 0x98, 0x99, 0xFF}, {0x99, 0x99, 0x99, 0xFF}, @@ -163,7 +162,7 @@ GXColor l_color[] = { {0x9A, 0x9A, 0x9A, 0xFF}, }; -cXy l_texCoord[] = { +static cXy l_texCoord[] = { {0.5f, 1.0f}, {1.0f, 0.0f}, {0.0f, 0.0f}, @@ -727,7 +726,7 @@ void dWood::Unit_c::cc_hit_before_cut(dWood::Packet_c *packet) { inf.GetCoHitObj()->GetStts()) { animIdx = packet->search_anm(Anm_c::Mode_PushInto); - if (fopAcM_GetProfName(actor) == PROC_PLAYER && + if (fopAcM_GetProfName(actor) == fpcNm_PLAYER_e && inf.GetCoHitLen() >= 2.0f && mAnimCooldown == 0) { mAnimCooldown = 20; diff --git a/src/d/d_wpillar.cpp b/src/d/d_wpillar.cpp index 912c7f90d..d04334a47 100644 --- a/src/d/d_wpillar.cpp +++ b/src/d/d_wpillar.cpp @@ -5,8 +5,6 @@ #include "d/dolzel.h" // IWYU pragma: keep #include "d/d_wpillar.h" -#include "d/d_priority.h" -#include "d/d_procname.h" #include "f_op/f_op_kankyo.h" class J3DNode; @@ -67,7 +65,7 @@ static cPhs_State dWpillar_Create(kankyo_class* i_this) { return a_this->create(); } -kankyo_method_class l_dWpillar_Method = { +static kankyo_method_class l_dWpillar_Method = { (process_method_func)dWpillar_Create, (process_method_func)dWpillar_Delete, (process_method_func)dWpillar_Execute, @@ -76,15 +74,15 @@ kankyo_method_class l_dWpillar_Method = { }; kankyo_process_profile_definition g_profile_WPILLAR = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0008, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_WPILLAR, - /* Proc SubMtd */ &g_fpcLf_Method.base, - /* Size */ sizeof(dWpillar_c), - /* SizeOther */ 0, - /* Parameters */ 0, - /* Leaf SubMtd */ &g_fopKy_Method, - /* Priority */ PRIO_WPILLAR, - /* Actor SubMtd */ &l_dWpillar_Method, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0008, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_WPILLAR_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(dWpillar_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopKy_Method, + /* Draw Prio */ fpcDwPi_WPILLAR_e, + /* Kankyo SubMtd */ &l_dWpillar_Method, }; diff --git a/src/d/d_wpot_water.cpp b/src/d/d_wpot_water.cpp index f87ce1999..d562c94f5 100644 --- a/src/d/d_wpot_water.cpp +++ b/src/d/d_wpot_water.cpp @@ -7,8 +7,6 @@ #include "d/d_wpot_water.h" #include "d/d_bg_s_gnd_chk.h" #include "d/d_com_inf_game.h" -#include "d/d_priority.h" -#include "d/d_procname.h" #include "f_op/f_op_kankyo_mng.h" dWpotWater_EcallBack dWpotWater_c::mEcallback; @@ -97,7 +95,7 @@ static cPhs_State dWpotWater_Create(kankyo_class* i_this) { f32 groundY = dComIfG_Bgsp()->GroundCross(&gndChk); if (lavaChk.ChkSetInfo() && dComIfG_Bgsp()->GetAttributeCode(lavaChk) == dBgS_Attr_LAVA_e && lavaY > groundY) { cXyz spawnPos(pos.x, lavaY + 25.0f, pos.z); - fopAcM_create(PROC_Obj_Magmarock, 0, &spawnPos, i_this->mParam); + fopAcM_create(fpcNm_Obj_Magmarock_e, 0, &spawnPos, i_this->mParam); break; } } @@ -113,14 +111,14 @@ static cPhs_State dWpotWater_Create(kankyo_class* i_this) { i_this->mPos.y = groundY; if (groundY != -G_CM3D_F_INF) { cXyz sp18(i_this->mPos.x, i_this->mPos.y, i_this->mPos.z); - fopAcM_create(PROC_HITOBJ, 0, &sp18, i_this->mParam); + fopAcM_create(fpcNm_HITOBJ_e, 0, &sp18, i_this->mParam); return a_this->create(); } return cPhs_ERROR_e; } -kankyo_method_class l_dWpotWater_Method = { +static kankyo_method_class l_dWpotWater_Method = { (process_method_func)dWpotWater_Create, (process_method_func)dWpotWater_Delete, (process_method_func)dWpotWater_Execute, @@ -129,15 +127,15 @@ kankyo_method_class l_dWpotWater_Method = { }; kankyo_process_profile_definition g_profile_WPOT_WATER = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0002, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_WPOT_WATER, - /* Proc SubMtd */ &g_fpcLf_Method.base, - /* Size */ sizeof(dWpotWater_c), - /* SizeOther */ 0, - /* Parameters */ 0, - /* Leaf SubMtd */ &g_fopKy_Method, - /* Priority */ PRIO_WPOT_WATER, - /* Actor SubMtd */ &l_dWpotWater_Method, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0002, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_WPOT_WATER_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(dWpotWater_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopKy_Method, + /* Draw Prio */ fpcDwPi_WPOT_WATER_e, + /* Kankyo SubMtd */ &l_dWpotWater_Method, }; diff --git a/src/f_ap/f_ap_game.cpp b/src/f_ap/f_ap_game.cpp index 0fdbd55e8..a710bf0e8 100644 --- a/src/f_ap/f_ap_game.cpp +++ b/src/f_ap/f_ap_game.cpp @@ -9,7 +9,6 @@ #include "f_op/f_op_camera_mng.h" #include "f_op/f_op_draw_tag.h" #include "f_pc/f_pc_manager.h" -#include "d/d_procname.h" #include "m_Do/m_Do_main.h" #include "SSystem/SComponent/c_counter.h" @@ -99,7 +98,7 @@ void fapGm_Create() { fopOvlpM_Init(); fopCamM_Init(); fopDwTg_CreateQueue(); - fopScnM_CreateReq(PROC_LOGO_SCENE, PROC_INVALID_e, 0, 0); + fopScnM_CreateReq(fpcNm_LOGO_SCENE_e, fpcNm_INVALID_e, 0, 0); g_HIO.mNo = mDoHIO_createChild("ゲームシステム", &g_HIO); // "Game System" } diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp index 623d80ffa..b7ec10161 100644 --- a/src/f_op/f_op_actor_mng.cpp +++ b/src/f_op/f_op_actor_mng.cpp @@ -12,7 +12,6 @@ #include "d/d_com_inf_game.h" #include "d/d_item_data.h" #include "d/d_stage.h" -#include "d/d_procname.h" #include "d/d_item.h" #include "d/d_item_data.h" #include "d/d_bg_s_lin_chk.h" @@ -530,7 +529,7 @@ s32 fopAcM_rollPlayerCrash(fopAc_ac_c* i_this, f32 distAdjust, u32 flag) { daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); s16 angle = fopAcM_searchPlayerAngleY(i_this); if (cM_scos(player->current.angle.y - angle) < -0.9f) { - if (fopAcM_GetName(player) == PROC_PLAYER) { + if (fopAcM_GetName(player) == fpcNm_PLAYER_e) { player->onFrollCrashFlg(flag); return TRUE; } @@ -779,7 +778,7 @@ fpc_ProcID fopAcM_createItemForPresentDemo(cXyz* pos, int i_itemNo, u8 argFlag, dComIfGp_event_setGtItm(i_itemNo); - if (i_itemNo == dItem_NONE_e) { + if (i_itemNo == dItemNo_NONE_e) { return fpcM_ERROR_PROCESS_ID_e; } @@ -792,7 +791,7 @@ fpc_ProcID fopAcM_createItemForTrBoxDemo(cXyz* pos, int i_itemNo, int roomNo, in dComIfGp_event_setGtItm(i_itemNo); - if (i_itemNo == dItem_NONE_e) { + if (i_itemNo == dItemNo_NONE_e) { return fpcM_ERROR_PROCESS_ID_e; } @@ -854,7 +853,7 @@ fpc_ProcID fopAcM_createItemFromTable(cXyz* p_pos, int i_itemNo, int i_itemBitNo u8* pItemTable = itemTableList->mItemTables[tableIdx]; u32 itemNo; fpc_ProcID lastItemPID; - for (int i = 0; (itemNo = *pItemTable) != dItem_NONE_e && i < 0x10; pItemTable++, i++) { + for (int i = 0; (itemNo = *pItemTable) != dItemNo_NONE_e && i < 0x10; pItemTable++, i++) { if (p_pos) { pos = *p_pos; } @@ -862,12 +861,12 @@ fpc_ProcID fopAcM_createItemFromTable(cXyz* p_pos, int i_itemNo, int i_itemBitNo angle = *p_angle; } - if (tableIdx == dItem_RECOVER_FAIRY_e) { + if (tableIdx == dItemNo_RECOVER_FAIRY_e) { // Bug: This condition never gets triggered. - // They meant to check if (itemNo == dItem_RECOVER_FAIRY_e) so that the + // They meant to check if (itemNo == dItemNo_RECOVER_FAIRY_e) so that the // 3x fairies drop table (table 0x14) spawns them in a triangle. // But instead they check if the table index is equal to - // 0x16/dItem_RECOVER_FAIRY_e, which will never be true. + // 0x16/dItemNo_RECOVER_FAIRY_e, which will never be true. pos += fairy_offset_tbl[i]; angle.y = cM_rndF((f32)0x7FFE); } @@ -920,44 +919,44 @@ fpc_ProcID fopAcM_createRaceItemFromTable(cXyz* pos, int i_itemNo, int i_itemBit fpc_ProcID fopAcM_createShopItem(cXyz* pos, int i_itemNo, csXyz* angle, int roomNo, cXyz* scale, createFunc createFunc) { JUT_ASSERT(DEMO_SELECT(2710, 2716), 0 <= i_itemNo && i_itemNo < 256); - if (i_itemNo == dItem_NONE_e) { + if (i_itemNo == dItemNo_NONE_e) { return fpcM_ERROR_PROCESS_ID_e; } - return fopAcM_create(PROC_ShopItem, i_itemNo, pos, roomNo, angle, scale, -1, createFunc); + return fopAcM_create(fpcNm_ShopItem_e, i_itemNo, pos, roomNo, angle, scale, -1, createFunc); } /* 8002688C-80026980 .text fopAcM_createRaceItem__FP4cXyziiP5csXyziP4cXyzi */ fpc_ProcID fopAcM_createRaceItem(cXyz* pos, int i_itemNo, int i_itemBitNo, csXyz* angle, int roomNo, cXyz* scale, int param_7) { JUT_ASSERT(DEMO_SELECT(2757, 2763), 0 <= i_itemNo && i_itemNo < 256 && (-1 <= i_itemBitNo && i_itemBitNo <= 79) || i_itemBitNo == 127); - if (i_itemNo == dItem_NONE_e) { + if (i_itemNo == dItemNo_NONE_e) { return fpcM_ERROR_PROCESS_ID_e; } i_itemNo = check_itemno(i_itemNo); u32 params = (i_itemBitNo & 0x7F) << 8 | (i_itemNo & 0xFF) << 0 | (param_7 & 0xF) << 15; - return fopAcM_create(PROC_RACEITEM, params, pos, roomNo, angle, scale); + return fopAcM_create(fpcNm_RACEITEM_e, params, pos, roomNo, angle, scale); } /* 80026980-80026A68 .text fopAcM_createDemoItem__FP4cXyziiP5csXyziP4cXyzUc */ fpc_ProcID fopAcM_createDemoItem(cXyz* pos, int i_itemNo, int i_itemBitNo, csXyz* i_angle, int i_roomNo, cXyz* i_scale, u8 i_argFlag) { JUT_ASSERT(DEMO_SELECT(2807, 2813), 0 <= i_itemNo && i_itemNo < 256 && (-1 <= i_itemBitNo && i_itemBitNo <= 79) || i_itemBitNo == 127); - if (i_itemNo == dItem_NONE_e) { + if (i_itemNo == dItemNo_NONE_e) { return fpcM_ERROR_PROCESS_ID_e; } u32 params = (i_itemNo & 0xFF) << 0 | (i_itemBitNo & 0x7F) << 8 | (i_argFlag & 0xFF) << 16; - return fopAcM_create(PROC_Demo_Item, params, pos, i_roomNo, i_angle, i_scale); + return fopAcM_create(fpcNm_Demo_Item_e, params, pos, i_roomNo, i_angle, i_scale); } /* 80026A68-80026ADC .text fopAcM_createItemForBoss__FP4cXyziiP5csXyzP4cXyzi */ fpc_ProcID fopAcM_createItemForBoss(cXyz* pos, int unused, int roomNo, csXyz* angle, cXyz* scale, int param_6) { switch (param_6) { case 1: - return fopAcM_createItem(pos, dItem_HEART_CONTAINER_e, -1, roomNo, daItemType_3_e, angle, daItemAct_BOSS_e, scale); + return fopAcM_createItem(pos, dItemNo_HEART_CONTAINER_e, -1, roomNo, daItemType_3_e, angle, daItemAct_BOSS_e, scale); case 0: // Disappear default: - return fopAcM_createItem(pos, dItem_HEART_CONTAINER_e, -1, roomNo, daItemType_3_e, angle, daItemAct_BOSS_DISAPPEAR_e, scale); + return fopAcM_createItem(pos, dItemNo_HEART_CONTAINER_e, -1, roomNo, daItemType_3_e, angle, daItemAct_BOSS_DISAPPEAR_e, scale); } } @@ -965,7 +964,7 @@ fpc_ProcID fopAcM_createItemForBoss(cXyz* pos, int unused, int roomNo, csXyz* an fpc_ProcID fopAcM_createItem(cXyz* pos, int i_itemNo, int i_itemBitNo, int roomNo, int type, csXyz* angle, int action, cXyz* scale) { JUT_ASSERT(DEMO_SELECT(2909, 2915), 0 <= i_itemNo && i_itemNo < 256 && (-1 <= i_itemBitNo && i_itemBitNo <= 79) || i_itemBitNo == 127); - if (i_itemNo == dItem_NONE_e) { + if (i_itemNo == dItemNo_NONE_e) { return fpcM_ERROR_PROCESS_ID_e; } @@ -981,16 +980,16 @@ fpc_ProcID fopAcM_createItem(cXyz* pos, int i_itemNo, int i_itemBitNo, int roomN u32 params = MAKE_ITEM_PARAMS(itemNo, i_itemBitNo, switchNo2, type, action); switch (i_itemNo) { - case dItem_RECOVER_FAIRY_e: - return fopAcM_create(PROC_NPC_FA1, daNpc_Fa1_c::Type_TIMER_e, pos, roomNo, angle, scale); - case dItem_TRIPLE_HEART_e: + case dItemNo_RECOVER_FAIRY_e: + return fopAcM_create(fpcNm_NPC_FA1_e, daNpc_Fa1_c::Type_TIMER_e, pos, roomNo, angle, scale); + case dItemNo_TRIPLE_HEART_e: // Make the two extra hearts first, then fall-through to make the third heart as normal. for (int i = 0; i < 2; i++) { - fopAcM_create(PROC_ITEM, params, pos, roomNo, &prmAngle, scale); + fopAcM_create(fpcNm_ITEM_e, params, pos, roomNo, &prmAngle, scale); } // Fall-through default: - return fopAcM_create(PROC_ITEM, params, pos, roomNo, &prmAngle, scale); + return fopAcM_create(fpcNm_ITEM_e, params, pos, roomNo, &prmAngle, scale); } } @@ -1005,7 +1004,7 @@ void* fopAcM_fastCreateItem2(cXyz* pos, int i_itemNo, int i_itemBitNo, int roomN csXyz prmAngle = csXyz::Zero; - if (i_itemNo == dItem_NONE_e) { + if (i_itemNo == dItemNo_NONE_e) { return NULL; } @@ -1020,27 +1019,27 @@ void* fopAcM_fastCreateItem2(cXyz* pos, int i_itemNo, int i_itemBitNo, int roomN u32 params = MAKE_ITEM_PARAMS(itemNo, i_itemBitNo, switchNo2, type, action); switch (i_itemNo) { - case dItem_RECOVER_FAIRY_e: - return fopAcM_fastCreate(PROC_NPC_FA1, daNpc_Fa1_c::Type_TIMER_e, pos, roomNo, angle, scale); - case dItem_TRIPLE_HEART_e: + case dItemNo_RECOVER_FAIRY_e: + return fopAcM_fastCreate(fpcNm_NPC_FA1_e, daNpc_Fa1_c::Type_TIMER_e, pos, roomNo, angle, scale); + case dItemNo_TRIPLE_HEART_e: // Make the two extra hearts first, then fall-through to make the third heart as normal. for (i = 0; i < 2; i++) { - fopAcM_fastCreate(PROC_ITEM, params, pos, roomNo, &prmAngle, scale); + fopAcM_fastCreate(fpcNm_ITEM_e, params, pos, roomNo, &prmAngle, scale); } // Fall-through default: - return fopAcM_fastCreate(PROC_ITEM, params, pos, roomNo, &prmAngle, scale); + return fopAcM_fastCreate(fpcNm_ITEM_e, params, pos, roomNo, &prmAngle, scale); } } /* 80026E5C-80026F5C .text fopAcM_createItemForKP2__FP4cXyziiP5csXyzP4cXyzfffUs */ fopAc_ac_c* fopAcM_createItemForKP2(cXyz* pos, int i_itemNo, int roomNo, csXyz* angle, cXyz* scale, f32 speedF, f32 speedY, f32 gravity, u16 i_itemBitNo) { JUT_ASSERT(DEMO_SELECT(3103, 3109), 0 <= i_itemNo && i_itemNo < 256); - if (i_itemNo == dItem_NONE_e) + if (i_itemNo == dItemNo_NONE_e) return NULL; u32 params = i_itemNo | (i_itemBitNo & 0xFFFF) << 8; - fopAc_ac_c* ac = (fopAc_ac_c*)fopAcM_fastCreate(PROC_SPC_ITEM01, params, pos, roomNo, angle, scale); + fopAc_ac_c* ac = (fopAc_ac_c*)fopAcM_fastCreate(fpcNm_SPC_ITEM01_e, params, pos, roomNo, angle, scale); if (ac != NULL) { fopAcM_SetSpeedF(ac, speedF); ac->speed.y = speedY; @@ -1061,7 +1060,7 @@ daItem_c* fopAcM_createItemForSimpleDemo(cXyz* pos, int i_itemNo, int roomNo, cs void* fopAcM_fastCreateItem(cXyz* pos, int i_itemNo, int roomNo, csXyz* angle, cXyz* scale, f32 speedF, f32 speedY, f32 gravity, int i_itemBitNo, createFunc createFunc) { JUT_ASSERT(DEMO_SELECT(3195, 3201), 0 <= i_itemNo && i_itemNo < 256); - if (i_itemNo == dItem_NONE_e) { + if (i_itemNo == dItemNo_NONE_e) { return NULL; } @@ -1081,10 +1080,10 @@ void* fopAcM_fastCreateItem(cXyz* pos, int i_itemNo, int roomNo, csXyz* angle, c daItem_c* item; csXyz prmAngle; switch (i_itemNo) { - case dItem_RECOVER_FAIRY_e: - item = (daItem_c*)fopAcM_fastCreate(PROC_NPC_FA1, daNpc_Fa1_c::Type_TIMER_e, pos, roomNo, angle, scale); + case dItemNo_RECOVER_FAIRY_e: + item = (daItem_c*)fopAcM_fastCreate(fpcNm_NPC_FA1_e, daNpc_Fa1_c::Type_TIMER_e, pos, roomNo, angle, scale); return item; - case dItem_TRIPLE_HEART_e: + case dItemNo_TRIPLE_HEART_e: // Make the two extra hearts first, then fall-through to make the third heart as normal. for (i = 0; i < 2; i++) { if (angle) { @@ -1096,7 +1095,7 @@ void* fopAcM_fastCreateItem(cXyz* pos, int i_itemNo, int roomNo, csXyz* angle, c prmAngle.z = switchNo; prmAngle.y += (int)cM_rndFX(0x2000); - item = (daItem_c*)fopAcM_fastCreate(PROC_ITEM, params, pos, roomNo, &prmAngle, scale, -1, createFunc); + item = (daItem_c*)fopAcM_fastCreate(fpcNm_ITEM_e, params, pos, roomNo, &prmAngle, scale, -1, createFunc); if (item) { item->speedF = speedF * (1.0f + cM_rndFX(0.3f)); item->speed.y = speedY * (1.0f + cM_rndFX(0.2f)); @@ -1112,7 +1111,7 @@ void* fopAcM_fastCreateItem(cXyz* pos, int i_itemNo, int roomNo, csXyz* angle, c } prmAngle.z = 0xFF; - item = (daItem_c*)fopAcM_fastCreate(PROC_ITEM, params, pos, roomNo, &prmAngle, scale, -1, createFunc); + item = (daItem_c*)fopAcM_fastCreate(fpcNm_ITEM_e, params, pos, roomNo, &prmAngle, scale, -1, createFunc); if (item) { item->speedF = speedF; item->speed.y = speedY; @@ -1155,7 +1154,7 @@ void* fopAcM_createStealItem(cXyz* p_pos, int i_tblNo, int i_roomNo, csXyz* p_an } i_itemBitNo = -1; } else { - if (itemNo == dItem_NONE_e) { + if (itemNo == dItemNo_NONE_e) { itemNo = getItemFromLifeBallTableWithoutEmono(i_tblNo); } i_itemBitNo = -1; @@ -1205,7 +1204,7 @@ void* fopAcM_createItemFromEnemyTable(u16 itemTableIdx, int i_itemBitNo, int i_r ) ) { i_itemBitNo = -1; - items[itemIdx] = dItem_YELLOW_RUPEE_e; + items[itemIdx] = dItemNo_YELLOW_RUPEE_e; } } else if (isNonSavedEmono(items[itemIdx])) { if (i_itemBitNo != 0) { @@ -1245,9 +1244,9 @@ fpc_ProcID fopAcM_createIball(cXyz* p_pos, int itemTableIdx, int i_roomNo, csXyz u32 params = (u16)itemTableIdx | (i_itemBitNo & 0xFF) << 16; daIball_c::remove_old(); #if VERSION == VERSION_DEMO - void* item = fopAcM_fastCreate(PROC_Iball, params, p_pos, i_roomNo, p_angle); + void* item = fopAcM_fastCreate(fpcNm_Iball_e, params, p_pos, i_roomNo, p_angle); #else - void* item = fopAcM_fastCreate(PROC_Iball, params, p_pos, i_roomNo); + void* item = fopAcM_fastCreate(fpcNm_Iball_e, params, p_pos, i_roomNo); #endif return fopAcM_GetID(item); } else { @@ -1262,7 +1261,7 @@ fpc_ProcID fopAcM_createIball(cXyz* p_pos, int itemTableIdx, int i_roomNo, csXyz /* 800278D8-80027920 .text fopAcM_createWarpFlower__FP4cXyzP5csXyziUc */ void fopAcM_createWarpFlower(cXyz* p_pos, csXyz* p_angle, int i_roomNo, u8 param_4) { u32 params = param_4; - fopAcM_create(PROC_WARPFLOWER, params, p_pos, i_roomNo, p_angle); + fopAcM_create(fpcNm_WARPFLOWER_e, params, p_pos, i_roomNo, p_angle); } /* 80027920-80027970 .text enemySearchJugge__FPvPv */ @@ -1294,9 +1293,9 @@ fopAc_ac_c* fopAcM_myRoomSearchEnemy(s8 roomNo) { fpc_ProcID fopAcM_createDisappear(fopAc_ac_c* i_actor, cXyz* p_pos, u8 i_scale, u8 i_dropType, u8 i_itemBitNo) { u32 params = (i_itemBitNo & 0xFF) << 16 | (i_scale & 0xFF) << 8 | (i_dropType & 0xFF) << 0; #if VERSION == VERSION_DEMO - fopAc_ac_c* disappear = (fopAc_ac_c*)fopAcM_fastCreate(PROC_DISAPPEAR, params, p_pos, fopAcM_GetRoomNo(i_actor)); + fopAc_ac_c* disappear = (fopAc_ac_c*)fopAcM_fastCreate(fpcNm_DISAPPEAR_e, params, p_pos, fopAcM_GetRoomNo(i_actor)); #else - fopAc_ac_c* disappear = (fopAc_ac_c*)fopAcM_fastCreate(PROC_DISAPPEAR, params, p_pos, fopAcM_GetRoomNo(i_actor), fopAcM_GetAngle_p(i_actor)); + fopAc_ac_c* disappear = (fopAc_ac_c*)fopAcM_fastCreate(fpcNm_DISAPPEAR_e, params, p_pos, fopAcM_GetRoomNo(i_actor), fopAcM_GetAngle_p(i_actor)); #endif if (disappear) { disappear->itemTableIdx = i_actor->itemTableIdx; @@ -1462,8 +1461,8 @@ BOOL fopAcM_getWaterY(const cXyz* pPos, f32* pDstWaterY) { /* 80028684-80028724 .text fopAcM_setGbaName__FP10fopAc_ac_cUcUcUc */ void fopAcM_setGbaName(fopAc_ac_c* i_this, u8 itemNo, u8 gbaName0, u8 gbaName1) { if (dComIfGs_checkGetItem(itemNo) || - (itemNo == dItem_BOW_e && (dComIfGs_checkGetItem(dItem_MAGIC_ARROW_e) || dComIfGs_checkGetItem(dItem_LIGHT_ARROW_e))) || - (itemNo == dItem_MAGIC_ARROW_e && dComIfGs_checkGetItem(dItem_LIGHT_ARROW_e)) + (itemNo == dItemNo_BOW_e && (dComIfGs_checkGetItem(dItemNo_MAGIC_ARROW_e) || dComIfGs_checkGetItem(dItemNo_LIGHT_ARROW_e))) || + (itemNo == dItemNo_MAGIC_ARROW_e && dComIfGs_checkGetItem(dItemNo_LIGHT_ARROW_e)) ) i_this->gbaName = gbaName1; else diff --git a/src/f_op/f_op_kankyo.cpp b/src/f_op/f_op_kankyo.cpp index d755837f7..31d17457c 100644 --- a/src/f_op/f_op_kankyo.cpp +++ b/src/f_op/f_op_kankyo.cpp @@ -8,7 +8,6 @@ #include "f_op/f_op_kankyo_mng.h" #include "f_pc/f_pc_manager.h" #include "d/d_meter.h" -#include "d/d_procname.h" #include "d/d_s_play.h" /* 8002A454-8002A4A4 .text fopKy_Draw__FPv */ @@ -28,7 +27,7 @@ static BOOL fopKy_Execute(void* i_ky) { BOOL ret; kankyo_class* i_this = (kankyo_class*)i_ky; - if (!dScnPly_ply_c::isPause() && (!dMenu_flag() || fpcM_GetName(i_ky) == PROC_ENVSE || fpcM_GetName(i_ky) == PROC_LEVEL_SE)) { + if (!dScnPly_ply_c::isPause() && (!dMenu_flag() || fpcM_GetName(i_ky) == fpcNm_ENVSE_e || fpcM_GetName(i_ky) == fpcNm_LEVEL_SE_e)) { ret = fpcMtd_Execute((process_method_class*)i_this->sub_method, i_ky); } diff --git a/src/f_op/f_op_kankyo_mng.cpp b/src/f_op/f_op_kankyo_mng.cpp index e270ff703..8d9cf96c9 100644 --- a/src/f_op/f_op_kankyo_mng.cpp +++ b/src/f_op/f_op_kankyo_mng.cpp @@ -6,7 +6,6 @@ #include "f_op/f_op_kankyo_mng.h" #include "f_op/f_op_kankyo.h" #include "f_pc/f_pc_executor.h" -#include "d/d_procname.h" #include "d/d_com_inf_game.h" #include "SSystem/SComponent/c_malloc.h" #include "SSystem/SComponent/c_lib.h" @@ -89,7 +88,7 @@ fpc_ProcID fopKyM_createWpillar(cXyz const* i_pos, f32 scaleXZ, f32 scaleY, int params->mScale.z = scaleXZ; params->mParam = i_param; - return fopKyM_Create(PROC_WPILLAR, NULL, params); + return fopKyM_Create(fpcNm_WPILLAR_e, NULL, params); } /* 8002AB40-8002ABB4 .text fopKyM_createMpillar__FPC4cXyzf */ diff --git a/src/f_op/f_op_msg_mng.cpp b/src/f_op/f_op_msg_mng.cpp index 390dbb09f..7c40a4966 100644 --- a/src/f_op/f_op_msg_mng.cpp +++ b/src/f_op/f_op_msg_mng.cpp @@ -16,7 +16,6 @@ #include "f_pc/f_pc_layer_iter.h" #include "f_pc/f_pc_searcher.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" #include "d/actor/d_a_npc_bs1.h" #include "JSystem/J2DGraph/J2DTextBox.h" #include "JSystem/J2DGraph/J2DPicture.h" @@ -57,73 +56,73 @@ static struct { u8 itemNo; const char* filename; } itemicon[] = { - /* 0x00 */ {dItem_TELESCOPE_e, "telescope.bti"}, - /* 0x01 */ {NORMAL_SAIL, "sail_00.bti"}, - /* 0x02 */ {dItem_WIND_WAKER_e, "baton.bti"}, - /* 0x03 */ {dItem_GRAPPLING_HOOK_e, "rope.bti"}, - /* 0x04 */ {dItem_SPOILS_BAG_e, "coverofbeast.bti"}, - /* 0x05 */ {dItem_BOOMERANG_e, "boomerang.bti"}, - /* 0x06 */ {dItem_DEKU_LEAF_e, "fan.bti"}, - /* 0x07 */ {dItem_TINGLE_TUNER_e, "whistle.bti"}, - /* 0x08 */ {CAMERA, "camera.bti"}, - /* 0x09 */ {dItem_IRON_BOOTS_e, "boots_00.bti"}, - /* 0x0A */ {dItem_MAGIC_ARMOR_e, "shield_02.bti"}, - /* 0x0B */ {dItem_BAIT_BAG_e, "coverofbait.bti"}, - /* 0x0C */ {dItem_BOW_e, "bow_01.bti"}, - /* 0x0D */ {dItem_BOMB_BAG_e, "bomb_00.bti"}, - /* 0x0E */ {dItem_EMPTY_BOTTLE_e, "bottle_00.bti"}, - /* 0x0F */ {dItem_RED_POTION_e, "bottle_01.bti"}, - /* 0x10 */ {dItem_GREEN_POTION_e, "bottle_02.bti"}, - /* 0x11 */ {dItem_BLUE_POTION_e, "bottle_03.bti"}, - /* 0x12 */ {dItem_DELIVERY_BAG_e, "delivery.bti"}, - /* 0x13 */ {dItem_HOOKSHOT_e, "hookshot.bti"}, - /* 0x14 */ {dItem_SKULL_HAMMER_e, "hammer_01.bti"}, + /* 0x00 */ {dItemNo_TELESCOPE_e, "telescope.bti"}, + /* 0x01 */ {dItemNo_SAIL_e, "sail_00.bti"}, + /* 0x02 */ {dItemNo_WIND_WAKER_e, "baton.bti"}, + /* 0x03 */ {dItemNo_GRAPPLING_HOOK_e, "rope.bti"}, + /* 0x04 */ {dItemNo_SPOILS_BAG_e, "coverofbeast.bti"}, + /* 0x05 */ {dItemNo_BOOMERANG_e, "boomerang.bti"}, + /* 0x06 */ {dItemNo_DEKU_LEAF_e, "fan.bti"}, + /* 0x07 */ {dItemNo_TINGLE_TUNER_e, "whistle.bti"}, + /* 0x08 */ {dItemNo_PICTO_BOX_e, "camera.bti"}, + /* 0x09 */ {dItemNo_IRON_BOOTS_e, "boots_00.bti"}, + /* 0x0A */ {dItemNo_MAGIC_ARMOR_e, "shield_02.bti"}, + /* 0x0B */ {dItemNo_BAIT_BAG_e, "coverofbait.bti"}, + /* 0x0C */ {dItemNo_BOW_e, "bow_01.bti"}, + /* 0x0D */ {dItemNo_BOMB_BAG_e, "bomb_00.bti"}, + /* 0x0E */ {dItemNo_EMPTY_BOTTLE_e, "bottle_00.bti"}, + /* 0x0F */ {dItemNo_RED_POTION_e, "bottle_01.bti"}, + /* 0x10 */ {dItemNo_GREEN_POTION_e, "bottle_02.bti"}, + /* 0x11 */ {dItemNo_BLUE_POTION_e, "bottle_03.bti"}, + /* 0x12 */ {dItemNo_DELIVERY_BAG_e, "delivery.bti"}, + /* 0x13 */ {dItemNo_HOOKSHOT_e, "hookshot.bti"}, + /* 0x14 */ {dItemNo_SKULL_HAMMER_e, "hammer_01.bti"}, - /* 0x15 */ {dItem_MAGIC_ARMOR_e, "shield_02.bti"}, - /* 0x16 */ {dItem_MAGIC_ARMOR_e, "shield_02.bti"}, - /* 0x17 */ {dItem_MAGIC_ARMOR_e, "shield_02.bti"}, + /* 0x15 */ {dItemNo_MAGIC_ARMOR_e, "shield_02.bti"}, + /* 0x16 */ {dItemNo_MAGIC_ARMOR_e, "shield_02.bti"}, + /* 0x17 */ {dItemNo_MAGIC_ARMOR_e, "shield_02.bti"}, - /* 0x18 */ {dItem_SKULL_NECKLACE_e, "beast_01.bti"}, - /* 0x19 */ {dItem_BOKOBABA_SEED_e, "beast_02.bti"}, - /* 0x1A */ {dItem_GOLDEN_FEATHER_e, "beast_03.bti"}, - /* 0x1B */ {dItem_KNIGHTS_CREST_e, "beast_04.bti"}, - /* 0x1C */ {dItem_RED_JELLY_e, "beast_05.bti"}, - /* 0x1D */ {dItem_GREEN_JELLY_e, "beast_06.bti"}, - /* 0x1E */ {dItem_BLUE_JELLY_e, "beast_07.bti"}, - /* 0x1F */ {dItem_JOY_PENDANT_e, "beast_08.bti"}, + /* 0x18 */ {dItemNo_SKULL_NECKLACE_e, "beast_01.bti"}, + /* 0x19 */ {dItemNo_BOKOBABA_SEED_e, "beast_02.bti"}, + /* 0x1A */ {dItemNo_GOLDEN_FEATHER_e, "beast_03.bti"}, + /* 0x1B */ {dItemNo_KNIGHTS_CREST_e, "beast_04.bti"}, + /* 0x1C */ {dItemNo_RED_JELLY_e, "beast_05.bti"}, + /* 0x1D */ {dItemNo_GREEN_JELLY_e, "beast_06.bti"}, + /* 0x1E */ {dItemNo_BLUE_JELLY_e, "beast_07.bti"}, + /* 0x1F */ {dItemNo_JOY_PENDANT_e, "beast_08.bti"}, - /* 0x20 */ {dItem_NONE_e, "beast_09.bti"}, - /* 0x21 */ {dItem_NONE_e, "beast_10.bti"}, - /* 0x22 */ {dItem_NONE_e, "beast_11.bti"}, - /* 0x23 */ {dItem_NONE_e, "beast_12.bti"}, + /* 0x20 */ {dItemNo_NONE_e, "beast_09.bti"}, + /* 0x21 */ {dItemNo_NONE_e, "beast_10.bti"}, + /* 0x22 */ {dItemNo_NONE_e, "beast_11.bti"}, + /* 0x23 */ {dItemNo_NONE_e, "beast_12.bti"}, - /* 0x24 */ {dItem_HYOI_PEAR_e, "beast_02.bti"}, - /* 0x25 */ {dItem_BIRD_BAIT_5_e, "beast_02.bti"}, - /* 0x26 */ {dItem_NONE_e, "beast_03.bti"}, - /* 0x27 */ {dItem_NONE_e, "beast_04.bti"}, - /* 0x28 */ {dItem_NONE_e, "beast_05.bti"}, - /* 0x29 */ {dItem_NONE_e, "beast_06.bti"}, - /* 0x2A */ {dItem_NONE_e, "beast_07.bti"}, - /* 0x2B */ {dItem_NONE_e, "beast_08.bti"}, + /* 0x24 */ {dItemNo_HYOI_PEAR_e, "beast_02.bti"}, + /* 0x25 */ {dItemNo_BIRD_BAIT_5_e, "beast_02.bti"}, + /* 0x26 */ {dItemNo_NONE_e, "beast_03.bti"}, + /* 0x27 */ {dItemNo_NONE_e, "beast_04.bti"}, + /* 0x28 */ {dItemNo_NONE_e, "beast_05.bti"}, + /* 0x29 */ {dItemNo_NONE_e, "beast_06.bti"}, + /* 0x2A */ {dItemNo_NONE_e, "beast_07.bti"}, + /* 0x2B */ {dItemNo_NONE_e, "beast_08.bti"}, - /* 0x2C */ {dItem_NONE_e, "beast_09.bti"}, - /* 0x2D */ {dItem_NONE_e, "beast_10.bti"}, - /* 0x2E */ {dItem_NONE_e, "beast_11.bti"}, - /* 0x2F */ {dItem_NONE_e, "beast_12.bti"}, + /* 0x2C */ {dItemNo_NONE_e, "beast_09.bti"}, + /* 0x2D */ {dItemNo_NONE_e, "beast_10.bti"}, + /* 0x2E */ {dItemNo_NONE_e, "beast_11.bti"}, + /* 0x2F */ {dItemNo_NONE_e, "beast_12.bti"}, - /* 0x30 */ {FLOWER_1, "beast_02.bti"}, - /* 0x31 */ {FLOWER_2, "beast_02.bti"}, - /* 0x32 */ {FLOWER_3, "beast_03.bti"}, - /* 0x33 */ {HEROS_FLAG, "beast_04.bti"}, - /* 0x34 */ {TAIRYO_FLAG, "beast_05.bti"}, - /* 0x35 */ {SALES_FLAG, "beast_06.bti"}, - /* 0x36 */ {WIND_FLAG, "beast_07.bti"}, - /* 0x37 */ {RED_FLAG, "beast_08.bti"}, + /* 0x30 */ {dItemNo_TOWN_FLOWER_e, "beast_02.bti"}, + /* 0x31 */ {dItemNo_SEA_FLOWER_e, "beast_02.bti"}, + /* 0x32 */ {dItemNo_EXOTIC_FLOWER_e, "beast_03.bti"}, + /* 0x33 */ {dItemNo_HEROS_FLAG_e, "beast_04.bti"}, + /* 0x34 */ {dItemNo_BIG_CATCH_FLAG_e, "beast_05.bti"}, + /* 0x35 */ {dItemNo_BIG_SALE_FLAG_e, "beast_06.bti"}, + /* 0x36 */ {dItemNo_PINWHEEL_e, "beast_07.bti"}, + /* 0x37 */ {dItemNo_SICKLE_MOON_FLAG_e, "beast_08.bti"}, - /* 0x38 */ {FOSSIL_HEAD, "beast_09.bti"}, - /* 0x39 */ {WATER_STATUE, "beast_10.bti"}, - /* 0x3A */ {POSTMAN_STATUE, "beast_11.bti"}, - /* 0x3B */ {PRESIDENT_STATUE, "beast_12.bti"}, + /* 0x38 */ {dItemNo_SKULL_TOWER_IDOL_e, "beast_09.bti"}, + /* 0x39 */ {dItemNo_FOUNTAIN_IDOL_e, "beast_10.bti"}, + /* 0x3A */ {dItemNo_POSTMAN_STATUE_e, "beast_11.bti"}, + /* 0x3B */ {dItemNo_SHOP_GURU_STATUE_e, "beast_12.bti"}, }; struct fopMsgM_pane_alpha_class; @@ -358,10 +357,10 @@ fpc_ProcID fopMsgM_messageTypeSelect(fopAc_ac_c* param_1, cXyz* param_2, u32* pa fpc_ProcID pcId; if(*param_3 >> 0x10 == 0x63) { - pcId = fopMsgM_create(PROC_SCP, param_1, param_2, param_3, param_4, NULL); + pcId = fopMsgM_create(fpcNm_SCP_e, param_1, param_2, param_3, param_4, NULL); } else if(*param_3 >> 0x10 == 0x59) { - pcId = fopMsgM_create(PROC_PB, param_1, param_2, param_3, param_4, NULL); + pcId = fopMsgM_create(fpcNm_PB_e, param_1, param_2, param_3, param_4, NULL); } else { mesg_header* header = msgGet.getMesgHeader(*param_3); @@ -375,22 +374,22 @@ fpc_ProcID fopMsgM_messageTypeSelect(fopAc_ac_c* param_1, cXyz* param_2, u32* pa dComIfGp_setMessageRupee(price); if(type == 2 || type == 6 || type == 7) { - pcId = fopMsgM_create(PROC_MSG2, param_1, param_2, param_3, param_4, NULL); + pcId = fopMsgM_create(fpcNm_MSG2_e, param_1, param_2, param_3, param_4, NULL); } else { - pcId = fopMsgM_create(PROC_MSG, param_1, param_2, param_3, param_4, NULL); + pcId = fopMsgM_create(fpcNm_MSG_e, param_1, param_2, param_3, param_4, NULL); } } else { *param_3 = 1; *param_4 = *param_3; - pcId = fopMsgM_create(PROC_MSG, param_1, param_2, param_3, param_4, NULL); + pcId = fopMsgM_create(fpcNm_MSG_e, param_1, param_2, param_3, param_4, NULL); } } else { *param_3 = 1; *param_4 = *param_3; - pcId = fopMsgM_create(PROC_MSG, param_1, param_2, param_3, param_4, NULL); + pcId = fopMsgM_create(fpcNm_MSG_e, param_1, param_2, param_3, param_4, NULL); } JKRFileLoader::removeResource(header, NULL); @@ -441,7 +440,7 @@ fpc_ProcID fopMsgM_messageSet(u32 msgNo, fopAc_ac_c* pActor) { else { pMsg->mMsgNo = msgNo; pMsg->field_0xf0 = msgNo; - if(fopMsgM_SearchByName(PROC_SCP) || fopMsgM_SearchByName(PROC_PB)) { + if(fopMsgM_SearchByName(fpcNm_SCP_e) || fopMsgM_SearchByName(fpcNm_PB_e)) { fopMsgM_Delete(pMsg); i_msgID = fpcM_ERROR_PROCESS_ID_e; } @@ -474,7 +473,7 @@ fpc_ProcID fopMsgM_messageSet(u32 msgNo, cXyz* lookAtPos) { else { pMsg->mMsgNo = msgNo; pMsg->field_0xf0 = msgNo; - if(fopMsgM_SearchByName(PROC_SCP) || fopMsgM_SearchByName(PROC_PB)) { + if(fopMsgM_SearchByName(fpcNm_SCP_e) || fopMsgM_SearchByName(fpcNm_PB_e)) { fopMsgM_Delete(pMsg); i_msgID = fpcM_ERROR_PROCESS_ID_e; } @@ -506,7 +505,7 @@ fpc_ProcID fopMsgM_messageSet(u32 msgNo) { else { pMsg->mMsgNo = msgNo; pMsg->field_0xf0 = msgNo; - if(fopMsgM_SearchByName(PROC_SCP) || fopMsgM_SearchByName(PROC_PB)) { + if(fopMsgM_SearchByName(fpcNm_SCP_e) || fopMsgM_SearchByName(fpcNm_PB_e)) { fopMsgM_Delete(pMsg); i_msgID = fpcM_ERROR_PROCESS_ID_e; } @@ -560,7 +559,7 @@ u32 fopMsgM_tactMessageSet() { else { pMsg->mMsgNo = msgNoTemp; pMsg->field_0xf0 = msgNoTemp; - if(fopMsgM_SearchByName(PROC_SCP) || fopMsgM_SearchByName(PROC_PB)) { + if(fopMsgM_SearchByName(fpcNm_SCP_e) || fopMsgM_SearchByName(fpcNm_PB_e)) { fopMsgM_Delete(pMsg); i_msgID = fpcM_ERROR_PROCESS_ID_e; } diff --git a/src/f_op/f_op_scene_mng.cpp b/src/f_op/f_op_scene_mng.cpp index ac5197c64..88307167a 100644 --- a/src/f_op/f_op_scene_mng.cpp +++ b/src/f_op/f_op_scene_mng.cpp @@ -7,7 +7,6 @@ #include "f_op/f_op_scene_iter.h" #include "f_op/f_op_scene_req.h" #include "f_pc/f_pc_searcher.h" -#include "d/d_procname.h" #include "JSystem/JUtility/JUTAssert.h" scene_class* fopScnM_SearchByID(fpc_ProcID id) { @@ -28,7 +27,7 @@ BOOL fopScnM_ChangeReq(scene_class* i_scene, s16 procName, s16 fadeProcName, u16 } BOOL fopScnM_DeleteReq(scene_class* i_scene) { - uint sceneRequestID = fopScnRq_Request(1, i_scene, PROC_INVALID_e, 0, PROC_INVALID_e, 0); + uint sceneRequestID = fopScnRq_Request(1, i_scene, fpcNm_INVALID_e, 0, fpcNm_INVALID_e, 0); return sceneRequestID != -1; } diff --git a/src/f_pc/f_pc_layer.cpp b/src/f_pc/f_pc_layer.cpp index 5de5e6239..3d502180b 100644 --- a/src/f_pc/f_pc_layer.cpp +++ b/src/f_pc/f_pc_layer.cpp @@ -72,11 +72,11 @@ void fpcLy_CreatedMesg(layer_class* i_layer) { } } -layer_class l_fpcLy_Crear = { +static layer_class l_fpcLy_Crear = { NULL, NULL, 0, 0xFFFFFFFF, NULL, 0, NULL, NULL, NULL, 0, 0, 0, }; -node_list_class l_fpcLy_LayerList = { +static node_list_class l_fpcLy_LayerList = { NULL, NULL, 0, diff --git a/src/m_Do/m_Do_audio.cpp b/src/m_Do/m_Do_audio.cpp index 9625099ef..16fea5995 100644 --- a/src/m_Do/m_Do_audio.cpp +++ b/src/m_Do/m_Do_audio.cpp @@ -107,8 +107,8 @@ void mDoAud_setupStreamBuffer() { JAInter::StreamLib::setDeallocBufferCallback(mDoAud_deallocStreamBuffer); } -mDoDvdThd_toMainRam_c* l_affCommand; -mDoDvdThd_mountArchive_c* l_arcCommand; +static mDoDvdThd_toMainRam_c* l_affCommand; +static mDoDvdThd_mountArchive_c* l_arcCommand; /* 80007090-80007224 .text mDoAud_Create__Fv */ void mDoAud_Create() {