diff options
69 files changed, 178 insertions, 176 deletions
diff --git a/include/SSystem/SComponent/c_bg_s_chk.h b/include/SSystem/SComponent/c_bg_s_chk.h index 11d5dfb9..0158deef 100644 --- a/include/SSystem/SComponent/c_bg_s_chk.h +++ b/include/SSystem/SComponent/c_bg_s_chk.h @@ -17,7 +17,7 @@ class cBgS_Chk { private: /* 0x0 */ cBgS_PolyPassChk* mPolyPassChk; /* 0x4 */ cBgS_GrpPassChk* mGrpPassChk; - /* 0x8 */ u32 mActorPid; + /* 0x8 */ uint mActorPid; /* 0xC */ u8 unk_0x0C; /* 0x10 */ // __vtable__ @@ -35,8 +35,8 @@ public: } bool ChkSameActorPid(uint) const; - void SetActorPid(u32 pid) { mActorPid = pid; } - u32 GetActorPid() const { return mActorPid; } + void SetActorPid(uint pid) { mActorPid = pid; } + uint GetActorPid() const { return mActorPid; } void SetPolyPassChk(cBgS_PolyPassChk* p_chk) { mPolyPassChk = p_chk; } void SetGrpPassChk(cBgS_GrpPassChk* p_chk) { mGrpPassChk = p_chk; } cBgS_PolyPassChk* GetPolyPassChk() const { return mPolyPassChk; } diff --git a/include/SSystem/SComponent/c_cc_d.h b/include/SSystem/SComponent/c_cc_d.h index b17ac208..50bef911 100644 --- a/include/SSystem/SComponent/c_cc_d.h +++ b/include/SSystem/SComponent/c_cc_d.h @@ -353,7 +353,7 @@ class cCcD_Stts { private: /* 0x00 */ cXyz m_cc_move; /* 0x0C */ fopAc_ac_c* mActor; - /* 0x10 */ int mApid; + /* 0x10 */ uint mApid; /* 0x14 */ u8 mWeight; /* 0x15 */ u8 field_0x15; /* 0x16 */ u8 mDmg; 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; diff --git a/include/f_op/f_op_actor.h b/include/f_op/f_op_actor.h index a7a3f08d..10c6073a 100644 --- a/include/f_op/f_op_actor.h +++ b/include/f_op/f_op_actor.h @@ -268,7 +268,7 @@ public: /* 0x1C2 */ u8 gbaName; /* 0x1C4 */ u32 actor_status; /* 0x1C8 */ u32 actor_condition; - /* 0x1CC */ u32 parentActorID; + /* 0x1CC */ uint parentActorID; /* 0x1D0 */ actor_place home; /* 0x1E4 */ actor_place old; /* 0x1F8 */ actor_place current; diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h index f384857e..d05d341f 100644 --- a/include/f_op/f_op_actor_mng.h +++ b/include/f_op/f_op_actor_mng.h @@ -39,7 +39,7 @@ struct fopAcM_prm_class { /* 0x16 */ u16 mSetId; /* 0x18 */ fopAcM_prmScale_class mScale; /* 0x1B */ u8 mGbaName; - /* 0x1C */ s32 mParentPcId; // parent process ID + /* 0x1C */ uint mParentPcId; // parent process ID /* 0x20 */ s8 mSubtype; /* 0x21 */ s8 mRoomNo; }; @@ -81,7 +81,7 @@ inline s8 fopAcM_GetRoomNo(fopAc_ac_c* pActor) { return pActor->current.roomNo; } -inline u32 fopAcM_GetID(void* pActor) { +inline uint fopAcM_GetID(void* pActor) { return fpcM_GetID(pActor); } @@ -419,13 +419,13 @@ void fopAcM_Log(fopAc_ac_c* p_actor, char* str); s32 fopAcM_delete(fopAc_ac_c* p_actor); s32 fopAcM_delete(uint actorID); -s32 fopAcM_create(s16 i_procName, u32 i_parameter, cXyz* i_pos = NULL, int i_roomNo = -1, - csXyz* i_angle = NULL, cXyz* i_scale = NULL, s8 i_subType = -1, - createFunc i_createFunc = NULL); +uint fopAcM_create(s16 i_procName, u32 i_parameter, cXyz* i_pos = NULL, int i_roomNo = -1, + csXyz* i_angle = NULL, cXyz* i_scale = NULL, s8 i_subType = -1, + createFunc i_createFunc = NULL); -s32 fopAcM_create(char*, u32 i_parameter, cXyz* i_pos = NULL, int i_roomNo = -1, - csXyz* i_angle = NULL, cXyz* i_scale = NULL, - createFunc i_createFunc = NULL); +uint fopAcM_create(char*, u32 i_parameter, cXyz* i_pos = NULL, int i_roomNo = -1, + csXyz* i_angle = NULL, cXyz* i_scale = NULL, + createFunc i_createFunc = NULL); inline s32 fopAcM_create(s16 i_procName, createFunc i_createFunc, void*); @@ -437,15 +437,19 @@ void* fopAcM_fastCreate(char* p_actorName, u32 parameter, cXyz* pActorPos = NULL csXyz* p_angle = NULL, cXyz* p_scale = NULL, createFunc p_createFunc = NULL, void* p_createFuncData = NULL); -s32 fopAcM_createChild(s16 procName, uint parentPId, u32 parameters, cXyz* p_pos, - int roomNo, csXyz* p_angle, cXyz* p_scale = NULL, s8 subType = -1, - createFunc p_createFunc = NULL); +uint fopAcM_createChild(s16 procName, uint parentPId, u32 parameters, cXyz* p_pos, + int roomNo, csXyz* p_angle, cXyz* p_scale = NULL, s8 subType = -1, + createFunc p_createFunc = NULL); -s32 fopAcM_createChild(char* pProcNameString, uint parentPcId, u32 parameter, cXyz* pPos, int roomNo, csXyz* pAngle, cXyz* pScale, createFunc createFunc); +uint fopAcM_createChild(char* pProcNameString, uint parentPcId, u32 parameter, cXyz* pPos, + int roomNo, csXyz* pAngle, cXyz* pScale, createFunc createFunc); -s32 fopAcM_createChildFromOffset(s16 procName, uint parentProcID, u32 actorParams, - cXyz* p_pos, int roomNo, csXyz* p_angle, - cXyz* p_scale, s8 subType, createFunc p_createFunc); +uint fopAcM_createChildFromOffset(s16 procName, uint parentProcID, u32 actorParams, + cXyz* p_pos, int roomNo, csXyz* p_angle, + cXyz* p_scale, s8 subType, createFunc p_createFunc); +uint fopAcM_createChildFromOffset(char* pProcNameString, uint parentPcId, u32 parameter, + cXyz* pPosOffs, int roomNo, csXyz* pAngleOffs, cXyz* pScale, + createFunc createFunc); void fopAcM_DeleteHeap(fopAc_ac_c* p_actor); @@ -509,37 +513,37 @@ fopAc_ac_c* fopAcM_getTalkEventPartner(fopAc_ac_c*); fopAc_ac_c* fopAcM_getItemEventPartner(fopAc_ac_c*); fopAc_ac_c* fopAcM_getEventPartner(fopAc_ac_c*); -s32 fopAcM_createItemForPresentDemo(cXyz* p_pos, int i_itemNo, u8 argFlag = 0x00, int i_itemBitNo = -1, - int i_roomNo = -1, csXyz* p_angle = NULL, cXyz* p_scale = NULL); +uint fopAcM_createItemForPresentDemo(cXyz* p_pos, int i_itemNo, u8 argFlag = 0x00, int i_itemBitNo = -1, + int i_roomNo = -1, csXyz* p_angle = NULL, cXyz* p_scale = NULL); -s32 fopAcM_createItemForTrBoxDemo(cXyz* p_pos, int i_itemNo, int i_itemBitNo = -1, - int i_roomNo = -1, csXyz* p_angle = NULL, cXyz* p_scale = NULL); +uint fopAcM_createItemForTrBoxDemo(cXyz* p_pos, int i_itemNo, int i_itemBitNo = -1, + int i_roomNo = -1, csXyz* p_angle = NULL, cXyz* p_scale = NULL); -s32 fopAcM_createItemFromTable(cXyz* p_pos, int i_tableNo, int i_itemBitNo, int i_roomNo, int, - csXyz* p_angle, int, cXyz* p_scale = NULL); +uint fopAcM_createItemFromTable(cXyz* p_pos, int i_tableNo, int i_itemBitNo, int i_roomNo, int, + csXyz* p_angle, int, cXyz* p_scale = NULL); -s32 fopAcM_createRaceItemFromTable(cXyz* pos, int i_itemNo, int i_itemBitNo, int i_roomNo, - csXyz* angle, cXyz* scale, int param_7); +uint fopAcM_createRaceItemFromTable(cXyz* pos, int i_itemNo, int i_itemBitNo, int i_roomNo, + csXyz* angle, cXyz* scale, int param_7); -s32 fopAcM_createShopItem(cXyz* p_pos, int i_itemNo, csXyz* p_angle, int roomNo, cXyz* scale = NULL, - createFunc createFunc = NULL); +uint fopAcM_createShopItem(cXyz* p_pos, int i_itemNo, csXyz* p_angle, int roomNo, cXyz* scale = NULL, + createFunc createFunc = NULL); -s32 fopAcM_createRaceItem(cXyz* p_pos, int i_itemNo, int i_itemBitNo, csXyz* p_angle, int roomNo, - cXyz* scale, int param_7); +uint fopAcM_createRaceItem(cXyz* p_pos, int i_itemNo, int i_itemBitNo, csXyz* p_angle, int roomNo, + cXyz* scale, int param_7); -s32 fopAcM_createIball(cXyz* p_pos, int itemTableIdx, int roomNo, csXyz* p_angle, int itemStealNum); +uint fopAcM_createIball(cXyz* p_pos, int itemTableIdx, int roomNo, csXyz* p_angle, int itemStealNum); -s32 fopAcM_createDemoItem(cXyz* p_pos, int itemNo, int itemBitNo, csXyz* p_angle, - int roomNo, cXyz* scale, u8 argFlag); +uint fopAcM_createDemoItem(cXyz* p_pos, int itemNo, int itemBitNo, csXyz* p_angle, + int roomNo, cXyz* scale, u8 argFlag); -s32 fopAcM_createItemForBoss(cXyz* p_pos, int param_2, int roomNo, csXyz* p_angle, - cXyz* p_scale = NULL, int param_8 = 0); +uint fopAcM_createItemForBoss(cXyz* p_pos, int param_2, int roomNo, csXyz* p_angle, + cXyz* p_scale = NULL, int param_8 = 0); daItem_c* fopAcM_createItemForSimpleDemo(cXyz* p_pos, int i_itemNo, int i_roomNo, csXyz* p_angle, cXyz* p_scale, f32 speedF, f32 speedY); -s32 fopAcM_createItem(cXyz* p_pos, int itemNo, int param_3, int roomNo, int type, csXyz* p_angle, - int action, cXyz* p_scale = NULL); +uint fopAcM_createItem(cXyz* p_pos, int itemNo, int param_3, int roomNo, int type, csXyz* p_angle, + int action, cXyz* p_scale = NULL); void* fopAcM_fastCreateItem2(cXyz* p_pos, int itemNo, int param_3, int roomNo, int param_5, csXyz* p_angle, int, cXyz* p_scale = NULL); @@ -554,7 +558,7 @@ BOOL stealItem_CB(void* actor); fopAc_ac_c* fopAcM_myRoomSearchEnemy(s8 roomNo); -s32 fopAcM_createDisappear(fopAc_ac_c* i_actor, cXyz* p_pos, u8 i_scale, u8 i_health = 0, u8 i_itemBitNo = -1); +uint fopAcM_createDisappear(fopAc_ac_c* i_actor, cXyz* p_pos, u8 i_scale, u8 i_health = 0, u8 i_itemBitNo = -1); void fopAcM_setCarryNow(fopAc_ac_c* i_this, BOOL stageLayer); void fopAcM_cancelCarryNow(fopAc_ac_c* i_this); s32 fopAcM_otoCheck(fopAc_ac_c*, f32); diff --git a/include/f_op/f_op_kankyo_mng.h b/include/f_op/f_op_kankyo_mng.h index 0895436b..cf18c2cd 100644 --- a/include/f_op/f_op_kankyo_mng.h +++ b/include/f_op/f_op_kankyo_mng.h @@ -15,13 +15,13 @@ struct fopKyM_prm_class { typedef int (*fopKyM_CreateFunc)(void*); void fopKyM_Delete(void* param_1); -int fopKyM_Create(s16 param_1, fopKyM_CreateFunc param_2 = NULL, void* param_3 = NULL); -int fopKyM_create(s16 i_procName, int i_param, cXyz* i_pos = NULL, cXyz* i_scale = NULL, +uint fopKyM_Create(s16 param_1, fopKyM_CreateFunc param_2 = NULL, void* param_3 = NULL); +uint fopKyM_create(s16 i_procName, int i_param, cXyz* i_pos = NULL, cXyz* i_scale = NULL, fopKyM_CreateFunc i_createFunc = NULL); kankyo_class* fopKyM_SearchByID(uint id); base_process_class* fopKyM_fastCreate(s16 param_0, int param_1, cXyz* param_2, cXyz* param_3, fopKyM_CreateFunc); -int fopKyM_createWpillar(cXyz const* i_pos, f32 scaleXZ, f32 scaleY, int i_param); +uint fopKyM_createWpillar(cXyz const* i_pos, f32 scaleXZ, f32 scaleY, int i_param); inline void* fopKyM_GetAppend(void* param_0) { return fpcM_GetAppend(param_0); diff --git a/include/f_op/f_op_msg_mng.h b/include/f_op/f_op_msg_mng.h index 3ecbf21f..ecb88a96 100644 --- a/include/f_op/f_op_msg_mng.h +++ b/include/f_op/f_op_msg_mng.h @@ -67,9 +67,9 @@ void fopMsgM_setMessageID(uint); void fopMsgM_destroyExpHeap(JKRExpHeap*); f32 fopMsgM_valueIncrease(int param_0, int param_1, u8 param_2); s32 fopMsgM_setStageLayer(void*); -int fopMsgM_messageSet(u32 i_msgNo, fopAc_ac_c* i_actorP); -int fopMsgM_messageSet(u32 param_0, cXyz*); -int fopMsgM_messageSet(u32 param_0); +uint fopMsgM_messageSet(u32 i_msgNo, fopAc_ac_c* i_actorP); +uint fopMsgM_messageSet(u32 param_0, cXyz*); +uint fopMsgM_messageSet(u32 param_0); int fopMsgM_messageSetDemo(u32 param_0); msg_class* fopMsgM_SearchByID(uint param_0); char* fopMsgM_messageGet(char* msg, u32 string_id); diff --git a/include/f_op/f_op_overlap_req.h b/include/f_op/f_op_overlap_req.h index 7d01ee36..5d222c1f 100644 --- a/include/f_op/f_op_overlap_req.h +++ b/include/f_op/f_op_overlap_req.h @@ -18,7 +18,7 @@ public: /* 0x10 */ s16 mProcName; /* 0x12 */ u8 field_0x12; /* 0x13 */ u8 field_0x13; - /* 0x14 */ int mPId; + /* 0x14 */ uint mPId; /* 0x18 */ request_of_phase_process_class mPhs; /* 0x20 */ overlap_task_class * mpTask; /* 0x24 */ layer_class* pCurrentLayer; diff --git a/include/f_op/f_op_scene_mng.h b/include/f_op/f_op_scene_mng.h index 55583405..7a381ba7 100644 --- a/include/f_op/f_op_scene_mng.h +++ b/include/f_op/f_op_scene_mng.h @@ -24,7 +24,7 @@ inline layer_class * fpcM_Layer(const void* pProc) { return &((process_node_class*)pProc)->mLayer; } -inline u32 fopScnM_GetID(void* proc) { +inline uint fopScnM_GetID(void* proc) { return fpcM_GetID(proc); } diff --git a/include/f_pc/f_pc_base.h b/include/f_pc/f_pc_base.h index 6b62695f..574f7f83 100644 --- a/include/f_pc/f_pc_base.h +++ b/include/f_pc/f_pc_base.h @@ -14,7 +14,7 @@ typedef struct profile_method_class profile_method_class; typedef struct base_process_class { /* 0x00 */ u32 mBsType; - /* 0x04 */ u32 mBsPcId; + /* 0x04 */ uint mBsPcId; /* 0x08 */ s16 mProcName; /* 0x0A */ s8 mUnk0; /* 0x0B */ u8 mPauseFlag; diff --git a/include/f_pc/f_pc_create_req.h b/include/f_pc/f_pc_create_req.h index 44b5ae8b..b6f61431 100644 --- a/include/f_pc/f_pc_create_req.h +++ b/include/f_pc/f_pc_create_req.h @@ -23,7 +23,7 @@ typedef struct create_request { process_method_tag_class mMtdTg; create_request_method_class* mpCtRqMtd; void* mpUnk1; - s32 mBsPcId; + uint mBsPcId; struct base_process_class* mpRes; layer_class* mpLayer; } create_request; // Size: 0x48 diff --git a/include/f_pc/f_pc_manager.h b/include/f_pc/f_pc_manager.h index 17eec220..98ae42f5 100644 --- a/include/f_pc/f_pc_manager.h +++ b/include/f_pc/f_pc_manager.h @@ -15,7 +15,7 @@ typedef int (*FastCreateReqFunc)(void*); typedef void (*fpcM_ManagementFunc)(void); typedef int (*fpcM_DrawIteraterFunc)(void*, void*); -inline u32 fpcM_GetID(void* pProc) { +inline uint fpcM_GetID(void* pProc) { return pProc != NULL ? ((base_process_class*)pProc)->mBsPcId : fpcM_ERROR_PROCESS_ID_e; } inline s16 fpcM_GetName(void* pActor) { @@ -33,7 +33,7 @@ inline s16 fpcM_GetProfName(void* pActor) { return ((base_process_class*)pActor)->mProfName; } -inline int fpcM_Create(s16 procName, FastCreateReqFunc createFunc, void* process) { +inline uint fpcM_Create(s16 procName, FastCreateReqFunc createFunc, void* process) { return fpcSCtRq_Request(fpcLy_CurrentLayer(), procName, (stdCreateFunc)createFunc, NULL, process); } diff --git a/include/f_pc/f_pc_node_req.h b/include/f_pc/f_pc_node_req.h index 5cfc0f69..0f3bed44 100644 --- a/include/f_pc/f_pc_node_req.h +++ b/include/f_pc/f_pc_node_req.h @@ -17,7 +17,7 @@ typedef struct node_create_request_method_class { // needed to match struct copy typedef struct unk_process_node_class { process_node_class* mpNodeProc; - u32 mProcId; + uint mProcId; } unk_process_node_class; typedef struct node_create_request { @@ -30,7 +30,7 @@ typedef struct node_create_request { s32 mRequestId; unk_process_node_class mNodeProc; layer_class* mpLayerClass; - u32 mCreatingID; + uint mCreatingID; s16 mProcName; void* mpUserData; s16 unk_0x60; diff --git a/include/f_pc/f_pc_stdcreate_req.h b/include/f_pc/f_pc_stdcreate_req.h index 452ce7c8..09c98be0 100644 --- a/include/f_pc/f_pc_stdcreate_req.h +++ b/include/f_pc/f_pc_stdcreate_req.h @@ -24,6 +24,6 @@ s32 fpcSCtRq_phase_Done(standard_create_request_class*); s32 fpcSCtRq_Handler(standard_create_request_class* pStdCreateReq); s32 fpcSCtRq_Delete(standard_create_request_class*); s32 fpcSCtRq_Cancel(standard_create_request_class*); -s32 fpcSCtRq_Request(layer_class* param_1, s16 param_2, stdCreateFunc param_3, void* param_4, void* param_5); +uint fpcSCtRq_Request(layer_class* param_1, s16 param_2, stdCreateFunc param_3, void* param_4, void* param_5); #endif diff --git a/src/d/actor/d_a_ghostship.cpp b/src/d/actor/d_a_ghostship.cpp index f410e311..fb191a17 100644 --- a/src/d/actor/d_a_ghostship.cpp +++ b/src/d/actor/d_a_ghostship.cpp @@ -148,7 +148,7 @@ void daGhostship_c::modePathMoveInit() { /* 0000077C-000007D0 .text modePathMove__13daGhostship_cFv */ void daGhostship_c::modePathMove() { - if(pathId != 0xFF) { + if(mPathNo != 0xFF) { mPathSpeed = 10.0f; pathMove(); } @@ -209,8 +209,8 @@ void daGhostship_c::createInit() { dLib_setCirclePath(&mPaths[i]); } - if(pathId != 0xFF) { - mPath = dPath_GetRoomPath(pathId, fopAcM_GetRoomNo(this)); + if(mPathNo != 0xFF) { + mPath = dPath_GetRoomPath(mPathNo, fopAcM_GetRoomNo(this)); modePathMoveInit(); } else { @@ -246,7 +246,7 @@ void daGhostship_c::createInit() { /* 00000C78-00000C8C .text getArg__13daGhostship_cFv */ void daGhostship_c::getArg() { u32 param = fopAcM_GetParam(this); - pathId = fopAcM_GetParamBit(param, 0x10, 8); + mPathNo = fopAcM_GetParamBit(param, 0x10, 8); moonPhase = fopAcM_GetParamBit(param, 0, 8); } diff --git a/src/d/actor/d_a_npc_ji1.cpp b/src/d/actor/d_a_npc_ji1.cpp index d4e9ff85..42c25d41 100644 --- a/src/d/actor/d_a_npc_ji1.cpp +++ b/src/d/actor/d_a_npc_ji1.cpp @@ -957,7 +957,7 @@ void daNpc_Ji1_c::createItem() { dComIfGs_onEventBit(0xF10); } - u32 itemPID = fopAcM_createItemForPresentDemo(¤t.pos, itemNo, 0, -1, current.roomNo); + uint itemPID = fopAcM_createItemForPresentDemo(¤t.pos, itemNo, 0, -1, current.roomNo); if(itemPID != fpcM_ERROR_PROCESS_ID_e) { dComIfGp_event_setItemPartnerId(itemPID); } diff --git a/src/d/actor/d_a_npc_md.cpp b/src/d/actor/d_a_npc_md.cpp index d33bce2c..e9c38edd 100644 --- a/src/d/actor/d_a_npc_md.cpp +++ b/src/d/actor/d_a_npc_md.cpp @@ -2056,10 +2056,10 @@ BOOL daNpc_Md_c::actionLookDown(int) { /* 0000CB8C-0000CC10 .text talk_init__10daNpc_Md_cFv */ BOOL daNpc_Md_c::talk_init() { if (l_msgId == fpcM_ERROR_PROCESS_ID_e) { - if (mMsgId == 0x5AC) { + if (mMsgNo == 0x5AC) { l_msgId = fopMsgM_tactMessageSet(); } else { - l_msgId = fopMsgM_messageSet(mMsgId, this); + l_msgId = fopMsgM_messageSet(mMsgNo, this); } } else { l_msg = fopMsgM_SearchByID(l_msgId); @@ -2075,9 +2075,9 @@ BOOL daNpc_Md_c::talk(int r4) { u16 msgStatus = l_msg->mStatus; u8 msgAnmAtr = dComIfGp_getMesgAnimeAttrInfo(); if (msgStatus == fopMsgStts_MSG_DISPLAYED_e) { - l_msg->mStatus = next_msgStatus(&mMsgId); + l_msg->mStatus = next_msgStatus(&mMsgNo); if (l_msg->mStatus == fopMsgStts_MSG_CONTINUES_e) { - fopMsgM_messageSet(mMsgId); + fopMsgM_messageSet(mMsgNo); m313A = 0; } } else if (msgStatus == fopMsgStts_UNK15_e) { @@ -2093,7 +2093,7 @@ BOOL daNpc_Md_c::talk(int r4) { } } } else if (msgStatus == fopMsgStts_MSG_TYPING_e) { - if (m313A == 0 && !fopAcM_checkCarryNow(this) && !isShipRide() && mMsgId != 0x05AC) { + if (m313A == 0 && !fopAcM_checkCarryNow(this) && !isShipRide() && mMsgNo != 0x05AC) { int anmType = getAnmType(msgAnmAtr); if (anmType >= 0) { setAnm(anmType); @@ -2105,7 +2105,7 @@ BOOL daNpc_Md_c::talk(int r4) { return TRUE; } - if (!fopAcM_checkCarryNow(this) && !isShipRide() && mMsgId != 0x05AC) { + if (!fopAcM_checkCarryNow(this) && !isShipRide() && mMsgNo != 0x05AC) { if (m313A == 1 && msgAnmAtr == 0x14 && m312A != 0) { setAnm(0x1B); m313A = 1; diff --git a/src/d/actor/d_a_obj_toripost.cpp b/src/d/actor/d_a_obj_toripost.cpp index c4507582..8896b1fd 100644 --- a/src/d/actor/d_a_obj_toripost.cpp +++ b/src/d/actor/d_a_obj_toripost.cpp @@ -166,7 +166,7 @@ void daObjTpost_c::cutPresentStart(int staffIdx) { /* 000003D8-00000474 .text cutPresentProc__12daObjTpost_cFi */ void daObjTpost_c::cutPresentProc(int staffIdx) { - u32 itemPID = fopAcM_createItemForPresentDemo(¤t.pos, m_letter[mNumReadable].mItemNo); + uint itemPID = fopAcM_createItemForPresentDemo(¤t.pos, m_letter[mNumReadable].mItemNo); if(itemPID != fpcM_ERROR_PROCESS_ID_e) { dComIfGp_event_setItemPartnerId(itemPID); dComIfGp_evmng_cutEnd(staffIdx); diff --git a/src/d/actor/d_a_player_food.inc b/src/d/actor/d_a_player_food.inc index 20dbc34d..521d138e 100644 --- a/src/d/actor/d_a_player_food.inc +++ b/src/d/actor/d_a_player_food.inc @@ -121,7 +121,7 @@ BOOL daPy_lk_c::procFoodThrow() { dComIfGp_evmng_cutEnd(mStaffIdx); } else { dComIfGp_event_reset(); - u32 playerPID = fopAcM_GetID(this); + uint playerPID = fopAcM_GetID(this); dCam_getBody()->EndEventCamera(playerPID); endDemoMode(); } @@ -212,7 +212,7 @@ BOOL daPy_lk_c::procFoodSet() { } else if (m34D0 < 0) { dComIfGp_event_reset(); deleteEquipItem(FALSE); - u32 playerPID = fopAcM_GetID(this); + uint playerPID = fopAcM_GetID(this); dCam_getBody()->EndEventCamera(playerPID); endDemoMode(); } else if (m34D0 == 0) { diff --git a/src/d/actor/d_a_player_tact.inc b/src/d/actor/d_a_player_tact.inc index 548c148e..3b542a81 100644 --- a/src/d/actor/d_a_player_tact.inc +++ b/src/d/actor/d_a_player_tact.inc @@ -343,7 +343,7 @@ BOOL daPy_lk_c::procTactPlay_init(s32 r27, int r30, int r31) { stage_stag_info_class* stag_info = dComIfGp_getStageStagInfo(); if (dStage_stagInfo_GetSTType(stag_info) == dStageType_SEA_e && m34CC != 1 && r30 != 0) { daShip_c* ship = dComIfGp_getShipActor(); - u32 warpID = fopAcM_create(PROC_TORNADO, 1, ¤t.pos, current.roomNo); + uint warpID = fopAcM_create(PROC_TORNADO, 1, ¤t.pos, current.roomNo); ship->setTactWarpID(warpID); } } diff --git a/src/d/actor/d_a_switem.cpp b/src/d/actor/d_a_switem.cpp index 26e3d689..2d313ce5 100644 --- a/src/d/actor/d_a_switem.cpp +++ b/src/d/actor/d_a_switem.cpp @@ -134,7 +134,7 @@ bool daSwItem_c::_execute() { } csXyz angle(0, home.angle.y, 0); - u32 itemProcId = fopAcM_createItemFromTable( + uint itemProcId = fopAcM_createItemFromTable( ¤t.pos, itemTbl, itemBitNo, fopAcM_GetHomeRoomNo(this), 0, &angle, 1 ); diff --git a/src/d/actor/d_a_tama.cpp b/src/d/actor/d_a_tama.cpp index 5e3e1aff..a4959e4a 100644 --- a/src/d/actor/d_a_tama.cpp +++ b/src/d/actor/d_a_tama.cpp @@ -54,7 +54,6 @@ BOOL daTama_c::_draw() { /* 0000011C-000002D4 .text _execute__8daTama_cFv */ BOOL daTama_c::_execute() { - /* Nonmatching */ fopNpc_npc_c* partner = (fopNpc_npc_c*)fopAcM_SearchByID(mPartnerID); bool del = true; if (partner != NULL) { diff --git a/src/d/actor/d_a_tbox.cpp b/src/d/actor/d_a_tbox.cpp index 98cf1d23..3ab06692 100644 --- a/src/d/actor/d_a_tbox.cpp +++ b/src/d/actor/d_a_tbox.cpp @@ -1014,7 +1014,7 @@ BOOL daTbox_c::actionOpenWait() { dComIfGp_event_onEventFlag(0x04); u8 itemNo = getItemNo(); - u32 itemPID = fopAcM_createItemForTrBoxDemo(¤t.pos, itemNo); + uint itemPID = fopAcM_createItemForTrBoxDemo(¤t.pos, itemNo); if (itemPID != fpcM_ERROR_PROCESS_ID_e) { dComIfGp_event_setItemPartnerId(itemPID); diff --git a/src/d/d_attention.cpp b/src/d/d_attention.cpp index ad729d1c..10a69068 100644 --- a/src/d/d_attention.cpp +++ b/src/d/d_attention.cpp @@ -569,8 +569,8 @@ void dAttList_c::setActor(fopAc_ac_c* i_actor) { } /* 8009FAB4-8009FACC .text getPId__10dAttHint_cFPv */ -u32 dAttHint_c::getPId(void* i_proc) { - return fpcM_GetID(i_proc); +uint dAttHint_c::getPId(void* i_proc) { + return fopAcM_GetID(i_proc); } /* 8009FACC-8009FAFC .text convPId__10dAttHint_cFUi */ diff --git a/src/d/d_cc_d.cpp b/src/d/d_cc_d.cpp index 10e92620..53df2145 100644 --- a/src/d/d_cc_d.cpp +++ b/src/d/d_cc_d.cpp @@ -63,7 +63,7 @@ void dCcD_GStts::Move() { /* 800AB3DC-800AB46C .text Init__9dCcD_SttsFiiP10fopAc_ac_c */ void dCcD_Stts::Init(int weight, int param_1, fopAc_ac_c* pActor) { - u32 procId; + uint procId; if (pActor) { procId = fopAcM_GetID(pActor); } else { diff --git a/src/d/d_event.cpp b/src/d/d_event.cpp index b17fb005..8d9a36c3 100644 --- a/src/d/d_event.cpp +++ b/src/d/d_event.cpp @@ -700,7 +700,7 @@ dStage_Event_dt_c* dEvt_control_c::nextStageEventDt(void* idxp) { } /* 800715B8-800715DC .text getPId__14dEvt_control_cFPv */ -u32 dEvt_control_c::getPId(void* ac) { +uint dEvt_control_c::getPId(void* ac) { if (ac == NULL) return fpcM_ERROR_PROCESS_ID_e; return fopAcM_GetID(ac); diff --git a/src/d/d_s_play.cpp b/src/d/d_s_play.cpp index d3014fc0..4c0ff8b6 100644 --- a/src/d/d_s_play.cpp +++ b/src/d/d_s_play.cpp @@ -1249,7 +1249,7 @@ int phase_1(dScnPly_ply_c* i_this) { delete l_lkDemoAnmCommand; } - u32 id = fopScnM_GetID(i_this); + uint id = fopScnM_GetID(i_this); dStage_roomControl_c::setProcID(id); dComIfGp_setStartStage(dComIfGp_getNextStartStage()); diff --git a/src/d/d_s_title.cpp b/src/d/d_s_title.cpp index 78399a25..a447d3d5 100644 --- a/src/d/d_s_title.cpp +++ b/src/d/d_s_title.cpp @@ -25,7 +25,7 @@ struct title_of_scene_class : public scene_class { public: /* 0x1C4 */ u32 pad[0x97]; - /* 0x420 */ u32 mMoviePId; + /* 0x420 */ uint mMoviePId; #if VERSION == VERSION_PAL static daMP_c* mMp; diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp index bdbdffdd..f12cfda3 100644 --- a/src/d/d_stage.cpp +++ b/src/d/d_stage.cpp @@ -2378,7 +2378,7 @@ dStage_darkStatus_c dStage_roomControl_c::mDarkStatus[8] = { {}, }; -u32 dStage_roomControl_c::mProcID; +uint dStage_roomControl_c::mProcID; s8 dStage_roomControl_c::mStayNo; s8 dStage_roomControl_c::mOldStayNo; u8 dStage_roomControl_c::mDarkRatio; diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp index 71d99ed2..adff6fd4 100644 --- a/src/f_op/f_op_actor_mng.cpp +++ b/src/f_op/f_op_actor_mng.cpp @@ -152,7 +152,7 @@ s32 fopAcM_delete(uint actorID) { } /* 8002451C-80024598 .text fopAcM_create__FsUlP4cXyziP5csXyzP4cXyzScPFPv_i */ -s32 fopAcM_create(s16 procName, u32 parameter, cXyz* pPos, int roomNo, csXyz* pAngle, cXyz* pScale, s8 subtype, createFunc createFunc) { +uint fopAcM_create(s16 procName, 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, fpcM_ERROR_PROCESS_ID_e); if (params == NULL) return fpcM_ERROR_PROCESS_ID_e; @@ -161,7 +161,7 @@ s32 fopAcM_create(s16 procName, u32 parameter, cXyz* pPos, int roomNo, csXyz* pA } /* 80024598-80024614 .text fopAcM_create__FPcUlP4cXyziP5csXyzP4cXyzPFPv_i */ -s32 fopAcM_create(char* pProcNameString, u32 parameter, cXyz* pPos, int roomNo, csXyz* pAngle, cXyz* pScale, createFunc createFunc) { +uint fopAcM_create(char* pProcNameString, 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; @@ -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, uint parentPcId, u32 parameter, cXyz* pPos, int roomNo, csXyz* pAngle, cXyz* pScale, s8 subtype, createFunc createFunc) { +uint 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, uint parentPcId, u32 parameter, cXyz* pPos, } /* 80024790-80024814 .text fopAcM_createChild__FPcUiUlP4cXyziP5csXyzP4cXyzPFPv_i */ -s32 fopAcM_createChild(char* pProcNameString, uint parentPcId, u32 parameter, cXyz* pPos, int roomNo, csXyz* pAngle, cXyz* pScale, createFunc createFunc) { +uint fopAcM_createChild(char* pProcNameString, uint parentPcId, u32 parameter, cXyz* pPos, int roomNo, csXyz* pAngle, cXyz* pScale, createFunc createFunc) { dStage_objectNameInf * nameInf = dStage_searchName(pProcNameString); if (nameInf == NULL) return fpcM_ERROR_PROCESS_ID_e; @@ -206,7 +206,7 @@ s32 fopAcM_createChild(char* pProcNameString, uint parentPcId, u32 parameter, cX } /* 80024814-800249D4 .text fopAcM_createChildFromOffset__FsUiUlP4cXyziP5csXyzP4cXyzScPFPv_i */ -s32 fopAcM_createChildFromOffset(s16 procName, uint parentPcId, u32 parameter, cXyz* pPosOffs, int roomNo, csXyz* pAngleOffs, cXyz* pScale, s8 subtype, createFunc createFunc) { +uint 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, uint parentPcId, u32 parameter, c } /* 800249D4-80024B78 .text fopAcM_createChildFromOffset__FPcUiUlP4cXyziP5csXyzP4cXyzPFPv_i */ -s32 fopAcM_createChildFromOffset(char* pProcNameString, uint parentPcId, u32 parameter, cXyz* pPosOffs, int roomNo, csXyz* pAngleOffs, cXyz* pScale, createFunc createFunc) { +uint 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; @@ -767,7 +767,7 @@ fopAc_ac_c* fopAcM_getEventPartner(fopAc_ac_c* i_this) { } /* 80026118-800261E8 .text fopAcM_createItemForPresentDemo__FP4cXyziUciiP5csXyzP4cXyz */ -s32 fopAcM_createItemForPresentDemo(cXyz* pos, int i_itemNo, u8 argFlag, int roomNo, int param_5, csXyz* rot, cXyz* scale) { +uint fopAcM_createItemForPresentDemo(cXyz* pos, int i_itemNo, u8 argFlag, int roomNo, int param_5, csXyz* rot, cXyz* scale) { JUT_ASSERT(2413, 0 <= i_itemNo && i_itemNo < 256); dComIfGp_event_setGtItm(i_itemNo); @@ -780,7 +780,7 @@ s32 fopAcM_createItemForPresentDemo(cXyz* pos, int i_itemNo, u8 argFlag, int roo } /* 800261E8-800262B4 .text fopAcM_createItemForTrBoxDemo__FP4cXyziiiP5csXyzP4cXyz */ -s32 fopAcM_createItemForTrBoxDemo(cXyz* pos, int i_itemNo, int roomNo, int param_5, csXyz* rot, cXyz* scale) { +uint fopAcM_createItemForTrBoxDemo(cXyz* pos, int i_itemNo, int roomNo, int param_5, csXyz* rot, cXyz* scale) { JUT_ASSERT(2458, 0 <= i_itemNo && i_itemNo < 256); dComIfGp_event_setGtItm(i_itemNo); @@ -793,7 +793,7 @@ s32 fopAcM_createItemForTrBoxDemo(cXyz* pos, int i_itemNo, int roomNo, int param } /* 800262B4-80026694 .text fopAcM_createItemFromTable__FP4cXyziiiiP5csXyziP4cXyz */ -s32 fopAcM_createItemFromTable(cXyz* p_pos, int i_itemNo, int i_itemBitNo, int roomNo, int type, csXyz* p_angle, int action, cXyz* p_scale) { +uint fopAcM_createItemFromTable(cXyz* p_pos, int i_itemNo, int i_itemBitNo, int roomNo, int type, csXyz* p_angle, int action, cXyz* p_scale) { JUT_ASSERT(2514, 0 <= i_itemNo && i_itemNo < 64 && (-1 <= i_itemBitNo && i_itemBitNo <= 79) || i_itemBitNo == 127); static cXyz fairy_offset_tbl[3] = { @@ -841,7 +841,7 @@ s32 fopAcM_createItemFromTable(cXyz* p_pos, int i_itemNo, int i_itemBitNo, int r } u8* pItemTable = itemTableList->mItemTables[tableIdx]; u32 itemNo; - u32 lastItemPID; + uint lastItemPID; for (int i = 0; (itemNo = *pItemTable) != dItem_NONE_e && i < 0x10; pItemTable++, i++) { if (p_pos) { pos = *p_pos; @@ -883,7 +883,7 @@ s32 fopAcM_createItemFromTable(cXyz* p_pos, int i_itemNo, int i_itemBitNo, int r } /* 80026694-800267C8 .text fopAcM_createRaceItemFromTable__FP4cXyziiiP5csXyzP4cXyzi */ -s32 fopAcM_createRaceItemFromTable(cXyz* pos, int i_itemNo, int i_itemBitNo, int i_roomNo, csXyz* angle, cXyz* scale, int param_7) { +uint fopAcM_createRaceItemFromTable(cXyz* pos, int i_itemNo, int i_itemBitNo, int i_roomNo, csXyz* angle, cXyz* scale, int param_7) { JUT_ASSERT(2660, 0 <= i_itemNo && i_itemNo < 64 && (-1 <= i_itemBitNo && i_itemBitNo <= 79) || i_itemBitNo == 127); if (i_itemNo >= 0x20 && i_itemNo <= 0x3E) { @@ -903,7 +903,7 @@ s32 fopAcM_createRaceItemFromTable(cXyz* pos, int i_itemNo, int i_itemBitNo, int } /* 800267C8-8002688C .text fopAcM_createShopItem__FP4cXyziP5csXyziP4cXyzPFPv_i */ -s32 fopAcM_createShopItem(cXyz* pos, int i_itemNo, csXyz* rot, int roomNo, cXyz* scale, +uint fopAcM_createShopItem(cXyz* pos, int i_itemNo, csXyz* rot, int roomNo, cXyz* scale, createFunc createFunc) { JUT_ASSERT(2716, 0 <= i_itemNo && i_itemNo < 256); if (i_itemNo == dItem_NONE_e) { @@ -914,7 +914,7 @@ s32 fopAcM_createShopItem(cXyz* pos, int i_itemNo, csXyz* rot, int roomNo, cXyz* } /* 8002688C-80026980 .text fopAcM_createRaceItem__FP4cXyziiP5csXyziP4cXyzi */ -s32 fopAcM_createRaceItem(cXyz* pos, int i_itemNo, int i_itemBitNo, csXyz* rot, int roomNo, cXyz* scale, int param_7) { +uint fopAcM_createRaceItem(cXyz* pos, int i_itemNo, int i_itemBitNo, csXyz* rot, int roomNo, cXyz* scale, int param_7) { JUT_ASSERT(2763, 0 <= i_itemNo && i_itemNo < 256 && (-1 <= i_itemBitNo && i_itemBitNo <= 79) || i_itemBitNo == 127); if (i_itemNo == dItem_NONE_e) { return fpcM_ERROR_PROCESS_ID_e; @@ -926,7 +926,7 @@ s32 fopAcM_createRaceItem(cXyz* pos, int i_itemNo, int i_itemBitNo, csXyz* rot, } /* 80026980-80026A68 .text fopAcM_createDemoItem__FP4cXyziiP5csXyziP4cXyzUc */ -s32 fopAcM_createDemoItem(cXyz* pos, int i_itemNo, int i_itemBitNo, csXyz* rot, int roomNo, cXyz* scale, u8 argFlag) { +uint fopAcM_createDemoItem(cXyz* pos, int i_itemNo, int i_itemBitNo, csXyz* rot, int roomNo, cXyz* scale, u8 argFlag) { JUT_ASSERT(2813, 0 <= i_itemNo && i_itemNo < 256 && (-1 <= i_itemBitNo && i_itemBitNo <= 79) || i_itemBitNo == 127); if (i_itemNo == dItem_NONE_e) { return fpcM_ERROR_PROCESS_ID_e; @@ -937,7 +937,7 @@ s32 fopAcM_createDemoItem(cXyz* pos, int i_itemNo, int i_itemBitNo, csXyz* rot, } /* 80026A68-80026ADC .text fopAcM_createItemForBoss__FP4cXyziiP5csXyzP4cXyzi */ -s32 fopAcM_createItemForBoss(cXyz* pos, int, int roomNo, csXyz* rot, cXyz* scale, int param_6) { +uint fopAcM_createItemForBoss(cXyz* pos, int, int roomNo, csXyz* rot, cXyz* scale, int param_6) { switch (param_6) { case 1: return fopAcM_createItem(pos, UTUWA_HEART, -1, roomNo, 3, rot, 0xC, scale); @@ -948,7 +948,7 @@ s32 fopAcM_createItemForBoss(cXyz* pos, int, int roomNo, csXyz* rot, cXyz* scale } /* 80026ADC-80026C90 .text fopAcM_createItem__FP4cXyziiiiP5csXyziP4cXyz */ -s32 fopAcM_createItem(cXyz* pos, int i_itemNo, int i_itemBitNo, int roomNo, int type, csXyz* rot, int action, cXyz* scale) { +uint fopAcM_createItem(cXyz* pos, int i_itemNo, int i_itemBitNo, int roomNo, int type, csXyz* rot, int action, cXyz* scale) { int switchNo = 0xFF; int switchNo2 = 0xFF; @@ -1201,7 +1201,7 @@ void* fopAcM_createItemFromEnemyTable(u16 itemTableIdx, int i_itemBitNo, int i_r } /* 8002777C-800278D8 .text fopAcM_createIball__FP4cXyziiP5csXyzi */ -s32 fopAcM_createIball(cXyz* p_pos, int itemTableIdx, int i_roomNo, csXyz* p_angle, int i_itemBitNo) { +uint fopAcM_createIball(cXyz* p_pos, int itemTableIdx, int i_roomNo, csXyz* p_angle, int i_itemBitNo) { int dropChance = dComIfGp_CharTbl()->GetInf(dComIfGp_CharTbl()->GetPercent(), (u16)itemTableIdx); int randPercent = cM_rndF(99.999f); @@ -1252,7 +1252,7 @@ fopAc_ac_c* fopAcM_myRoomSearchEnemy(s8 roomNo) { scene_class* roomProc = fopScnM_SearchByID(dStage_roomControl_c::getStatusProcID(roomNo)); JUT_ASSERT(0xe0a, roomProc != 0); - u32 grabProcID = daPy_getPlayerActorClass()->getGrabActorID(); + uint grabProcID = daPy_getPlayerActorClass()->getGrabActorID(); fopAc_ac_c* enemy = fopAcM_SearchByID(grabProcID); if (enemy != NULL && fopAcM_GetGroup(enemy) == fopAc_ENEMY_e) return enemy; @@ -1261,7 +1261,7 @@ fopAc_ac_c* fopAcM_myRoomSearchEnemy(s8 roomNo) { } /* 80027A9C-80027B24 .text fopAcM_createDisappear__FP10fopAc_ac_cP4cXyzUcUcUc */ -s32 fopAcM_createDisappear(fopAc_ac_c* i_actor, cXyz* p_pos, u8 i_scale, u8 i_health, u8 i_itemBitNo) { +uint fopAcM_createDisappear(fopAc_ac_c* i_actor, cXyz* p_pos, u8 i_scale, u8 i_health, u8 i_itemBitNo) { u32 params = (i_itemBitNo & 0xFF) << 0x10 | (i_scale & 0xFF) << 0x08 | i_health & 0xFF; fopAc_ac_c* disappear = (fopAc_ac_c*)fopAcM_fastCreate(PROC_DISAPPEAR, params, p_pos, fopAcM_GetRoomNo(i_actor), fopAcM_GetAngle_p(i_actor)); if (disappear) { diff --git a/src/f_op/f_op_camera.cpp b/src/f_op/f_op_camera.cpp index 7ec04c4e..e11503b3 100644 --- a/src/f_op/f_op_camera.cpp +++ b/src/f_op/f_op_camera.cpp @@ -9,7 +9,7 @@ // the DOL, even though this is an ugly hack and they're now in the wrong translation unit instead. #include "d/actor/d_a_player.h" void daPy_py_c::onFrollCrashFlg(u32) {} -u32 daPy_py_c::getGrabActorID() const { return fpcM_ERROR_PROCESS_ID_e; } +uint daPy_py_c::getGrabActorID() const { return fpcM_ERROR_PROCESS_ID_e; } #include "f_op/f_op_camera.h" #include "f_op/f_op_draw_tag.h" diff --git a/src/f_op/f_op_camera_mng.cpp b/src/f_op/f_op_camera_mng.cpp index 9cb8dbc2..6f2b11ff 100644 --- a/src/f_op/f_op_camera_mng.cpp +++ b/src/f_op/f_op_camera_mng.cpp @@ -7,7 +7,7 @@ #include "f_pc/f_pc_layer.h" #include "f_pc/f_pc_stdcreate_req.h" -static u32 l_fopCamM_id[4]; +static uint l_fopCamM_id[4]; /* 80029468-80029470 .text fopCamM_GetParam__FP12camera_class */ u32 fopCamM_GetParam(camera_class* i_this) { diff --git a/src/f_op/f_op_kankyo_mng.cpp b/src/f_op/f_op_kankyo_mng.cpp index 344118f5..8c071161 100644 --- a/src/f_op/f_op_kankyo_mng.cpp +++ b/src/f_op/f_op_kankyo_mng.cpp @@ -48,12 +48,12 @@ void fopKyM_Delete(void* i_process) { } /* 8002A988-8002A9D8 .text fopKyM_Create__FsPFPv_iPv */ -int fopKyM_Create(s16 i_procName, fopKyM_CreateFunc i_createFunc, void* i_process) { +uint fopKyM_Create(s16 i_procName, fopKyM_CreateFunc i_createFunc, void* i_process) { return fpcM_Create(i_procName, i_createFunc, i_process); } /* 8002A9D8-8002AA38 .text fopKyM_create__FsiP4cXyzP4cXyzPFPv_i */ -int fopKyM_create(s16 i_procName, int i_param, cXyz* i_pos, cXyz* i_scale, fopKyM_CreateFunc i_createFunc) { +uint fopKyM_create(s16 i_procName, int i_param, cXyz* i_pos, cXyz* i_scale, fopKyM_CreateFunc i_createFunc) { fopKyM_prm_class* params = createAppend(i_param, i_pos, i_scale); if (params == NULL) { @@ -76,7 +76,7 @@ base_process_class* fopKyM_fastCreate(s16 i_procName, int i_param, cXyz* i_pos, } /* 8002AA9C-8002AB40 .text fopKyM_createWpillar__FPC4cXyzffi */ -int fopKyM_createWpillar(cXyz const* i_pos, f32 scaleXZ, f32 scaleY, int i_param) { +uint fopKyM_createWpillar(cXyz const* i_pos, f32 scaleXZ, f32 scaleY, int i_param) { fopKyM_prm_class* params = fopKyM_CreateAppend(); if (params == NULL) { diff --git a/src/f_op/f_op_msg_mng.cpp b/src/f_op/f_op_msg_mng.cpp index 8b08e2fd..7552a042 100644 --- a/src/f_op/f_op_msg_mng.cpp +++ b/src/f_op/f_op_msg_mng.cpp @@ -225,17 +225,17 @@ u32 fopMsgM_searchMessageNumber(u32) { } /* 8002B634-8002B778 .text fopMsgM_messageSet__FUlP10fopAc_ac_c */ -int fopMsgM_messageSet(u32, fopAc_ac_c*) { +uint fopMsgM_messageSet(u32, fopAc_ac_c*) { /* Nonmatching */ } /* 8002B778-8002B8A4 .text fopMsgM_messageSet__FUlP4cXyz */ -int fopMsgM_messageSet(u32, cXyz*) { +uint fopMsgM_messageSet(u32, cXyz*) { /* Nonmatching */ } /* 8002B8A4-8002B9C4 .text fopMsgM_messageSet__FUl */ -int fopMsgM_messageSet(u32) { +uint fopMsgM_messageSet(u32) { /* Nonmatching */ } diff --git a/src/f_pc/f_pc_node_req.cpp b/src/f_pc/f_pc_node_req.cpp index 227ce5b9..011426f2 100644 --- a/src/f_pc/f_pc_node_req.cpp +++ b/src/f_pc/f_pc_node_req.cpp @@ -138,7 +138,7 @@ s32 fpcNdRq_Handler() { /* 8003F6BC-8003F728 .text fpcNdRq_IsPossibleTarget__FP18process_node_class */ s32 fpcNdRq_IsPossibleTarget(process_node_class* i_procNode) { - s32 bsPcId = i_procNode->base.mBsPcId; + uint bsPcId = i_procNode->base.mBsPcId; request_node_class* currentNode; node_create_request* currentNdCr; currentNode = (request_node_class*)l_fpcNdRq_Queue.mpHead; @@ -155,7 +155,7 @@ s32 fpcNdRq_IsPossibleTarget(process_node_class* i_procNode) { s32 fpcNdRq_IsIng(process_node_class* i_procNode) { request_node_class* currentNode; node_create_request* currentNodeReq; - s32 bsPcId = i_procNode->base.mBsPcId; + uint bsPcId = i_procNode->base.mBsPcId; currentNode = (request_node_class*)l_fpcNdRq_Queue.mpHead; while (currentNode != NULL) { currentNodeReq = currentNode->mNodeCrReq; diff --git a/src/f_pc/f_pc_stdcreate_req.cpp b/src/f_pc/f_pc_stdcreate_req.cpp index 90ec5040..e831aba6 100644 --- a/src/f_pc/f_pc_stdcreate_req.cpp +++ b/src/f_pc/f_pc_stdcreate_req.cpp @@ -93,7 +93,7 @@ s32 fpcSCtRq_Cancel(standard_create_request_class* i_SCtReq) { } /* 8004086C-80040900 .text fpcSCtRq_Request__FP11layer_classsPFPvPv_iPvPv */ -s32 fpcSCtRq_Request(layer_class* i_layer, s16 i_procName, stdCreateFunc i_createFunc, void* param_4, void* param_5) { +uint fpcSCtRq_Request(layer_class* i_layer, s16 i_procName, stdCreateFunc i_createFunc, void* param_4, void* param_5) { static create_request_method_class submethod = { (cPhs__Handler)fpcSCtRq_Handler, (process_method_func)fpcSCtRq_Cancel, |