diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2024-07-12 21:14:13 -0400 |
|---|---|---|
| committer | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2024-07-12 21:14:13 -0400 |
| commit | 2def735282a0584a5a2b3ed007bd99ddfb72b394 (patch) | |
| tree | 0aed235b7e874a33aa9d1b1a1cba67bc67f4077e | |
| parent | 61d9f474a53cc8a02490e8cdb1b4f86bb4d1af95 (diff) | |
Add fpc_ProcID type and use it for all process IDs
See https://github.com/zeldaret/tp/pull/2173
159 files changed, 401 insertions, 382 deletions
diff --git a/include/SSystem/SComponent/c_bg_s.h b/include/SSystem/SComponent/c_bg_s.h index 1f8bec4b..44c009ac 100644 --- a/include/SSystem/SComponent/c_bg_s.h +++ b/include/SSystem/SComponent/c_bg_s.h @@ -25,7 +25,7 @@ public: void Release(); virtual ~cBgS_ChkElm() {} - virtual void Regist2(cBgW*, uint, void*); + virtual void Regist2(cBgW*, fpc_ProcID, void*); bool ChkUsed() const { return (m_flags & 1); } }; // Size: 0x14 @@ -44,7 +44,7 @@ public: cM3dGPla* GetTriPla(cBgS_PolyInfo& polyInfo) const { return GetTriPla(polyInfo.GetBgIndex(), polyInfo.GetPolyIndex()); } - bool Regist(cBgW*, uint, void*); + bool Regist(cBgW*, fpc_ProcID, void*); bool Release(cBgW*); bool LineCross(cBgS_LinChk*); f32 GroundCross(cBgS_GndChk*); diff --git a/include/SSystem/SComponent/c_bg_s_chk.h b/include/SSystem/SComponent/c_bg_s_chk.h index 0158deef..42600f92 100644 --- a/include/SSystem/SComponent/c_bg_s_chk.h +++ b/include/SSystem/SComponent/c_bg_s_chk.h @@ -2,6 +2,7 @@ #define C_BG_S_CHK_H #include "dolphin/mtx/vec.h" +#include "f_pc/f_pc_base.h" #include "global.h" struct cBgD_Vtx_t : public Vec {}; @@ -17,7 +18,7 @@ class cBgS_Chk { private: /* 0x0 */ cBgS_PolyPassChk* mPolyPassChk; /* 0x4 */ cBgS_GrpPassChk* mGrpPassChk; - /* 0x8 */ uint mActorPid; + /* 0x8 */ fpc_ProcID mActorPid; /* 0xC */ u8 unk_0x0C; /* 0x10 */ // __vtable__ @@ -33,10 +34,10 @@ public: mActorPid = other.mActorPid; unk_0x0C = other.unk_0x0C; } - bool ChkSameActorPid(uint) const; + bool ChkSameActorPid(fpc_ProcID) const; - void SetActorPid(uint pid) { mActorPid = pid; } - uint GetActorPid() const { return mActorPid; } + void SetActorPid(fpc_ProcID pid) { mActorPid = pid; } + fpc_ProcID GetActorPid() const { return mActorPid; } void SetPolyPassChk(cBgS_PolyPassChk* p_chk) { mPolyPassChk = p_chk; } void SetGrpPassChk(cBgS_GrpPassChk* p_chk) { mGrpPassChk = p_chk; } cBgS_PolyPassChk* GetPolyPassChk() const { return mPolyPassChk; } diff --git a/include/SSystem/SComponent/c_bg_s_lin_chk.h b/include/SSystem/SComponent/c_bg_s_lin_chk.h index ad782b29..ac67b09e 100644 --- a/include/SSystem/SComponent/c_bg_s_lin_chk.h +++ b/include/SSystem/SComponent/c_bg_s_lin_chk.h @@ -20,7 +20,7 @@ public: public: cBgS_LinChk() { ct(); } void ct(); - void Set2(cXyz* pStart, cXyz* pEnd, uint actorPid); + void Set2(cXyz* pStart, cXyz* pEnd, fpc_ProcID actorPid); virtual ~cBgS_LinChk() {} diff --git a/include/SSystem/SComponent/c_bg_s_poly_info.h b/include/SSystem/SComponent/c_bg_s_poly_info.h index 68a19a6e..f7807230 100644 --- a/include/SSystem/SComponent/c_bg_s_poly_info.h +++ b/include/SSystem/SComponent/c_bg_s_poly_info.h @@ -12,7 +12,7 @@ private: /* 0x00 */ u16 mPolyIndex; /* 0x02 */ u16 mBgIndex; /* 0x04 */ cBgW* mpBgW; - /* 0x08 */ uint mActorId; + /* 0x08 */ fpc_ProcID mActorId; public: cBgS_PolyInfo() { @@ -27,13 +27,13 @@ public: void SetPolyInfo(const cBgS_PolyInfo& other) { *this = other; } - void SetActorInfo(int bg_index, void* bgw, uint actor_id) { + void SetActorInfo(int bg_index, void* bgw, fpc_ProcID actor_id) { JUT_ASSERT(0x59, 0 <= bg_index); mBgIndex = bg_index; mpBgW = (cBgW*)bgw; mActorId = actor_id; } - bool ChkSafe(const void* bgw, uint pid) { + bool ChkSafe(const void* bgw, fpc_ProcID pid) const { if (mpBgW == bgw && mActorId == pid) return true; return false; @@ -50,16 +50,19 @@ public: return true; } + bool ChkSetInf() const { + if (mPolyIndex == 0xFFFF || mBgIndex == 0x100) { + return false; + } + + return true; + } bool ChkBgIndex() const { if (mBgIndex == 0x100) { return false; } return true; } - - // TODO - void ChkSafe(const void*, uint) const {} - void ChkSetInf() const {} void SetPolyIndex(int poly_index) { JUT_ASSERT(0x7b, 0 <= poly_index); mPolyIndex = poly_index; diff --git a/include/SSystem/SComponent/c_cc_d.h b/include/SSystem/SComponent/c_cc_d.h index 50bef911..a01a7f9f 100644 --- a/include/SSystem/SComponent/c_cc_d.h +++ b/include/SSystem/SComponent/c_cc_d.h @@ -6,6 +6,7 @@ #include "SSystem/SComponent/c_m3d_g_cyl.h" #include "SSystem/SComponent/c_m3d_g_sph.h" #include "SSystem/SComponent/c_m3d_g_tri.h" +#include "f_pc/f_pc_base.h" class fopAc_ac_c; class cCcD_PntAttr; @@ -353,7 +354,7 @@ class cCcD_Stts { private: /* 0x00 */ cXyz m_cc_move; /* 0x0C */ fopAc_ac_c* mActor; - /* 0x10 */ uint mApid; + /* 0x10 */ fpc_ProcID mApid; /* 0x14 */ u8 mWeight; /* 0x15 */ u8 field_0x15; /* 0x16 */ u8 mDmg; @@ -364,7 +365,7 @@ public: virtual ~cCcD_Stts() {} virtual const cCcD_GStts* GetGStts() const; virtual cCcD_GStts* GetGStts(); - void Init(int, int, void*, uint); + void Init(int, int, void*, fpc_ProcID); virtual void Ct(); void PlusCcMove(f32, f32, f32); void ClrCcMove() { @@ -381,7 +382,7 @@ public: fopAc_ac_c* GetActor() const { return mActor; } void SetActor(void* ac) { mActor = (fopAc_ac_c*)ac; } cXyz* GetCCMoveP() { return &m_cc_move; } - uint GetApid() const { return mApid; } + fpc_ProcID GetApid() const { return mApid; } }; // Size = 0x1C STATIC_ASSERT(0x1C == sizeof(cCcD_Stts)); diff --git a/include/d/actor/d_a_agb.h b/include/d/actor/d_a_agb.h index a1d9fbbd..bb05cb90 100644 --- a/include/d/actor/d_a_agb.h +++ b/include/d/actor/d_a_agb.h @@ -37,7 +37,7 @@ public: public: /* 0x00 */ u16 field_0x0; - /* 0x04 */ uint mMsgID; + /* 0x04 */ fpc_ProcID mMsgID; /* 0x08 */ msg_class* mpMsg; }; @@ -110,8 +110,8 @@ public: BOOL isHold() { return mHold; } BOOL getFollowTarget() { return mFollowTarget; } void setFollowTarget(bool follow) { mFollowTarget = follow; } - uint getTargetID() { return mTargetID; } - void setTargetID(uint pid) { mTargetID = pid; } + fpc_ProcID getTargetID() { return mTargetID; } + void setTargetID(fpc_ProcID pid) { mTargetID = pid; } struct daAgb_ItemBuy { union { @@ -247,7 +247,7 @@ public: /* 0x634 */ cXyz field_0x634; /* 0x640 */ int field_0x640; /* 0x648 */ u64 mPlayerName; - /* 0x650 */ uint mTargetID; + /* 0x650 */ fpc_ProcID mTargetID; /* 0x654 */ int field_0x654; /* 0x658 */ s16 field_0x658; /* 0x65A */ u16 mPrevButtons; diff --git a/include/d/actor/d_a_am.h b/include/d/actor/d_a_am.h index 16ed4219..b4c5afea 100644 --- a/include/d/actor/d_a_am.h +++ b/include/d/actor/d_a_am.h @@ -28,7 +28,7 @@ public: /* 0x02DC */ s16 mSpawnRotY; /* 0x02DE */ u8 m02DE[0x02E0 - 0x02DE]; /* 0x02E0 */ int mCurrBckIdx; - /* 0x02E4 */ uint mSwallowedActorPID; + /* 0x02E4 */ fpc_ProcID mSwallowedActorPID; /* 0x02E8 */ f32 mAreaRadius; /* 0x02EC */ f32 mCorrectionOffsetY; /* 0x02F0 */ f32 mSpawnPosY; diff --git a/include/d/actor/d_a_arrow.h b/include/d/actor/d_a_arrow.h index 5415392d..247e8918 100644 --- a/include/d/actor/d_a_arrow.h +++ b/include/d/actor/d_a_arrow.h @@ -87,7 +87,7 @@ public: /* 0x606 */ u8 field_0x606[0x608 - 0x606]; /* 0x608 */ s16 mSparkleTimer; /* 0x60C */ JPABaseEmitter* mpSparkleEmitter; - /* 0x610 */ uint mHitActorProcID; + /* 0x610 */ fpc_ProcID mHitActorProcID; /* 0x614 */ s32 mHitJointIndex; /* 0x618 */ cXyz field_0x618; /* 0x624 */ u8 field_0x624[0x660 - 0x624]; @@ -96,7 +96,7 @@ public: /* 0x668 */ dPa_followEcallBack mBlurFollowCb; /* 0x67C */ csXyz mBlurAngle; /* 0x682 */ u8 field_0x682; - /* 0x684 */ uint mLightEffPID; + /* 0x684 */ fpc_ProcID mLightEffPID; /* 0x688 */ bool mbHasLightEff; /* 0x68C */ daArrow_c_ProcFunc mCurrProcFunc; /* 0x698 */ bool field_0x698; diff --git a/include/d/actor/d_a_auction.h b/include/d/actor/d_a_auction.h index 3dc57bb6..670447b8 100644 --- a/include/d/actor/d_a_auction.h +++ b/include/d/actor/d_a_auction.h @@ -41,7 +41,7 @@ public: void setAucMdlNo(u8 idx, u8 mdlNo) { mAucMdlNo[idx] = mdlNo; } void setItemNo(unsigned char) {} void setKind(unsigned char, unsigned char) {} - void setNpcID(int, uint) {} + void setNpcID(int, fpc_ProcID) {} void setStart(unsigned char) {} s32 _create(); @@ -95,10 +95,10 @@ public: public: /* 0x6C4 */ request_of_phase_process_class mPhs; /* 0x6CC */ dNpc_EventCut_c mNpcEvtInfo; - /* 0x738 */ uint m738[8]; - /* 0x758 */ uint mCurrAuctionItemPID; - /* 0x75C */ uint mTimerID; - /* 0x760 */ uint mGaugeID; + /* 0x738 */ fpc_ProcID m738[8]; + /* 0x758 */ fpc_ProcID mCurrAuctionItemPID; + /* 0x75C */ fpc_ProcID mTimerID; + /* 0x760 */ fpc_ProcID mGaugeID; /* 0x764 */ dTimer_c* mpTimer; /* 0x768 */ LIGHT_INFLUENCE mLight; /* 0x788 */ J3DModel* mpModel; diff --git a/include/d/actor/d_a_bflower.h b/include/d/actor/d_a_bflower.h index d7fed8bc..fcba1740 100644 --- a/include/d/actor/d_a_bflower.h +++ b/include/d/actor/d_a_bflower.h @@ -54,7 +54,7 @@ public: /* 0x59C */ fopAc_ac_c* mpBombActor; // Bomb2 actor /* 0x5A0 */ s32 mAnimTimer; /* 0x5A4 */ f32 mPrevPlayerDist; - /* 0x5A8 */ uint mPrevGrabActorID; // Actor held by player during previous frame? + /* 0x5A8 */ fpc_ProcID mPrevGrabActorID; // Actor held by player during previous frame? /* 0x5AC */ cXyz mBombScale; /* 0x5B8 */ u8 m5B8; }; diff --git a/include/d/actor/d_a_deku_item.h b/include/d/actor/d_a_deku_item.h index 17467ef8..2d5138a8 100644 --- a/include/d/actor/d_a_deku_item.h +++ b/include/d/actor/d_a_deku_item.h @@ -47,7 +47,7 @@ public: /* 0x62C */ Mode_e mMode; /* 0x630 */ BOOL unk630; /* 0x634 */ s32 mItemBitNo; - /* 0x638 */ uint mItemPID; + /* 0x638 */ fpc_ProcID mItemPID; /* 0x63C */ JPABaseEmitter* mpEmitter; }; diff --git a/include/d/actor/d_a_fan.h b/include/d/actor/d_a_fan.h index c71fb689..74a50cf2 100644 --- a/include/d/actor/d_a_fan.h +++ b/include/d/actor/d_a_fan.h @@ -36,7 +36,7 @@ public: /* 0x4C8 */ mDoExt_btkAnm mWindBtkAnm1; /* 0x4C8 */ mDoExt_bckAnm mWindBckAnm; /* 0x500 */ cXyz mWindScale; - /* 0x50C */ uint mWindSePId; + /* 0x50C */ fpc_ProcID mWindSePId; static const char* m_arcname[3]; static const char m_arcname2[8]; diff --git a/include/d/actor/d_a_fganon.h b/include/d/actor/d_a_fganon.h index fb043696..7a7c172e 100644 --- a/include/d/actor/d_a_fganon.h +++ b/include/d/actor/d_a_fganon.h @@ -46,7 +46,7 @@ public: /* 0x68F */ u8 m68F; /* 0x690 */ u8 m690; /* 0x691 */ u8 m691[0x6B4 - 0x691]; - /* 0x6B4 */ uint mCapeID; + /* 0x6B4 */ fpc_ProcID mCapeID; /* 0x6B8 */ dBgS_AcchCir m6B8; /* 0x6F8 */ dBgS_Acch m6F8; /* 0x8BC */ dCcD_Stts mStts; diff --git a/include/d/actor/d_a_hookshot.h b/include/d/actor/d_a_hookshot.h index 63f94d5e..651b65ac 100644 --- a/include/d/actor/d_a_hookshot.h +++ b/include/d/actor/d_a_hookshot.h @@ -20,7 +20,7 @@ public: int getChainCnt() { return mChainCnt; } cXyz getMoveVec() const { return mMoveVec; } - uint getCarryActorID() const { return mCarryActorID; } + fpc_ProcID getCarryActorID() const { return mCarryActorID; } void getHookAngle() {} MtxP getMtxTop() { return mMtx; } void getObjHookFlg() const {} @@ -71,7 +71,7 @@ public: /* 0x398 */ dCcD_Stts mStts; /* 0x3D4 */ dCcD_Cps mCps; /* 0x50C */ cXyz m50C; - /* 0x518 */ uint mCarryActorID; + /* 0x518 */ fpc_ProcID mCarryActorID; /* 0x51C */ Mtx mMtx; /* 0x54C */ ProcFunc mCurrProcFunc; }; diff --git a/include/d/actor/d_a_item.h b/include/d/actor/d_a_item.h index 899c05b6..292b41d4 100644 --- a/include/d/actor/d_a_item.h +++ b/include/d/actor/d_a_item.h @@ -118,7 +118,7 @@ public: /* 0x66B */ u8 mItemStatus; /* 0x66C */ u8 mOnGroundTimer; /* 0x66D */ u8 field_0x66D[0x670 - 0x66D]; - /* 0x670 */ uint mDemoItemBsPcId; + /* 0x670 */ fpc_ProcID mDemoItemBsPcId; /* 0x674 */ dPa_rippleEcallBack mPtclRippleCb; /* 0x688 */ dPa_followEcallBack mPtclFollowCb; /* 0x69C */ dPa_smokeEcallBack mPtclSmokeCb; diff --git a/include/d/actor/d_a_kamome.h b/include/d/actor/d_a_kamome.h index df98c896..3994092e 100644 --- a/include/d/actor/d_a_kamome.h +++ b/include/d/actor/d_a_kamome.h @@ -47,7 +47,7 @@ public: /* 0x2EC */ s16 mRiseTimer; /* 0x2EE */ u8 m2EE[0x2F0 - 0x2EE]; /* 0x2F0 */ f32 mScale; - /* 0x2F4 */ uint mEsaProcID; + /* 0x2F4 */ fpc_ProcID mEsaProcID; /* 0x2F8 */ fopAc_ac_c* mpTargetActor; /* 0x2FC */ s16 m2FC; /* 0x2FE */ u8 mbUsePathMovement; diff --git a/include/d/actor/d_a_kantera.h b/include/d/actor/d_a_kantera.h index caa617d8..e3055cd5 100644 --- a/include/d/actor/d_a_kantera.h +++ b/include/d/actor/d_a_kantera.h @@ -30,7 +30,7 @@ public: /* 0x29B */ u8 mSwitchID; /* 0x29C */ J3DModel* mpModel; /* 0x2A0 */ J3DModel* mpModel2; - /* 0x2A4 */ uint mTargetActorID; + /* 0x2A4 */ fpc_ProcID mTargetActorID; /* 0x2A8 */ mDoExt_brkAnm* mpBrkAnm1; /* 0x2AC */ mDoExt_brkAnm* mpBrkAnm2; /* 0x2B0 */ int m2B0; diff --git a/include/d/actor/d_a_mo2.h b/include/d/actor/d_a_mo2.h index 21ddc5b3..cd95d92c 100644 --- a/include/d/actor/d_a_mo2.h +++ b/include/d/actor/d_a_mo2.h @@ -114,7 +114,7 @@ public: /* 0x2951 */ u8 m2951; /* 0x2952 */ s16 m2952; /* 0x2954 */ int m2954; - /* 0x2958 */ uint mWeaponPcId; + /* 0x2958 */ fpc_ProcID mWeaponPcId; /* 0x295C */ fopAc_ac_c* mpBomb; /* 0x2960 */ u16 m2960; /* 0x2962 */ u8 m2962[0x2968 - 0x2962]; diff --git a/include/d/actor/d_a_mozo.h b/include/d/actor/d_a_mozo.h index 839ec480..bb00e98c 100644 --- a/include/d/actor/d_a_mozo.h +++ b/include/d/actor/d_a_mozo.h @@ -21,7 +21,7 @@ public: BOOL CreateHeap(); s32 CreateInit(); void event_move(); - fopAc_ac_c* getBeamActor(uint); + fopAc_ac_c* getBeamActor(fpc_ProcID); void search_beam_proc_init(); void search_beam_proc(); void search_fire_proc_init(); diff --git a/include/d/actor/d_a_npc_ba1.h b/include/d/actor/d_a_npc_ba1.h index cc5ef79d..2c72a5f3 100644 --- a/include/d/actor/d_a_npc_ba1.h +++ b/include/d/actor/d_a_npc_ba1.h @@ -52,7 +52,7 @@ public: void getMsg(); void chkAttention(); void setAttention(bool); - void searchByID(uint); + void searchByID(fpc_ProcID); void partner_srch_sub(void* (*)(void*, void*)); void partner_srch(); void check_useFairyArea(); diff --git a/include/d/actor/d_a_npc_bj1.h b/include/d/actor/d_a_npc_bj1.h index 8fa97906..51916a28 100644 --- a/include/d/actor/d_a_npc_bj1.h +++ b/include/d/actor/d_a_npc_bj1.h @@ -55,7 +55,7 @@ public: void getMsg(); void chkAttention(); void setAttention(bool); - void searchByID(uint); + void searchByID(fpc_ProcID); void partner_srch_sub(void* (*)(void*, void*)); void partner_srch(); void setCollision_SP_(); diff --git a/include/d/actor/d_a_npc_bm1.h b/include/d/actor/d_a_npc_bm1.h index 4e1f8839..6dcd55da 100644 --- a/include/d/actor/d_a_npc_bm1.h +++ b/include/d/actor/d_a_npc_bm1.h @@ -84,7 +84,7 @@ public: void getMsg(); void chkAttention(); void setAttention(bool); - void searchByID(uint); + void searchByID(fpc_ProcID); void partner_srch_sub(void* (*)(void*, void*)); void partner_srch(); void bm_movPass(bool); diff --git a/include/d/actor/d_a_npc_de1.h b/include/d/actor/d_a_npc_de1.h index bd30b52c..8880fada 100644 --- a/include/d/actor/d_a_npc_de1.h +++ b/include/d/actor/d_a_npc_de1.h @@ -28,7 +28,7 @@ public: void checkOrder(); void chkAttention(); void setAttention(); - void searchByID(uint); + void searchByID(fpc_ProcID); void setDemoStartCenter(); void partner_srch(); void ccCreate(); diff --git a/include/d/actor/d_a_npc_gk1.h b/include/d/actor/d_a_npc_gk1.h index a7c511be..7b2e7714 100644 --- a/include/d/actor/d_a_npc_gk1.h +++ b/include/d/actor/d_a_npc_gk1.h @@ -38,7 +38,7 @@ public: void checkOrder(); void chk_talk(); void chk_parts_notMov(); - void searchByID(uint, int*); + void searchByID(fpc_ProcID, int*); void lookBack(); void chkAttention(); void setAttention(bool); diff --git a/include/d/actor/d_a_npc_gp1.h b/include/d/actor/d_a_npc_gp1.h index b92cb3d6..353a2a14 100644 --- a/include/d/actor/d_a_npc_gp1.h +++ b/include/d/actor/d_a_npc_gp1.h @@ -41,7 +41,7 @@ public: void getMsg(); void chkAttention(); void setAttention(bool); - void searchByID(uint); + void searchByID(fpc_ProcID); void partner_srch_sub(void* (*)(void*, void*)); void partner_srch(); void ctrl_WAITanm(); diff --git a/include/d/actor/d_a_npc_hi1.h b/include/d/actor/d_a_npc_hi1.h index ed5a772a..a5938ab4 100644 --- a/include/d/actor/d_a_npc_hi1.h +++ b/include/d/actor/d_a_npc_hi1.h @@ -41,7 +41,7 @@ public: void checkOrder(); void chk_talk(); void chk_parts_notMov(); - void searchByID(uint, int*); + void searchByID(fpc_ProcID, int*); void lookBack(); void chkAttention(); void setAttention(bool); diff --git a/include/d/actor/d_a_npc_hr.h b/include/d/actor/d_a_npc_hr.h index d9c4393e..f0370edf 100644 --- a/include/d/actor/d_a_npc_hr.h +++ b/include/d/actor/d_a_npc_hr.h @@ -41,7 +41,7 @@ public: /* 0x0E8 */ cXyz mSquallPos[4]; /* 0x118 */ u8 m118; /* 0x119 */ u8 m119[0x11C - 0x119]; - /* 0x11C */ uint mActorProcID; + /* 0x11C */ fpc_ProcID mActorProcID; /* 0x120 */ f32 m120; /* 0x124 */ f32 m124; /* 0x128 */ f32 m128; diff --git a/include/d/actor/d_a_npc_kf1.h b/include/d/actor/d_a_npc_kf1.h index b665faf3..e5d2b88c 100644 --- a/include/d/actor/d_a_npc_kf1.h +++ b/include/d/actor/d_a_npc_kf1.h @@ -37,7 +37,7 @@ public: void eventOrder(); void checkOrder(); void chk_talk(); - void searchByID(uint, int*); + void searchByID(fpc_ProcID, int*); void srch_Tsubo(); void create_rupee(cXyz, int); void ready_kutaniCamera(int, int); diff --git a/include/d/actor/d_a_npc_kk1.h b/include/d/actor/d_a_npc_kk1.h index ee7dcf25..5ec69a82 100644 --- a/include/d/actor/d_a_npc_kk1.h +++ b/include/d/actor/d_a_npc_kk1.h @@ -41,7 +41,7 @@ public: void checkOrder(); void chk_talk(); void chk_parts_notMov(); - void searchByID(uint, int*); + void searchByID(fpc_ProcID, int*); void partner_search_sub(void* (*)(void*, void*)); void partner_search(); void lookBack(); diff --git a/include/d/actor/d_a_npc_ko1.h b/include/d/actor/d_a_npc_ko1.h index 58f0ecd2..83b9bbcb 100644 --- a/include/d/actor/d_a_npc_ko1.h +++ b/include/d/actor/d_a_npc_ko1.h @@ -63,7 +63,7 @@ public: void getMsg(); void chkAttention(); void setAttention(bool); - void searchByID(uint); + void searchByID(fpc_ProcID); void partner_srch_sub(void* (*)(void*, void*)); void partner_srch(); void check_landOn(); diff --git a/include/d/actor/d_a_npc_ls1.h b/include/d/actor/d_a_npc_ls1.h index ceced343..9d5627fb 100644 --- a/include/d/actor/d_a_npc_ls1.h +++ b/include/d/actor/d_a_npc_ls1.h @@ -67,7 +67,7 @@ public: void checkOrder(); void chk_talk(); void chk_parts_notMov(); - void searchByID(uint, int*); + void searchByID(fpc_ProcID, int*); void partner_search_sub(void* (*)(void*, void*)); void partner_search(); void setEyeCtrl(); diff --git a/include/d/actor/d_a_npc_ob1.h b/include/d/actor/d_a_npc_ob1.h index 35d4d268..f7d374c6 100644 --- a/include/d/actor/d_a_npc_ob1.h +++ b/include/d/actor/d_a_npc_ob1.h @@ -44,7 +44,7 @@ public: void getMsg(); void chkAttention(); void setAttention(bool); - void searchByID(uint); + void searchByID(fpc_ProcID); void partner_srch(); void bitCount(unsigned char); void set_pigCnt(); diff --git a/include/d/actor/d_a_npc_pf1.h b/include/d/actor/d_a_npc_pf1.h index 05886757..aa22b55f 100644 --- a/include/d/actor/d_a_npc_pf1.h +++ b/include/d/actor/d_a_npc_pf1.h @@ -38,7 +38,7 @@ public: void checkOrder(); void chk_talk(); void chk_parts_notMov(); - void searchByID(uint, int*); + void searchByID(fpc_ProcID, int*); void lookBack(); void chkAttention(); void setAttention(bool); diff --git a/include/d/actor/d_a_npc_roten.h b/include/d/actor/d_a_npc_roten.h index bbeb7af7..e0103602 100644 --- a/include/d/actor/d_a_npc_roten.h +++ b/include/d/actor/d_a_npc_roten.h @@ -91,7 +91,7 @@ public: /* 0x6E0 */ mDoExt_btpAnm mBtpAnm; /* 0x6F4 */ u32 mShadowId; /* 0x6F8 */ u32 field_0x6F8; - /* 0x6FC */ uint field_0x6FC; + /* 0x6FC */ fpc_ProcID field_0x6FC; /* 0x700 */ dNpc_PathRun_c mPathRun; /* 0x708 */ cXyz field_0x708; /* 0x714 */ cXyz field_0x714; diff --git a/include/d/actor/d_a_npc_yw1.h b/include/d/actor/d_a_npc_yw1.h index 19bb13f8..a046b2ad 100644 --- a/include/d/actor/d_a_npc_yw1.h +++ b/include/d/actor/d_a_npc_yw1.h @@ -45,7 +45,7 @@ public: void checkOrder(); void chk_talk(); void chk_parts_notMov(); - void searchByID(uint, int*); + void searchByID(fpc_ProcID, int*); void partner_search_sub(void* (*)(void*, void*)); void partner_search(); void lookBack(); diff --git a/include/d/actor/d_a_npc_zk1.h b/include/d/actor/d_a_npc_zk1.h index 752b7b06..f14d1ca9 100644 --- a/include/d/actor/d_a_npc_zk1.h +++ b/include/d/actor/d_a_npc_zk1.h @@ -37,7 +37,7 @@ public: void checkOrder(); void chk_talk(); void chk_parts_notMov(); - void searchByID(uint, int*); + void searchByID(fpc_ProcID, int*); void lookBack(); void chkAttention(); void setAttention(bool); diff --git a/include/d/actor/d_a_npc_zl1.h b/include/d/actor/d_a_npc_zl1.h index 072cab3a..599242f4 100644 --- a/include/d/actor/d_a_npc_zl1.h +++ b/include/d/actor/d_a_npc_zl1.h @@ -69,7 +69,7 @@ public: void checkOrder(); void chk_talk(); void chk_parts_notMov(); - void searchByID(uint, int*); + void searchByID(fpc_ProcID, int*); void partner_search_sub(void* (*)(void*, void*)); void partner_search(); void setEyeCtrl(); diff --git a/include/d/actor/d_a_obj_buoyflag.h b/include/d/actor/d_a_obj_buoyflag.h index 1f7b77c8..834ae4ca 100644 --- a/include/d/actor/d_a_obj_buoyflag.h +++ b/include/d/actor/d_a_obj_buoyflag.h @@ -48,7 +48,7 @@ namespace daObjBuoyflag { class Act_c : public fopAc_ac_c { public: - static uint make_norm(uint parentPId, cXyz* pos, int roomNo, csXyz* angle) { + static fpc_ProcID make_norm(fpc_ProcID parentPId, cXyz* pos, int roomNo, csXyz* angle) { u32 params = prm_make(static_cast<Type_e>(0), static_cast<Texture_e>(0), false); // TODO: placeholder return fopAcM_createChild(PROC_Obj_Buoyflag, parentPId, params, pos, roomNo, angle); } @@ -63,8 +63,8 @@ namespace daObjBuoyflag { inline BOOL _draw(); inline BOOL _execute(); void jump_to_sea(float, float, short) {} - void make_barrel2_mine(uint, cXyz*, int, csXyz*, Texture_e, bool) {} - void make_barrel2_norm(uint, cXyz*, int, csXyz*, Texture_e) {} + void make_barrel2_mine(fpc_ProcID, cXyz*, int, csXyz*, Texture_e, bool) {} + void make_barrel2_norm(fpc_ProcID, cXyz*, int, csXyz*, Texture_e) {} void attr_type() const; // weak but not inlined? void prm_get_noCull() const {} void prm_get_texture() const; // weak but not inlined? diff --git a/include/d/actor/d_a_obj_eskban.h b/include/d/actor/d_a_obj_eskban.h index e566c320..b42b0858 100644 --- a/include/d/actor/d_a_obj_eskban.h +++ b/include/d/actor/d_a_obj_eskban.h @@ -60,7 +60,7 @@ namespace daObjEskban { /* 0x320 */ dCcD_Cyl mCheckCyl; /* 0x450 */ dCcD_Stts mCameraStts; /* 0x48C */ dCcD_Cyl mCameraCyl; - /* 0x5BC */ uint mActorID; + /* 0x5BC */ fpc_ProcID mActorID; /* 0x5C0 */ dCcD_Stts mCheckSphStts; /* 0x5FC */ dCcD_Sph mCheckSph; /* 0x728 */ s32 mActorState; diff --git a/include/d/actor/d_a_obj_figure.h b/include/d/actor/d_a_obj_figure.h index 7f89d53e..434950ff 100644 --- a/include/d/actor/d_a_obj_figure.h +++ b/include/d/actor/d_a_obj_figure.h @@ -61,7 +61,7 @@ public: /* 0x3F8 */ dCcD_Stts mStts; /* 0x434 */ dCcD_Cyl mCyl1; /* 0x564 */ dCcD_Cyl mCyl2; - /* 0x694 */ uint m694; + /* 0x694 */ fpc_ProcID m694; /* 0x698 */ msg_class* mpCurrMsg; /* 0x69C */ u32 m69C; /* 0x6A0 */ dNpc_EventCut_c mEventCut; diff --git a/include/d/actor/d_a_obj_ftree.h b/include/d/actor/d_a_obj_ftree.h index 792c43a5..2217a8b4 100644 --- a/include/d/actor/d_a_obj_ftree.h +++ b/include/d/actor/d_a_obj_ftree.h @@ -123,7 +123,7 @@ namespace daObjFtree { /* 0x4CC */ dCcD_Stts m4CC; /* 0x508 */ dCcD_Cyl m508; /* 0x638 */ u8 m638[0x64C - 0x638]; - /* 0x64C */ uint mSpawnedHeartPieceProcessId; + /* 0x64C */ fpc_ProcID mSpawnedHeartPieceProcessId; /* 0x650 */ s16 m650; /* 0x652 */ s16 m652; /* 0x654 */ GXColorS10 m654; diff --git a/include/d/actor/d_a_obj_ikada.h b/include/d/actor/d_a_obj_ikada.h index 3293dafc..c34d33cc 100644 --- a/include/d/actor/d_a_obj_ikada.h +++ b/include/d/actor/d_a_obj_ikada.h @@ -144,7 +144,7 @@ public: /* 0x0550 */ Mtx mMtx; /* 0x0580 */ dBgS_ObjAcch mObjAcch; /* 0x0744 */ dBgS_AcchCir mAcchCir; - /* 0x0784 */ uint mFlagPcId; + /* 0x0784 */ fpc_ProcID mFlagPcId; /* 0x0788 */ cXyz mFlagOffset; /* 0x0794 */ f32 mFlagScale; /* 0x0798 */ J3DModel* mpRopeEnd; diff --git a/include/d/actor/d_a_obj_mknjd.h b/include/d/actor/d_a_obj_mknjd.h index 6c69ba02..151b7929 100644 --- a/include/d/actor/d_a_obj_mknjd.h +++ b/include/d/actor/d_a_obj_mknjd.h @@ -88,7 +88,7 @@ namespace daObjMknjD { /* 0x04E6 */ u8 mGiveItemNo; /* 0x04E8 */ cXyz mGoalPos; /* 0x04F4 */ u32 mMsgNo; - /* 0x04F8 */ uint mMsgPID; + /* 0x04F8 */ fpc_ProcID mMsgPID; /* 0x04FC */ msg_class* mMsgPtr; /* 0x0500 */ s32 m0500; /* 0x0504 */ bool m0504; diff --git a/include/d/actor/d_a_obj_movebox.h b/include/d/actor/d_a_obj_movebox.h index e94d6e5c..45175bb5 100644 --- a/include/d/actor/d_a_obj_movebox.h +++ b/include/d/actor/d_a_obj_movebox.h @@ -267,7 +267,7 @@ namespace daObjMovebox { /* 0x64E */ bool mbPrmXInitialized; /* 0x64F */ bool m64F; /* 0x650 */ EffSmokeCB mSmokeCbs[2]; - /* 0x6B8 */ uint mChildPID; + /* 0x6B8 */ fpc_ProcID mChildPID; /* 0x6BC */ BOOL mbRollCrash; static const char* const M_arcname[13]; diff --git a/include/d/actor/d_a_obj_paper.h b/include/d/actor/d_a_obj_paper.h index b5a759b1..2e86d4a3 100644 --- a/include/d/actor/d_a_obj_paper.h +++ b/include/d/actor/d_a_obj_paper.h @@ -61,7 +61,7 @@ namespace daObjPaper { /* 0x3CC */ dCcD_Stts mColStatus; /* 0x408 */ bool mbHasCc; /* 0x40C */ int mMode; - /* 0x410 */ uint mMsgId; + /* 0x410 */ fpc_ProcID mMsgId; /* 0x414 */ msg_class* mpMsg; /* 0x418 */ Type_e mType; }; diff --git a/include/d/actor/d_a_obj_search.h b/include/d/actor/d_a_obj_search.h index 29308558..cb1aed44 100644 --- a/include/d/actor/d_a_obj_search.h +++ b/include/d/actor/d_a_obj_search.h @@ -20,7 +20,7 @@ namespace daObj_Search { void isSecond() {} void modeProcInit(int) {} void setBkControl(bool control) { mBkControl = control; } - void setChildId(uint id) { mChildId = id; } + void setChildId(fpc_ProcID id) { mChildId = id; } void _createHeap(); void searchCreateHeap(); @@ -69,7 +69,7 @@ namespace daObj_Search { /* 0x290 */ u8 m290[0x664 - 0x290]; /* 0x664 */ bool mBkControl; /* 0x665 */ u8 m665[0x84C - 0x665]; - /* 0x84C */ uint mChildId; + /* 0x84C */ fpc_ProcID mChildId; }; class Bgc_c { diff --git a/include/d/actor/d_a_oship.h b/include/d/actor/d_a_oship.h index 12097602..d6ae3ce4 100644 --- a/include/d/actor/d_a_oship.h +++ b/include/d/actor/d_a_oship.h @@ -103,8 +103,8 @@ public: /* 0xD08 */ cXyz mSmokePos; /* 0xD14 */ cXyz mFlagOffset; /* 0xD20 */ Mtx mFlagMtx; - /* 0xD50 */ uint mFlagPcId; - /* 0xD54 */ uint mBombPcId[1]; + /* 0xD50 */ fpc_ProcID mFlagPcId; + /* 0xD54 */ fpc_ProcID mBombPcId[1]; /* 0xD58 */ u8 mD58[0xD68 - 0xD58]; /* 0xD68 */ f32 mVelocityFwdTarget; /* 0xD6C */ int mAimCounter; diff --git a/include/d/actor/d_a_player.h b/include/d/actor/d_a_player.h index 74259998..b33bf9ce 100644 --- a/include/d/actor/d_a_player.h +++ b/include/d/actor/d_a_player.h @@ -486,14 +486,14 @@ public: virtual BOOL checkCutCharge() const { return FALSE; } virtual BOOL getBokoFlamePos(cXyz*);// { return FALSE; } virtual BOOL checkTactWait() const { return FALSE; } - virtual void setTactZev(uint, int, char*) {} + virtual void setTactZev(fpc_ProcID, int, char*) {} virtual void onDekuSpReturnFlg(u8) {} virtual BOOL checkComboCutTurn() const { return false; } virtual f32 getBaseAnimeFrameRate() = 0; virtual f32 getBaseAnimeFrame() = 0; - virtual uint getItemID() const { return fpcM_ERROR_PROCESS_ID_e; } - virtual uint getThrowBoomerangID() const { return fpcM_ERROR_PROCESS_ID_e; } - virtual uint getGrabActorID() const;// { return fpcM_ERROR_PROCESS_ID_e; } + virtual fpc_ProcID getItemID() const { return fpcM_ERROR_PROCESS_ID_e; } + virtual fpc_ProcID getThrowBoomerangID() const { return fpcM_ERROR_PROCESS_ID_e; } + virtual fpc_ProcID getGrabActorID() const;// { return fpcM_ERROR_PROCESS_ID_e; } virtual BOOL checkGrabBarrel() { return FALSE; } virtual u32 checkPlayerNoDraw() { return FALSE; } virtual BOOL checkRopeTag() { return FALSE; } @@ -503,7 +503,7 @@ public: virtual void onFrollCrashFlg(u32);// {} virtual MtxP getModelJointMtx(u16) { return NULL; } virtual f32 getOldSpeedY() { return 0.0f; } - virtual BOOL setHookshotCarryOffset(uint, const cXyz*) { return FALSE; } + virtual BOOL setHookshotCarryOffset(fpc_ProcID, const cXyz*) { return FALSE; } virtual void setPlayerPosAndAngle(cXyz*, s16);// {} virtual void setPlayerPosAndAngle(cXyz*, csXyz*) {} virtual void setPlayerPosAndAngle(MtxP) {} diff --git a/include/d/actor/d_a_player_main.h b/include/d/actor/d_a_player_main.h index 5698fa7e..87c0e481 100644 --- a/include/d/actor/d_a_player_main.h +++ b/include/d/actor/d_a_player_main.h @@ -63,11 +63,11 @@ public: void setData(fopAc_ac_c*); void clearData(); - uint getID() const { return mID; } + fpc_ProcID getID() const { return mID; } fopAc_ac_c* getActor() { return mActor; } private: - /* 0x0 */ uint mID; + /* 0x0 */ fpc_ProcID mID; /* 0x4 */ fopAc_ac_c* mActor; }; // Size: 0x8 @@ -1691,7 +1691,7 @@ public: void getShadowID() const {} void npcStartRestartRoom() {} void setDaiokutaEnd() {} - void setWhirlId(uint) {} + void setWhirlId(fpc_ProcID) {} void decrementBombCnt() { if (mActivePlayerBombs != 0) { mActivePlayerBombs--; @@ -1795,14 +1795,14 @@ public: virtual BOOL checkCutCharge() const { return mCurProc == daPyProc_CUT_TURN_MOVE_e; } virtual BOOL getBokoFlamePos(cXyz*); virtual BOOL checkTactWait() const { return mCurProc == daPyProc_TACT_WAIT_e; } - virtual void setTactZev(uint, int, char*); + virtual void setTactZev(fpc_ProcID, int, char*); virtual void onDekuSpReturnFlg(u8 i_point); virtual BOOL checkComboCutTurn() const { return mCurProc == daPyProc_CUT_TURN_e && m3570 != 0; } virtual f32 getBaseAnimeFrameRate() { return mFrameCtrlUnder[UNDER_MOVE0_e].getRate(); } virtual f32 getBaseAnimeFrame() { return mFrameCtrlUnder[UNDER_MOVE0_e].getFrame(); } - virtual uint getItemID() const { return mActorKeepEquip.getID(); } - virtual uint getThrowBoomerangID() const { return mActorKeepThrow.getID(); } - virtual uint getGrabActorID() const { return mActorKeepGrab.getID(); } + virtual fpc_ProcID getItemID() const { return mActorKeepEquip.getID(); } + virtual fpc_ProcID getThrowBoomerangID() const { return mActorKeepThrow.getID(); } + virtual fpc_ProcID getGrabActorID() const { return mActorKeepGrab.getID(); } virtual BOOL checkGrabBarrel() { return checkGrabBarrelSearch(1); } virtual u32 checkPlayerNoDraw() { return dComIfGp_checkCameraAttentionStatus(mCameraInfoIdx, 2) || checkNoResetFlg0(daPyFlg0_NO_DRAW); } virtual BOOL checkRopeTag() { return mActorKeepEquip.getActor() == NULL; } @@ -1812,7 +1812,7 @@ public: virtual void onFrollCrashFlg(u32 param_1) { m3620 = param_1; onNoResetFlg0(daPyFlg0_UNK8); } virtual MtxP getModelJointMtx(u16 idx) { return mpCLModel->getAnmMtx(idx); } virtual f32 getOldSpeedY() { return mOldSpeed.y; } - virtual BOOL setHookshotCarryOffset(uint, const cXyz*); + virtual BOOL setHookshotCarryOffset(fpc_ProcID, const cXyz*); virtual void cancelChangeTextureAnime() { resetDemoTextureAnime(); } public: @@ -2102,11 +2102,11 @@ public: /* 0x361C */ u32 mMtrlSndId; /* 0x3620 */ u32 m3620; /* 0x3624 */ u32 m3624; - /* 0x3628 */ uint m3628; - /* 0x362C */ uint mTactZevPartnerPID; - /* 0x3630 */ uint m3630; + /* 0x3628 */ fpc_ProcID m3628; + /* 0x362C */ fpc_ProcID mTactZevPartnerPID; + /* 0x3630 */ fpc_ProcID m3630; /* 0x3634 */ int m3634; - /* 0x3638 */ uint mMsgId; + /* 0x3638 */ fpc_ProcID mMsgId; /* 0x363C */ J3DFrameCtrl* mpSeAnmFrameCtrl; /* 0x3640 */ s16 m3640; /* 0x3644 */ f32 m3644; diff --git a/include/d/actor/d_a_pw.h b/include/d/actor/d_a_pw.h index a3343a89..ef1fcee9 100644 --- a/include/d/actor/d_a_pw.h +++ b/include/d/actor/d_a_pw.h @@ -49,8 +49,8 @@ public: /* 0x366 */ s16 mAction; /* 0x368 */ s16 mState; /* 0x36A */ u8 m36A[0x36C - 0x36A]; - /* 0x36C */ uint mJalhallaID; - /* 0x370 */ uint mKanteraID; + /* 0x36C */ fpc_ProcID mJalhallaID; + /* 0x370 */ fpc_ProcID mKanteraID; /* 0x374 */ int mBckIdx; /* 0x378 */ s16 m378; /* 0x37A */ s16 m37A; diff --git a/include/d/actor/d_a_rd.h b/include/d/actor/d_a_rd.h index a27f63d7..bd94f012 100644 --- a/include/d/actor/d_a_rd.h +++ b/include/d/actor/d_a_rd.h @@ -193,7 +193,7 @@ public: /* 0x690 */ u32 mShadowId; /* 0x694 */ mDoExt_invisibleModel mInvisModel; /* 0x69C */ dNpc_JntCtrl_c mJntCtrl; - /* 0x6D0 */ uint mCorpseID; + /* 0x6D0 */ fpc_ProcID mCorpseID; /* 0x6D4 */ int m6D4; /* 0x6D8 */ s8 mBckIdx; /* 0x6D9 */ s8 mAnmPrmIdx; diff --git a/include/d/actor/d_a_st.h b/include/d/actor/d_a_st.h index e7452a1a..d38f15cd 100644 --- a/include/d/actor/d_a_st.h +++ b/include/d/actor/d_a_st.h @@ -60,10 +60,10 @@ public: /* 0x1DA2 */ u8 m1DA2[0x1DA4 - 0x1DA2]; /* 0x1DA4 */ cXyz m1DA4[3]; /* 0x1DC8 */ u8 m1DC8[0x1DCC - 0x1DC8]; - /* 0x1DCC */ uint mHeldWeaponEntityId; + /* 0x1DCC */ fpc_ProcID mHeldWeaponEntityId; /* 0x1DD0 */ u8 m1DD0; /* 0x1DD1 */ u8 m1DD1[0x1DD4 - 0x1DD1]; - /* 0x1DD4 */ uint mUpperBodyEntityId; + /* 0x1DD4 */ fpc_ProcID mUpperBodyEntityId; /* 0x1DD8 */ u8 m1DD8; /* 0x1DD9 */ u8 m1DD9[0x1DDA - 0x1DD9]; /* 0x1DDA */ s16 m1DDA; diff --git a/include/d/actor/d_a_tag_etc.h b/include/d/actor/d_a_tag_etc.h index 6f2941c8..26d57806 100644 --- a/include/d/actor/d_a_tag_etc.h +++ b/include/d/actor/d_a_tag_etc.h @@ -24,7 +24,7 @@ public: /* 0x291*/ u8 field_0x291; /* 0x292*/ u8 field_0x292; /* 0x293*/ u8 field_0x293; - /* 0x294 */ uint mMedliPID; + /* 0x294 */ fpc_ProcID mMedliPID; /* 0x298 */ s16 mEventIdx; /* 0x29A */ short field_0x29A; }; diff --git a/include/d/actor/d_a_tama.h b/include/d/actor/d_a_tama.h index c8fa33f6..d153ce9d 100644 --- a/include/d/actor/d_a_tama.h +++ b/include/d/actor/d_a_tama.h @@ -8,7 +8,7 @@ class daTama_c : public fopAc_ac_c { public: void setDis(f32 dis) { mDis = dis; } - void setPartnerID(uint id) { mPartnerID = id; } + void setPartnerID(fpc_ProcID id) { mPartnerID = id; } void setSpd(f32 spd) { speedF = spd; } BOOL createInit(); @@ -18,7 +18,7 @@ public: s32 _create(); public: - /* 0x290 */ uint mPartnerID; + /* 0x290 */ fpc_ProcID mPartnerID; /* 0x294 */ dBgS_ObjAcch mAcch; /* 0x458 */ dBgS_AcchCir mAcchCir; /* 0x498 */ dCcD_Stts mStts; diff --git a/include/d/actor/d_a_tn.h b/include/d/actor/d_a_tn.h index d7ffb36f..8c02e494 100644 --- a/include/d/actor/d_a_tn.h +++ b/include/d/actor/d_a_tn.h @@ -54,7 +54,7 @@ public: /* 0x1390 */ u8 m1390[0x1408 - 0x1390]; /* 0x1408 */ int m1408; /* 0x140C */ u8 m140C[0x1430 - 0x140C]; - /* 0x1430 */ uint mCapeEntityId; + /* 0x1430 */ fpc_ProcID mCapeEntityId; /* 0x1434 */ dPa_cutTurnEcallBack_c m1434[3]; /* 0x1464 */ cXyz m1464[10]; /* 0x14DC */ u8 m14DC[0x150C - 0x14DC]; diff --git a/include/d/actor/d_a_toge.h b/include/d/actor/d_a_toge.h index b54d1969..a7ef6ac9 100644 --- a/include/d/actor/d_a_toge.h +++ b/include/d/actor/d_a_toge.h @@ -39,7 +39,7 @@ public: /* 0x474 */ f32 unk474; /* 0x478 */ s32 mSwitchNo; /* 0x47C */ u8 pad47C[4]; - /* 0x480 */ uint mWindTagId; + /* 0x480 */ fpc_ProcID mWindTagId; /* 0x484 */ u8 mEventState; /* 0x485 */ u8 unk485; /* 0x486 */ u8 unk486; diff --git a/include/d/actor/d_a_wind_tag.h b/include/d/actor/d_a_wind_tag.h index 6d94583d..1bc3614e 100644 --- a/include/d/actor/d_a_wind_tag.h +++ b/include/d/actor/d_a_wind_tag.h @@ -71,7 +71,7 @@ namespace daWindTag { /* 0x57D */ u8 field_0x57d; /* 0x57E */ bool mbDraw; /* 0x57F */ u8 field_0x57f; - /* 0x580 */ uint mLevelSeID; + /* 0x580 */ fpc_ProcID mLevelSeID; }; }; // namespace daWindTag diff --git a/include/d/d_attention.h b/include/d/d_attention.h index 8ebc6092..0201a4aa 100644 --- a/include/d/d_attention.h +++ b/include/d/d_attention.h @@ -22,24 +22,24 @@ public: class dAttHint_c { public: dAttHint_c() {} - uint getPId(void*); - fopAc_ac_c* convPId(uint); + fpc_ProcID getPId(void*); + fopAc_ac_c* convPId(fpc_ProcID); int request(fopAc_ac_c*, int); void init(); void proc(); - fopAc_ac_c* getZHintTarget() { return convPId(field_0x8); } + fopAc_ac_c* getZHintTarget() { return convPId(mZHintTargetID); } private: - /* 0x0 */ uint mHintActorID; + /* 0x0 */ fpc_ProcID mHintActorID; /* 0x4 */ int mPriority; - /* 0x8 */ uint field_0x8; + /* 0x8 */ fpc_ProcID mZHintTargetID; }; class dAttCatch_c { public: dAttCatch_c() {} - fopAc_ac_c* convPId(uint); + fopAc_ac_c* convPId(fpc_ProcID); void init(); void proc(); void request(fopAc_ac_c*, u8, f32, f32, f32, s16, int); @@ -48,14 +48,14 @@ public: u8 getChangeItem() { return mChangeItem; } private: - /* 0x00 */ uint field_0x0; + /* 0x00 */ fpc_ProcID field_0x0; /* 0x04 */ int field_0x4; /* 0x08 */ f32 field_0x8; /* 0x0C */ u8 field_0xc; /* 0x0D */ u8 field_0xd; /* 0x0E */ u8 field_0xe; /* 0x0F */ u8 field_0xf; - /* 0x10 */ uint mCatghTargetID; + /* 0x10 */ fpc_ProcID mCatghTargetID; /* 0x14 */ u8 mChangeItem; }; // Size: 0x18 @@ -81,19 +81,19 @@ public: class dAttLook_c { public: - fopAc_ac_c* convPId(uint); + fopAc_ac_c* convPId(fpc_ProcID); void init(); void proc(); void request(fopAc_ac_c*, f32, f32, f32, s16, int); void requestF(fopAc_ac_c*, s16, int); - uint getLookTarget() { return mLookTargetID; } + fpc_ProcID getLookTarget() { return mLookTargetID; } private: - /* 0x0 */ uint field_0x0; + /* 0x0 */ fpc_ProcID field_0x0; /* 0x4 */ u32 field_0x4; /* 0x8 */ f32 field_0x8; - /* 0xC */ uint mLookTargetID; + /* 0xC */ fpc_ProcID mLookTargetID; }; // Size: 0x10 class dAttList_c { @@ -101,12 +101,12 @@ public: fopAc_ac_c* getActor(); void setActor(fopAc_ac_c*); - uint getPid() { return mActorID; } + fpc_ProcID getPid() { return mActorID; } /* 0x0 */ f32 mWeight; /* 0x4 */ f32 mDistance; /* 0x8 */ u32 mType; - /* 0xC */ uint mActorID; + /* 0xC */ fpc_ProcID mActorID; }; // Size: 0x10 class dAttDraw_CallBack_c : public mDoExt_McaMorfCallBack1_c { @@ -156,7 +156,7 @@ public: void Draw(); fopAc_ac_c* LockonTarget(s32); void LockonReleaseDistanse(); - uint LockonTargetPId(s32); + fpc_ProcID LockonTargetPId(s32); fopAc_ac_c* ActionTarget(s32); bool LockonTruth(); diff --git a/include/d/d_bg_s.h b/include/d/d_bg_s.h index 502d9a15..760b0572 100644 --- a/include/d/d_bg_s.h +++ b/include/d/d_bg_s.h @@ -136,7 +136,7 @@ public: // not 100% sure if this is right Set(i_pos, i_line, fpcM_GetID(actor), param_3); } - void Set(cXyz* i_pos, cXyz* i_line, uint actorPid, cXyz* param_3) { + void Set(cXyz* i_pos, cXyz* i_line, fpc_ProcID actorPid, cXyz* param_3) { // not 100% sure if this is right pm_pos = i_pos; pm_old_pos = i_line; @@ -177,7 +177,7 @@ public: void SetCyl() { mCyl.Set(*pm_pos, mWallRadius, mWallHeight * 2.0f); } void SetLin() { mLin.SetStartEnd(*pm_old_pos, *pm_pos); } - void SetWallActorInfo(int bg_index, void* bgw, uint actor_id) { + void SetWallActorInfo(int bg_index, void* bgw, fpc_ProcID actor_id) { SetActorInfo(bg_index, bgw, actor_id); } void SetWallPolyIndex(int) {} // TODO diff --git a/include/d/d_bg_s_acch.h b/include/d/d_bg_s_acch.h index 137918bf..f2fbd745 100644 --- a/include/d/d_bg_s_acch.h +++ b/include/d/d_bg_s_acch.h @@ -94,10 +94,10 @@ public: f32 GetWallAllLowH_R(); f32 GetSpeedY(); f32 GetWallAddY(Vec&); - void SetNowActorInfo(int bg_index, void* bgw, uint apid) { + void SetNowActorInfo(int bg_index, void* bgw, fpc_ProcID apid) { m_bg_index = bg_index; field_0x78 = bgw; - field_0x7c = apid; + m_ap_id = apid; } void SetWallPolyIndex(int, int); void CalcMovePosWork(); @@ -185,7 +185,7 @@ public: /* 0x05C */ cM3dGCyl m_wall_cyl; /* 0x074 */ int m_bg_index; /* 0x078 */ void* field_0x78; - /* 0x07C */ u32 field_0x7c; + /* 0x07C */ fpc_ProcID m_ap_id; /* 0x080 */ fopAc_ac_c* m_my_ac; /* 0x084 */ int m_tbl_size; /* 0x088 */ dBgS_AcchCir* pm_acch_cir; diff --git a/include/d/d_camera.h b/include/d/d_camera.h index f19f072a..4a0d1e73 100644 --- a/include/d/d_camera.h +++ b/include/d/d_camera.h @@ -5,6 +5,7 @@ #include "SSystem/SComponent/c_rnd.h" #include "SSystem/SComponent/c_sxyz.h" #include "SSystem/SComponent/c_xyz.h" +#include "f_pc/f_pc_base.h" #include "d/d_cam_param.h" #include "global.h" @@ -351,8 +352,8 @@ public: void SubjectLockOn(fopAc_ac_c*); void SubjectLockOff(); void GetForceLockOnActor(); - void ForceLockOn(uint); - void ForceLockOff(uint); + void ForceLockOn(fpc_ProcID); + void ForceLockOff(fpc_ProcID); void SetExtendedPosition(cXyz*); void ScopeViewMsgModeOff(); diff --git a/include/d/d_cc_d.h b/include/d/d_cc_d.h index a2aa3a6a..193d603c 100644 --- a/include/d/d_cc_d.h +++ b/include/d/d_cc_d.h @@ -121,12 +121,12 @@ public: void Move(); void ClrAt() { mAtSpl = 0; } void ClrTg() { mTgSpl = 0; } - void SetAtApid(uint id) { mAtApid = id; } - void SetTgApid(uint id) { mTgApid = id; } + void SetAtApid(fpc_ProcID id) { mAtApid = id; } + void SetTgApid(fpc_ProcID id) { mTgApid = id; } u8 GetRoomId() { return mRoomId; } void SetRoomId(int id) { mRoomId = id; } - uint GetAtOldApid() { return mAtOldApid; } - uint GetTgOldApid() { return mTgOldApid; } + fpc_ProcID GetAtOldApid() { return mAtOldApid; } + fpc_ProcID GetTgOldApid() { return mTgOldApid; } bool ChkNoActor() { return field_0x1C & 1; } bool ChkNoneActorPerfTblId() { return mActorPerfTblId == 0xFFFF; } dCcG_At_Spl GetAtSpl() { return (dCcG_At_Spl)mAtSpl; } @@ -140,10 +140,10 @@ public: /* 0x05 */ u8 mTgSpl; /* 0x06 */ u8 mRoomId; /* 0x08 */ u16 mActorPerfTblId; - /* 0x0C */ uint mAtApid; - /* 0x10 */ uint mAtOldApid; - /* 0x14 */ uint mTgApid; - /* 0x18 */ uint mTgOldApid; + /* 0x0C */ fpc_ProcID mAtApid; + /* 0x10 */ fpc_ProcID mAtOldApid; + /* 0x14 */ fpc_ProcID mTgApid; + /* 0x18 */ fpc_ProcID mTgOldApid; /* 0x1C */ int field_0x1C; }; // Size = 0x20 @@ -179,7 +179,7 @@ public: /* 0x00 */ u32 mSPrm; /* 0x04 */ u32 mRPrm; /* 0x08 */ dCcD_HitCallback mHitCallback; - /* 0x0C */ uint mApid; + /* 0x0C */ fpc_ProcID mApid; /* 0x10 */ fopAc_ac_c* mAc; /* 0x14 */ s8 mEffCounter; /* 0x15 */ u8 field_0x15[3]; @@ -197,7 +197,7 @@ public: mHitCallback = NULL; mEffCounter = 0; } - void SetHitApid(uint id) { + void SetHitApid(fpc_ProcID id) { mApid = id; mAc = NULL; } @@ -387,9 +387,9 @@ public: dCcD_HitCallback GetCoHitCallback() { return mGObjCo.GetHitCallback(); } dCcD_HitCallback GetAtHitCallback() { return mGObjAt.GetHitCallback(); } dCcD_HitCallback GetTgHitCallback() { return mGObjTg.GetHitCallback(); } - void SetCoHitApid(uint apid) { mGObjCo.SetHitApid(apid); } - void SetAtHitApid(uint apid) { mGObjAt.SetHitApid(apid); } - void SetTgHitApid(uint apid) { mGObjTg.SetHitApid(apid); } + void SetCoHitApid(fpc_ProcID apid) { mGObjCo.SetHitApid(apid); } + void SetAtHitApid(fpc_ProcID apid) { mGObjAt.SetHitApid(apid); } + void SetTgHitApid(fpc_ProcID apid) { mGObjTg.SetHitApid(apid); } void OnCoHitNoActor() { mGObjCo.OnRPrm(1); } void OffCoHitNoActor() { mGObjCo.OffRPrm(1); } void OnAtHitNoActor() { mGObjAt.OnRPrm(2); } diff --git a/include/d/d_com_inf_game.h b/include/d/d_com_inf_game.h index b6980554..8dfc72b9 100644 --- a/include/d/d_com_inf_game.h +++ b/include/d/d_com_inf_game.h @@ -2738,7 +2738,7 @@ inline void dComIfGp_event_setItemPartner(void* pt) { g_dComIfG_gameInfo.play.getEvent().setPtI(pt); } -inline void dComIfGp_event_setItemPartnerId(uint id) { +inline void dComIfGp_event_setItemPartnerId(fpc_ProcID id) { g_dComIfG_gameInfo.play.getEvent().setPtI_Id(id); } diff --git a/include/d/d_demo.h b/include/d/d_demo.h index 717ec360..44b1176a 100644 --- a/include/d/d_demo.h +++ b/include/d/d_demo.h @@ -21,6 +21,7 @@ #include "JSystem/JStudio/JStudio_JParticle/control.h" #include "JSystem/JStudio/JStudio_JStage/control.h" #include "m_Do/m_Do_mtx.h" +#include "f_pc/f_pc_base.h" class fopAc_ac_c; @@ -111,7 +112,7 @@ public: /* 0x4C */ u32 field_0x4c; /* 0x50 */ const void* field_0x50; /* 0x54 */ u32 field_0x54; - /* 0x58 */ uint mActorPcId; + /* 0x58 */ fpc_ProcID mActorPcId; /* 0x5C */ s32 mBckId; /* 0x60 */ s32 mBtpId; /* 0x64 */ s32 mBtkId; diff --git a/include/d/d_door.h b/include/d/d_door.h index c5a6bda6..61c46649 100644 --- a/include/d/d_door.h +++ b/include/d/d_door.h @@ -120,7 +120,7 @@ public: BOOL proc(cXyz*); public: - /* 0x0 */ uint mMsgPId; + /* 0x0 */ fpc_ProcID mMsgPId; /* 0x4 */ msg_class* m_msg; /* 0x8 */ u8 mState; /* 0xA */ s16 mMsgId; diff --git a/include/d/d_event.h b/include/d/d_event.h index a1b8baa3..d222f668 100644 --- a/include/d/d_event.h +++ b/include/d/d_event.h @@ -1,6 +1,7 @@ #ifndef D_EVENT_D_EVENT_H #define D_EVENT_D_EVENT_H +#include "f_pc/f_pc_base.h" #include "global.h" class fopAc_ac_c; @@ -90,15 +91,15 @@ public: void remove(); dStage_Event_dt_c* getStageEventDt(); dStage_Event_dt_c* nextStageEventDt(void*); - uint getPId(void*); - fopAc_ac_c* convPId(uint); + fpc_ProcID getPId(void*); + fopAc_ac_c* convPId(fpc_ProcID); u8 getTactFreeMStick(int); u8 getTactFreeCStick(int); bool giveItemCut(u8); u8 getTalkXYBtn() { return mTalkButton; } bool chkTalkXY() { return mTalkButton == 1 || mTalkButton == 2 || mTalkButton == 3; } - void setPtI_Id(uint id) { mPtItem = id; } + void setPtI_Id(fpc_ProcID id) { mPtItem = id; } void setPtI(void* actor) { mPtItem = getPId(actor); } fopAc_ac_c* getPtI() { return convPId(mPtItem); } void setGtItm(u8 itemNo) { mGetItemNo = itemNo; } @@ -135,10 +136,10 @@ public: /* 0xC1 */ s8 mFirstOrderIdx; /* 0xC2 */ u8 mMode; /* 0xC3 */ u8 mbEndProc; - /* 0xC4 */ uint mPt1; - /* 0xC8 */ uint mPt2; - /* 0xCC */ uint mPtTalk; - /* 0xD0 */ uint mPtItem; + /* 0xC4 */ fpc_ProcID mPt1; + /* 0xC8 */ fpc_ProcID mPt2; + /* 0xCC */ fpc_ProcID mPtTalk; + /* 0xD0 */ fpc_ProcID mPtItem; /* 0xD4 */ u8 mGetItemNo; /* 0xD5 */ u8 field_0xD5[0xD6 - 0xD5]; /* 0xD6 */ s16 mHindFlag; diff --git a/include/d/d_kankyo.h b/include/d/d_kankyo.h index 3bc87a40..fc67e13a 100644 --- a/include/d/d_kankyo.h +++ b/include/d/d_kankyo.h @@ -4,6 +4,7 @@ #include "JSystem/J3DGraphBase/J3DTevs.h" #include "SSystem/SComponent/c_xyz.h" #include "dolphin/gx/GX.h" +#include "f_pc/f_pc_base.h" #include "global.h" class J3DModel; @@ -78,7 +79,7 @@ struct SND_INFLUENCE { /* 0x00 */ cXyz field_0x0; /* 0x0C */ int field_0xc; /* 0x10 */ int field_0x10; - /* 0x14 */ u32 field_0x14; + /* 0x14 */ fpc_ProcID field_0x14; }; struct WAVECHAN { @@ -393,7 +394,7 @@ void dKy_set_nexttime(f32); void dKy_instant_timechg(f32); void dKy_instant_rainchg(); SND_INFLUENCE * dKy_Sound_get(); -void dKy_Sound_set(cXyz i_pos, int param_1, uint i_actorID, int param_3); +void dKy_Sound_set(cXyz i_pos, int param_1, fpc_ProcID i_actorID, int param_3); void dKy_SordFlush_set(cXyz hitPos, int lightType); void dKy_itudemo_se(); void dKy_actor_addcol_set(s16, s16, s16, f32); diff --git a/include/d/d_npc.h b/include/d/d_npc.h index edb8a117..a78cb0c1 100644 --- a/include/d/d_npc.h +++ b/include/d/d_npc.h @@ -261,7 +261,7 @@ public: /* 0x574 */ dCcD_Cyl mCyl; /* 0x6A4 */ u32 mCurrMsgNo; /* 0x6A8 */ u32 mEndMsgNo; - /* 0x6AC */ uint mCurrMsgBsPcId; + /* 0x6AC */ fpc_ProcID mCurrMsgBsPcId; /* 0x6B0 */ msg_class* mpCurrMsg; /* 0x6B4 */ u8 field_0x6b4[6]; /* 0x6BA */ u16 field_0x6ba; diff --git a/include/d/d_snap.h b/include/d/d_snap.h index 163657e1..9b0e7191 100644 --- a/include/d/d_snap.h +++ b/include/d/d_snap.h @@ -221,7 +221,7 @@ public: /* 0x00 */ cXyz mCenter; /* 0x0C */ f32 mRadius; /* 0x10 */ f32 mHeight; - /* 0x14 */ uint mActorPID; + /* 0x14 */ fpc_ProcID mActorPID; /* 0x18 */ u8 mPhoto; /* 0x19 */ u8 field_0x19; /* 0x1A */ u8 field_0x1a; diff --git a/include/d/d_stage.h b/include/d/d_stage.h index ea0ffe21..fe48a41c 100644 --- a/include/d/d_stage.h +++ b/include/d/d_stage.h @@ -869,10 +869,10 @@ public: static s8 getStayNo() { return mStayNo; } static s8 getMemoryBlockID(int i_roomNo) { return mStatus[i_roomNo].mMemBlockID; } static void onStatusDraw(int i_roomNo) { mStatus[i_roomNo].mDraw = true; } - static void setProcID(uint id) { mProcID = id; } - static uint getProcID() { return mProcID; } - static void setStatusProcID(int i_roomNo, uint i_id) { mStatus[i_roomNo].mProcID = i_id; } - static uint getStatusProcID(int i_roomNo) { return mStatus[i_roomNo].mProcID; } + static void setProcID(fpc_ProcID id) { mProcID = id; } + static fpc_ProcID getProcID() { return mProcID; } + static void setStatusProcID(int i_roomNo, fpc_ProcID i_id) { mStatus[i_roomNo].mProcID = i_id; } + static fpc_ProcID getStatusProcID(int i_roomNo) { return mStatus[i_roomNo].mProcID; } static dStage_darkStatus_c& getDarkStatus(int i_idx) { return mDarkStatus[i_idx]; } static char* getDemoArcName() { return mDemoArcName; } static u8 getDarkRatio() { return mDarkRatio; } @@ -889,7 +889,7 @@ public: static dStage_roomStatus_c mStatus[64]; static dStage_darkStatus_c mDarkStatus[8]; static u8 mDarkRatio; - static uint mProcID; + static fpc_ProcID mProcID; static s8 mStayNo; static s8 mOldStayNo; static s8 m_time_pass; diff --git a/include/d/d_timer.h b/include/d/d_timer.h index 6482baa4..39e338ae 100644 --- a/include/d/d_timer.h +++ b/include/d/d_timer.h @@ -103,8 +103,8 @@ public: /* 0x174 */ u32 field_0x174; }; -uint dTimer_createStockTimer(); +fpc_ProcID dTimer_createStockTimer(); -uint dTimer_createTimer(int, u16, u8, u8, f32, f32, f32, f32); +fpc_ProcID dTimer_createTimer(int, u16, u8, u8, f32, f32, f32, f32); #endif /* D_TIMER_H */ diff --git a/include/f_op/f_op_actor.h b/include/f_op/f_op_actor.h index 911ae576..d6e1b2fd 100644 --- a/include/f_op/f_op_actor.h +++ b/include/f_op/f_op_actor.h @@ -279,7 +279,7 @@ public: /* 0x1C2 */ u8 gbaName; /* 0x1C4 */ u32 actor_status; /* 0x1C8 */ u32 actor_condition; - /* 0x1CC */ uint parentActorID; + /* 0x1CC */ fpc_ProcID parentActorID; /* 0x1D0 */ actor_place home; /* 0x1E4 */ actor_place old; /* 0x1F8 */ actor_place current; diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h index 1ccc51c4..43744643 100644 --- a/include/f_op/f_op_actor_mng.h +++ b/include/f_op/f_op_actor_mng.h @@ -40,7 +40,7 @@ struct fopAcM_prm_class { /* 0x16 */ u16 mSetId; /* 0x18 */ fopAcM_prmScale_class mScale; /* 0x1B */ u8 mGbaName; - /* 0x1C */ uint mParentPcId; // parent process ID + /* 0x1C */ fpc_ProcID mParentPcId; // parent process ID /* 0x20 */ s8 mSubtype; /* 0x21 */ s8 mRoomNo; }; @@ -82,7 +82,7 @@ inline s8 fopAcM_GetRoomNo(fopAc_ac_c* pActor) { return pActor->current.roomNo; } -inline uint fopAcM_GetID(void* pActor) { +inline fpc_ProcID fopAcM_GetID(void* pActor) { return fpcM_GetID(pActor); } @@ -263,7 +263,7 @@ inline fopAcM_prm_class* fopAcM_GetAppend(void* actor) { return (fopAcM_prm_class*)fpcM_GetAppend(actor); } -inline BOOL fopAcM_IsExecuting(uint id) { +inline BOOL fopAcM_IsExecuting(fpc_ProcID id) { return fpcM_IsExecuting(id); } @@ -344,7 +344,7 @@ inline BOOL fopAcM_isSwitch(fopAc_ac_c* pActor, int sw) { return dComIfGs_isSwitch(sw, fopAcM_GetHomeRoomNo(pActor)); } -inline fopAc_ac_c* fopAcM_SearchByID(uint id) { +inline fopAc_ac_c* fopAcM_SearchByID(fpc_ProcID id) { return (fopAc_ac_c*)fopAcIt_Judge((fopAcIt_JudgeFunc)fpcSch_JudgeByID, &id); } @@ -405,7 +405,7 @@ void fopAcM_setStageLayer(void* p_proc); void fopAcM_setRoomLayer(void* p_proc, int roomNo); -s32 fopAcM_SearchByID(uint id, fopAc_ac_c** p_actor); +s32 fopAcM_SearchByID(fpc_ProcID id, fopAc_ac_c** p_actor); s32 fopAcM_SearchByName(s16 procName, fopAc_ac_c** p_actor); @@ -413,18 +413,18 @@ fopAcM_prm_class* fopAcM_CreateAppend(); fopAcM_prm_class* createAppend(u16 enemyNo, u32 parameters, cXyz* p_pos, int roomNo, csXyz* p_angle, cXyz* p_scale, s8 subType, - uint parentPId); + fpc_ProcID parentPId); void fopAcM_Log(fopAc_ac_c* p_actor, char* str); s32 fopAcM_delete(fopAc_ac_c* p_actor); -s32 fopAcM_delete(uint actorID); +s32 fopAcM_delete(fpc_ProcID actorID); -uint fopAcM_create(s16 i_procName, u32 i_parameter, cXyz* i_pos = NULL, int i_roomNo = -1, +fpc_ProcID fopAcM_create(s16 i_procName, u32 i_parameter, cXyz* i_pos = NULL, int i_roomNo = -1, csXyz* i_angle = NULL, cXyz* i_scale = NULL, s8 i_subType = -1, createFunc i_createFunc = NULL); -uint fopAcM_create(char*, u32 i_parameter, cXyz* i_pos = NULL, int i_roomNo = -1, +fpc_ProcID fopAcM_create(char*, u32 i_parameter, cXyz* i_pos = NULL, int i_roomNo = -1, csXyz* i_angle = NULL, cXyz* i_scale = NULL, createFunc i_createFunc = NULL); @@ -438,17 +438,17 @@ void* fopAcM_fastCreate(char* p_actorName, u32 parameter, cXyz* pActorPos = NULL csXyz* p_angle = NULL, cXyz* p_scale = NULL, createFunc p_createFunc = NULL, void* p_createFuncData = NULL); -uint fopAcM_createChild(s16 procName, uint parentPId, u32 parameters, cXyz* p_pos, +fpc_ProcID fopAcM_createChild(s16 procName, fpc_ProcID parentPId, u32 parameters, cXyz* p_pos, int roomNo, csXyz* p_angle, cXyz* p_scale = NULL, s8 subType = -1, createFunc p_createFunc = NULL); -uint fopAcM_createChild(char* pProcNameString, uint parentPcId, u32 parameter, cXyz* pPos, +fpc_ProcID fopAcM_createChild(char* pProcNameString, fpc_ProcID parentPcId, u32 parameter, cXyz* pPos, int roomNo, csXyz* pAngle, cXyz* pScale, createFunc createFunc); -uint fopAcM_createChildFromOffset(s16 procName, uint parentProcID, u32 actorParams, +fpc_ProcID fopAcM_createChildFromOffset(s16 procName, fpc_ProcID parentProcID, u32 actorParams, cXyz* p_pos, int roomNo, csXyz* p_angle, cXyz* p_scale, s8 subType, createFunc p_createFunc); -uint fopAcM_createChildFromOffset(char* pProcNameString, uint parentPcId, u32 parameter, +fpc_ProcID fopAcM_createChildFromOffset(char* pProcNameString, fpc_ProcID parentPcId, u32 parameter, cXyz* pPosOffs, int roomNo, csXyz* pAngleOffs, cXyz* pScale, createFunc createFunc); @@ -516,36 +516,36 @@ fopAc_ac_c* fopAcM_getTalkEventPartner(fopAc_ac_c*); fopAc_ac_c* fopAcM_getItemEventPartner(fopAc_ac_c*); fopAc_ac_c* fopAcM_getEventPartner(fopAc_ac_c*); -uint fopAcM_createItemForPresentDemo(cXyz* p_pos, int i_itemNo, u8 argFlag = 0x00, int i_itemBitNo = -1, +fpc_ProcID fopAcM_createItemForPresentDemo(cXyz* p_pos, int i_itemNo, u8 argFlag = 0x00, int i_itemBitNo = -1, int i_roomNo = -1, csXyz* p_angle = NULL, cXyz* p_scale = NULL); -uint fopAcM_createItemForTrBoxDemo(cXyz* p_pos, int i_itemNo, int i_itemBitNo = -1, +fpc_ProcID fopAcM_createItemForTrBoxDemo(cXyz* p_pos, int i_itemNo, int i_itemBitNo = -1, int i_roomNo = -1, csXyz* p_angle = NULL, cXyz* p_scale = NULL); -uint fopAcM_createItemFromTable(cXyz* p_pos, int i_tableNo, int i_itemBitNo, int i_roomNo, int, +fpc_ProcID fopAcM_createItemFromTable(cXyz* p_pos, int i_tableNo, int i_itemBitNo, int i_roomNo, int, csXyz* p_angle, int, cXyz* p_scale = NULL); -uint fopAcM_createRaceItemFromTable(cXyz* pos, int i_itemNo, int i_itemBitNo, int i_roomNo, +fpc_ProcID fopAcM_createRaceItemFromTable(cXyz* pos, int i_itemNo, int i_itemBitNo, int i_roomNo, csXyz* angle, cXyz* scale, int param_7); -uint fopAcM_createShopItem(cXyz* p_pos, int i_itemNo, csXyz* p_angle, int roomNo, cXyz* scale = NULL, +fpc_ProcID fopAcM_createShopItem(cXyz* p_pos, int i_itemNo, csXyz* p_angle, int roomNo, cXyz* scale = NULL, createFunc createFunc = NULL); -uint fopAcM_createRaceItem(cXyz* p_pos, int i_itemNo, int i_itemBitNo, csXyz* p_angle, int roomNo, +fpc_ProcID fopAcM_createRaceItem(cXyz* p_pos, int i_itemNo, int i_itemBitNo, csXyz* p_angle, int roomNo, cXyz* scale, int param_7); -uint fopAcM_createIball(cXyz* p_pos, int itemTableIdx, int roomNo, csXyz* p_angle, int itemStealNum); +fpc_ProcID fopAcM_createIball(cXyz* p_pos, int itemTableIdx, int roomNo, csXyz* p_angle, int itemStealNum); -uint fopAcM_createDemoItem(cXyz* p_pos, int itemNo, int itemBitNo, csXyz* p_angle, +fpc_ProcID fopAcM_createDemoItem(cXyz* p_pos, int itemNo, int itemBitNo, csXyz* p_angle, int roomNo, cXyz* scale, u8 argFlag); -uint fopAcM_createItemForBoss(cXyz* p_pos, int param_2, int roomNo, csXyz* p_angle, +fpc_ProcID fopAcM_createItemForBoss(cXyz* p_pos, int param_2, int roomNo, csXyz* p_angle, cXyz* p_scale = NULL, int param_8 = 0); daItem_c* fopAcM_createItemForSimpleDemo(cXyz* p_pos, int i_itemNo, int i_roomNo, csXyz* p_angle, cXyz* p_scale, f32 speedF, f32 speedY); -uint fopAcM_createItem(cXyz* p_pos, int itemNo, int param_3, int roomNo, int type, csXyz* p_angle, +fpc_ProcID fopAcM_createItem(cXyz* p_pos, int itemNo, int param_3, int roomNo, int type, csXyz* p_angle, int action, cXyz* p_scale = NULL); void* fopAcM_fastCreateItem2(cXyz* p_pos, int itemNo, int param_3, int roomNo, int param_5, @@ -561,7 +561,7 @@ BOOL stealItem_CB(void* actor); fopAc_ac_c* fopAcM_myRoomSearchEnemy(s8 roomNo); -uint fopAcM_createDisappear(fopAc_ac_c* i_actor, cXyz* p_pos, u8 i_scale, u8 i_health = 0, u8 i_itemBitNo = -1); +fpc_ProcID fopAcM_createDisappear(fopAc_ac_c* i_actor, cXyz* p_pos, u8 i_scale, u8 i_health = 0, u8 i_itemBitNo = -1); void fopAcM_setCarryNow(fopAc_ac_c* i_this, BOOL stageLayer); void fopAcM_cancelCarryNow(fopAc_ac_c* i_this); s32 fopAcM_otoCheck(fopAc_ac_c*, f32); diff --git a/include/f_op/f_op_camera_mng.h b/include/f_op/f_op_camera_mng.h index b043aa7a..95d04e27 100644 --- a/include/f_op/f_op_camera_mng.h +++ b/include/f_op/f_op_camera_mng.h @@ -41,7 +41,7 @@ inline f32 fopCamM_GetFovy(camera_class* i_camera) { return i_camera->mFovy; } -u32 fopCamM_Create(int i_cameraIdx, s16 pProcName, void* param_3); +fpc_ProcID fopCamM_Create(int i_cameraIdx, s16 pProcName, void* param_3); void fopCamM_Management(void); u32 fopCamM_GetParam(camera_class* pCamera); void fopCamM_Init(void); diff --git a/include/f_op/f_op_kankyo_mng.h b/include/f_op/f_op_kankyo_mng.h index cf18c2cd..2fa42b2e 100644 --- a/include/f_op/f_op_kankyo_mng.h +++ b/include/f_op/f_op_kankyo_mng.h @@ -15,13 +15,13 @@ struct fopKyM_prm_class { typedef int (*fopKyM_CreateFunc)(void*); void fopKyM_Delete(void* param_1); -uint fopKyM_Create(s16 param_1, fopKyM_CreateFunc param_2 = NULL, void* param_3 = NULL); -uint fopKyM_create(s16 i_procName, int i_param, cXyz* i_pos = NULL, cXyz* i_scale = NULL, +fpc_ProcID fopKyM_Create(s16 param_1, fopKyM_CreateFunc param_2 = NULL, void* param_3 = NULL); +fpc_ProcID fopKyM_create(s16 i_procName, int i_param, cXyz* i_pos = NULL, cXyz* i_scale = NULL, fopKyM_CreateFunc i_createFunc = NULL); -kankyo_class* fopKyM_SearchByID(uint id); +kankyo_class* fopKyM_SearchByID(fpc_ProcID id); base_process_class* fopKyM_fastCreate(s16 param_0, int param_1, cXyz* param_2, cXyz* param_3, fopKyM_CreateFunc); -uint fopKyM_createWpillar(cXyz const* i_pos, f32 scaleXZ, f32 scaleY, int i_param); +fpc_ProcID fopKyM_createWpillar(cXyz const* i_pos, f32 scaleXZ, f32 scaleY, int i_param); inline void* fopKyM_GetAppend(void* param_0) { return fpcM_GetAppend(param_0); diff --git a/include/f_op/f_op_msg_mng.h b/include/f_op/f_op_msg_mng.h index cc7f0a22..f614d5f5 100644 --- a/include/f_op/f_op_msg_mng.h +++ b/include/f_op/f_op_msg_mng.h @@ -155,26 +155,25 @@ typedef int (*fopMsgCreateFunc)(void*); JKRExpHeap* fopMsgM_createExpHeap(u32, JKRHeap*); JKRExpHeap* fopMsgM_createExpHeap(u32); -u32 fopMsgM_Create(s16, fopMsgCreateFunc, void*); -s32 fopMsgM_create(s16 i_procName, fopAc_ac_c* param_1 = NULL, cXyz* param_2 = NULL, - u32* param_3 = NULL, u32* param_4 = NULL, fopMsgCreateFunc createFunc = NULL); +fpc_ProcID fopMsgM_Create(s16, fopMsgCreateFunc, void*); +fpc_ProcID fopMsgM_create(s16 i_procName, fopAc_ac_c* param_1 = NULL, cXyz* param_2 = NULL, + u32* param_3 = NULL, u32* param_4 = NULL, fopMsgCreateFunc createFunc = NULL); void fopMsgM_Delete(void* process); fopMsg_prm_class* fopMsgM_GetAppend(void* msg); -void fopMsgM_setMessageID(uint); void fopMsgM_destroyExpHeap(JKRExpHeap*); f32 fopMsgM_valueIncrease(int param_0, int param_1, u8 param_2); s32 fopMsgM_setStageLayer(void*); -uint fopMsgM_messageSet(u32 i_msgNo, fopAc_ac_c* i_actorP); -uint fopMsgM_messageSet(u32 param_0, cXyz*); -uint fopMsgM_messageSet(u32 param_0); -uint fopMsgM_scopeMessageSet(u32 param_0); +fpc_ProcID fopMsgM_messageSet(u32 i_msgNo, fopAc_ac_c* i_actorP); +fpc_ProcID fopMsgM_messageSet(u32 param_0, cXyz*); +fpc_ProcID fopMsgM_messageSet(u32 param_0); +fpc_ProcID fopMsgM_scopeMessageSet(u32 param_0); int fopMsgM_messageSetDemo(u32 param_0); -msg_class* fopMsgM_SearchByID(uint param_0); +msg_class* fopMsgM_SearchByID(fpc_ProcID param_0); char* fopMsgM_messageGet(char* msg, u32 string_id); void fopMsgM_passwordGet(char*, u32); -uint fop_Timer_create(s16 param_0, u8 param_1, u16 param_2, u8 param_3, u8 param_4, f32 param_5, +fpc_ProcID fop_Timer_create(s16 param_0, u8 param_1, u16 param_2, u8 param_3, u8 param_4, f32 param_5, f32 param_6, f32 param_7, f32 param_8, fopMsgCreateFunc createFunc); -inline uint fopMsgM_Timer_create(s16 param_0, u8 param_1, u32 param_2, u8 param_3, u8 param_4, +inline fpc_ProcID fopMsgM_Timer_create(s16 param_0, u8 param_1, u32 param_2, u8 param_3, u8 param_4, f32 param_5, f32 param_6, f32 param_7, f32 param_8, fopMsgCreateFunc createFunc) { return fop_Timer_create(param_0, param_1, param_2, param_3, param_4, param_5, param_6, param_7, diff --git a/include/f_op/f_op_overlap_mng.h b/include/f_op/f_op_overlap_mng.h index 77828eaa..f6496119 100644 --- a/include/f_op/f_op_overlap_mng.h +++ b/include/f_op/f_op_overlap_mng.h @@ -14,7 +14,7 @@ class overlap_task_class : public leafdraw_class { public: /* 0xC0 */ overlap_method_class* sub_method; /* 0xC4 */ request_base_class mRq; - /* 0xC8 */ int mScenePId; + /* 0xC8 */ fpc_ProcID mScenePId; }; // Size: 0xCC struct overlap_process_profile_definition { @@ -27,7 +27,7 @@ int fopOvlpM_SceneIsStart(); void fopOvlpM_Management(); int fopOvlpM_IsOutReq(overlap_task_class* i_this); void fopOvlpM_Done(overlap_task_class* i_this); -void fopOvlpM_ToldAboutID(uint pid); +void fopOvlpM_ToldAboutID(fpc_ProcID pid); int fopOvlpM_IsPeek(); int fopOvlpM_IsDone(); int fopOvlpM_IsDoingReq(); diff --git a/include/f_op/f_op_overlap_req.h b/include/f_op/f_op_overlap_req.h index 5d222c1f..1e79fd89 100644 --- a/include/f_op/f_op_overlap_req.h +++ b/include/f_op/f_op_overlap_req.h @@ -3,6 +3,7 @@ #include "SSystem/SComponent/c_phase.h" #include "SSystem/SComponent/c_request.h" +#include "f_pc/f_pc_base.h" struct layer_class; class overlap_task_class; @@ -18,7 +19,7 @@ public: /* 0x10 */ s16 mProcName; /* 0x12 */ u8 field_0x12; /* 0x13 */ u8 field_0x13; - /* 0x14 */ uint mPId; + /* 0x14 */ fpc_ProcID mPId; /* 0x18 */ request_of_phase_process_class mPhs; /* 0x20 */ overlap_task_class * mpTask; /* 0x24 */ layer_class* pCurrentLayer; diff --git a/include/f_op/f_op_scene_mng.h b/include/f_op/f_op_scene_mng.h index 7a381ba7..0fc6e4e6 100644 --- a/include/f_op/f_op_scene_mng.h +++ b/include/f_op/f_op_scene_mng.h @@ -6,10 +6,10 @@ typedef struct base_process_class base_process_class; -scene_class* fopScnM_SearchByID(uint id); +scene_class* fopScnM_SearchByID(fpc_ProcID id); int fopScnM_ChangeReq(scene_class*, s16, s16, u16); -uint fopScnM_DeleteReq(scene_class*); -int fopScnM_CreateReq(s16, s16, u16, u32); +BOOL fopScnM_DeleteReq(scene_class*); +BOOL fopScnM_CreateReq(s16, s16, u16, u32); u32 fopScnM_ReRequest(s16, u32); void fopScnM_Management(void); void fopScnM_Init(void); @@ -24,7 +24,7 @@ inline layer_class * fpcM_Layer(const void* pProc) { return &((process_node_class*)pProc)->mLayer; } -inline uint fopScnM_GetID(void* proc) { +inline fpc_ProcID fopScnM_GetID(void* proc) { return fpcM_GetID(proc); } diff --git a/include/f_pc/f_pc_base.h b/include/f_pc/f_pc_base.h index 574f7f83..b78e5cb4 100644 --- a/include/f_pc/f_pc_base.h +++ b/include/f_pc/f_pc_base.h @@ -8,13 +8,15 @@ #include "f_pc/f_pc_priority.h" #include "f_pc/f_pc_profile.h" +typedef unsigned int fpc_ProcID; + typedef struct create_request create_request; typedef struct process_method_class process_method_class; typedef struct profile_method_class profile_method_class; typedef struct base_process_class { /* 0x00 */ u32 mBsType; - /* 0x04 */ uint mBsPcId; + /* 0x04 */ fpc_ProcID mBsPcId; /* 0x08 */ s16 mProcName; /* 0x0A */ s8 mUnk0; /* 0x0B */ u8 mPauseFlag; @@ -35,12 +37,12 @@ typedef struct base_process_class { BOOL fpcBs_Is_JustOfType(int pType1, int pType2); s32 fpcBs_MakeOfType(int* pType); -s32 fpcBs_MakeOfId(void); +fpc_ProcID fpcBs_MakeOfId(void); s32 fpcBs_Execute(base_process_class* pProc); void fpcBs_DeleteAppend(base_process_class* pProc); s32 fpcBs_IsDelete(base_process_class* pProc); s32 fpcBs_Delete(base_process_class* pProc); -base_process_class* fpcBs_Create(s16 pProcTypeID, uint pProcID, void* pData); +base_process_class* fpcBs_Create(s16 pProcTypeID, fpc_ProcID pProcID, void* pData); s32 fpcBs_SubCreate(base_process_class* pProc); extern "C" { diff --git a/include/f_pc/f_pc_create_iter.h b/include/f_pc/f_pc_create_iter.h index 2bb1c122..f9c7dd2a 100644 --- a/include/f_pc/f_pc_create_iter.h +++ b/include/f_pc/f_pc_create_iter.h @@ -28,6 +28,6 @@ typedef struct fpcCtIt_jilprm_c { s32 fpcCtIt_Method(fpcCtIt_MethodFunc pJudge, void* pUserData); void* fpcCtIt_Judge(fpcCtIt_JudgeFunc pJudge, void* pUserData); void* fpcCtIt_filter_JudgeInLayer(create_tag*, fpcCtIt_jilprm_c*); -void* fpcCtIt_JudgeInLayer(uint pUnk0, fpcCtIt_JudgeFunc pFunc, void* pUserData); +void* fpcCtIt_JudgeInLayer(uint i_layerID, fpcCtIt_JudgeFunc i_judgeFunc, void* i_data); #endif diff --git a/include/f_pc/f_pc_create_req.h b/include/f_pc/f_pc_create_req.h index b6f61431..e8043eca 100644 --- a/include/f_pc/f_pc_create_req.h +++ b/include/f_pc/f_pc_create_req.h @@ -6,6 +6,7 @@ #include "f_pc/f_pc_create_tag.h" #include "f_pc/f_pc_method.h" #include "f_pc/f_pc_method_tag.h" +#include "f_pc/f_pc_base.h" typedef struct base_process_class base_process_class; typedef struct layer_class layer_class; @@ -23,13 +24,13 @@ typedef struct create_request { process_method_tag_class mMtdTg; create_request_method_class* mpCtRqMtd; void* mpUnk1; - uint mBsPcId; + fpc_ProcID mBsPcId; struct base_process_class* mpRes; layer_class* mpLayer; } create_request; // Size: 0x48 -bool fpcCtRq_isCreatingByID(create_tag* pTag, uint* pId); -BOOL fpcCtRq_IsCreatingByID(uint id); +bool fpcCtRq_isCreatingByID(create_tag* pTag, fpc_ProcID* pId); +BOOL fpcCtRq_IsCreatingByID(fpc_ProcID id); void fpcCtRq_CreateQTo(create_request* pReq); void fpcCtRq_ToCreateQ(create_request* pReq); BOOL fpcCtRq_Delete(create_request* pReq); diff --git a/include/f_pc/f_pc_creator.h b/include/f_pc/f_pc_creator.h index e6b9e496..902e457f 100644 --- a/include/f_pc/f_pc_creator.h +++ b/include/f_pc/f_pc_creator.h @@ -2,11 +2,12 @@ #ifndef F_PC_CREATOR_H_ #define F_PC_CREATOR_H_ +#include "f_pc/f_pc_base.h" #include "dolphin/types.h" typedef struct base_process_class base_process_class; -BOOL fpcCt_IsCreatingByID(uint id); +BOOL fpcCt_IsCreatingByID(fpc_ProcID id); s32 fpcCt_IsDoing(base_process_class* pProc); BOOL fpcCt_Abort(base_process_class* pProc); s32 fpcCt_Handler(void); diff --git a/include/f_pc/f_pc_executor.h b/include/f_pc/f_pc_executor.h index 4ff05e75..a820d739 100644 --- a/include/f_pc/f_pc_executor.h +++ b/include/f_pc/f_pc_executor.h @@ -4,12 +4,13 @@ #include "f_pc/f_pc_layer_iter.h" #include "f_pc/f_pc_line_iter.h" +#include "f_pc/f_pc_base.h" typedef struct base_process_class base_process_class; base_process_class* fpcEx_Search(fpcLyIt_JudgeFunc pFunc, void* pUserData); -base_process_class* fpcEx_SearchByID(uint id); -BOOL fpcEx_IsExist(uint id); +base_process_class* fpcEx_SearchByID(fpc_ProcID id); +BOOL fpcEx_IsExist(fpc_ProcID id); s32 fpcEx_ToLineQ(base_process_class* pProc); s32 fpcEx_ExecuteQTo(base_process_class* pProc); s32 fpcEx_Execute(base_process_class* pProc); diff --git a/include/f_pc/f_pc_layer.h b/include/f_pc/f_pc_layer.h index b9f5a17b..ea8e7dfb 100644 --- a/include/f_pc/f_pc_layer.h +++ b/include/f_pc/f_pc_layer.h @@ -26,8 +26,8 @@ typedef struct layer_class { void fpcLy_SetCurrentLayer(layer_class* pLayer); layer_class* fpcLy_CurrentLayer(void); layer_class* fpcLy_RootLayer(void); -layer_class* fpcLy_Layer(uint id); -layer_class* fpcLy_Search(uint id); +layer_class* fpcLy_Layer(uint i_layerID); +layer_class* fpcLy_Search(uint i_layerIDid); void fpcLy_Regist(layer_class* pLayer); void fpcLy_CreatedMesg(layer_class* pLayer); diff --git a/include/f_pc/f_pc_layer_tag.h b/include/f_pc/f_pc_layer_tag.h index 4d06b5e1..7aa9bf09 100644 --- a/include/f_pc/f_pc_layer_tag.h +++ b/include/f_pc/f_pc_layer_tag.h @@ -20,10 +20,11 @@ typedef struct layer_management_tag_class { u16 mNodeListIdx; } layer_management_tag_class; -s32 fpcLyTg_QueueTo(layer_management_tag_class* pTag); -s32 fpcLyTg_ToQueue(layer_management_tag_class* pTag, uint layerID, u16 listID, - u16 listPrio); -s32 fpcLyTg_Move(layer_management_tag_class*, uint, u16, u16); -s32 fpcLyTg_Init(layer_management_tag_class*, uint, void*); +s32 fpcLyTg_QueueTo(layer_management_tag_class* i_lyTag); +s32 fpcLyTg_ToQueue(layer_management_tag_class* i_lyTag, uint i_layerID, u16 i_listID, + u16 i_listPriority); +s32 fpcLyTg_Move(layer_management_tag_class* i_lyTag, uint i_layerID, u16 i_listID, + u16 i_listPriority); +s32 fpcLyTg_Init(layer_management_tag_class* i_lyTag, uint i_layerID, void* i_data); #endif diff --git a/include/f_pc/f_pc_manager.h b/include/f_pc/f_pc_manager.h index 98ae42f5..5e645d0c 100644 --- a/include/f_pc/f_pc_manager.h +++ b/include/f_pc/f_pc_manager.h @@ -15,7 +15,7 @@ typedef int (*FastCreateReqFunc)(void*); typedef void (*fpcM_ManagementFunc)(void); typedef int (*fpcM_DrawIteraterFunc)(void*, void*); -inline uint fpcM_GetID(void* pProc) { +inline fpc_ProcID fpcM_GetID(void* pProc) { return pProc != NULL ? ((base_process_class*)pProc)->mBsPcId : fpcM_ERROR_PROCESS_ID_e; } inline s16 fpcM_GetName(void* pActor) { @@ -33,7 +33,7 @@ inline s16 fpcM_GetProfName(void* pActor) { return ((base_process_class*)pActor)->mProfName; } -inline uint fpcM_Create(s16 procName, FastCreateReqFunc createFunc, void* process) { +inline fpc_ProcID fpcM_Create(s16 procName, FastCreateReqFunc createFunc, void* process) { return fpcSCtRq_Request(fpcLy_CurrentLayer(), procName, (stdCreateFunc)createFunc, NULL, process); } @@ -66,7 +66,7 @@ inline void* fpcM_GetAppend(void* proc) { return ((base_process_class*)proc)->mpUserData; } -inline BOOL fpcM_IsExecuting(uint id) { +inline BOOL fpcM_IsExecuting(fpc_ProcID id) { return fpcEx_IsExist(id); } @@ -82,7 +82,7 @@ void fpcM_Draw(void* pProc); s32 fpcM_DrawIterater(fpcM_DrawIteraterFunc pFunc); s32 fpcM_Execute(void* pProc); s32 fpcM_Delete(void* pProc); -BOOL fpcM_IsCreating(uint pID); +BOOL fpcM_IsCreating(fpc_ProcID pID); void fpcM_Management(fpcM_ManagementFunc pFunc1, fpcM_ManagementFunc pFunc2); void fpcM_Init(void); base_process_class* fpcM_FastCreate(s16 pProcTypeID, FastCreateReqFunc param_2, void* param_3, @@ -90,7 +90,7 @@ base_process_class* fpcM_FastCreate(s16 pProcTypeID, FastCreateReqFunc param_2, s32 fpcM_IsPause(void* pProc, u8 param_2); void fpcM_PauseEnable(void* pProc, u8 param_2); void fpcM_PauseDisable(void* pProc, u8 param_2); -void* fpcM_JudgeInLayer(uint pLayerID, fpcCtIt_JudgeFunc pFunc, void* pUserData); +void* fpcM_JudgeInLayer(uint i_layerID, fpcCtIt_JudgeFunc i_judgeFunc, void* i_data); extern "C" { void fpcM_Delete__FPv(void); diff --git a/include/f_pc/f_pc_node_req.h b/include/f_pc/f_pc_node_req.h index 0f3bed44..f70a08f1 100644 --- a/include/f_pc/f_pc_node_req.h +++ b/include/f_pc/f_pc_node_req.h @@ -4,6 +4,7 @@ #include "SSystem/SComponent/c_phase.h" #include "f_pc/f_pc_method.h" #include "f_pc/f_pc_method_tag.h" +#include "f_pc/f_pc_base.h" typedef struct layer_class layer_class; typedef struct process_node_class process_node_class; @@ -17,7 +18,7 @@ typedef struct node_create_request_method_class { // needed to match struct copy typedef struct unk_process_node_class { process_node_class* mpNodeProc; - uint mProcId; + fpc_ProcID mProcId; } unk_process_node_class; typedef struct node_create_request { @@ -27,10 +28,10 @@ typedef struct node_create_request { cPhs__Handler* mpPhsHandler; node_create_request_method_class* mpNodeCrReqMthCls; s32 mParameter; - s32 mRequestId; + uint mRequestId; unk_process_node_class mNodeProc; layer_class* mpLayerClass; - uint mCreatingID; + fpc_ProcID mCreatingID; s16 mProcName; void* mpUserData; s16 unk_0x60; @@ -64,7 +65,7 @@ node_create_request* fpcNdRq_CreateNode(u32 pRequestSize, s16 param_2, void* par node_create_request* fpcNdRq_Request(u32 param_1, int param_2, process_node_class* param_3, s16 param_4, void* param_5, node_create_request_method_class* pNodeCreateRequestMethodClass); -s32 fpcNdRq_ReChangeNode(uint pRequestId, s16 param_2, void* param_3); -s32 fpcNdRq_ReRequest(uint pRequestId, s16 param_2, void* param_3); +s32 fpcNdRq_ReChangeNode(uint i_requestID, s16 i_procName, void* i_data); +s32 fpcNdRq_ReRequest(uint i_requestID, s16 i_procName, void* i_data); #endif
\ No newline at end of file diff --git a/include/f_pc/f_pc_priority.h b/include/f_pc/f_pc_priority.h index bdfd57f9..85a45184 100644 --- a/include/f_pc/f_pc_priority.h +++ b/include/f_pc/f_pc_priority.h @@ -27,11 +27,12 @@ s32 fpcPi_QueueTo(process_priority_class* pPi); s32 fpcPi_ToQueue(process_priority_class* pPi); process_priority_class* fpcPi_GetFromQueue(void); s32 fpcPi_Delete(process_priority_class* pPi); -s32 fpcPi_IsNormal(uint layer, u16 listID, u16 priority); -s32 fpcPi_Change(process_priority_class* pPi, uint layer, u16 listID, u16 priority); +s32 fpcPi_IsNormal(uint i_layer, u16 i_listID, u16 i_priority); +s32 fpcPi_Change(process_priority_class* i_procPriority, uint i_layer, u16 i_listID, + u16 i_priority); s32 fpcPi_Handler(void); -s32 fpcPi_Init(process_priority_class* pPi, void* pUserData, uint layer, u16 listID, - u16 priority); +s32 fpcPi_Init(process_priority_class* i_procPriority, void* pUserData, uint i_layer, u16 i_listID, + u16 i_priority); extern s8 data_804505F0; // roomReadId diff --git a/include/f_pc/f_pc_stdcreate_req.h b/include/f_pc/f_pc_stdcreate_req.h index 09c98be0..71ff5d46 100644 --- a/include/f_pc/f_pc_stdcreate_req.h +++ b/include/f_pc/f_pc_stdcreate_req.h @@ -24,6 +24,6 @@ s32 fpcSCtRq_phase_Done(standard_create_request_class*); s32 fpcSCtRq_Handler(standard_create_request_class* pStdCreateReq); s32 fpcSCtRq_Delete(standard_create_request_class*); s32 fpcSCtRq_Cancel(standard_create_request_class*); -uint fpcSCtRq_Request(layer_class* param_1, s16 param_2, stdCreateFunc param_3, void* param_4, void* param_5); +fpc_ProcID fpcSCtRq_Request(layer_class* param_1, s16 param_2, stdCreateFunc param_3, void* param_4, void* param_5); #endif diff --git a/src/SSystem/SComponent/c_bg_s.cpp b/src/SSystem/SComponent/c_bg_s.cpp index 43afcc3a..db997bdf 100644 --- a/src/SSystem/SComponent/c_bg_s.cpp +++ b/src/SSystem/SComponent/c_bg_s.cpp @@ -21,7 +21,7 @@ void cBgS_ChkElm::Init() { } /* 8024645C-80246478 .text Regist2__11cBgS_ChkElmFP4cBgWUiPv */ -void cBgS_ChkElm::Regist2(cBgW* bgw, uint pid, void* actor) { +void cBgS_ChkElm::Regist2(cBgW* bgw, fpc_ProcID pid, void* actor) { m_flags |= 1; m_bgw_base_ptr = bgw; m_actor_id = pid; @@ -37,7 +37,7 @@ void cBgS_ChkElm::Release() { } /* 8024649C-80246600 .text Regist__4cBgSFP4cBgWUiPv */ -bool cBgS::Regist(cBgW* bgw, uint pid, void* actor) { +bool cBgS::Regist(cBgW* bgw, fpc_ProcID pid, void* actor) { if (bgw == NULL) return true; diff --git a/src/SSystem/SComponent/c_bg_s_chk.cpp b/src/SSystem/SComponent/c_bg_s_chk.cpp index e8dd6b27..ba99fd02 100644 --- a/src/SSystem/SComponent/c_bg_s_chk.cpp +++ b/src/SSystem/SComponent/c_bg_s_chk.cpp @@ -11,8 +11,8 @@ cBgS_Chk::~cBgS_Chk() { } /* 8024734C-8024738C .text ChkSameActorPid__8cBgS_ChkCFUi */ -bool cBgS_Chk::ChkSameActorPid(uint pid) const { - if (mActorPid == fpcM_ERROR_PROCESS_ID_e || pid == UINT32_MAX || unk_0x0C == 0) { +bool cBgS_Chk::ChkSameActorPid(fpc_ProcID pid) const { + if (mActorPid == fpcM_ERROR_PROCESS_ID_e || pid == fpcM_ERROR_PROCESS_ID_e || unk_0x0C == 0) { return FALSE; } else { return (mActorPid == pid) ? TRUE : FALSE; diff --git a/src/SSystem/SComponent/c_bg_s_lin_chk.cpp b/src/SSystem/SComponent/c_bg_s_lin_chk.cpp index fb97dd1b..9f12bc31 100644 --- a/src/SSystem/SComponent/c_bg_s_lin_chk.cpp +++ b/src/SSystem/SComponent/c_bg_s_lin_chk.cpp @@ -18,7 +18,7 @@ void cBgS_LinChk::ct() { } /* 80247480-80247500 .text Set2__11cBgS_LinChkFP4cXyzP4cXyzUi */ -void cBgS_LinChk::Set2(cXyz* pStart, cXyz* pEnd, uint actorPid) { +void cBgS_LinChk::Set2(cXyz* pStart, cXyz* pEnd, fpc_ProcID actorPid) { mLin.SetStartEnd(*pStart, *pEnd); field_0x40 = *pEnd; SetActorPid(actorPid); diff --git a/src/SSystem/SComponent/c_cc_d.cpp b/src/SSystem/SComponent/c_cc_d.cpp index 3f1386f2..bc49a60b 100644 --- a/src/SSystem/SComponent/c_cc_d.cpp +++ b/src/SSystem/SComponent/c_cc_d.cpp @@ -184,7 +184,7 @@ cCcD_GStts* cCcD_Stts::GetGStts() { } /* 80241934-80241994 .text Init__9cCcD_SttsFiiPvUi */ -void cCcD_Stts::Init(int weight, int param_1, void* pProc, uint procID) { +void cCcD_Stts::Init(int weight, int param_1, void* pProc, fpc_ProcID procID) { Ct(); mWeight = weight; field_0x15 = param_1; diff --git a/src/d/actor/d_a_auction.cpp b/src/d/actor/d_a_auction.cpp index 23ec9271..a963ac17 100644 --- a/src/d/actor/d_a_auction.cpp +++ b/src/d/actor/d_a_auction.cpp @@ -207,7 +207,7 @@ extern void dAuction_screen_gaugeUp(); extern void dAuction_screen_gaugeDown(); extern void dAuction_screen_talkStart(); extern void dAuction_screen_talkEnd(); -extern uint dAuction_screen_create(); +extern fpc_ProcID dAuction_screen_create(); /* 000000EC-000002FC .text __ct__11daAuction_cFv */ daAuction_c::daAuction_c() { @@ -1189,7 +1189,7 @@ void daAuction_c::eventMainMsgBikonW() { /* 00002C1C-00002D4C .text eventGetItemInit__11daAuction_cFv */ void daAuction_c::eventGetItemInit() { if (m822 == 2) { - uint itemID = fopAcM_createItemForPresentDemo(¤t.pos, l_item_dat22[mCurrAuctionItemIndex] & 0xFF); + fpc_ProcID itemID = fopAcM_createItemForPresentDemo(¤t.pos, l_item_dat22[mCurrAuctionItemIndex] & 0xFF); if (itemID != fpcM_ERROR_PROCESS_ID_e) { dComIfGp_event_setItemPartnerId(itemID); @@ -1197,7 +1197,7 @@ void daAuction_c::eventGetItemInit() { dComIfGs_onEventBit(l_item_dat2[mCurrAuctionItemIndex].mObtainedEventBit); } else { - uint itemID = fopAcM_createItemForPresentDemo(¤t.pos, l_item_dat[mCurrAuctionItemIndex].mItemID & 0xFF); + fpc_ProcID itemID = fopAcM_createItemForPresentDemo(¤t.pos, l_item_dat[mCurrAuctionItemIndex].mItemID & 0xFF); if (itemID != fpcM_ERROR_PROCESS_ID_e) { dComIfGp_event_setItemPartnerId(itemID); diff --git a/src/d/actor/d_a_bk.cpp b/src/d/actor/d_a_bk.cpp index 4ed8a289..00093026 100644 --- a/src/d/actor/d_a_bk.cpp +++ b/src/d/actor/d_a_bk.cpp @@ -677,7 +677,7 @@ static void* s_w_sub(void* param_1, void*) { } /* 00002CD4-00002FB0 .text search_wepon__FP8bk_class */ -static uint search_wepon(bk_class* i_this) { +static fpc_ProcID search_wepon(bk_class* i_this) { target_info_count = 0; for (int i = 0; i < ARRAY_SIZE(target_info); i++) { target_info[i] = NULL; diff --git a/src/d/actor/d_a_mozo.cpp b/src/d/actor/d_a_mozo.cpp index 53f47507..0feb8c4d 100644 --- a/src/d/actor/d_a_mozo.cpp +++ b/src/d/actor/d_a_mozo.cpp @@ -214,7 +214,7 @@ bool daMozo_c::_delete() { } /* 0000242C-00002498 .text getBeamActor__8daMozo_cFUi */ -fopAc_ac_c* daMozo_c::getBeamActor(uint apid) { +fopAc_ac_c* daMozo_c::getBeamActor(fpc_ProcID apid) { fopAc_ac_c* ac = fopAcM_SearchByID(apid); if (ac == NULL) return NULL; diff --git a/src/d/actor/d_a_npc_ba1.cpp b/src/d/actor/d_a_npc_ba1.cpp index 710ef677..948ee731 100644 --- a/src/d/actor/d_a_npc_ba1.cpp +++ b/src/d/actor/d_a_npc_ba1.cpp @@ -227,7 +227,7 @@ void daNpc_Ba1_c::setAttention(bool) { } /* 00001A94-00001AC8 .text searchByID__11daNpc_Ba1_cFUi */ -void daNpc_Ba1_c::searchByID(uint) { +void daNpc_Ba1_c::searchByID(fpc_ProcID) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_bj1.cpp b/src/d/actor/d_a_npc_bj1.cpp index 08a58f36..cf0f8c45 100644 --- a/src/d/actor/d_a_npc_bj1.cpp +++ b/src/d/actor/d_a_npc_bj1.cpp @@ -252,7 +252,7 @@ void daNpc_Bj1_c::setAttention(bool) { } /* 000025D4-00002608 .text searchByID__11daNpc_Bj1_cFUi */ -void daNpc_Bj1_c::searchByID(uint) { +void daNpc_Bj1_c::searchByID(fpc_ProcID) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_bm1.cpp b/src/d/actor/d_a_npc_bm1.cpp index 3db88240..3e84fcdb 100644 --- a/src/d/actor/d_a_npc_bm1.cpp +++ b/src/d/actor/d_a_npc_bm1.cpp @@ -367,7 +367,7 @@ void daNpc_Bm1_c::setAttention(bool) { } /* 00003630-00003664 .text searchByID__11daNpc_Bm1_cFUi */ -void daNpc_Bm1_c::searchByID(uint) { +void daNpc_Bm1_c::searchByID(fpc_ProcID) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_bs1.cpp b/src/d/actor/d_a_npc_bs1.cpp index ac21ee62..44cc9e30 100644 --- a/src/d/actor/d_a_npc_bs1.cpp +++ b/src/d/actor/d_a_npc_bs1.cpp @@ -27,7 +27,7 @@ static Vec dummy_2080 = {1.0f, 1.0f, 1.0f}; static u8 dummy_1811[] = {0x02, 0x00, 0x02, 0x01}; static f64 dummy4[2] = {3.0, 0.5}; -static uint l_msgId; +static fpc_ProcID l_msgId; static msg_class* l_msg; static daNpc_Bs1_HIO_c l_HIO; @@ -1761,7 +1761,7 @@ BOOL daNpc_Bs1_c::getdemo_action(void*) { m830 = m831; mShopCamAction.Reset(); u16 itemNo = mShopItems.getSelectItemNo(); - uint itemPID = fopAcM_createItemForPresentDemo(¤t.pos, itemNo, 0, -1, current.roomNo); + fpc_ProcID itemPID = fopAcM_createItemForPresentDemo(¤t.pos, itemNo, 0, -1, current.roomNo); if (itemPID != fpcM_ERROR_PROCESS_ID_e) { dComIfGp_event_setItemPartnerId(itemPID); } diff --git a/src/d/actor/d_a_npc_de1.cpp b/src/d/actor/d_a_npc_de1.cpp index fe029e4a..0b589cc3 100644 --- a/src/d/actor/d_a_npc_de1.cpp +++ b/src/d/actor/d_a_npc_de1.cpp @@ -112,7 +112,7 @@ void daNpc_De1_c::setAttention() { } /* 00001194-000011C8 .text searchByID__11daNpc_De1_cFUi */ -void daNpc_De1_c::searchByID(uint) { +void daNpc_De1_c::searchByID(fpc_ProcID) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_gk1.cpp b/src/d/actor/d_a_npc_gk1.cpp index 8f8ed50a..923cdc4a 100644 --- a/src/d/actor/d_a_npc_gk1.cpp +++ b/src/d/actor/d_a_npc_gk1.cpp @@ -167,7 +167,7 @@ void daNpc_Gk1_c::chk_parts_notMov() { } /* 000011A4-000011F8 .text searchByID__11daNpc_Gk1_cFUiPi */ -void daNpc_Gk1_c::searchByID(uint, int*) { +void daNpc_Gk1_c::searchByID(fpc_ProcID, int*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_gp1.cpp b/src/d/actor/d_a_npc_gp1.cpp index f419e7ef..f2217792 100644 --- a/src/d/actor/d_a_npc_gp1.cpp +++ b/src/d/actor/d_a_npc_gp1.cpp @@ -172,7 +172,7 @@ void daNpc_Gp1_c::setAttention(bool) { } /* 00001790-000017C4 .text searchByID__11daNpc_Gp1_cFUi */ -void daNpc_Gp1_c::searchByID(uint) { +void daNpc_Gp1_c::searchByID(fpc_ProcID) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_hi1.cpp b/src/d/actor/d_a_npc_hi1.cpp index ae9978da..b5f4e015 100644 --- a/src/d/actor/d_a_npc_hi1.cpp +++ b/src/d/actor/d_a_npc_hi1.cpp @@ -177,7 +177,7 @@ void daNpc_Hi1_c::chk_parts_notMov() { } /* 0000103C-00001090 .text searchByID__11daNpc_Hi1_cFUiPi */ -void daNpc_Hi1_c::searchByID(uint, int*) { +void daNpc_Hi1_c::searchByID(fpc_ProcID, int*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_ji1.cpp b/src/d/actor/d_a_npc_ji1.cpp index 699b72db..72f0d4d4 100644 --- a/src/d/actor/d_a_npc_ji1.cpp +++ b/src/d/actor/d_a_npc_ji1.cpp @@ -25,7 +25,7 @@ static u8 dummy5[0x4C]; static daNpc_Ji1_HIO_c l_HIO; -static uint l_msgId; +static fpc_ProcID l_msgId; static msg_class* l_msg; static dCcD_SrcCyl l_cyl_src = { @@ -1266,7 +1266,7 @@ void daNpc_Ji1_c::createItem() { dComIfGs_onEventBit(0xF10); } - uint itemPID = fopAcM_createItemForPresentDemo(¤t.pos, itemNo, 0, -1, current.roomNo); + fpc_ProcID itemPID = fopAcM_createItemForPresentDemo(¤t.pos, itemNo, 0, -1, current.roomNo); if(itemPID != fpcM_ERROR_PROCESS_ID_e) { dComIfGp_event_setItemPartnerId(itemPID); } diff --git a/src/d/actor/d_a_npc_kamome.cpp b/src/d/actor/d_a_npc_kamome.cpp index ad2e5914..ec456eb9 100644 --- a/src/d/actor/d_a_npc_kamome.cpp +++ b/src/d/actor/d_a_npc_kamome.cpp @@ -26,7 +26,7 @@ static char* l_staff_name = "HyoiKam"; static u8 temp[0x4C]; // TODO static daNpc_kam_HIO_c l_HIO; static int l_hio_counter; -static uint l_msgId; +static fpc_ProcID l_msgId; static msg_class* l_msg; static daNpc_kam_c* l_act; static s16 l_demo_start_chk_cnt; diff --git a/src/d/actor/d_a_npc_kf1.cpp b/src/d/actor/d_a_npc_kf1.cpp index 4623fb81..88be6257 100644 --- a/src/d/actor/d_a_npc_kf1.cpp +++ b/src/d/actor/d_a_npc_kf1.cpp @@ -172,7 +172,7 @@ void daNpc_Kf1_c::chk_talk() { } /* 00001418-0000146C .text searchByID__11daNpc_Kf1_cFUiPi */ -void daNpc_Kf1_c::searchByID(uint, int*) { +void daNpc_Kf1_c::searchByID(fpc_ProcID, int*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_kk1.cpp b/src/d/actor/d_a_npc_kk1.cpp index 37b0d895..f158d699 100644 --- a/src/d/actor/d_a_npc_kk1.cpp +++ b/src/d/actor/d_a_npc_kk1.cpp @@ -172,7 +172,7 @@ void daNpc_Kk1_c::chk_parts_notMov() { } /* 000017B4-00001808 .text searchByID__11daNpc_Kk1_cFUiPi */ -void daNpc_Kk1_c::searchByID(uint, int*) { +void daNpc_Kk1_c::searchByID(fpc_ProcID, int*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_ko1.cpp b/src/d/actor/d_a_npc_ko1.cpp index 9602f456..df31a214 100644 --- a/src/d/actor/d_a_npc_ko1.cpp +++ b/src/d/actor/d_a_npc_ko1.cpp @@ -307,7 +307,7 @@ void daNpc_Ko1_c::setAttention(bool) { } /* 00002610-00002644 .text searchByID__11daNpc_Ko1_cFUi */ -void daNpc_Ko1_c::searchByID(uint) { +void daNpc_Ko1_c::searchByID(fpc_ProcID) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_ls1.cpp b/src/d/actor/d_a_npc_ls1.cpp index 92cf91d1..c0cf23a0 100644 --- a/src/d/actor/d_a_npc_ls1.cpp +++ b/src/d/actor/d_a_npc_ls1.cpp @@ -277,7 +277,7 @@ void daNpc_Ls1_c::chk_parts_notMov() { } /* 00002050-000020A4 .text searchByID__11daNpc_Ls1_cFUiPi */ -void daNpc_Ls1_c::searchByID(uint, int*) { +void daNpc_Ls1_c::searchByID(fpc_ProcID, int*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_md.cpp b/src/d/actor/d_a_npc_md.cpp index 0e739794..799c2c0e 100644 --- a/src/d/actor/d_a_npc_md.cpp +++ b/src/d/actor/d_a_npc_md.cpp @@ -1291,7 +1291,7 @@ BOOL daNpc_Md_c::harpWaitNpcAction(void*) { /* Nonmatching */ } -static uint l_msgId; +static fpc_ProcID l_msgId; static msg_class* l_msg; /* 00004CFC-00004D40 .text XYTalkCheck__10daNpc_Md_cFv */ diff --git a/src/d/actor/d_a_npc_ob1.cpp b/src/d/actor/d_a_npc_ob1.cpp index 3626216b..8d09abd6 100644 --- a/src/d/actor/d_a_npc_ob1.cpp +++ b/src/d/actor/d_a_npc_ob1.cpp @@ -187,7 +187,7 @@ void daNpc_Ob1_c::setAttention(bool) { } /* 000019C4-000019F8 .text searchByID__11daNpc_Ob1_cFUi */ -void daNpc_Ob1_c::searchByID(uint) { +void daNpc_Ob1_c::searchByID(fpc_ProcID) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_os.cpp b/src/d/actor/d_a_npc_os.cpp index 0e739db7..456ef948 100644 --- a/src/d/actor/d_a_npc_os.cpp +++ b/src/d/actor/d_a_npc_os.cpp @@ -797,7 +797,7 @@ BOOL daNpc_Os_c::finish02NpcAction(void* param_1) { return true; } -static uint l_msgId; +static fpc_ProcID l_msgId; static msg_class* l_msg; /* 00001F48-00002118 .text talkNpcAction__10daNpc_Os_cFPv */ diff --git a/src/d/actor/d_a_npc_people.cpp b/src/d/actor/d_a_npc_people.cpp index 97461e59..14cb4111 100644 --- a/src/d/actor/d_a_npc_people.cpp +++ b/src/d/actor/d_a_npc_people.cpp @@ -5860,7 +5860,7 @@ void daNpcPeople_c::eventGetItemInit(int staffIdx) { itemNo = m75C; } - uint itemPID = fopAcM_createItemForPresentDemo(¤t.pos, itemNo, 0, -1, current.roomNo); + fpc_ProcID itemPID = fopAcM_createItemForPresentDemo(¤t.pos, itemNo, 0, -1, current.roomNo); if (itemPID != fpcM_ERROR_PROCESS_ID_e) { dComIfGp_event_setItemPartnerId(itemPID); } diff --git a/src/d/actor/d_a_npc_pf1.cpp b/src/d/actor/d_a_npc_pf1.cpp index 774846c1..b9e55951 100644 --- a/src/d/actor/d_a_npc_pf1.cpp +++ b/src/d/actor/d_a_npc_pf1.cpp @@ -162,7 +162,7 @@ void daNpc_Pf1_c::chk_parts_notMov() { } /* 0000111C-00001170 .text searchByID__11daNpc_Pf1_cFUiPi */ -void daNpc_Pf1_c::searchByID(uint, int*) { +void daNpc_Pf1_c::searchByID(fpc_ProcID, int*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_roten.cpp b/src/d/actor/d_a_npc_roten.cpp index 3120268e..bacea5ef 100644 --- a/src/d/actor/d_a_npc_roten.cpp +++ b/src/d/actor/d_a_npc_roten.cpp @@ -2312,7 +2312,7 @@ void daNpcRoten_c::eventClrItemInit() { /* 00002978-00002A70 .text eventGetItemInit__12daNpcRoten_cFi */ void daNpcRoten_c::eventGetItemInit(int staffIdx) { - uint pcId; + fpc_ProcID pcId; u32* pData = dComIfGp_evmng_getMyIntegerP(staffIdx, "ItemNo"); if(pData != NULL) { diff --git a/src/d/actor/d_a_npc_yw1.cpp b/src/d/actor/d_a_npc_yw1.cpp index a89c0fce..1266f0c5 100644 --- a/src/d/actor/d_a_npc_yw1.cpp +++ b/src/d/actor/d_a_npc_yw1.cpp @@ -212,7 +212,7 @@ void daNpc_Yw1_c::chk_parts_notMov() { } /* 000018D8-00001938 .text searchByID__11daNpc_Yw1_cFUiPi */ -void daNpc_Yw1_c::searchByID(uint, int*) { +void daNpc_Yw1_c::searchByID(fpc_ProcID, int*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_zk1.cpp b/src/d/actor/d_a_npc_zk1.cpp index 39ff253d..833ae966 100644 --- a/src/d/actor/d_a_npc_zk1.cpp +++ b/src/d/actor/d_a_npc_zk1.cpp @@ -157,7 +157,7 @@ void daNpc_Zk1_c::chk_parts_notMov() { } /* 00001064-000010B8 .text searchByID__11daNpc_Zk1_cFUiPi */ -void daNpc_Zk1_c::searchByID(uint, int*) { +void daNpc_Zk1_c::searchByID(fpc_ProcID, int*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_zl1.cpp b/src/d/actor/d_a_npc_zl1.cpp index e3837163..b707919d 100644 --- a/src/d/actor/d_a_npc_zl1.cpp +++ b/src/d/actor/d_a_npc_zl1.cpp @@ -263,7 +263,7 @@ void daNpc_Zl1_c::chk_parts_notMov() { } /* 00002358-000023AC .text searchByID__11daNpc_Zl1_cFUiPi */ -void daNpc_Zl1_c::searchByID(uint, int*) { +void daNpc_Zl1_c::searchByID(fpc_ProcID, int*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_toripost.cpp b/src/d/actor/d_a_obj_toripost.cpp index 8e85bf96..14e023c7 100644 --- a/src/d/actor/d_a_obj_toripost.cpp +++ b/src/d/actor/d_a_obj_toripost.cpp @@ -175,7 +175,7 @@ void daObjTpost_c::cutPresentStart(int staffIdx) { /* 000003D8-00000474 .text cutPresentProc__12daObjTpost_cFi */ void daObjTpost_c::cutPresentProc(int staffIdx) { - uint itemPID = fopAcM_createItemForPresentDemo(¤t.pos, m_letter[mNumReadable].mItemNo); + fpc_ProcID itemPID = fopAcM_createItemForPresentDemo(¤t.pos, m_letter[mNumReadable].mItemNo); if(itemPID != fpcM_ERROR_PROCESS_ID_e) { dComIfGp_event_setItemPartnerId(itemPID); dComIfGp_evmng_cutEnd(staffIdx); diff --git a/src/d/actor/d_a_player_food.inc b/src/d/actor/d_a_player_food.inc index 2538d9c6..95f9b6b0 100644 --- a/src/d/actor/d_a_player_food.inc +++ b/src/d/actor/d_a_player_food.inc @@ -121,7 +121,7 @@ BOOL daPy_lk_c::procFoodThrow() { dComIfGp_evmng_cutEnd(mStaffIdx); } else { dComIfGp_event_reset(); - uint playerPID = fopAcM_GetID(this); + fpc_ProcID playerPID = fopAcM_GetID(this); dCam_getBody()->EndEventCamera(playerPID); endDemoMode(); } @@ -212,7 +212,7 @@ BOOL daPy_lk_c::procFoodSet() { } else if (m34D0 < 0) { dComIfGp_event_reset(); deleteEquipItem(FALSE); - uint playerPID = fopAcM_GetID(this); + fpc_ProcID playerPID = fopAcM_GetID(this); dCam_getBody()->EndEventCamera(playerPID); endDemoMode(); } else if (m34D0 == 0) { diff --git a/src/d/actor/d_a_player_hook.inc b/src/d/actor/d_a_player_hook.inc index 1b57de72..e1547930 100644 --- a/src/d/actor/d_a_player_hook.inc +++ b/src/d/actor/d_a_player_hook.inc @@ -18,7 +18,7 @@ BOOL daPy_lk_c::checkHookshotReturn() { } /* 8014ABA0-8014ABF4 .text setHookshotCarryOffset__9daPy_lk_cFUiPC4cXyz */ -BOOL daPy_lk_c::setHookshotCarryOffset(uint, const cXyz*) { +BOOL daPy_lk_c::setHookshotCarryOffset(fpc_ProcID, const cXyz*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_player_tact.inc b/src/d/actor/d_a_player_tact.inc index a4fc6a83..c1bde9f1 100644 --- a/src/d/actor/d_a_player_tact.inc +++ b/src/d/actor/d_a_player_tact.inc @@ -115,7 +115,7 @@ BOOL daPy_lk_c::checkTactLastInput() { } /* 8014D9F8-8014DA78 .text setTactZev__9daPy_lk_cFUiiPc */ -void daPy_lk_c::setTactZev(uint tactZevPartnerPID, int r30, char* r31) { +void daPy_lk_c::setTactZev(fpc_ProcID tactZevPartnerPID, int r30, char* r31) { if (tactZevPartnerPID != fpcM_ERROR_PROCESS_ID_e) { mDoAud_seStart(JA_SE_PRE_TAKT); } @@ -544,7 +544,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(); - uint warpID = fopAcM_create(PROC_TORNADO, 1, ¤t.pos, current.roomNo); + fpc_ProcID warpID = fopAcM_create(PROC_TORNADO, 1, ¤t.pos, current.roomNo); ship->setTactWarpID(warpID); } } diff --git a/src/d/actor/d_a_switem.cpp b/src/d/actor/d_a_switem.cpp index 86fef40b..a4748826 100644 --- a/src/d/actor/d_a_switem.cpp +++ b/src/d/actor/d_a_switem.cpp @@ -134,7 +134,7 @@ bool daSwItem_c::_execute() { } csXyz angle(0, home.angle.y, 0); - uint itemProcId = fopAcM_createItemFromTable( + fpc_ProcID itemProcId = fopAcM_createItemFromTable( ¤t.pos, itemTbl, itemBitNo, fopAcM_GetHomeRoomNo(this), 0, &angle, 1 ); diff --git a/src/d/actor/d_a_tag_island.cpp b/src/d/actor/d_a_tag_island.cpp index 631e3a03..4a388ccc 100644 --- a/src/d/actor/d_a_tag_island.cpp +++ b/src/d/actor/d_a_tag_island.cpp @@ -9,7 +9,7 @@ #include "d/d_com_inf_game.h" #include "d/d_procname.h" -static uint l_msgId; +static fpc_ProcID l_msgId; static msg_class* l_msg; enum { diff --git a/src/d/actor/d_a_tag_msg.cpp b/src/d/actor/d_a_tag_msg.cpp index 0455b6ff..696e6624 100644 --- a/src/d/actor/d_a_tag_msg.cpp +++ b/src/d/actor/d_a_tag_msg.cpp @@ -26,7 +26,7 @@ static u8 bss_941 ALIGN_DECL(4); static u8 bss_939 ALIGN_DECL(4); static u8 bss_937 ALIGN_DECL(4); static u8 bss_936 ALIGN_DECL(4); -static uint l_msgId; +static fpc_ProcID l_msgId; static msg_class* l_msg; static u8 msg_mode; diff --git a/src/d/actor/d_a_tbox.cpp b/src/d/actor/d_a_tbox.cpp index 0e893e60..fa509c69 100644 --- a/src/d/actor/d_a_tbox.cpp +++ b/src/d/actor/d_a_tbox.cpp @@ -971,7 +971,7 @@ BOOL daTbox_c::actionOpenWait() { dComIfGp_event_onEventFlag(0x04); u8 itemNo = getItemNo(); - uint itemPID = fopAcM_createItemForTrBoxDemo(¤t.pos, itemNo); + fpc_ProcID itemPID = fopAcM_createItemForTrBoxDemo(¤t.pos, itemNo); if (itemPID != fpcM_ERROR_PROCESS_ID_e) { dComIfGp_event_setItemPartnerId(itemPID); diff --git a/src/d/d_attention.cpp b/src/d/d_attention.cpp index 76a0e1d4..30fff1ed 100644 --- a/src/d/d_attention.cpp +++ b/src/d/d_attention.cpp @@ -538,7 +538,7 @@ void dAttention_c::LockonReleaseDistanse() { } /* 8009F980-8009F9B8 .text LockonTargetPId__12dAttention_cFl */ -uint dAttention_c::LockonTargetPId(s32 idx) { +fpc_ProcID dAttention_c::LockonTargetPId(s32 idx) { if (idx >= mLockOnNum) return NULL; @@ -577,12 +577,12 @@ void dAttList_c::setActor(fopAc_ac_c* i_actor) { } /* 8009FAB4-8009FACC .text getPId__10dAttHint_cFPv */ -uint dAttHint_c::getPId(void* i_proc) { +fpc_ProcID dAttHint_c::getPId(void* i_proc) { return fopAcM_GetID(i_proc); } /* 8009FACC-8009FAFC .text convPId__10dAttHint_cFUi */ -fopAc_ac_c* dAttHint_c::convPId(uint i_procID) { +fopAc_ac_c* dAttHint_c::convPId(fpc_ProcID i_procID) { return fopAcM_SearchByID(i_procID); } @@ -602,19 +602,19 @@ int dAttHint_c::request(fopAc_ac_c* i_actor, int priority) { /* 8009FB58-8009FB70 .text init__10dAttHint_cFv */ void dAttHint_c::init() { mHintActorID = fpcM_ERROR_PROCESS_ID_e; - field_0x8 = fpcM_ERROR_PROCESS_ID_e; + mZHintTargetID = fpcM_ERROR_PROCESS_ID_e; mPriority = 0x200; } /* 8009FB70-8009FB8C .text proc__10dAttHint_cFv */ void dAttHint_c::proc() { - field_0x8 = mHintActorID; + mZHintTargetID = mHintActorID; mHintActorID = fpcM_ERROR_PROCESS_ID_e; mPriority = 0x200; } /* 8009FB8C-8009FBBC .text convPId__11dAttCatch_cFUi */ -fopAc_ac_c* dAttCatch_c::convPId(uint i_procID) { +fopAc_ac_c* dAttCatch_c::convPId(fpc_ProcID i_procID) { return fopAcM_SearchByID(i_procID); } @@ -641,7 +641,7 @@ void dAttCatch_c::request(fopAc_ac_c*, u8, f32, f32, f32, s16, int) { } /* 8009FE10-8009FE40 .text convPId__10dAttLook_cFUi */ -fopAc_ac_c* dAttLook_c::convPId(uint i_procID) { +fopAc_ac_c* dAttLook_c::convPId(fpc_ProcID i_procID) { return fopAcM_SearchByID(i_procID); } diff --git a/src/d/d_auction_screen.cpp b/src/d/d_auction_screen.cpp index 73e2c646..2f91af00 100644 --- a/src/d/d_auction_screen.cpp +++ b/src/d/d_auction_screen.cpp @@ -142,7 +142,7 @@ static void dAs_Create(msg_class*) { } /* 80160D20-80160D70 .text dAuction_screen_create__Fv */ -uint dAuction_screen_create() { +fpc_ProcID dAuction_screen_create() { /* Nonmatching */ } diff --git a/src/d/d_bg_s.cpp b/src/d/d_bg_s.cpp index a83264b0..cb547607 100644 --- a/src/d/d_bg_s.cpp +++ b/src/d/d_bg_s.cpp @@ -112,7 +112,7 @@ int dBgS::GetExitId(cBgS_PolyInfo& polyInfo) { /* 800A06A4-800A0708 .text GetPolyColor__4dBgSFR13cBgS_PolyInfo */ int dBgS::GetPolyColor(cBgS_PolyInfo& polyInfo) { - if (!polyInfo.ChkSetInfo()) + if (!polyInfo.ChkSetInf()) return 0xFF; return GetPolyId0(polyInfo.GetBgIndex(), polyInfo.GetPolyIndex(), 0xFF, 0x07F80000, 19); @@ -277,7 +277,7 @@ int dBgS::GetRoomPathPntNo(cBgS_PolyInfo& polyInfo) { /* 800A0E68-800A0F88 .text GetRoomId__4dBgSFR13cBgS_PolyInfo */ s32 dBgS::GetRoomId(cBgS_PolyInfo& polyInfo) { - if (!polyInfo.ChkSetInfo()) + if (!polyInfo.ChkSetInf()) return -1; s32 id = polyInfo.GetBgIndex(); diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp index 3e501ed0..dc65769d 100644 --- a/src/d/d_camera.cpp +++ b/src/d/d_camera.cpp @@ -558,12 +558,12 @@ void dCamera_c::GetForceLockOnActor() { } /* 8017BCEC-8017BD2C .text ForceLockOn__9dCamera_cFUi */ -void dCamera_c::ForceLockOn(uint) { +void dCamera_c::ForceLockOn(fpc_ProcID) { /* Nonmatching */ } /* 8017BD2C-8017BD5C .text ForceLockOff__9dCamera_cFUi */ -void dCamera_c::ForceLockOff(uint) { +void dCamera_c::ForceLockOff(fpc_ProcID) { /* Nonmatching */ } diff --git a/src/d/d_cc_d.cpp b/src/d/d_cc_d.cpp index ffaffc8c..8c609858 100644 --- a/src/d/d_cc_d.cpp +++ b/src/d/d_cc_d.cpp @@ -63,7 +63,7 @@ void dCcD_GStts::Move() { /* 800AB3DC-800AB46C .text Init__9dCcD_SttsFiiP10fopAc_ac_c */ void dCcD_Stts::Init(int weight, int param_1, fopAc_ac_c* pActor) { - uint procId; + fpc_ProcID procId; if (pActor) { procId = fopAcM_GetID(pActor); } else { diff --git a/src/d/d_cc_s.cpp b/src/d/d_cc_s.cpp index 38c07c2d..de05ed92 100644 --- a/src/d/d_cc_s.cpp +++ b/src/d/d_cc_s.cpp @@ -82,8 +82,8 @@ bool dCcS::ChkAtTgHitAfterCross(bool r4, bool r5, const cCcD_GObjInf* inf1_, con dCcD_Stts* stts2 = (dCcD_Stts*)stts2_; dCcD_GStts* gstts1 = (dCcD_GStts*)gstts1_; dCcD_GStts* gstts2 = (dCcD_GStts*)gstts2_; - uint r11 = stts1->GetApid(); - uint r3 = stts2->GetApid(); + fpc_ProcID r11 = stts1->GetApid(); + fpc_ProcID r3 = stts2->GetApid(); if (r4) { gstts1->SetAtApid(r3); if (inf1->ChkAtNoConHit() && gstts1->GetAtOldApid() == stts2->GetApid()) { diff --git a/src/d/d_event.cpp b/src/d/d_event.cpp index e1241756..1003a7ba 100644 --- a/src/d/d_event.cpp +++ b/src/d/d_event.cpp @@ -700,14 +700,14 @@ dStage_Event_dt_c* dEvt_control_c::nextStageEventDt(void* idxp) { } /* 800715B8-800715DC .text getPId__14dEvt_control_cFPv */ -uint dEvt_control_c::getPId(void* ac) { +fpc_ProcID dEvt_control_c::getPId(void* ac) { if (ac == NULL) return fpcM_ERROR_PROCESS_ID_e; return fopAcM_GetID(ac); } /* 800715DC-8007160C .text convPId__14dEvt_control_cFUi */ -fopAc_ac_c* dEvt_control_c::convPId(uint pid) { +fopAc_ac_c* dEvt_control_c::convPId(fpc_ProcID pid) { return fopAcM_SearchByID(pid); } diff --git a/src/d/d_event_data.cpp b/src/d/d_event_data.cpp index 765b2138..bf823141 100644 --- a/src/d/d_event_data.cpp +++ b/src/d/d_event_data.cpp @@ -270,7 +270,7 @@ void dEvDtStaff_c::specialProcMessage() { "TELOP_ON", "TELOP_OFF", }; - static uint l_msgId; + static fpc_ProcID l_msgId; static msg_class* l_msg; static int l_msgNo; diff --git a/src/d/d_kankyo.cpp b/src/d/d_kankyo.cpp index b16a3a58..3f9d07e3 100644 --- a/src/d/d_kankyo.cpp +++ b/src/d/d_kankyo.cpp @@ -3030,7 +3030,7 @@ void dKy_Sound_init() { } /* 801967F4-801969A8 .text dKy_Sound_set__F4cXyziUii */ -void dKy_Sound_set(cXyz pos, int p2, uint p3, int p4) { +void dKy_Sound_set(cXyz pos, int p2, fpc_ProcID p3, int p4) { camera_class* camera = (camera_class*)dComIfGp_getCamera(0); BOOL ret = FALSE; diff --git a/src/d/d_s_play.cpp b/src/d/d_s_play.cpp index 96285399..de6d17fd 100644 --- a/src/d/d_s_play.cpp +++ b/src/d/d_s_play.cpp @@ -1249,7 +1249,7 @@ int phase_1(dScnPly_ply_c* i_this) { delete l_lkDemoAnmCommand; } - uint id = fopScnM_GetID(i_this); + fpc_ProcID id = fopScnM_GetID(i_this); dStage_roomControl_c::setProcID(id); dComIfGp_setStartStage(dComIfGp_getNextStartStage()); diff --git a/src/d/d_s_title.cpp b/src/d/d_s_title.cpp index 1db6c889..1e5af478 100644 --- a/src/d/d_s_title.cpp +++ b/src/d/d_s_title.cpp @@ -24,8 +24,8 @@ struct title_of_scene_class : public scene_class { public: - /* 0x1C4 */ u32 pad[0x97]; - /* 0x420 */ uint mMoviePId; + /* 0x1C4 */ u8 m1C4[0x420 - 0x1C4]; + /* 0x420 */ fpc_ProcID mMoviePId; #if VERSION == VERSION_PAL static daMP_c* mMp; diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp index 5b76a269..2eb1ba7e 100644 --- a/src/d/d_stage.cpp +++ b/src/d/d_stage.cpp @@ -2373,7 +2373,7 @@ dStage_darkStatus_c dStage_roomControl_c::mDarkStatus[8] = { {}, }; -uint dStage_roomControl_c::mProcID; +fpc_ProcID dStage_roomControl_c::mProcID; s8 dStage_roomControl_c::mStayNo; s8 dStage_roomControl_c::mOldStayNo; u8 dStage_roomControl_c::mDarkRatio; diff --git a/src/d/d_timer.cpp b/src/d/d_timer.cpp index 0d4bef42..5fca98d7 100644 --- a/src/d/d_timer.cpp +++ b/src/d/d_timer.cpp @@ -710,14 +710,14 @@ static s32 dTimer_Create(msg_class* i_this) { } /* 8023DA28-8023DA88 .text dTimer_createTimer__FiUsUcUcffff */ -uint 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) { +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 fpcM_ERROR_PROCESS_ID_e; } /* 8023DA88-8023DAEC .text dTimer_createStockTimer__Fv */ -uint dTimer_createStockTimer() { +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 fpcM_ERROR_PROCESS_ID_e; diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp index 4b9e5d32..570e8a76 100644 --- a/src/f_op/f_op_actor_mng.cpp +++ b/src/f_op/f_op_actor_mng.cpp @@ -49,7 +49,7 @@ void fopAcM_setRoomLayer(void* pProc, int room_no) { } /* 800241C0-80024230 .text fopAcM_SearchByID__FUiPP10fopAc_ac_c */ -s32 fopAcM_SearchByID(uint actorID, fopAc_ac_c** pDstActor) { +s32 fopAcM_SearchByID(fpc_ProcID actorID, fopAc_ac_c** pDstActor) { if (fpcM_IsCreating(actorID)) { *pDstActor = NULL; } else { @@ -92,7 +92,7 @@ fopAcM_prm_class* fopAcM_CreateAppend() { } /* 80024320-80024474 .text createAppend__FUlP4cXyziP5csXyzP4cXyzScUi */ -fopAcM_prm_class * createAppend(u32 parameter, cXyz* pPos, int roomNo, csXyz* pAngle, cXyz* pScale, s8 subtype, uint parentPcId) { +fopAcM_prm_class * createAppend(u32 parameter, cXyz* pPos, int roomNo, csXyz* pAngle, cXyz* pScale, s8 subtype, fpc_ProcID parentPcId) { fopAcM_prm_class * params = fopAcM_CreateAppend(); if (params == NULL) return NULL; @@ -139,7 +139,7 @@ s32 fopAcM_delete(fopAc_ac_c* pActor) { } /* 800244B8-8002451C .text fopAcM_delete__FUi */ -s32 fopAcM_delete(uint actorID) { +s32 fopAcM_delete(fpc_ProcID actorID) { fopAc_ac_c* pActor = (fopAc_ac_c*)fopAcM_SearchByID(actorID); if (pActor != NULL) { @@ -152,7 +152,7 @@ s32 fopAcM_delete(uint actorID) { } /* 8002451C-80024598 .text fopAcM_create__FsUlP4cXyziP5csXyzP4cXyzScPFPv_i */ -uint fopAcM_create(s16 procName, u32 parameter, cXyz* pPos, int roomNo, csXyz* pAngle, cXyz* pScale, s8 subtype, createFunc createFunc) { +fpc_ProcID fopAcM_create(s16 procName, u32 parameter, cXyz* pPos, int roomNo, csXyz* pAngle, cXyz* pScale, s8 subtype, createFunc createFunc) { fopAcM_prm_class* params = createAppend(parameter, pPos, roomNo, pAngle, pScale, subtype, fpcM_ERROR_PROCESS_ID_e); if (params == NULL) return fpcM_ERROR_PROCESS_ID_e; @@ -161,7 +161,7 @@ uint fopAcM_create(s16 procName, u32 parameter, cXyz* pPos, int roomNo, csXyz* p } /* 80024598-80024614 .text fopAcM_create__FPcUlP4cXyziP5csXyzP4cXyzPFPv_i */ -uint fopAcM_create(char* pProcNameString, u32 parameter, cXyz* pPos, int roomNo, csXyz* pAngle, cXyz* pScale, createFunc createFunc) { +fpc_ProcID fopAcM_create(char* pProcNameString, u32 parameter, cXyz* pPos, int roomNo, csXyz* pAngle, cXyz* pScale, createFunc createFunc) { dStage_objectNameInf * nameInf = dStage_searchName(pProcNameString); if (nameInf == NULL) return fpcM_ERROR_PROCESS_ID_e; @@ -188,7 +188,7 @@ void* fopAcM_fastCreate(char* pProcNameString, u32 parameter, cXyz* pPos, int ro } /* 80024710-80024790 .text fopAcM_createChild__FsUiUlP4cXyziP5csXyzP4cXyzScPFPv_i */ -uint fopAcM_createChild(s16 procName, uint parentPcId, u32 parameter, cXyz* pPos, int roomNo, csXyz* pAngle, cXyz* pScale, s8 subtype, createFunc createFunc) { +fpc_ProcID fopAcM_createChild(s16 procName, fpc_ProcID parentPcId, u32 parameter, cXyz* pPos, int roomNo, csXyz* pAngle, cXyz* pScale, s8 subtype, createFunc createFunc) { fopAcM_prm_class* params = createAppend(parameter, pPos, roomNo, pAngle, pScale, subtype, parentPcId); if (params == NULL) return fpcM_ERROR_PROCESS_ID_e; @@ -197,7 +197,7 @@ uint fopAcM_createChild(s16 procName, uint parentPcId, u32 parameter, cXyz* pPos } /* 80024790-80024814 .text fopAcM_createChild__FPcUiUlP4cXyziP5csXyzP4cXyzPFPv_i */ -uint fopAcM_createChild(char* pProcNameString, uint parentPcId, u32 parameter, cXyz* pPos, int roomNo, csXyz* pAngle, cXyz* pScale, createFunc createFunc) { +fpc_ProcID fopAcM_createChild(char* pProcNameString, fpc_ProcID parentPcId, u32 parameter, cXyz* pPos, int roomNo, csXyz* pAngle, cXyz* pScale, createFunc createFunc) { dStage_objectNameInf * nameInf = dStage_searchName(pProcNameString); if (nameInf == NULL) return fpcM_ERROR_PROCESS_ID_e; @@ -206,7 +206,7 @@ uint fopAcM_createChild(char* pProcNameString, uint parentPcId, u32 parameter, c } /* 80024814-800249D4 .text fopAcM_createChildFromOffset__FsUiUlP4cXyziP5csXyzP4cXyzScPFPv_i */ -uint fopAcM_createChildFromOffset(s16 procName, uint parentPcId, u32 parameter, cXyz* pPosOffs, int roomNo, csXyz* pAngleOffs, cXyz* pScale, s8 subtype, createFunc createFunc) { +fpc_ProcID fopAcM_createChildFromOffset(s16 procName, fpc_ProcID parentPcId, u32 parameter, cXyz* pPosOffs, int roomNo, csXyz* pAngleOffs, cXyz* pScale, s8 subtype, createFunc createFunc) { fopAc_ac_c * pParent = fopAcM_SearchByID(parentPcId); s16 parentAngleY = pParent->current.angle.y; @@ -239,7 +239,7 @@ uint fopAcM_createChildFromOffset(s16 procName, uint parentPcId, u32 parameter, } /* 800249D4-80024B78 .text fopAcM_createChildFromOffset__FPcUiUlP4cXyziP5csXyzP4cXyzPFPv_i */ -uint fopAcM_createChildFromOffset(char* pProcNameString, uint parentPcId, u32 parameter, cXyz* pPosOffs, int roomNo, csXyz* pAngleOffs, cXyz* pScale, createFunc createFunc) { +fpc_ProcID fopAcM_createChildFromOffset(char* pProcNameString, fpc_ProcID parentPcId, u32 parameter, cXyz* pPosOffs, int roomNo, csXyz* pAngleOffs, cXyz* pScale, createFunc createFunc) { fopAc_ac_c * pParent = fopAcM_SearchByID(parentPcId); s16 parentAngleY = pParent->current.angle.y; @@ -767,7 +767,7 @@ fopAc_ac_c* fopAcM_getEventPartner(fopAc_ac_c* i_this) { } /* 80026118-800261E8 .text fopAcM_createItemForPresentDemo__FP4cXyziUciiP5csXyzP4cXyz */ -uint fopAcM_createItemForPresentDemo(cXyz* pos, int i_itemNo, u8 argFlag, int roomNo, int param_5, csXyz* rot, cXyz* scale) { +fpc_ProcID fopAcM_createItemForPresentDemo(cXyz* pos, int i_itemNo, u8 argFlag, int roomNo, int param_5, csXyz* rot, cXyz* scale) { JUT_ASSERT(2413, 0 <= i_itemNo && i_itemNo < 256); dComIfGp_event_setGtItm(i_itemNo); @@ -780,7 +780,7 @@ uint fopAcM_createItemForPresentDemo(cXyz* pos, int i_itemNo, u8 argFlag, int ro } /* 800261E8-800262B4 .text fopAcM_createItemForTrBoxDemo__FP4cXyziiiP5csXyzP4cXyz */ -uint fopAcM_createItemForTrBoxDemo(cXyz* pos, int i_itemNo, int roomNo, int param_5, csXyz* rot, cXyz* scale) { +fpc_ProcID fopAcM_createItemForTrBoxDemo(cXyz* pos, int i_itemNo, int roomNo, int param_5, csXyz* rot, cXyz* scale) { JUT_ASSERT(2458, 0 <= i_itemNo && i_itemNo < 256); dComIfGp_event_setGtItm(i_itemNo); @@ -793,7 +793,7 @@ uint fopAcM_createItemForTrBoxDemo(cXyz* pos, int i_itemNo, int roomNo, int para } /* 800262B4-80026694 .text fopAcM_createItemFromTable__FP4cXyziiiiP5csXyziP4cXyz */ -uint fopAcM_createItemFromTable(cXyz* p_pos, int i_itemNo, int i_itemBitNo, int roomNo, int type, csXyz* p_angle, int action, cXyz* p_scale) { +fpc_ProcID fopAcM_createItemFromTable(cXyz* p_pos, int i_itemNo, int i_itemBitNo, int roomNo, int type, csXyz* p_angle, int action, cXyz* p_scale) { JUT_ASSERT(2514, 0 <= i_itemNo && i_itemNo < 64 && (-1 <= i_itemBitNo && i_itemBitNo <= 79) || i_itemBitNo == 127); static cXyz fairy_offset_tbl[3] = { @@ -841,7 +841,7 @@ uint fopAcM_createItemFromTable(cXyz* p_pos, int i_itemNo, int i_itemBitNo, int } u8* pItemTable = itemTableList->mItemTables[tableIdx]; u32 itemNo; - uint lastItemPID; + fpc_ProcID lastItemPID; for (int i = 0; (itemNo = *pItemTable) != dItem_NONE_e && i < 0x10; pItemTable++, i++) { if (p_pos) { pos = *p_pos; @@ -883,7 +883,7 @@ uint fopAcM_createItemFromTable(cXyz* p_pos, int i_itemNo, int i_itemBitNo, int } /* 80026694-800267C8 .text fopAcM_createRaceItemFromTable__FP4cXyziiiP5csXyzP4cXyzi */ -uint fopAcM_createRaceItemFromTable(cXyz* pos, int i_itemNo, int i_itemBitNo, int i_roomNo, csXyz* angle, cXyz* scale, int param_7) { +fpc_ProcID fopAcM_createRaceItemFromTable(cXyz* pos, int i_itemNo, int i_itemBitNo, int i_roomNo, csXyz* angle, cXyz* scale, int param_7) { JUT_ASSERT(2660, 0 <= i_itemNo && i_itemNo < 64 && (-1 <= i_itemBitNo && i_itemBitNo <= 79) || i_itemBitNo == 127); if (i_itemNo >= 0x20 && i_itemNo <= 0x3E) { @@ -903,7 +903,7 @@ uint fopAcM_createRaceItemFromTable(cXyz* pos, int i_itemNo, int i_itemBitNo, in } /* 800267C8-8002688C .text fopAcM_createShopItem__FP4cXyziP5csXyziP4cXyzPFPv_i */ -uint fopAcM_createShopItem(cXyz* pos, int i_itemNo, csXyz* rot, int roomNo, cXyz* scale, +fpc_ProcID fopAcM_createShopItem(cXyz* pos, int i_itemNo, csXyz* rot, int roomNo, cXyz* scale, createFunc createFunc) { JUT_ASSERT(2716, 0 <= i_itemNo && i_itemNo < 256); if (i_itemNo == dItem_NONE_e) { @@ -914,7 +914,7 @@ uint fopAcM_createShopItem(cXyz* pos, int i_itemNo, csXyz* rot, int roomNo, cXyz } /* 8002688C-80026980 .text fopAcM_createRaceItem__FP4cXyziiP5csXyziP4cXyzi */ -uint fopAcM_createRaceItem(cXyz* pos, int i_itemNo, int i_itemBitNo, csXyz* rot, int roomNo, cXyz* scale, int param_7) { +fpc_ProcID fopAcM_createRaceItem(cXyz* pos, int i_itemNo, int i_itemBitNo, csXyz* rot, int roomNo, cXyz* scale, int param_7) { JUT_ASSERT(2763, 0 <= i_itemNo && i_itemNo < 256 && (-1 <= i_itemBitNo && i_itemBitNo <= 79) || i_itemBitNo == 127); if (i_itemNo == dItem_NONE_e) { return fpcM_ERROR_PROCESS_ID_e; @@ -926,7 +926,7 @@ uint fopAcM_createRaceItem(cXyz* pos, int i_itemNo, int i_itemBitNo, csXyz* rot, } /* 80026980-80026A68 .text fopAcM_createDemoItem__FP4cXyziiP5csXyziP4cXyzUc */ -uint fopAcM_createDemoItem(cXyz* pos, int i_itemNo, int i_itemBitNo, csXyz* rot, int roomNo, cXyz* scale, u8 argFlag) { +fpc_ProcID fopAcM_createDemoItem(cXyz* pos, int i_itemNo, int i_itemBitNo, csXyz* rot, int roomNo, cXyz* scale, u8 argFlag) { JUT_ASSERT(2813, 0 <= i_itemNo && i_itemNo < 256 && (-1 <= i_itemBitNo && i_itemBitNo <= 79) || i_itemBitNo == 127); if (i_itemNo == dItem_NONE_e) { return fpcM_ERROR_PROCESS_ID_e; @@ -937,7 +937,7 @@ uint fopAcM_createDemoItem(cXyz* pos, int i_itemNo, int i_itemBitNo, csXyz* rot, } /* 80026A68-80026ADC .text fopAcM_createItemForBoss__FP4cXyziiP5csXyzP4cXyzi */ -uint fopAcM_createItemForBoss(cXyz* pos, int, int roomNo, csXyz* rot, cXyz* scale, int param_6) { +fpc_ProcID fopAcM_createItemForBoss(cXyz* pos, int, int roomNo, csXyz* rot, cXyz* scale, int param_6) { switch (param_6) { case 1: return fopAcM_createItem(pos, dItem_HEART_CONTAINER_e, -1, roomNo, 3, rot, 0xC, scale); @@ -948,7 +948,7 @@ uint fopAcM_createItemForBoss(cXyz* pos, int, int roomNo, csXyz* rot, cXyz* scal } /* 80026ADC-80026C90 .text fopAcM_createItem__FP4cXyziiiiP5csXyziP4cXyz */ -uint fopAcM_createItem(cXyz* pos, int i_itemNo, int i_itemBitNo, int roomNo, int type, csXyz* rot, int action, cXyz* scale) { +fpc_ProcID fopAcM_createItem(cXyz* pos, int i_itemNo, int i_itemBitNo, int roomNo, int type, csXyz* rot, int action, cXyz* scale) { int switchNo = 0xFF; int switchNo2 = 0xFF; @@ -1201,7 +1201,7 @@ void* fopAcM_createItemFromEnemyTable(u16 itemTableIdx, int i_itemBitNo, int i_r } /* 8002777C-800278D8 .text fopAcM_createIball__FP4cXyziiP5csXyzi */ -uint fopAcM_createIball(cXyz* p_pos, int itemTableIdx, int i_roomNo, csXyz* p_angle, int i_itemBitNo) { +fpc_ProcID fopAcM_createIball(cXyz* p_pos, int itemTableIdx, int i_roomNo, csXyz* p_angle, int i_itemBitNo) { int dropChance = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->GetPercent(), (u16)itemTableIdx); int randPercent = cM_rndF(99.999f); @@ -1252,7 +1252,7 @@ fopAc_ac_c* fopAcM_myRoomSearchEnemy(s8 roomNo) { scene_class* roomProc = fopScnM_SearchByID(dStage_roomControl_c::getStatusProcID(roomNo)); JUT_ASSERT(0xe0a, roomProc != NULL); - uint grabProcID = daPy_getPlayerActorClass()->getGrabActorID(); + fpc_ProcID grabProcID = daPy_getPlayerActorClass()->getGrabActorID(); fopAc_ac_c* enemy = fopAcM_SearchByID(grabProcID); if (enemy != NULL && fopAcM_GetGroup(enemy) == fopAc_ENEMY_e) return enemy; @@ -1261,7 +1261,7 @@ fopAc_ac_c* fopAcM_myRoomSearchEnemy(s8 roomNo) { } /* 80027A9C-80027B24 .text fopAcM_createDisappear__FP10fopAc_ac_cP4cXyzUcUcUc */ -uint fopAcM_createDisappear(fopAc_ac_c* i_actor, cXyz* p_pos, u8 i_scale, u8 i_health, u8 i_itemBitNo) { +fpc_ProcID fopAcM_createDisappear(fopAc_ac_c* i_actor, cXyz* p_pos, u8 i_scale, u8 i_health, u8 i_itemBitNo) { u32 params = (i_itemBitNo & 0xFF) << 0x10 | (i_scale & 0xFF) << 0x08 | i_health & 0xFF; fopAc_ac_c* disappear = (fopAc_ac_c*)fopAcM_fastCreate(PROC_DISAPPEAR, params, p_pos, fopAcM_GetRoomNo(i_actor), fopAcM_GetAngle_p(i_actor)); if (disappear) { diff --git a/src/f_op/f_op_camera.cpp b/src/f_op/f_op_camera.cpp index e11503b3..d776f860 100644 --- a/src/f_op/f_op_camera.cpp +++ b/src/f_op/f_op_camera.cpp @@ -9,7 +9,7 @@ // the DOL, even though this is an ugly hack and they're now in the wrong translation unit instead. #include "d/actor/d_a_player.h" void daPy_py_c::onFrollCrashFlg(u32) {} -uint daPy_py_c::getGrabActorID() const { return fpcM_ERROR_PROCESS_ID_e; } +fpc_ProcID daPy_py_c::getGrabActorID() const { return fpcM_ERROR_PROCESS_ID_e; } #include "f_op/f_op_camera.h" #include "f_op/f_op_draw_tag.h" diff --git a/src/f_op/f_op_camera_mng.cpp b/src/f_op/f_op_camera_mng.cpp index 6f2b11ff..5bb24c58 100644 --- a/src/f_op/f_op_camera_mng.cpp +++ b/src/f_op/f_op_camera_mng.cpp @@ -6,16 +6,17 @@ #include "f_op/f_op_camera_mng.h" #include "f_pc/f_pc_layer.h" #include "f_pc/f_pc_stdcreate_req.h" +#include "f_pc/f_pc_manager.h" -static uint l_fopCamM_id[4]; +static fpc_ProcID l_fopCamM_id[4]; /* 80029468-80029470 .text fopCamM_GetParam__FP12camera_class */ u32 fopCamM_GetParam(camera_class* i_this) { - return i_this->base.mParameters; + return fpcM_GetParam(i_this); } /* 80029470-800294D4 .text fopCamM_Create__FisPv */ -u32 fopCamM_Create(int i_cameraIdx, s16 i_procName, void* param_3) { +fpc_ProcID fopCamM_Create(int i_cameraIdx, s16 i_procName, void* param_3) { l_fopCamM_id[i_cameraIdx] = fpcSCtRq_Request(fpcLy_CurrentLayer(), i_procName, 0, 0, param_3); return l_fopCamM_id[i_cameraIdx]; } diff --git a/src/f_op/f_op_kankyo_mng.cpp b/src/f_op/f_op_kankyo_mng.cpp index 8c071161..61d7b53e 100644 --- a/src/f_op/f_op_kankyo_mng.cpp +++ b/src/f_op/f_op_kankyo_mng.cpp @@ -12,7 +12,7 @@ #include "SSystem/SComponent/c_lib.h" /* 8002A860-8002A880 .text fopKyM_SearchByID__FUi */ -kankyo_class* fopKyM_SearchByID(uint id) { +kankyo_class* fopKyM_SearchByID(fpc_ProcID id) { return (kankyo_class*) fpcEx_SearchByID(id); } @@ -48,12 +48,12 @@ void fopKyM_Delete(void* i_process) { } /* 8002A988-8002A9D8 .text fopKyM_Create__FsPFPv_iPv */ -uint fopKyM_Create(s16 i_procName, fopKyM_CreateFunc i_createFunc, void* i_process) { +fpc_ProcID fopKyM_Create(s16 i_procName, fopKyM_CreateFunc i_createFunc, void* i_process) { return fpcM_Create(i_procName, i_createFunc, i_process); } /* 8002A9D8-8002AA38 .text fopKyM_create__FsiP4cXyzP4cXyzPFPv_i */ -uint fopKyM_create(s16 i_procName, int i_param, cXyz* i_pos, cXyz* i_scale, fopKyM_CreateFunc i_createFunc) { +fpc_ProcID fopKyM_create(s16 i_procName, int i_param, cXyz* i_pos, cXyz* i_scale, fopKyM_CreateFunc i_createFunc) { fopKyM_prm_class* params = createAppend(i_param, i_pos, i_scale); if (params == NULL) { @@ -76,7 +76,7 @@ base_process_class* fopKyM_fastCreate(s16 i_procName, int i_param, cXyz* i_pos, } /* 8002AA9C-8002AB40 .text fopKyM_createWpillar__FPC4cXyzffi */ -uint fopKyM_createWpillar(cXyz const* i_pos, f32 scaleXZ, f32 scaleY, int i_param) { +fpc_ProcID fopKyM_createWpillar(cXyz const* i_pos, f32 scaleXZ, f32 scaleY, int i_param) { fopKyM_prm_class* params = fopKyM_CreateAppend(); if (params == NULL) { diff --git a/src/f_op/f_op_msg_mng.cpp b/src/f_op/f_op_msg_mng.cpp index 1fcb4095..c930c932 100644 --- a/src/f_op/f_op_msg_mng.cpp +++ b/src/f_op/f_op_msg_mng.cpp @@ -141,7 +141,7 @@ s32 fopMsgM_setStageLayer(void* proc) { } /* 8002AED4-8002AEF4 .text fopMsgM_SearchByID__FUi */ -msg_class* fopMsgM_SearchByID(uint pid) { +msg_class* fopMsgM_SearchByID(fpc_ProcID pid) { return (msg_class*)fpcEx_SearchByID(pid); } @@ -151,7 +151,7 @@ msg_class* fopMsgM_SearchByName(s16 proc_name) { } /* 8002AF24-8002AF44 .text fopMsgM_IsExecuting__FUi */ -BOOL fopMsgM_IsExecuting(uint pid) { +BOOL fopMsgM_IsExecuting(fpc_ProcID pid) { return fpcEx_IsExist(pid); } @@ -200,7 +200,7 @@ void createTimerAppend(int, u16, u8, u8, f32, f32, f32, f32, uint) { } /* 8002B1C8-8002B23C .text fopMsgM_create__FsP10fopAc_ac_cP4cXyzPUlPUlPFPv_i */ -s32 fopMsgM_create(s16, fopAc_ac_c*, cXyz*, u32*, u32*, int (*)(void*)) { +fpc_ProcID fopMsgM_create(s16, fopAc_ac_c*, cXyz*, u32*, u32*, int (*)(void*)) { /* Nonmatching */ } @@ -210,7 +210,7 @@ void fop_MGameTerm_create(s16, s16, s16, int, int, int (*)(void*)) { } /* 8002B2B0-8002B324 .text fop_Timer_create__FsUcUsUcUcffffPFPv_i */ -uint fop_Timer_create(s16, u8, u16, u8, u8, f32, f32, f32, f32, int (*)(void*)) { +fpc_ProcID fop_Timer_create(s16, u8, u16, u8, u8, f32, f32, f32, f32, int (*)(void*)) { /* Nonmatching */ } @@ -225,22 +225,22 @@ u32 fopMsgM_searchMessageNumber(u32) { } /* 8002B634-8002B778 .text fopMsgM_messageSet__FUlP10fopAc_ac_c */ -uint fopMsgM_messageSet(u32, fopAc_ac_c*) { +fpc_ProcID fopMsgM_messageSet(u32, fopAc_ac_c*) { /* Nonmatching */ } /* 8002B778-8002B8A4 .text fopMsgM_messageSet__FUlP4cXyz */ -uint fopMsgM_messageSet(u32, cXyz*) { +fpc_ProcID fopMsgM_messageSet(u32, cXyz*) { /* Nonmatching */ } /* 8002B8A4-8002B9C4 .text fopMsgM_messageSet__FUl */ -uint fopMsgM_messageSet(u32) { +fpc_ProcID fopMsgM_messageSet(u32) { /* Nonmatching */ } /* 8002B9C4-8002BA4C .text fopMsgM_scopeMessageSet__FUl */ -uint fopMsgM_scopeMessageSet(u32) { +fpc_ProcID fopMsgM_scopeMessageSet(u32) { /* Nonmatching */ } @@ -490,7 +490,7 @@ void fopMsgM_outFontDraw2(J2DPicture*, J2DPicture*, int, int, int, int, s16*, u8 } /* 8002E204-8002E254 .text fopMsgM_Create__FsPFPv_iPv */ -u32 fopMsgM_Create(s16, int (*)(void*), void*) { +fpc_ProcID fopMsgM_Create(s16, int (*)(void*), void*) { /* Nonmatching */ } diff --git a/src/f_op/f_op_overlap_mng.cpp b/src/f_op/f_op_overlap_mng.cpp index aa10569f..7d8057f2 100644 --- a/src/f_op/f_op_overlap_mng.cpp +++ b/src/f_op/f_op_overlap_mng.cpp @@ -37,7 +37,7 @@ void fopOvlpM_Done(overlap_task_class* pTaskClass) { cReq_Done(&pTaskClass->mRq); } -void fopOvlpM_ToldAboutID(uint pcId) { +void fopOvlpM_ToldAboutID(fpc_ProcID pcId) { if (l_fopOvlpM_overlap[0] != NULL) l_fopOvlpM_overlap[0]->mpTask->mScenePId = pcId; } diff --git a/src/f_op/f_op_scene_mng.cpp b/src/f_op/f_op_scene_mng.cpp index 0bb80c04..638efe5a 100644 --- a/src/f_op/f_op_scene_mng.cpp +++ b/src/f_op/f_op_scene_mng.cpp @@ -9,16 +9,16 @@ #include "f_pc/f_pc_searcher.h" #include "JSystem/JUtility/JUTAssert.h" -scene_class* fopScnM_SearchByID(uint id) { +scene_class* fopScnM_SearchByID(fpc_ProcID id) { return (scene_class*)fopScnIt_Judge((fop_ScnItFunc)fpcSch_JudgeByID, &id); } -static u32 l_scnRqID = fpcM_ERROR_PROCESS_ID_e; +static uint l_scnRqID = -1; int fopScnM_ChangeReq(scene_class* i_scene, s16 procName, s16 fadeTime, u16 param_4) { uint sceneRequestID = fopScnRq_Request(2, i_scene, procName, 0, fadeTime, param_4); - if (sceneRequestID == fpcM_ERROR_PROCESS_ID_e) { + if (sceneRequestID == -1) { return 0; } @@ -26,18 +26,18 @@ int fopScnM_ChangeReq(scene_class* i_scene, s16 procName, s16 fadeTime, u16 para return 1; } -uint fopScnM_DeleteReq(scene_class* i_scene) { +BOOL fopScnM_DeleteReq(scene_class* i_scene) { uint sceneRequestID = fopScnRq_Request(1, i_scene, 0x7FFF, 0, 0x7FFF, 0); - return sceneRequestID != fpcM_ERROR_PROCESS_ID_e; + return sceneRequestID != -1; } -int fopScnM_CreateReq(s16 param_1, s16 param_2, u16 param_3, u32 param_4) { +BOOL fopScnM_CreateReq(s16 param_1, s16 param_2, u16 param_3, u32 param_4) { uint sceneRequestID = fopScnRq_Request(0, 0, param_1, (void*)param_4, param_2, param_3); - return sceneRequestID != fpcM_ERROR_PROCESS_ID_e; + return sceneRequestID != -1; } u32 fopScnM_ReRequest(s16 param_1, u32 param_2) { - if (l_scnRqID == fpcM_ERROR_PROCESS_ID_e) { + if (l_scnRqID == -1) { return 0; } diff --git a/src/f_op/f_op_scene_req.cpp b/src/f_op/f_op_scene_req.cpp index d184fc10..ebd83ec2 100644 --- a/src/f_op/f_op_scene_req.cpp +++ b/src/f_op/f_op_scene_req.cpp @@ -120,14 +120,14 @@ uint fopScnRq_Request(int param_1, scene_class* i_scene, s16 param_3, void* para &submethod); if (!pScnReq) { - ret = fpcM_ERROR_PROCESS_ID_e; + ret = -1; } else { if (param_5 != 0x7fff) { phase_handler_table = fadeFase; tmp = (int)fopScnRq_FadeRequest(param_5, param_6); if (!tmp) { fpcNdRq_Delete(&pScnReq->mCrtReq); - return fpcM_ERROR_PROCESS_ID_e; + return -1; } } pScnReq->mFadeRequest = tmp; @@ -138,8 +138,8 @@ uint fopScnRq_Request(int param_1, scene_class* i_scene, s16 param_3, void* para return ret; } -s32 fopScnRq_ReRequest(uint param_1, s16 param_2, void* param_3) { - return fpcNdRq_ReRequest(param_1, param_2, param_3); +s32 fopScnRq_ReRequest(uint i_requestID, s16 i_procName, void* i_data) { + return fpcNdRq_ReRequest(i_requestID, i_procName, i_data); } s32 fopScnRq_Handler() { diff --git a/src/f_pc/f_pc_base.cpp b/src/f_pc/f_pc_base.cpp index 4396d3d7..ab324e69 100644 --- a/src/f_pc/f_pc_base.cpp +++ b/src/f_pc/f_pc_base.cpp @@ -34,8 +34,8 @@ s32 fpcBs_MakeOfType(int* i_type) { } /* 8003C8DC-8003C904 .text fpcBs_MakeOfId__Fv */ -s32 fpcBs_MakeOfId() { - static s32 process_id = 1; +fpc_ProcID fpcBs_MakeOfId() { + static fpc_ProcID process_id = 1; return process_id++; } @@ -79,7 +79,7 @@ s32 fpcBs_Delete(base_process_class* i_proc) { } /* 8003CA60-8003CB5C .text fpcBs_Create__FsUiPv */ -base_process_class* fpcBs_Create(s16 i_profName, uint i_procID, void* i_data) { +base_process_class* fpcBs_Create(s16 i_profName, fpc_ProcID i_procID, void* i_data) { process_profile_definition* procProfDef; base_process_class* procClass; u32 size; diff --git a/src/f_pc/f_pc_create_req.cpp b/src/f_pc/f_pc_create_req.cpp index 75de6cc7..be22a3ab 100644 --- a/src/f_pc/f_pc_create_req.cpp +++ b/src/f_pc/f_pc_create_req.cpp @@ -13,13 +13,13 @@ #include "f_pc/f_pc_layer_iter.h" /* 8003CD0C-8003CD28 .text fpcCtRq_isCreatingByID__FP10create_tagPUi */ -bool fpcCtRq_isCreatingByID(create_tag* i_createTag, uint* i_procID) { +bool fpcCtRq_isCreatingByID(create_tag* i_createTag, fpc_ProcID* i_procID) { create_request* pReq = static_cast<create_request*>(i_createTag->base.mpTagData); return pReq->mBsPcId == *i_procID; } /* 8003CD28-8003CD60 .text fpcCtRq_IsCreatingByID__FUi */ -BOOL fpcCtRq_IsCreatingByID(uint i_id) { +BOOL fpcCtRq_IsCreatingByID(fpc_ProcID i_id) { return fpcCtIt_Judge((fpcLyIt_JudgeFunc)fpcCtRq_isCreatingByID, &i_id) != NULL ? TRUE : FALSE; } diff --git a/src/f_pc/f_pc_creator.cpp b/src/f_pc/f_pc_creator.cpp index ddb0c923..52df73bb 100644 --- a/src/f_pc/f_pc_creator.cpp +++ b/src/f_pc/f_pc_creator.cpp @@ -8,7 +8,7 @@ #include "f_pc/f_pc_create_req.h" /* 8003D0E8-8003D108 .text fpcCt_IsCreatingByID__FUi */ -BOOL fpcCt_IsCreatingByID(uint i_id) { +BOOL fpcCt_IsCreatingByID(fpc_ProcID i_id) { return fpcCtRq_IsCreatingByID(i_id); } diff --git a/src/f_pc/f_pc_executor.cpp b/src/f_pc/f_pc_executor.cpp index a295e42e..740159f0 100644 --- a/src/f_pc/f_pc_executor.cpp +++ b/src/f_pc/f_pc_executor.cpp @@ -14,7 +14,7 @@ base_process_class* fpcEx_Search(fpcLyIt_JudgeFunc i_judgeFunc, void* i_data) { } /* 8003D5D0-8003D614 .text fpcEx_SearchByID__FUi */ -base_process_class* fpcEx_SearchByID(uint i_id) { +base_process_class* fpcEx_SearchByID(fpc_ProcID i_id) { if (i_id + 2 <= 1) return NULL; @@ -22,7 +22,7 @@ base_process_class* fpcEx_SearchByID(uint i_id) { } /* 8003D614-8003D63C .text fpcEx_IsExist__FUi */ -BOOL fpcEx_IsExist(uint i_id) { +BOOL fpcEx_IsExist(fpc_ProcID i_id) { return fpcEx_SearchByID(i_id) != NULL ? TRUE : FALSE; } diff --git a/src/f_pc/f_pc_layer.cpp b/src/f_pc/f_pc_layer.cpp index 15719471..cef67860 100644 --- a/src/f_pc/f_pc_layer.cpp +++ b/src/f_pc/f_pc_layer.cpp @@ -100,10 +100,10 @@ layer_class* fpcLy_CurrentLayer() { } /* 8003D974-8003D9C4 .text fpcLy_Search__FUi */ -layer_class* fpcLy_Search(uint i_id) { +layer_class* fpcLy_Search(uint i_layerID) { layer_class* layer_p = fpcLy_RootLayer(); while (layer_p != NULL) { - if (layer_p->mLayerID == i_id) { + if (layer_p->mLayerID == i_layerID) { return layer_p; } layer_p = (layer_class*)layer_p->mNode.mpNextNode; @@ -112,13 +112,13 @@ layer_class* fpcLy_Search(uint i_id) { } /* 8003D9C4-8003DA34 .text fpcLy_Layer__FUi */ -layer_class* fpcLy_Layer(uint i_id) { - if (i_id == fpcLy_ROOT_e || fpcLy_RootLayer()->mLayerID == i_id) { +layer_class* fpcLy_Layer(uint i_layerID) { + if (i_layerID == fpcLy_ROOT_e || fpcLy_RootLayer()->mLayerID == i_layerID) { return fpcLy_RootLayer(); - } else if (i_id == fpcLy_CURRENT_e || fpcLy_CurrentLayer()->mLayerID == i_id) { + } else if (i_layerID == fpcLy_CURRENT_e || fpcLy_CurrentLayer()->mLayerID == i_layerID) { return fpcLy_CurrentLayer(); } else { - return fpcLy_Search(i_id); + return fpcLy_Search(i_layerID); } } diff --git a/src/f_pc/f_pc_layer_tag.cpp b/src/f_pc/f_pc_layer_tag.cpp index 44097cd2..10a5cdde 100644 --- a/src/f_pc/f_pc_layer_tag.cpp +++ b/src/f_pc/f_pc_layer_tag.cpp @@ -59,7 +59,7 @@ s32 fpcLyTg_Move(layer_management_tag_class* i_lyTag, uint i_layerID, u16 i_list } /* 8003E128-8003E1DC .text fpcLyTg_Init__FP26layer_management_tag_classUiPv */ -s32 fpcLyTg_Init(layer_management_tag_class* i_lyTag, uint i_id, void* i_data) { +s32 fpcLyTg_Init(layer_management_tag_class* i_lyTag, uint i_layerID, void* i_data) { static layer_management_tag_class crear = { NULL, NULL, NULL, NULL, 0, NULL, 0xFFFF, 0xFFFF, }; @@ -67,7 +67,7 @@ s32 fpcLyTg_Init(layer_management_tag_class* i_lyTag, uint i_id, void* i_data) { layer_class* layer; *i_lyTag = crear; cTg_Create(&i_lyTag->mCreateTag, i_data); - layer = fpcLy_Layer(i_id); + layer = fpcLy_Layer(i_layerID); if (layer != NULL) { i_lyTag->mpLayer = layer; return 1; diff --git a/src/f_pc/f_pc_manager.cpp b/src/f_pc/f_pc_manager.cpp index ab636b58..93e4c46b 100644 --- a/src/f_pc/f_pc_manager.cpp +++ b/src/f_pc/f_pc_manager.cpp @@ -49,7 +49,7 @@ s32 fpcM_Delete(void* i_proc) { } /* 8003E3B0-8003E3D0 .text fpcM_IsCreating__FUi */ -BOOL fpcM_IsCreating(uint pID) { +BOOL fpcM_IsCreating(fpc_ProcID pID) { return fpcCt_IsCreatingByID(pID); } diff --git a/src/f_pc/f_pc_node_req.cpp b/src/f_pc/f_pc_node_req.cpp index 011426f2..0e60f278 100644 --- a/src/f_pc/f_pc_node_req.cpp +++ b/src/f_pc/f_pc_node_req.cpp @@ -12,6 +12,7 @@ #include "f_pc/f_pc_layer.h" #include "f_pc/f_pc_node.h" #include "f_pc/f_pc_stdcreate_req.h" +#include "f_pc/f_pc_manager.h" /* 8003F29C-8003F2DC .text fpcNdRq_RequestQTo__FP19node_create_request */ void fpcNdRq_RequestQTo(node_create_request* i_NdCtReq) { @@ -43,7 +44,7 @@ s32 fpcNdRq_phase_Create(node_create_request* i_NdCtReq) { i_NdCtReq->mCreatingID = fpcSCtRq_Request(i_NdCtReq->mpLayerClass, i_NdCtReq->mProcName, (stdCreateFunc)i_NdCtReq->mpNodeCrReqMthCls->mpPostMethodFunc, i_NdCtReq, i_NdCtReq->mpUserData); - return i_NdCtReq->mCreatingID == -1 ? 3 : 2; + return i_NdCtReq->mCreatingID == fpcM_ERROR_PROCESS_ID_e ? 3 : 2; } /* 8003F3DC-8003F3E4 .text fpcNdRq_phase_IsDeleteTiming__FP19node_create_request */ @@ -138,7 +139,7 @@ s32 fpcNdRq_Handler() { /* 8003F6BC-8003F728 .text fpcNdRq_IsPossibleTarget__FP18process_node_class */ s32 fpcNdRq_IsPossibleTarget(process_node_class* i_procNode) { - uint bsPcId = i_procNode->base.mBsPcId; + fpc_ProcID bsPcId = i_procNode->base.mBsPcId; request_node_class* currentNode; node_create_request* currentNdCr; currentNode = (request_node_class*)l_fpcNdRq_Queue.mpHead; @@ -155,7 +156,7 @@ s32 fpcNdRq_IsPossibleTarget(process_node_class* i_procNode) { s32 fpcNdRq_IsIng(process_node_class* i_procNode) { request_node_class* currentNode; node_create_request* currentNodeReq; - uint bsPcId = i_procNode->base.mBsPcId; + fpc_ProcID bsPcId = i_procNode->base.mBsPcId; currentNode = (request_node_class*)l_fpcNdRq_Queue.mpHead; while (currentNode != NULL) { currentNodeReq = currentNode->mNodeCrReq; @@ -176,7 +177,7 @@ node_create_request* fpcNdRq_Create(u32 i_requestSize) { node_create_request* req = (node_create_request*)cMl::memalignB(-4, i_requestSize); if (req != NULL) { - static int request_id = 0; + static uint request_id = 0; sBs_ClearArea(req, i_requestSize); *req = clear; cTg_Create(&req->mCreateTag, req); diff --git a/src/f_pc/f_pc_searcher.cpp b/src/f_pc/f_pc_searcher.cpp index ac1c8422..0464d434 100644 --- a/src/f_pc/f_pc_searcher.cpp +++ b/src/f_pc/f_pc_searcher.cpp @@ -16,7 +16,7 @@ void* fpcSch_JudgeForPName(void* i_proc, void* i_data) { /* 80040068-80040080 .text fpcSch_JudgeByID__FPvPv */ void* fpcSch_JudgeByID(void* i_proc, void* i_data) { - s32 process_id = *(s32*)i_data; + fpc_ProcID process_id = *(fpc_ProcID*)i_data; if (((base_process_class*)i_proc)->mBsPcId == process_id) return i_proc; diff --git a/src/f_pc/f_pc_stdcreate_req.cpp b/src/f_pc/f_pc_stdcreate_req.cpp index e831aba6..8836016c 100644 --- a/src/f_pc/f_pc_stdcreate_req.cpp +++ b/src/f_pc/f_pc_stdcreate_req.cpp @@ -93,7 +93,7 @@ s32 fpcSCtRq_Cancel(standard_create_request_class* i_SCtReq) { } /* 8004086C-80040900 .text fpcSCtRq_Request__FP11layer_classsPFPvPv_iPvPv */ -uint fpcSCtRq_Request(layer_class* i_layer, s16 i_procName, stdCreateFunc i_createFunc, void* param_4, void* param_5) { +fpc_ProcID fpcSCtRq_Request(layer_class* i_layer, s16 i_procName, stdCreateFunc i_createFunc, void* param_4, void* param_5) { static create_request_method_class submethod = { (cPhs__Handler)fpcSCtRq_Handler, (process_method_func)fpcSCtRq_Cancel, |