minor inline cleanup

13 files changed, 27 insertions, 27 deletions

diff --git a/src/d/actor/d_a_agb.cpp b/src/d/actor/d_a_agb.cpp
index f49ccab8..908d0c22 100644
--- a/src/d/actor/d_a_agb.cpp
+++ b/src/d/actor/d_a_agb.cpp
@@ -1466,7 +1466,7 @@ void daAgb_c::modeMove() {
             if (attList) {
                 fopAc_ac_c* r3 = attList->getActor();
                 if (r3) {
-                    if (fopAcM_CheckStatusMap(r3, 0) && !fopAcM_checkStatus(r3, fopAcStts_BOSS_e) && fopAcM_GetName(r3) != PROC_FGANON) {
+                    if (fopAcM_CheckStatusMap(r3, 0) && !fopAcM_CheckStatus(r3, fopAcStts_BOSS_e) && fopAcM_GetName(r3) != PROC_FGANON) {
                         current.pos = r3->current.pos;
                         home.pos = r3->current.pos;
                         setTargetID(attList->getPid());
diff --git a/src/d/actor/d_a_am2.cpp b/src/d/actor/d_a_am2.cpp
index f2ee1ea9..3072dcef 100644
--- a/src/d/actor/d_a_am2.cpp
+++ b/src/d/actor/d_a_am2.cpp
@@ -127,7 +127,7 @@ static BOOL daAM2_Draw(am2_class* i_this) {
     i_this->mpBrkAnm->remove(model->getModelData());
     i_this->mpBtkAnm->remove(model->getModelData());
 
-    if (!fopAcM_checkStatus(i_this, fopAcStts_CARRY_e)) {
+    if (!fopAcM_CheckStatus(i_this, fopAcStts_CARRY_e)) {
         dComIfGd_setSimpleShadow2(
             &i_this->current.pos, i_this->mAcch.GetGroundH(), 50.0f, i_this->mAcch.m_gnd,
             0, 1.0f, dDlst_shadowControl_c::getSimpleTex()
@@ -684,7 +684,7 @@ static void action_mahi(am2_class* i_this) {
                 fopAcM_seStart(actor, JA_SE_CM_AM2_JUMP, 0);
                 i_this->mCountUpTimers[1] = 0;
             }
-            if (fopAcM_checkStatus(actor, fopAcStts_CARRY_e)) {
+            if (fopAcM_CheckStatus(actor, fopAcStts_CARRY_e)) {
                 i_this->mAcchRadius = 40.0f + g_regHIO.mChild[8].mFloatRegs[10];
                 i_this->mbMadeWaterSplash = false;
                 i_this->mRippleCb.end();
@@ -708,7 +708,7 @@ static void action_mahi(am2_class* i_this) {
         if (i_this->mPickedUpYPos + 10.0f <= actor->current.pos.y) {
             cLib_addCalcAngleS2(&actor->shape_angle.y, actor->current.angle.y, 1, 0x1000);
         }
-        if (!fopAcM_checkStatus(actor, fopAcStts_CARRY_e)) {
+        if (!fopAcM_CheckStatus(actor, fopAcStts_CARRY_e)) {
             i_this->mAcchRadius = 40.0f + g_regHIO.mChild[8].mFloatRegs[10];
             i_this->mBodyCyl.OnCoSetBit();
             if (actor->speedF > 0.0f) {
@@ -807,7 +807,7 @@ static void action_mahi(am2_class* i_this) {
             i_this->mAction = ACTION_DOUSA;
             i_this->mState = 0;
             
-            if (fopAcM_checkStatus(actor, fopAcStts_CARRY_e)) {
+            if (fopAcM_CheckStatus(actor, fopAcStts_CARRY_e)) {
                 fopAcM_cancelCarryNow(actor);
                 actor->attention_info.flags &= ~fopAc_Attn_ACTION_CARRY_e;
                 actor->gravity = -4.0f;
@@ -827,7 +827,7 @@ static void action_mahi(am2_class* i_this) {
             }
             
             if (i_this->mCountDownTimers[3] == 1) {
-                if (fopAcM_checkStatus(actor, fopAcStts_CARRY_e)) {
+                if (fopAcM_CheckStatus(actor, fopAcStts_CARRY_e)) {
                     fopAcM_cancelCarryNow(actor);
                     actor->attention_info.flags &= ~fopAc_Attn_ACTION_CARRY_e;
                 }
@@ -840,7 +840,7 @@ static void action_mahi(am2_class* i_this) {
         }
     }
     
-    if (fopAcM_checkStatus(actor, fopAcStts_CARRY_e) || i_this->mState == 0xF || !week_atari_check(i_this)) {
+    if (fopAcM_CheckStatus(actor, fopAcStts_CARRY_e) || i_this->mState == 0xF || !week_atari_check(i_this)) {
         body_atari_check(i_this);
     }
 }
diff --git a/src/d/actor/d_a_hookshot.cpp b/src/d/actor/d_a_hookshot.cpp
index 1381e61f..93169b84 100644
--- a/src/d/actor/d_a_hookshot.cpp
+++ b/src/d/actor/d_a_hookshot.cpp
@@ -193,7 +193,7 @@ void daHookshot_rockLineCallback(fopAc_ac_c* hookshot_actor, dCcD_GObjInf* objIn
     f32 f1 = i_this->m2CC.abs2(i_this->current.pos);
     if (f1 > f31) {
         i_this->m2CC = *objInf->GetAtHitPosP();
-        if (fopAcM_checkStatus(collided_actor, fopAcStts_UNK80000_e | fopAcStts_UNK200000_e | fopAcStts_UNK10000000_e)) {
+        if (fopAcM_CheckStatus(collided_actor, fopAcStts_UNK80000_e | fopAcStts_UNK200000_e | fopAcStts_UNK10000000_e)) {
             i_this->m2B0 = 1;
         } else {
             i_this->m2B0 = 0;
@@ -319,7 +319,7 @@ static BOOL daHookshot_IsDelete(daHookshot_c* i_this) {
 BOOL daHookshot_c::hookshot_delete() {
     if (mCarryActorID != fpcM_ERROR_PROCESS_ID_e) {
         fopAc_ac_c* hooked_actor = fopAcM_SearchByID(mCarryActorID);
-        if (hooked_actor && fopAcM_checkStatus(hooked_actor, fopAcStts_HOOK_CARRY_e)) {
+        if (hooked_actor && fopAcM_CheckStatus(hooked_actor, fopAcStts_HOOK_CARRY_e)) {
             fopAcM_cancelHookCarryNow(hooked_actor);
             mCarryActorID = fpcM_ERROR_PROCESS_ID_e;
         }
diff --git a/src/d/actor/d_a_item.cpp b/src/d/actor/d_a_item.cpp
index 2435bba7..93ff1759 100644
--- a/src/d/actor/d_a_item.cpp
+++ b/src/d/actor/d_a_item.cpp
@@ -798,7 +798,7 @@ BOOL daItem_c::checkItemDisappear() {
     if (mItemStatus == STATUS_UNK4) {
         disappearing = FALSE;
     }
-    if (checkFlag(FLAG_BOOMERANG) || checkFlag(FLAG_HOOK) || fopAcM_checkStatus(this, fopAcStts_HOOK_CARRY_e)) {
+    if (checkFlag(FLAG_BOOMERANG) || checkFlag(FLAG_HOOK) || fopAcM_CheckStatus(this, fopAcStts_HOOK_CARRY_e)) {
         disappearing = FALSE;
         show();
     }
diff --git a/src/d/actor/d_a_npc_md.cpp b/src/d/actor/d_a_npc_md.cpp
index ff5361d4..d33bce2c 100644
--- a/src/d/actor/d_a_npc_md.cpp
+++ b/src/d/actor/d_a_npc_md.cpp
@@ -1136,7 +1136,7 @@ BOOL daNpc_Md_c::lightHitCheck() {
         
         if (mCps.ChkAtHit()) {
             fopAc_ac_c* hitActor = mCps.GetAtHitAc();
-            if (fopAcM_checkStatus(this, fopAcStts_CARRY_e) && !isNoCarryAction()) {
+            if (fopAcM_CheckStatus(this, fopAcStts_CARRY_e) && !isNoCarryAction()) {
                 if (hitActor != dComIfGp_getLinkPlayer() && m3058.getEmitter() == NULL) {
                     dComIfGp_particle_set(0x8232, &current.pos, NULL, NULL, 0xFF, &m3058);
                 }
@@ -2964,7 +2964,7 @@ BOOL daNpc_Md_c::draw() {
         dComIfGd_getXluList()->entryImm(&m0B70, 0x1F);
     }
     
-    if (!isShipRide() && !fopAcM_checkStatus(this, fopAcStts_CARRY_e) && cLib_checkBit(m30F0, 0x20000UL)) {
+    if (!isShipRide() && !fopAcM_CheckStatus(this, fopAcStts_CARRY_e) && cLib_checkBit(m30F0, 0x20000UL)) {
         cXyz shadowPos(current.pos.x, current.pos.y + 150.0f, current.pos.z);
         mShadowId = dComIfGd_setShadow(
             mShadowId, 0, mpMorf->getModel(), &shadowPos, 800.0f, 20.0f,
diff --git a/src/d/actor/d_a_player_npc.cpp b/src/d/actor/d_a_player_npc.cpp
index c605f70e..990e98d1 100644
--- a/src/d/actor/d_a_player_npc.cpp
+++ b/src/d/actor/d_a_player_npc.cpp
@@ -174,7 +174,7 @@ BOOL daPy_npc_c::checkNowPosMove(const char* pName) {
         return TRUE;
     }
     
-    return fopAcM_checkStatus(this, fopAcStts_UNK800_e);
+    return fopAcM_CheckStatus(this, fopAcStts_UNK800_e);
 }
 
 /* 8015AC74-8015AD20       .text drawDamageFog__10daPy_npc_cFv */
diff --git a/src/d/d_attention.cpp b/src/d/d_attention.cpp
index 442a6ba8..f94969cf 100644
--- a/src/d/d_attention.cpp
+++ b/src/d/d_attention.cpp
@@ -565,7 +565,7 @@ fopAc_ac_c* dAttList_c::getActor() {
 
 /* 8009FA98-8009FAB4       .text setActor__10dAttList_cFP10fopAc_ac_c */
 void dAttList_c::setActor(fopAc_ac_c* i_actor) {
-    mActorID = fpcM_GetID(i_actor);
+    mActorID = fopAcM_GetID(i_actor);
 }
 
 /* 8009FAB4-8009FACC       .text getPId__10dAttHint_cFPv */
diff --git a/src/d/d_cc_d.cpp b/src/d/d_cc_d.cpp
index 04cd4d8d..10e92620 100644
--- a/src/d/d_cc_d.cpp
+++ b/src/d/d_cc_d.cpp
@@ -65,7 +65,7 @@ void dCcD_GStts::Move() {
 void dCcD_Stts::Init(int weight, int param_1, fopAc_ac_c* pActor) {
     u32 procId;
     if (pActor) {
-        procId = fpcM_GetID(pActor);
+        procId = fopAcM_GetID(pActor);
     } else {
         procId = fpcM_ERROR_PROCESS_ID_e;
     }
@@ -73,7 +73,7 @@ void dCcD_Stts::Init(int weight, int param_1, fopAc_ac_c* pActor) {
     
     s32 roomNo;
     if (pActor) {
-        roomNo = pActor->current.roomNo;
+        roomNo = fopAcM_GetRoomNo(pActor);
     } else {
         roomNo = 0;
         OnNoActor();
diff --git a/src/d/d_cc_uty.cpp b/src/d/d_cc_uty.cpp
index 12e35908..f04a0dc9 100644
--- a/src/d/d_cc_uty.cpp
+++ b/src/d/d_cc_uty.cpp
@@ -202,7 +202,7 @@ fopAc_ac_c* cc_at_check(fopAc_ac_c* tgActor, CcAtInfo* atInfo) {
         atInfo->m0C.y = cM_atan2s(-f2, -f0);
         
         if (atInfo->mpObj->ChkAtType(AT_TYPE_HOOKSHOT)) {
-            if (fopAcM_checkStatus(tgActor, fopAcStts_UNK80000_e | fopAcStts_HOOK_CARRY_e | fopAcStts_UNK200000_e)) {
+            if (fopAcM_CheckStatus(tgActor, fopAcStts_UNK80000_e | fopAcStts_HOOK_CARRY_e | fopAcStts_UNK200000_e)) {
                 atInfo->mDamage = 0;
             }
         }
diff --git a/src/d/d_door.cpp b/src/d/d_door.cpp
index 0f14e3ea..52a24e73 100644
--- a/src/d/d_door.cpp
+++ b/src/d/d_door.cpp
@@ -147,7 +147,7 @@ u8 dDoor_info_c::drawCheck(int mode) {
 /* 8006B8AC-8006B954       .text checkExecute__12dDoor_info_cFv */
 u8 dDoor_info_c::checkExecute() {
     mFrontCheck = frontCheck();
-    if (fopAcM_checkStatus(this, fopAcStts_UNK1000_e))
+    if (fopAcM_CheckStatus(this, fopAcStts_UNK1000_e))
         return 1;
 
     if (eventInfo.checkCommandDemoAccrpt() || eventInfo.checkCommandDoor())
diff --git a/src/d/d_event.cpp b/src/d/d_event.cpp
index 7e31dab6..f0a3ca90 100644
--- a/src/d/d_event.cpp
+++ b/src/d/d_event.cpp
@@ -632,22 +632,22 @@ s32 dEvt_control_c::moveApproval(void* actor) {
         break;
     }
 
-    if (fopAcM_checkStatus(i_ac, fopAcStts_FORCEMOVE_e))
+    if (fopAcM_CheckStatus(i_ac, fopAcStts_FORCEMOVE_e))
         return dEvtMove_FORCE_e;
 
-    if (getMode() == dEvtMode_TALK_e && fopAcM_checkStatus(i_ac, fopAcStts_UNK40_e))
+    if (getMode() == dEvtMode_TALK_e && fopAcM_CheckStatus(i_ac, fopAcStts_UNK40_e))
         return dEvtMove_MOVE_e;
     if (dComIfGp_demo_mode() == 1)
         return dEvtMove_MOVE_e;
-    if (fopAcM_checkStatus(i_ac, fopAcStts_UNK800_e))
+    if (fopAcM_CheckStatus(i_ac, fopAcStts_UNK800_e))
         return dEvtMove_MOVE_e;
-    if ((dComIfGp_event_getMode() == dEvtMode_COMPULSORY_e || dComIfGp_event_getMode() == dEvtMode_TALK_e) && fopAcM_checkStatus(i_ac, fopAcStts_BOSS_e))
+    if ((dComIfGp_event_getMode() == dEvtMode_COMPULSORY_e || dComIfGp_event_getMode() == dEvtMode_TALK_e) && fopAcM_CheckStatus(i_ac, fopAcStts_BOSS_e))
         return dEvtMove_NOMOVE_e;
-    if (chkEventFlag(0x80) && fopAcM_checkStatus(i_ac, fopAcStts_BOSS_e))
+    if (chkEventFlag(0x80) && fopAcM_CheckStatus(i_ac, fopAcStts_BOSS_e))
         return dEvtMove_NOMOVE_e;
-    if (fopAcM_checkStatus(i_ac, fopAcStts_UNK4000_e))
+    if (fopAcM_CheckStatus(i_ac, fopAcStts_UNK4000_e))
         return dEvtMove_MOVE_e;
-    return fopAcM_checkStatus(i_ac, fopAcStts_CARRY_e) ? dEvtMove_MOVE_e : dEvtMove_NOMOVE_e;
+    return fopAcM_CheckStatus(i_ac, fopAcStts_CARRY_e) ? dEvtMove_MOVE_e : dEvtMove_NOMOVE_e;
 }
 
 /* 80071418-80071468       .text compulsory__14dEvt_control_cFPvPCcUs */
diff --git a/src/d/d_event_manager.cpp b/src/d/d_event_manager.cpp
index 52f17479..0461c1bc 100644
--- a/src/d/d_event_manager.cpp
+++ b/src/d/d_event_manager.cpp
@@ -397,7 +397,7 @@ int dEvent_manager_c::getMyStaffId(const char* name, fopAc_ac_c* actor, int tagI
     if (mList.getHeaderP() == NULL)
         return -1;
 
-    if (actor && !fopAcM_checkStatus(actor, fopAcStts_FORCEMOVE_e))
+    if (actor && !fopAcM_CheckStatus(actor, fopAcStts_FORCEMOVE_e))
         return -1;
 
     for (s32 i = 0; i < mList.getEventNum(); i++) {
diff --git a/src/d/d_snap.cpp b/src/d/d_snap.cpp
index 2876e7e8..f7961a49 100644
--- a/src/d/d_snap.cpp
+++ b/src/d/d_snap.cpp
@@ -1704,7 +1704,7 @@ void dSnap_Obj::SetGeoSph(const Vec& center, f32 radius) {
 /* 800CDB68-800CDB94       .text SetInf__9dSnap_ObjFUcPC10fopAc_ac_cUcUcs */
 void dSnap_Obj::SetInf(u8 r4, const fopAc_ac_c* r5, u8 r6, u8 r7, s16 cullAngle) {
     mPhoto = r4;
-    mActorPID = fpcM_GetID(r5);
+    mActorPID = fopAcM_GetID(const_cast<fopAc_ac_c*>(r5));
     field_0x1a = r6;
     field_0x19 = r7;
     mCullAngle = cullAngle;