Add uint typedef

33 files changed, 53 insertions, 53 deletions

diff --git a/include/d/actor/d_a_agb.h b/include/d/actor/d_a_agb.h
index 87d46ebb..3e355819 100644
--- a/include/d/actor/d_a_agb.h
+++ b/include/d/actor/d_a_agb.h
@@ -110,8 +110,8 @@ public:
     BOOL isHold() { return mHold; }
     BOOL getFollowTarget() { return mFollowTarget; }
     void setFollowTarget(bool follow) { mFollowTarget = follow; }
-    unsigned int getTargetID() { return mTargetID; }
-    void setTargetID(unsigned int pid) { mTargetID = pid; }
+    uint getTargetID() { return mTargetID; }
+    void setTargetID(uint pid) { mTargetID = pid; }
 
     struct daAgb_ItemBuy {
         union {
diff --git a/include/d/actor/d_a_auction.h b/include/d/actor/d_a_auction.h
index 0efe6136..5b7bfe69 100644
--- a/include/d/actor/d_a_auction.h
+++ b/include/d/actor/d_a_auction.h
@@ -27,7 +27,7 @@ public:
     void setAucMdlNo(unsigned char, unsigned char) {}
     void setItemNo(unsigned char) {}
     void setKind(unsigned char, unsigned char) {}
-    void setNpcID(int, unsigned int) {}
+    void setNpcID(int, uint) {}
     void setStart(unsigned char) {}
 
     s32 _create();
diff --git a/include/d/actor/d_a_mozo.h b/include/d/actor/d_a_mozo.h
index 1600b567..839ec480 100644
--- a/include/d/actor/d_a_mozo.h
+++ b/include/d/actor/d_a_mozo.h
@@ -21,7 +21,7 @@ public:
     BOOL CreateHeap();
     s32 CreateInit();
     void event_move();
-    fopAc_ac_c* getBeamActor(unsigned int);
+    fopAc_ac_c* getBeamActor(uint);
     void search_beam_proc_init();
     void search_beam_proc();
     void search_fire_proc_init();
diff --git a/include/d/actor/d_a_npc_ba1.h b/include/d/actor/d_a_npc_ba1.h
index c05f6731..cc5ef79d 100644
--- a/include/d/actor/d_a_npc_ba1.h
+++ b/include/d/actor/d_a_npc_ba1.h
@@ -52,7 +52,7 @@ public:
     void getMsg();
     void chkAttention();
     void setAttention(bool);
-    void searchByID(unsigned int);
+    void searchByID(uint);
     void partner_srch_sub(void* (*)(void*, void*));
     void partner_srch();
     void check_useFairyArea();
diff --git a/include/d/actor/d_a_npc_bj1.h b/include/d/actor/d_a_npc_bj1.h
index d1a61ec1..8fa97906 100644
--- a/include/d/actor/d_a_npc_bj1.h
+++ b/include/d/actor/d_a_npc_bj1.h
@@ -55,7 +55,7 @@ public:
     void getMsg();
     void chkAttention();
     void setAttention(bool);
-    void searchByID(unsigned int);
+    void searchByID(uint);
     void partner_srch_sub(void* (*)(void*, void*));
     void partner_srch();
     void setCollision_SP_();
diff --git a/include/d/actor/d_a_npc_bm1.h b/include/d/actor/d_a_npc_bm1.h
index b4dd74ad..4e1f8839 100644
--- a/include/d/actor/d_a_npc_bm1.h
+++ b/include/d/actor/d_a_npc_bm1.h
@@ -84,7 +84,7 @@ public:
     void getMsg();
     void chkAttention();
     void setAttention(bool);
-    void searchByID(unsigned int);
+    void searchByID(uint);
     void partner_srch_sub(void* (*)(void*, void*));
     void partner_srch();
     void bm_movPass(bool);
diff --git a/include/d/actor/d_a_npc_de1.h b/include/d/actor/d_a_npc_de1.h
index d831ca95..bd30b52c 100644
--- a/include/d/actor/d_a_npc_de1.h
+++ b/include/d/actor/d_a_npc_de1.h
@@ -28,7 +28,7 @@ public:
     void checkOrder();
     void chkAttention();
     void setAttention();
-    void searchByID(unsigned int);
+    void searchByID(uint);
     void setDemoStartCenter();
     void partner_srch();
     void ccCreate();
diff --git a/include/d/actor/d_a_npc_gk1.h b/include/d/actor/d_a_npc_gk1.h
index d4d8fc86..a7c511be 100644
--- a/include/d/actor/d_a_npc_gk1.h
+++ b/include/d/actor/d_a_npc_gk1.h
@@ -38,7 +38,7 @@ public:
     void checkOrder();
     void chk_talk();
     void chk_parts_notMov();
-    void searchByID(unsigned int, int*);
+    void searchByID(uint, int*);
     void lookBack();
     void chkAttention();
     void setAttention(bool);
diff --git a/include/d/actor/d_a_npc_gp1.h b/include/d/actor/d_a_npc_gp1.h
index f2697aa1..b92cb3d6 100644
--- a/include/d/actor/d_a_npc_gp1.h
+++ b/include/d/actor/d_a_npc_gp1.h
@@ -41,7 +41,7 @@ public:
     void getMsg();
     void chkAttention();
     void setAttention(bool);
-    void searchByID(unsigned int);
+    void searchByID(uint);
     void partner_srch_sub(void* (*)(void*, void*));
     void partner_srch();
     void ctrl_WAITanm();
diff --git a/include/d/actor/d_a_npc_hi1.h b/include/d/actor/d_a_npc_hi1.h
index 21d92774..ed5a772a 100644
--- a/include/d/actor/d_a_npc_hi1.h
+++ b/include/d/actor/d_a_npc_hi1.h
@@ -41,7 +41,7 @@ public:
     void checkOrder();
     void chk_talk();
     void chk_parts_notMov();
-    void searchByID(unsigned int, int*);
+    void searchByID(uint, int*);
     void lookBack();
     void chkAttention();
     void setAttention(bool);
diff --git a/include/d/actor/d_a_npc_kf1.h b/include/d/actor/d_a_npc_kf1.h
index a59c1f98..b665faf3 100644
--- a/include/d/actor/d_a_npc_kf1.h
+++ b/include/d/actor/d_a_npc_kf1.h
@@ -37,7 +37,7 @@ public:
     void eventOrder();
     void checkOrder();
     void chk_talk();
-    void searchByID(unsigned int, int*);
+    void searchByID(uint, int*);
     void srch_Tsubo();
     void create_rupee(cXyz, int);
     void ready_kutaniCamera(int, int);
diff --git a/include/d/actor/d_a_npc_kk1.h b/include/d/actor/d_a_npc_kk1.h
index 1d5b466a..ee7dcf25 100644
--- a/include/d/actor/d_a_npc_kk1.h
+++ b/include/d/actor/d_a_npc_kk1.h
@@ -41,7 +41,7 @@ public:
     void checkOrder();
     void chk_talk();
     void chk_parts_notMov();
-    void searchByID(unsigned int, int*);
+    void searchByID(uint, int*);
     void partner_search_sub(void* (*)(void*, void*));
     void partner_search();
     void lookBack();
diff --git a/include/d/actor/d_a_npc_ko1.h b/include/d/actor/d_a_npc_ko1.h
index f0e289c6..58f0ecd2 100644
--- a/include/d/actor/d_a_npc_ko1.h
+++ b/include/d/actor/d_a_npc_ko1.h
@@ -63,7 +63,7 @@ public:
     void getMsg();
     void chkAttention();
     void setAttention(bool);
-    void searchByID(unsigned int);
+    void searchByID(uint);
     void partner_srch_sub(void* (*)(void*, void*));
     void partner_srch();
     void check_landOn();
diff --git a/include/d/actor/d_a_npc_ls1.h b/include/d/actor/d_a_npc_ls1.h
index 706b73f0..ceced343 100644
--- a/include/d/actor/d_a_npc_ls1.h
+++ b/include/d/actor/d_a_npc_ls1.h
@@ -67,7 +67,7 @@ public:
     void checkOrder();
     void chk_talk();
     void chk_parts_notMov();
-    void searchByID(unsigned int, int*);
+    void searchByID(uint, int*);
     void partner_search_sub(void* (*)(void*, void*));
     void partner_search();
     void setEyeCtrl();
diff --git a/include/d/actor/d_a_npc_ob1.h b/include/d/actor/d_a_npc_ob1.h
index 7c42d41a..35d4d268 100644
--- a/include/d/actor/d_a_npc_ob1.h
+++ b/include/d/actor/d_a_npc_ob1.h
@@ -44,7 +44,7 @@ public:
     void getMsg();
     void chkAttention();
     void setAttention(bool);
-    void searchByID(unsigned int);
+    void searchByID(uint);
     void partner_srch();
     void bitCount(unsigned char);
     void set_pigCnt();
diff --git a/include/d/actor/d_a_npc_pf1.h b/include/d/actor/d_a_npc_pf1.h
index bf4a872e..05886757 100644
--- a/include/d/actor/d_a_npc_pf1.h
+++ b/include/d/actor/d_a_npc_pf1.h
@@ -38,7 +38,7 @@ public:
     void checkOrder();
     void chk_talk();
     void chk_parts_notMov();
-    void searchByID(unsigned int, int*);
+    void searchByID(uint, int*);
     void lookBack();
     void chkAttention();
     void setAttention(bool);
diff --git a/include/d/actor/d_a_npc_yw1.h b/include/d/actor/d_a_npc_yw1.h
index 0ac039f0..19bb13f8 100644
--- a/include/d/actor/d_a_npc_yw1.h
+++ b/include/d/actor/d_a_npc_yw1.h
@@ -45,7 +45,7 @@ public:
     void checkOrder();
     void chk_talk();
     void chk_parts_notMov();
-    void searchByID(unsigned int, int*);
+    void searchByID(uint, int*);
     void partner_search_sub(void* (*)(void*, void*));
     void partner_search();
     void lookBack();
diff --git a/include/d/actor/d_a_npc_zk1.h b/include/d/actor/d_a_npc_zk1.h
index c07495a1..752b7b06 100644
--- a/include/d/actor/d_a_npc_zk1.h
+++ b/include/d/actor/d_a_npc_zk1.h
@@ -37,7 +37,7 @@ public:
     void checkOrder();
     void chk_talk();
     void chk_parts_notMov();
-    void searchByID(unsigned int, int*);
+    void searchByID(uint, int*);
     void lookBack();
     void chkAttention();
     void setAttention(bool);
diff --git a/include/d/actor/d_a_npc_zl1.h b/include/d/actor/d_a_npc_zl1.h
index 0a2d51dc..072cab3a 100644
--- a/include/d/actor/d_a_npc_zl1.h
+++ b/include/d/actor/d_a_npc_zl1.h
@@ -69,7 +69,7 @@ public:
     void checkOrder();
     void chk_talk();
     void chk_parts_notMov();
-    void searchByID(unsigned int, int*);
+    void searchByID(uint, int*);
     void partner_search_sub(void* (*)(void*, void*));
     void partner_search();
     void setEyeCtrl();
diff --git a/include/d/actor/d_a_obj_buoyflag.h b/include/d/actor/d_a_obj_buoyflag.h
index 0b3639da..5c97c800 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(unsigned int parentPId, cXyz* pos, int roomNo, csXyz* angle) {
+        static s32 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);
         }
@@ -63,8 +63,8 @@ namespace daObjBuoyflag {
         inline BOOL _draw();
         inline BOOL _execute();
         void jump_to_sea(float, float, short) {}
-        void make_barrel2_mine(unsigned int, cXyz*, int, csXyz*, Texture_e, bool) {}
-        void make_barrel2_norm(unsigned int, cXyz*, int, csXyz*, Texture_e) {}
+        void make_barrel2_mine(uint, cXyz*, int, csXyz*, Texture_e, bool) {}
+        void make_barrel2_norm(uint, cXyz*, int, csXyz*, Texture_e) {}
         void attr_type() const; // weak but not inlined?
         void prm_get_noCull() const {}
         void prm_get_texture() const; // weak but not inlined?
diff --git a/include/d/actor/d_a_obj_search.h b/include/d/actor/d_a_obj_search.h
index 13557849..d50ddd52 100644
--- a/include/d/actor/d_a_obj_search.h
+++ b/include/d/actor/d_a_obj_search.h
@@ -20,7 +20,7 @@ namespace daObj_Search {
         void isSecond() {}
         void modeProcInit(int) {}
         void setBkControl(bool) {}
-        void setChildId(unsigned int) {}
+        void setChildId(uint) {}
         
         void _createHeap();
         void searchCreateHeap();
diff --git a/include/d/actor/d_a_player.h b/include/d/actor/d_a_player.h
index cd4dfdae..dbb4812e 100644
--- a/include/d/actor/d_a_player.h
+++ b/include/d/actor/d_a_player.h
@@ -483,7 +483,7 @@ public:
     virtual BOOL checkCutCharge() const { return FALSE; }
     virtual BOOL getBokoFlamePos(cXyz*);// { return FALSE; }
     virtual BOOL checkTactWait() const { return FALSE; }
-    virtual void setTactZev(unsigned int, int, char*) {}
+    virtual void setTactZev(uint, int, char*) {}
     virtual void onDekuSpReturnFlg(u8) {}
     virtual BOOL checkComboCutTurn() const { return false; }
     virtual f32 getBaseAnimeFrameRate() = 0;
@@ -500,7 +500,7 @@ public:
     virtual void onFrollCrashFlg(u32);// {}
     virtual MtxP getModelJointMtx(u16) { return NULL; }
     virtual f32 getOldSpeedY() { return 0.0f; }
-    virtual BOOL setHookshotCarryOffset(unsigned int, const cXyz*) { return FALSE; }
+    virtual BOOL setHookshotCarryOffset(uint, const cXyz*) { return FALSE; }
     virtual void setPlayerPosAndAngle(cXyz*, s16) {}
     virtual void setPlayerPosAndAngle(cXyz*, csXyz*) {}
     virtual void setPlayerPosAndAngle(MtxP) {}
diff --git a/include/d/actor/d_a_player_main.h b/include/d/actor/d_a_player_main.h
index c3cdfcc0..07b53e05 100644
--- a/include/d/actor/d_a_player_main.h
+++ b/include/d/actor/d_a_player_main.h
@@ -1673,7 +1673,7 @@ public:
     void getShadowID() const {}
     void npcStartRestartRoom() {}
     void setDaiokutaEnd() {}
-    void setWhirlId(unsigned int) {}
+    void setWhirlId(uint) {}
     void decrementBombCnt() {
         if (mActivePlayerBombs != 0) {
             mActivePlayerBombs--;
@@ -1777,7 +1777,7 @@ 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(unsigned int, int, char*);
+    virtual void setTactZev(uint, 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(); }
@@ -1794,7 +1794,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(unsigned int, const cXyz*);
+    virtual BOOL setHookshotCarryOffset(uint, const cXyz*);
     virtual void cancelChangeTextureAnime() { resetDemoTextureAnime(); }
 
 public:
@@ -2085,7 +2085,7 @@ public:
     /* 0x3620 */ u32 m3620;
     /* 0x3624 */ int m3624;
     /* 0x3628 */ int m3628;
-    /* 0x362C */ unsigned int mTactZevPartnerPID;
+    /* 0x362C */ uint mTactZevPartnerPID;
     /* 0x3630 */ u32 m3630;
     /* 0x3634 */ int m3634;
     /* 0x3638 */ int mMsgId;
diff --git a/include/d/actor/d_a_tama.h b/include/d/actor/d_a_tama.h
index 21dcc770..374cf08a 100644
--- a/include/d/actor/d_a_tama.h
+++ b/include/d/actor/d_a_tama.h
@@ -8,7 +8,7 @@
 class daTama_c : public fopAc_ac_c {
 public:
     void setDis(f32 dis) { mDis = dis; }
-    void setPartnerID(unsigned int id) { mPartnerID = id; }
+    void setPartnerID(uint id) { mPartnerID = id; }
     void setSpd(f32 spd) { speedF = spd; }
 
     BOOL createInit();
diff --git a/include/d/d_attention.h b/include/d/d_attention.h
index bfd2c2ad..9a3a5ed1 100644
--- a/include/d/d_attention.h
+++ b/include/d/d_attention.h
@@ -23,7 +23,7 @@ class dAttHint_c {
 public:
     dAttHint_c() {}
     u32 getPId(void*);
-    fopAc_ac_c* convPId(unsigned int);
+    fopAc_ac_c* convPId(uint);
     int request(fopAc_ac_c*, int);
     void init();
     void proc();
@@ -39,7 +39,7 @@ private:
 class dAttCatch_c {
 public:
     dAttCatch_c() {}
-    fopAc_ac_c* convPId(unsigned int);
+    fopAc_ac_c* convPId(uint);
     void init();
     void proc();
     void request(fopAc_ac_c*, u8, f32, f32, f32, s16, int);
@@ -81,7 +81,7 @@ public:
 
 class dAttLook_c {
 public:
-    fopAc_ac_c* convPId(unsigned int);
+    fopAc_ac_c* convPId(uint);
     void init();
     void proc();
     void request(fopAc_ac_c*, f32, f32, f32, s16, int);
@@ -156,7 +156,7 @@ public:
     void Draw();
     fopAc_ac_c* LockonTarget(s32);
     void LockonReleaseDistanse();
-    unsigned int LockonTargetPId(s32);
+    uint LockonTargetPId(s32);
     fopAc_ac_c* ActionTarget(s32);
     bool LockonTruth();
 
diff --git a/include/d/d_bg_s.h b/include/d/d_bg_s.h
index 477c49ee..502d9a15 100644
--- a/include/d/d_bg_s.h
+++ b/include/d/d_bg_s.h
@@ -136,7 +136,7 @@ public:
         // not 100% sure if this is right
         Set(i_pos, i_line, fpcM_GetID(actor), param_3);
     }
-    void Set(cXyz* i_pos, cXyz* i_line, unsigned int actorPid, cXyz* param_3) {
+    void Set(cXyz* i_pos, cXyz* i_line, uint 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, unsigned int actor_id) {
+    void SetWallActorInfo(int bg_index, void* bgw, uint actor_id) {
         SetActorInfo(bg_index, bgw, actor_id);
     }
     void SetWallPolyIndex(int) {} // TODO
diff --git a/include/d/d_bg_s_acch.h b/include/d/d_bg_s_acch.h
index 05a71abb..1298e1b7 100644
--- a/include/d/d_bg_s_acch.h
+++ b/include/d/d_bg_s_acch.h
@@ -94,7 +94,7 @@ public:
     f32 GetWallAllLowH_R();
     f32 GetSpeedY();
     f32 GetWallAddY(Vec&);
-    void SetNowActorInfo(int bg_index, void* bgw, unsigned int apid) {
+    void SetNowActorInfo(int bg_index, void* bgw, uint apid) {
         m_bg_index = bg_index;
         field_0x78 = bgw;
         field_0x7c = apid;
diff --git a/include/d/d_camera.h b/include/d/d_camera.h
index 6e27f913..a15f76e6 100644
--- a/include/d/d_camera.h
+++ b/include/d/d_camera.h
@@ -351,8 +351,8 @@ public:
     void SubjectLockOn(fopAc_ac_c*);
     void SubjectLockOff();
     void GetForceLockOnActor();
-    void ForceLockOn(unsigned int);
-    void ForceLockOff(unsigned int);
+    void ForceLockOn(uint);
+    void ForceLockOff(uint);
     void SetExtendedPosition(cXyz*);
     void ScopeViewMsgModeOff();
 
diff --git a/include/d/d_cc_d.h b/include/d/d_cc_d.h
index a8add313..5739352d 100644
--- a/include/d/d_cc_d.h
+++ b/include/d/d_cc_d.h
@@ -121,12 +121,12 @@ public:
     void Move();
     void ClrAt() { mAtSpl = 0; }
     void ClrTg() { mTgSpl = 0; }
-    void SetAtApid(unsigned int id) { mAtApid = id; }
-    void SetTgApid(unsigned int id) { mTgApid = id; }
+    void SetAtApid(uint id) { mAtApid = id; }
+    void SetTgApid(uint id) { mTgApid = id; }
     u8 GetRoomId() { return mRoomId; }
     void SetRoomId(int id) { mRoomId = id; }
-    unsigned int GetAtOldApid() { return mAtOldApid; }
-    unsigned int GetTgOldApid() { return mTgOldApid; }
+    uint GetAtOldApid() { return mAtOldApid; }
+    uint GetTgOldApid() { return mTgOldApid; }
     bool ChkNoActor() { return field_0x1C & 1; }
     bool ChkNoneActorPerfTblId() { return mActorPerfTblId == 0xFFFF; }
     dCcG_At_Spl GetAtSpl() { return (dCcG_At_Spl)mAtSpl; }
@@ -197,7 +197,7 @@ public:
         mHitCallback = NULL;
         mEffCounter = 0;
     }
-    void SetHitApid(unsigned int id) {
+    void SetHitApid(uint 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(unsigned int apid) { mGObjCo.SetHitApid(apid); }
-    void SetAtHitApid(unsigned int apid) { mGObjAt.SetHitApid(apid); }
-    void SetTgHitApid(unsigned int apid) { mGObjTg.SetHitApid(apid); }
+    void SetCoHitApid(uint apid) { mGObjCo.SetHitApid(apid); }
+    void SetAtHitApid(uint apid) { mGObjAt.SetHitApid(apid); }
+    void SetTgHitApid(uint apid) { mGObjTg.SetHitApid(apid); }
     void OnCoHitNoActor() { mGObjCo.OnRPrm(1); }
     void OffCoHitNoActor() { mGObjCo.OffRPrm(1); }
     void OnAtHitNoActor() { mGObjAt.OnRPrm(2); }
diff --git a/include/d/d_com_inf_game.h b/include/d/d_com_inf_game.h
index 498fbacd..a848808f 100644
--- a/include/d/d_com_inf_game.h
+++ b/include/d/d_com_inf_game.h
@@ -2484,7 +2484,7 @@ inline void dComIfGp_event_setItemPartner(void* pt) {
     g_dComIfG_gameInfo.play.getEvent().setPtI(pt);
 }
 
-inline void dComIfGp_event_setItemPartnerId(unsigned int id) {
+inline void dComIfGp_event_setItemPartnerId(uint id) {
     g_dComIfG_gameInfo.play.getEvent().setPtI_Id(id);
 }
 
diff --git a/include/d/d_event.h b/include/d/d_event.h
index 6e7d5d6c..d4fda115 100644
--- a/include/d/d_event.h
+++ b/include/d/d_event.h
@@ -91,14 +91,14 @@ public:
     dStage_Event_dt_c* getStageEventDt();
     dStage_Event_dt_c* nextStageEventDt(void*);
     u32 getPId(void*);
-    fopAc_ac_c* convPId(unsigned int);
+    fopAc_ac_c* convPId(uint);
     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(unsigned int id) { mPtItem = id; }
+    void setPtI_Id(uint id) { mPtItem = id; }
     void setPtI(void* actor) { mPtItem = getPId(actor); }
     fopAc_ac_c* getPtI() { return convPId(mPtItem); }
     void setGtItm(u8 itemNo) { mGetItemNo = itemNo; }
diff --git a/include/d/d_kankyo.h b/include/d/d_kankyo.h
index 4ac8f2c4..41f6808a 100644
--- a/include/d/d_kankyo.h
+++ b/include/d/d_kankyo.h
@@ -392,7 +392,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, unsigned int i_actorID, int param_3);
+void dKy_Sound_set(cXyz i_pos, int param_1, uint i_actorID, int param_3);
 void dKy_SordFlush_set(cXyz hitPos, int lightType);
 void dKy_itudemo_se();
 void dKy_actor_addcol_set(s16, s16, s16, f32);
diff --git a/include/d/d_stage.h b/include/d/d_stage.h
index d1629989..ed9711d9 100644
--- a/include/d/d_stage.h
+++ b/include/d/d_stage.h
@@ -871,7 +871,7 @@ public:
     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 setStatusProcID(int i_roomNo, unsigned int i_id) { mStatus[i_roomNo].mProcID = i_id; }
+    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 dStage_darkStatus_c& getDarkStatus(int i_idx) { return mDarkStatus[i_idx]; }
     static char* getDemoArcName() { return mDemoArcName; }