Add uint typedef

include/JSystem/JUtility/JUTConsole.h

@@ -21,23 +21,23 @@ public:
         /* 0x3 */ OUTPUT_OSR_AND_CONSOLE,
     };
 
-    static JUTConsole* create(unsigned int, void*, u32);
-    static JUTConsole* create(unsigned int, unsigned int, JKRHeap*);
-    JUTConsole(unsigned int, unsigned int, bool);
-    static size_t getObjectSizeFromBufferSize(unsigned int, unsigned int);
-    static size_t getLineFromObjectSize(u32, unsigned int);
+    static JUTConsole* create(uint, void*, u32);
+    static JUTConsole* create(uint, uint, JKRHeap*);
+    JUTConsole(uint, uint, bool);
+    static size_t getObjectSizeFromBufferSize(uint, uint);
+    static size_t getLineFromObjectSize(u32, uint);
     void clear();
     void doDraw(JUTConsole::EConsoleType) const;
     void print_f(char const*, ...);
     void print(char const*);
-    void dumpToTerminal(unsigned int);
+    void dumpToTerminal(uint);
     void scroll(int);
     int getUsedLine() const;
     int getLineOffset() const;
 
     virtual ~JUTConsole();
 
-    void setOutput(unsigned int output) { mOutput = output; }
+    void setOutput(uint output) { mOutput = output; }
     void setPosition(int x, int y) {
         mPositionX = x;
         mPositionY = y;

include/SSystem/SComponent/c_bg_s.h

@@ -25,7 +25,7 @@ public:
     void Release();
 
     virtual ~cBgS_ChkElm() {}
-    virtual void Regist2(cBgW*, unsigned int, void*);
+    virtual void Regist2(cBgW*, uint, 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*, unsigned int, void*);
+    bool Regist(cBgW*, uint, void*);
     bool Release(cBgW*);
     bool LineCross(cBgS_LinChk*);
     f32 GroundCross(cBgS_GndChk*);

include/SSystem/SComponent/c_bg_s_chk.h

@@ -33,7 +33,7 @@ public:
         mActorPid = other.mActorPid;
         unk_0x0C = other.unk_0x0C;
     }
-    bool ChkSameActorPid(unsigned int) const;
+    bool ChkSameActorPid(uint) const;
 
     void SetActorPid(u32 pid) { mActorPid = pid; }
     u32 GetActorPid() const { return mActorPid; }

include/SSystem/SComponent/c_bg_s_lin_chk.h

@@ -20,7 +20,7 @@ public:
 public:
     cBgS_LinChk() { ct(); }
     void ct();
-    void Set2(cXyz* pStart, cXyz* pEnd, unsigned int actorPid);
+    void Set2(cXyz* pStart, cXyz* pEnd, uint actorPid);
 
     virtual ~cBgS_LinChk() {}
 

include/SSystem/SComponent/c_bg_s_poly_info.h

@@ -12,7 +12,7 @@ private:
     /* 0x00 */ u16 mPolyIndex;
     /* 0x02 */ u16 mBgIndex;
     /* 0x04 */ cBgW* mpBgW;
-    /* 0x08 */ unsigned int mActorId;
+    /* 0x08 */ uint mActorId;
 
 public:
     cBgS_PolyInfo() {
@@ -27,13 +27,13 @@ public:
     void SetPolyInfo(const cBgS_PolyInfo& other) {
         *this = other;
     }
-    void SetActorInfo(int bg_index, void* bgw, unsigned int actor_id) {
+    void SetActorInfo(int bg_index, void* bgw, uint actor_id) {
         JUT_ASSERT(0x59, 0 <= bg_index);
         mBgIndex = bg_index;
         mpBgW = (cBgW*)bgw;
         mActorId = actor_id;
     }
-    bool ChkSafe(const void* bgw, unsigned int pid) {
+    bool ChkSafe(const void* bgw, uint pid) {
         if (mpBgW == bgw && mActorId == pid)
             return true;
         return false;
@@ -58,7 +58,7 @@ public:
     }
 
     // TODO
-    void ChkSafe(const void*, unsigned int) const {}
+    void ChkSafe(const void*, uint) const {}
     void ChkSetInf() const {}
     void SetPolyIndex(int poly_index) {
         JUT_ASSERT(0x7b, 0 <= poly_index);

include/SSystem/SComponent/c_cc_d.h

@@ -364,7 +364,7 @@ public:
     virtual ~cCcD_Stts() {}
     virtual const cCcD_GStts* GetGStts() const;
     virtual cCcD_GStts* GetGStts();
-    void Init(int, int, void*, unsigned int);
+    void Init(int, int, void*, uint);
     virtual void Ct();
     void PlusCcMove(f32, f32, f32);
     void ClrCcMove() {
@@ -381,7 +381,7 @@ public:
     fopAc_ac_c* GetActor() const { return mActor; }
     void SetActor(void* ac) { mActor = (fopAc_ac_c*)ac; }
     cXyz* GetCCMoveP() { return &m_cc_move; }
-    unsigned int GetApid() const { return mApid; }
+    uint GetApid() const { return mApid; }
 };  // Size = 0x1C
 
 STATIC_ASSERT(0x1C == sizeof(cCcD_Stts));

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 {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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?

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

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

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;

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

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

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

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;

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

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

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

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

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

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

include/dolphin/types.h

@@ -26,6 +26,8 @@ typedef volatile f64 vf64;
 
 typedef int BOOL;
 
+typedef unsigned int uint;
+
 #define TRUE 1
 #define FALSE 0
 

include/f_op/f_op_actor_mng.h

@@ -262,7 +262,7 @@ inline fopAcM_prm_class* fopAcM_GetAppend(void* actor) {
     return (fopAcM_prm_class*)fpcM_GetAppend(actor);
 }
 
-inline BOOL fopAcM_IsExecuting(unsigned int id) {
+inline BOOL fopAcM_IsExecuting(uint id) {
     return fpcM_IsExecuting(id);
 }
 
@@ -343,7 +343,7 @@ inline BOOL fopAcM_isSwitch(fopAc_ac_c* pActor, int sw) {
     return dComIfGs_isSwitch(sw, fopAcM_GetHomeRoomNo(pActor));
 }
 
-inline fopAc_ac_c* fopAcM_SearchByID(unsigned int id) {
+inline fopAc_ac_c* fopAcM_SearchByID(uint id) {
     return (fopAc_ac_c*)fopAcIt_Judge((fopAcIt_JudgeFunc)fpcSch_JudgeByID, &id);
 }
 
@@ -404,7 +404,7 @@ void fopAcM_setStageLayer(void* p_proc);
 
 void fopAcM_setRoomLayer(void* p_proc, int roomNo);
 
-s32 fopAcM_SearchByID(unsigned int id, fopAc_ac_c** p_actor);
+s32 fopAcM_SearchByID(uint id, fopAc_ac_c** p_actor);
 
 s32 fopAcM_SearchByName(s16 procName, fopAc_ac_c** p_actor);
 
@@ -412,12 +412,12 @@ 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,
-                               unsigned int parentPId);
+                               uint parentPId);
 
 void fopAcM_Log(fopAc_ac_c* p_actor, char* str);
 
 s32 fopAcM_delete(fopAc_ac_c* p_actor);
-s32 fopAcM_delete(unsigned int actorID);
+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,
@@ -437,13 +437,13 @@ 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, unsigned int parentPId, u32 parameters, cXyz* p_pos,
+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);
 
-s32 fopAcM_createChild(char* pProcNameString, unsigned int parentPcId, u32 parameter, cXyz* pPos, int roomNo, csXyz* pAngle, cXyz* pScale, createFunc createFunc);
+s32 fopAcM_createChild(char* pProcNameString, uint parentPcId, u32 parameter, cXyz* pPos, int roomNo, csXyz* pAngle, cXyz* pScale, createFunc createFunc);
 
-s32 fopAcM_createChildFromOffset(s16 procName, unsigned int parentProcID, u32 actorParams,
+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);
 

include/f_op/f_op_kankyo_mng.h

@@ -18,7 +18,7 @@ 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,
                   fopKyM_CreateFunc i_createFunc = NULL);
-kankyo_class* fopKyM_SearchByID(unsigned int id);
+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);

include/f_op/f_op_msg_mng.h

@@ -63,7 +63,7 @@ u32 fopMsgM_Create(s16, fopMsgCreateFunc, void*);
 s32 fopMsgM_create(s16 param_0, fopAc_ac_c* param_1, cXyz* param_2, u32* param_3, u32* param_4, fopMsgCreateFunc createFunc);
 void fopMsgM_Delete(void* process);
 fopMsg_prm_class* fopMsgM_GetAppend(void* msg);
-void fopMsgM_setMessageID(unsigned int);
+void fopMsgM_setMessageID(uint);
 void fopMsgM_destroyExpHeap(JKRExpHeap*);
 f32 fopMsgM_valueIncrease(int param_0, int param_1, u8 param_2);
 s32 fopMsgM_setStageLayer(void*);
@@ -71,7 +71,7 @@ int fopMsgM_messageSet(u32 i_msgNo, fopAc_ac_c* i_actorP);
 int fopMsgM_messageSet(u32 param_0, cXyz*);
 int fopMsgM_messageSet(u32 param_0);
 int fopMsgM_messageSetDemo(u32 param_0);
-msg_class* fopMsgM_SearchByID(unsigned int param_0);
+msg_class* fopMsgM_SearchByID(uint param_0);
 char* fopMsgM_messageGet(char* msg, u32 string_id);
 s32 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);

include/f_op/f_op_overlap_mng.h

@@ -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(unsigned int pid);
+void fopOvlpM_ToldAboutID(uint pid);
 int fopOvlpM_IsPeek();
 int fopOvlpM_IsDone();
 int fopOvlpM_IsDoingReq();

include/f_op/f_op_scene_mng.h

@@ -6,9 +6,9 @@
 
 typedef struct base_process_class base_process_class;
 
-scene_class* fopScnM_SearchByID(unsigned int id);
+scene_class* fopScnM_SearchByID(uint id);
 int fopScnM_ChangeReq(scene_class*, s16, s16, u16);
-unsigned int fopScnM_DeleteReq(scene_class*);
+uint fopScnM_DeleteReq(scene_class*);
 int fopScnM_CreateReq(s16, s16, u16, u32);
 u32 fopScnM_ReRequest(s16, u32);
 void fopScnM_Management(void);

include/f_op/f_op_scene_req.h

@@ -20,7 +20,7 @@ public:
 
 // cPhs__Step fopScnRq_phase_ClearOverlap(scene_request_class* param_1);
 s32 fopScnRq_Request(int, scene_class*, s16, void*, s16, u16);
-s32 fopScnRq_ReRequest(unsigned int, s16, void*);
+s32 fopScnRq_ReRequest(uint, s16, void*);
 s32 fopScnRq_Handler(void);
 
 #endif

include/f_pc/f_pc_base.h

@@ -40,7 +40,7 @@ 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, unsigned int pProcID, void* pData);
+base_process_class* fpcBs_Create(s16 pProcTypeID, uint pProcID, void* pData);
 s32 fpcBs_SubCreate(base_process_class* pProc);
 
 extern "C" {

include/f_pc/f_pc_create_iter.h

@@ -28,6 +28,6 @@ typedef struct fpcCtIt_jilprm_c {
 s32 fpcCtIt_Method(fpcCtIt_MethodFunc pJudge, void* pUserData);
 void* fpcCtIt_Judge(fpcCtIt_JudgeFunc pJudge, void* pUserData);
 void* fpcCtIt_filter_JudgeInLayer(create_tag*, fpcCtIt_jilprm_c*);
-void* fpcCtIt_JudgeInLayer(unsigned int pUnk0, fpcCtIt_JudgeFunc pFunc, void* pUserData);
+void* fpcCtIt_JudgeInLayer(uint pUnk0, fpcCtIt_JudgeFunc pFunc, void* pUserData);
 
 #endif

include/f_pc/f_pc_create_req.h

@@ -28,8 +28,8 @@ typedef struct create_request {
     layer_class* mpLayer;
 } create_request;  // Size: 0x48
 
-bool fpcCtRq_isCreatingByID(create_tag* pTag, unsigned int* pId);
-BOOL fpcCtRq_IsCreatingByID(unsigned int id);
+bool fpcCtRq_isCreatingByID(create_tag* pTag, uint* pId);
+BOOL fpcCtRq_IsCreatingByID(uint id);
 void fpcCtRq_CreateQTo(create_request* pReq);
 void fpcCtRq_ToCreateQ(create_request* pReq);
 BOOL fpcCtRq_Delete(create_request* pReq);

include/f_pc/f_pc_creator.h

@@ -6,7 +6,7 @@
 
 typedef struct base_process_class base_process_class;
 
-BOOL fpcCt_IsCreatingByID(unsigned int id);
+BOOL fpcCt_IsCreatingByID(uint id);
 s32 fpcCt_IsDoing(base_process_class* pProc);
 BOOL fpcCt_Abort(base_process_class* pProc);
 s32 fpcCt_Handler(void);

include/f_pc/f_pc_executor.h

@@ -8,8 +8,8 @@
 typedef struct base_process_class base_process_class;
 
 base_process_class* fpcEx_Search(fpcLyIt_JudgeFunc pFunc, void* pUserData);
-base_process_class* fpcEx_SearchByID(unsigned int id);
-BOOL fpcEx_IsExist(unsigned int id);
+base_process_class* fpcEx_SearchByID(uint id);
+BOOL fpcEx_IsExist(uint id);
 s32 fpcEx_ToLineQ(base_process_class* pProc);
 s32 fpcEx_ExecuteQTo(base_process_class* pProc);
 s32 fpcEx_Execute(base_process_class* pProc);

include/f_pc/f_pc_layer.h

@@ -26,8 +26,8 @@ typedef struct layer_class {
 void fpcLy_SetCurrentLayer(layer_class* pLayer);
 layer_class* fpcLy_CurrentLayer(void);
 layer_class* fpcLy_RootLayer(void);
-layer_class* fpcLy_Layer(unsigned int id);
-layer_class* fpcLy_Search(unsigned int id);
+layer_class* fpcLy_Layer(uint id);
+layer_class* fpcLy_Search(uint id);
 void fpcLy_Regist(layer_class* pLayer);
 
 void fpcLy_CreatedMesg(layer_class* pLayer);

include/f_pc/f_pc_layer_tag.h

@@ -21,9 +21,9 @@ typedef struct layer_management_tag_class {
 } layer_management_tag_class;
 
 s32 fpcLyTg_QueueTo(layer_management_tag_class* pTag);
-s32 fpcLyTg_ToQueue(layer_management_tag_class* pTag, unsigned int layerID, u16 listID,
+s32 fpcLyTg_ToQueue(layer_management_tag_class* pTag, uint layerID, u16 listID,
                     u16 listPrio);
-s32 fpcLyTg_Move(layer_management_tag_class*, unsigned int, u16, u16);
-s32 fpcLyTg_Init(layer_management_tag_class*, unsigned int, void*);
+s32 fpcLyTg_Move(layer_management_tag_class*, uint, u16, u16);
+s32 fpcLyTg_Init(layer_management_tag_class*, uint, void*);
 
 #endif

include/f_pc/f_pc_manager.h

@@ -66,7 +66,7 @@ inline void* fpcM_GetAppend(void* proc) {
     return ((base_process_class*)proc)->mpUserData;
 }
 
-inline BOOL fpcM_IsExecuting(unsigned int id) {
+inline BOOL fpcM_IsExecuting(uint 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(unsigned int pID);
+BOOL fpcM_IsCreating(uint 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(unsigned int pLayerID, fpcCtIt_JudgeFunc pFunc, void* pUserData);
+void* fpcM_JudgeInLayer(uint pLayerID, fpcCtIt_JudgeFunc pFunc, void* pUserData);
 
 extern "C" {
 void fpcM_Delete__FPv(void);

include/f_pc/f_pc_node_req.h

@@ -64,7 +64,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(unsigned int pRequestId, s16 param_2, void* param_3);
-s32 fpcNdRq_ReRequest(unsigned int pRequestId, s16 param_2, void* param_3);
+s32 fpcNdRq_ReChangeNode(uint pRequestId, s16 param_2, void* param_3);
+s32 fpcNdRq_ReRequest(uint pRequestId, s16 param_2, void* param_3);
 
 #endif

include/f_pc/f_pc_priority.h

@@ -27,10 +27,10 @@ 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(unsigned int layer, u16 listID, u16 priority);
-s32 fpcPi_Change(process_priority_class* pPi, unsigned int layer, u16 listID, u16 priority);
+s32 fpcPi_IsNormal(uint layer, u16 listID, u16 priority);
+s32 fpcPi_Change(process_priority_class* pPi, uint layer, u16 listID, u16 priority);
 s32 fpcPi_Handler(void);
-s32 fpcPi_Init(process_priority_class* pPi, void* pUserData, unsigned int layer, u16 listID,
+s32 fpcPi_Init(process_priority_class* pPi, void* pUserData, uint layer, u16 listID,
                u16 priority);
 
 extern s8 data_804505F0;  // roomReadId

include/global.h

@@ -41,7 +41,7 @@
 #endif
 
 // hack to make functions that return comparisons as int match
-extern int __cntlzw(unsigned int);
+extern int __cntlzw(uint);
 inline BOOL checkEqual(s32 a, s32 b) {
     return (u32)__cntlzw(a - b) >> 5;
 }

src/JSystem/JUtility/JUTConsole.cpp

@@ -16,7 +16,7 @@
 JUTConsoleManager* JUTConsoleManager::sManager;
 
 /* 802CA2FC-802CA3CC       .text create__10JUTConsoleFUiUiP7JKRHeap */
-JUTConsole* JUTConsole::create(unsigned int param_0, unsigned int maxLines, JKRHeap* p_heap) {
+JUTConsole* JUTConsole::create(uint param_0, uint maxLines, JKRHeap* p_heap) {
     JUTConsoleManager* pManager = JUTConsoleManager::getManager();
     JUT_ASSERT(33, pManager != 0);
 
@@ -32,7 +32,7 @@ JUTConsole* JUTConsole::create(unsigned int param_0, unsigned int maxLines, JKRH
 }
 
 /* 802CA3CC-802CA4C8       .text create__10JUTConsoleFUiPvUl */
-JUTConsole* JUTConsole::create(unsigned int param_0, void* buffer, u32 bufferSize) {
+JUTConsole* JUTConsole::create(uint param_0, void* buffer, u32 bufferSize) {
     JUTConsoleManager* pManager = JUTConsoleManager::getManager();
     JUT_ASSERT(59, pManager != 0);
     JUT_ASSERT(62, ( (u32)buffer & 0x3 ) == 0);
@@ -47,7 +47,7 @@ JUTConsole* JUTConsole::create(unsigned int param_0, void* buffer, u32 bufferSiz
 }
 
 /* 802CA4C8-802CA5AC       .text __ct__10JUTConsoleFUiUib */
-JUTConsole::JUTConsole(unsigned int param_0, unsigned int maxLines, bool param_2) {
+JUTConsole::JUTConsole(uint param_0, uint maxLines, bool param_2) {
     field_0x2c = param_2;
     field_0x20 = param_0;
     mMaxLines = maxLines;
@@ -81,12 +81,12 @@ JUTConsole::~JUTConsole() {
 }
 
 /* 802CA658-802CA668       .text getObjectSizeFromBufferSize__10JUTConsoleFUiUi */
-size_t JUTConsole::getObjectSizeFromBufferSize(unsigned int param_0, unsigned int maxLines) {
+size_t JUTConsole::getObjectSizeFromBufferSize(uint param_0, uint maxLines) {
     return (param_0 + 2) * maxLines + sizeof(JUTConsole);
 }
 
 /* 802CA668-802CA678       .text getLineFromObjectSize__10JUTConsoleFUlUi */
-size_t JUTConsole::getLineFromObjectSize(u32 bufferSize, unsigned int param_1) {
+size_t JUTConsole::getLineFromObjectSize(u32 bufferSize, uint param_1) {
     return (bufferSize - sizeof(JUTConsole)) / (param_1 + 2);
 }
 
@@ -257,7 +257,7 @@ void JUTConsole_print_f_va_(JUTConsole* console, const char* fmt, va_list args)
 }
 
 /* 802CB03C-802CB19C       .text dumpToTerminal__10JUTConsoleFUi */
-void JUTConsole::dumpToTerminal(unsigned int param_0) {
+void JUTConsole::dumpToTerminal(uint param_0) {
     if (param_0 == 0) {
         return;
     }

src/SSystem/SComponent/c_bg_s.cpp

@@ -21,7 +21,7 @@ void cBgS_ChkElm::Init() {
 }
 
 /* 8024645C-80246478       .text Regist2__11cBgS_ChkElmFP4cBgWUiPv */
-void cBgS_ChkElm::Regist2(cBgW* bgw, unsigned int pid, void* actor) {
+void cBgS_ChkElm::Regist2(cBgW* bgw, uint 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, unsigned int pid, void* actor) {
+bool cBgS::Regist(cBgW* bgw, uint pid, void* actor) {
     if (bgw == NULL)
         return true;
 

src/SSystem/SComponent/c_bg_s_chk.cpp

@@ -11,7 +11,7 @@ cBgS_Chk::~cBgS_Chk() {
 }
 
 /* 8024734C-8024738C       .text ChkSameActorPid__8cBgS_ChkCFUi */
-bool cBgS_Chk::ChkSameActorPid(unsigned int pid) const {
+bool cBgS_Chk::ChkSameActorPid(uint pid) const {
     if (mActorPid == fpcM_ERROR_PROCESS_ID_e || pid == UINT32_MAX || unk_0x0C == 0) {
         return FALSE;
     } else {

src/SSystem/SComponent/c_bg_s_lin_chk.cpp

@@ -18,7 +18,7 @@ void cBgS_LinChk::ct() {
 }
 
 /* 80247480-80247500       .text Set2__11cBgS_LinChkFP4cXyzP4cXyzUi */
-void cBgS_LinChk::Set2(cXyz* pStart, cXyz* pEnd, unsigned int actorPid) {
+void cBgS_LinChk::Set2(cXyz* pStart, cXyz* pEnd, uint actorPid) {
     mLin.SetStartEnd(*pStart, *pEnd);
     field_0x40 = *pEnd;
     SetActorPid(actorPid);

src/SSystem/SComponent/c_cc_d.cpp

@@ -184,7 +184,7 @@ cCcD_GStts* cCcD_Stts::GetGStts() {
 }
 
 /* 80241934-80241994       .text Init__9cCcD_SttsFiiPvUi */
-void cCcD_Stts::Init(int weight, int param_1, void* pProc, unsigned int procID) {
+void cCcD_Stts::Init(int weight, int param_1, void* pProc, uint procID) {
     Ct();
     mWeight = weight;
     field_0x15 = param_1;

src/d/actor/d_a_mozo.cpp

@@ -213,7 +213,7 @@ bool daMozo_c::_delete() {
 }
 
 /* 0000242C-00002498       .text getBeamActor__8daMozo_cFUi */
-fopAc_ac_c* daMozo_c::getBeamActor(unsigned int apid) {
+fopAc_ac_c* daMozo_c::getBeamActor(uint apid) {
     fopAc_ac_c* ac = fopAcM_SearchByID(apid);
     if (ac == NULL)
         return NULL;

src/d/actor/d_a_npc_ba1.cpp

@@ -227,7 +227,7 @@ void daNpc_Ba1_c::setAttention(bool) {
 }
 
 /* 00001A94-00001AC8       .text searchByID__11daNpc_Ba1_cFUi */
-void daNpc_Ba1_c::searchByID(unsigned int) {
+void daNpc_Ba1_c::searchByID(uint) {
     /* Nonmatching */
 }
 

src/d/actor/d_a_npc_bj1.cpp

@@ -252,7 +252,7 @@ void daNpc_Bj1_c::setAttention(bool) {
 }
 
 /* 000025D4-00002608       .text searchByID__11daNpc_Bj1_cFUi */
-void daNpc_Bj1_c::searchByID(unsigned int) {
+void daNpc_Bj1_c::searchByID(uint) {
     /* Nonmatching */
 }
 

src/d/actor/d_a_npc_bm1.cpp

@@ -367,7 +367,7 @@ void daNpc_Bm1_c::setAttention(bool) {
 }
 
 /* 00003630-00003664       .text searchByID__11daNpc_Bm1_cFUi */
-void daNpc_Bm1_c::searchByID(unsigned int) {
+void daNpc_Bm1_c::searchByID(uint) {
     /* Nonmatching */
 }
 

src/d/actor/d_a_npc_de1.cpp

@@ -112,7 +112,7 @@ void daNpc_De1_c::setAttention() {
 }
 
 /* 00001194-000011C8       .text searchByID__11daNpc_De1_cFUi */
-void daNpc_De1_c::searchByID(unsigned int) {
+void daNpc_De1_c::searchByID(uint) {
     /* Nonmatching */
 }
 

src/d/actor/d_a_npc_gk1.cpp

@@ -167,7 +167,7 @@ void daNpc_Gk1_c::chk_parts_notMov() {
 }
 
 /* 000011A4-000011F8       .text searchByID__11daNpc_Gk1_cFUiPi */
-void daNpc_Gk1_c::searchByID(unsigned int, int*) {
+void daNpc_Gk1_c::searchByID(uint, int*) {
     /* Nonmatching */
 }
 

src/d/actor/d_a_npc_gp1.cpp

@@ -172,7 +172,7 @@ void daNpc_Gp1_c::setAttention(bool) {
 }
 
 /* 00001790-000017C4       .text searchByID__11daNpc_Gp1_cFUi */
-void daNpc_Gp1_c::searchByID(unsigned int) {
+void daNpc_Gp1_c::searchByID(uint) {
     /* Nonmatching */
 }
 

src/d/actor/d_a_npc_hi1.cpp

@@ -177,7 +177,7 @@ void daNpc_Hi1_c::chk_parts_notMov() {
 }
 
 /* 0000103C-00001090       .text searchByID__11daNpc_Hi1_cFUiPi */
-void daNpc_Hi1_c::searchByID(unsigned int, int*) {
+void daNpc_Hi1_c::searchByID(uint, int*) {
     /* Nonmatching */
 }
 

src/d/actor/d_a_npc_kf1.cpp

@@ -172,7 +172,7 @@ void daNpc_Kf1_c::chk_talk() {
 }
 
 /* 00001418-0000146C       .text searchByID__11daNpc_Kf1_cFUiPi */
-void daNpc_Kf1_c::searchByID(unsigned int, int*) {
+void daNpc_Kf1_c::searchByID(uint, int*) {
     /* Nonmatching */
 }
 

src/d/actor/d_a_npc_kk1.cpp

@@ -172,7 +172,7 @@ void daNpc_Kk1_c::chk_parts_notMov() {
 }
 
 /* 000017B4-00001808       .text searchByID__11daNpc_Kk1_cFUiPi */
-void daNpc_Kk1_c::searchByID(unsigned int, int*) {
+void daNpc_Kk1_c::searchByID(uint, int*) {
     /* Nonmatching */
 }
 

src/d/actor/d_a_npc_ko1.cpp

@@ -307,7 +307,7 @@ void daNpc_Ko1_c::setAttention(bool) {
 }
 
 /* 00002610-00002644       .text searchByID__11daNpc_Ko1_cFUi */
-void daNpc_Ko1_c::searchByID(unsigned int) {
+void daNpc_Ko1_c::searchByID(uint) {
     /* Nonmatching */
 }
 

src/d/actor/d_a_npc_ls1.cpp

@@ -277,7 +277,7 @@ void daNpc_Ls1_c::chk_parts_notMov() {
 }
 
 /* 00002050-000020A4       .text searchByID__11daNpc_Ls1_cFUiPi */
-void daNpc_Ls1_c::searchByID(unsigned int, int*) {
+void daNpc_Ls1_c::searchByID(uint, int*) {
     /* Nonmatching */
 }
 

src/d/actor/d_a_npc_ob1.cpp

@@ -187,7 +187,7 @@ void daNpc_Ob1_c::setAttention(bool) {
 }
 
 /* 000019C4-000019F8       .text searchByID__11daNpc_Ob1_cFUi */
-void daNpc_Ob1_c::searchByID(unsigned int) {
+void daNpc_Ob1_c::searchByID(uint) {
     /* Nonmatching */
 }
 

src/d/actor/d_a_npc_pf1.cpp

@@ -162,7 +162,7 @@ void daNpc_Pf1_c::chk_parts_notMov() {
 }
 
 /* 0000111C-00001170       .text searchByID__11daNpc_Pf1_cFUiPi */
-void daNpc_Pf1_c::searchByID(unsigned int, int*) {
+void daNpc_Pf1_c::searchByID(uint, int*) {
     /* Nonmatching */
 }
 

src/d/actor/d_a_npc_yw1.cpp

@@ -212,7 +212,7 @@ void daNpc_Yw1_c::chk_parts_notMov() {
 }
 
 /* 000018D8-00001938       .text searchByID__11daNpc_Yw1_cFUiPi */
-void daNpc_Yw1_c::searchByID(unsigned int, int*) {
+void daNpc_Yw1_c::searchByID(uint, int*) {
     /* Nonmatching */
 }
 

src/d/actor/d_a_npc_zk1.cpp

@@ -157,7 +157,7 @@ void daNpc_Zk1_c::chk_parts_notMov() {
 }
 
 /* 00001064-000010B8       .text searchByID__11daNpc_Zk1_cFUiPi */
-void daNpc_Zk1_c::searchByID(unsigned int, int*) {
+void daNpc_Zk1_c::searchByID(uint, int*) {
     /* Nonmatching */
 }
 

src/d/actor/d_a_npc_zl1.cpp

@@ -262,7 +262,7 @@ void daNpc_Zl1_c::chk_parts_notMov() {
 }
 
 /* 00002358-000023AC       .text searchByID__11daNpc_Zl1_cFUiPi */
-void daNpc_Zl1_c::searchByID(unsigned int, int*) {
+void daNpc_Zl1_c::searchByID(uint, int*) {
     /* Nonmatching */
 }
 

src/d/actor/d_a_player_hook.inc

@@ -18,7 +18,7 @@ BOOL daPy_lk_c::checkHookshotReturn() {
 }
 
 /* 8014ABA0-8014ABF4       .text setHookshotCarryOffset__9daPy_lk_cFUiPC4cXyz */
-BOOL daPy_lk_c::setHookshotCarryOffset(unsigned int, const cXyz*) {
+BOOL daPy_lk_c::setHookshotCarryOffset(uint, const cXyz*) {
     /* Nonmatching */
 }
 

src/d/actor/d_a_player_tact.inc

@@ -113,7 +113,7 @@ BOOL daPy_lk_c::checkTactLastInput() {
 }
 
 /* 8014D9F8-8014DA78       .text setTactZev__9daPy_lk_cFUiiPc */
-void daPy_lk_c::setTactZev(unsigned int tactZevPartnerPID, int r30, char* r31) {
+void daPy_lk_c::setTactZev(uint tactZevPartnerPID, int r30, char* r31) {
     if (tactZevPartnerPID != fpcM_ERROR_PROCESS_ID_e) {
         mDoAud_seStart(JA_SE_PRE_TAKT);
     }

src/d/d_attention.cpp

@@ -530,7 +530,7 @@ void dAttention_c::LockonReleaseDistanse() {
 }
 
 /* 8009F980-8009F9B8       .text LockonTargetPId__12dAttention_cFl */
-unsigned int dAttention_c::LockonTargetPId(s32 idx) {
+uint dAttention_c::LockonTargetPId(s32 idx) {
     if (idx >= mLockOnNum)
         return NULL;
 
@@ -574,7 +574,7 @@ u32 dAttHint_c::getPId(void* i_proc) {
 }
 
 /* 8009FACC-8009FAFC       .text convPId__10dAttHint_cFUi */
-fopAc_ac_c* dAttHint_c::convPId(unsigned int i_procID) {
+fopAc_ac_c* dAttHint_c::convPId(uint i_procID) {
     return fopAcM_SearchByID(i_procID);
 }
 
@@ -606,7 +606,7 @@ void dAttHint_c::proc() {
 }
 
 /* 8009FB8C-8009FBBC       .text convPId__11dAttCatch_cFUi */
-fopAc_ac_c* dAttCatch_c::convPId(unsigned int i_procID) {
+fopAc_ac_c* dAttCatch_c::convPId(uint i_procID) {
     return fopAcM_SearchByID(i_procID);
 }
 
@@ -633,7 +633,7 @@ void dAttCatch_c::request(fopAc_ac_c*, u8, f32, f32, f32, s16, int) {
 }
 
 /* 8009FE10-8009FE40       .text convPId__10dAttLook_cFUi */
-fopAc_ac_c* dAttLook_c::convPId(unsigned int i_procID) {
+fopAc_ac_c* dAttLook_c::convPId(uint i_procID) {
     return fopAcM_SearchByID(i_procID);
 }
 

src/d/d_camera.cpp

@@ -558,12 +558,12 @@ void dCamera_c::GetForceLockOnActor() {
 }
 
 /* 8017BCEC-8017BD2C       .text ForceLockOn__9dCamera_cFUi */
-void dCamera_c::ForceLockOn(unsigned int) {
+void dCamera_c::ForceLockOn(uint) {
     /* Nonmatching */
 }
 
 /* 8017BD2C-8017BD5C       .text ForceLockOff__9dCamera_cFUi */
-void dCamera_c::ForceLockOff(unsigned int) {
+void dCamera_c::ForceLockOff(uint) {
     /* Nonmatching */
 }
 

src/d/d_cc_s.cpp

@@ -82,8 +82,8 @@ bool dCcS::ChkAtTgHitAfterCross(bool r4, bool r5, const cCcD_GObjInf* inf1_, con
     dCcD_Stts* stts2 = (dCcD_Stts*)stts2_;
     dCcD_GStts* gstts1 = (dCcD_GStts*)gstts1_;
     dCcD_GStts* gstts2 = (dCcD_GStts*)gstts2_;
-    unsigned int r11 = stts1->GetApid();
-    unsigned int r3 = stts2->GetApid();
+    uint r11 = stts1->GetApid();
+    uint r3 = stts2->GetApid();
     if (r4) {
         gstts1->SetAtApid(r3);
         if (inf1->ChkAtNoConHit() && gstts1->GetAtOldApid() == stts2->GetApid()) {

src/d/d_event.cpp

@@ -707,7 +707,7 @@ u32 dEvt_control_c::getPId(void* ac) {
 }
 
 /* 800715DC-8007160C       .text convPId__14dEvt_control_cFUi */
-fopAc_ac_c* dEvt_control_c::convPId(unsigned int pid) {
+fopAc_ac_c* dEvt_control_c::convPId(uint pid) {
     return fopAcM_SearchByID(pid);
 }
 

src/d/d_kankyo.cpp

@@ -3030,7 +3030,7 @@ void dKy_Sound_init() {
 }
 
 /* 801967F4-801969A8       .text dKy_Sound_set__F4cXyziUii */
-void dKy_Sound_set(cXyz pos, int p2, unsigned int p3, int p4) {
+void dKy_Sound_set(cXyz pos, int p2, uint p3, int p4) {
     camera_class* camera = (camera_class*)dComIfGp_getCamera(0);
 
     BOOL ret = FALSE;

src/f_op/f_op_actor_mng.cpp

@@ -49,7 +49,7 @@ void fopAcM_setRoomLayer(void* pProc, int room_no) {
 }
 
 /* 800241C0-80024230       .text fopAcM_SearchByID__FUiPP10fopAc_ac_c */
-s32 fopAcM_SearchByID(unsigned int actorID, fopAc_ac_c** pDstActor) {
+s32 fopAcM_SearchByID(uint actorID, fopAc_ac_c** pDstActor) {
     if (fpcM_IsCreating(actorID)) {
         *pDstActor = NULL;
     } else {
@@ -92,7 +92,7 @@ fopAcM_prm_class* fopAcM_CreateAppend() {
 }
 
 /* 80024320-80024474       .text createAppend__FUlP4cXyziP5csXyzP4cXyzScUi */
-fopAcM_prm_class * createAppend(u32 parameter, cXyz* pPos, int roomNo, csXyz* pAngle, cXyz* pScale, s8 subtype, unsigned int parentPcId) {
+fopAcM_prm_class * createAppend(u32 parameter, cXyz* pPos, int roomNo, csXyz* pAngle, cXyz* pScale, s8 subtype, uint parentPcId) {
     fopAcM_prm_class * params = fopAcM_CreateAppend();
     if (params == NULL)
         return NULL;
@@ -139,7 +139,7 @@ s32 fopAcM_delete(fopAc_ac_c* pActor) {
 }
 
 /* 800244B8-8002451C       .text fopAcM_delete__FUi */
-s32 fopAcM_delete(unsigned int actorID) {
+s32 fopAcM_delete(uint actorID) {
     fopAc_ac_c* pActor = (fopAc_ac_c*)fopAcM_SearchByID(actorID);
 
     if (pActor != NULL) {
@@ -188,7 +188,7 @@ void* fopAcM_fastCreate(char* pProcNameString, u32 parameter, cXyz* pPos, int ro
 }
 
 /* 80024710-80024790       .text fopAcM_createChild__FsUiUlP4cXyziP5csXyzP4cXyzScPFPv_i */
-s32 fopAcM_createChild(s16 procName, unsigned int parentPcId, u32 parameter, cXyz* pPos, int roomNo, csXyz* pAngle, cXyz* pScale, s8 subtype, createFunc createFunc) {
+s32 fopAcM_createChild(s16 procName, uint parentPcId, u32 parameter, cXyz* pPos, int roomNo, csXyz* pAngle, cXyz* pScale, s8 subtype, createFunc createFunc) {
     fopAcM_prm_class* params = createAppend(parameter, pPos, roomNo, pAngle, pScale, subtype, parentPcId);
     if (params == NULL)
         return fpcM_ERROR_PROCESS_ID_e;
@@ -197,7 +197,7 @@ s32 fopAcM_createChild(s16 procName, unsigned int parentPcId, u32 parameter, cXy
 }
 
 /* 80024790-80024814       .text fopAcM_createChild__FPcUiUlP4cXyziP5csXyzP4cXyzPFPv_i */
-s32 fopAcM_createChild(char* pProcNameString, unsigned int parentPcId, u32 parameter, cXyz* pPos, int roomNo, csXyz* pAngle, cXyz* pScale, createFunc createFunc) {
+s32 fopAcM_createChild(char* pProcNameString, uint parentPcId, u32 parameter, cXyz* pPos, int roomNo, csXyz* pAngle, cXyz* pScale, createFunc createFunc) {
     dStage_objectNameInf * nameInf = dStage_searchName(pProcNameString);
     if (nameInf == NULL)
         return fpcM_ERROR_PROCESS_ID_e;
@@ -206,7 +206,7 @@ s32 fopAcM_createChild(char* pProcNameString, unsigned int parentPcId, u32 param
 }
 
 /* 80024814-800249D4       .text fopAcM_createChildFromOffset__FsUiUlP4cXyziP5csXyzP4cXyzScPFPv_i */
-s32 fopAcM_createChildFromOffset(s16 procName, unsigned int parentPcId, u32 parameter, cXyz* pPosOffs, int roomNo, csXyz* pAngleOffs, cXyz* pScale, s8 subtype, createFunc createFunc) {
+s32 fopAcM_createChildFromOffset(s16 procName, uint parentPcId, u32 parameter, cXyz* pPosOffs, int roomNo, csXyz* pAngleOffs, cXyz* pScale, s8 subtype, createFunc createFunc) {
     fopAc_ac_c * pParent = fopAcM_SearchByID(parentPcId);
     s16 parentAngleY = pParent->current.angle.y;
 
@@ -239,7 +239,7 @@ s32 fopAcM_createChildFromOffset(s16 procName, unsigned int parentPcId, u32 para
 }
 
 /* 800249D4-80024B78       .text fopAcM_createChildFromOffset__FPcUiUlP4cXyziP5csXyzP4cXyzPFPv_i */
-s32 fopAcM_createChildFromOffset(char* pProcNameString, unsigned int parentPcId, u32 parameter, cXyz* pPosOffs, int roomNo, csXyz* pAngleOffs, cXyz* pScale, createFunc createFunc) {
+s32 fopAcM_createChildFromOffset(char* pProcNameString, uint parentPcId, u32 parameter, cXyz* pPosOffs, int roomNo, csXyz* pAngleOffs, cXyz* pScale, createFunc createFunc) {
     fopAc_ac_c * pParent = fopAcM_SearchByID(parentPcId);
     s16 parentAngleY = pParent->current.angle.y;
 

src/f_op/f_op_kankyo_mng.cpp

@@ -12,7 +12,7 @@
 #include "SSystem/SComponent/c_lib.h"
 
 /* 8002A860-8002A880       .text fopKyM_SearchByID__FUi */
-kankyo_class* fopKyM_SearchByID(unsigned int id) {
+kankyo_class* fopKyM_SearchByID(uint id) {
     return (kankyo_class*) fpcEx_SearchByID(id);
 }
 

src/f_op/f_op_msg_mng.cpp

@@ -141,7 +141,7 @@ s32 fopMsgM_setStageLayer(void* proc) {
 }
 
 /* 8002AED4-8002AEF4       .text fopMsgM_SearchByID__FUi */
-msg_class* fopMsgM_SearchByID(unsigned int pid) {
+msg_class* fopMsgM_SearchByID(uint pid) {
     return (msg_class*)fpcEx_SearchByID(pid);
 }
 
@@ -151,7 +151,7 @@ msg_class* fopMsgM_SearchByName(s16 proc_name) {
 }
 
 /* 8002AF24-8002AF44       .text fopMsgM_IsExecuting__FUi */
-BOOL fopMsgM_IsExecuting(unsigned int pid) {
+BOOL fopMsgM_IsExecuting(uint pid) {
     return fpcEx_IsExist(pid);
 }
 
@@ -166,7 +166,7 @@ void fopMsgM_Delete(void* i_this) {
 }
 
 /* 8002AF6C-8002B030       .text createAppend__FP10fopAc_ac_cP4cXyzPUlPUlUi */
-fopMsg_prm_class* createAppend(fopAc_ac_c* actor, cXyz* pos, u32* msg_id, u32* p4, unsigned int p5) {
+fopMsg_prm_class* createAppend(fopAc_ac_c* actor, cXyz* pos, u32* msg_id, u32* p4, uint p5) {
     fopMsg_prm_class* params = (fopMsg_prm_class*) cMl::memalignB(-4, sizeof(fopMsg_prm_class));
     if (params == NULL)
         return NULL;
@@ -190,12 +190,12 @@ fopMsg_prm_class* createAppend(fopAc_ac_c* actor, cXyz* pos, u32* msg_id, u32* p
 }
 
 /* 8002B030-8002B0CC       .text createMGameTermAppend__FssiiUi */
-void createMGameTermAppend(s16, s16, int, int, unsigned int) {
+void createMGameTermAppend(s16, s16, int, int, uint) {
     /* Nonmatching */
 }
 
 /* 8002B0CC-8002B1C8       .text createTimerAppend__FiUsUcUcffffUi */
-void createTimerAppend(int, u16, u8, u8, f32, f32, f32, f32, unsigned int) {
+void createTimerAppend(int, u16, u8, u8, f32, f32, f32, f32, uint) {
     /* Nonmatching */
 }
 

src/f_op/f_op_overlap_mng.cpp

@@ -37,7 +37,7 @@ void fopOvlpM_Done(overlap_task_class* pTaskClass) {
     cReq_Done(&pTaskClass->mRq);
 }
 
-void fopOvlpM_ToldAboutID(unsigned int pcId) {
+void fopOvlpM_ToldAboutID(uint pcId) {
     if (l_fopOvlpM_overlap[0] != NULL)
         l_fopOvlpM_overlap[0]->mpTask->mScenePId = pcId;
 }

src/f_op/f_op_scene_mng.cpp

@@ -9,7 +9,7 @@
 #include "f_pc/f_pc_searcher.h"
 #include "JSystem/JUtility/JUTAssert.h"
 
-scene_class* fopScnM_SearchByID(unsigned int id) {
+scene_class* fopScnM_SearchByID(uint id) {
     return (scene_class*)fopScnIt_Judge((fop_ScnItFunc)fpcSch_JudgeByID, &id);
 }
 
@@ -26,7 +26,7 @@ int fopScnM_ChangeReq(scene_class* i_scene, s16 procName, s16 fadeTime, u16 para
     return 1;
 }
 
-unsigned int fopScnM_DeleteReq(scene_class* i_scene) {
+uint fopScnM_DeleteReq(scene_class* i_scene) {
     u32 sceneRequestID = fopScnRq_Request(1, i_scene, 0x7FFF, 0, 0x7FFF, 0);
     return sceneRequestID != fpcM_ERROR_PROCESS_ID_e;
 }

src/f_op/f_op_scene_req.cpp

@@ -138,7 +138,7 @@ s32 fopScnRq_Request(int param_1, scene_class* i_scene, s16 param_3, void* param
     return ret;
 }
 
-s32 fopScnRq_ReRequest(unsigned int param_1, s16 param_2, void* param_3) {
+s32 fopScnRq_ReRequest(uint param_1, s16 param_2, void* param_3) {
     return fpcNdRq_ReRequest(param_1, param_2, param_3);
 }
 

src/f_pc/f_pc_base.cpp

@@ -14,7 +14,7 @@
 #include "dolphin/types.h"
 
 // hack to make functions that return comparisons as int match
-extern int __cntlzw(unsigned int);
+extern int __cntlzw(uint);
 inline BOOL checkEqual(s32 a, s32 b) {
     return (u32)__cntlzw(a - b) >> 5;
 }
@@ -81,7 +81,7 @@ s32 fpcBs_Delete(base_process_class* i_proc) {
 }
 
 /* 8003CA60-8003CB5C       .text fpcBs_Create__FsUiPv */
-base_process_class* fpcBs_Create(s16 i_profName, unsigned int i_procID, void* i_data) {
+base_process_class* fpcBs_Create(s16 i_profName, uint i_procID, void* i_data) {
     process_profile_definition* procProfDef;
     base_process_class* procClass;
     u32 size;

src/f_pc/f_pc_create_iter.cpp

@@ -36,7 +36,7 @@ void* fpcCtIt_filter_JudgeInLayer(create_tag* i_createTag, fpcCtIt_jilprm_c* i_i
 }
 
 /* 8003CCD4-8003CD0C       .text fpcCtIt_JudgeInLayer__FUiPFPvPv_PvPv */
-void* fpcCtIt_JudgeInLayer(unsigned int i_layerID, fpcCtIt_JudgeFunc i_judgeFunc, void* i_data) {
+void* fpcCtIt_JudgeInLayer(uint i_layerID, fpcCtIt_JudgeFunc i_judgeFunc, void* i_data) {
     fpcCtIt_jilprm_c data;
     data.mLayerID = i_layerID;
     data.mFunc = i_judgeFunc;

src/f_pc/f_pc_create_req.cpp

@@ -13,13 +13,13 @@
 #include "f_pc/f_pc_layer_iter.h"
 
 /* 8003CD0C-8003CD28       .text fpcCtRq_isCreatingByID__FP10create_tagPUi */
-bool fpcCtRq_isCreatingByID(create_tag* i_createTag, unsigned int* i_procID) {
+bool fpcCtRq_isCreatingByID(create_tag* i_createTag, uint* i_procID) {
     create_request* pReq = static_cast<create_request*>(i_createTag->base.mpTagData);
     return pReq->mBsPcId == *i_procID;
 }
 
 /* 8003CD28-8003CD60       .text fpcCtRq_IsCreatingByID__FUi */
-BOOL fpcCtRq_IsCreatingByID(unsigned int i_id) {
+BOOL fpcCtRq_IsCreatingByID(uint i_id) {
     return fpcCtIt_Judge((fpcLyIt_JudgeFunc)fpcCtRq_isCreatingByID, &i_id) != NULL ? TRUE : FALSE;
 }
 

src/f_pc/f_pc_creator.cpp

@@ -8,7 +8,7 @@
 #include "f_pc/f_pc_create_req.h"
 
 /* 8003D0E8-8003D108       .text fpcCt_IsCreatingByID__FUi */
-BOOL fpcCt_IsCreatingByID(unsigned int i_id) {
+BOOL fpcCt_IsCreatingByID(uint i_id) {
     return fpcCtRq_IsCreatingByID(i_id);
 }
 

src/f_pc/f_pc_delete_tag.cpp

@@ -3,14 +3,14 @@
 // Translation Unit: f_pc_delete_tag.cpp
 //
 
-#include "SSystem/SComponent/c_list.h"
 #include "f_pc/f_pc_delete_tag.h"
+#include "SSystem/SComponent/c_list.h"
 #include "dolphin/types.h"
 
 node_list_class g_fpcDtTg_Queue = {NULL, NULL, 0};
 
 // hack to make functions that return comparisons as int match
-extern int __cntlzw(unsigned int);
+extern int __cntlzw(uint);
 inline BOOL checkEqual(s32 a, s32 b) {
     return (u32)__cntlzw(a - b) >> 5;
 }

src/f_pc/f_pc_executor.cpp

@@ -14,7 +14,7 @@ base_process_class* fpcEx_Search(fpcLyIt_JudgeFunc i_judgeFunc, void* i_data) {
 }
 
 /* 8003D5D0-8003D614       .text fpcEx_SearchByID__FUi */
-base_process_class* fpcEx_SearchByID(unsigned int i_id) {
+base_process_class* fpcEx_SearchByID(uint i_id) {
     if (i_id + 2 <= 1)
         return NULL;
 
@@ -22,7 +22,7 @@ base_process_class* fpcEx_SearchByID(unsigned int i_id) {
 }
 
 /* 8003D614-8003D63C       .text fpcEx_IsExist__FUi */
-BOOL fpcEx_IsExist(unsigned int i_id) {
+BOOL fpcEx_IsExist(uint i_id) {
     return fpcEx_SearchByID(i_id) != NULL ? TRUE : FALSE;
 }
 

src/f_pc/f_pc_layer.cpp

@@ -100,7 +100,7 @@ layer_class* fpcLy_CurrentLayer() {
 }
 
 /* 8003D974-8003D9C4       .text fpcLy_Search__FUi */
-layer_class* fpcLy_Search(unsigned int i_id) {
+layer_class* fpcLy_Search(uint i_id) {
     layer_class* layer_p = fpcLy_RootLayer();
     while (layer_p != NULL) {
         if (layer_p->mLayerID == i_id) {
@@ -112,7 +112,7 @@ layer_class* fpcLy_Search(unsigned int i_id) {
 }
 
 /* 8003D9C4-8003DA34       .text fpcLy_Layer__FUi */
-layer_class* fpcLy_Layer(unsigned int i_id) {
+layer_class* fpcLy_Layer(uint i_id) {
     if (i_id == fpcLy_ROOT_e || fpcLy_RootLayer()->mLayerID == i_id) {
         return fpcLy_RootLayer();
     } else if (i_id == fpcLy_CURRENT_e || fpcLy_CurrentLayer()->mLayerID == i_id) {

src/f_pc/f_pc_layer_tag.cpp

@@ -7,7 +7,7 @@
 #include "f_pc/f_pc_layer.h"
 
 /* 8003DF4C-8003E044       .text fpcLyTg_ToQueue__FP26layer_management_tag_classUiUsUs */
-s32 fpcLyTg_ToQueue(layer_management_tag_class* i_lyTag, unsigned int i_layerID, u16 i_listID,
+s32 fpcLyTg_ToQueue(layer_management_tag_class* i_lyTag, uint i_layerID, u16 i_listID,
                     u16 i_listPriority) {
     if (i_lyTag->mpLayer == NULL && i_layerID == fpcLy_NONE_e) {
         return 0;
@@ -45,7 +45,7 @@ s32 fpcLyTg_QueueTo(layer_management_tag_class* i_lyTag) {
 }
 
 /* 8003E0A4-8003E128       .text fpcLyTg_Move__FP26layer_management_tag_classUiUsUs */
-s32 fpcLyTg_Move(layer_management_tag_class* i_lyTag, unsigned int i_layerID, u16 i_listID,
+s32 fpcLyTg_Move(layer_management_tag_class* i_lyTag, uint i_layerID, u16 i_listID,
                  u16 i_listPriority) {
     layer_class* layer = fpcLy_Layer(i_layerID);
     if (layer == NULL) {
@@ -59,7 +59,7 @@ s32 fpcLyTg_Move(layer_management_tag_class* i_lyTag, unsigned int i_layerID, u1
 }
 
 /* 8003E128-8003E1DC       .text fpcLyTg_Init__FP26layer_management_tag_classUiPv */
-s32 fpcLyTg_Init(layer_management_tag_class* i_lyTag, unsigned int i_id, void* i_data) {
+s32 fpcLyTg_Init(layer_management_tag_class* i_lyTag, uint i_id, void* i_data) {
     static layer_management_tag_class crear = {
         NULL, NULL, NULL, NULL, 0, NULL, 0xFFFF, 0xFFFF,
     };