Standardize process ID type to be uint

9 files changed, 17 insertions, 18 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);