diff --git a/include/d/actor/d_a_daiocta.h b/include/d/actor/d_a_daiocta.h
index e7add7832..c9de1d57f 100644
--- a/include/d/actor/d_a_daiocta.h
+++ b/include/d/actor/d_a_daiocta.h
@@ -149,7 +149,7 @@ public:
     /* 0x26C0 */ u8 m26C0;
     /* 0x26C1 */ u8 m26C1;
     /* 0x26C2 */ u8 m26C2[0x26C4 - 0x26C2];
-    /* 0x26C4 */ fpc_ProcID mpAuzu;
+    /* 0x26C4 */ fpc_ProcID mAuzuId;
     /* 0x26C8 */ JntHit_c* mpJntHit;
     /* 0x26CC */ J3DModel* mpSuikomiModel;
     /* 0x26D0 */ mDoExt_brkAnm mBrkAnm2;
diff --git a/src/d/actor/d_a_daiocta.cpp b/src/d/actor/d_a_daiocta.cpp
index b79a881aa..a58ecd13b 100644
--- a/src/d/actor/d_a_daiocta.cpp
+++ b/src/d/actor/d_a_daiocta.cpp
@@ -904,7 +904,7 @@ void daDaiocta_c::modeAppearInit() {
 #if VERSION > VERSION_JPN
     fopAc_ac_c* auzu_p;
 
-    if (fopAcM_SearchByID(mpAuzu, &auzu_p) && auzu_p) {
+    if (fopAcM_SearchByID(mAuzuId, &auzu_p) && auzu_p) {
         auzu_p->current.pos = auzu_pos;
     }
 #else 
@@ -952,7 +952,7 @@ void daDaiocta_c::modeAppear() {
             );
     }
 
-    daObjAuzu::Act_c* auzu_p = (daObjAuzu::Act_c *) fopAcM_SearchByID(mpAuzu);
+    daObjAuzu::Act_c* auzu_p = (daObjAuzu::Act_c *) fopAcM_SearchByID(mAuzuId);
     if (auzu_p) {
         auzu_p->to_appear();
         if (auzu_p->is_appear()) {
@@ -1173,7 +1173,7 @@ void daDaiocta_c::modeDemo() {
         }
 
         if (strcmp(cut_name, "HAKIDASU") == 0) {
-            fopAc_ac_c* actor_p = fopAcM_SearchByID(mpAuzu);
+            fopAc_ac_c* actor_p = fopAcM_SearchByID(mAuzuId);
             actor_p->current.pos = current.pos;
             actor_p->current.pos.y += 20.0f;
             if (s32(mpMorf->getFrame()) == 26) {
@@ -1239,7 +1239,7 @@ void daDaiocta_c::modeDelete() {
             if (mPrmIdx == 5 && mpMorf->isStop()) {
                 fopAcM_monsSeStart(this, JA_SE_CV_DO_SINK, 0);
                 setEffect(dPa_name::ID_IT_SN_DO_DOWNSHIBUKI00);
-                daObjAuzu::Act_c* auzu_p = (daObjAuzu::Act_c *) fopAcM_SearchByID(mpAuzu);
+                daObjAuzu::Act_c* auzu_p = (daObjAuzu::Act_c *) fopAcM_SearchByID(mAuzuId);
                 auzu_p->to_disappear();
                 dComIfGp_getVibration().StartQuake(7, -0x21, cXyz(0.0f, 1.0f, 0.0f));
                 dComIfGp_evmng_cutEnd(staff_id);
@@ -1662,7 +1662,7 @@ void daDaiocta_c::createInit() {
     }
 
 #if VERSION > VERSION_JPN
-    mpAuzu = fopAcM_create(
+    mAuzuId = fopAcM_create(
         PROC_Obj_Auzu, 
         0x1100FF, 
         &current.pos, 
diff --git a/src/d/actor/d_a_npc_ji1.cpp b/src/d/actor/d_a_npc_ji1.cpp
index c612b774f..611f14278 100644
--- a/src/d/actor/d_a_npc_ji1.cpp
+++ b/src/d/actor/d_a_npc_ji1.cpp
@@ -708,7 +708,7 @@ BOOL daNpc_Ji1_c::kaitenAction(void*) {
     else if(field_0xC78 != -1) {
         int staffIdx = dComIfGp_evmng_getMyStaffId("Ji1");
         int actionNo = getEventActionNo(staffIdx);
-        if(l_msgId == -1) {
+        if(l_msgId == fpcM_ERROR_PROCESS_ID_e) {
             if(actionNo == 2) {
                 if(mMsgNo == 0x974) {
                     current.angle.y = -0x8000;
@@ -1055,7 +1055,7 @@ BOOL daNpc_Ji1_c::talkAction(void*) {
         l_msg = 0;
     }
     else if(field_0xC78 != -1) {
-        if(l_msgId == -1) {
+        if(l_msgId == fpcM_ERROR_PROCESS_ID_e) {
             l_msgId = fopMsgM_messageSet(mMsgNo, &eyePos);
         }
         else if(l_msg == 0) {
@@ -1327,7 +1327,7 @@ BOOL daNpc_Ji1_c::speakBadAction(void*) {
         l_msgId = -1;
     }
     else if(field_0xC78 != -1) {
-        if(l_msgId == -1) {
+        if(l_msgId == fpcM_ERROR_PROCESS_ID_e) {
             if(mAnimation == 7) {
                 if(mpOrcaMorf->getFrame() > mpOrcaMorf->getEndFrame() - 2.0f) {
                     l_msgId = fopMsgM_messageSet(mMsgNo, &eyePos);
@@ -2234,7 +2234,7 @@ BOOL daNpc_Ji1_c::endspeakAction(void*) {
         l_msgId = -1;
     }
     else if(field_0xC78 != -1) {
-        if(l_msgId == -1) {
+        if(l_msgId == fpcM_ERROR_PROCESS_ID_e) {
             l_msgId = fopMsgM_messageSet(mMsgNo, &eyePos);
             setAnm(5, 4.0f, 0);
         }
diff --git a/src/d/actor/d_a_npc_os.cpp b/src/d/actor/d_a_npc_os.cpp
index 4ec6f7697..db25d2eb4 100644
--- a/src/d/actor/d_a_npc_os.cpp
+++ b/src/d/actor/d_a_npc_os.cpp
@@ -1619,7 +1619,7 @@ void daNpc_Os_c::initialSaveEvent(int) {
 
 /* 00004AF8-00004B64       .text talk_init__10daNpc_Os_cFv */
 BOOL daNpc_Os_c::talk_init() {
-    if(l_msgId == -1) {
+    if(l_msgId == fpcM_ERROR_PROCESS_ID_e) {
         l_msgId = fopMsgM_messageSet(field_0x780, this);
     }
     else {
diff --git a/src/d/actor/d_a_npc_zl1.cpp b/src/d/actor/d_a_npc_zl1.cpp
index 6d7d0a153..8a88563ad 100644
--- a/src/d/actor/d_a_npc_zl1.cpp
+++ b/src/d/actor/d_a_npc_zl1.cpp
@@ -534,7 +534,7 @@ void daNpc_Zl1_c::setMtx(bool param_1) {
     if(field_0x7CE) {
 #if VERSION > VERSION_DEMO
         if(!fpcM_IsCreating(mProcId1)) {
-            if(mProcId1 != 0xffffffff) {
+            if(mProcId1 != fpcM_ERROR_PROCESS_ID_e) {
                 if(fopAcM_SearchByID(mProcId1, (fopAc_ac_c **)&actor) == 1) {
                     if(actor != NULL) {
                         temp = true;
@@ -1136,10 +1136,8 @@ fopAc_ac_c* daNpc_Zl1_c::searchByID(fpc_ProcID pid, int* param_2) {
 
 /* 000023AC-0000245C       .text partner_search_sub__11daNpc_Zl1_cFPFPvPv_Pv */
 bool daNpc_Zl1_c::partner_search_sub(void* (*param_1)(void*, void*)) {
-    fpc_ProcID procId;
-
     bool ret = false;
-    mProcId1 = -1;
+    mProcId1 = fpcM_ERROR_PROCESS_ID_e;
 
     l_check_wrk = 0;
     for (s32 i = 0; i < 0x14; i++) {
diff --git a/src/d/d_snap.cpp b/src/d/d_snap.cpp
index b8ec078ea..6369ea8ca 100644
--- a/src/d/d_snap.cpp
+++ b/src/d/d_snap.cpp
@@ -2160,7 +2160,7 @@ void dSnap_packet::SetResult() {
             if (sp8[m_tbl[col].m_obj.GetPhoto()] != 0) {
                 continue;
             }
-            if (m_judge_tbl[m_tbl[col].m_obj.GetPhoto()] != NULL) {
+            if (m_judge_tbl[m_tbl[col].m_obj.GetPhoto()] != 0) {
                 field_0x10 = m_tbl[col].m_obj.GetPhoto();
                 mResult = (this->*m_judge_tbl[m_tbl[col].m_obj.GetPhoto()])();
                 r30 = m_tbl[col].m_obj.mCapturedPixels;