summaryrefslogtreecommitdiff
path: root/include/d
diff options
context:
space:
mode:
Diffstat (limited to 'include/d')
-rw-r--r--include/d/actor/d_a_agb.h4
-rw-r--r--include/d/actor/d_a_am.h2
-rw-r--r--include/d/actor/d_a_arrow.h4
-rw-r--r--include/d/actor/d_a_fan.h2
-rw-r--r--include/d/actor/d_a_fganon.h2
-rw-r--r--include/d/actor/d_a_ghostship.h2
-rw-r--r--include/d/actor/d_a_hookshot.h4
-rw-r--r--include/d/actor/d_a_item.h2
-rw-r--r--include/d/actor/d_a_kamome.h2
-rw-r--r--include/d/actor/d_a_kantera.h2
-rw-r--r--include/d/actor/d_a_mo2.h2
-rw-r--r--include/d/actor/d_a_npc_hr.h2
-rw-r--r--include/d/actor/d_a_npc_md.h2
-rw-r--r--include/d/actor/d_a_obj_buoyflag.h2
-rw-r--r--include/d/actor/d_a_obj_ftree.h2
-rw-r--r--include/d/actor/d_a_obj_ikada.h2
-rw-r--r--include/d/actor/d_a_obj_mknjd.h2
-rw-r--r--include/d/actor/d_a_obj_movebox.h2
-rw-r--r--include/d/actor/d_a_oship.h4
-rw-r--r--include/d/actor/d_a_player.h6
-rw-r--r--include/d/actor/d_a_player_main.h10
-rw-r--r--include/d/actor/d_a_pw.h2
-rw-r--r--include/d/actor/d_a_rd.h2
-rw-r--r--include/d/actor/d_a_st.h4
-rw-r--r--include/d/actor/d_a_tag_etc.h2
-rw-r--r--include/d/actor/d_a_tama.h3
-rw-r--r--include/d/actor/d_a_tn.h2
-rw-r--r--include/d/d_attention.h20
-rw-r--r--include/d/d_cc_d.h10
-rw-r--r--include/d/d_demo.h2
-rw-r--r--include/d/d_event.h10
-rw-r--r--include/d/d_npc.h2
-rw-r--r--include/d/d_snap.h2
-rw-r--r--include/d/d_stage.h8
34 files changed, 65 insertions, 66 deletions
diff --git a/include/d/actor/d_a_agb.h b/include/d/actor/d_a_agb.h
index 3e355819..a1d9fbbd 100644
--- a/include/d/actor/d_a_agb.h
+++ b/include/d/actor/d_a_agb.h
@@ -37,7 +37,7 @@ public:
public:
/* 0x00 */ u16 field_0x0;
- /* 0x04 */ 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;
diff --git a/include/d/actor/d_a_am.h b/include/d/actor/d_a_am.h
index 5162fc40..9a37eebd 100644
--- a/include/d/actor/d_a_am.h
+++ b/include/d/actor/d_a_am.h
@@ -28,7 +28,7 @@ public:
/* 0x02DC */ s16 mSpawnRotY;
/* 0x02DE */ u8 m02DE[0x02E0 - 0x02DE];
/* 0x02E0 */ int mCurrBckIdx;
- /* 0x02E4 */ u32 mSwallowedActorPID;
+ /* 0x02E4 */ uint mSwallowedActorPID;
/* 0x02E8 */ f32 mAreaRadius;
/* 0x02EC */ f32 m02EC;
/* 0x02F0 */ f32 mSpawnPosY;
diff --git a/include/d/actor/d_a_arrow.h b/include/d/actor/d_a_arrow.h
index 7b51c7bc..5415392d 100644
--- a/include/d/actor/d_a_arrow.h
+++ b/include/d/actor/d_a_arrow.h
@@ -87,7 +87,7 @@ public:
/* 0x606 */ u8 field_0x606[0x608 - 0x606];
/* 0x608 */ s16 mSparkleTimer;
/* 0x60C */ JPABaseEmitter* mpSparkleEmitter;
- /* 0x610 */ 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;
diff --git a/include/d/actor/d_a_fan.h b/include/d/actor/d_a_fan.h
index c7a4ac14..c71fb689 100644
--- a/include/d/actor/d_a_fan.h
+++ b/include/d/actor/d_a_fan.h
@@ -36,7 +36,7 @@ public:
/* 0x4C8 */ mDoExt_btkAnm mWindBtkAnm1;
/* 0x4C8 */ mDoExt_bckAnm mWindBckAnm;
/* 0x500 */ cXyz mWindScale;
- /* 0x50C */ u32 mWindSePId;
+ /* 0x50C */ uint mWindSePId;
static const char* m_arcname[3];
static const char m_arcname2[8];
diff --git a/include/d/actor/d_a_fganon.h b/include/d/actor/d_a_fganon.h
index 7204e9d0..fb043696 100644
--- a/include/d/actor/d_a_fganon.h
+++ b/include/d/actor/d_a_fganon.h
@@ -46,7 +46,7 @@ public:
/* 0x68F */ u8 m68F;
/* 0x690 */ u8 m690;
/* 0x691 */ u8 m691[0x6B4 - 0x691];
- /* 0x6B4 */ int mCapeID;
+ /* 0x6B4 */ uint mCapeID;
/* 0x6B8 */ dBgS_AcchCir m6B8;
/* 0x6F8 */ dBgS_Acch m6F8;
/* 0x8BC */ dCcD_Stts mStts;
diff --git a/include/d/actor/d_a_ghostship.h b/include/d/actor/d_a_ghostship.h
index e68478bc..8cc1c905 100644
--- a/include/d/actor/d_a_ghostship.h
+++ b/include/d/actor/d_a_ghostship.h
@@ -34,7 +34,7 @@ public:
public:
/* 0x290 */ u32 mMode;
- /* 0x294 */ s32 pathId;
+ /* 0x294 */ s32 mPathNo;
/* 0x298 */ u8 moonPhase;
/* 0x29C */ cXyz mCurPntPos;
/* 0x2A8 */ s8 mPathPntNo;
diff --git a/include/d/actor/d_a_hookshot.h b/include/d/actor/d_a_hookshot.h
index daedf0fb..63f94d5e 100644
--- a/include/d/actor/d_a_hookshot.h
+++ b/include/d/actor/d_a_hookshot.h
@@ -20,7 +20,7 @@ public:
int getChainCnt() { return mChainCnt; }
cXyz getMoveVec() const { return mMoveVec; }
- 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;
};
diff --git a/include/d/actor/d_a_item.h b/include/d/actor/d_a_item.h
index 5c7d9d81..df06b7b4 100644
--- a/include/d/actor/d_a_item.h
+++ b/include/d/actor/d_a_item.h
@@ -118,7 +118,7 @@ public:
/* 0x66B */ u8 mItemStatus;
/* 0x66C */ u8 mOnGroundTimer;
/* 0x66D */ u8 field_0x66D[0x670 - 0x66D];
- /* 0x670 */ u32 mDemoItemBsPcId;
+ /* 0x670 */ uint mDemoItemBsPcId;
/* 0x674 */ dPa_rippleEcallBack mPtclRippleCb;
/* 0x688 */ dPa_followEcallBack mPtclFollowCb;
/* 0x69C */ dPa_smokeEcallBack mPtclSmokeCb;
diff --git a/include/d/actor/d_a_kamome.h b/include/d/actor/d_a_kamome.h
index 778c5fc9..df98c896 100644
--- a/include/d/actor/d_a_kamome.h
+++ b/include/d/actor/d_a_kamome.h
@@ -47,7 +47,7 @@ public:
/* 0x2EC */ s16 mRiseTimer;
/* 0x2EE */ u8 m2EE[0x2F0 - 0x2EE];
/* 0x2F0 */ f32 mScale;
- /* 0x2F4 */ int mEsaProcID;
+ /* 0x2F4 */ uint mEsaProcID;
/* 0x2F8 */ fopAc_ac_c* mpTargetActor;
/* 0x2FC */ s16 m2FC;
/* 0x2FE */ u8 mbUsePathMovement;
diff --git a/include/d/actor/d_a_kantera.h b/include/d/actor/d_a_kantera.h
index 533b3bef..caa617d8 100644
--- a/include/d/actor/d_a_kantera.h
+++ b/include/d/actor/d_a_kantera.h
@@ -30,7 +30,7 @@ public:
/* 0x29B */ u8 mSwitchID;
/* 0x29C */ J3DModel* mpModel;
/* 0x2A0 */ J3DModel* mpModel2;
- /* 0x2A4 */ int mTargetActorID;
+ /* 0x2A4 */ uint mTargetActorID;
/* 0x2A8 */ mDoExt_brkAnm* mpBrkAnm1;
/* 0x2AC */ mDoExt_brkAnm* mpBrkAnm2;
/* 0x2B0 */ int m2B0;
diff --git a/include/d/actor/d_a_mo2.h b/include/d/actor/d_a_mo2.h
index 99b98934..21ddc5b3 100644
--- a/include/d/actor/d_a_mo2.h
+++ b/include/d/actor/d_a_mo2.h
@@ -114,7 +114,7 @@ public:
/* 0x2951 */ u8 m2951;
/* 0x2952 */ s16 m2952;
/* 0x2954 */ int m2954;
- /* 0x2958 */ int mWeaponPcId;
+ /* 0x2958 */ uint mWeaponPcId;
/* 0x295C */ fopAc_ac_c* mpBomb;
/* 0x2960 */ u16 m2960;
/* 0x2962 */ u8 m2962[0x2968 - 0x2962];
diff --git a/include/d/actor/d_a_npc_hr.h b/include/d/actor/d_a_npc_hr.h
index a5868c8d..d9c4393e 100644
--- a/include/d/actor/d_a_npc_hr.h
+++ b/include/d/actor/d_a_npc_hr.h
@@ -41,7 +41,7 @@ public:
/* 0x0E8 */ cXyz mSquallPos[4];
/* 0x118 */ u8 m118;
/* 0x119 */ u8 m119[0x11C - 0x119];
- /* 0x11C */ u32 mActorProcID;
+ /* 0x11C */ uint mActorProcID;
/* 0x120 */ f32 m120;
/* 0x124 */ f32 m124;
/* 0x128 */ f32 m128;
diff --git a/include/d/actor/d_a_npc_md.h b/include/d/actor/d_a_npc_md.h
index d7e96b68..ff2f016a 100644
--- a/include/d/actor/d_a_npc_md.h
+++ b/include/d/actor/d_a_npc_md.h
@@ -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;
diff --git a/include/d/actor/d_a_obj_buoyflag.h b/include/d/actor/d_a_obj_buoyflag.h
index 5c97c800..1f7b77c8 100644
--- a/include/d/actor/d_a_obj_buoyflag.h
+++ b/include/d/actor/d_a_obj_buoyflag.h
@@ -48,7 +48,7 @@ namespace daObjBuoyflag {
class Act_c : public fopAc_ac_c {
public:
- static 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);
}
diff --git a/include/d/actor/d_a_obj_ftree.h b/include/d/actor/d_a_obj_ftree.h
index 68e9d6e8..792c43a5 100644
--- a/include/d/actor/d_a_obj_ftree.h
+++ b/include/d/actor/d_a_obj_ftree.h
@@ -123,7 +123,7 @@ namespace daObjFtree {
/* 0x4CC */ dCcD_Stts m4CC;
/* 0x508 */ dCcD_Cyl m508;
/* 0x638 */ u8 m638[0x64C - 0x638];
- /* 0x64C */ int mSpawnedHeartPieceProcessId;
+ /* 0x64C */ uint mSpawnedHeartPieceProcessId;
/* 0x650 */ s16 m650;
/* 0x652 */ s16 m652;
/* 0x654 */ GXColorS10 m654;
diff --git a/include/d/actor/d_a_obj_ikada.h b/include/d/actor/d_a_obj_ikada.h
index 787283b7..674d087e 100644
--- a/include/d/actor/d_a_obj_ikada.h
+++ b/include/d/actor/d_a_obj_ikada.h
@@ -144,7 +144,7 @@ public:
/* 0x0550 */ Mtx mMtx;
/* 0x0580 */ dBgS_ObjAcch mObjAcch;
/* 0x0744 */ dBgS_AcchCir mAcchCir;
- /* 0x0784 */ u32 mFlagPcId;
+ /* 0x0784 */ uint mFlagPcId;
/* 0x0788 */ cXyz mFlagOffset;
/* 0x0794 */ f32 mFlagScale;
/* 0x0798 */ J3DModel* mpRopeEnd;
diff --git a/include/d/actor/d_a_obj_mknjd.h b/include/d/actor/d_a_obj_mknjd.h
index 455048ba..fd130ba7 100644
--- a/include/d/actor/d_a_obj_mknjd.h
+++ b/include/d/actor/d_a_obj_mknjd.h
@@ -88,7 +88,7 @@ namespace daObjMknjD {
/* 0x04E6 */ u8 mGiveItemNo;
/* 0x04E8 */ cXyz mGoalPos;
/* 0x04F4 */ u32 mMsgNo;
- /* 0x04F8 */ u32 mMsgPID;
+ /* 0x04F8 */ uint mMsgPID;
/* 0x04FC */ msg_class* mMsgPtr;
/* 0x0500 */ s32 m0500;
/* 0x0504 */ bool m0504;
diff --git a/include/d/actor/d_a_obj_movebox.h b/include/d/actor/d_a_obj_movebox.h
index 091a1c32..4e764006 100644
--- a/include/d/actor/d_a_obj_movebox.h
+++ b/include/d/actor/d_a_obj_movebox.h
@@ -267,7 +267,7 @@ namespace daObjMovebox {
/* 0x64E */ bool mbPrmXInitialized;
/* 0x64F */ bool m64F;
/* 0x650 */ EffSmokeCB mSmokeCbs[2];
- /* 0x6B8 */ u32 mChildPID;
+ /* 0x6B8 */ uint mChildPID;
/* 0x6BC */ BOOL mbRollCrash;
static const char* const M_arcname[13];
diff --git a/include/d/actor/d_a_oship.h b/include/d/actor/d_a_oship.h
index 94001769..12097602 100644
--- a/include/d/actor/d_a_oship.h
+++ b/include/d/actor/d_a_oship.h
@@ -103,8 +103,8 @@ public:
/* 0xD08 */ cXyz mSmokePos;
/* 0xD14 */ cXyz mFlagOffset;
/* 0xD20 */ Mtx mFlagMtx;
- /* 0xD50 */ int mFlagPcId;
- /* 0xD54 */ int mBombPcId[1];
+ /* 0xD50 */ uint mFlagPcId;
+ /* 0xD54 */ uint mBombPcId[1];
/* 0xD58 */ u8 mD58[0xD68 - 0xD58];
/* 0xD68 */ f32 mVelocityFwdTarget;
/* 0xD6C */ int mAimCounter;
diff --git a/include/d/actor/d_a_player.h b/include/d/actor/d_a_player.h
index dbb4812e..f3e5d3b5 100644
--- a/include/d/actor/d_a_player.h
+++ b/include/d/actor/d_a_player.h
@@ -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; }
diff --git a/include/d/actor/d_a_player_main.h b/include/d/actor/d_a_player_main.h
index 07b53e05..22caed38 100644
--- a/include/d/actor/d_a_player_main.h
+++ b/include/d/actor/d_a_player_main.h
@@ -63,11 +63,11 @@ public:
void setData(fopAc_ac_c*);
void clearData();
- 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; }
diff --git a/include/d/actor/d_a_pw.h b/include/d/actor/d_a_pw.h
index 0b92c1cf..7788a4dd 100644
--- a/include/d/actor/d_a_pw.h
+++ b/include/d/actor/d_a_pw.h
@@ -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;
diff --git a/include/d/actor/d_a_rd.h b/include/d/actor/d_a_rd.h
index 4118dfcb..69d99856 100644
--- a/include/d/actor/d_a_rd.h
+++ b/include/d/actor/d_a_rd.h
@@ -193,7 +193,7 @@ public:
/* 0x690 */ u32 mShadowId;
/* 0x694 */ mDoExt_invisibleModel mInvisModel;
/* 0x69C */ dNpc_JntCtrl_c mJntCtrl;
- /* 0x6D0 */ u32 mCorpseID;
+ /* 0x6D0 */ uint mCorpseID;
/* 0x6D4 */ int m6D4;
/* 0x6D8 */ s8 mBckIdx;
/* 0x6D9 */ s8 mAnmPrmIdx;
diff --git a/include/d/actor/d_a_st.h b/include/d/actor/d_a_st.h
index beeb921f..e7452a1a 100644
--- a/include/d/actor/d_a_st.h
+++ b/include/d/actor/d_a_st.h
@@ -60,10 +60,10 @@ public:
/* 0x1DA2 */ u8 m1DA2[0x1DA4 - 0x1DA2];
/* 0x1DA4 */ cXyz m1DA4[3];
/* 0x1DC8 */ u8 m1DC8[0x1DCC - 0x1DC8];
- /* 0x1DCC */ 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;
diff --git a/include/d/actor/d_a_tag_etc.h b/include/d/actor/d_a_tag_etc.h
index dd4b001c..6f2941c8 100644
--- a/include/d/actor/d_a_tag_etc.h
+++ b/include/d/actor/d_a_tag_etc.h
@@ -24,7 +24,7 @@ public:
/* 0x291*/ u8 field_0x291;
/* 0x292*/ u8 field_0x292;
/* 0x293*/ u8 field_0x293;
- /* 0x294 */ s32 mMedliPID;
+ /* 0x294 */ uint mMedliPID;
/* 0x298 */ s16 mEventIdx;
/* 0x29A */ short field_0x29A;
};
diff --git a/include/d/actor/d_a_tama.h b/include/d/actor/d_a_tama.h
index 374cf08a..c8fa33f6 100644
--- a/include/d/actor/d_a_tama.h
+++ b/include/d/actor/d_a_tama.h
@@ -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;
diff --git a/include/d/actor/d_a_tn.h b/include/d/actor/d_a_tn.h
index a62d348d..d7ffb36f 100644
--- a/include/d/actor/d_a_tn.h
+++ b/include/d/actor/d_a_tn.h
@@ -54,7 +54,7 @@ public:
/* 0x1390 */ u8 m1390[0x1408 - 0x1390];
/* 0x1408 */ int m1408;
/* 0x140C */ u8 m140C[0x1430 - 0x140C];
- /* 0x1430 */ int mCapeEntityId;
+ /* 0x1430 */ uint mCapeEntityId;
/* 0x1434 */ dPa_cutTurnEcallBack_c m1434[3];
/* 0x1464 */ cXyz m1464[10];
/* 0x14DC */ u8 m14DC[0x150C - 0x14DC];
diff --git a/include/d/d_attention.h b/include/d/d_attention.h
index 9a3a5ed1..8ebc6092 100644
--- a/include/d/d_attention.h
+++ b/include/d/d_attention.h
@@ -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 {
diff --git a/include/d/d_cc_d.h b/include/d/d_cc_d.h
index 5739352d..a2aa3a6a 100644
--- a/include/d/d_cc_d.h
+++ b/include/d/d_cc_d.h
@@ -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];
diff --git a/include/d/d_demo.h b/include/d/d_demo.h
index c72a5ee3..7137cfe3 100644
--- a/include/d/d_demo.h
+++ b/include/d/d_demo.h
@@ -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;
diff --git a/include/d/d_event.h b/include/d/d_event.h
index d4fda115..dd19c4a3 100644
--- a/include/d/d_event.h
+++ b/include/d/d_event.h
@@ -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;
diff --git a/include/d/d_npc.h b/include/d/d_npc.h
index 8a2f800b..df2b2cc3 100644
--- a/include/d/d_npc.h
+++ b/include/d/d_npc.h
@@ -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;
diff --git a/include/d/d_snap.h b/include/d/d_snap.h
index 53a04171..b0034aa6 100644
--- a/include/d/d_snap.h
+++ b/include/d/d_snap.h
@@ -221,7 +221,7 @@ public:
/* 0x00 */ cXyz mCenter;
/* 0x0C */ f32 mRadius;
/* 0x10 */ f32 mHeight;
- /* 0x14 */ u32 mActorPID;
+ /* 0x14 */ uint mActorPID;
/* 0x18 */ u8 mPhoto;
/* 0x19 */ u8 field_0x19;
/* 0x1A */ u8 field_0x1a;
diff --git a/include/d/d_stage.h b/include/d/d_stage.h
index ed9711d9..c80cf7f7 100644
--- a/include/d/d_stage.h
+++ b/include/d/d_stage.h
@@ -869,10 +869,10 @@ public:
static s8 getStayNo() { return mStayNo; }
static s8 getMemoryBlockID(int i_roomNo) { return mStatus[i_roomNo].mMemBlockID; }
static void onStatusDraw(int i_roomNo) { mStatus[i_roomNo].mDraw = true; }
- static void setProcID(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;
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-03 15:29:02 +0000