summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLagoLunatic <LagoLunatic@users.noreply.github.com>2024-07-12 21:14:13 -0400
committerLagoLunatic <LagoLunatic@users.noreply.github.com>2024-07-12 21:14:13 -0400
commit2def735282a0584a5a2b3ed007bd99ddfb72b394 (patch)
tree0aed235b7e874a33aa9d1b1a1cba67bc67f4077e /src
parent61d9f474a53cc8a02490e8cdb1b4f86bb4d1af95 (diff)
Add fpc_ProcID type and use it for all process IDs
See https://github.com/zeldaret/tp/pull/2173
Diffstat (limited to 'src')
-rw-r--r--src/SSystem/SComponent/c_bg_s.cpp4
-rw-r--r--src/SSystem/SComponent/c_bg_s_chk.cpp4
-rw-r--r--src/SSystem/SComponent/c_bg_s_lin_chk.cpp2
-rw-r--r--src/SSystem/SComponent/c_cc_d.cpp2
-rw-r--r--src/d/actor/d_a_auction.cpp6
-rw-r--r--src/d/actor/d_a_bk.cpp2
-rw-r--r--src/d/actor/d_a_mozo.cpp2
-rw-r--r--src/d/actor/d_a_npc_ba1.cpp2
-rw-r--r--src/d/actor/d_a_npc_bj1.cpp2
-rw-r--r--src/d/actor/d_a_npc_bm1.cpp2
-rw-r--r--src/d/actor/d_a_npc_bs1.cpp4
-rw-r--r--src/d/actor/d_a_npc_de1.cpp2
-rw-r--r--src/d/actor/d_a_npc_gk1.cpp2
-rw-r--r--src/d/actor/d_a_npc_gp1.cpp2
-rw-r--r--src/d/actor/d_a_npc_hi1.cpp2
-rw-r--r--src/d/actor/d_a_npc_ji1.cpp4
-rw-r--r--src/d/actor/d_a_npc_kamome.cpp2
-rw-r--r--src/d/actor/d_a_npc_kf1.cpp2
-rw-r--r--src/d/actor/d_a_npc_kk1.cpp2
-rw-r--r--src/d/actor/d_a_npc_ko1.cpp2
-rw-r--r--src/d/actor/d_a_npc_ls1.cpp2
-rw-r--r--src/d/actor/d_a_npc_md.cpp2
-rw-r--r--src/d/actor/d_a_npc_ob1.cpp2
-rw-r--r--src/d/actor/d_a_npc_os.cpp2
-rw-r--r--src/d/actor/d_a_npc_people.cpp2
-rw-r--r--src/d/actor/d_a_npc_pf1.cpp2
-rw-r--r--src/d/actor/d_a_npc_roten.cpp2
-rw-r--r--src/d/actor/d_a_npc_yw1.cpp2
-rw-r--r--src/d/actor/d_a_npc_zk1.cpp2
-rw-r--r--src/d/actor/d_a_npc_zl1.cpp2
-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_hook.inc2
-rw-r--r--src/d/actor/d_a_player_tact.inc4
-rw-r--r--src/d/actor/d_a_switem.cpp2
-rw-r--r--src/d/actor/d_a_tag_island.cpp2
-rw-r--r--src/d/actor/d_a_tag_msg.cpp2
-rw-r--r--src/d/actor/d_a_tbox.cpp2
-rw-r--r--src/d/d_attention.cpp14
-rw-r--r--src/d/d_auction_screen.cpp2
-rw-r--r--src/d/d_bg_s.cpp4
-rw-r--r--src/d/d_camera.cpp4
-rw-r--r--src/d/d_cc_d.cpp2
-rw-r--r--src/d/d_cc_s.cpp4
-rw-r--r--src/d/d_event.cpp4
-rw-r--r--src/d/d_event_data.cpp2
-rw-r--r--src/d/d_kankyo.cpp2
-rw-r--r--src/d/d_s_play.cpp2
-rw-r--r--src/d/d_s_title.cpp4
-rw-r--r--src/d/d_stage.cpp2
-rw-r--r--src/d/d_timer.cpp4
-rw-r--r--src/f_op/f_op_actor_mng.cpp44
-rw-r--r--src/f_op/f_op_camera.cpp2
-rw-r--r--src/f_op/f_op_camera_mng.cpp7
-rw-r--r--src/f_op/f_op_kankyo_mng.cpp8
-rw-r--r--src/f_op/f_op_msg_mng.cpp18
-rw-r--r--src/f_op/f_op_overlap_mng.cpp2
-rw-r--r--src/f_op/f_op_scene_mng.cpp16
-rw-r--r--src/f_op/f_op_scene_req.cpp8
-rw-r--r--src/f_pc/f_pc_base.cpp6
-rw-r--r--src/f_pc/f_pc_create_req.cpp4
-rw-r--r--src/f_pc/f_pc_creator.cpp2
-rw-r--r--src/f_pc/f_pc_executor.cpp4
-rw-r--r--src/f_pc/f_pc_layer.cpp12
-rw-r--r--src/f_pc/f_pc_layer_tag.cpp4
-rw-r--r--src/f_pc/f_pc_manager.cpp2
-rw-r--r--src/f_pc/f_pc_node_req.cpp9
-rw-r--r--src/f_pc/f_pc_searcher.cpp2
-rw-r--r--src/f_pc/f_pc_stdcreate_req.cpp2
69 files changed, 148 insertions, 146 deletions
diff --git a/src/SSystem/SComponent/c_bg_s.cpp b/src/SSystem/SComponent/c_bg_s.cpp
index 43afcc3a..db997bdf 100644
--- a/src/SSystem/SComponent/c_bg_s.cpp
+++ b/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, uint pid, void* actor) {
+void cBgS_ChkElm::Regist2(cBgW* bgw, fpc_ProcID 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, uint pid, void* actor) {
+bool cBgS::Regist(cBgW* bgw, fpc_ProcID pid, void* actor) {
if (bgw == NULL)
return true;
diff --git a/src/SSystem/SComponent/c_bg_s_chk.cpp b/src/SSystem/SComponent/c_bg_s_chk.cpp
index e8dd6b27..ba99fd02 100644
--- a/src/SSystem/SComponent/c_bg_s_chk.cpp
+++ b/src/SSystem/SComponent/c_bg_s_chk.cpp
@@ -11,8 +11,8 @@ cBgS_Chk::~cBgS_Chk() {
}
/* 8024734C-8024738C .text ChkSameActorPid__8cBgS_ChkCFUi */
-bool cBgS_Chk::ChkSameActorPid(uint pid) const {
- if (mActorPid == fpcM_ERROR_PROCESS_ID_e || pid == UINT32_MAX || unk_0x0C == 0) {
+bool cBgS_Chk::ChkSameActorPid(fpc_ProcID pid) const {
+ if (mActorPid == fpcM_ERROR_PROCESS_ID_e || pid == fpcM_ERROR_PROCESS_ID_e || unk_0x0C == 0) {
return FALSE;
} else {
return (mActorPid == pid) ? TRUE : FALSE;
diff --git a/src/SSystem/SComponent/c_bg_s_lin_chk.cpp b/src/SSystem/SComponent/c_bg_s_lin_chk.cpp
index fb97dd1b..9f12bc31 100644
--- a/src/SSystem/SComponent/c_bg_s_lin_chk.cpp
+++ b/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, uint actorPid) {
+void cBgS_LinChk::Set2(cXyz* pStart, cXyz* pEnd, fpc_ProcID actorPid) {
mLin.SetStartEnd(*pStart, *pEnd);
field_0x40 = *pEnd;
SetActorPid(actorPid);
diff --git a/src/SSystem/SComponent/c_cc_d.cpp b/src/SSystem/SComponent/c_cc_d.cpp
index 3f1386f2..bc49a60b 100644
--- a/src/SSystem/SComponent/c_cc_d.cpp
+++ b/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, uint procID) {
+void cCcD_Stts::Init(int weight, int param_1, void* pProc, fpc_ProcID procID) {
Ct();
mWeight = weight;
field_0x15 = param_1;
diff --git a/src/d/actor/d_a_auction.cpp b/src/d/actor/d_a_auction.cpp
index 23ec9271..a963ac17 100644
--- a/src/d/actor/d_a_auction.cpp
+++ b/src/d/actor/d_a_auction.cpp
@@ -207,7 +207,7 @@ extern void dAuction_screen_gaugeUp();
extern void dAuction_screen_gaugeDown();
extern void dAuction_screen_talkStart();
extern void dAuction_screen_talkEnd();
-extern uint dAuction_screen_create();
+extern fpc_ProcID dAuction_screen_create();
/* 000000EC-000002FC .text __ct__11daAuction_cFv */
daAuction_c::daAuction_c() {
@@ -1189,7 +1189,7 @@ void daAuction_c::eventMainMsgBikonW() {
/* 00002C1C-00002D4C .text eventGetItemInit__11daAuction_cFv */
void daAuction_c::eventGetItemInit() {
if (m822 == 2) {
- uint itemID = fopAcM_createItemForPresentDemo(&current.pos, l_item_dat22[mCurrAuctionItemIndex] & 0xFF);
+ fpc_ProcID itemID = fopAcM_createItemForPresentDemo(&current.pos, l_item_dat22[mCurrAuctionItemIndex] & 0xFF);
if (itemID != fpcM_ERROR_PROCESS_ID_e) {
dComIfGp_event_setItemPartnerId(itemID);
@@ -1197,7 +1197,7 @@ void daAuction_c::eventGetItemInit() {
dComIfGs_onEventBit(l_item_dat2[mCurrAuctionItemIndex].mObtainedEventBit);
} else {
- uint itemID = fopAcM_createItemForPresentDemo(&current.pos, l_item_dat[mCurrAuctionItemIndex].mItemID & 0xFF);
+ fpc_ProcID itemID = fopAcM_createItemForPresentDemo(&current.pos, l_item_dat[mCurrAuctionItemIndex].mItemID & 0xFF);
if (itemID != fpcM_ERROR_PROCESS_ID_e) {
dComIfGp_event_setItemPartnerId(itemID);
diff --git a/src/d/actor/d_a_bk.cpp b/src/d/actor/d_a_bk.cpp
index 4ed8a289..00093026 100644
--- a/src/d/actor/d_a_bk.cpp
+++ b/src/d/actor/d_a_bk.cpp
@@ -677,7 +677,7 @@ static void* s_w_sub(void* param_1, void*) {
}
/* 00002CD4-00002FB0 .text search_wepon__FP8bk_class */
-static uint search_wepon(bk_class* i_this) {
+static fpc_ProcID search_wepon(bk_class* i_this) {
target_info_count = 0;
for (int i = 0; i < ARRAY_SIZE(target_info); i++) {
target_info[i] = NULL;
diff --git a/src/d/actor/d_a_mozo.cpp b/src/d/actor/d_a_mozo.cpp
index 53f47507..0feb8c4d 100644
--- a/src/d/actor/d_a_mozo.cpp
+++ b/src/d/actor/d_a_mozo.cpp
@@ -214,7 +214,7 @@ bool daMozo_c::_delete() {
}
/* 0000242C-00002498 .text getBeamActor__8daMozo_cFUi */
-fopAc_ac_c* daMozo_c::getBeamActor(uint apid) {
+fopAc_ac_c* daMozo_c::getBeamActor(fpc_ProcID apid) {
fopAc_ac_c* ac = fopAcM_SearchByID(apid);
if (ac == NULL)
return NULL;
diff --git a/src/d/actor/d_a_npc_ba1.cpp b/src/d/actor/d_a_npc_ba1.cpp
index 710ef677..948ee731 100644
--- a/src/d/actor/d_a_npc_ba1.cpp
+++ b/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(uint) {
+void daNpc_Ba1_c::searchByID(fpc_ProcID) {
/* Nonmatching */
}
diff --git a/src/d/actor/d_a_npc_bj1.cpp b/src/d/actor/d_a_npc_bj1.cpp
index 08a58f36..cf0f8c45 100644
--- a/src/d/actor/d_a_npc_bj1.cpp
+++ b/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(uint) {
+void daNpc_Bj1_c::searchByID(fpc_ProcID) {
/* Nonmatching */
}
diff --git a/src/d/actor/d_a_npc_bm1.cpp b/src/d/actor/d_a_npc_bm1.cpp
index 3db88240..3e84fcdb 100644
--- a/src/d/actor/d_a_npc_bm1.cpp
+++ b/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(uint) {
+void daNpc_Bm1_c::searchByID(fpc_ProcID) {
/* Nonmatching */
}
diff --git a/src/d/actor/d_a_npc_bs1.cpp b/src/d/actor/d_a_npc_bs1.cpp
index ac21ee62..44cc9e30 100644
--- a/src/d/actor/d_a_npc_bs1.cpp
+++ b/src/d/actor/d_a_npc_bs1.cpp
@@ -27,7 +27,7 @@ static Vec dummy_2080 = {1.0f, 1.0f, 1.0f};
static u8 dummy_1811[] = {0x02, 0x00, 0x02, 0x01};
static f64 dummy4[2] = {3.0, 0.5};
-static uint l_msgId;
+static fpc_ProcID l_msgId;
static msg_class* l_msg;
static daNpc_Bs1_HIO_c l_HIO;
@@ -1761,7 +1761,7 @@ BOOL daNpc_Bs1_c::getdemo_action(void*) {
m830 = m831;
mShopCamAction.Reset();
u16 itemNo = mShopItems.getSelectItemNo();
- uint itemPID = fopAcM_createItemForPresentDemo(&current.pos, itemNo, 0, -1, current.roomNo);
+ fpc_ProcID 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_de1.cpp b/src/d/actor/d_a_npc_de1.cpp
index fe029e4a..0b589cc3 100644
--- a/src/d/actor/d_a_npc_de1.cpp
+++ b/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(uint) {
+void daNpc_De1_c::searchByID(fpc_ProcID) {
/* Nonmatching */
}
diff --git a/src/d/actor/d_a_npc_gk1.cpp b/src/d/actor/d_a_npc_gk1.cpp
index 8f8ed50a..923cdc4a 100644
--- a/src/d/actor/d_a_npc_gk1.cpp
+++ b/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(uint, int*) {
+void daNpc_Gk1_c::searchByID(fpc_ProcID, int*) {
/* Nonmatching */
}
diff --git a/src/d/actor/d_a_npc_gp1.cpp b/src/d/actor/d_a_npc_gp1.cpp
index f419e7ef..f2217792 100644
--- a/src/d/actor/d_a_npc_gp1.cpp
+++ b/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(uint) {
+void daNpc_Gp1_c::searchByID(fpc_ProcID) {
/* Nonmatching */
}
diff --git a/src/d/actor/d_a_npc_hi1.cpp b/src/d/actor/d_a_npc_hi1.cpp
index ae9978da..b5f4e015 100644
--- a/src/d/actor/d_a_npc_hi1.cpp
+++ b/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(uint, int*) {
+void daNpc_Hi1_c::searchByID(fpc_ProcID, int*) {
/* Nonmatching */
}
diff --git a/src/d/actor/d_a_npc_ji1.cpp b/src/d/actor/d_a_npc_ji1.cpp
index 699b72db..72f0d4d4 100644
--- a/src/d/actor/d_a_npc_ji1.cpp
+++ b/src/d/actor/d_a_npc_ji1.cpp
@@ -25,7 +25,7 @@ static u8 dummy5[0x4C];
static daNpc_Ji1_HIO_c l_HIO;
-static uint l_msgId;
+static fpc_ProcID l_msgId;
static msg_class* l_msg;
static dCcD_SrcCyl l_cyl_src = {
@@ -1266,7 +1266,7 @@ void daNpc_Ji1_c::createItem() {
dComIfGs_onEventBit(0xF10);
}
- uint itemPID = fopAcM_createItemForPresentDemo(&current.pos, itemNo, 0, -1, current.roomNo);
+ fpc_ProcID 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_kamome.cpp b/src/d/actor/d_a_npc_kamome.cpp
index ad2e5914..ec456eb9 100644
--- a/src/d/actor/d_a_npc_kamome.cpp
+++ b/src/d/actor/d_a_npc_kamome.cpp
@@ -26,7 +26,7 @@ static char* l_staff_name = "HyoiKam";
static u8 temp[0x4C]; // TODO
static daNpc_kam_HIO_c l_HIO;
static int l_hio_counter;
-static uint l_msgId;
+static fpc_ProcID l_msgId;
static msg_class* l_msg;
static daNpc_kam_c* l_act;
static s16 l_demo_start_chk_cnt;
diff --git a/src/d/actor/d_a_npc_kf1.cpp b/src/d/actor/d_a_npc_kf1.cpp
index 4623fb81..88be6257 100644
--- a/src/d/actor/d_a_npc_kf1.cpp
+++ b/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(uint, int*) {
+void daNpc_Kf1_c::searchByID(fpc_ProcID, int*) {
/* Nonmatching */
}
diff --git a/src/d/actor/d_a_npc_kk1.cpp b/src/d/actor/d_a_npc_kk1.cpp
index 37b0d895..f158d699 100644
--- a/src/d/actor/d_a_npc_kk1.cpp
+++ b/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(uint, int*) {
+void daNpc_Kk1_c::searchByID(fpc_ProcID, int*) {
/* Nonmatching */
}
diff --git a/src/d/actor/d_a_npc_ko1.cpp b/src/d/actor/d_a_npc_ko1.cpp
index 9602f456..df31a214 100644
--- a/src/d/actor/d_a_npc_ko1.cpp
+++ b/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(uint) {
+void daNpc_Ko1_c::searchByID(fpc_ProcID) {
/* Nonmatching */
}
diff --git a/src/d/actor/d_a_npc_ls1.cpp b/src/d/actor/d_a_npc_ls1.cpp
index 92cf91d1..c0cf23a0 100644
--- a/src/d/actor/d_a_npc_ls1.cpp
+++ b/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(uint, int*) {
+void daNpc_Ls1_c::searchByID(fpc_ProcID, int*) {
/* Nonmatching */
}
diff --git a/src/d/actor/d_a_npc_md.cpp b/src/d/actor/d_a_npc_md.cpp
index 0e739794..799c2c0e 100644
--- a/src/d/actor/d_a_npc_md.cpp
+++ b/src/d/actor/d_a_npc_md.cpp
@@ -1291,7 +1291,7 @@ BOOL daNpc_Md_c::harpWaitNpcAction(void*) {
/* Nonmatching */
}
-static uint l_msgId;
+static fpc_ProcID l_msgId;
static msg_class* l_msg;
/* 00004CFC-00004D40 .text XYTalkCheck__10daNpc_Md_cFv */
diff --git a/src/d/actor/d_a_npc_ob1.cpp b/src/d/actor/d_a_npc_ob1.cpp
index 3626216b..8d09abd6 100644
--- a/src/d/actor/d_a_npc_ob1.cpp
+++ b/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(uint) {
+void daNpc_Ob1_c::searchByID(fpc_ProcID) {
/* Nonmatching */
}
diff --git a/src/d/actor/d_a_npc_os.cpp b/src/d/actor/d_a_npc_os.cpp
index 0e739db7..456ef948 100644
--- a/src/d/actor/d_a_npc_os.cpp
+++ b/src/d/actor/d_a_npc_os.cpp
@@ -797,7 +797,7 @@ BOOL daNpc_Os_c::finish02NpcAction(void* param_1) {
return true;
}
-static uint l_msgId;
+static fpc_ProcID l_msgId;
static msg_class* l_msg;
/* 00001F48-00002118 .text talkNpcAction__10daNpc_Os_cFPv */
diff --git a/src/d/actor/d_a_npc_people.cpp b/src/d/actor/d_a_npc_people.cpp
index 97461e59..14cb4111 100644
--- a/src/d/actor/d_a_npc_people.cpp
+++ b/src/d/actor/d_a_npc_people.cpp
@@ -5860,7 +5860,7 @@ void daNpcPeople_c::eventGetItemInit(int staffIdx) {
itemNo = m75C;
}
- uint itemPID = fopAcM_createItemForPresentDemo(&current.pos, itemNo, 0, -1, current.roomNo);
+ fpc_ProcID 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_pf1.cpp b/src/d/actor/d_a_npc_pf1.cpp
index 774846c1..b9e55951 100644
--- a/src/d/actor/d_a_npc_pf1.cpp
+++ b/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(uint, int*) {
+void daNpc_Pf1_c::searchByID(fpc_ProcID, int*) {
/* Nonmatching */
}
diff --git a/src/d/actor/d_a_npc_roten.cpp b/src/d/actor/d_a_npc_roten.cpp
index 3120268e..bacea5ef 100644
--- a/src/d/actor/d_a_npc_roten.cpp
+++ b/src/d/actor/d_a_npc_roten.cpp
@@ -2312,7 +2312,7 @@ void daNpcRoten_c::eventClrItemInit() {
/* 00002978-00002A70 .text eventGetItemInit__12daNpcRoten_cFi */
void daNpcRoten_c::eventGetItemInit(int staffIdx) {
- uint pcId;
+ fpc_ProcID pcId;
u32* pData = dComIfGp_evmng_getMyIntegerP(staffIdx, "ItemNo");
if(pData != NULL) {
diff --git a/src/d/actor/d_a_npc_yw1.cpp b/src/d/actor/d_a_npc_yw1.cpp
index a89c0fce..1266f0c5 100644
--- a/src/d/actor/d_a_npc_yw1.cpp
+++ b/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(uint, int*) {
+void daNpc_Yw1_c::searchByID(fpc_ProcID, int*) {
/* Nonmatching */
}
diff --git a/src/d/actor/d_a_npc_zk1.cpp b/src/d/actor/d_a_npc_zk1.cpp
index 39ff253d..833ae966 100644
--- a/src/d/actor/d_a_npc_zk1.cpp
+++ b/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(uint, int*) {
+void daNpc_Zk1_c::searchByID(fpc_ProcID, int*) {
/* Nonmatching */
}
diff --git a/src/d/actor/d_a_npc_zl1.cpp b/src/d/actor/d_a_npc_zl1.cpp
index e3837163..b707919d 100644
--- a/src/d/actor/d_a_npc_zl1.cpp
+++ b/src/d/actor/d_a_npc_zl1.cpp
@@ -263,7 +263,7 @@ void daNpc_Zl1_c::chk_parts_notMov() {
}
/* 00002358-000023AC .text searchByID__11daNpc_Zl1_cFUiPi */
-void daNpc_Zl1_c::searchByID(uint, int*) {
+void daNpc_Zl1_c::searchByID(fpc_ProcID, int*) {
/* Nonmatching */
}
diff --git a/src/d/actor/d_a_obj_toripost.cpp b/src/d/actor/d_a_obj_toripost.cpp
index 8e85bf96..14e023c7 100644
--- a/src/d/actor/d_a_obj_toripost.cpp
+++ b/src/d/actor/d_a_obj_toripost.cpp
@@ -175,7 +175,7 @@ void daObjTpost_c::cutPresentStart(int staffIdx) {
/* 000003D8-00000474 .text cutPresentProc__12daObjTpost_cFi */
void daObjTpost_c::cutPresentProc(int staffIdx) {
- uint itemPID = fopAcM_createItemForPresentDemo(&current.pos, m_letter[mNumReadable].mItemNo);
+ fpc_ProcID 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 2538d9c6..95f9b6b0 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();
- uint playerPID = fopAcM_GetID(this);
+ fpc_ProcID 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);
- uint playerPID = fopAcM_GetID(this);
+ fpc_ProcID playerPID = fopAcM_GetID(this);
dCam_getBody()->EndEventCamera(playerPID);
endDemoMode();
} else if (m34D0 == 0) {
diff --git a/src/d/actor/d_a_player_hook.inc b/src/d/actor/d_a_player_hook.inc
index 1b57de72..e1547930 100644
--- a/src/d/actor/d_a_player_hook.inc
+++ b/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(uint, const cXyz*) {
+BOOL daPy_lk_c::setHookshotCarryOffset(fpc_ProcID, const cXyz*) {
/* Nonmatching */
}
diff --git a/src/d/actor/d_a_player_tact.inc b/src/d/actor/d_a_player_tact.inc
index a4fc6a83..c1bde9f1 100644
--- a/src/d/actor/d_a_player_tact.inc
+++ b/src/d/actor/d_a_player_tact.inc
@@ -115,7 +115,7 @@ BOOL daPy_lk_c::checkTactLastInput() {
}
/* 8014D9F8-8014DA78 .text setTactZev__9daPy_lk_cFUiiPc */
-void daPy_lk_c::setTactZev(uint tactZevPartnerPID, int r30, char* r31) {
+void daPy_lk_c::setTactZev(fpc_ProcID tactZevPartnerPID, int r30, char* r31) {
if (tactZevPartnerPID != fpcM_ERROR_PROCESS_ID_e) {
mDoAud_seStart(JA_SE_PRE_TAKT);
}
@@ -544,7 +544,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();
- uint warpID = fopAcM_create(PROC_TORNADO, 1, &current.pos, current.roomNo);
+ fpc_ProcID 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 86fef40b..a4748826 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);
- uint itemProcId = fopAcM_createItemFromTable(
+ fpc_ProcID itemProcId = fopAcM_createItemFromTable(
&current.pos, itemTbl, itemBitNo,
fopAcM_GetHomeRoomNo(this), 0, &angle, 1
);
diff --git a/src/d/actor/d_a_tag_island.cpp b/src/d/actor/d_a_tag_island.cpp
index 631e3a03..4a388ccc 100644
--- a/src/d/actor/d_a_tag_island.cpp
+++ b/src/d/actor/d_a_tag_island.cpp
@@ -9,7 +9,7 @@
#include "d/d_com_inf_game.h"
#include "d/d_procname.h"
-static uint l_msgId;
+static fpc_ProcID l_msgId;
static msg_class* l_msg;
enum {
diff --git a/src/d/actor/d_a_tag_msg.cpp b/src/d/actor/d_a_tag_msg.cpp
index 0455b6ff..696e6624 100644
--- a/src/d/actor/d_a_tag_msg.cpp
+++ b/src/d/actor/d_a_tag_msg.cpp
@@ -26,7 +26,7 @@ static u8 bss_941 ALIGN_DECL(4);
static u8 bss_939 ALIGN_DECL(4);
static u8 bss_937 ALIGN_DECL(4);
static u8 bss_936 ALIGN_DECL(4);
-static uint l_msgId;
+static fpc_ProcID l_msgId;
static msg_class* l_msg;
static u8 msg_mode;
diff --git a/src/d/actor/d_a_tbox.cpp b/src/d/actor/d_a_tbox.cpp
index 0e893e60..fa509c69 100644
--- a/src/d/actor/d_a_tbox.cpp
+++ b/src/d/actor/d_a_tbox.cpp
@@ -971,7 +971,7 @@ BOOL daTbox_c::actionOpenWait() {
dComIfGp_event_onEventFlag(0x04);
u8 itemNo = getItemNo();
- uint itemPID = fopAcM_createItemForTrBoxDemo(&current.pos, itemNo);
+ fpc_ProcID 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 76a0e1d4..30fff1ed 100644
--- a/src/d/d_attention.cpp
+++ b/src/d/d_attention.cpp
@@ -538,7 +538,7 @@ void dAttention_c::LockonReleaseDistanse() {
}
/* 8009F980-8009F9B8 .text LockonTargetPId__12dAttention_cFl */
-uint dAttention_c::LockonTargetPId(s32 idx) {
+fpc_ProcID dAttention_c::LockonTargetPId(s32 idx) {
if (idx >= mLockOnNum)
return NULL;
@@ -577,12 +577,12 @@ void dAttList_c::setActor(fopAc_ac_c* i_actor) {
}
/* 8009FAB4-8009FACC .text getPId__10dAttHint_cFPv */
-uint dAttHint_c::getPId(void* i_proc) {
+fpc_ProcID dAttHint_c::getPId(void* i_proc) {
return fopAcM_GetID(i_proc);
}
/* 8009FACC-8009FAFC .text convPId__10dAttHint_cFUi */
-fopAc_ac_c* dAttHint_c::convPId(uint i_procID) {
+fopAc_ac_c* dAttHint_c::convPId(fpc_ProcID i_procID) {
return fopAcM_SearchByID(i_procID);
}
@@ -602,19 +602,19 @@ int dAttHint_c::request(fopAc_ac_c* i_actor, int priority) {
/* 8009FB58-8009FB70 .text init__10dAttHint_cFv */
void dAttHint_c::init() {
mHintActorID = fpcM_ERROR_PROCESS_ID_e;
- field_0x8 = fpcM_ERROR_PROCESS_ID_e;
+ mZHintTargetID = fpcM_ERROR_PROCESS_ID_e;
mPriority = 0x200;
}
/* 8009FB70-8009FB8C .text proc__10dAttHint_cFv */
void dAttHint_c::proc() {
- field_0x8 = mHintActorID;
+ mZHintTargetID = mHintActorID;
mHintActorID = fpcM_ERROR_PROCESS_ID_e;
mPriority = 0x200;
}
/* 8009FB8C-8009FBBC .text convPId__11dAttCatch_cFUi */
-fopAc_ac_c* dAttCatch_c::convPId(uint i_procID) {
+fopAc_ac_c* dAttCatch_c::convPId(fpc_ProcID i_procID) {
return fopAcM_SearchByID(i_procID);
}
@@ -641,7 +641,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(uint i_procID) {
+fopAc_ac_c* dAttLook_c::convPId(fpc_ProcID i_procID) {
return fopAcM_SearchByID(i_procID);
}
diff --git a/src/d/d_auction_screen.cpp b/src/d/d_auction_screen.cpp
index 73e2c646..2f91af00 100644
--- a/src/d/d_auction_screen.cpp
+++ b/src/d/d_auction_screen.cpp
@@ -142,7 +142,7 @@ static void dAs_Create(msg_class*) {
}
/* 80160D20-80160D70 .text dAuction_screen_create__Fv */
-uint dAuction_screen_create() {
+fpc_ProcID dAuction_screen_create() {
/* Nonmatching */
}
diff --git a/src/d/d_bg_s.cpp b/src/d/d_bg_s.cpp
index a83264b0..cb547607 100644
--- a/src/d/d_bg_s.cpp
+++ b/src/d/d_bg_s.cpp
@@ -112,7 +112,7 @@ int dBgS::GetExitId(cBgS_PolyInfo& polyInfo) {
/* 800A06A4-800A0708 .text GetPolyColor__4dBgSFR13cBgS_PolyInfo */
int dBgS::GetPolyColor(cBgS_PolyInfo& polyInfo) {
- if (!polyInfo.ChkSetInfo())
+ if (!polyInfo.ChkSetInf())
return 0xFF;
return GetPolyId0(polyInfo.GetBgIndex(), polyInfo.GetPolyIndex(), 0xFF, 0x07F80000, 19);
@@ -277,7 +277,7 @@ int dBgS::GetRoomPathPntNo(cBgS_PolyInfo& polyInfo) {
/* 800A0E68-800A0F88 .text GetRoomId__4dBgSFR13cBgS_PolyInfo */
s32 dBgS::GetRoomId(cBgS_PolyInfo& polyInfo) {
- if (!polyInfo.ChkSetInfo())
+ if (!polyInfo.ChkSetInf())
return -1;
s32 id = polyInfo.GetBgIndex();
diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp
index 3e501ed0..dc65769d 100644
--- a/src/d/d_camera.cpp
+++ b/src/d/d_camera.cpp
@@ -558,12 +558,12 @@ void dCamera_c::GetForceLockOnActor() {
}
/* 8017BCEC-8017BD2C .text ForceLockOn__9dCamera_cFUi */
-void dCamera_c::ForceLockOn(uint) {
+void dCamera_c::ForceLockOn(fpc_ProcID) {
/* Nonmatching */
}
/* 8017BD2C-8017BD5C .text ForceLockOff__9dCamera_cFUi */
-void dCamera_c::ForceLockOff(uint) {
+void dCamera_c::ForceLockOff(fpc_ProcID) {
/* Nonmatching */
}
diff --git a/src/d/d_cc_d.cpp b/src/d/d_cc_d.cpp
index ffaffc8c..8c609858 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) {
- uint procId;
+ fpc_ProcID procId;
if (pActor) {
procId = fopAcM_GetID(pActor);
} else {
diff --git a/src/d/d_cc_s.cpp b/src/d/d_cc_s.cpp
index 38c07c2d..de05ed92 100644
--- a/src/d/d_cc_s.cpp
+++ b/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_;
- uint r11 = stts1->GetApid();
- uint r3 = stts2->GetApid();
+ fpc_ProcID r11 = stts1->GetApid();
+ fpc_ProcID r3 = stts2->GetApid();
if (r4) {
gstts1->SetAtApid(r3);
if (inf1->ChkAtNoConHit() && gstts1->GetAtOldApid() == stts2->GetApid()) {
diff --git a/src/d/d_event.cpp b/src/d/d_event.cpp
index e1241756..1003a7ba 100644
--- a/src/d/d_event.cpp
+++ b/src/d/d_event.cpp
@@ -700,14 +700,14 @@ dStage_Event_dt_c* dEvt_control_c::nextStageEventDt(void* idxp) {
}
/* 800715B8-800715DC .text getPId__14dEvt_control_cFPv */
-uint dEvt_control_c::getPId(void* ac) {
+fpc_ProcID dEvt_control_c::getPId(void* ac) {
if (ac == NULL)
return fpcM_ERROR_PROCESS_ID_e;
return fopAcM_GetID(ac);
}
/* 800715DC-8007160C .text convPId__14dEvt_control_cFUi */
-fopAc_ac_c* dEvt_control_c::convPId(uint pid) {
+fopAc_ac_c* dEvt_control_c::convPId(fpc_ProcID pid) {
return fopAcM_SearchByID(pid);
}
diff --git a/src/d/d_event_data.cpp b/src/d/d_event_data.cpp
index 765b2138..bf823141 100644
--- a/src/d/d_event_data.cpp
+++ b/src/d/d_event_data.cpp
@@ -270,7 +270,7 @@ void dEvDtStaff_c::specialProcMessage() {
"TELOP_ON",
"TELOP_OFF",
};
- static uint l_msgId;
+ static fpc_ProcID l_msgId;
static msg_class* l_msg;
static int l_msgNo;
diff --git a/src/d/d_kankyo.cpp b/src/d/d_kankyo.cpp
index b16a3a58..3f9d07e3 100644
--- a/src/d/d_kankyo.cpp
+++ b/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, uint p3, int p4) {
+void dKy_Sound_set(cXyz pos, int p2, fpc_ProcID p3, int p4) {
camera_class* camera = (camera_class*)dComIfGp_getCamera(0);
BOOL ret = FALSE;
diff --git a/src/d/d_s_play.cpp b/src/d/d_s_play.cpp
index 96285399..de6d17fd 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;
}
- uint id = fopScnM_GetID(i_this);
+ fpc_ProcID 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 1db6c889..1e5af478 100644
--- a/src/d/d_s_title.cpp
+++ b/src/d/d_s_title.cpp
@@ -24,8 +24,8 @@
struct title_of_scene_class : public scene_class {
public:
- /* 0x1C4 */ u32 pad[0x97];
- /* 0x420 */ uint mMoviePId;
+ /* 0x1C4 */ u8 m1C4[0x420 - 0x1C4];
+ /* 0x420 */ fpc_ProcID mMoviePId;
#if VERSION == VERSION_PAL
static daMP_c* mMp;
diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp
index 5b76a269..2eb1ba7e 100644
--- a/src/d/d_stage.cpp
+++ b/src/d/d_stage.cpp
@@ -2373,7 +2373,7 @@ dStage_darkStatus_c dStage_roomControl_c::mDarkStatus[8] = {
{},
};
-uint dStage_roomControl_c::mProcID;
+fpc_ProcID dStage_roomControl_c::mProcID;
s8 dStage_roomControl_c::mStayNo;
s8 dStage_roomControl_c::mOldStayNo;
u8 dStage_roomControl_c::mDarkRatio;
diff --git a/src/d/d_timer.cpp b/src/d/d_timer.cpp
index 0d4bef42..5fca98d7 100644
--- a/src/d/d_timer.cpp
+++ b/src/d/d_timer.cpp
@@ -710,14 +710,14 @@ static s32 dTimer_Create(msg_class* i_this) {
}
/* 8023DA28-8023DA88 .text dTimer_createTimer__FiUsUcUcffff */
-uint dTimer_createTimer(int param_1, u16 param_2, u8 param_3, u8 param_4, f32 param_5, f32 param_6, f32 param_7, f32 param_8) {
+fpc_ProcID dTimer_createTimer(int param_1, u16 param_2, u8 param_3, u8 param_4, f32 param_5, f32 param_6, f32 param_7, f32 param_8) {
if (dComIfG_getTimerMode() == -1)
return fop_Timer_create(PROC_TIMER, param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8, NULL);
return fpcM_ERROR_PROCESS_ID_e;
}
/* 8023DA88-8023DAEC .text dTimer_createStockTimer__Fv */
-uint dTimer_createStockTimer() {
+fpc_ProcID dTimer_createStockTimer() {
if (dComIfG_getTimerMode() != -1)
return fop_Timer_create(PROC_TIMER, 7, 0, 3, 0, 221.0f, 439.0f, 32.0f, 419.0f, NULL);
return fpcM_ERROR_PROCESS_ID_e;
diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp
index 4b9e5d32..570e8a76 100644
--- a/src/f_op/f_op_actor_mng.cpp
+++ b/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(uint actorID, fopAc_ac_c** pDstActor) {
+s32 fopAcM_SearchByID(fpc_ProcID 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, uint parentPcId) {
+fopAcM_prm_class * createAppend(u32 parameter, cXyz* pPos, int roomNo, csXyz* pAngle, cXyz* pScale, s8 subtype, fpc_ProcID 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(uint actorID) {
+s32 fopAcM_delete(fpc_ProcID actorID) {
fopAc_ac_c* pActor = (fopAc_ac_c*)fopAcM_SearchByID(actorID);
if (pActor != NULL) {
@@ -152,7 +152,7 @@ s32 fopAcM_delete(uint actorID) {
}
/* 8002451C-80024598 .text fopAcM_create__FsUlP4cXyziP5csXyzP4cXyzScPFPv_i */
-uint fopAcM_create(s16 procName, u32 parameter, cXyz* pPos, int roomNo, csXyz* pAngle, cXyz* pScale, s8 subtype, createFunc createFunc) {
+fpc_ProcID 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 @@ uint fopAcM_create(s16 procName, u32 parameter, cXyz* pPos, int roomNo, csXyz* p
}
/* 80024598-80024614 .text fopAcM_create__FPcUlP4cXyziP5csXyzP4cXyzPFPv_i */
-uint fopAcM_create(char* pProcNameString, u32 parameter, cXyz* pPos, int roomNo, csXyz* pAngle, cXyz* pScale, createFunc createFunc) {
+fpc_ProcID 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 */
-uint fopAcM_createChild(s16 procName, uint parentPcId, u32 parameter, cXyz* pPos, int roomNo, csXyz* pAngle, cXyz* pScale, s8 subtype, createFunc createFunc) {
+fpc_ProcID fopAcM_createChild(s16 procName, fpc_ProcID 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 @@ uint fopAcM_createChild(s16 procName, uint parentPcId, u32 parameter, cXyz* pPos
}
/* 80024790-80024814 .text fopAcM_createChild__FPcUiUlP4cXyziP5csXyzP4cXyzPFPv_i */
-uint fopAcM_createChild(char* pProcNameString, uint parentPcId, u32 parameter, cXyz* pPos, int roomNo, csXyz* pAngle, cXyz* pScale, createFunc createFunc) {
+fpc_ProcID fopAcM_createChild(char* pProcNameString, fpc_ProcID 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 @@ uint fopAcM_createChild(char* pProcNameString, uint parentPcId, u32 parameter, c
}
/* 80024814-800249D4 .text fopAcM_createChildFromOffset__FsUiUlP4cXyziP5csXyzP4cXyzScPFPv_i */
-uint fopAcM_createChildFromOffset(s16 procName, uint parentPcId, u32 parameter, cXyz* pPosOffs, int roomNo, csXyz* pAngleOffs, cXyz* pScale, s8 subtype, createFunc createFunc) {
+fpc_ProcID fopAcM_createChildFromOffset(s16 procName, fpc_ProcID 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 @@ uint fopAcM_createChildFromOffset(s16 procName, uint parentPcId, u32 parameter,
}
/* 800249D4-80024B78 .text fopAcM_createChildFromOffset__FPcUiUlP4cXyziP5csXyzP4cXyzPFPv_i */
-uint fopAcM_createChildFromOffset(char* pProcNameString, uint parentPcId, u32 parameter, cXyz* pPosOffs, int roomNo, csXyz* pAngleOffs, cXyz* pScale, createFunc createFunc) {
+fpc_ProcID fopAcM_createChildFromOffset(char* pProcNameString, fpc_ProcID 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 */
-uint fopAcM_createItemForPresentDemo(cXyz* pos, int i_itemNo, u8 argFlag, int roomNo, int param_5, csXyz* rot, cXyz* scale) {
+fpc_ProcID 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 @@ uint fopAcM_createItemForPresentDemo(cXyz* pos, int i_itemNo, u8 argFlag, int ro
}
/* 800261E8-800262B4 .text fopAcM_createItemForTrBoxDemo__FP4cXyziiiP5csXyzP4cXyz */
-uint fopAcM_createItemForTrBoxDemo(cXyz* pos, int i_itemNo, int roomNo, int param_5, csXyz* rot, cXyz* scale) {
+fpc_ProcID 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 @@ uint fopAcM_createItemForTrBoxDemo(cXyz* pos, int i_itemNo, int roomNo, int para
}
/* 800262B4-80026694 .text fopAcM_createItemFromTable__FP4cXyziiiiP5csXyziP4cXyz */
-uint fopAcM_createItemFromTable(cXyz* p_pos, int i_itemNo, int i_itemBitNo, int roomNo, int type, csXyz* p_angle, int action, cXyz* p_scale) {
+fpc_ProcID 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 @@ uint fopAcM_createItemFromTable(cXyz* p_pos, int i_itemNo, int i_itemBitNo, int
}
u8* pItemTable = itemTableList->mItemTables[tableIdx];
u32 itemNo;
- uint lastItemPID;
+ fpc_ProcID lastItemPID;
for (int i = 0; (itemNo = *pItemTable) != dItem_NONE_e && i < 0x10; pItemTable++, i++) {
if (p_pos) {
pos = *p_pos;
@@ -883,7 +883,7 @@ uint fopAcM_createItemFromTable(cXyz* p_pos, int i_itemNo, int i_itemBitNo, int
}
/* 80026694-800267C8 .text fopAcM_createRaceItemFromTable__FP4cXyziiiP5csXyzP4cXyzi */
-uint fopAcM_createRaceItemFromTable(cXyz* pos, int i_itemNo, int i_itemBitNo, int i_roomNo, csXyz* angle, cXyz* scale, int param_7) {
+fpc_ProcID 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 @@ uint fopAcM_createRaceItemFromTable(cXyz* pos, int i_itemNo, int i_itemBitNo, in
}
/* 800267C8-8002688C .text fopAcM_createShopItem__FP4cXyziP5csXyziP4cXyzPFPv_i */
-uint fopAcM_createShopItem(cXyz* pos, int i_itemNo, csXyz* rot, int roomNo, cXyz* scale,
+fpc_ProcID 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 @@ uint fopAcM_createShopItem(cXyz* pos, int i_itemNo, csXyz* rot, int roomNo, cXyz
}
/* 8002688C-80026980 .text fopAcM_createRaceItem__FP4cXyziiP5csXyziP4cXyzi */
-uint fopAcM_createRaceItem(cXyz* pos, int i_itemNo, int i_itemBitNo, csXyz* rot, int roomNo, cXyz* scale, int param_7) {
+fpc_ProcID 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 @@ uint fopAcM_createRaceItem(cXyz* pos, int i_itemNo, int i_itemBitNo, csXyz* rot,
}
/* 80026980-80026A68 .text fopAcM_createDemoItem__FP4cXyziiP5csXyziP4cXyzUc */
-uint fopAcM_createDemoItem(cXyz* pos, int i_itemNo, int i_itemBitNo, csXyz* rot, int roomNo, cXyz* scale, u8 argFlag) {
+fpc_ProcID 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 @@ uint fopAcM_createDemoItem(cXyz* pos, int i_itemNo, int i_itemBitNo, csXyz* rot,
}
/* 80026A68-80026ADC .text fopAcM_createItemForBoss__FP4cXyziiP5csXyzP4cXyzi */
-uint fopAcM_createItemForBoss(cXyz* pos, int, int roomNo, csXyz* rot, cXyz* scale, int param_6) {
+fpc_ProcID fopAcM_createItemForBoss(cXyz* pos, int, int roomNo, csXyz* rot, cXyz* scale, int param_6) {
switch (param_6) {
case 1:
return fopAcM_createItem(pos, dItem_HEART_CONTAINER_e, -1, roomNo, 3, rot, 0xC, scale);
@@ -948,7 +948,7 @@ uint fopAcM_createItemForBoss(cXyz* pos, int, int roomNo, csXyz* rot, cXyz* scal
}
/* 80026ADC-80026C90 .text fopAcM_createItem__FP4cXyziiiiP5csXyziP4cXyz */
-uint fopAcM_createItem(cXyz* pos, int i_itemNo, int i_itemBitNo, int roomNo, int type, csXyz* rot, int action, cXyz* scale) {
+fpc_ProcID 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 */
-uint fopAcM_createIball(cXyz* p_pos, int itemTableIdx, int i_roomNo, csXyz* p_angle, int i_itemBitNo) {
+fpc_ProcID 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 != NULL);
- uint grabProcID = daPy_getPlayerActorClass()->getGrabActorID();
+ fpc_ProcID 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 */
-uint fopAcM_createDisappear(fopAc_ac_c* i_actor, cXyz* p_pos, u8 i_scale, u8 i_health, u8 i_itemBitNo) {
+fpc_ProcID 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 e11503b3..d776f860 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) {}
-uint daPy_py_c::getGrabActorID() const { return fpcM_ERROR_PROCESS_ID_e; }
+fpc_ProcID 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 6f2b11ff..5bb24c58 100644
--- a/src/f_op/f_op_camera_mng.cpp
+++ b/src/f_op/f_op_camera_mng.cpp
@@ -6,16 +6,17 @@
#include "f_op/f_op_camera_mng.h"
#include "f_pc/f_pc_layer.h"
#include "f_pc/f_pc_stdcreate_req.h"
+#include "f_pc/f_pc_manager.h"
-static uint l_fopCamM_id[4];
+static fpc_ProcID l_fopCamM_id[4];
/* 80029468-80029470 .text fopCamM_GetParam__FP12camera_class */
u32 fopCamM_GetParam(camera_class* i_this) {
- return i_this->base.mParameters;
+ return fpcM_GetParam(i_this);
}
/* 80029470-800294D4 .text fopCamM_Create__FisPv */
-u32 fopCamM_Create(int i_cameraIdx, s16 i_procName, void* param_3) {
+fpc_ProcID fopCamM_Create(int i_cameraIdx, s16 i_procName, void* param_3) {
l_fopCamM_id[i_cameraIdx] = fpcSCtRq_Request(fpcLy_CurrentLayer(), i_procName, 0, 0, param_3);
return l_fopCamM_id[i_cameraIdx];
}
diff --git a/src/f_op/f_op_kankyo_mng.cpp b/src/f_op/f_op_kankyo_mng.cpp
index 8c071161..61d7b53e 100644
--- a/src/f_op/f_op_kankyo_mng.cpp
+++ b/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(uint id) {
+kankyo_class* fopKyM_SearchByID(fpc_ProcID id) {
return (kankyo_class*) fpcEx_SearchByID(id);
}
@@ -48,12 +48,12 @@ void fopKyM_Delete(void* i_process) {
}
/* 8002A988-8002A9D8 .text fopKyM_Create__FsPFPv_iPv */
-uint fopKyM_Create(s16 i_procName, fopKyM_CreateFunc i_createFunc, void* i_process) {
+fpc_ProcID 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 */
-uint fopKyM_create(s16 i_procName, int i_param, cXyz* i_pos, cXyz* i_scale, fopKyM_CreateFunc i_createFunc) {
+fpc_ProcID 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 */
-uint fopKyM_createWpillar(cXyz const* i_pos, f32 scaleXZ, f32 scaleY, int i_param) {
+fpc_ProcID 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 1fcb4095..c930c932 100644
--- a/src/f_op/f_op_msg_mng.cpp
+++ b/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(uint pid) {
+msg_class* fopMsgM_SearchByID(fpc_ProcID 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(uint pid) {
+BOOL fopMsgM_IsExecuting(fpc_ProcID pid) {
return fpcEx_IsExist(pid);
}
@@ -200,7 +200,7 @@ void createTimerAppend(int, u16, u8, u8, f32, f32, f32, f32, uint) {
}
/* 8002B1C8-8002B23C .text fopMsgM_create__FsP10fopAc_ac_cP4cXyzPUlPUlPFPv_i */
-s32 fopMsgM_create(s16, fopAc_ac_c*, cXyz*, u32*, u32*, int (*)(void*)) {
+fpc_ProcID fopMsgM_create(s16, fopAc_ac_c*, cXyz*, u32*, u32*, int (*)(void*)) {
/* Nonmatching */
}
@@ -210,7 +210,7 @@ void fop_MGameTerm_create(s16, s16, s16, int, int, int (*)(void*)) {
}
/* 8002B2B0-8002B324 .text fop_Timer_create__FsUcUsUcUcffffPFPv_i */
-uint fop_Timer_create(s16, u8, u16, u8, u8, f32, f32, f32, f32, int (*)(void*)) {
+fpc_ProcID fop_Timer_create(s16, u8, u16, u8, u8, f32, f32, f32, f32, int (*)(void*)) {
/* Nonmatching */
}
@@ -225,22 +225,22 @@ u32 fopMsgM_searchMessageNumber(u32) {
}
/* 8002B634-8002B778 .text fopMsgM_messageSet__FUlP10fopAc_ac_c */
-uint fopMsgM_messageSet(u32, fopAc_ac_c*) {
+fpc_ProcID fopMsgM_messageSet(u32, fopAc_ac_c*) {
/* Nonmatching */
}
/* 8002B778-8002B8A4 .text fopMsgM_messageSet__FUlP4cXyz */
-uint fopMsgM_messageSet(u32, cXyz*) {
+fpc_ProcID fopMsgM_messageSet(u32, cXyz*) {
/* Nonmatching */
}
/* 8002B8A4-8002B9C4 .text fopMsgM_messageSet__FUl */
-uint fopMsgM_messageSet(u32) {
+fpc_ProcID fopMsgM_messageSet(u32) {
/* Nonmatching */
}
/* 8002B9C4-8002BA4C .text fopMsgM_scopeMessageSet__FUl */
-uint fopMsgM_scopeMessageSet(u32) {
+fpc_ProcID fopMsgM_scopeMessageSet(u32) {
/* Nonmatching */
}
@@ -490,7 +490,7 @@ void fopMsgM_outFontDraw2(J2DPicture*, J2DPicture*, int, int, int, int, s16*, u8
}
/* 8002E204-8002E254 .text fopMsgM_Create__FsPFPv_iPv */
-u32 fopMsgM_Create(s16, int (*)(void*), void*) {
+fpc_ProcID fopMsgM_Create(s16, int (*)(void*), void*) {
/* Nonmatching */
}
diff --git a/src/f_op/f_op_overlap_mng.cpp b/src/f_op/f_op_overlap_mng.cpp
index aa10569f..7d8057f2 100644
--- a/src/f_op/f_op_overlap_mng.cpp
+++ b/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(uint pcId) {
+void fopOvlpM_ToldAboutID(fpc_ProcID pcId) {
if (l_fopOvlpM_overlap[0] != NULL)
l_fopOvlpM_overlap[0]->mpTask->mScenePId = pcId;
}
diff --git a/src/f_op/f_op_scene_mng.cpp b/src/f_op/f_op_scene_mng.cpp
index 0bb80c04..638efe5a 100644
--- a/src/f_op/f_op_scene_mng.cpp
+++ b/src/f_op/f_op_scene_mng.cpp
@@ -9,16 +9,16 @@
#include "f_pc/f_pc_searcher.h"
#include "JSystem/JUtility/JUTAssert.h"
-scene_class* fopScnM_SearchByID(uint id) {
+scene_class* fopScnM_SearchByID(fpc_ProcID id) {
return (scene_class*)fopScnIt_Judge((fop_ScnItFunc)fpcSch_JudgeByID, &id);
}
-static u32 l_scnRqID = fpcM_ERROR_PROCESS_ID_e;
+static uint l_scnRqID = -1;
int fopScnM_ChangeReq(scene_class* i_scene, s16 procName, s16 fadeTime, u16 param_4) {
uint sceneRequestID = fopScnRq_Request(2, i_scene, procName, 0, fadeTime, param_4);
- if (sceneRequestID == fpcM_ERROR_PROCESS_ID_e) {
+ if (sceneRequestID == -1) {
return 0;
}
@@ -26,18 +26,18 @@ int fopScnM_ChangeReq(scene_class* i_scene, s16 procName, s16 fadeTime, u16 para
return 1;
}
-uint fopScnM_DeleteReq(scene_class* i_scene) {
+BOOL fopScnM_DeleteReq(scene_class* i_scene) {
uint sceneRequestID = fopScnRq_Request(1, i_scene, 0x7FFF, 0, 0x7FFF, 0);
- return sceneRequestID != fpcM_ERROR_PROCESS_ID_e;
+ return sceneRequestID != -1;
}
-int fopScnM_CreateReq(s16 param_1, s16 param_2, u16 param_3, u32 param_4) {
+BOOL fopScnM_CreateReq(s16 param_1, s16 param_2, u16 param_3, u32 param_4) {
uint sceneRequestID = fopScnRq_Request(0, 0, param_1, (void*)param_4, param_2, param_3);
- return sceneRequestID != fpcM_ERROR_PROCESS_ID_e;
+ return sceneRequestID != -1;
}
u32 fopScnM_ReRequest(s16 param_1, u32 param_2) {
- if (l_scnRqID == fpcM_ERROR_PROCESS_ID_e) {
+ if (l_scnRqID == -1) {
return 0;
}
diff --git a/src/f_op/f_op_scene_req.cpp b/src/f_op/f_op_scene_req.cpp
index d184fc10..ebd83ec2 100644
--- a/src/f_op/f_op_scene_req.cpp
+++ b/src/f_op/f_op_scene_req.cpp
@@ -120,14 +120,14 @@ uint fopScnRq_Request(int param_1, scene_class* i_scene, s16 param_3, void* para
&submethod);
if (!pScnReq) {
- ret = fpcM_ERROR_PROCESS_ID_e;
+ ret = -1;
} else {
if (param_5 != 0x7fff) {
phase_handler_table = fadeFase;
tmp = (int)fopScnRq_FadeRequest(param_5, param_6);
if (!tmp) {
fpcNdRq_Delete(&pScnReq->mCrtReq);
- return fpcM_ERROR_PROCESS_ID_e;
+ return -1;
}
}
pScnReq->mFadeRequest = tmp;
@@ -138,8 +138,8 @@ uint fopScnRq_Request(int param_1, scene_class* i_scene, s16 param_3, void* para
return ret;
}
-s32 fopScnRq_ReRequest(uint param_1, s16 param_2, void* param_3) {
- return fpcNdRq_ReRequest(param_1, param_2, param_3);
+s32 fopScnRq_ReRequest(uint i_requestID, s16 i_procName, void* i_data) {
+ return fpcNdRq_ReRequest(i_requestID, i_procName, i_data);
}
s32 fopScnRq_Handler() {
diff --git a/src/f_pc/f_pc_base.cpp b/src/f_pc/f_pc_base.cpp
index 4396d3d7..ab324e69 100644
--- a/src/f_pc/f_pc_base.cpp
+++ b/src/f_pc/f_pc_base.cpp
@@ -34,8 +34,8 @@ s32 fpcBs_MakeOfType(int* i_type) {
}
/* 8003C8DC-8003C904 .text fpcBs_MakeOfId__Fv */
-s32 fpcBs_MakeOfId() {
- static s32 process_id = 1;
+fpc_ProcID fpcBs_MakeOfId() {
+ static fpc_ProcID process_id = 1;
return process_id++;
}
@@ -79,7 +79,7 @@ s32 fpcBs_Delete(base_process_class* i_proc) {
}
/* 8003CA60-8003CB5C .text fpcBs_Create__FsUiPv */
-base_process_class* fpcBs_Create(s16 i_profName, uint i_procID, void* i_data) {
+base_process_class* fpcBs_Create(s16 i_profName, fpc_ProcID i_procID, void* i_data) {
process_profile_definition* procProfDef;
base_process_class* procClass;
u32 size;
diff --git a/src/f_pc/f_pc_create_req.cpp b/src/f_pc/f_pc_create_req.cpp
index 75de6cc7..be22a3ab 100644
--- a/src/f_pc/f_pc_create_req.cpp
+++ b/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, uint* i_procID) {
+bool fpcCtRq_isCreatingByID(create_tag* i_createTag, fpc_ProcID* 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(uint i_id) {
+BOOL fpcCtRq_IsCreatingByID(fpc_ProcID i_id) {
return fpcCtIt_Judge((fpcLyIt_JudgeFunc)fpcCtRq_isCreatingByID, &i_id) != NULL ? TRUE : FALSE;
}
diff --git a/src/f_pc/f_pc_creator.cpp b/src/f_pc/f_pc_creator.cpp
index ddb0c923..52df73bb 100644
--- a/src/f_pc/f_pc_creator.cpp
+++ b/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(uint i_id) {
+BOOL fpcCt_IsCreatingByID(fpc_ProcID i_id) {
return fpcCtRq_IsCreatingByID(i_id);
}
diff --git a/src/f_pc/f_pc_executor.cpp b/src/f_pc/f_pc_executor.cpp
index a295e42e..740159f0 100644
--- a/src/f_pc/f_pc_executor.cpp
+++ b/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(uint i_id) {
+base_process_class* fpcEx_SearchByID(fpc_ProcID i_id) {
if (i_id + 2 <= 1)
return NULL;
@@ -22,7 +22,7 @@ base_process_class* fpcEx_SearchByID(uint i_id) {
}
/* 8003D614-8003D63C .text fpcEx_IsExist__FUi */
-BOOL fpcEx_IsExist(uint i_id) {
+BOOL fpcEx_IsExist(fpc_ProcID i_id) {
return fpcEx_SearchByID(i_id) != NULL ? TRUE : FALSE;
}
diff --git a/src/f_pc/f_pc_layer.cpp b/src/f_pc/f_pc_layer.cpp
index 15719471..cef67860 100644
--- a/src/f_pc/f_pc_layer.cpp
+++ b/src/f_pc/f_pc_layer.cpp
@@ -100,10 +100,10 @@ layer_class* fpcLy_CurrentLayer() {
}
/* 8003D974-8003D9C4 .text fpcLy_Search__FUi */
-layer_class* fpcLy_Search(uint i_id) {
+layer_class* fpcLy_Search(uint i_layerID) {
layer_class* layer_p = fpcLy_RootLayer();
while (layer_p != NULL) {
- if (layer_p->mLayerID == i_id) {
+ if (layer_p->mLayerID == i_layerID) {
return layer_p;
}
layer_p = (layer_class*)layer_p->mNode.mpNextNode;
@@ -112,13 +112,13 @@ layer_class* fpcLy_Search(uint i_id) {
}
/* 8003D9C4-8003DA34 .text fpcLy_Layer__FUi */
-layer_class* fpcLy_Layer(uint i_id) {
- if (i_id == fpcLy_ROOT_e || fpcLy_RootLayer()->mLayerID == i_id) {
+layer_class* fpcLy_Layer(uint i_layerID) {
+ if (i_layerID == fpcLy_ROOT_e || fpcLy_RootLayer()->mLayerID == i_layerID) {
return fpcLy_RootLayer();
- } else if (i_id == fpcLy_CURRENT_e || fpcLy_CurrentLayer()->mLayerID == i_id) {
+ } else if (i_layerID == fpcLy_CURRENT_e || fpcLy_CurrentLayer()->mLayerID == i_layerID) {
return fpcLy_CurrentLayer();
} else {
- return fpcLy_Search(i_id);
+ return fpcLy_Search(i_layerID);
}
}
diff --git a/src/f_pc/f_pc_layer_tag.cpp b/src/f_pc/f_pc_layer_tag.cpp
index 44097cd2..10a5cdde 100644
--- a/src/f_pc/f_pc_layer_tag.cpp
+++ b/src/f_pc/f_pc_layer_tag.cpp
@@ -59,7 +59,7 @@ s32 fpcLyTg_Move(layer_management_tag_class* i_lyTag, uint i_layerID, u16 i_list
}
/* 8003E128-8003E1DC .text fpcLyTg_Init__FP26layer_management_tag_classUiPv */
-s32 fpcLyTg_Init(layer_management_tag_class* i_lyTag, uint i_id, void* i_data) {
+s32 fpcLyTg_Init(layer_management_tag_class* i_lyTag, uint i_layerID, void* i_data) {
static layer_management_tag_class crear = {
NULL, NULL, NULL, NULL, 0, NULL, 0xFFFF, 0xFFFF,
};
@@ -67,7 +67,7 @@ s32 fpcLyTg_Init(layer_management_tag_class* i_lyTag, uint i_id, void* i_data) {
layer_class* layer;
*i_lyTag = crear;
cTg_Create(&i_lyTag->mCreateTag, i_data);
- layer = fpcLy_Layer(i_id);
+ layer = fpcLy_Layer(i_layerID);
if (layer != NULL) {
i_lyTag->mpLayer = layer;
return 1;
diff --git a/src/f_pc/f_pc_manager.cpp b/src/f_pc/f_pc_manager.cpp
index ab636b58..93e4c46b 100644
--- a/src/f_pc/f_pc_manager.cpp
+++ b/src/f_pc/f_pc_manager.cpp
@@ -49,7 +49,7 @@ s32 fpcM_Delete(void* i_proc) {
}
/* 8003E3B0-8003E3D0 .text fpcM_IsCreating__FUi */
-BOOL fpcM_IsCreating(uint pID) {
+BOOL fpcM_IsCreating(fpc_ProcID pID) {
return fpcCt_IsCreatingByID(pID);
}
diff --git a/src/f_pc/f_pc_node_req.cpp b/src/f_pc/f_pc_node_req.cpp
index 011426f2..0e60f278 100644
--- a/src/f_pc/f_pc_node_req.cpp
+++ b/src/f_pc/f_pc_node_req.cpp
@@ -12,6 +12,7 @@
#include "f_pc/f_pc_layer.h"
#include "f_pc/f_pc_node.h"
#include "f_pc/f_pc_stdcreate_req.h"
+#include "f_pc/f_pc_manager.h"
/* 8003F29C-8003F2DC .text fpcNdRq_RequestQTo__FP19node_create_request */
void fpcNdRq_RequestQTo(node_create_request* i_NdCtReq) {
@@ -43,7 +44,7 @@ s32 fpcNdRq_phase_Create(node_create_request* i_NdCtReq) {
i_NdCtReq->mCreatingID = fpcSCtRq_Request(i_NdCtReq->mpLayerClass, i_NdCtReq->mProcName,
(stdCreateFunc)i_NdCtReq->mpNodeCrReqMthCls->mpPostMethodFunc, i_NdCtReq,
i_NdCtReq->mpUserData);
- return i_NdCtReq->mCreatingID == -1 ? 3 : 2;
+ return i_NdCtReq->mCreatingID == fpcM_ERROR_PROCESS_ID_e ? 3 : 2;
}
/* 8003F3DC-8003F3E4 .text fpcNdRq_phase_IsDeleteTiming__FP19node_create_request */
@@ -138,7 +139,7 @@ s32 fpcNdRq_Handler() {
/* 8003F6BC-8003F728 .text fpcNdRq_IsPossibleTarget__FP18process_node_class */
s32 fpcNdRq_IsPossibleTarget(process_node_class* i_procNode) {
- uint bsPcId = i_procNode->base.mBsPcId;
+ fpc_ProcID bsPcId = i_procNode->base.mBsPcId;
request_node_class* currentNode;
node_create_request* currentNdCr;
currentNode = (request_node_class*)l_fpcNdRq_Queue.mpHead;
@@ -155,7 +156,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;
- uint bsPcId = i_procNode->base.mBsPcId;
+ fpc_ProcID bsPcId = i_procNode->base.mBsPcId;
currentNode = (request_node_class*)l_fpcNdRq_Queue.mpHead;
while (currentNode != NULL) {
currentNodeReq = currentNode->mNodeCrReq;
@@ -176,7 +177,7 @@ node_create_request* fpcNdRq_Create(u32 i_requestSize) {
node_create_request* req = (node_create_request*)cMl::memalignB(-4, i_requestSize);
if (req != NULL) {
- static int request_id = 0;
+ static uint request_id = 0;
sBs_ClearArea(req, i_requestSize);
*req = clear;
cTg_Create(&req->mCreateTag, req);
diff --git a/src/f_pc/f_pc_searcher.cpp b/src/f_pc/f_pc_searcher.cpp
index ac1c8422..0464d434 100644
--- a/src/f_pc/f_pc_searcher.cpp
+++ b/src/f_pc/f_pc_searcher.cpp
@@ -16,7 +16,7 @@ void* fpcSch_JudgeForPName(void* i_proc, void* i_data) {
/* 80040068-80040080 .text fpcSch_JudgeByID__FPvPv */
void* fpcSch_JudgeByID(void* i_proc, void* i_data) {
- s32 process_id = *(s32*)i_data;
+ fpc_ProcID process_id = *(fpc_ProcID*)i_data;
if (((base_process_class*)i_proc)->mBsPcId == process_id)
return i_proc;
diff --git a/src/f_pc/f_pc_stdcreate_req.cpp b/src/f_pc/f_pc_stdcreate_req.cpp
index e831aba6..8836016c 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 */
-uint fpcSCtRq_Request(layer_class* i_layer, s16 i_procName, stdCreateFunc i_createFunc, void* param_4, void* param_5) {
+fpc_ProcID 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,