mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-05-26 15:44:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Standardize process ID type to be uint

Browse Source
This commit is contained in:
LagoLunatic
2024-03-11 19:03:47 -04:00
parent d0e8844b4b
commit 0dd3f6e47c
69 changed files with 178 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/SSystem/SComponent/c_bg_s_chk.h
+3 -3
View File
@@ -17,7 +17,7 @@ class cBgS_Chk {
private:
/* 0x0 */ cBgS_PolyPassChk* mPolyPassChk;
/* 0x4 */ cBgS_GrpPassChk* mGrpPassChk;
/* 0x8 */ u32 mActorPid;
/* 0x8 */ uint mActorPid;
/* 0xC */ u8 unk_0x0C;
/* 0x10 */ // __vtable__
@@ -35,8 +35,8 @@ public:
}
bool ChkSameActorPid(uint) const;
void SetActorPid(u32 pid) { mActorPid = pid; }
u32 GetActorPid() const { return mActorPid; }
void SetActorPid(uint pid) { mActorPid = pid; }
uint 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; }
include/SSystem/SComponent/c_cc_d.h
+1 -1
View File
@@ -353,7 +353,7 @@ class cCcD_Stts {
private:
/* 0x00 */ cXyz m_cc_move;
/* 0x0C */ fopAc_ac_c* mActor;
/* 0x10 */ int mApid;
/* 0x10 */ uint mApid;
/* 0x14 */ u8 mWeight;
/* 0x15 */ u8 field_0x15;
/* 0x16 */ u8 mDmg;
include/d/actor/d_a_agb.h
+2 -2
View File
@@ -37,7 +37,7 @@ public:
public:
/* 0x00 */ u16 field_0x0;
/* 0x04 */ u32 mMsgID;
/* 0x04 */ uint mMsgID;
/* 0x08 */ msg_class* mpMsg;
};
@@ -247,7 +247,7 @@ public:
/* 0x634 */ cXyz field_0x634;
/* 0x640 */ int field_0x640;
/* 0x648 */ u64 mPlayerName;
/* 0x650 */ u32 mTargetID;
/* 0x650 */ uint mTargetID;
/* 0x654 */ int field_0x654;
/* 0x658 */ s16 field_0x658;
/* 0x65A */ u16 mPrevButtons;
include/d/actor/d_a_am.h
+1 -1
View File
@@ -28,7 +28,7 @@ public:
/* 0x02DC */ s16 mSpawnRotY;
/* 0x02DE */ u8 m02DE[0x02E0 - 0x02DE];
/* 0x02E0 */ int mCurrBckIdx;
/* 0x02E4 */ u32 mSwallowedActorPID;
/* 0x02E4 */ uint mSwallowedActorPID;
/* 0x02E8 */ f32 mAreaRadius;
/* 0x02EC */ f32 m02EC;
/* 0x02F0 */ f32 mSpawnPosY;
include/d/actor/d_a_arrow.h
+2 -2
View File
@@ -87,7 +87,7 @@ public:
/* 0x606 */ u8 field_0x606[0x608 - 0x606];
/* 0x608 */ s16 mSparkleTimer;
/* 0x60C */ JPABaseEmitter* mpSparkleEmitter;
/* 0x610 */ u32 mHitActorProcID;
/* 0x610 */ uint 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 */ u32 mLightEffPID;
/* 0x684 */ uint mLightEffPID;
/* 0x688 */ bool mbHasLightEff;
/* 0x68C */ daArrow_c_ProcFunc mCurrProcFunc;
/* 0x698 */ bool field_0x698;
include/d/actor/d_a_fan.h
+1 -1
View File
@@ -36,7 +36,7 @@ public:
/* 0x4C8 */ mDoExt_btkAnm mWindBtkAnm1;
/* 0x4C8 */ mDoExt_bckAnm mWindBckAnm;
/* 0x500 */ cXyz mWindScale;
/* 0x50C */ u32 mWindSePId;
/* 0x50C */ uint mWindSePId;
static const char* m_arcname[3];
static const char m_arcname2[8];
include/d/actor/d_a_fganon.h
+1 -1
View File
@@ -46,7 +46,7 @@ public:
/* 0x68F */ u8 m68F;
/* 0x690 */ u8 m690;
/* 0x691 */ u8 m691[0x6B4 - 0x691];
/* 0x6B4 */ int mCapeID;
/* 0x6B4 */ uint mCapeID;
/* 0x6B8 */ dBgS_AcchCir m6B8;
/* 0x6F8 */ dBgS_Acch m6F8;
/* 0x8BC */ dCcD_Stts mStts;
include/d/actor/d_a_ghostship.h
+1 -1
View File
@@ -34,7 +34,7 @@ public:
public:
/* 0x290 */ u32 mMode;
/* 0x294 */ s32 pathId;
/* 0x294 */ s32 mPathNo;
/* 0x298 */ u8 moonPhase;
/* 0x29C */ cXyz mCurPntPos;
/* 0x2A8 */ s8 mPathPntNo;
include/d/actor/d_a_hookshot.h
+2 -2
View File
@@ -20,7 +20,7 @@ public:
int getChainCnt() { return mChainCnt; }
cXyz getMoveVec() const { return mMoveVec; }
u32 getCarryActorID() const { return mCarryActorID; }
uint 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 */ u32 mCarryActorID;
/* 0x518 */ uint mCarryActorID;
/* 0x51C */ Mtx mMtx;
/* 0x54C */ ProcFunc mCurrProcFunc;
};
include/d/actor/d_a_item.h
+1 -1
View File
@@ -118,7 +118,7 @@ public:
/* 0x66B */ u8 mItemStatus;
/* 0x66C */ u8 mOnGroundTimer;
/* 0x66D */ u8 field_0x66D[0x670 - 0x66D];
/* 0x670 */ u32 mDemoItemBsPcId;
/* 0x670 */ uint mDemoItemBsPcId;
/* 0x674 */ dPa_rippleEcallBack mPtclRippleCb;
/* 0x688 */ dPa_followEcallBack mPtclFollowCb;
/* 0x69C */ dPa_smokeEcallBack mPtclSmokeCb;
include/d/actor/d_a_kamome.h
+1 -1
View File
@@ -47,7 +47,7 @@ public:
/* 0x2EC */ s16 mRiseTimer;
/* 0x2EE */ u8 m2EE[0x2F0 - 0x2EE];
/* 0x2F0 */ f32 mScale;
/* 0x2F4 */ int mEsaProcID;
/* 0x2F4 */ uint mEsaProcID;
/* 0x2F8 */ fopAc_ac_c* mpTargetActor;
/* 0x2FC */ s16 m2FC;
/* 0x2FE */ u8 mbUsePathMovement;
include/d/actor/d_a_kantera.h
+1 -1
View File
@@ -30,7 +30,7 @@ public:
/* 0x29B */ u8 mSwitchID;
/* 0x29C */ J3DModel* mpModel;
/* 0x2A0 */ J3DModel* mpModel2;
/* 0x2A4 */ int mTargetActorID;
/* 0x2A4 */ uint mTargetActorID;
/* 0x2A8 */ mDoExt_brkAnm* mpBrkAnm1;
/* 0x2AC */ mDoExt_brkAnm* mpBrkAnm2;
/* 0x2B0 */ int m2B0;
include/d/actor/d_a_mo2.h
+1 -1
View File
@@ -114,7 +114,7 @@ public:
/* 0x2951 */ u8 m2951;
/* 0x2952 */ s16 m2952;
/* 0x2954 */ int m2954;
/* 0x2958 */ int mWeaponPcId;
/* 0x2958 */ uint mWeaponPcId;
/* 0x295C */ fopAc_ac_c* mpBomb;
/* 0x2960 */ u16 m2960;
/* 0x2962 */ u8 m2962[0x2968 - 0x2962];
include/d/actor/d_a_npc_hr.h
+1 -1
View File
@@ -41,7 +41,7 @@ public:
/* 0x0E8 */ cXyz mSquallPos[4];
/* 0x118 */ u8 m118;
/* 0x119 */ u8 m119[0x11C - 0x119];
/* 0x11C */ u32 mActorProcID;
/* 0x11C */ uint mActorProcID;
/* 0x120 */ f32 m120;
/* 0x124 */ f32 m124;
/* 0x128 */ f32 m128;
include/d/actor/d_a_npc_md.h
+1 -1
View File
@@ -514,7 +514,7 @@ public:
/* 0x30D0 */ f32 m30D0;
/* 0x30D4 */ ActionFunc mCurrPlayerActionFunc;
/* 0x30E0 */ ActionFunc mCurrNpcActionFunc;
/* 0x30EC */ u32 mMsgId;
/* 0x30EC */ u32 mMsgNo;
/* 0x30F0 */ u32 m30F0;
/* 0x30F4 */ u8 m30F4[0x30F8 - 0x30F4];
/* 0x30F8 */ f32 m30F8;
include/d/actor/d_a_obj_buoyflag.h
+1 -1
View File
@@ -48,7 +48,7 @@ namespace daObjBuoyflag {
class Act_c : public fopAc_ac_c {
public:
static s32 make_norm(uint parentPId, cXyz* pos, int roomNo, csXyz* angle) {
static uint make_norm(uint 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);
}
include/d/actor/d_a_obj_ftree.h
+1 -1
View File
@@ -123,7 +123,7 @@ namespace daObjFtree {
/* 0x4CC */ dCcD_Stts m4CC;
/* 0x508 */ dCcD_Cyl m508;
/* 0x638 */ u8 m638[0x64C - 0x638];
/* 0x64C */ int mSpawnedHeartPieceProcessId;
/* 0x64C */ uint mSpawnedHeartPieceProcessId;
/* 0x650 */ s16 m650;
/* 0x652 */ s16 m652;
/* 0x654 */ GXColorS10 m654;
include/d/actor/d_a_obj_ikada.h
+1 -1
View File
@@ -144,7 +144,7 @@ public:
/* 0x0550 */ Mtx mMtx;
/* 0x0580 */ dBgS_ObjAcch mObjAcch;
/* 0x0744 */ dBgS_AcchCir mAcchCir;
/* 0x0784 */ u32 mFlagPcId;
/* 0x0784 */ uint mFlagPcId;
/* 0x0788 */ cXyz mFlagOffset;
/* 0x0794 */ f32 mFlagScale;
/* 0x0798 */ J3DModel* mpRopeEnd;
include/d/actor/d_a_obj_mknjd.h
+1 -1
View File
@@ -88,7 +88,7 @@ namespace daObjMknjD {
/* 0x04E6 */ u8 mGiveItemNo;
/* 0x04E8 */ cXyz mGoalPos;
/* 0x04F4 */ u32 mMsgNo;
/* 0x04F8 */ u32 mMsgPID;
/* 0x04F8 */ uint mMsgPID;
/* 0x04FC */ msg_class* mMsgPtr;
/* 0x0500 */ s32 m0500;
/* 0x0504 */ bool m0504;
include/d/actor/d_a_obj_movebox.h
+1 -1
View File
@@ -267,7 +267,7 @@ namespace daObjMovebox {
/* 0x64E */ bool mbPrmXInitialized;
/* 0x64F */ bool m64F;
/* 0x650 */ EffSmokeCB mSmokeCbs[2];
/* 0x6B8 */ u32 mChildPID;
/* 0x6B8 */ uint mChildPID;
/* 0x6BC */ BOOL mbRollCrash;
static const char* const M_arcname[13];
include/d/actor/d_a_oship.h
+2 -2
View File
@@ -103,8 +103,8 @@ public:
/* 0xD08 */ cXyz mSmokePos;
/* 0xD14 */ cXyz mFlagOffset;
/* 0xD20 */ Mtx mFlagMtx;
/* 0xD50 */ int mFlagPcId;
/* 0xD54 */ int mBombPcId[1];
/* 0xD50 */ uint mFlagPcId;
/* 0xD54 */ uint mBombPcId[1];
/* 0xD58 */ u8 mD58[0xD68 - 0xD58];
/* 0xD68 */ f32 mVelocityFwdTarget;
/* 0xD6C */ int mAimCounter;
include/d/actor/d_a_player.h
+3 -3
View File
@@ -488,9 +488,9 @@ public:
virtual BOOL checkComboCutTurn() const { return false; }
virtual f32 getBaseAnimeFrameRate() = 0;
virtual f32 getBaseAnimeFrame() = 0;
virtual u32 getItemID() const { return fpcM_ERROR_PROCESS_ID_e; }
virtual u32 getThrowBoomerangID() const { return fpcM_ERROR_PROCESS_ID_e; }
virtual u32 getGrabActorID() const;// { return fpcM_ERROR_PROCESS_ID_e; }
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 BOOL checkGrabBarrel() { return FALSE; }
virtual u32 checkPlayerNoDraw() { return FALSE; }
virtual BOOL checkRopeTag() { return FALSE; }
include/d/actor/d_a_player_main.h
+5 -5
View File
@@ -63,11 +63,11 @@ public:
void setData(fopAc_ac_c*);
void clearData();
u32 getID() const { return mID; }
uint getID() const { return mID; }
fopAc_ac_c* getActor() { return mActor; }
private:
/* 0x0 */ u32 mID;
/* 0x0 */ uint mID;
/* 0x4 */ fopAc_ac_c* mActor;
}; // Size: 0x8
@@ -1782,9 +1782,9 @@ public:
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 u32 getItemID() const { return mActorKeepEquip.getID(); }
virtual u32 getThrowBoomerangID() const { return mActorKeepThrow.getID(); }
virtual u32 getGrabActorID() const { return mActorKeepGrab.getID(); }
virtual uint getItemID() const { return mActorKeepEquip.getID(); }
virtual uint getThrowBoomerangID() const { return mActorKeepThrow.getID(); }
virtual uint 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; }
include/d/actor/d_a_pw.h
+1 -1
View File
@@ -29,7 +29,7 @@ public:
/* 0x366 */ s16 m366;
/* 0x368 */ s16 m368;
/* 0x36A */ u8 m36A[0x36C - 0x36A];
/* 0x36C */ int mJalhallaParentId;
/* 0x36C */ uint mJalhallaParentId;
/* 0x370 */ u8 m370[0x374 - 0x370];
/* 0x374 */ u32 m374;
/* 0x378 */ s16 m378;
include/d/actor/d_a_rd.h
+1 -1
View File
@@ -193,7 +193,7 @@ public:
/* 0x690 */ u32 mShadowId;
/* 0x694 */ mDoExt_invisibleModel mInvisModel;
/* 0x69C */ dNpc_JntCtrl_c mJntCtrl;
/* 0x6D0 */ u32 mCorpseID;
/* 0x6D0 */ uint mCorpseID;
/* 0x6D4 */ int m6D4;
/* 0x6D8 */ s8 mBckIdx;
/* 0x6D9 */ s8 mAnmPrmIdx;
include/d/actor/d_a_st.h
+2 -2
View File
@@ -60,10 +60,10 @@ public:
/* 0x1DA2 */ u8 m1DA2[0x1DA4 - 0x1DA2];
/* 0x1DA4 */ cXyz m1DA4[3];
/* 0x1DC8 */ u8 m1DC8[0x1DCC - 0x1DC8];
/* 0x1DCC */ int mHeldWeaponEntityId;
/* 0x1DCC */ uint mHeldWeaponEntityId;
/* 0x1DD0 */ u8 m1DD0;
/* 0x1DD1 */ u8 m1DD1[0x1DD4 - 0x1DD1];
/* 0x1DD4 */ int mUpperBodyEntityId;
/* 0x1DD4 */ uint mUpperBodyEntityId;
/* 0x1DD8 */ u8 m1DD8;
/* 0x1DD9 */ u8 m1DD9[0x1DDA - 0x1DD9];
/* 0x1DDA */ s16 m1DDA;
include/d/actor/d_a_tag_etc.h
+1 -1
View File
@@ -24,7 +24,7 @@ public:
/* 0x291*/ u8 field_0x291;
/* 0x292*/ u8 field_0x292;
/* 0x293*/ u8 field_0x293;
/* 0x294 */ s32 mMedliPID;
/* 0x294 */ uint mMedliPID;
/* 0x298 */ s16 mEventIdx;
/* 0x29A */ short field_0x29A;
};
include/d/actor/d_a_tama.h
+1 -2
View File
@@ -18,8 +18,7 @@ public:
s32 _create();
public:
/* Place member variables here */
/* 0x290 */ u32 mPartnerID;
/* 0x290 */ uint mPartnerID;
/* 0x294 */ dBgS_ObjAcch mAcch;
/* 0x458 */ dBgS_AcchCir mAcchCir;
/* 0x498 */ dCcD_Stts mStts;
include/d/actor/d_a_tn.h
+1 -1
View File
@@ -54,7 +54,7 @@ public:
/* 0x1390 */ u8 m1390[0x1408 - 0x1390];
/* 0x1408 */ int m1408;
/* 0x140C */ u8 m140C[0x1430 - 0x140C];
/* 0x1430 */ int mCapeEntityId;
/* 0x1430 */ uint mCapeEntityId;
/* 0x1434 */ dPa_cutTurnEcallBack_c m1434[3];
/* 0x1464 */ cXyz m1464[10];
/* 0x14DC */ u8 m14DC[0x150C - 0x14DC];
include/d/d_attention.h
+10 -10
View File
@@ -22,7 +22,7 @@ public:
class dAttHint_c {
public:
dAttHint_c() {}
u32 getPId(void*);
uint getPId(void*);
fopAc_ac_c* convPId(uint);
int request(fopAc_ac_c*, int);
void init();
@@ -31,9 +31,9 @@ public:
fopAc_ac_c* getZHintTarget() { return convPId(field_0x8); }
private:
/* 0x0 */ u32 mHintActorID;
/* 0x0 */ uint mHintActorID;
/* 0x4 */ int mPriority;
/* 0x8 */ u32 field_0x8;
/* 0x8 */ uint field_0x8;
};
class dAttCatch_c {
@@ -48,14 +48,14 @@ public:
u8 getChangeItem() { return mChangeItem; }
private:
/* 0x00 */ u32 field_0x0;
/* 0x00 */ uint 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 */ u32 mCatghTargetID;
/* 0x10 */ uint mCatghTargetID;
/* 0x14 */ u8 mChangeItem;
}; // Size: 0x18
@@ -87,13 +87,13 @@ public:
void request(fopAc_ac_c*, f32, f32, f32, s16, int);
void requestF(fopAc_ac_c*, s16, int);
u32 getLookTarget() { return mLookTargetID; }
uint getLookTarget() { return mLookTargetID; }
private:
/* 0x0 */ u32 field_0x0;
/* 0x0 */ uint field_0x0;
/* 0x4 */ u32 field_0x4;
/* 0x8 */ f32 field_0x8;
/* 0xC */ u32 mLookTargetID;
/* 0xC */ uint mLookTargetID;
}; // Size: 0x10
class dAttList_c {
@@ -101,12 +101,12 @@ public:
fopAc_ac_c* getActor();
void setActor(fopAc_ac_c*);
u32 getPid() { return mActorID; }
uint getPid() { return mActorID; }
/* 0x0 */ f32 mWeight;
/* 0x4 */ f32 mDistance;
/* 0x8 */ u32 mType;
/* 0xC */ u32 mActorID;
/* 0xC */ uint mActorID;
}; // Size: 0x10
class dAttDraw_CallBack_c : public mDoExt_McaMorfCallBack1_c {
include/d/d_cc_d.h
+5 -5
View File
@@ -140,10 +140,10 @@ public:
/* 0x05 */ u8 mTgSpl;
/* 0x06 */ u8 mRoomId;
/* 0x08 */ u16 mActorPerfTblId;
/* 0x0C */ int mAtApid;
/* 0x10 */ int mAtOldApid;
/* 0x14 */ int mTgApid;
/* 0x18 */ int mTgOldApid;
/* 0x0C */ uint mAtApid;
/* 0x10 */ uint mAtOldApid;
/* 0x14 */ uint mTgApid;
/* 0x18 */ uint mTgOldApid;
/* 0x1C */ int field_0x1C;
}; // Size = 0x20
@@ -179,7 +179,7 @@ public:
/* 0x00 */ u32 mSPrm;
/* 0x04 */ u32 mRPrm;
/* 0x08 */ dCcD_HitCallback mHitCallback;
/* 0x0C */ u32 mApid;
/* 0x0C */ uint mApid;
/* 0x10 */ fopAc_ac_c* mAc;
/* 0x14 */ s8 mEffCounter;
/* 0x15 */ u8 field_0x15[3];
include/d/d_demo.h
+1 -1
View File
@@ -111,7 +111,7 @@ public:
/* 0x4C */ u32 field_0x4c;
/* 0x50 */ const void* field_0x50;
/* 0x54 */ u32 field_0x54;
/* 0x58 */ s32 mActorPcId;
/* 0x58 */ uint mActorPcId;
/* 0x5C */ s32 mBckId;
/* 0x60 */ s32 mBtpId;
/* 0x64 */ s32 mBtkId;
include/d/d_event.h
+5 -5
View File
@@ -90,7 +90,7 @@ public:
void remove();
dStage_Event_dt_c* getStageEventDt();
dStage_Event_dt_c* nextStageEventDt(void*);
u32 getPId(void*);
uint getPId(void*);
fopAc_ac_c* convPId(uint);
u8 getTactFreeMStick(int);
u8 getTactFreeCStick(int);
@@ -135,10 +135,10 @@ public:
/* 0xC1 */ s8 mFirstOrderIdx;
/* 0xC2 */ u8 mMode;
/* 0xC3 */ u8 mbEndProc;
/* 0xC4 */ u32 mPt1;
/* 0xC8 */ u32 mPt2;
/* 0xCC */ u32 mPtTalk;
/* 0xD0 */ u32 mPtItem;
/* 0xC4 */ uint mPt1;
/* 0xC8 */ uint mPt2;
/* 0xCC */ uint mPtTalk;
/* 0xD0 */ uint mPtItem;
/* 0xD4 */ u8 mGetItemNo;
/* 0xD5 */ u8 field_0xD5[0xD6 - 0xD5];
/* 0xD6 */ s16 mHindFlag;
include/d/d_npc.h
+1 -1
View File
@@ -252,7 +252,7 @@ public:
/* 0x574 */ dCcD_Cyl mCyl;
/* 0x6A4 */ u32 mCurrMsgNo;
/* 0x6A8 */ u32 mEndMsgNo;
/* 0x6AC */ u32 mCurrMsgBsPcId;
/* 0x6AC */ uint mCurrMsgBsPcId;
/* 0x6B0 */ msg_class* mpCurrMsg;
/* 0x6B4 */ u8 field_0x6b4[6];
/* 0x6BA */ u16 field_0x6ba;
include/d/d_snap.h
+1 -1
View File
@@ -221,7 +221,7 @@ public:
/* 0x00 */ cXyz mCenter;
/* 0x0C */ f32 mRadius;
/* 0x10 */ f32 mHeight;
/* 0x14 */ u32 mActorPID;
/* 0x14 */ uint mActorPID;
/* 0x18 */ u8 mPhoto;
/* 0x19 */ u8 field_0x19;
/* 0x1A */ u8 field_0x1a;
include/d/d_stage.h
+4 -4
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(u32 id) { mProcID = id; }
static u32 getProcID() { return mProcID; }
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 int getStatusProcID(int i_roomNo) { return mStatus[i_roomNo].mProcID; }
static uint 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 u32 mProcID;
static uint mProcID;
static s8 mStayNo;
static s8 mOldStayNo;
static s8 m_time_pass;
include/f_op/f_op_actor.h
+1 -1
View File
@@ -268,7 +268,7 @@ public:
/* 0x1C2 */ u8 gbaName;
/* 0x1C4 */ u32 actor_status;
/* 0x1C8 */ u32 actor_condition;
/* 0x1CC */ u32 parentActorID;
/* 0x1CC */ uint parentActorID;
/* 0x1D0 */ actor_place home;
/* 0x1E4 */ actor_place old;
/* 0x1F8 */ actor_place current;
include/f_op/f_op_actor_mng.h
+39 -35
View File
@@ -39,7 +39,7 @@ struct fopAcM_prm_class {
/* 0x16 */ u16 mSetId;
/* 0x18 */ fopAcM_prmScale_class mScale;
/* 0x1B */ u8 mGbaName;
/* 0x1C */ s32 mParentPcId; // parent process ID
/* 0x1C */ uint mParentPcId; // parent process ID
/* 0x20 */ s8 mSubtype;
/* 0x21 */ s8 mRoomNo;
};
@@ -81,7 +81,7 @@ inline s8 fopAcM_GetRoomNo(fopAc_ac_c* pActor) {
return pActor->current.roomNo;
}
inline u32 fopAcM_GetID(void* pActor) {
inline uint fopAcM_GetID(void* pActor) {
return fpcM_GetID(pActor);
}
@@ -419,13 +419,13 @@ 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_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(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);
s32 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);
uint 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);
inline s32 fopAcM_create(s16 i_procName, createFunc i_createFunc, void*);
@@ -437,15 +437,19 @@ 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);
s32 fopAcM_createChild(s16 procName, uint 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(s16 procName, uint parentPId, u32 parameters, cXyz* p_pos,
int roomNo, csXyz* p_angle, cXyz* p_scale = NULL, s8 subType = -1,
createFunc p_createFunc = NULL);
s32 fopAcM_createChild(char* pProcNameString, uint parentPcId, u32 parameter, cXyz* pPos, int roomNo, csXyz* pAngle, cXyz* pScale, createFunc createFunc);
uint fopAcM_createChild(char* pProcNameString, uint parentPcId, u32 parameter, cXyz* pPos,
int roomNo, csXyz* pAngle, cXyz* pScale, createFunc createFunc);
s32 fopAcM_createChildFromOffset(s16 procName, uint parentProcID, u32 actorParams,
cXyz* p_pos, int roomNo, csXyz* p_angle,
cXyz* p_scale, s8 subType, createFunc p_createFunc);
uint fopAcM_createChildFromOffset(s16 procName, uint 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,
cXyz* pPosOffs, int roomNo, csXyz* pAngleOffs, cXyz* pScale,
createFunc createFunc);
void fopAcM_DeleteHeap(fopAc_ac_c* p_actor);
@@ -509,37 +513,37 @@ fopAc_ac_c* fopAcM_getTalkEventPartner(fopAc_ac_c*);
fopAc_ac_c* fopAcM_getItemEventPartner(fopAc_ac_c*);
fopAc_ac_c* fopAcM_getEventPartner(fopAc_ac_c*);
s32 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_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);
s32 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_createItemForTrBoxDemo(cXyz* p_pos, int i_itemNo, int i_itemBitNo = -1,
int i_roomNo = -1, csXyz* p_angle = NULL, cXyz* p_scale = NULL);
s32 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_createItemFromTable(cXyz* p_pos, int i_tableNo, int i_itemBitNo, int i_roomNo, int,
csXyz* p_angle, int, cXyz* p_scale = NULL);
s32 fopAcM_createRaceItemFromTable(cXyz* pos, int i_itemNo, int i_itemBitNo, int i_roomNo,
csXyz* angle, cXyz* scale, int param_7);
uint fopAcM_createRaceItemFromTable(cXyz* pos, int i_itemNo, int i_itemBitNo, int i_roomNo,
csXyz* angle, cXyz* scale, int param_7);
s32 fopAcM_createShopItem(cXyz* p_pos, int i_itemNo, csXyz* p_angle, int roomNo, cXyz* scale = NULL,
createFunc createFunc = NULL);
uint fopAcM_createShopItem(cXyz* p_pos, int i_itemNo, csXyz* p_angle, int roomNo, cXyz* scale = NULL,
createFunc createFunc = NULL);
s32 fopAcM_createRaceItem(cXyz* p_pos, int i_itemNo, int i_itemBitNo, csXyz* p_angle, int roomNo,
cXyz* scale, int param_7);
uint fopAcM_createRaceItem(cXyz* p_pos, int i_itemNo, int i_itemBitNo, csXyz* p_angle, int roomNo,
cXyz* scale, int param_7);
s32 fopAcM_createIball(cXyz* p_pos, int itemTableIdx, int roomNo, csXyz* p_angle, int itemStealNum);
uint fopAcM_createIball(cXyz* p_pos, int itemTableIdx, int roomNo, csXyz* p_angle, int itemStealNum);
s32 fopAcM_createDemoItem(cXyz* p_pos, int itemNo, int itemBitNo, csXyz* p_angle,
int roomNo, cXyz* scale, u8 argFlag);
uint fopAcM_createDemoItem(cXyz* p_pos, int itemNo, int itemBitNo, csXyz* p_angle,
int roomNo, cXyz* scale, u8 argFlag);
s32 fopAcM_createItemForBoss(cXyz* p_pos, int param_2, int roomNo, csXyz* p_angle,
cXyz* p_scale = NULL, int param_8 = 0);
uint 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);
s32 fopAcM_createItem(cXyz* p_pos, int itemNo, int param_3, int roomNo, int type, csXyz* p_angle,
int action, cXyz* p_scale = NULL);
uint 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,
csXyz* p_angle, int, cXyz* p_scale = NULL);
@@ -554,7 +558,7 @@ BOOL stealItem_CB(void* actor);
fopAc_ac_c* fopAcM_myRoomSearchEnemy(s8 roomNo);
s32 fopAcM_createDisappear(fopAc_ac_c* i_actor, cXyz* p_pos, u8 i_scale, u8 i_health = 0, u8 i_itemBitNo = -1);
uint 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);
include/f_op/f_op_kankyo_mng.h
+3 -3
View File
@@ -15,13 +15,13 @@ struct fopKyM_prm_class {
typedef int (*fopKyM_CreateFunc)(void*);
void fopKyM_Delete(void* param_1);
int fopKyM_Create(s16 param_1, fopKyM_CreateFunc param_2 = NULL, void* param_3 = NULL);
int fopKyM_create(s16 i_procName, int i_param, cXyz* i_pos = NULL, cXyz* i_scale = NULL,
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,
fopKyM_CreateFunc i_createFunc = NULL);
kankyo_class* fopKyM_SearchByID(uint id);
base_process_class* fopKyM_fastCreate(s16 param_0, int param_1, cXyz* param_2, cXyz* param_3,
fopKyM_CreateFunc);
int fopKyM_createWpillar(cXyz const* i_pos, f32 scaleXZ, f32 scaleY, int i_param);
uint 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);
include/f_op/f_op_msg_mng.h
+3 -3
View File
@@ -67,9 +67,9 @@ void fopMsgM_setMessageID(uint);
void fopMsgM_destroyExpHeap(JKRExpHeap*);
f32 fopMsgM_valueIncrease(int param_0, int param_1, u8 param_2);
s32 fopMsgM_setStageLayer(void*);
int fopMsgM_messageSet(u32 i_msgNo, fopAc_ac_c* i_actorP);
int fopMsgM_messageSet(u32 param_0, cXyz*);
int fopMsgM_messageSet(u32 param_0);
uint fopMsgM_messageSet(u32 i_msgNo, fopAc_ac_c* i_actorP);
uint fopMsgM_messageSet(u32 param_0, cXyz*);
uint fopMsgM_messageSet(u32 param_0);
int fopMsgM_messageSetDemo(u32 param_0);
msg_class* fopMsgM_SearchByID(uint param_0);
char* fopMsgM_messageGet(char* msg, u32 string_id);
include/f_op/f_op_overlap_req.h
+1 -1
View File
@@ -18,7 +18,7 @@ public:
/* 0x10 */ s16 mProcName;
/* 0x12 */ u8 field_0x12;
/* 0x13 */ u8 field_0x13;
/* 0x14 */ int mPId;
/* 0x14 */ uint mPId;
/* 0x18 */ request_of_phase_process_class mPhs;
/* 0x20 */ overlap_task_class * mpTask;
/* 0x24 */ layer_class* pCurrentLayer;
include/f_op/f_op_scene_mng.h
+1 -1
View File
@@ -24,7 +24,7 @@ inline layer_class * fpcM_Layer(const void* pProc) {
return &((process_node_class*)pProc)->mLayer;
}
inline u32 fopScnM_GetID(void* proc) {
inline uint fopScnM_GetID(void* proc) {
return fpcM_GetID(proc);
}
include/f_pc/f_pc_base.h
+1 -1
View File
@@ -14,7 +14,7 @@ typedef struct profile_method_class profile_method_class;
typedef struct base_process_class {
/* 0x00 */ u32 mBsType;
/* 0x04 */ u32 mBsPcId;
/* 0x04 */ uint mBsPcId;
/* 0x08 */ s16 mProcName;
/* 0x0A */ s8 mUnk0;
/* 0x0B */ u8 mPauseFlag;
include/f_pc/f_pc_create_req.h
+1 -1
View File
@@ -23,7 +23,7 @@ typedef struct create_request {
process_method_tag_class mMtdTg;
create_request_method_class* mpCtRqMtd;
void* mpUnk1;
s32 mBsPcId;
uint mBsPcId;
struct base_process_class* mpRes;
layer_class* mpLayer;
} create_request; // Size: 0x48
include/f_pc/f_pc_manager.h
+2 -2
View File
@@ -15,7 +15,7 @@ typedef int (*FastCreateReqFunc)(void*);
typedef void (*fpcM_ManagementFunc)(void);
typedef int (*fpcM_DrawIteraterFunc)(void*, void*);
inline u32 fpcM_GetID(void* pProc) {
inline uint 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 int fpcM_Create(s16 procName, FastCreateReqFunc createFunc, void* process) {
inline uint fpcM_Create(s16 procName, FastCreateReqFunc createFunc, void* process) {
return fpcSCtRq_Request(fpcLy_CurrentLayer(), procName, (stdCreateFunc)createFunc, NULL,
process);
}
include/f_pc/f_pc_node_req.h
+2 -2
View File
@@ -17,7 +17,7 @@ typedef struct node_create_request_method_class {
// needed to match struct copy
typedef struct unk_process_node_class {
process_node_class* mpNodeProc;
u32 mProcId;
uint mProcId;
} unk_process_node_class;
typedef struct node_create_request {
@@ -30,7 +30,7 @@ typedef struct node_create_request {
s32 mRequestId;
unk_process_node_class mNodeProc;
layer_class* mpLayerClass;
u32 mCreatingID;
uint mCreatingID;
s16 mProcName;
void* mpUserData;
s16 unk_0x60;
include/f_pc/f_pc_stdcreate_req.h
+1 -1
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*);
s32 fpcSCtRq_Request(layer_class* param_1, s16 param_2, stdCreateFunc param_3, void* param_4, void* param_5);
uint fpcSCtRq_Request(layer_class* param_1, s16 param_2, stdCreateFunc param_3, void* param_4, void* param_5);
#endif