Add fpc_ProcID type and use it for all process IDs

See https://github.com/zeldaret/tp/pull/2173

47 files changed, 65 insertions, 65 deletions

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;