Game-Decompilation/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2024-11-26 23:01:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add fpc_ProcID type and use it for all process IDs

Browse Source 
See https://github.com/zeldaret/tp/pull/2173
This commit is contained in:
LagoLunatic 2024-07-12 21:14:13 -04:00
parent 61d9f474a5
commit 2def735282
159 changed files with 401 additions and 382 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/SSystem/SComponent/c_bg_s.h
View File

@ -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*);

9
include/SSystem/SComponent/c_bg_s_chk.h
View File

@ -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; }

2
include/SSystem/SComponent/c_bg_s_lin_chk.h
View File

@ -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() {}

17
include/SSystem/SComponent/c_bg_s_poly_info.h
View File

@ -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;

7
include/SSystem/SComponent/c_cc_d.h
View File

@ -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));

8
include/d/actor/d_a_agb.h
View File

@ -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;

2
include/d/actor/d_a_am.h
View File

@ -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;

4
include/d/actor/d_a_arrow.h
View File

@ -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;

10
include/d/actor/d_a_auction.h
View File

@ -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;

2
include/d/actor/d_a_bflower.h
View File

@ -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;
};

2
include/d/actor/d_a_deku_item.h
View File

@ -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;
};

2
include/d/actor/d_a_fan.h
View File

@ -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];

2
include/d/actor/d_a_fganon.h
View File

@ -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;

4
include/d/actor/d_a_hookshot.h
View File

@ -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;
};

2
include/d/actor/d_a_item.h
View File

@ -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;

2
include/d/actor/d_a_kamome.h
View File

@ -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;

2
include/d/actor/d_a_kantera.h
View File

@ -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;

2
include/d/actor/d_a_mo2.h
View File

@ -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];

2
include/d/actor/d_a_mozo.h
View File

@ -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();

2
include/d/actor/d_a_npc_ba1.h
View File

@ -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();

2
include/d/actor/d_a_npc_bj1.h
View File

@ -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_();

2
include/d/actor/d_a_npc_bm1.h
View File

@ -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);

2
include/d/actor/d_a_npc_de1.h
View File

@ -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();

2
include/d/actor/d_a_npc_gk1.h
View File

@ -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);

2
include/d/actor/d_a_npc_gp1.h
View File

@ -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();

2
include/d/actor/d_a_npc_hi1.h
View File

@ -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);

2
include/d/actor/d_a_npc_hr.h
View File

@ -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;

2
include/d/actor/d_a_npc_kf1.h
View File

@ -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);

2
include/d/actor/d_a_npc_kk1.h
View File

@ -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();

2
include/d/actor/d_a_npc_ko1.h
View File

@ -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();

2
include/d/actor/d_a_npc_ls1.h
View File

@ -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();

2
include/d/actor/d_a_npc_ob1.h
View File

@ -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();

2
include/d/actor/d_a_npc_pf1.h
View File

@ -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);

2
include/d/actor/d_a_npc_roten.h
View File

@ -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;

2
include/d/actor/d_a_npc_yw1.h
View File

@ -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();

2
include/d/actor/d_a_npc_zk1.h
View File

@ -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);

2
include/d/actor/d_a_npc_zl1.h
View File

@ -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();

6
include/d/actor/d_a_obj_buoyflag.h
View File

@ -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?

2
include/d/actor/d_a_obj_eskban.h
View File

@ -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;

2
include/d/actor/d_a_obj_figure.h
View File

@ -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;

2
include/d/actor/d_a_obj_ftree.h
View File

@ -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;

2
include/d/actor/d_a_obj_ikada.h
View File

@ -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;

2
include/d/actor/d_a_obj_mknjd.h
View File

@ -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;

2
include/d/actor/d_a_obj_movebox.h
View File

@ -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];

2
include/d/actor/d_a_obj_paper.h
View File

@ -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;
};

4
include/d/actor/d_a_obj_search.h
View File

@ -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 {

4
include/d/actor/d_a_oship.h
View File

@ -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;

10
include/d/actor/d_a_player.h
View File

@ -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) {}

24
include/d/actor/d_a_player_main.h
View File

@ -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;

4
include/d/actor/d_a_pw.h
View File

@ -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;

2
include/d/actor/d_a_rd.h
View File

@ -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;

4
include/d/actor/d_a_st.h
View File

@ -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;

2
include/d/actor/d_a_tag_etc.h
View File

@ -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;
};

4
include/d/actor/d_a_tama.h
View File

@ -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;

2
include/d/actor/d_a_tn.h
View File

@ -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];

2
include/d/actor/d_a_toge.h
View File

@ -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;

2
include/d/actor/d_a_wind_tag.h
View File

@ -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

30
include/d/d_attention.h
View File

@ -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();

4
include/d/d_bg_s.h
View File

@ -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

6
include/d/d_bg_s_acch.h
View File

@ -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;

5
include/d/d_camera.h
View File

@ -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();

26
include/d/d_cc_d.h
View File

@ -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); }

2
include/d/d_com_inf_game.h
View File

@ -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);
}

3
include/d/d_demo.h
View File

@ -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;

2
include/d/d_door.h
View File

@ -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;

15
include/d/d_event.h
View File

@ -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;

5
include/d/d_kankyo.h
View File

@ -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);

2
include/d/d_npc.h
View File

@ -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;

2
include/d/d_snap.h
View File

@ -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;

10
include/d/d_stage.h
View File

@ -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;

4
include/d/d_timer.h
View File

@ -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 */

2
include/f_op/f_op_actor.h
View File

@ -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;

48
include/f_op/f_op_actor_mng.h
View File

@ -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);

2
include/f_op/f_op_camera_mng.h
View File

@ -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);

8
include/f_op/f_op_kankyo_mng.h
View File

@ -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);

21
include/f_op/f_op_msg_mng.h
View File

@ -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,

4
include/f_op/f_op_overlap_mng.h
View File

@ -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();

3
include/f_op/f_op_overlap_req.h
View File

@ -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;

8
include/f_op/f_op_scene_mng.h
View File

@ -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);
}

8
include/f_pc/f_pc_base.h
View File

@ -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" {

2
include/f_pc/f_pc_create_iter.h
View File

@ -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

7
include/f_pc/f_pc_create_req.h
View File

@ -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);

3
include/f_pc/f_pc_creator.h
View File

@ -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);

5
include/f_pc/f_pc_executor.h
View File

@ -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);

4
include/f_pc/f_pc_layer.h
View File

@ -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);

11
include/f_pc/f_pc_layer_tag.h
View File

@ -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

10
include/f_pc/f_pc_manager.h
View File

@ -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);

11
include/f_pc/f_pc_node_req.h
View File

@ -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

9
include/f_pc/f_pc_priority.h
View File

@ -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

2
include/f_pc/f_pc_stdcreate_req.h
View File

@ -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

4
src/SSystem/SComponent/c_bg_s.cpp
View File

@ -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;

4
src/SSystem/SComponent/c_bg_s_chk.cpp
View File

@ -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;

2
src/SSystem/SComponent/c_bg_s_lin_chk.cpp
View File

@ -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);

2
src/SSystem/SComponent/c_cc_d.cpp
View File

@ -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;

6
src/d/actor/d_a_auction.cpp
View File

@ -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(&current.pos, l_item_dat22[mCurrAuctionItemIndex] & 0xFF);
fpc_ProcID itemID = fopAcM_createItemForPresentDemo(&current.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(&current.pos, l_item_dat[mCurrAuctionItemIndex].mItemID & 0xFF);
fpc_ProcID itemID = fopAcM_createItemForPresentDemo(&current.pos, l_item_dat[mCurrAuctionItemIndex].mItemID & 0xFF);
if (itemID != fpcM_ERROR_PROCESS_ID_e) {
dComIfGp_event_setItemPartnerId(itemID);

2
src/d/actor/d_a_bk.cpp
View File

@ -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;

2
src/d/actor/d_a_mozo.cpp
View File

@ -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;

2
src/d/actor/d_a_npc_ba1.cpp
View File

@ -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 */
}

2
src/d/actor/d_a_npc_bj1.cpp
View File

@ -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 */
}

2
src/d/actor/d_a_npc_bm1.cpp
View File

@ -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 */
}

Some files were not shown because too many files have changed in this diff Show More