summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/d/actor/d_a_ghostship.cpp8
-rw-r--r--src/d/actor/d_a_npc_ji1.cpp2
-rw-r--r--src/d/actor/d_a_npc_md.cpp12
-rw-r--r--src/d/actor/d_a_obj_toripost.cpp2
-rw-r--r--src/d/actor/d_a_player_food.inc4
-rw-r--r--src/d/actor/d_a_player_tact.inc2
-rw-r--r--src/d/actor/d_a_switem.cpp2
-rw-r--r--src/d/actor/d_a_tama.cpp1
-rw-r--r--src/d/actor/d_a_tbox.cpp2
-rw-r--r--src/d/d_attention.cpp4
-rw-r--r--src/d/d_cc_d.cpp2
-rw-r--r--src/d/d_event.cpp2
-rw-r--r--src/d/d_s_play.cpp2
-rw-r--r--src/d/d_s_title.cpp2
-rw-r--r--src/d/d_stage.cpp2
-rw-r--r--src/f_op/f_op_actor_mng.cpp38
-rw-r--r--src/f_op/f_op_camera.cpp2
-rw-r--r--src/f_op/f_op_camera_mng.cpp2
-rw-r--r--src/f_op/f_op_kankyo_mng.cpp6
-rw-r--r--src/f_op/f_op_msg_mng.cpp6
-rw-r--r--src/f_pc/f_pc_node_req.cpp4
-rw-r--r--src/f_pc/f_pc_stdcreate_req.cpp2
22 files changed, 54 insertions, 55 deletions
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(&current.pos, itemNo, 0, -1, current.roomNo);
+ uint itemPID = fopAcM_createItemForPresentDemo(&current.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(&current.pos, m_letter[mNumReadable].mItemNo);
+ uint itemPID = fopAcM_createItemForPresentDemo(&current.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, &current.pos, current.roomNo);
+ uint warpID = fopAcM_create(PROC_TORNADO, 1, &current.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(
&current.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(&current.pos, itemNo);
+ uint itemPID = fopAcM_createItemForTrBoxDemo(&current.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,
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-03 21:30:20 +0000