diff options
| author | Huitzi <73550465+marwernerh@users.noreply.github.com> | 2026-03-09 21:33:31 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-03-09 18:33:31 -0700 |
| commit | 0b0fdd1f60193d1e3e610326cc2cf2a7b558d366 (patch) | |
| tree | a39b648ba460b5f80dad748690fa43f6f780e5a6 /include/d | |
| parent | 30e839c28be83fb07bfbe008d3eb9eb9127e3801 (diff) | |
Actor status consolidation & process profile definition editing (#3117)
* Consolidate fopAcM_STATUS into fopAc_Status_e
* Add _e suffix to fopAcStts enums
* Prepare for profile enumeration
* Correct typo in scene_process_profile_definition
* Manually handle g_profile_Obj_DamCps (inline preprocessing)
* Correct g_profile_TAG_LV5SOUP procname to enum
* Create d_priority.h
* Update process profile definitions
* Moved inline comments to the left
* Add missing fopAcStts enums
* Add d_priority.h include in f_pc_leaf.h
* Manually update d_a_obj_damCps profile
* Replace fopAcStts enums replacing and anticipatory profile size correction
* Changed profile size from literal to sizeof() in anticipation of PR #3116
* Provided putative names to staff-related status enums
* Replaced appropriate literals with fopAcStts enums
* Fix borked merge
* Rename item number enums and move to d_item_data.h
* Rename process profile name & draw priority enums
* Move process profile name & draw priority enums to appropriate files
* Moved fpcNm_ enums from d/d_procname.h to f_pc/f_pc_name.h
* Moved fpcDwPi_ enums from d/d_priority.h to f_pc/f_pc_draw_priority.h
* ACTUALLY (whoops) stage merge
* Correct item mistranslation
Co-authored-by: LagoLunatic <LagoLunatic@users.noreply.github.com>
---------
Co-authored-by: LagoLunatic <LagoLunatic@users.noreply.github.com>
Diffstat (limited to 'include/d')
| -rw-r--r-- | include/d/actor/d_a_alink.h | 20 | ||||
| -rw-r--r-- | include/d/actor/d_a_arrow.h | 4 | ||||
| -rw-r--r-- | include/d/actor/d_a_npc_ins.h | 2 | ||||
| -rw-r--r-- | include/d/actor/d_a_npc_jagar.h | 2 | ||||
| -rw-r--r-- | include/d/actor/d_a_npc_shad.h | 6 | ||||
| -rw-r--r-- | include/d/actor/d_a_obj_eff.h | 2 | ||||
| -rw-r--r-- | include/d/actor/d_a_player.h | 20 | ||||
| -rw-r--r-- | include/d/actor/d_a_tag_lantern.h | 2 | ||||
| -rw-r--r-- | include/d/actor/d_a_tag_mhint.h | 2 | ||||
| -rw-r--r-- | include/d/d_bomb.h | 26 | ||||
| -rw-r--r-- | include/d/d_com_inf_game.h | 2 | ||||
| -rw-r--r-- | include/d/d_item_data.h | 259 | ||||
| -rw-r--r-- | include/d/d_k_wmark.h | 2 | ||||
| -rw-r--r-- | include/d/d_procname.h | 805 | ||||
| -rw-r--r-- | include/d/d_save.h | 2 |
15 files changed, 305 insertions, 851 deletions
diff --git a/include/d/actor/d_a_alink.h b/include/d/actor/d_a_alink.h index ced12d318e..7c70ea54e5 100644 --- a/include/d/actor/d_a_alink.h +++ b/include/d/actor/d_a_alink.h @@ -3232,7 +3232,7 @@ public: virtual bool checkChainBlockPushPull(); virtual BOOL checkElecDamage() const { return mProcID == PROC_ELEC_DAMAGE; } virtual BOOL checkEmptyBottleSwing() const { - return mEquipItem == fpcNm_ITEM_EMPTY_BOTTLE && mProcID == PROC_BOTTLE_SWING; + return mEquipItem == dItemNo_EMPTY_BOTTLE_e && mProcID == PROC_BOTTLE_SWING; } virtual BOOL checkBottleSwingMode() const { return mProcID == PROC_BOTTLE_SWING; } virtual BOOL checkHawkWait() const { return mProcID == PROC_HAWK_SUBJECT; } @@ -3334,7 +3334,7 @@ public: virtual u32 checkBoardRide() const; virtual u32 checkSpinnerRide() const; virtual bool checkArrowChargeEnd() const; - virtual bool checkNoEquipItem() const { return mEquipItem == fpcNm_ITEM_NONE; } + virtual bool checkNoEquipItem() const { return mEquipItem == dItemNo_NONE_e; } virtual bool checkKandelaarSwing(int) const; virtual s16 getBoardCutTurnOffsetAngleY() const { if (mProcID == PROC_BOARD_CUT_TURN) { @@ -3402,7 +3402,7 @@ public: } virtual BOOL checkWolfDownAttackPullOut() const { return mProcID == PROC_WOLF_DOWN_AT_LAND; } virtual cXyz* getMidnaAtnPos() const { return (cXyz*)&mMidnaAtnPos; } - virtual bool checkCopyRodEquip() const { return mEquipItem == fpcNm_ITEM_COPY_ROD; } + virtual bool checkCopyRodEquip() const { return mEquipItem == dItemNo_COPY_ROD_e; } virtual void setKandelaarMtx(Mtx i_mtx, int, int); virtual bool getStickAngleFromPlayerShape(s16* o_angle) const; virtual bool checkSpinnerPathMove(); @@ -3487,11 +3487,11 @@ public: return checkHookshotReadyAnime() || checkHookshotShootAnime(); } BOOL checkBoomerangReadyAnime() const { - return (mEquipItem == fpcNm_ITEM_BOOMERANG || mEquipItem == 0x102) && checkUpperAnime(dRes_ID_ALANM_BCK_BOOMWAIT_e); + return (mEquipItem == dItemNo_BOOMERANG_e || mEquipItem == 0x102) && checkUpperAnime(dRes_ID_ALANM_BCK_BOOMWAIT_e); } bool checkDkCaught2Anime() const { return checkUpperAnime(dRes_ID_ALANM_BCK_WAITHDB_e); } BOOL checkCopyRodThrowAnime() const { - return mEquipItem == fpcNm_ITEM_COPY_ROD && checkUpperAnime(dRes_ID_ALANM_BCK_BOOMTHROW_e); + return mEquipItem == dItemNo_COPY_ROD_e && checkUpperAnime(dRes_ID_ALANM_BCK_BOOMTHROW_e); } BOOL checkCutDashChargeAnime() const { return checkUpperAnime(dRes_ID_ALANM_BCK_CUTDTP_e); } BOOL checkBoomerangAnimeAndReturnWait() const { return checkBoomerangAnime(); } @@ -3526,7 +3526,7 @@ public: bool checkDashDamageAnime() const { return checkUpperAnime(dRes_ID_ALANM_BCK_DAMD_e); } bool checkBoomerangCatchAnime() const { return checkUpperAnime(dRes_ID_ALANM_BCK_BOOMCATCH_e); } BOOL checkCopyRodReadyAnime() const { - return mEquipItem == fpcNm_ITEM_COPY_ROD && checkUpperAnime(dRes_ID_ALANM_BCK_BOOMWAIT_e); + return mEquipItem == dItemNo_COPY_ROD_e && checkUpperAnime(dRes_ID_ALANM_BCK_BOOMWAIT_e); } BOOL checkCanoeFishingWaitAnime() const { return checkUpperAnime(dRes_ID_ALANM_BCK_CANOEREELINGR_e) || checkUpperAnime(dRes_ID_ALANM_BCK_WAITFISHR_e); @@ -3685,12 +3685,12 @@ public: } bool checkFisingRodJewl() const { - return (mEquipItem == fpcNm_ITEM_JEWEL_ROD || mEquipItem == fpcNm_ITEM_JEWEL_WORM_ROD) || mEquipItem == fpcNm_ITEM_JEWEL_BEE_ROD; + return (mEquipItem == dItemNo_JEWEL_ROD_e || mEquipItem == dItemNo_JEWEL_WORM_ROD_e) || mEquipItem == dItemNo_JEWEL_BEE_ROD_e; } - bool checkFisingRodWorm() const { return mItemMode == fpcNm_ITEM_WORM; } + bool checkFisingRodWorm() const { return mItemMode == dItemNo_WORM_e; } - bool checkFisingRodBee() const { return mItemMode == fpcNm_ITEM_BEE_CHILD; } + bool checkFisingRodBee() const { return mItemMode == dItemNo_BEE_CHILD_e; } void fishingCastWaitAnimeStart() { if (mProcID == PROC_FISHING_CAST) { @@ -3772,7 +3772,7 @@ public: void setGrassCancelStatus(u8 i_status) { setBStatus(i_status); } void seStartSystem(u32 i_soundID) { mDoAud_seStart(i_soundID, NULL, 0, 0); } - bool checkIronBallEquip() const { return mEquipItem == fpcNm_ITEM_IRONBALL; } + bool checkIronBallEquip() const { return mEquipItem == dItemNo_IRONBALL_e; } BOOL checkFishingRodEquip() const { return checkFishingRodItem(mEquipItem); } f32 getAnmSpeedStickRate(f32 param_0, f32 param_1) const { diff --git a/include/d/actor/d_a_arrow.h b/include/d/actor/d_a_arrow.h index 66b4a9d901..682ffd43d7 100644 --- a/include/d/actor/d_a_arrow.h +++ b/include/d/actor/d_a_arrow.h @@ -74,7 +74,7 @@ public: void deleteArrow() { field_0x93f = 1; } static fopAc_ac_c* makeArrow(fopAc_ac_c* i_actor, u16 param_1) { - return (fopAc_ac_c*)fopAcM_fastCreate(PROC_ARROW, + return (fopAc_ac_c*)fopAcM_fastCreate(fpcNm_ARROW_e, param_1 << 8, &i_actor->current.pos, fopAcM_GetRoomNo(i_actor), @@ -86,7 +86,7 @@ public: } static fopAc_ac_c* makeSlingStone(fopAc_ac_c* i_actor, cXyz* i_pos) { - return (fopAc_ac_c*)fopAcM_fastCreate(PROC_ARROW, + return (fopAc_ac_c*)fopAcM_fastCreate(fpcNm_ARROW_e, 0x401, i_pos, fopAcM_GetRoomNo(i_actor), diff --git a/include/d/actor/d_a_npc_ins.h b/include/d/actor/d_a_npc_ins.h index 0437a01e30..3f8b40a9a0 100644 --- a/include/d/actor/d_a_npc_ins.h +++ b/include/d/actor/d_a_npc_ins.h @@ -107,7 +107,7 @@ public: bool isInsect(int type) { bool rv = false; - if (type >= fpcNm_ITEM_M_BEETLE && type <= fpcNm_ITEM_F_MAYFLY) { + if (type >= dItemNo_M_BEETLE_e && type <= dItemNo_F_MAYFLY_e) { rv = true; } diff --git a/include/d/actor/d_a_npc_jagar.h b/include/d/actor/d_a_npc_jagar.h index 63891084fc..fbedc8ca1e 100644 --- a/include/d/actor/d_a_npc_jagar.h +++ b/include/d/actor/d_a_npc_jagar.h @@ -206,7 +206,7 @@ public: int crashPumpkin(fopAc_ac_c* pumpkin_p) { int reg_r30; - if (mType == 0 && fopAcM_GetName(pumpkin_p) == PROC_OBJ_PUMPKIN && !daNpcT_chkEvtBit(0xAE) + if (mType == 0 && fopAcM_GetName(pumpkin_p) == fpcNm_OBJ_PUMPKIN_e && !daNpcT_chkEvtBit(0xAE) && daNpcT_chkEvtBit(0x25B) && !daNpcT_chkEvtBit(0x235)) { ++field_0xffc; reg_r30 = chkPointInArea(pumpkin_p->current.pos, current.pos, mpHIO->m.pumpkin_watch_range, diff --git a/include/d/actor/d_a_npc_shad.h b/include/d/actor/d_a_npc_shad.h index 0afc724746..ba94bbe74e 100644 --- a/include/d/actor/d_a_npc_shad.h +++ b/include/d/actor/d_a_npc_shad.h @@ -214,15 +214,15 @@ public: void searchActors() { if (mMode == 0) { if (mActorMngr[1].getActorP() == NULL) { - mActorMngr[1].entry(fopAcM_SearchByName(PROC_NPC_ASH)); + mActorMngr[1].entry(fopAcM_SearchByName(fpcNm_NPC_ASH_e)); } if (mActorMngr[2].getActorP() == NULL) { - mActorMngr[2].entry(fopAcM_SearchByName(PROC_NPC_RAFREL)); + mActorMngr[2].entry(fopAcM_SearchByName(fpcNm_NPC_RAFREL_e)); } if (mActorMngr[3].getActorP() == NULL) { - mActorMngr[3].entry(fopAcM_SearchByName(PROC_NPC_MOIR)); + mActorMngr[3].entry(fopAcM_SearchByName(fpcNm_NPC_MOIR_e)); } if (mActorMngr[4].getActorP() == NULL) { diff --git a/include/d/actor/d_a_obj_eff.h b/include/d/actor/d_a_obj_eff.h index 4df3d0502b..79309d84a6 100644 --- a/include/d/actor/d_a_obj_eff.h +++ b/include/d/actor/d_a_obj_eff.h @@ -32,7 +32,7 @@ public: static void make_land_smoke(cXyz* i_pos, f32 i_scale) { cXyz scale(i_scale, i_scale, i_scale); scale *= 1.6666666f; - fopAcM_create(PROC_Obj_Eff, 3, i_pos, -1, NULL, &scale, -1); + fopAcM_create(fpcNm_Obj_Eff_e, 3, i_pos, -1, NULL, &scale, -1); } }; }; // namespace daObjEff diff --git a/include/d/actor/d_a_player.h b/include/d/actor/d_a_player.h index 0b3dbed490..e81bce0a94 100644 --- a/include/d/actor/d_a_player.h +++ b/include/d/actor/d_a_player.h @@ -687,8 +687,8 @@ public: static void setMidnaMotionNum(int i_motionNum); static void setMidnaFaceNum(int i_faceNum); - static BOOL checkShieldGet() { return dComIfGs_getSelectEquipShield() != fpcNm_ITEM_NONE; } - static BOOL checkSwordGet() { return dComIfGs_getSelectEquipSword() != fpcNm_ITEM_NONE; } + static BOOL checkShieldGet() { return dComIfGs_getSelectEquipShield() != dItemNo_NONE_e; } + static BOOL checkSwordGet() { return dComIfGs_getSelectEquipSword() != dItemNo_NONE_e; } cXyz getHeadTopPos() const { return mHeadTopPos; } u32 checkThrowDamage() const { return checkNoResetFlg1(FLG1_THROW_DAMAGE); } @@ -1123,40 +1123,40 @@ public: static int getLastSceneDamage() { return (dComIfGs_getLastSceneMode() >> 4) & 0x7F; } static u32 getLastSceneSwordAtUpTime() { return (dComIfGs_getLastSceneMode() >> 11) & 0xFF; } - static BOOL checkNormalSwordEquip() { return dComIfGs_getSelectEquipSword() == fpcNm_ITEM_SWORD; } + static BOOL checkNormalSwordEquip() { return dComIfGs_getSelectEquipSword() == dItemNo_SWORD_e; } static u32 getLastSceneMode() { return dComIfGs_getLastSceneMode() & 0xF; } static bool checkWoodSwordEquip() { - return dComIfGs_getSelectEquipSword() == fpcNm_ITEM_WOOD_STICK; + return dComIfGs_getSelectEquipSword() == dItemNo_WOOD_STICK_e; } static bool checkLightMasterSwordEquip() { - return dComIfGs_getSelectEquipSword() == fpcNm_ITEM_LIGHT_SWORD; + return dComIfGs_getSelectEquipSword() == dItemNo_LIGHT_SWORD_e; } static bool checkCasualWearFlg() { - return dComIfGs_getSelectEquipClothes() == fpcNm_ITEM_WEAR_CASUAL; + return dComIfGs_getSelectEquipClothes() == dItemNo_WEAR_CASUAL_e; } static u32 checkNowWolf() { return ((daPy_py_c*)dComIfGp_getLinkPlayer())->checkWolf(); } static bool checkZoraWearFlg() { - return dComIfGs_getSelectEquipClothes() == fpcNm_ITEM_WEAR_ZORA; + return dComIfGs_getSelectEquipClothes() == dItemNo_WEAR_ZORA_e; } static bool checkMagicArmorWearFlg() { - return dComIfGs_getSelectEquipClothes() == fpcNm_ITEM_ARMOR; + return dComIfGs_getSelectEquipClothes() == dItemNo_ARMOR_e; } static bool checkCarvingWoodShieldEquip() { - return dComIfGs_getSelectEquipShield() == fpcNm_ITEM_WOOD_SHIELD; + return dComIfGs_getSelectEquipShield() == dItemNo_WOOD_SHIELD_e; } static bool checkShopWoodShieldEquip() { - return dComIfGs_getSelectEquipShield() == fpcNm_ITEM_SHIELD; + return dComIfGs_getSelectEquipShield() == dItemNo_SHIELD_e; } static BOOL checkPowerGloveGet() { return false; } diff --git a/include/d/actor/d_a_tag_lantern.h b/include/d/actor/d_a_tag_lantern.h index 54e1e5cf22..c0e0c0d152 100644 --- a/include/d/actor/d_a_tag_lantern.h +++ b/include/d/actor/d_a_tag_lantern.h @@ -45,7 +45,7 @@ public: BOOL rt = false; if (fopAcM_searchPlayerDistanceXZ(this) < scale.x && 0.0f <= var_f31 && var_f31 < scale.y) { - rt = dComIfGp_checkItemGet(fpcNm_ITEM_KANTERA, 1) && dComIfGs_getOil() != 0; + rt = dComIfGp_checkItemGet(dItemNo_KANTERA_e, 1) && dComIfGs_getOil() != 0; field_0x5f8 = rt == true ? 0 : 1; } else { rt = true; diff --git a/include/d/actor/d_a_tag_mhint.h b/include/d/actor/d_a_tag_mhint.h index 29086d4ddf..e4c5260079 100644 --- a/include/d/actor/d_a_tag_mhint.h +++ b/include/d/actor/d_a_tag_mhint.h @@ -21,7 +21,7 @@ public: static void createPortalWarpMissTag(u16 param_0, fpc_ProcID i_parentID) { csXyz sp18(-1, -1, param_0); - fopAcM_createChild(PROC_Tag_Mhint, i_parentID, 0x800FFFFF, + fopAcM_createChild(fpcNm_Tag_Mhint_e, i_parentID, 0x800FFFFF, &daPy_getLinkPlayerActorClass()->current.pos, dComIfGp_roomControl_getStayNo(), &sp18, NULL, -1, NULL); } diff --git a/include/d/d_bomb.h b/include/d/d_bomb.h index 79e0d90f08..66256dacf8 100644 --- a/include/d/d_bomb.h +++ b/include/d/d_bomb.h @@ -39,63 +39,63 @@ public: bool checkStateExplode() { return fopAcM_GetParam(this) == 0; } static bool checkBombActor(fopAc_ac_c* i_actor) { - return fopAcM_GetName(i_actor) == PROC_NBOMB; + return fopAcM_GetName(i_actor) == fpcNm_NBOMB_e; } static fopAc_ac_c* createNormalBombPlayer(cXyz* i_pos) { - return (fopAc_ac_c*)fopAcM_fastCreate(PROC_NBOMB, 8, i_pos, -1, NULL, NULL, -1, NULL, NULL); + return (fopAc_ac_c*)fopAcM_fastCreate(fpcNm_NBOMB_e, 8, i_pos, -1, NULL, NULL, -1, NULL, NULL); } static fopAc_ac_c* createNormalBombExplode(cXyz* i_pos) { - return (fopAc_ac_c*)fopAcM_fastCreate(PROC_NBOMB, 0, i_pos, -1, NULL, NULL, -1, NULL, NULL); + return (fopAc_ac_c*)fopAcM_fastCreate(fpcNm_NBOMB_e, 0, i_pos, -1, NULL, NULL, -1, NULL, NULL); } static fopAc_ac_c* createWaterBombPlayer(cXyz* i_pos) { - return (fopAc_ac_c*)fopAcM_fastCreate(PROC_NBOMB, 9, i_pos, -1, NULL, NULL, -1, NULL, NULL); + return (fopAc_ac_c*)fopAcM_fastCreate(fpcNm_NBOMB_e, 9, i_pos, -1, NULL, NULL, -1, NULL, NULL); } static fopAc_ac_c* createFlowerBomb(cXyz* i_pos, csXyz* i_angle, int param_2) { - return (fopAc_ac_c*)fopAcM_fastCreate(PROC_NBOMB, 4, i_pos, param_2, i_angle, NULL, -1, + return (fopAc_ac_c*)fopAcM_fastCreate(fpcNm_NBOMB_e, 4, i_pos, param_2, i_angle, NULL, -1, NULL, NULL); } static fopAc_ac_c* createInsectBombPlayer(cXyz* i_pos) { - return (fopAc_ac_c*)fopAcM_fastCreate(PROC_NBOMB, 10, i_pos, -1, NULL, NULL, -1, + return (fopAc_ac_c*)fopAcM_fastCreate(fpcNm_NBOMB_e, 10, i_pos, -1, NULL, NULL, -1, NULL, NULL); } static fopAc_ac_c* createEnemyBombBoomerang(cXyz* i_pos, csXyz* i_angle, int i_roomNo) { - return (fopAc_ac_c*)fopAcM_fastCreate(PROC_NBOMB, 12, i_pos, i_roomNo, i_angle, NULL, -1, + return (fopAc_ac_c*)fopAcM_fastCreate(fpcNm_NBOMB_e, 12, i_pos, i_roomNo, i_angle, NULL, -1, NULL, NULL); } static fopAc_ac_c* createWaterBombExplode(cXyz* i_pos) { - return (fopAc_ac_c*)fopAcM_fastCreate(PROC_NBOMB, 18, i_pos, -1, NULL, NULL, -1, NULL, + return (fopAc_ac_c*)fopAcM_fastCreate(fpcNm_NBOMB_e, 18, i_pos, -1, NULL, NULL, -1, NULL, NULL); } static fopAc_ac_c* createEnemyWaterBomb(cXyz* i_pos, csXyz* i_angle, int i_roomNo) { - return (fopAc_ac_c*)fopAcM_fastCreate(PROC_NBOMB, 14, i_pos, i_roomNo, i_angle, NULL, -1, + return (fopAc_ac_c*)fopAcM_fastCreate(fpcNm_NBOMB_e, 14, i_pos, i_roomNo, i_angle, NULL, -1, NULL, NULL); } static fopAc_ac_c* createEnemyWaterBombHookshot(cXyz* i_pos, csXyz* i_angle, int i_roomNo) { - return (fopAc_ac_c*)fopAcM_fastCreate(PROC_NBOMB, 16, i_pos, i_roomNo, i_angle, NULL, -1, + return (fopAc_ac_c*)fopAcM_fastCreate(fpcNm_NBOMB_e, 16, i_pos, i_roomNo, i_angle, NULL, -1, NULL, NULL); } static fopAc_ac_c* createBombCargoCarry(cXyz* i_pos, csXyz* i_angle, int i_roomNo) { - return (fopAc_ac_c*)fopAcM_fastCreate(PROC_NBOMB, 0x11, i_pos, i_roomNo, i_angle, NULL, -1, + return (fopAc_ac_c*)fopAcM_fastCreate(fpcNm_NBOMB_e, 0x11, i_pos, i_roomNo, i_angle, NULL, -1, NULL, NULL); } static fopAc_ac_c* createEnemyBombHookshot(cXyz* i_pos, csXyz* i_angle, int i_roomNo) { - return (fopAc_ac_c*)fopAcM_fastCreate(PROC_NBOMB, 13, i_pos, i_roomNo, i_angle, NULL, -1, + return (fopAc_ac_c*)fopAcM_fastCreate(fpcNm_NBOMB_e, 13, i_pos, i_roomNo, i_angle, NULL, -1, NULL, NULL); } static fopAc_ac_c* createEnemyBomb(cXyz* i_pos, csXyz* i_angle, int i_roomNo) { - return (fopAc_ac_c*)fopAcM_fastCreate(PROC_NBOMB, 0xB, i_pos, i_roomNo, i_angle, NULL, -1, + return (fopAc_ac_c*)fopAcM_fastCreate(fpcNm_NBOMB_e, 0xB, i_pos, i_roomNo, i_angle, NULL, -1, NULL, NULL); } }; diff --git a/include/d/d_com_inf_game.h b/include/d/d_com_inf_game.h index 18165eb628..cc233eb750 100644 --- a/include/d/d_com_inf_game.h +++ b/include/d/d_com_inf_game.h @@ -4209,7 +4209,7 @@ inline void dComIfGp_clearItemBombNumCount(u8 i_no) { } inline s16 dComIfGp_getItemMaxBombNumCount() { - return g_dComIfG_gameInfo.play.getItemMaxBombNumCount(fpcNm_ITEM_NORMAL_BOMB); + return g_dComIfG_gameInfo.play.getItemMaxBombNumCount(dItemNo_NORMAL_BOMB_e); } inline void dComIfGp_setNowVibration(u8 status) { diff --git a/include/d/d_item_data.h b/include/d/d_item_data.h index a7e658c1a3..a1770be241 100644 --- a/include/d/d_item_data.h +++ b/include/d/d_item_data.h @@ -91,4 +91,263 @@ struct dItem_data { static dItem_itemInfo item_info[255]; }; +enum { + /* 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_SILVER_RUPEE_e, + /* 0x08 */ dItemNo_S_MAGIC_e, + /* 0x09 */ dItemNo_L_MAGIC_e, + /* 0x0A */ dItemNo_BOMB_5_e, + /* 0x0B */ dItemNo_BOMB_10_e, + /* 0x0C */ dItemNo_BOMB_20_e, + /* 0x0D */ dItemNo_BOMB_30_e, + /* 0x0E */ dItemNo_ARROW_10_e, + /* 0x0F */ dItemNo_ARROW_20_e, + /* 0x10 */ dItemNo_ARROW_30_e, + /* 0x11 */ dItemNo_ARROW_1_e, + /* 0x12 */ dItemNo_PACHINKO_SHOT_e, + /* 0x13 */ dItemNo_NOENTRY_19_e, + /* 0x14 */ dItemNo_NOENTRY_20_e, + /* 0x15 */ dItemNo_NOENTRY_21_e, + /* 0x16 */ dItemNo_WATER_BOMB_5_e, + /* 0x17 */ dItemNo_WATER_BOMB_10_e, + /* 0x18 */ dItemNo_WATER_BOMB_20_e, + /* 0x19 */ dItemNo_WATER_BOMB_30_e, + /* 0x1A */ dItemNo_BOMB_INSECT_5_e, + /* 0x1B */ dItemNo_BOMB_INSECT_10_e, + /* 0x1C */ dItemNo_BOMB_INSECT_20_e, + /* 0x1D */ dItemNo_BOMB_INSECT_30_e, + /* 0x1E */ dItemNo_RECOVERY_FAILY_e, + /* 0x1F */ dItemNo_TRIPLE_HEART_e, + /* 0x20 */ dItemNo_SMALL_KEY_e, + /* 0x21 */ dItemNo_KAKERA_HEART_e, + /* 0x22 */ dItemNo_UTAWA_HEART_e, + /* 0x23 */ dItemNo_MAP_e, + /* 0x24 */ dItemNo_COMPUS_e, + /* 0x25 */ dItemNo_DUNGEON_EXIT_e, + /* 0x26 */ dItemNo_BOSS_KEY_e, + /* 0x27 */ dItemNo_DUNGEON_BACK_e, + /* 0x28 */ dItemNo_SWORD_e, + /* 0x29 */ dItemNo_MASTER_SWORD_e, + /* 0x2A */ dItemNo_WOOD_SHIELD_e, + /* 0x2B */ dItemNo_SHIELD_e, + /* 0x2C */ dItemNo_HYLIA_SHIELD_e, + /* 0x2D */ dItemNo_TKS_LETTER_e, + /* 0x2E */ dItemNo_WEAR_CASUAL_e, + /* 0x2F */ dItemNo_WEAR_KOKIRI_e, + /* 0x30 */ dItemNo_ARMOR_e, + /* 0x31 */ dItemNo_WEAR_ZORA_e, + /* 0x32 */ dItemNo_MAGIC_LV1_e, + /* 0x33 */ dItemNo_DUNGEON_EXIT_2_e, + /* 0x34 */ dItemNo_WALLET_LV1_e, + /* 0x35 */ dItemNo_WALLET_LV2_e, + /* 0x36 */ dItemNo_WALLET_LV3_e, + /* 0x37 */ dItemNo_NOENTRY_55_e, + /* 0x38 */ dItemNo_NOENTRY_56_e, + /* 0x39 */ dItemNo_NOENTRY_57_e, + /* 0x3A */ dItemNo_NOENTRY_58_e, + /* 0x3B */ dItemNo_NOENTRY_59_e, + /* 0x3C */ dItemNo_NOENTRY_60_e, + /* 0x3D */ dItemNo_ZORAS_JEWEL_e, + /* 0x3E */ dItemNo_HAWK_EYE_e, + /* 0x3F */ dItemNo_WOOD_STICK_e, + /* 0x40 */ dItemNo_BOOMERANG_e, + /* 0x41 */ dItemNo_SPINNER_e, + /* 0x42 */ dItemNo_IRONBALL_e, + /* 0x43 */ dItemNo_BOW_e, + /* 0x44 */ dItemNo_HOOKSHOT_e, + /* 0x45 */ dItemNo_HVY_BOOTS_e, + /* 0x46 */ dItemNo_COPY_ROD_e, + /* 0x47 */ dItemNo_W_HOOKSHOT_e, + /* 0x48 */ dItemNo_KANTERA_e, + /* 0x49 */ dItemNo_LIGHT_SWORD_e, + /* 0x4A */ dItemNo_FISHING_ROD_1_e, + /* 0x4B */ dItemNo_PACHINKO_e, + /* 0x4C */ dItemNo_COPY_ROD_2_e, + /* 0x4D */ dItemNo_NOENTRY_77_e, + /* 0x4E */ dItemNo_NOENTRY_78_e, + /* 0x4F */ dItemNo_BOMB_BAG_LV2_e, + /* 0x50 */ dItemNo_BOMB_BAG_LV1_e, + /* 0x51 */ dItemNo_BOMB_IN_BAG_e, + /* 0x52 */ dItemNo_NOENTRY_82_e, + /* 0x53 */ dItemNo_LIGHT_ARROW_e, + /* 0x54 */ dItemNo_ARROW_LV1_e, + /* 0x55 */ dItemNo_ARROW_LV2_e, + /* 0x56 */ dItemNo_ARROW_LV3_e, + /* 0x57 */ dItemNo_NOENTRY_87_e, + /* 0x58 */ dItemNo_LURE_ROD_e, + /* 0x59 */ dItemNo_BOMB_ARROW_e, + /* 0x5A */ dItemNo_HAWK_ARROW_e, + /* 0x5B */ dItemNo_BEE_ROD_e, + /* 0x5C */ dItemNo_JEWEL_ROD_e, + /* 0x5D */ dItemNo_WORM_ROD_e, + /* 0x5E */ dItemNo_JEWEL_BEE_ROD_e, + /* 0x5F */ dItemNo_JEWEL_WORM_ROD_e, + /* 0x60 */ dItemNo_EMPTY_BOTTLE_e, + /* 0x61 */ dItemNo_RED_BOTTLE_e, + /* 0x62 */ dItemNo_GREEN_BOTTLE_e, + /* 0x63 */ dItemNo_BLUE_BOTTLE_e, + /* 0x64 */ dItemNo_MILK_BOTTLE_e, + /* 0x65 */ dItemNo_HALF_MILK_BOTTLE_e, + /* 0x66 */ dItemNo_OIL_BOTTLE_e, + /* 0x67 */ dItemNo_WATER_BOTTLE_e, + /* 0x68 */ dItemNo_OIL_BOTTLE_2_e, + /* 0x69 */ dItemNo_RED_BOTTLE_2_e, + /* 0x6A */ dItemNo_UGLY_SOUP_e, + /* 0x6B */ dItemNo_HOT_SPRING_e, + /* 0x6C */ dItemNo_FAIRY_e, + /* 0x6D */ dItemNo_HOT_SPRING_2_e, + /* 0x6E */ dItemNo_OIL2_e, + /* 0x6F */ dItemNo_OIL_e, + /* 0x70 */ dItemNo_NORMAL_BOMB_e, + /* 0x71 */ dItemNo_WATER_BOMB_e, + /* 0x72 */ dItemNo_POKE_BOMB_e, + /* 0x73 */ dItemNo_FAIRY_DROP_e, + /* 0x74 */ dItemNo_WORM_e, + /* 0x75 */ dItemNo_DROP_BOTTLE_e, + /* 0x76 */ dItemNo_BEE_CHILD_e, + /* 0x77 */ dItemNo_CHUCHU_RARE_e, + /* 0x78 */ dItemNo_CHUCHU_RED_e, + /* 0x79 */ dItemNo_CHUCHU_BLUE_e, + /* 0x7A */ dItemNo_CHUCHU_GREEN_e, + /* 0x7B */ dItemNo_CHUCHU_YELLOW_e, + /* 0x7C */ dItemNo_CHUCHU_PURPLE_e, + /* 0x7D */ dItemNo_LV1_SOUP_e, + /* 0x7E */ dItemNo_LV2_SOUP_e, + /* 0x7F */ dItemNo_LV3_SOUP_e, + /* 0x80 */ dItemNo_LETTER_e, + /* 0x81 */ dItemNo_BILL_e, + /* 0x82 */ dItemNo_WOOD_STATUE_e, + /* 0x83 */ dItemNo_IRIAS_PENDANT_e, + /* 0x84 */ dItemNo_HORSE_FLUTE_e, + /* 0x85 */ dItemNo_NOENTRY_133_e, + /* 0x86 */ dItemNo_NOENTRY_134_e, + /* 0x87 */ dItemNo_NOENTRY_135_e, + /* 0x88 */ dItemNo_NOENTRY_136_e, + /* 0x89 */ dItemNo_NOENTRY_137_e, + /* 0x8A */ dItemNo_NOENTRY_138_e, + /* 0x8B */ dItemNo_NOENTRY_139_e, + /* 0x8C */ dItemNo_NOENTRY_140_e, + /* 0x8D */ dItemNo_NOENTRY_141_e, + /* 0x8E */ dItemNo_NOENTRY_142_e, + /* 0x8F */ dItemNo_NOENTRY_143_e, + /* 0x90 */ dItemNo_RAFRELS_MEMO_e, + /* 0x91 */ dItemNo_ASHS_SCRIBBLING_e, + /* 0x92 */ dItemNo_NOENTRY_146_e, + /* 0x93 */ dItemNo_NOENTRY_147_e, + /* 0x94 */ dItemNo_NOENTRY_148_e, + /* 0x95 */ dItemNo_NOENTRY_149_e, + /* 0x96 */ dItemNo_NOENTRY_150_e, + /* 0x97 */ dItemNo_NOENTRY_151_e, + /* 0x98 */ dItemNo_NOENTRY_152_e, + /* 0x99 */ dItemNo_NOENTRY_153_e, + /* 0x9A */ dItemNo_NOENTRY_154_e, + /* 0x9B */ dItemNo_NOENTRY_155_e, + /* 0x9C */ dItemNo_CHUCHU_YELLOW2_e, + /* 0x9D */ dItemNo_OIL_BOTTLE3_e, + /* 0x9E */ dItemNo_SHOP_BEE_CHILD_e, + /* 0x9F */ dItemNo_CHUCHU_BLACK_e, + /* 0xA0 */ dItemNo_LIGHT_DROP_e, + /* 0xA1 */ dItemNo_DROP_CONTAINER_e, + /* 0xA2 */ dItemNo_DROP_CONTAINER02_e, + /* 0xA3 */ dItemNo_DROP_CONTAINER03_e, + /* 0xA4 */ dItemNo_FILLED_CONTAINER_e, + /* 0xA5 */ dItemNo_MIRROR_PIECE_2_e, + /* 0xA6 */ dItemNo_MIRROR_PIECE_3_e, + /* 0xA7 */ dItemNo_MIRROR_PIECE_4_e, + /* 0xA8 */ dItemNo_NOENTRY_168_e, + /* 0xA9 */ dItemNo_NOENTRY_169_e, + /* 0xAA */ dItemNo_NOENTRY_170_e, + /* 0xAB */ dItemNo_NOENTRY_171_e, + /* 0xAC */ dItemNo_NOENTRY_172_e, + /* 0xAD */ dItemNo_NOENTRY_173_e, + /* 0xAE */ dItemNo_NOENTRY_174_e, + /* 0xAF */ dItemNo_NOENTRY_175_e, + /* 0xB0 */ dItemNo_SMELL_YELIA_POUCH_e, + /* 0xB1 */ dItemNo_SMELL_PUMPKIN_e, + /* 0xB2 */ dItemNo_SMELL_POH_e, + /* 0xB3 */ dItemNo_SMELL_FISH_e, + /* 0xB4 */ dItemNo_SMELL_CHILDREN_e, + /* 0xB5 */ dItemNo_SMELL_MEDICINE_e, + /* 0xB6 */ dItemNo_NOENTRY_182_e, + /* 0xB7 */ dItemNo_NOENTRY_183_e, + /* 0xB8 */ dItemNo_NOENTRY_184_e, + /* 0xB9 */ dItemNo_NOENTRY_185_e, + /* 0xBA */ dItemNo_NOENTRY_186_e, + /* 0xBB */ dItemNo_NOENTRY_187_e, + /* 0xBC */ dItemNo_NOENTRY_188_e, + /* 0xBD */ dItemNo_NOENTRY_189_e, + /* 0xBE */ dItemNo_NOENTRY_190_e, + /* 0xBF */ dItemNo_NOENTRY_191_e, + /* 0xC0 */ dItemNo_M_BEETLE_e, + /* 0xC1 */ dItemNo_F_BEETLE_e, + /* 0xC2 */ dItemNo_M_BUTTERFLY_e, + /* 0xC3 */ dItemNo_F_BUTTERFLY_e, + /* 0xC4 */ dItemNo_M_STAG_BEETLE_e, + /* 0xC5 */ dItemNo_F_STAG_BEETLE_e, + /* 0xC6 */ dItemNo_M_GRASSHOPPER_e, + /* 0xC7 */ dItemNo_F_GRASSHOPPER_e, + /* 0xC8 */ dItemNo_M_NANAFUSHI_e, + /* 0xC9 */ dItemNo_F_NANAFUSHI_e, + /* 0xCA */ dItemNo_M_DANGOMUSHI_e, + /* 0xCB */ dItemNo_F_DANGOMUSHI_e, + /* 0xCC */ dItemNo_M_MANTIS_e, + /* 0xCD */ dItemNo_F_MANTIS_e, + /* 0xCE */ dItemNo_M_LADYBUG_e, + /* 0xCF */ dItemNo_F_LADYBUG_e, + /* 0xD0 */ dItemNo_M_SNAIL_e, + /* 0xD1 */ dItemNo_F_SNAIL_e, + /* 0xD2 */ dItemNo_M_DRAGONFLY_e, + /* 0xD3 */ dItemNo_F_DRAGONFLY_e, + /* 0xD4 */ dItemNo_M_ANT_e, + /* 0xD5 */ dItemNo_F_ANT_e, + /* 0xD6 */ dItemNo_M_MAYFLY_e, + /* 0xD7 */ dItemNo_F_MAYFLY_e, + /* 0xD8 */ dItemNo_NOENTRY_216_e, + /* 0xD9 */ dItemNo_NOENTRY_217_e, + /* 0xDA */ dItemNo_NOENTRY_218_e, + /* 0xDB */ dItemNo_NOENTRY_219_e, + /* 0xDC */ dItemNo_NOENTRY_220_e, + /* 0xDD */ dItemNo_NOENTRY_221_e, + /* 0xDE */ dItemNo_NOENTRY_222_e, + /* 0xDF */ dItemNo_NOENTRY_223_e, + /* 0xE0 */ dItemNo_POU_SPIRIT_e, + /* 0xE1 */ dItemNo_NOENTRY_225_e, + /* 0xE2 */ dItemNo_NOENTRY_226_e, + /* 0xE3 */ dItemNo_NOENTRY_227_e, + /* 0xE4 */ dItemNo_NOENTRY_228_e, + /* 0xE5 */ dItemNo_NOENTRY_229_e, + /* 0xE6 */ dItemNo_NOENTRY_230_e, + /* 0xE7 */ dItemNo_NOENTRY_231_e, + /* 0xE8 */ dItemNo_NOENTRY_232_e, + /* 0xE9 */ dItemNo_ANCIENT_DOCUMENT_e, + /* 0xEA */ dItemNo_AIR_LETTER_e, + /* 0xEB */ dItemNo_ANCIENT_DOCUMENT2_e, + /* 0xEC */ dItemNo_LV7_DUNGEON_EXIT_e, + /* 0xED */ dItemNo_LINKS_SAVINGS_e, + /* 0xEE */ dItemNo_SMALL_KEY2_e, + /* 0xEF */ dItemNo_POU_FIRE1_e, + /* 0xF0 */ dItemNo_POU_FIRE2_e, + /* 0xF1 */ dItemNo_POU_FIRE3_e, + /* 0xF2 */ dItemNo_POU_FIRE4_e, + /* 0xF3 */ dItemNo_BOSSRIDER_KEY_e, + /* 0xF4 */ dItemNo_TOMATO_PUREE_e, + /* 0xF5 */ dItemNo_TASTE_e, + /* 0xF6 */ dItemNo_LV5_BOSS_KEY_e, + /* 0xF7 */ dItemNo_SURFBOARD_e, + /* 0xF8 */ dItemNo_KANTERA2_e, + /* 0xF9 */ dItemNo_L2_KEY_PIECES1_e, + /* 0xFA */ dItemNo_L2_KEY_PIECES2_e, + /* 0xFB */ dItemNo_L2_KEY_PIECES3_e, + /* 0xFC */ dItemNo_KEY_OF_CARAVAN_e, + /* 0xFD */ dItemNo_LV2_BOSS_KEY_e, + /* 0xFE */ dItemNo_KEY_OF_FILONE_e, + /* 0xFF */ dItemNo_NONE_e, +}; + #endif /* D_D_ITEM_DATA_H */ diff --git a/include/d/d_k_wmark.h b/include/d/d_k_wmark.h index 10be281182..0190c94467 100644 --- a/include/d/d_k_wmark.h +++ b/include/d/d_k_wmark.h @@ -16,7 +16,7 @@ public: static int m_nowID; static void setFootMark(cXyz* i_pos, s16 param_1, int param_2) { - fopKyM_create(PROC_WMARK, param_2 | (param_1 << 0x10), i_pos, NULL, NULL); + fopKyM_create(fpcNm_WMARK_e, param_2 | (param_1 << 0x10), i_pos, NULL, NULL); } /* 0x0F8 */ JKRSolidHeap* mpHeap; diff --git a/include/d/d_procname.h b/include/d/d_procname.h deleted file mode 100644 index bc0ed5efc1..0000000000 --- a/include/d/d_procname.h +++ /dev/null @@ -1,805 +0,0 @@ -#ifndef D_PROCNAME_H -#define D_PROCNAME_H - -#include "global.h" - -enum { - /* 0x000 */ PROC_OVERLAP0, - /* 0x001 */ PROC_OVERLAP1, - /* 0x002 */ PROC_OVERLAP3, - /* 0x003 */ PROC_OVERLAP6, - /* 0x004 */ PROC_OVERLAP7, - /* 0x005 */ PROC_OVERLAP8, - /* 0x006 */ PROC_OVERLAP9, - /* 0x007 */ PROC_OVERLAP10, - /* 0x008 */ PROC_OVERLAP11, - /* 0x009 */ PROC_LOGO_SCENE, - /* 0x00A */ PROC_MENU_SCENE, - /* 0x00B */ PROC_PLAY_SCENE, - /* 0x00C */ PROC_OPENING_SCENE, - /* 0x00D */ PROC_NAME_SCENE, - /* 0x00E */ PROC_NAMEEX_SCENE, -#if VERSION != VERSION_WII_USA_R0 && VERSION != VERSION_WII_PAL - /* 0x00F */ PROC_WARNING_SCENE, - /* 0x010 */ PROC_WARNING2_SCENE, -#endif - /* 0x011 */ PROC_OVERLAP2, - /* 0x012 */ PROC_ROOM_SCENE, - /* 0x013 */ PROC_KANKYO, - /* 0x014 */ PROC_ALLDIE, - /* 0x015 */ PROC_ENVSE, - /* 0x016 */ PROC_Obj_Swpush, - /* 0x017 */ PROC_Obj_Swpush2, - /* 0x018 */ PROC_Obj_Swpush5, - /* 0x019 */ PROC_Tag_Gstart, - /* 0x01A */ PROC_NO_CHG_ROOM, - /* 0x01B */ PROC_Obj_Lv6ElevtA, - /* 0x01C */ PROC_OBJ_SO, - /* 0x01D */ PROC_Obj_Movebox, - /* 0x01E */ PROC_Obj_SwTurn, - /* 0x01F */ PROC_Obj_Lv6SwTurn, - /* 0x020 */ PROC_OBJ_SEKIZOA, - /* 0x021 */ PROC_OBJ_GRA, - /* 0x022 */ PROC_TAG_GRA, - /* 0x023 */ PROC_TAG_YAMI, - /* 0x024 */ PROC_Obj_Ladder, - /* 0x025 */ PROC_OBJ_BEF, - /* 0x026 */ PROC_OBJ_FMOBJ, - /* 0x027 */ PROC_OBJ_LBOX, - /* 0x028 */ PROC_OBJ_WEB0, - /* 0x029 */ PROC_OBJ_WEB1, - /* 0x02A */ PROC_OBJ_CB, - /* 0x02B */ PROC_OBJ_MAKI, - /* 0x02C */ PROC_OBJ_BRG, - /* 0x02D */ PROC_OBJ_GB, - /* 0x02E */ PROC_OBJ_GM, - /* 0x02F */ PROC_OBJ_TOBY, - /* 0x030 */ PROC_OBJ_TP, - /* 0x031 */ PROC_TREESH, - /* 0x032 */ PROC_Obj_ZDoor, - /* 0x033 */ PROC_Obj_Pillar, - /* 0x034 */ PROC_Obj_Cdoor, - /* 0x035 */ PROC_GRDWATER, - /* 0x036 */ PROC_Obj_RotBridge, - /* 0x037 */ PROC_Obj_MagLift, - /* 0x038 */ PROC_Obj_MagLiftRot, - /* 0x039 */ PROC_Obj_Lv1Cdl00, - /* 0x03A */ PROC_Obj_Lv1Cdl01, - /* 0x03B */ PROC_Obj_TvCdlst, - /* 0x03C */ PROC_Obj_HsTarget, - /* 0x03D */ PROC_Obj_HeavySw, - /* 0x03E */ PROC_Obj_GoGate, - /* 0x03F */ PROC_Obj_TaFence, - /* 0x040 */ PROC_Obj_Saidan, - /* 0x041 */ PROC_Obj_SpinLift, - /* 0x042 */ PROC_Obj_BmWindow, - /* 0x043 */ PROC_Obj_RfHole, - /* 0x044 */ PROC_Obj_WaterPillar, - /* 0x045 */ PROC_Obj_SyRock, - /* 0x046 */ PROC_Obj_BsGate, - /* 0x047 */ PROC_Obj_AmiShutter, - /* 0x048 */ PROC_Obj_WtGate, - /* 0x049 */ PROC_Obj_Lv2Candle, - /* 0x04A */ PROC_Obj_TogeTrap, - /* 0x04B */ PROC_Obj_RotTrap, - /* 0x04C */ PROC_Obj_SwallShutter, - /* 0x04D */ PROC_Obj_IceWall, - /* 0x04E */ PROC_Obj_Lv5SwIce, - /* 0x04F */ PROC_Obj_Lv5FBoard, - /* 0x050 */ PROC_Obj_Turara, - /* 0x051 */ PROC_Obj_TwGate, - /* 0x052 */ PROC_Obj_Digholl, - /* 0x053 */ PROC_Obj_Digpl, - /* 0x054 */ PROC_Obj_TestCube, - /* 0x055 */ PROC_Obj_Kshutter, - /* 0x056 */ PROC_NPC_COACH, - /* 0x057 */ PROC_NPC_THEB, - /* 0x058 */ PROC_COACH_FIRE, - /* 0x059 */ PROC_COACH2D, - /* 0x05A */ PROC_BALLOON2D, - /* 0x05B */ PROC_SKIP2D, - /* 0x05C */ PROC_Obj_MvStair, - /* 0x05D */ PROC_Obj_Cowdoor, - /* 0x05E */ PROC_Obj_Swpropeller, - /* 0x05F */ PROC_Obj_BoomShutter, - /* 0x060 */ PROC_NPC_KS, - /* 0x061 */ PROC_Obj_Hfuta, - /* 0x062 */ PROC_Obj_BkDoor, - /* 0x063 */ PROC_Obj_Cboard, - /* 0x064 */ PROC_Obj_MGate, - /* 0x065 */ PROC_Obj_Ikada, - /* 0x066 */ PROC_Obj_Ice_l, - /* 0x067 */ PROC_Obj_Ice_s, - /* 0x068 */ PROC_Obj_E_CREATE, - /* 0x069 */ PROC_Obj_Bhbridge, - /* 0x06A */ PROC_Obj_Kaisou, - /* 0x06B */ PROC_Obj_HHASHI, - /* 0x06C */ PROC_Obj_BHASHI, - /* 0x06D */ PROC_OCTHASHI, - /* 0x06E */ PROC_Obj_THASHI, - /* 0x06F */ PROC_Obj_CRVGATE, - /* 0x070 */ PROC_Obj_CRVFENCE, - /* 0x071 */ PROC_Obj_CRVHAHEN, - /* 0x072 */ PROC_Obj_CRVSTEEL, - /* 0x073 */ PROC_Obj_CRVLH_UP, - /* 0x074 */ PROC_Obj_CRVLH_DW, - /* 0x075 */ PROC_Obj_RIVERROCK, - /* 0x076 */ PROC_Obj_DUST, - /* 0x077 */ PROC_Obj_ITA, - /* 0x078 */ PROC_Obj_Window, - /* 0x079 */ PROC_Obj_MetalBox, - /* 0x07A */ PROC_Obj_BBox, - /* 0x07B */ PROC_OBJ_MSIMA, - /* 0x07C */ PROC_OBJ_MYOGAN, - /* 0x07D */ PROC_B_ZANTS, - /* 0x07E */ PROC_Obj_ChainBlock, - /* 0x07F */ PROC_Obj_ChainWall, - /* 0x080 */ PROC_Obj_KkrGate, - /* 0x081 */ PROC_Obj_RiderGate, - /* 0x082 */ PROC_Obj_Onsen, - /* 0x083 */ PROC_Obj_Chest, - /* 0x084 */ PROC_Obj_Bemos, - /* 0x085 */ PROC_Obj_RopeBridge, - /* 0x086 */ PROC_Obj_WellCover, - /* 0x087 */ PROC_Obj_GraveStone, - /* 0x088 */ PROC_Obj_ZraRock, - /* 0x089 */ PROC_Obj_GraRock, - /* 0x08A */ PROC_Obj_GrzRock, - /* 0x08B */ PROC_GRA_WALL, - /* 0x08C */ PROC_OBJ_ONSEN_FIRE, - /* 0x08D */ PROC_Obj_Lv6bemos, - /* 0x08E */ PROC_Obj_Lv6bemos2, - /* 0x08F */ PROC_Obj_BarDesk, - /* 0x090 */ PROC_Obj_DigSnow, - /* 0x091 */ PROC_Obj_Ytaihou, - /* 0x092 */ PROC_Obj_Elevator, - /* 0x093 */ PROC_Obj_Lv6TogeRoll, - /* 0x094 */ PROC_Obj_Lv6TogeTrap, - /* 0x095 */ PROC_Obj_Lv6Tenbin, - /* 0x096 */ PROC_Obj_Lv6SwGate, - /* 0x097 */ PROC_Obj_Lv6Lblock, - /* 0x098 */ PROC_Obj_Lv6ChgGate, - /* 0x099 */ PROC_Obj_Lv6FuriTrap, - /* 0x09A */ PROC_Obj_Lv6SzGate, - /* 0x09B */ PROC_Obj_Lv4EdShutter, - /* 0x09C */ PROC_Obj_Lv4Gate, - /* 0x09D */ PROC_Obj_Lv4PoGate, - /* 0x09E */ PROC_Obj_Lv4SlideWall, - /* 0x09F */ PROC_Obj_Lv4HsTarget, - /* 0x0A0 */ PROC_Obj_Lv7PropY, - /* 0x0A1 */ PROC_Obj_Lv7BsGate, - /* 0x0A2 */ PROC_Obj_Lv8OptiLift, - /* 0x0A3 */ PROC_Obj_Lv8KekkaiTrap, - /* 0x0A4 */ PROC_Obj_Lv8Lift, - /* 0x0A5 */ PROC_Obj_Lv8UdFloor, - /* 0x0A6 */ PROC_Obj_Lv9SwShutter, - /* 0x0A7 */ PROC_Obj_TobyHouse, - /* 0x0A8 */ PROC_Obj_poCandle, - /* 0x0A9 */ PROC_Obj_Lv4DigSand, - /* 0x0AA */ PROC_Obj_FallObj, - /* 0x0AB */ PROC_Obj_SmgDoor, - /* 0x0AC */ PROC_Obj_SwLight, - /* 0x0AD */ PROC_Obj_Avalanche, - /* 0x0AE */ PROC_Obj_MirrorScrew, - /* 0x0AF */ PROC_Obj_MirrorSand, - /* 0x0B0 */ PROC_Obj_MirrorTable, - /* 0x0B1 */ PROC_Obj_MirrorChain, - /* 0x0B2 */ PROC_Obj_Mirror6Pole, - /* 0x0B3 */ PROC_Obj_SwSpinner, - /* 0x0B4 */ PROC_Obj_TDoor, - /* 0x0B5 */ PROC_Obj_Lv7Bridge, - /* 0x0B6 */ PROC_Obj_zrTurara, - /* 0x0B7 */ PROC_Obj_TakaraDai, - /* 0x0B8 */ PROC_Obj_Table, - /* 0x0B9 */ PROC_Obj_CatDoor, - /* 0x0BA */ PROC_Obj_Gake, - /* 0x0BB */ PROC_CSTAF, - /* 0x0BC */ PROC_Obj_Lv4RailWall, - /* 0x0BD */ PROC_Obj_Lv4Sand, - /* 0x0BE */ PROC_Obj_PushDoor, - /* 0x0BF */ PROC_PushDoor, - /* 0x0C0 */ PROC_Obj_GanonWall2, - /* 0x0C1 */ PROC_Obj_Lv4Bridge, - /* 0x0C2 */ PROC_Obj_Lv4Floor, - /* 0x0C3 */ PROC_Tag_Spinner, - /* 0x0C4 */ PROC_Obj_SwHang, - /* 0x0C5 */ PROC_Obj_RotStair, - /* 0x0C6 */ PROC_Obj_MagneArm, - /* 0x0C7 */ PROC_Obj_KWheel00, - /* 0x0C8 */ PROC_Obj_KWheel01, - /* 0x0C9 */ PROC_Obj_Ychndlr, - /* 0x0CA */ PROC_Obj_PRElvtr, - /* 0x0CB */ PROC_Obj_MHasu, - /* 0x0CC */ PROC_Obj_YIblltray, - /* 0x0CD */ PROC_Obj_Lv6EGate, - /* 0x0CE */ PROC_Obj_PDtile, - /* 0x0CF */ PROC_Obj_PDwall, - /* 0x0D0 */ PROC_Obj_Lv4PRwall, - /* 0x0D1 */ PROC_Obj_KLift00, - /* 0x0D2 */ PROC_B_OH, - /* 0x0D3 */ PROC_Obj_Lv4Chan, - /* 0x0D4 */ PROC_Obj_Lv3R10Saka, - /* 0x0D5 */ PROC_Obj_Lv3Water, - /* 0x0D6 */ PROC_Obj_Lv3Water2, - /* 0x0D7 */ PROC_OBJ_LV3WATERB, - /* 0x0D8 */ PROC_Obj_HBombkoya, - /* 0x0D9 */ PROC_Obj_SZbridge, - /* 0x0DA */ PROC_Obj_KakarikoBrg, - /* 0x0DB */ PROC_Obj_OrdinBrg, - /* 0x0DC */ PROC_Obj_BurnBox, - /* 0x0DD */ PROC_Obj_KJgjs, - /* 0x0DE */ PROC_OBJ_IHASI, - /* 0x0DF */ PROC_Obj_IceBlock, - /* 0x0E0 */ PROC_Obj_VolcanicBall, - /* 0x0E1 */ PROC_Obj_VolcanicBomb, - /* 0x0E2 */ PROC_Obj_VolcGnd, - /* 0x0E3 */ PROC_Obj_KKanban, - /* 0x0E4 */ PROC_E_PH, - /* 0x0E5 */ PROC_NPC_ZRA, - /* 0x0E6 */ PROC_Obj_Chandelier, - /* 0x0E7 */ PROC_Obj_Stopper2, - /* 0x0E8 */ PROC_DOOR20, - /* 0x0E9 */ PROC_Tag_Hinit, - /* 0x0EA */ PROC_Tag_Hjump, - /* 0x0EB */ PROC_Tag_AJnot, - /* 0x0EC */ PROC_Tag_Hstop, - /* 0x0ED */ PROC_CANOE, - /* 0x0EE */ PROC_HORSE, - /* 0x0EF */ PROC_E_WB, - /* 0x0F0 */ PROC_OBJ_ITO, - /* 0x0F1 */ PROC_OBJ_SW, - /* 0x0F2 */ PROC_SPINNER, - /* 0x0F3 */ PROC_B_OB, - /* 0x0F4 */ PROC_KAGO, - /* 0x0F5 */ PROC_E_YC, - /* 0x0F6 */ PROC_B_DS, - /* 0x0F7 */ PROC_B_DR, - /* 0x0F8 */ PROC_B_ZANTZ, - /* 0x0F9 */ PROC_B_ZANT, - /* 0x0FA */ PROC_B_ZANTM, - /* 0x0FB */ PROC_TBOX, - /* 0x0FC */ PROC_TBOX2, - /* 0x0FD */ PROC_ALINK, - /* 0x0FE */ PROC_BOOMERANG, - /* 0x0FF */ PROC_MIDNA, - /* 0x100 */ PROC_NPC_TK, - /* 0x101 */ PROC_NPC_WORM, - /* 0x102 */ PROC_PPolamp, - /* 0x103 */ PROC_BkyRock, - /* 0x104 */ PROC_HITOBJ, - /* 0x105 */ PROC_EP, - /* 0x106 */ PROC_COW, - /* 0x107 */ PROC_PERU, - /* 0x108 */ PROC_NI, - /* 0x109 */ PROC_NPC_TKJ2, - /* 0x10A */ PROC_SQ, - /* 0x10B */ PROC_NPC_SQ, - /* 0x10C */ PROC_DO, - /* 0x10D */ PROC_NPC_NE, - /* 0x10E */ PROC_NPC_TR, - /* 0x10F */ PROC_NPC_LF, - /* 0x110 */ PROC_OBJ_FOOD, - /* 0x111 */ PROC_OBJ_KI, - /* 0x112 */ PROC_OBJ_KITA, - /* 0x113 */ PROC_OBJ_KEY, - /* 0x114 */ PROC_OBJ_KEYHOLE, - /* 0x115 */ PROC_Obj_Lv5Key, - /* 0x116 */ PROC_OBJ_LP, - /* 0x117 */ PROC_OBJ_TATIGI, - /* 0x118 */ PROC_OBJ_ROCK, - /* 0x119 */ PROC_OBJ_WFLAG, - /* 0x11A */ PROC_OBJ_KAGE, - /* 0x11B */ PROC_OBJ_KANBAN2, - /* 0x11C */ PROC_OBJ_BALLOON, - /* 0x11D */ PROC_OBJ_SUISYA, - /* 0x11E */ PROC_OBJ_OILTUBO, - /* 0x11F */ PROC_OBJ_ROTEN, - /* 0x120 */ PROC_OBJ_SSDRINK, - /* 0x121 */ PROC_OBJ_SSITEM, - /* 0x122 */ PROC_TAG_SSDRINK, - /* 0x123 */ PROC_TAG_BTLITM, - /* 0x124 */ PROC_TAG_LV5SOUP, - /* 0x125 */ PROC_TAG_MNLIGHT, - /* 0x126 */ PROC_TAG_SHOPCAM, - /* 0x127 */ PROC_TAG_SHOPITM, - /* 0x128 */ PROC_OBJ_NDOOR, - /* 0x129 */ PROC_OBJ_UDOOR, - /* 0x12A */ PROC_OBJ_USAKU, - /* 0x12B */ PROC_Obj_SM_DOOR, - /* 0x12C */ PROC_OBJ_BED, - /* 0x12D */ PROC_OBJ_BOUMATO, - /* 0x12E */ PROC_OBJ_ITAMATO, - /* 0x12F */ PROC_OBJ_NOUGU, - /* 0x130 */ PROC_OBJ_STICK, - /* 0x131 */ PROC_OBJ_MIE, - /* 0x132 */ PROC_OBJ_SEKIDOOR, - /* 0x133 */ PROC_OBJ_SEKIZO, - /* 0x134 */ PROC_OBJ_SMTILE, - /* 0x135 */ PROC_NPC_FISH, - /* 0x136 */ PROC_MG_FISH, - /* 0x137 */ PROC_FSHOP, - /* 0x138 */ PROC_NPC_DU, - /* 0x139 */ PROC_DISAPPEAR, - /* 0x13A */ PROC_Obj_Mato, - /* 0x13B */ PROC_Obj_Flag, - /* 0x13C */ PROC_Obj_Flag2, - /* 0x13D */ PROC_Obj_Flag3, - /* 0x13E */ PROC_Obj_GOMIKABE, - /* 0x13F */ PROC_Obj_Yousei, - /* 0x140 */ PROC_Obj_Kabuto, - /* 0x141 */ PROC_Obj_Cho, - /* 0x142 */ PROC_Obj_Kuw, - /* 0x143 */ PROC_Obj_Nan, - /* 0x144 */ PROC_Obj_Dan, - /* 0x145 */ PROC_Obj_Kam, - /* 0x146 */ PROC_Obj_Ten, - /* 0x147 */ PROC_Obj_Ari, - /* 0x148 */ PROC_Obj_Kag, - /* 0x149 */ PROC_Obj_Batta, - /* 0x14A */ PROC_Obj_Tombo, - /* 0x14B */ PROC_Obj_Kat, - /* 0x14C */ PROC_Obj_H_Saku, - /* 0x14D */ PROC_Obj_Yobikusa, - /* 0x14E */ PROC_Obj_KazeNeko, - /* 0x14F */ PROC_Obj_KznkArm, - /* 0x150 */ PROC_Obj_NamePlate, - /* 0x151 */ PROC_Obj_OnCloth, - /* 0x152 */ PROC_Obj_LndRope, - /* 0x153 */ PROC_Obj_ItaRope, - /* 0x154 */ PROC_Obj_Sakuita, - /* 0x155 */ PROC_Obj_Laundry, - /* 0x156 */ PROC_WarpBug, - /* 0x157 */ PROC_Izumi_Gate, - /* 0x158 */ PROC_Obj_Fchain, - /* 0x159 */ PROC_Obj_Wchain, - /* 0x15A */ PROC_Tag_Attp, - /* 0x15B */ PROC_Obj_Tornado, - /* 0x15C */ PROC_Obj_Tornado2, - /* 0x15D */ PROC_Obj_FirePillar, - /* 0x15E */ PROC_Obj_FirePillar2, - /* 0x15F */ PROC_Obj_InoBone, - /* 0x160 */ PROC_Obj_Stopper, - /* 0x161 */ PROC_Obj_MHole, - /* 0x162 */ PROC_Tag_Magne, - /* 0x163 */ PROC_Obj_BossWarp, - /* 0x164 */ PROC_Obj_WoodPendulum, - /* 0x165 */ PROC_Obj_WdStick, - /* 0x166 */ PROC_Obj_StairBlock, - /* 0x167 */ PROC_Obj_Geyser, - /* 0x168 */ PROC_Tag_KtOnFire, - /* 0x169 */ PROC_Obj_FireWood, - /* 0x16A */ PROC_Obj_FireWood2, - /* 0x16B */ PROC_Obj_GpTaru, - /* 0x16C */ PROC_Obj_OnsenTaru, - /* 0x16D */ PROC_Obj_KiPot, - /* 0x16E */ PROC_TBOX_SW, - /* 0x16F */ PROC_Obj_SwChain, - /* 0x170 */ PROC_Obj_WoodenSword, - /* 0x171 */ PROC_Obj_StoneMark, - /* 0x172 */ PROC_Obj_Lv3Candle, - /* 0x173 */ PROC_Tag_Lv4Candle, - /* 0x174 */ PROC_Tag_Lv4CandleDm, - /* 0x175 */ PROC_Obj_DamCps, - /* 0x176 */ PROC_Obj_Smoke, - /* 0x177 */ PROC_Obj_WaterFall, - /* 0x178 */ PROC_Obj_ZoraCloth, - /* 0x179 */ PROC_Obj_poFire, - /* 0x17A */ PROC_Tag_poFire, - /* 0x17B */ PROC_Obj_glowSphere, - /* 0x17C */ PROC_Tag_LightBall, - /* 0x17D */ PROC_SwLBall, - /* 0x17E */ PROC_SwBall, - /* 0x17F */ PROC_Obj_WaterEff, - /* 0x180 */ PROC_Tag_RiverBack, - /* 0x181 */ PROC_Tag_KagoFall, - /* 0x182 */ PROC_Tag_Lv2PrChk, - /* 0x183 */ PROC_Obj_Lv4Gear, - /* 0x184 */ PROC_Obj_MasterSword, - /* 0x185 */ PROC_Obj_WoodStatue, - /* 0x186 */ PROC_Obj_Fan, - /* 0x187 */ PROC_Obj_IceLeaf, - /* 0x188 */ PROC_Obj_zrTuraraRc, - /* 0x189 */ PROC_Tag_RetRoom, - /* 0x18A */ PROC_Obj_WindStone, - /* 0x18B */ PROC_Tag_WaraHowl, - /* 0x18C */ PROC_Obj_SCannon, - /* 0x18D */ PROC_Obj_SmWStone, - /* 0x18E */ PROC_Obj_SCannonCrs, - /* 0x18F */ PROC_Tag_SnowEff, - /* 0x190 */ PROC_Tag_CstaSw, - /* 0x191 */ PROC_Tag_Lv6CstaSw, - /* 0x192 */ PROC_Obj_awaPlar, - /* 0x193 */ PROC_Obj_poTbox, - /* 0x194 */ PROC_Obj_TimeFire, - /* 0x195 */ PROC_Obj_TMoon, - /* 0x196 */ PROC_Obj_GanonWall, - /* 0x197 */ PROC_Obj_Prop, - /* 0x198 */ PROC_CSTATUE, - /* 0x199 */ PROC_Obj_SwBallA, - /* 0x19A */ PROC_Obj_SwBallB, - /* 0x19B */ PROC_Obj_SnowSoup, - /* 0x19C */ PROC_Obj_Nagaisu, - /* 0x19D */ PROC_Obj_RCircle, - /* 0x19E */ PROC_Obj_Picture, - /* 0x19F */ PROC_Tag_SetBall, - /* 0x1A0 */ PROC_Tag_SmkEmt, - /* 0x1A1 */ PROC_SwTime, - /* 0x1A2 */ PROC_Obj_HFtr, - /* 0x1A3 */ PROC_Obj_HBarrel, - /* 0x1A4 */ PROC_Obj_Crystal, - /* 0x1A5 */ PROC_Obj_SCannonTen, - /* 0x1A6 */ PROC_Obj_SwBallC, - /* 0x1A7 */ PROC_SCENE_EXIT2, - /* 0x1A8 */ PROC_Obj_Hata, - /* 0x1A9 */ PROC_Obj_ToaruMaki, - /* 0x1AA */ PROC_Tag_AttackItem, - /* 0x1AB */ PROC_Tag_RmbitSw, - /* 0x1AC */ PROC_Obj_Sword, - /* 0x1AD */ PROC_Tag_Spring, - /* 0x1AE */ PROC_Tag_Statue, - /* 0x1AF */ PROC_E_AI, - /* 0x1B0 */ PROC_E_GS, - /* 0x1B1 */ PROC_E_GOB, - /* 0x1B2 */ PROC_E_DD, - /* 0x1B3 */ PROC_E_DN, - /* 0x1B4 */ PROC_E_S1, - /* 0x1B5 */ PROC_E_MF, - /* 0x1B6 */ PROC_E_SG, - /* 0x1B7 */ PROC_E_BS, - /* 0x1B8 */ PROC_E_SF, - /* 0x1B9 */ PROC_E_SH, - /* 0x1BA */ PROC_E_DF, - /* 0x1BB */ PROC_E_GM, - /* 0x1BC */ PROC_E_MD, - /* 0x1BD */ PROC_E_SM, - /* 0x1BE */ PROC_E_SM2, - /* 0x1BF */ PROC_E_ST, - /* 0x1C0 */ PROC_E_ST_LINE, - /* 0x1C1 */ PROC_E_SB, - /* 0x1C2 */ PROC_E_TH, - /* 0x1C3 */ PROC_E_CR, - /* 0x1C4 */ PROC_E_CR_EGG, - /* 0x1C5 */ PROC_E_DB, - /* 0x1C6 */ PROC_E_DB_LEAF, - /* 0x1C7 */ PROC_E_GA, - /* 0x1C8 */ PROC_E_GB, - /* 0x1C9 */ PROC_E_HB, - /* 0x1CA */ PROC_E_HB_LEAF, - /* 0x1CB */ PROC_E_HZELDA, - /* 0x1CC */ PROC_E_YD, - /* 0x1CD */ PROC_E_YH, - /* 0x1CE */ PROC_E_YD_LEAF, - /* 0x1CF */ PROC_E_HM, - /* 0x1D0 */ PROC_E_TK, - /* 0x1D1 */ PROC_E_TK2, - /* 0x1D2 */ PROC_E_TK_BALL, - /* 0x1D3 */ PROC_E_RB, - /* 0x1D4 */ PROC_E_RD, - /* 0x1D5 */ PROC_E_RDB, - /* 0x1D6 */ PROC_E_RDY, - /* 0x1D7 */ PROC_E_FM, - /* 0x1D8 */ PROC_E_FS, - /* 0x1D9 */ PROC_E_PM, - /* 0x1DA */ PROC_E_PO, - /* 0x1DB */ PROC_E_MB, - /* 0x1DC */ PROC_E_MK, - /* 0x1DD */ PROC_E_MM, - /* 0x1DE */ PROC_E_FZ, - /* 0x1DF */ PROC_E_ZS, - /* 0x1E0 */ PROC_E_KK, - /* 0x1E1 */ PROC_E_HP, - /* 0x1E2 */ PROC_E_ZH, - /* 0x1E3 */ PROC_E_ZM, - /* 0x1E4 */ PROC_E_PZ, - /* 0x1E5 */ PROC_E_FB, - /* 0x1E6 */ PROC_E_FK, - /* 0x1E7 */ PROC_E_MS, - /* 0x1E8 */ PROC_E_NEST, - /* 0x1E9 */ PROC_E_NZ, - /* 0x1EA */ PROC_E_BA, - /* 0x1EB */ PROC_E_BU, - /* 0x1EC */ PROC_E_BUG, - /* 0x1ED */ PROC_E_BEE, - /* 0x1EE */ PROC_E_IS, - /* 0x1EF */ PROC_E_KG, - /* 0x1F0 */ PROC_E_KR, - /* 0x1F1 */ PROC_E_SW, - /* 0x1F2 */ PROC_E_GE, - /* 0x1F3 */ PROC_Tag_WatchGe, - /* 0x1F4 */ PROC_E_YM, - /* 0x1F5 */ PROC_E_YM_TAG, - /* 0x1F6 */ PROC_E_YMB, - /* 0x1F7 */ PROC_Tag_FWall, - /* 0x1F8 */ PROC_Tag_WaterFall, - /* 0x1F9 */ PROC_E_YK, - /* 0x1FA */ PROC_E_YR, - /* 0x1FB */ PROC_E_YG, - /* 0x1FC */ PROC_E_HZ, - /* 0x1FD */ PROC_E_WS, - /* 0x1FE */ PROC_E_OC, - /* 0x1FF */ PROC_E_OT, - /* 0x200 */ PROC_E_DT, - /* 0x201 */ PROC_E_BG, - /* 0x202 */ PROC_E_OctBg, - /* 0x203 */ PROC_DR, - /* 0x204 */ PROC_L7lowDr, - /* 0x205 */ PROC_L7ODR, - /* 0x206 */ PROC_E_TT, - /* 0x207 */ PROC_E_DK, - /* 0x208 */ PROC_E_VT, - /* 0x209 */ PROC_E_WW, - /* 0x20A */ PROC_E_GI, - /* 0x20B */ PROC_B_BH, - /* 0x20C */ PROC_B_BQ, - /* 0x20D */ PROC_B_GM, - /* 0x20E */ PROC_B_GND, - /* 0x20F */ PROC_B_GO, - /* 0x210 */ PROC_B_OH2, - /* 0x211 */ PROC_B_YO, - /* 0x212 */ PROC_B_YOI, - /* 0x213 */ PROC_B_TN, - /* 0x214 */ PROC_B_GG, - /* 0x215 */ PROC_B_DRE, - /* 0x216 */ PROC_B_MGN, - /* 0x217 */ PROC_E_WAP, - /* 0x218 */ PROC_ITEM, - /* 0x219 */ PROC_Obj_SmallKey, - /* 0x21A */ PROC_Obj_Kantera, - /* 0x21B */ PROC_Obj_LifeContainer, - /* 0x21C */ PROC_Obj_Shield, - /* 0x21D */ PROC_Demo_Item, - /* 0x21E */ PROC_ShopItem, - /* 0x21F */ PROC_Obj_Drop, - /* 0x220 */ PROC_OBJ_RW, - /* 0x221 */ PROC_NBOMB, - /* 0x222 */ PROC_TAG_CSW, - /* 0x223 */ PROC_TAG_QS, - /* 0x224 */ PROC_HOZELDA, - /* 0x225 */ PROC_SWC00, - /* 0x226 */ PROC_KNOB20, - /* 0x227 */ PROC_DBDOOR, - /* 0x228 */ PROC_BOSS_DOOR, - /* 0x229 */ PROC_L1BOSS_DOOR, - /* 0x22A */ PROC_L1MBOSS_DOOR, - /* 0x22B */ PROC_L5BOSS_DOOR, - /* 0x22C */ PROC_DSHUTTER, - /* 0x22D */ PROC_SPIRAL_DOOR, - /* 0x22E */ PROC_Tag_ChgRestart, - /* 0x22F */ PROC_Tag_Restart, - /* 0x230 */ PROC_ANDSW, - /* 0x231 */ PROC_ANDSW2, - /* 0x232 */ PROC_MYNA, - /* 0x233 */ PROC_NPC_GND, - /* 0x234 */ PROC_NPC_GRA, - /* 0x235 */ PROC_NPC_GRC, - /* 0x236 */ PROC_NPC_GRD, - /* 0x237 */ PROC_NPC_GRM, - /* 0x238 */ PROC_NPC_GRMC, - /* 0x239 */ PROC_NPC_GRO, - /* 0x23A */ PROC_NPC_GRR, - /* 0x23B */ PROC_NPC_GRS, - /* 0x23C */ PROC_NPC_GRZ, - /* 0x23D */ PROC_NPC_YAMID, - /* 0x23E */ PROC_NPC_YAMIT, - /* 0x23F */ PROC_NPC_YAMIS, - /* 0x240 */ PROC_NPC_BLUENS, - /* 0x241 */ PROC_NPC_KAKASHI, - /* 0x242 */ PROC_NPC_KDK, - /* 0x243 */ PROC_NPC_ARU, - /* 0x244 */ PROC_NPC_BANS, - /* 0x245 */ PROC_NPC_BESU, - /* 0x246 */ PROC_NPC_BOU, - /* 0x247 */ PROC_NPC_BOU_S, - /* 0x248 */ PROC_NPC_CLERKA, - /* 0x249 */ PROC_NPC_CLERKB, - /* 0x24A */ PROC_NPC_CLERKT, - /* 0x24B */ PROC_NPC_WRESTLER, - /* 0x24C */ PROC_Tag_Arena, - /* 0x24D */ PROC_Tag_Instruction, - /* 0x24E */ PROC_NPC_DOC, - /* 0x24F */ PROC_NPC_GWOLF, - /* 0x250 */ PROC_NPC_LEN, - /* 0x251 */ PROC_NPC_LUD, - /* 0x252 */ PROC_NPC_FAIRY_SEIREI, - /* 0x253 */ PROC_NPC_FAIRY, - /* 0x254 */ PROC_NPC_HANJO, - /* 0x255 */ PROC_NPC_HENNA, - /* 0x256 */ PROC_NPC_HENNA0, - /* 0x257 */ PROC_NPC_HOZ, - /* 0x258 */ PROC_NPC_JAGAR, - /* 0x259 */ PROC_NPC_KKRI, - /* 0x25A */ PROC_NPC_KN, - /* 0x25B */ PROC_KN_BULLET, - /* 0x25C */ PROC_NPC_KNJ, - /* 0x25D */ PROC_NPC_KOLIN, - /* 0x25E */ PROC_NPC_KOLINB, - /* 0x25F */ PROC_NPC_KYURY, - /* 0x260 */ PROC_NPC_MARO, - /* 0x261 */ PROC_NPC_MIDP, - /* 0x262 */ PROC_NPC_MOI, - /* 0x263 */ PROC_NPC_RACA, - /* 0x264 */ PROC_NPC_SARU, - /* 0x265 */ PROC_NPC_SEIB, - /* 0x266 */ PROC_NPC_SEIC, - /* 0x267 */ PROC_NPC_SEID, - /* 0x268 */ PROC_NPC_SEIRA, - /* 0x269 */ PROC_NPC_SERA2, - /* 0x26A */ PROC_NPC_SEIREI, - /* 0x26B */ PROC_NPC_SHAMAN, - /* 0x26C */ PROC_NPC_SMARO, - /* 0x26D */ PROC_NPC_SOLA, - /* 0x26E */ PROC_NPC_TARO, - /* 0x26F */ PROC_NPC_PACHI_BESU, - /* 0x270 */ PROC_NPC_PACHI_TARO, - /* 0x271 */ PROC_NPC_PACHI_MARO, - /* 0x272 */ PROC_TAG_PATI, - /* 0x273 */ PROC_NPC_THE, - /* 0x274 */ PROC_NPC_TKJ, - /* 0x275 */ PROC_NPC_TKS, - /* 0x276 */ PROC_NPC_TKC, - /* 0x277 */ PROC_OBJ_TKS, - /* 0x278 */ PROC_NPC_TOBY, - /* 0x279 */ PROC_NPC_URI, - /* 0x27A */ PROC_NPC_YELIA, - /* 0x27B */ PROC_NPC_YKM, - /* 0x27C */ PROC_NPC_YKW, - /* 0x27D */ PROC_NPC_ZANB, - /* 0x27E */ PROC_NPC_ZANT, - /* 0x27F */ PROC_NPC_ZELDA, - /* 0x280 */ PROC_NPC_ZELR, - /* 0x281 */ PROC_NPC_ZELRO, - /* 0x282 */ PROC_OBJ_ZRAFREEZE, - /* 0x283 */ PROC_NPC_ZRC, - /* 0x284 */ PROC_NPC_ZRZ, - /* 0x285 */ PROC_ZRA_MARK, - /* 0x286 */ PROC_MYNA2, - /* 0x287 */ PROC_TAG_MYNA2, - /* 0x288 */ PROC_NPC_CD3, - /* 0x289 */ PROC_Tag_Schedule, - /* 0x28A */ PROC_Tag_Escape, - /* 0x28B */ PROC_NPC_CHAT, - /* 0x28C */ PROC_NPC_SOLDIERa, - /* 0x28D */ PROC_NPC_SOLDIERb, - /* 0x28E */ PROC_PASSER_MNG, - /* 0x28F */ PROC_NPC_PASSER, - /* 0x290 */ PROC_NPC_PASSER2, - /* 0x291 */ PROC_NPC_POST, - /* 0x292 */ PROC_NPC_POUYA, - /* 0x293 */ PROC_FORMATION_MNG, - /* 0x294 */ PROC_NPC_FGUARD, - /* 0x295 */ PROC_GUARD_MNG, - /* 0x296 */ PROC_TAG_GUARD, - /* 0x297 */ PROC_NPC_GUARD, - /* 0x298 */ PROC_NPC_ASH, - /* 0x299 */ PROC_NPC_ASHB, - /* 0x29A */ PROC_NPC_SHAD, - /* 0x29B */ PROC_NPC_RAFREL, - /* 0x29C */ PROC_NPC_MOIR, - /* 0x29D */ PROC_NPC_IMPAL, - /* 0x29E */ PROC_NPC_SHOE, - /* 0x29F */ PROC_NPC_DOORBOY, - /* 0x2A0 */ PROC_NPC_PRAYER, - /* 0x2A1 */ PROC_NPC_KASIHANA, - /* 0x2A2 */ PROC_NPC_KASIKYU, - /* 0x2A3 */ PROC_NPC_KASIMICH, - /* 0x2A4 */ PROC_NPC_DRSOL, - /* 0x2A5 */ PROC_NPC_CHIN, - /* 0x2A6 */ PROC_NPC_INS, - /* 0x2A7 */ PROC_NPC_SHOP0, - /* 0x2A8 */ PROC_NPC_MK, - /* 0x2A9 */ PROC_NPC_P2, - /* 0x2AA */ PROC_KYTAG00, - /* 0x2AB */ PROC_KYTAG01, - /* 0x2AC */ PROC_KYTAG02, - /* 0x2AD */ PROC_KYTAG03, - /* 0x2AE */ PROC_KYTAG04, - /* 0x2AF */ PROC_KYTAG05, - /* 0x2B0 */ PROC_KYTAG06, - /* 0x2B1 */ PROC_KYTAG07, - /* 0x2B2 */ PROC_KYTAG08, - /* 0x2B3 */ PROC_KYTAG09, - /* 0x2B4 */ PROC_KYTAG10, - /* 0x2B5 */ PROC_KYTAG11, - /* 0x2B6 */ PROC_KYTAG12, - /* 0x2B7 */ PROC_KYTAG13, - /* 0x2B8 */ PROC_KYTAG14, - /* 0x2B9 */ PROC_KYTAG15, - /* 0x2BA */ PROC_KYTAG16, - /* 0x2BB */ PROC_KYTAG17, - /* 0x2BC */ PROC_Ykgr, - /* 0x2BD */ PROC_TALK, - /* 0x2BE */ PROC_Obj_Crope, - /* 0x2BF */ PROC_Obj_Bombf, - /* 0x2C0 */ PROC_Obj_BkLeaf, - /* 0x2C1 */ PROC_Tag_Mhint, - /* 0x2C2 */ PROC_Tag_Mmsg, - /* 0x2C3 */ PROC_Tag_Mwait, - /* 0x2C4 */ PROC_Tag_Mstop, - /* 0x2C5 */ PROC_Tag_Stream, - /* 0x2C6 */ PROC_Tag_Sppath, - /* 0x2C7 */ PROC_Tag_Wljump, - /* 0x2C8 */ PROC_Tag_TWGate, - /* 0x2C9 */ PROC_Tag_Lv6Gate, - /* 0x2CA */ PROC_Tag_Lv7Gate, - /* 0x2CB */ PROC_Tag_Lv8Gate, - /* 0x2CC */ PROC_Tag_TheBHint, - /* 0x2CD */ PROC_Tag_Assist, - /* 0x2CE */ PROC_DEMO00, - /* 0x2CF */ PROC_TAG_CAMERA, - /* 0x2D0 */ PROC_TAG_CHKPOINT, - /* 0x2D1 */ PROC_TAG_EVENT, - /* 0x2D2 */ PROC_TAG_EVT, - /* 0x2D3 */ PROC_TAG_TELOP, - /* 0x2D4 */ PROC_TAG_HOWL, - /* 0x2D5 */ PROC_TAG_MSG, - /* 0x2D6 */ PROC_TAG_LANTERN, - /* 0x2D7 */ PROC_Tag_Mist, - /* 0x2D8 */ PROC_DMIDNA, - /* 0x2D9 */ PROC_KY_THUNDER, - /* 0x2DA */ PROC_VRBOX, - /* 0x2DB */ PROC_VRBOX2, - /* 0x2DC */ PROC_BG, - /* 0x2DD */ PROC_SET_BG_OBJ, - /* 0x2DE */ PROC_BG_OBJ, - /* 0x2DF */ PROC_MIRROR, - /* 0x2E0 */ PROC_MOVIE_PLAYER, - /* 0x2E1 */ PROC_TITLE, - /* 0x2E2 */ PROC_FR, - /* 0x2E3 */ PROC_ECONT, - /* 0x2E4 */ PROC_MG_ROD, - /* 0x2E5 */ PROC_E_ARROW, - /* 0x2E6 */ PROC_BULLET, - /* 0x2E7 */ PROC_SWHIT0, - /* 0x2E8 */ PROC_E_TH_BALL, - /* 0x2E9 */ PROC_TAG_EVTAREA, - /* 0x2EA */ PROC_TAG_EVTMSG, - /* 0x2EB */ PROC_TAG_KMSG, - /* 0x2EC */ PROC_TAG_PUSH, - /* 0x2ED */ PROC_E_MK_BO, - /* 0x2EE */ PROC_E_MM_MT, - /* 0x2EF */ PROC_OBJ_KBOX, - /* 0x2F0 */ PROC_OBJ_FW, - /* 0x2F1 */ PROC_B_GOS, - /* 0x2F2 */ PROC_OBJ_YSTONE, - /* 0x2F3 */ PROC_MANT, - /* 0x2F4 */ PROC_CROD, - /* 0x2F5 */ PROC_OBJ_PLEAF, - /* 0x2F6 */ PROC_OBJ_KBACKET, - /* 0x2F7 */ PROC_OBJ_YBAG, - /* 0x2F8 */ PROC_OBJ_PUMPKIN, - /* 0x2F9 */ PROC_OBJ_AUTOMATA, - /* 0x2FA */ PROC_OBJ_GADGET, - /* 0x2FB */ PROC_OBJ_KAGO, - /* 0x2FC */ PROC_Obj_Carry, - /* 0x2FD */ PROC_Obj_Stone, - /* 0x2FE */ PROC_OBJ_HB, - /* 0x2FF */ PROC_NPC_INKO, - /* 0x300 */ PROC_BD, - /* 0x301 */ PROC_Obj_Eff, - /* 0x302 */ PROC_WPILLAR, - /* 0x303 */ PROC_WMARK, - /* 0x304 */ PROC_E_BI, - /* 0x305 */ PROC_E_BI_LEAF, - /* 0x306 */ PROC_START_AND_GOAL, - /* 0x307 */ PROC_NPC_DF, - /* 0x308 */ PROC_ARROW, - /* 0x309 */ PROC_PATH_LINE, - /* 0x30A */ PROC_TAG_ALLMATO, - /* 0x30B */ PROC_Obj_Timer, - /* 0x30C */ PROC_SCENE_EXIT, - /* 0x30D */ PROC_CAMERA, - /* 0x30E */ PROC_CAMERA2, - /* 0x30F */ PROC_SUSPEND, - /* 0x310 */ PROC_GRASS, - /* 0x311 */ PROC_KYEFF, - /* 0x312 */ PROC_KYEFF2, - /* 0x313 */ PROC_MSG_OBJECT, - /* 0x314 */ PROC_MENUWINDOW, - /* 0x315 */ PROC_TIMER, - /* 0x316 */ PROC_METER2, - /* 0x317 */ PROC_GAMEOVER, - - PROC_MAX_NUM, -}; - -#endif /* D_PROCNAME_H */ diff --git a/include/d/d_save.h b/include/d/d_save.h index 9a57f9eb15..68a58e3ad1 100644 --- a/include/d/d_save.h +++ b/include/d/d_save.h @@ -5,7 +5,7 @@ #include "SSystem/SComponent/c_xyz.h" #include <os.h> #include "global.h" -#include "f_pc/f_pc_name.h" +#include "d/d_item_data.h" #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JHostIO/JORReflexible.h" |
