diff --git a/include/f_op/f_op_actor.h b/include/f_op/f_op_actor.h
index 0ba53b5fd..6b651095d 100644
--- a/include/f_op/f_op_actor.h
+++ b/include/f_op/f_op_actor.h
@@ -198,7 +198,7 @@ public:
         return mpPhotoCB(i_actor, i_itemBtn);
     }
 
-public:
+private:
     /* 0x04 */ u16 mCommand;
     /* 0x06 */ u16 mCondition;
     /* 0x08 */ s16 mEventId;
diff --git a/include/m_Do/m_Do_ext.h b/include/m_Do/m_Do_ext.h
index 7c962dd44..168db7fde 100644
--- a/include/m_Do/m_Do_ext.h
+++ b/include/m_Do/m_Do_ext.h
@@ -536,6 +536,7 @@ private:
 class mDoExt_invisibleModel {
 public:
     mDoExt_invisibleModel() {}
+    ~mDoExt_invisibleModel() {}
 
     BOOL create(J3DModel*);
 
diff --git a/src/c/c_damagereaction.cpp b/src/c/c_damagereaction.cpp
index 3de074267..53e8f7b40 100644
--- a/src/c/c_damagereaction.cpp
+++ b/src/c/c_damagereaction.cpp
@@ -996,7 +996,7 @@ s16 hang_ang_get(damagereaction* dr) {
 
         linChk.Set(&temp3, &dst[i], dr->mpEnemy);
         if(dComIfG_Bgsp()->LineCross(&linChk)) {
-            dst[i] = linChk.GetLinP()->GetEnd();
+            dst[i] = linChk.GetCross();
         }
         else {
             return 0xDCF;
diff --git a/src/d/actor/d_a_am.cpp b/src/d/actor/d_a_am.cpp
index b22a8d9da..449cafb3d 100644
--- a/src/d/actor/d_a_am.cpp
+++ b/src/d/actor/d_a_am.cpp
@@ -1154,7 +1154,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_this) {
     };
     a_this->mEyeJntHit = JntHit_create(a_this->mpMorf->getModel(), search_data, ARRAY_SIZE(search_data));
     if (a_this->mEyeJntHit) {
-        i_this->jntHit = a_this->mEyeJntHit;
+        fopAcM_SetJntHit(i_this, a_this->mEyeJntHit);
     } else {
         return FALSE;
     }
diff --git a/src/d/actor/d_a_arrow.cpp b/src/d/actor/d_a_arrow.cpp
index 8afd843e6..dc8795091 100644
--- a/src/d/actor/d_a_arrow.cpp
+++ b/src/d/actor/d_a_arrow.cpp
@@ -112,7 +112,7 @@ void daArrow_c::_atHit(dCcD_GObjInf* thisObjInf, fopAc_ac_c* hitActor, dCcD_GObj
     if (!hitActor) {
         return;
     }
-    if (!fopAc_IsActor(hitActor)) {
+    if (!fopAcM_IsActor(hitActor)) {
         return;
     }
     if (!fopAcM_GetJntHit(hitActor)) {
diff --git a/src/d/actor/d_a_bb.cpp b/src/d/actor/d_a_bb.cpp
index 35fe7a455..df878ad9d 100644
--- a/src/d/actor/d_a_bb.cpp
+++ b/src/d/actor/d_a_bb.cpp
@@ -370,7 +370,7 @@ static void* s_a_d_sub(void* ac1, void* ac2) {
     cXyz sp14;
     cXyz sp8;
 
-    if (esa_check_count < 100 && fopAc_IsActor(ac1) && fpcM_GetName(ac1) == fpcNm_ESA_e) {
+    if (esa_check_count < 100 && fopAcM_IsActor(ac1) && fpcM_GetName(ac1) == fpcNm_ESA_e) {
         esa_class* esa1 = (esa_class*)ac1;
         esa_class* esa2 = (esa_class*)ac2;
 
@@ -1246,7 +1246,7 @@ void bb_water_check(bb_class* i_this) {
 
 /* 00004000-0000404C       .text pl_name_check__FPvPv */
 void* pl_name_check(void* ac1, void* ac2) {
-    if (fopAc_IsActor(ac1) && fopAcM_GetName(ac1) == fpcNm_NPC_KAM_e) {
+    if (fopAcM_IsActor(ac1) && fopAcM_GetName(ac1) == fpcNm_NPC_KAM_e) {
         return ac1;
     }
     return NULL;
diff --git a/src/d/actor/d_a_bgn.cpp b/src/d/actor/d_a_bgn.cpp
index 2db41ded1..5e0536c4f 100644
--- a/src/d/actor/d_a_bgn.cpp
+++ b/src/d/actor/d_a_bgn.cpp
@@ -894,7 +894,7 @@ static void room_disp(bgn_class* i_this) {
 /* 00001898-0000192C       .text ten_a_d_sub__FPvPv */
 static void* ten_a_d_sub(void* param_1, void*) {
     fopAc_ac_c* actor = (fopAc_ac_c*)param_1;
-    if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_Obj_Vteng_e)) {
+    if ((fopAcM_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_Obj_Vteng_e)) {
         if ((actor->model != NULL) && (bgn != NULL)) {
             bgn->mCC24.setModel(actor->model);
             bgn->mCC24.update();
@@ -908,7 +908,7 @@ static void* ten_a_d_sub(void* param_1, void*) {
 /* 0000192C-00001998       .text ki_a_d_sub__FPvPv */
 static void* ki_a_d_sub(void* param_1, void*) {
     ki_class* keese = (ki_class*)param_1;
-    if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_KI_e)) {
+    if ((fopAcM_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_KI_e)) {
         if (keese->actor.model != NULL) {
             keese->m2B8.setModel(keese->actor.model);
             keese->m2B8.update();
@@ -928,7 +928,7 @@ static void obj_disp(bgn_class* i_this) {
 #if VERSION > VERSION_DEMO
 /* 000019F4-00001A40       .text bgn2_s_sub__FPvPv */
 static void* bgn2_s_sub(void* param_1, void*) {
-    if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_BGN2_e)) {
+    if ((fopAcM_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_BGN2_e)) {
         return param_1;
     } else {
         return NULL;
@@ -937,7 +937,7 @@ static void* bgn2_s_sub(void* param_1, void*) {
 
 /* 00001A40-00001A8C       .text bgn3_s_sub__FPvPv */
 static void* bgn3_s_sub(void* param_1, void*) {
-    if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_BGN3_e)) {
+    if ((fopAcM_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_BGN3_e)) {
         return param_1;
     } else {
         return NULL;
@@ -1003,7 +1003,7 @@ static BOOL daBgn_Draw(bgn_class* i_this) {
 /* 00001C40-00001C8C       .text ki_del_sub__FPvPv */
 static void* ki_del_sub(void* param_1, void*) {
     ki_class* keese = (ki_class*)param_1;
-    if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_KI_e)) {
+    if ((fopAcM_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_KI_e)) {
         fopAcM_delete(&keese->actor);
     }
     return NULL;
@@ -1013,7 +1013,7 @@ static void* ki_del_sub(void* param_1, void*) {
 /* 00001C8C-00001CD8       .text ks_del_sub__FPvPv */
 static void* ks_del_sub(void* param_1, void*) {
     ks_class* morth = (ks_class*)param_1;
-    if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_KS_e)) {
+    if ((fopAcM_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_KS_e)) {
         fopAcM_delete(&morth->actor);
     }
     return NULL;
@@ -1022,7 +1022,7 @@ static void* ks_del_sub(void* param_1, void*) {
 
 /* 00001CD8-00001D30       .text ki_c_sub__FPvPv */
 static void* ki_c_sub(void* param_1, void*) {
-    if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_KI_e)) {
+    if ((fopAcM_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_KI_e)) {
         ki_all_count++;
     }
     return NULL;
@@ -1082,7 +1082,7 @@ static s32 gr_check(bgn_class* i_this, cXyz* param_2) {
 static void* s_b_sub(void* param_1, void* param_2) {
     bgn_class* bgn = (bgn_class*)param_2;
     daBomb_c* bomb = (daBomb_c*)param_1;
-    if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_BOMB_e) && bomb->get_explode_instant()) {
+    if ((fopAcM_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_BOMB_e) && bomb->get_explode_instant()) {
         cXyz local_18 = bomb->current.pos;
         if (!gr_check(bgn, &local_18)) {
             dComIfGp_particle_set(dPa_name::ID_AK_SN_KGTT1PUNCHSPLASH00, &local_18);
@@ -3270,7 +3270,7 @@ static void demo_camera(bgn_class* i_this) {
 #if VERSION == VERSION_DEMO
 /* 000019F4-00001A40       .text bgn2_s_sub__FPvPv */
 static void* bgn2_s_sub(void* param_1, void*) {
-    if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_BGN2_e)) {
+    if ((fopAcM_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_BGN2_e)) {
         return param_1;
     } else {
         return NULL;
@@ -3279,7 +3279,7 @@ static void* bgn2_s_sub(void* param_1, void*) {
 
 /* 00001A40-00001A8C       .text bgn3_s_sub__FPvPv */
 static void* bgn3_s_sub(void* param_1, void*) {
-    if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_BGN3_e)) {
+    if ((fopAcM_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_BGN3_e)) {
         return param_1;
     } else {
         return NULL;
diff --git a/src/d/actor/d_a_bgn2.cpp b/src/d/actor/d_a_bgn2.cpp
index c25472226..e4467a229 100644
--- a/src/d/actor/d_a_bgn2.cpp
+++ b/src/d/actor/d_a_bgn2.cpp
@@ -87,7 +87,7 @@ static void anm_init(bgn2_class* i_this, int bckFileIdx, f32 morf, u8 loopMode,
 
 /* 000002BC-00000308       .text bgn_s_sub__FPvPv */
 static void* bgn_s_sub(void* param_1, void*) {
-    if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_BGN_e)) {
+    if ((fopAcM_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_BGN_e)) {
         return param_1;
     } else {
         return NULL;
@@ -96,7 +96,7 @@ static void* bgn_s_sub(void* param_1, void*) {
 
 /* 00000308-00000354       .text bgn3_s_sub__FPvPv */
 static void* bgn3_s_sub(void* param_1, void*) {
-    if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_BGN3_e)) {
+    if ((fopAcM_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_BGN3_e)) {
         return param_1;
     } else {
         return NULL;
@@ -811,7 +811,7 @@ static void damage_check(bgn2_class* i_this) {
 
 /* 00002C88-00002CE0       .text ki_c_sub__FPvPv */
 static void* ki_c_sub(void* param_1, void*) {
-    if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_KI_e)) {
+    if ((fopAcM_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_KI_e)) {
         ki_all_count++;
     }
     return NULL;
diff --git a/src/d/actor/d_a_bgn3.cpp b/src/d/actor/d_a_bgn3.cpp
index ef227b306..63f5f78cb 100644
--- a/src/d/actor/d_a_bgn3.cpp
+++ b/src/d/actor/d_a_bgn3.cpp
@@ -107,7 +107,7 @@ daBgn3_HIO_c::daBgn3_HIO_c() {
 #if VERSION > VERSION_DEMO
 /* 000001F4-00000240       .text bgn_s_sub__FPvPv */
 static void* bgn_s_sub(void* param_1, void*) {
-    if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_BGN_e)) {
+    if ((fopAcM_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_BGN_e)) {
         return param_1;
     } else {
         return NULL;
@@ -220,7 +220,7 @@ static void drop_eff_set(bgn3_class* i_this) {
 
 /* 0000101C-00001068       .text esa_s_sub__FPvPv */
 static void* esa_s_sub(void* param_1, void*) {
-    if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_ESA_e)) {
+    if ((fopAcM_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_ESA_e)) {
         return param_1;
     } else {
         return NULL;
@@ -1043,7 +1043,7 @@ static void move(bgn3_class* i_this) {
 #if VERSION == VERSION_DEMO
 /* 000001F4-00000240       .text bgn_s_sub__FPvPv */
 static void* bgn_s_sub(void* param_1, void*) {
-    if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_BGN_e)) {
+    if ((fopAcM_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_BGN_e)) {
         return param_1;
     } else {
         return NULL;
@@ -1053,7 +1053,7 @@ static void* bgn_s_sub(void* param_1, void*) {
 
 /* 00004058-000040B0       .text ki_c_sub__FPvPv */
 static void* ki_c_sub(void* param_1, void*) {
-    if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_KS_e)) {
+    if ((fopAcM_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_KS_e)) {
         ki_all_count++;
     }
     return NULL;
diff --git a/src/d/actor/d_a_bita.cpp b/src/d/actor/d_a_bita.cpp
index 45ac46493..0a309dce4 100644
--- a/src/d/actor/d_a_bita.cpp
+++ b/src/d/actor/d_a_bita.cpp
@@ -25,7 +25,7 @@ static u32 ita_Ef[]     = { dRes_INDEX_BITA_BRK_EF_BTDITA0_e, dRes_INDEX_BITA_BR
 /* 00000078-000000C4       .text b_a_sub__FPvPv */
 static void* b_a_sub(void* search, void* user) {
     UNUSED(user);
-    if (fopAc_IsActor(search) && fopAcM_GetName(search) == fpcNm_BTD_e)
+    if (fopAcM_IsActor(search) && fopAcM_GetName(search) == fpcNm_BTD_e)
         return search;
     return NULL;
 }
diff --git a/src/d/actor/d_a_bk.cpp b/src/d/actor/d_a_bk.cpp
index 5af21ff5c..e012cb307 100644
--- a/src/d/actor/d_a_bk.cpp
+++ b/src/d/actor/d_a_bk.cpp
@@ -668,7 +668,7 @@ static s32 target_info_count;
 
 /* 00002C4C-00002CD4       .text s_w_sub__FPvPv */
 static void* s_w_sub(void* param_1, void*) {
-    if (fopAc_IsActor(param_1) && fopAcM_GetName(param_1) == fpcNm_BOKO_e) {
+    if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == fpcNm_BOKO_e) {
         daBoko_c* boko = (daBoko_c*)param_1;
         if (fopAcM_GetParam(boko) != daBoko_c::Type_MOBLIN_SPEAR_e && !fopAcM_checkCarryNow(boko)) {
             if (target_info_count < (s32)ARRAY_SIZE(target_info)) {
@@ -739,7 +739,7 @@ static fpc_ProcID search_wepon(bk_class* i_this) {
 
 /* 00002FB0-0000302C       .text s_b_sub__FPvPv */
 static void* s_b_sub(void* param_1, void*) {
-    if (fopAc_IsActor(param_1) && fopAcM_GetName(param_1) == fpcNm_BOMB_e) {
+    if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == fpcNm_BOMB_e) {
         daBomb_c* bomb = (daBomb_c*)param_1;
         // TODO: why is it checking the bomb's params as a single field instead of just one param? bug?
         if (fopAcM_GetParam(bomb) != 0) {
@@ -1192,7 +1192,7 @@ static void jyunkai(bk_class* i_this) {
 
 /* 0000488C-000048E4       .text ken_s_sub__FPvPv */
 static void* ken_s_sub(void* param_1, void*) {
-    if (fopAc_IsActor(param_1) && fopAcM_GetName(param_1) == fpcNm_ITEM_e) {
+    if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == fpcNm_ITEM_e) {
         daItem_c* item = (daItem_c*)param_1;
         if (item->getItemNo() == dItemNo_DROPPED_SWORD_e) {
             return param_1;
@@ -1428,7 +1428,7 @@ static void stand(bk_class* i_this) {
 /* 000053E0-000054E0       .text s_s_sub__FPvPv */
 static void* s_s_sub(void* r29, void* r30) {
     bk_class* i_this = (bk_class*)r30;
-    if (fopAc_IsActor(r29) && fopAcM_GetName(r29) == fpcNm_OBJ_SEARCH_e) {
+    if (fopAcM_IsActor(r29) && fopAcM_GetName(r29) == fpcNm_OBJ_SEARCH_e) {
         daObj_Search::Act_c* search = (daObj_Search::Act_c*)r29;
         cXyz sp18 = i_this->home.pos - search->current.pos;
         if (sp18.abs() < 600.0f) {
@@ -1767,7 +1767,7 @@ u16 learn_check;
 
 /* 0000647C-000064D8       .text shot_s_sub__FPvPv */
 static void* shot_s_sub(void* param_1, void*) {
-    if (fopAc_IsActor(param_1) && (learn_check & 0x400) && fopAcM_GetName(param_1) == fpcNm_HIMO2_e) {
+    if (fopAcM_IsActor(param_1) && (learn_check & 0x400) && fopAcM_GetName(param_1) == fpcNm_HIMO2_e) {
         return param_1;
     }
     return NULL;
@@ -3780,7 +3780,7 @@ static void damage_check(bk_class* i_this) {
 
 /* 0000BCD4-0000BD30       .text s_s2_sub__FPvPv */
 static void* s_s2_sub(void* param_1, void*) {
-    if (fopAc_IsActor(param_1) && fopAcM_GetName(param_1) == fpcNm_OBJ_SEARCH_e) {
+    if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == fpcNm_OBJ_SEARCH_e) {
         if (daObj_Search::Act_c::getFindFlag()) {
             return param_1;
         }
@@ -4987,7 +4987,7 @@ static cPhs_State daBk_Create(fopAc_ac_c* i_actor) {
         i_this->mpJntHit = JntHit_create(i_this->mpMorf->getModel(), search_data, ARRAY_SIZE(search_data));
         
         if (i_this->mpJntHit) {
-            i_actor->jntHit = i_this->mpJntHit;
+            fopAcM_SetJntHit(i_actor, i_this->mpJntHit);
         }
         fopAcM_adjustHeap(i_actor);
 #else
diff --git a/src/d/actor/d_a_bst.cpp b/src/d/actor/d_a_bst.cpp
index ec8f167f8..ae0d93062 100644
--- a/src/d/actor/d_a_bst.cpp
+++ b/src/d/actor/d_a_bst.cpp
@@ -1939,7 +1939,7 @@ static BOOL beam_wall_check(cXyz* pos_1, cXyz* pos_2) {
     end.y = start.y;
     gndChk.Set(&start, &end, NULL);
     if (dComIfG_Bgsp()->LineCross(&gndChk)) {
-        *pos_1 = gndChk.mLin.GetEnd();
+        *pos_1 = gndChk.GetCross();
         return TRUE;
     }
     return FALSE;
diff --git a/src/d/actor/d_a_coming2.cpp b/src/d/actor/d_a_coming2.cpp
index 8759d8d89..c0266a010 100644
--- a/src/d/actor/d_a_coming2.cpp
+++ b/src/d/actor/d_a_coming2.cpp
@@ -116,7 +116,7 @@ struct SafetyCallback {
 void* daComing2::position_is_safety_call_back(void* ac, void* cb) {
     SafetyCallback* callback = (SafetyCallback*)cb;
 
-    if (fopAc_IsActor(ac)) {
+    if (fopAcM_IsActor(ac)) {
         fopAc_ac_c* actor = (fopAc_ac_c*)ac;
         if (fopAcM_GetGroup(actor) == fopAc_ENEMY_e) {
             f32 x = actor->current.pos.x - callback->pos->x;
diff --git a/src/d/actor/d_a_coming3.cpp b/src/d/actor/d_a_coming3.cpp
index a7ef0364c..7f2b29be1 100644
--- a/src/d/actor/d_a_coming3.cpp
+++ b/src/d/actor/d_a_coming3.cpp
@@ -118,7 +118,7 @@ struct SafetyCallback {
 void* daComing3::position_is_safety_call_back(void* ac, void* cb) {
     SafetyCallback* callback = (SafetyCallback*)cb;
 
-    if (fopAc_IsActor(ac)) {
+    if (fopAcM_IsActor(ac)) {
         fopAc_ac_c* actor = (fopAc_ac_c*)ac;
         if (fopAcM_GetGroup(actor) == fopAc_ENEMY_e) {
             f32 x = actor->current.pos.x - callback->pos->x;
diff --git a/src/d/actor/d_a_dai.cpp b/src/d/actor/d_a_dai.cpp
index 7cc250b39..185ab41d4 100644
--- a/src/d/actor/d_a_dai.cpp
+++ b/src/d/actor/d_a_dai.cpp
@@ -90,8 +90,8 @@ void daDai_c::CreateInit() {
     shape_angle = current.angle;
     cLib_onBit<u32>(attention_info.flags, fopAc_Attn_TALKFLAG_CHECK_e | fopAc_Attn_ACTION_SPEAK_e);
 
-    eventInfo.mpCheckCB = daDai_XyCheckCB;
-    eventInfo.mpEventCB = daDai_XyEventCB;
+    eventInfo.setXyCheckCB(daDai_XyCheckCB);
+    eventInfo.setXyEventCB(daDai_XyEventCB);
 
     mEvtDaiItemIdx = dComIfGp_evmng_getEventIdx("DAI_ITEM");
     mEvtDefaultTalkIdx = dComIfGp_evmng_getEventIdx("DEFAULT_TALK");
diff --git a/src/d/actor/d_a_daiocta.cpp b/src/d/actor/d_a_daiocta.cpp
index 2e160b11d..e3b0cb6d0 100644
--- a/src/d/actor/d_a_daiocta.cpp
+++ b/src/d/actor/d_a_daiocta.cpp
@@ -495,7 +495,7 @@ BOOL daDaiocta_c::createArrowHitHeap() {
         return FALSE;
     }
 
-    jntHit = mpJntHit;
+    fopAcM_SetJntHit(this, mpJntHit);
 
     return TRUE;
 }
diff --git a/src/d/actor/d_a_daiocta_eye.cpp b/src/d/actor/d_a_daiocta_eye.cpp
index 2db7c1400..c0632b52a 100644
--- a/src/d/actor/d_a_daiocta_eye.cpp
+++ b/src/d/actor/d_a_daiocta_eye.cpp
@@ -164,8 +164,8 @@ BOOL daDaiocta_Eye_c::_createHeap() {
 
     mpJntHit = JntHit_create(mpModel, search_data, ARRAY_SSIZE(search_data));
 
-    if (mpJntHit) {   
-        jntHit = mpJntHit;
+    if (mpJntHit) {
+        fopAcM_SetJntHit(this, mpJntHit);
     } else {
         return FALSE;
     }
@@ -459,7 +459,7 @@ void daDaiocta_Eye_c::createInit() {
     mEyeScale.setall(1.0f);
     if (parentActorID != fpcM_ERROR_PROCESS_ID_e) {
         fopAc_ac_c* parent_p = fopAcM_SearchByID(parentActorID);
-        if (parent_p && fopAc_IsActor(parent_p) && fpcM_GetName(parent_p) == fpcNm_DAIOCTA_e) {
+        if (parent_p && fopAcM_IsActor(parent_p) && fpcM_GetName(parent_p) == fpcNm_DAIOCTA_e) {
             mpParentActor = (daDaiocta_c *) parent_p;
         }
     }
diff --git a/src/d/actor/d_a_fganon.cpp b/src/d/actor/d_a_fganon.cpp
index e99d77514..72b48cde0 100644
--- a/src/d/actor/d_a_fganon.cpp
+++ b/src/d/actor/d_a_fganon.cpp
@@ -2360,7 +2360,7 @@ void energy_ball_move(fganon_class* i_this) {
 void* mahou_se_set(void* i_act, void* i_other) {
     fganon_class* i_this = (fganon_class*)i_act;
     fopAc_ac_c* a_this = &i_this->actor;
-    if ((fopAc_IsActor(i_this)) && fopAcM_GetName(a_this) == fpcNm_FGMAHOU_e) {
+    if ((fopAcM_IsActor(i_this)) && fopAcM_GetName(a_this) == fpcNm_FGMAHOU_e) {
         if (a_this->health == 0) {
             fopAcM_seStartCurrent(a_this, JA_SE_OBJ_PG_EBALL_FLY_L, 0);
         }
diff --git a/src/d/actor/d_a_fgmahou.cpp b/src/d/actor/d_a_fgmahou.cpp
index 6a77dc23e..7d5416819 100644
--- a/src/d/actor/d_a_fgmahou.cpp
+++ b/src/d/actor/d_a_fgmahou.cpp
@@ -23,7 +23,7 @@ static BOOL daFgmahou_Draw(fgmahou_class* i_this) {
 
 /* 000000E4-00000130       .text boss_s_sub__FPvPv */
 static void* boss_s_sub(void* param_1, void*) {
-    if(fopAc_IsActor(param_1) && fopAcM_GetName(param_1) == fpcNm_FGANON_e) {
+    if(fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == fpcNm_FGANON_e) {
         return param_1;
     }
 
diff --git a/src/d/actor/d_a_fm.cpp b/src/d/actor/d_a_fm.cpp
index 157ab7dbe..55f8cc056 100644
--- a/src/d/actor/d_a_fm.cpp
+++ b/src/d/actor/d_a_fm.cpp
@@ -7,6 +7,7 @@
 #include "d/actor/d_a_fm.h"
 #include "d/actor/d_a_player_main.h"
 #include "d/d_cc_d.h"
+#include "d/d_cc_uty.h"
 #include "d/d_lib.h"
 #include "d/d_jnt_hit.h"
 #include "d/d_snap.h"
@@ -305,10 +306,9 @@ static BOOL nodeControl_CB(J3DNode* node, int arg1) {
 void daFm_c::_nodeControl(J3DNode* node, J3DModel* model) {
     J3DJoint* joint = static_cast<J3DJoint*>(node);
     int jntNo = joint->getJntNo();
-              
+
     cXyz temp;
     cXyz temp2;
-    cXyz temp3;
     Mtx mtx;
     MTXCopy(model->getAnmMtx(jntNo), mtx);
 
@@ -518,7 +518,7 @@ bool daFm_c::jntHitCreateHeap() {
     };
     mpJntHit = JntHit_create(mpMorf->getModel(), search_data, ARRAY_SIZE(search_data));
     if (mpJntHit) {
-        jntHit = mpJntHit;
+        fopAcM_SetJntHit(this, mpJntHit);
     } else {
         return false;
     }
@@ -560,7 +560,7 @@ fopAc_ac_c* daFm_c::searchNearOtherActor(fopAc_ac_c* i_actor) {
     if(dComIfGp_event_runCheck()) {
         return NULL;
     }
-    if(fopAc_IsActor(i_actor)) {
+    if(fopAcM_IsActor(i_actor)) {
         if(!checkHeight(i_actor)) {
             return NULL;
         }
@@ -606,7 +606,7 @@ static void* searchNearFm_CB(void* param_1, void* param_2) {
 /* 00000F44-00001150       .text searchNearFm__6daFm_cFP10fopAc_ac_c */
 void* daFm_c::searchNearFm(fopAc_ac_c* i_actor) {
     f32 dist;
-    if(fopAc_IsActor(i_actor) && fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_FM_e) { // redundant isactor check?
+    if(fopAcM_IsActor(i_actor) && fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_FM_e) { // redundant isactor check?
         f32 abs = (field_0x3E4 - current.pos).absXZ();
         dist = fopAcM_searchActorDistanceXZ(this, i_actor);
         if(dist != 0.0f) {
@@ -661,7 +661,7 @@ void daFm_c::moveRndEscape() {
             } else {
                 field_0x680 = shape_angle.y + 0x3000 + cM_rndF(5.0f) * 0x1000;
             }
-            field_0x660.set(field_0x690);
+            field_0x660 = field_0x690;
             field_0x660.z += l_HIO.field_0x0B8 * cM_scos(field_0x680);
             field_0x660.x += l_HIO.field_0x0B8 * cM_ssin(field_0x680);
             field_0x648 = l_HIO.field_0x0A0;
@@ -674,7 +674,7 @@ void daFm_c::moveRndEscape() {
 
     if(mAnmPrmIdx != 0xc && field_0xAE4 != 0 && !mObjAcch.ChkWallHit()) {
         cLib_addCalcPosXZ2(&current.pos, field_0x660, (l_HIO.field_0x0CC + 1.0f) *0.005f * field_0x394, l_HIO.field_0x0B0);
-        field_0x690.set(current.pos);
+        field_0x690 = current.pos;
     }
 }
 
@@ -1157,9 +1157,9 @@ bool daFm_c::isGrabFoot() {
     }
 
 #if VERSION <= VERSION_JPN
-    daPy_lk_c* pLink = daPy_getPlayerLinkActorClass();
+    daPy_py_c* pLink = daPy_getPlayerLinkActorClass();
 #endif
-    if(pLink->speedF > 4.0f) {
+    if(pLink->getSpeedF() > 4.0f) {
         return false;
     }
     if(pLink->checkPlayerFly() || pLink->checkFrontRoll() || pLink->getGrabActorID() != -1
@@ -1187,13 +1187,13 @@ void daFm_c::modeSwWait() {
 
     if(field_0x2E4 != 0) {
         setHoleScale(l_HIO.field_0x124, 0.1f, l_HIO.field_0x128);
-        if(eventInfo.mCommand == dEvtCmd_INDEMO_e) {
+        if(eventInfo.checkCommandDemoAccrpt()) {
             if(field_0x2E4 != 0 && cLib_calcTimer(&field_0x650) != 0) {
                 return;
             }
         } else {
             if(dComIfGp_evmng_startCheck("DEFAULT_FM_SW_APEEAR") == 0) {
-                fopAcM_orderOtherEvent2(this,"DEFAULT_FM_SW_APEEAR",dEvtFlag_NOPARTNER_e);
+                fopAcM_orderOtherEvent(this, "DEFAULT_FM_SW_APEEAR");
                 return;
             }
         }
@@ -1552,9 +1552,9 @@ void daFm_c::modeAttack() {
                             fopAcM_seStart(this, JA_SE_CM_FM_GRAB_HAND, 0);
                             daPy_getPlayerLinkActorClass()->voiceStart(0x1C);
                         } else {
-                            daPy_lk_c* pLink = (daPy_lk_c*)daPy_getPlayerLinkActorClass();
+                            daPy_py_c* pLink = daPy_getPlayerLinkActorClass();
 
-                            if(pLink->speedF >= 1.0f){
+                            if(pLink->getSpeedF() >= 1.0f){
                                 dist = (mGrabPos - field_0x63C).absXZ();
                                 if(dist > l_HIO.field_0x110 && dist < l_HIO.field_0x114) {
                                     s16 targetAngle2 = cLib_targetAngleY(&field_0x63C, &mGrabPos);
@@ -1569,7 +1569,7 @@ void daFm_c::modeAttack() {
                         }
                     } else {
                         if (isNpc(mpActorTarget) == true) { 
-                            if (!fopAcM_CheckStatus(mpActorTarget, fopAcStts_CARRY_e)) {
+                            if (!fopAcM_checkCarryNow(mpActorTarget)) {
                                 fopAcM_seStart(this, JA_SE_CM_FM_GRAB_HAND, 0);
                                 fopAcM_setCarryNow(mpActorTarget, 0);
                                 field_0x684 = 4;
@@ -1608,7 +1608,7 @@ void daFm_c::modeAttack() {
                             s16 procName = fopAcM_GetName(actor);
 
                             if (procName == fpcNm_BOMB_e) {
-                                if (!fopAcM_CheckStatus(actor, fopAcStts_CARRY_e)) {
+                                if (!fopAcM_checkCarryNow(actor)) {
                                     fopAcM_setCarryNow(actor, 0);
                                     field_0x684 = 2;
                                     fopAcM_seStart(this, JA_SE_CM_FM_GRAB, 0);
@@ -1618,7 +1618,7 @@ void daFm_c::modeAttack() {
                                     modeProcInit(7);
                                 }
                             } else if (procName == fpcNm_TSUBO_e) {
-                                if (!fopAcM_CheckStatus(actor, fopAcStts_CARRY_e)) {
+                                if (!fopAcM_checkCarryNow(actor)) {
                                     fopAcM_setCarryNow(actor, 0);
                                     field_0x684 = 3;
                                     fopAcM_seStart(this, JA_SE_CM_FM_GRAB, 0);
@@ -1636,7 +1636,7 @@ void daFm_c::modeAttack() {
                     if (dist > l_HIO.field_0x110 && dist < l_HIO.field_0x114) {
                         daPy_lk_c* pLink = (daPy_lk_c*)daPy_getPlayerLinkActorClass();
 
-                        if(pLink->speedF >= 1.0f) {
+                        if(pLink->getSpeedF() >= 1.0f) {
                             s16 targetAngle = cLib_targetAngleY(&field_0x63C, &mGrabPos);
                             f32 dist3 = std::fabsf(l_HIO.field_0x114 - l_HIO.field_0x110);
                             if (dist3 == 0.0f) {
@@ -1742,7 +1742,7 @@ void daFm_c::modeThrow() {
 void daFm_c::modeGrabFootDemoInit() {
     daPy_lk_c* pLink = daPy_getPlayerLinkActorClass();
     field_0x610.setall(0.0f);
-    field_0x630.set(pLink->current.pos);
+    field_0x630 = pLink->current.pos;
 }
 
 /* 00004D20-000050B4       .text modeGrabFootDemo__6daFm_cFv */
@@ -1751,10 +1751,7 @@ void daFm_c::modeGrabFootDemo() {
     if(l_HIO.field_0x00D) {
         modeProc(PROC_INIT_e, 5);
     } else {
-        if(eventInfo.mCommand == dEvtCmd_INDEMO_e) {
-            // char* cutName;
-            // int staffIdx;
-            
+        if(eventInfo.checkCommandDemoAccrpt()) {
             int staffIdx = dComIfGp_evmng_getMyStaffId("Fmaster");
             char* cutName = dComIfGp_getPEvtManager()->getMyNowCutName(staffIdx);
             if(strcmp(cutName, "Dummy") == 0 || strcmp(cutName, "WAIT") == 0) {
@@ -1764,7 +1761,7 @@ void daFm_c::modeGrabFootDemo() {
                 mpMorf->getFrame() == 10.0f) {
                 dComIfGp_evmng_cutEnd(staffIdx);
             }
-            daPy_lk_c* pLink = (daPy_lk_c*)daPy_getPlayerLinkActorClass();
+            daPy_py_c* pLink = daPy_getPlayerLinkActorClass();
             fopAc_ac_c* ac = fopAcM_SearchByID(pLink->getGrabActorID());
             if(ac != NULL) {
                 fopAcM_cancelCarryNow(ac);
@@ -2011,7 +2008,7 @@ void daFm_c::modeGrabDemoInit() {
 void daFm_c::modeGrabDemo() {
     resetInvKine();
 
-    if (eventInfo.mCommand == dEvtCmd_INDEMO_e) {
+    if (eventInfo.checkCommandDemoAccrpt()) {
         daPy_lk_c* pLink = (daPy_lk_c*)daPy_getPlayerLinkActorClass();
         pLink->changeOriginalDemo();
         if (mAnmPrmIdx == 6 && mpMorf->getFrame() == 15.0f) {
@@ -2157,7 +2154,7 @@ void daFm_c::modeGrabNpcDemoInit() {
 void daFm_c::modeGrabNpcDemo() {
     resetInvKine();
     mGrabPos = field_0x61C;
-    if(eventInfo.mCommand == dEvtCmd_INDEMO_e) {
+    if(eventInfo.checkCommandDemoAccrpt()) {
         int staffIdx = dComIfGp_evmng_getMyStaffId("Fmaster");
         if(strcmp(dComIfGp_getPEvtManager()->getMyNowCutName(staffIdx), "YAYU") == 0) {
             setAnm(12, false);
@@ -2429,10 +2426,10 @@ void daFm_c::modeProc(daFm_c::Proc_e proc, int newMode) {
             case 0x10:
             case 0x11:
             case 0x12:
-                attention_info.flags &= ~fopAc_Attn_LOCKON_BATTLE_e;
+                cLib_offBit<u32>(attention_info.flags, fopAc_Attn_LOCKON_BATTLE_e);
                 break;
             default:
-                attention_info.flags |= fopAc_Attn_LOCKON_BATTLE_e;
+                cLib_onBit<u32>(attention_info.flags, fopAc_Attn_LOCKON_BATTLE_e);
                 break;
         }
         mMode = newMode;
@@ -2592,7 +2589,7 @@ void daFm_c::setAnm(s8 anmPrmIdx, bool param_2) {
 /* 00006DE8-00006EA4       .text cancelGrab__6daFm_cFv */
 void daFm_c::cancelGrab() {
     if(mpActorTarget != NULL) {
-        if(field_0x684 != 0 && fopAcM_CheckStatus(mpActorTarget, fopAcStts_CARRY_e) && !checkPlayerGrabTarget()) {
+        if(field_0x684 != 0 && fopAcM_checkCarryNow(mpActorTarget) && !checkPlayerGrabTarget()) {
             mpActorTarget->gravity = 0.0f;
             mpActorTarget->speedF = 0.0f;
             mpActorTarget->speed.x = 0.0f;
@@ -2712,7 +2709,7 @@ void daFm_c::grabPlayer() {
     switch (mAnmPrmIdx) {
         case 4:
         case 6: {
-            daPy_lk_c* pLink = (daPy_lk_c*)daPy_getPlayerLinkActorClass();
+            daPy_py_c* pLink = daPy_getPlayerLinkActorClass();
             cXyz offset2 = pLink->getHeadTopPos() - pLink->current.pos;
             temp.set(5.0f, 0.0f, 10.0f);
             angle.set(-3000, 0, 7000);
@@ -2941,7 +2938,7 @@ bool daFm_c::areaCheck() {
 bool daFm_c::lineCheck(cXyz* param_1, cXyz* param_2) {
     mLinChk.Set(param_1, param_2, this);
     if (dComIfG_Bgsp()->LineCross(&mLinChk)) {
-        *param_2 = mLinChk.mLin.GetEnd();
+        *param_2 = mLinChk.GetCross();
         return true;
     }
     return false;
@@ -3219,7 +3216,7 @@ void daFm_c::debugDraw() {
         dLib_debugDrawAxis(field_0x6BC, 100.0f);
     }
     if (l_HIO.field_0x007) {
-        MTXCopy(fopAcM_GetModel(this)->getAnmMtx(FM_JNT_TE_e), mtx);
+        MTXCopy(model->getAnmMtx(FM_JNT_TE_e), mtx);
         dLib_debugDrawAxis(mtx, 100.0f);
     }
     if (l_HIO.field_0x005) {
@@ -3409,7 +3406,7 @@ cPhs_State daFm_c::_create() {
         if(parentActorID != -1) {
             fopAc_ac_c* ac = fopAcM_SearchByID(parentActorID);
 
-            if(ac != NULL && fopAc_IsActor(ac) && isLink(ac)) {
+            if(ac != NULL && fopAcM_IsActor(ac) && isLink(ac)) {
                 modeProc(PROC_INIT_e, 0x11);
             }
         }
diff --git a/src/d/actor/d_a_gy_ctrl.cpp b/src/d/actor/d_a_gy_ctrl.cpp
index cff76177b..05eee6501 100644
--- a/src/d/actor/d_a_gy_ctrl.cpp
+++ b/src/d/actor/d_a_gy_ctrl.cpp
@@ -68,7 +68,7 @@ static void* searchNearActor_CB(void* arg0, void* arg1) {
 
 /* 000001E4-0000029C       .text searchNearActor__11daGy_Ctrl_cFP10fopAc_ac_c */
 void* daGy_Ctrl_c::searchNearActor(fopAc_ac_c* arg1) {
-    if (fopAc_IsActor(arg1)) {
+    if (fopAcM_IsActor(arg1)) {
         f32 dVar3 = fopAcM_searchActorDistanceXZ(this, arg1);
         if (m328 == 0 && fpcM_GetName(arg1) == fpcNm_GY_CTRLB_e && dVar3 < 6000.0f) {
             return arg1;
@@ -181,7 +181,7 @@ f32 daGy_Ctrl_c::getWaterY(cXyz& arg1) {
 bool daGy_Ctrl_c::lineCheck(cXyz* arg1, cXyz* arg2) {
     mLinChk.Set(arg1, arg2, this);
     if (dComIfG_Bgsp()->LineCross(&mLinChk)) {
-        *arg2 = mLinChk.mLin.GetEnd();
+        *arg2 = mLinChk.GetCross();
         return true;
     }
     return false;
diff --git a/src/d/actor/d_a_himo2.cpp b/src/d/actor/d_a_himo2.cpp
index 199c4b281..c6633528b 100644
--- a/src/d/actor/d_a_himo2.cpp
+++ b/src/d/actor/d_a_himo2.cpp
@@ -497,7 +497,7 @@ static BOOL daHimo2_Draw(himo2_class* i_this) {
 
 /* 800ECBE8-800ECC54       .text s_a_d_sub__FPvPv */
 static void* s_a_d_sub(void* param_1, void* param_2) {
-    if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_KUI_e)) {
+    if ((fopAcM_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_KUI_e)) {
         himo2_class* rope = (himo2_class*)param_2;
         rope->m218C[rope->m24AC] = (fopAc_ac_c*)param_1;
         rope->m24AC++;
@@ -641,7 +641,7 @@ BOOL himo2_class::setTargetPos(cXyz* param_1, f32* param_2, f32* param_3) {
 
 /* 800ED2E0-800ED32C       .text dr_a_sub__FPvPv */
 static void* dr_a_sub(void* param_1, void* param_2) {
-    if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_DR2_e)) {
+    if ((fopAcM_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_DR2_e)) {
         return param_1;
     } else {
         return param_2 = NULL;
@@ -650,7 +650,7 @@ static void* dr_a_sub(void* param_1, void* param_2) {
 
 /* 800ED32C-800ED378       .text b_a_sub__FPvPv */
 static void* b_a_sub(void* param_1, void* param_2) {
-    if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_BTD_e)) {
+    if ((fopAcM_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_BTD_e)) {
         return param_1;
     } else {
         return param_2 = NULL;
diff --git a/src/d/actor/d_a_hookshot.cpp b/src/d/actor/d_a_hookshot.cpp
index 8ea94e919..180984ed0 100644
--- a/src/d/actor/d_a_hookshot.cpp
+++ b/src/d/actor/d_a_hookshot.cpp
@@ -243,7 +243,7 @@ BOOL daHookshot_c::procShot() {
         cXyz sp8C = current.pos + (mMoveVec * 15.0f);
         mLinChk.Set(&current.pos, &sp8C, this);
         if (dComIfG_Bgsp()->LineCross(&mLinChk)) {
-            sp8C = mLinChk.GetLinP()->GetEnd();
+            sp8C = mLinChk.GetCross();
             if (dComIfG_Bgsp()->ChkPolyHSStick(mLinChk)) {
                 fopAcM_SetParam(this, Mode_Pull);
                 mShipRideFlg = false;
diff --git a/src/d/actor/d_a_kamome.cpp b/src/d/actor/d_a_kamome.cpp
index c1b1aac66..07aaaf494 100644
--- a/src/d/actor/d_a_kamome.cpp
+++ b/src/d/actor/d_a_kamome.cpp
@@ -60,7 +60,7 @@ static void* s_a_d_sub(void* ac1, void* ac2) {
     dBgS_LinChk linChk;
     fopAc_ac_c* actor2 = (fopAc_ac_c*)ac2;
 
-    if ((esa_check_count < 100) && fopAc_IsActor(ac1) && fpcM_GetName(ac1) == fpcNm_ESA_e) {
+    if ((esa_check_count < 100) && fopAcM_IsActor(ac1) && fpcM_GetName(ac1) == fpcNm_ESA_e) {
         esa_class* esa = (esa_class*)ac1;
         if (esa->field_0x298 == 0) {
             cXyz sp14;
@@ -113,7 +113,7 @@ static fopAc_ac_c* search_esa(kamome_class* i_this) {
 /* 00000A44-00000A90       .text s_a_i_sub__FPvPv */
 static void* s_a_i_sub(void* ac1, void* ac2) {
     UNUSED(ac2);
-    if (fopAc_IsActor(ac1) && fpcM_GetName(ac1) == fpcNm_NPC_LS1_e) {
+    if (fopAcM_IsActor(ac1) && fpcM_GetName(ac1) == fpcNm_NPC_LS1_e) {
         return ac1;
     }
     return NULL;
diff --git a/src/d/actor/d_a_ks.cpp b/src/d/actor/d_a_ks.cpp
index bf82a9f22..581913339 100644
--- a/src/d/actor/d_a_ks.cpp
+++ b/src/d/actor/d_a_ks.cpp
@@ -211,7 +211,7 @@ BOOL ks_kuttuki_check(ks_class* i_this) {
 void gm_birth_delet(ks_class* i_this) {
     if (i_this->mGmID) {
         gm_class* i_gm = (gm_class*)fopAcM_SearchByID(i_this->mGmID);
-        if (i_gm && fopAc_IsActor(i_gm) && fopAcM_GetName(i_gm) == fpcNm_GM_e && i_gm->m31E > 0) {
+        if (i_gm && fopAcM_IsActor(i_gm) && fopAcM_GetName(i_gm) == fpcNm_GM_e && i_gm->m31E > 0) {
             i_gm->m31E--;
         }
     }
@@ -1185,7 +1185,7 @@ static void* tsubo_search(void* param_1, void* i_data) {
     ks_class* i_this = (ks_class*)i_data;
     fopAc_ac_c* actor = &i_this->actor;
     int r0 = 0;
-    if (r0 < 100 && fopAc_IsActor(param_1) && (fopAcM_GetName(param_1) == fpcNm_TSUBO_e)) {
+    if (r0 < 100 && fopAcM_IsActor(param_1) && (fopAcM_GetName(param_1) == fpcNm_TSUBO_e)) {
         fopAc_ac_c* tsubo_actor = (fopAc_ac_c*)param_1;
         
         if (std::fabsf(tsubo_actor->current.pos.x - actor->current.pos.x) < 20.0f &&
@@ -1717,7 +1717,7 @@ static cPhs_State daKS_Create(fopAc_ac_c* i_this) {
             }
 
             fopAc_ac_c* gm_actor = fopAcM_SearchByID(a_this->mGmID);
-            if (gm_actor && fopAc_IsActor(gm_actor) && fopAcM_GetName(gm_actor) == fpcNm_GM_e && a_this->m2C8 == 5) {
+            if (gm_actor && fopAcM_IsActor(gm_actor) && fopAcM_GetName(gm_actor) == fpcNm_GM_e && a_this->m2C8 == 5) {
                 i_this->current.angle.y += cM_rndFX(0x2000);
                 i_this->speedF = cM_rndF(6.0f) + 34.0f;
                 i_this->speed.y = cM_rndF(8.0f) + 22.0f;
diff --git a/src/d/actor/d_a_mozo.cpp b/src/d/actor/d_a_mozo.cpp
index 1f8d0fe86..bcd3fdf6c 100644
--- a/src/d/actor/d_a_mozo.cpp
+++ b/src/d/actor/d_a_mozo.cpp
@@ -265,7 +265,7 @@ fopAc_ac_c* daMozo_c::getBeamActor(fpc_ProcID apid) {
     fopAc_ac_c* ac = fopAcM_SearchByID(apid);
     if (ac == NULL)
         return NULL;
-    if (fopAc_IsActor(ac) && fopAcM_GetProfName(ac) == fpcNm_Beam_e)
+    if (fopAcM_IsActor(ac) && fopAcM_GetProfName(ac) == fpcNm_Beam_e)
         return ac;
     return NULL;
 }
diff --git a/src/d/actor/d_a_npc_hi1.cpp b/src/d/actor/d_a_npc_hi1.cpp
index c36849c51..c2b157227 100644
--- a/src/d/actor/d_a_npc_hi1.cpp
+++ b/src/d/actor/d_a_npc_hi1.cpp
@@ -440,7 +440,7 @@ void daNpc_Hi1_c::checkOrder() {
             field_0x7BC = 0xff;
             field_0x7BD = 0xff;
         }
-    } else if(eventInfo.mCommand == dEvtCmd_INTALK_e && (field_0x7C1 == 1 || field_0x7C1 == 2)) {
+    } else if(eventInfo.checkCommandTalk() && (field_0x7C1 == 1 || field_0x7C1 == 2)) {
         field_0x7C1 = 0;
         field_0x7B7 = true;
     }
diff --git a/src/d/actor/d_a_npc_hr.cpp b/src/d/actor/d_a_npc_hr.cpp
index a6cae4f77..55f7690ee 100644
--- a/src/d/actor/d_a_npc_hr.cpp
+++ b/src/d/actor/d_a_npc_hr.cpp
@@ -1171,8 +1171,8 @@ void daNpc_Hr_c::eventOrder() {
 
 /* 00002C94-00002D3C       .text checkOrder__10daNpc_Hr_cFv */
 void daNpc_Hr_c::checkOrder() {
-    if (eventInfo.mCommand != dEvtCmd_INDEMO_e) {
-        if (eventInfo.mCommand == dEvtCmd_INTALK_e && ChkOrder(7)) {
+    if (!eventInfo.checkCommandDemoAccrpt()) {
+        if (eventInfo.checkCommandTalk() && ChkOrder(7)) {
             if (dComIfGp_event_chkTalkXY()) {
                 setFlag(HR_FLAG_00000008);
             } else {
@@ -1549,7 +1549,7 @@ bool daNpc_Hr_c::rt_hide() {
     getTornadoPos(0, &tornadoPos);
     current.pos = tornadoPos;
     current.pos.y -= 1500.0f;
-    if(eventInfo.mCommand == dEvtCmd_INDEMO_e) {
+    if(eventInfo.checkCommandDemoAccrpt()) {
         mReturnState = 8;
         mState = HR_STATE_RT_INTRO;
         mStaffIdx = dComIfGp_evmng_getMyStaffId("Hr2");
@@ -1677,7 +1677,7 @@ bool daNpc_Hr_c::rt_win() {
 bool daNpc_Hr_c::rt_hit0() {
     daShip_c* pShip = dComIfGp_getShipActor();
 
-    if(eventInfo.mCommand == dEvtCmd_INDEMO_e) {
+    if(eventInfo.checkCommandDemoAccrpt()) {
         mState = HR_STATE_RT_HIT_1;
         mStaffIdx = dComIfGp_evmng_getMyStaffId("Hr2");
         setEvFlag(EVFLAG_TORNADO_ACTIVE);
diff --git a/src/d/actor/d_a_npc_jb1.cpp b/src/d/actor/d_a_npc_jb1.cpp
index e10d83f7c..51a41e949 100644
--- a/src/d/actor/d_a_npc_jb1.cpp
+++ b/src/d/actor/d_a_npc_jb1.cpp
@@ -258,11 +258,11 @@ void daNpc_Jb1_c::eventOrder() {
 
 /* 0000076C-000007AC       .text checkOrder__11daNpc_Jb1_cFv */
 void daNpc_Jb1_c::checkOrder() {
-    if (eventInfo.mCommand == dEvtCmd_INDEMO_e) {
+    if (eventInfo.checkCommandDemoAccrpt()) {
         return;
     }
 
-    if (eventInfo.mCommand != dEvtCmd_INTALK_e) {
+    if (eventInfo.getCommand() != dEvtCmd_INTALK_e) {
         return;
     }
 
diff --git a/src/d/actor/d_a_npc_ji1.cpp b/src/d/actor/d_a_npc_ji1.cpp
index 2a34c9daa..72c710323 100644
--- a/src/d/actor/d_a_npc_ji1.cpp
+++ b/src/d/actor/d_a_npc_ji1.cpp
@@ -251,7 +251,7 @@ static void daJi1_TgHitCallback(fopAc_ac_c* i_this, dCcD_GObjInf*, fopAc_ac_c* a
 
 /* 00000424-000004A0       .text daJi1_AtHitCallback__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */
 static void daJi1_AtHitCallback(fopAc_ac_c* i_this, dCcD_GObjInf* param_2, fopAc_ac_c* actor, dCcD_GObjInf*) {
-    if(fopAc_IsActor(actor)) {
+    if(fopAcM_IsActor(actor)) {
         if(fpcM_GetName(actor) == fpcNm_PLAYER_e) {
             if(!param_2->ChkAtShieldHit()) {
                 static_cast<daNpc_Ji1_c*>(i_this)->field_0xC3C++;
@@ -1386,7 +1386,7 @@ BOOL daNpc_Ji1_c::speakBadAction(void*) {
 
 /* 00003F54-00004050       .text initPosObject__11daNpc_Ji1_cFPvPv */
 void* daNpc_Ji1_c::initPosObject(void* pActor, void* pData) {
-    if(fopAc_IsActor(pActor) && fopAcM_GetName(pActor) == fpcNm_TSUBO_e) {
+    if(fopAcM_IsActor(pActor) && fopAcM_GetName(pActor) == fpcNm_TSUBO_e) {
         ((daTsubo::Act_c*)pActor)->pos_init();
     }
 
diff --git a/src/d/actor/d_a_npc_ls1.cpp b/src/d/actor/d_a_npc_ls1.cpp
index 4abc19a83..4d3274e23 100644
--- a/src/d/actor/d_a_npc_ls1.cpp
+++ b/src/d/actor/d_a_npc_ls1.cpp
@@ -220,7 +220,7 @@ void* searchActor_Bm1(void* i_actorP, void* i_unusedP) {
 
     if (
         l_check_wrk < ARRAY_SSIZE(l_check_inf) && 
-        fopAc_IsActor(i_actorP) && 
+        fopAcM_IsActor(i_actorP) && 
         fpcM_GetName(i_actorP) == fpcNm_NPC_BM1_e
     ) {
         l_check_inf[l_check_wrk] = (fopAc_ac_c*)i_actorP;
@@ -234,7 +234,7 @@ void* searchActor_Bm1(void* i_actorP, void* i_unusedP) {
 void* searchActor_kamome_Set_NOSTOP_DEMO(void* i_actorP, void* i_unusedP) {
     UNUSED(i_unusedP);
 
-    if (fopAc_IsActor(i_actorP) && fpcM_GetName(i_actorP) == fpcNm_KAMOME_e) {
+    if (fopAcM_IsActor(i_actorP) && fpcM_GetName(i_actorP) == fpcNm_KAMOME_e) {
         fopAcM_OnStatus((fopAc_ac_c*)i_actorP, fopAcStts_UNK4000_e);
     }
 
@@ -245,7 +245,7 @@ void* searchActor_kamome_Set_NOSTOP_DEMO(void* i_actorP, void* i_unusedP) {
 void* searchActor_kamome_Clr_NOSTOP_DEMO(void* i_actorP, void* i_unused) {
     UNUSED(i_unused);
 
-    if (fopAc_IsActor(i_actorP) && fpcM_GetName(i_actorP) == fpcNm_KAMOME_e) {
+    if (fopAcM_IsActor(i_actorP) && fpcM_GetName(i_actorP) == fpcNm_KAMOME_e) {
         fopAcM_OffStatus((fopAc_ac_c*) i_actorP, fopAcStts_UNK4000_e);
     }
     
@@ -2102,7 +2102,7 @@ BOOL daNpc_Ls1_c::talk_1() {
             break;
         case 0xBC4:
         case 0xBC6:
-            eventInfo.mEventId = -1;
+            eventInfo.setEventId(-1);
             break;
         }
         fpcM_Search(searchActor_kamome_Clr_NOSTOP_DEMO, this);
diff --git a/src/d/actor/d_a_npc_mk.cpp b/src/d/actor/d_a_npc_mk.cpp
index 26ebec783..10524fa7f 100644
--- a/src/d/actor/d_a_npc_mk.cpp
+++ b/src/d/actor/d_a_npc_mk.cpp
@@ -179,7 +179,7 @@ void daNpc_Mk_c::eventOrder() {
 
 /* 00000678-000006D4       .text checkOrder__10daNpc_Mk_cFv */
 void daNpc_Mk_c::checkOrder() {
-    if (eventInfo.mCommand == dEvtCmd_INTALK_e && ChkOrder(3)) {
+    if (eventInfo.checkCommandTalk() && ChkOrder(3)) {
         setFlag(1);
         talkInit();
     }
@@ -1092,14 +1092,14 @@ bool daNpc_Mk_c::talk02() {
 /* 00002AC0-00002BB4       .text visitTalkInit__10daNpc_Mk_cFv */
 u8 daNpc_Mk_c::visitTalkInit() {
     if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_1F80) && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_1E02)) {
-        mEventIdx = eventInfo.mEventId;
+        mEventIdx = eventInfo.getEventId();
         mState = STATE_DEMO03;
         demo03();
         dComIfGs_onEventBit(dSv_event_flag_c::UNK_1E04);
         return 12;
     }
     if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_1208) && !dComIfGs_checkGetItem(dItemNo_PICTO_BOX_e) && !dComIfGs_checkGetItem(dItemNo_DELUXE_PICTO_BOX_e)) {
-        mEventIdx = eventInfo.mEventId;
+        mEventIdx = eventInfo.getEventId();
         mState = STATE_DEMO03;
         demo03();
         dComIfGs_onEventBit(dSv_event_flag_c::UNK_1602);
@@ -1221,7 +1221,7 @@ bool daNpc_Mk_c::climb01() {
 
 /* 00003064-00003108       .text drop01__10daNpc_Mk_cFv */
 bool daNpc_Mk_c::drop01() {
-    if (eventInfo.mCommand == dEvtCmd_INDEMO_e) {
+    if (eventInfo.checkCommandDemoAccrpt()) {
         mPrevState = STATE_RUNAWAY;
         mState = STATE_DEMO03;
         mMkStatic.init(0x50, 0x12C);
diff --git a/src/d/actor/d_a_npc_mt.cpp b/src/d/actor/d_a_npc_mt.cpp
index 609f4a326..c9ddbf412 100644
--- a/src/d/actor/d_a_npc_mt.cpp
+++ b/src/d/actor/d_a_npc_mt.cpp
@@ -489,7 +489,7 @@ cPhs_State daNpcMt_c::createInit() {
     gravity = -9.0f;
     setAnmTbl(l_npc_anm_wait);
     mMtGetItemEventIdx = dComIfGp_evmng_getEventIdx("MT_GET_ITEM", 0xff);
-    eventInfo.mpCheckCB = daNpcMt_XyCheckCB;
+    eventInfo.setXyCheckCB(daNpcMt_XyCheckCB);
     mEventCut.setActorInfo2(l_npc_staff_id[mNpcNo], this);
 #if VERSION == VERSION_DEMO
     setMtx();
diff --git a/src/d/actor/d_a_npc_p1.cpp b/src/d/actor/d_a_npc_p1.cpp
index bd81db041..41321f53d 100644
--- a/src/d/actor/d_a_npc_p1.cpp
+++ b/src/d/actor/d_a_npc_p1.cpp
@@ -1200,7 +1200,7 @@ fpc_ProcID daNpc_P1_c::getKajiID() {
     fpc_ProcID parent_id = parentActorID;
     if (parent_id != fpcM_ERROR_PROCESS_ID_e) {
         fopAc_ac_c* actor = fopAcM_SearchByID(parent_id);
-        if (fopAc_IsActor(actor) && fopAcM_GetName(actor) == fpcNm_Obj_Pirateship_e) {
+        if (fopAcM_IsActor(actor) && fopAcM_GetName(actor) == fpcNm_Obj_Pirateship_e) {
             kaji_id = ((daObjPirateship::Act_c*)actor)->getKajiID();
         }
     }
@@ -1231,7 +1231,7 @@ BOOL daNpc_P1_c::kaji_anm() {
         }
         if (mKajiId != fpcM_ERROR_PROCESS_ID_e) {
             fopAc_ac_c* kaji = fopAcM_SearchByID(mKajiId);
-            if (fopAc_IsActor(kaji) && fopAcM_GetName(kaji) == fpcNm_Kaji_e) {
+            if (fopAcM_IsActor(kaji) && fopAcM_GetName(kaji) == fpcNm_Kaji_e) {
                 ((daKaji_c*)kaji)->setAnm(mAnmNum - 9, mpMorf->getFrame());
             }
         }
diff --git a/src/d/actor/d_a_npc_photo.cpp b/src/d/actor/d_a_npc_photo.cpp
index ed1bad16a..afb8b7ed2 100644
--- a/src/d/actor/d_a_npc_photo.cpp
+++ b/src/d/actor/d_a_npc_photo.cpp
@@ -1107,7 +1107,7 @@ void daNpcPhoto_c::executeTurn() {
 
 /* 00001E5C-00001FDC       .text checkOrder__12daNpcPhoto_cFv */
 void daNpcPhoto_c::checkOrder() {
-    if(eventInfo.mCommand == dEvtCmd_INDEMO_e){
+    if(eventInfo.checkCommandDemoAccrpt()){
         if(dComIfGp_evmng_startCheck(mPhotoLinkBackEventIdx) && field_0x9BE == 3){
             field_0x9BE = 0;
         } else if(dComIfGp_evmng_startCheck(mPhotoGetItemEventIdx) && field_0x9BE == 4){
@@ -1121,7 +1121,7 @@ void daNpcPhoto_c::checkOrder() {
         } else if(dComIfGp_evmng_startCheck(mPhotoDateUB4EventIdx) && field_0x9BE == 10){
             field_0x9BE = 0;
         }
-    } else if(eventInfo.mCommand == dEvtCmd_INTALK_e && (field_0x9BE == 2 || field_0x9BE == 1)){
+    } else if(eventInfo.checkCommandTalk() && (field_0x9BE == 2 || field_0x9BE == 1)){
         field_0x9BC = true;
         executeSetMode(1);
     }
@@ -1166,7 +1166,7 @@ void daNpcPhoto_c::eventMove() {
         field_0x9C6 |= 0x40;
     } else if(dComIfGp_evmng_endCheck(field_0x9A6)){
         field_0x9C6 |= 0x40;
-        eventInfo.mEventId = -1;
+        eventInfo.setEventId(-1);
         field_0x9C7 = true;
         field_0x9BE = 0;
         field_0x9BC = false;
diff --git a/src/d/actor/d_a_npc_tc.cpp b/src/d/actor/d_a_npc_tc.cpp
index 35afc0266..039c70217 100644
--- a/src/d/actor/d_a_npc_tc.cpp
+++ b/src/d/actor/d_a_npc_tc.cpp
@@ -661,12 +661,12 @@ void daNpc_Tc_c::eventOrder() {
 
 /* 00001424-00001470       .text checkOrder__10daNpc_Tc_cFv */
 void daNpc_Tc_c::checkOrder() {
-    if (eventInfo.mCommand == dEvtCmd_INDEMO_e) {
+    if (eventInfo.checkCommandDemoAccrpt()) {
         mEventIdx = 0;
         return;
     }
 
-    if (eventInfo.mCommand != dEvtCmd_INTALK_e) {
+    if (!eventInfo.checkCommandTalk()) {
         return;
     }
 
diff --git a/src/d/actor/d_a_npc_tt.cpp b/src/d/actor/d_a_npc_tt.cpp
index 335ea6aac..864f93e42 100644
--- a/src/d/actor/d_a_npc_tt.cpp
+++ b/src/d/actor/d_a_npc_tt.cpp
@@ -110,8 +110,8 @@ void daNpc_Tt_c::eventOrder() {
 
 /* 000003DC-00000484       .text checkOrder__10daNpc_Tt_cFv */
 void daNpc_Tt_c::checkOrder() {
-    if (eventInfo.mCommand != dEvtCmd_INDEMO_e) {
-        if (eventInfo.mCommand == dEvtCmd_INTALK_e && ChkOrder(7)) {
+    if (!eventInfo.checkCommandDemoAccrpt()) {
+        if (eventInfo.checkCommandTalk() && ChkOrder(7)) {
             if (dComIfGp_event_chkTalkXY()) {
                 setFlag(0x4);
             } else {
diff --git a/src/d/actor/d_a_npc_zl1.cpp b/src/d/actor/d_a_npc_zl1.cpp
index 3e2453b61..158dbd3d3 100644
--- a/src/d/actor/d_a_npc_zl1.cpp
+++ b/src/d/actor/d_a_npc_zl1.cpp
@@ -1064,7 +1064,7 @@ void daNpc_Zl1_c::eventOrder() {
 
 /* 0000213C-00002280       .text checkOrder__11daNpc_Zl1_cFv */
 void daNpc_Zl1_c::checkOrder() {
-    static const f32 a_start_pos[] = {-229.76634f, 37.46317f, 305.2134f};
+    static const Vec a_start_pos[] = {-229.76634f, 37.46317f, 305.2134f};
     if(eventInfo.checkCommandDemoAccrpt()) {
         if(dComIfGp_evmng_startCheck(mEventIdx[mEventIdx[4]]) && field_0x84A >= 3) {
             switch(mEventIdx[4]) {
@@ -1072,7 +1072,7 @@ void daNpc_Zl1_c::checkOrder() {
                     field_0x7D3 = true;
                     break;
                 case 2:
-                    dComIfGs_setRestartRoom(*(cXyz*)a_start_pos, 0x4000, 0); // fake match probably
+                    dComIfGs_setRestartRoom(*static_cast<const cXyz*>(a_start_pos), 0x4000, 0);
                     field_0x7C9 = true;
                     break;
                 case 3:
diff --git a/src/d/actor/d_a_obj_coming.cpp b/src/d/actor/d_a_obj_coming.cpp
index 45744a88d..cb84eaf82 100644
--- a/src/d/actor/d_a_obj_coming.cpp
+++ b/src/d/actor/d_a_obj_coming.cpp
@@ -330,7 +330,7 @@ void* daObjComing::Act_c::chk_make_pos_act(void* actor, void* data) {
     daObjComing::Act_c* i_this = (daObjComing::Act_c*)actor;
     daObjComing::Act_c::MakeTmp_c* tmp = (daObjComing::Act_c::MakeTmp_c*)data;
 
-    if (fopAc_IsActor(i_this)) {
+    if (fopAcM_IsActor(i_this)) {
         s16 proc = fopAcM_GetName(i_this);
         if (proc != fpcNm_SHIP_e && proc != fpcNm_PLAYER_e && (std::fabsf(i_this->current.pos.y - tmp->m0C.y) < tmp->m1C + 100.0f)) {
             if (i_this->current.pos.absXZ(tmp->m0C) < tmp->m18 + 100.0f) {
diff --git a/src/d/actor/d_a_obj_doguu.cpp b/src/d/actor/d_a_obj_doguu.cpp
index 6b514286b..4633d79f0 100644
--- a/src/d/actor/d_a_obj_doguu.cpp
+++ b/src/d/actor/d_a_obj_doguu.cpp
@@ -683,7 +683,7 @@ bool daObjDoguu_c::_execute() {
             }
             break;        
         case 1:
-            if(eventInfo.mCommand == dEvtCmd_INDEMO_e){
+            if(eventInfo.checkCommandDemoAccrpt()){
                 field_0x8AC = 2;
             } else {
                 fopAcM_orderOtherEventId(this, mDoguuDemo1EventIdx);
@@ -706,7 +706,7 @@ bool daObjDoguu_c::_execute() {
             }
             break;
         case 4:
-            if(eventInfo.mCommand == dEvtCmd_INDEMO_e){
+            if(eventInfo.checkCommandDemoAccrpt()){
                 field_0x8AC = 5;
             }
             break;
@@ -721,7 +721,7 @@ bool daObjDoguu_c::_execute() {
             field_0x8AC = 7;
             break;
         case 7:
-            if(eventInfo.mCommand == dEvtCmd_INDEMO_e){
+            if(eventInfo.checkCommandDemoAccrpt()){
                 field_0x8AC = 8;
             }
             break;
@@ -747,7 +747,7 @@ bool daObjDoguu_c::_execute() {
             mCyl.SetR(30.0f);
             break;
         case 11:
-            if(eventInfo.mCommand == dEvtCmd_INDEMO_e){
+            if(eventInfo.checkCommandDemoAccrpt()){
                 field_0x8AC = 12;
             }
             break;
diff --git a/src/d/actor/d_a_obj_hha.cpp b/src/d/actor/d_a_obj_hha.cpp
index caff00d0a..3529fc414 100644
--- a/src/d/actor/d_a_obj_hha.cpp
+++ b/src/d/actor/d_a_obj_hha.cpp
@@ -599,7 +599,7 @@ bool daObjHha_c::_execute() {
     switch(mState){
         case State_OPEN: if(check_sw()){
             if(mIsMiddle == 0){
-                if(eventInfo.mCommand != dEvtCmd_INDEMO_e){
+                if(!eventInfo.checkCommandDemoAccrpt()){
                     fopAcM_orderOtherEventId(this, mEventIdx);
                     eventInfo.onCondition(2);
                 }
diff --git a/src/d/actor/d_a_obj_homen.cpp b/src/d/actor/d_a_obj_homen.cpp
index 4f4b5b4cd..872f0c075 100644
--- a/src/d/actor/d_a_obj_homen.cpp
+++ b/src/d/actor/d_a_obj_homen.cpp
@@ -384,7 +384,7 @@ void Act_c::init_mtx() {
 void Act_c::exe_event() {
     switch (field_0x7F6) {
     case 1:
-        if (eventInfo.mCommand == dEvtCmd_INDEMO_e) {
+        if (eventInfo.checkCommandDemoAccrpt()) {
             field_0x7F6 = 2;
         } else {
             fopAcM_orderOtherEventId(this, field_0x7F4);
diff --git a/src/d/actor/d_a_obj_paper.cpp b/src/d/actor/d_a_obj_paper.cpp
index 0d90167d4..fbd532a6b 100644
--- a/src/d/actor/d_a_obj_paper.cpp
+++ b/src/d/actor/d_a_obj_paper.cpp
@@ -201,7 +201,7 @@ void daObjPaper::Act_c::mode_wait_init() {
 
 /* 00000748-00000784       .text mode_wait__Q210daObjPaper5Act_cFv */
 void daObjPaper::Act_c::mode_wait() {
-    if (eventInfo.mCommand == dEvtCmd_INTALK_e) {
+    if (eventInfo.checkCommandTalk()) {
         mode_talk0_init();
     }
     else {
diff --git a/src/d/actor/d_a_obj_volcano.cpp b/src/d/actor/d_a_obj_volcano.cpp
index af4bd03d7..aef0a4d4b 100644
--- a/src/d/actor/d_a_obj_volcano.cpp
+++ b/src/d/actor/d_a_obj_volcano.cpp
@@ -235,7 +235,7 @@ void daObjVolcano::Act_c::init_mtx() {
 
 /* 00000FDC-0000103C       .text daObjVolcano_fire_demo_wait__Q212daObjVolcano5Act_cFv */
 void daObjVolcano::Act_c::daObjVolcano_fire_demo_wait() {
-    if (eventInfo.mCommand == dEvtCmd_INDEMO_e) {
+    if (eventInfo.checkCommandDemoAccrpt()) {
         StartFire();
         field_0x500 = 5;
     } else {
@@ -277,7 +277,7 @@ void daObjVolcano::Act_c::daObjVolcano_fire_main() {
 
 /* 00001284-000013E4       .text daObjVolcano_freeze_demo_wait__Q212daObjVolcano5Act_cFv */
 void daObjVolcano::Act_c::daObjVolcano_freeze_demo_wait() {
-    if (eventInfo.mCommand == dEvtCmd_INDEMO_e) {
+    if (eventInfo.checkCommandDemoAccrpt()) {
         int switchIndex = prm_get_swSave();
         fopAcM_onSwitch(this, switchIndex);
         field_0x4E8 = 0;
diff --git a/src/d/actor/d_a_player_hang.inc b/src/d/actor/d_a_player_hang.inc
index f795e9576..68afe9445 100644
--- a/src/d/actor/d_a_player_hang.inc
+++ b/src/d/actor/d_a_player_hang.inc
@@ -524,7 +524,7 @@ BOOL daPy_lk_c::procHangMove() {
                             m34EC += (s16)(shape_angle.y - sVar6);
                             shape_angle.y = sVar6;
                             cXyz local_88;
-                            local_88.set(*mLinkLinChk.GetLinP()->GetEndP());
+                            local_88.set(mLinkLinChk.GetCross());
                             local_88.x -= triPla->GetNP()->x * 1.5f;
                             local_88.y += 25.0f;
                             local_88.z -= triPla->GetNP()->z * 1.5f;
@@ -534,9 +534,9 @@ BOOL daPy_lk_c::procHangMove() {
                                 current.pos = local_88;
                             }
                         } else {
-                            current.pos.x = (mLinkLinChk.GetLinP()->GetEndP()->x - 1.5f * triPla->GetNP()->x) -
+                            current.pos.x = (mLinkLinChk.GetCross().x - 1.5f * triPla->GetNP()->x) -
                                             (mNormalSpeed * dVar13);
-                            current.pos.z = (mLinkLinChk.GetLinP()->GetEndP()->z - 1.5f * triPla->GetNP()->z) -
+                            current.pos.z = (mLinkLinChk.GetCross().z - 1.5f * triPla->GetNP()->z) -
                                             (mNormalSpeed * dVar11);
                         }
                     }
diff --git a/src/d/actor/d_a_player_npc.cpp b/src/d/actor/d_a_player_npc.cpp
index d7224420e..3f3ce0b56 100644
--- a/src/d/actor/d_a_player_npc.cpp
+++ b/src/d/actor/d_a_player_npc.cpp
@@ -43,7 +43,7 @@ BOOL daPy_npc_c::check_moveStop() {
             speedF = 0.0f;
             m4E8 = 0;
         }
-        if (dComIfGp_getPlayer(0)->eventInfo.mCommand != dEvtCmd_INDOOR_e) {
+        if (!dComIfGp_getPlayer(0)->eventInfo.checkCommandDoor()) {
             offNpcCallCommand();
         }
         return TRUE;
diff --git a/src/d/actor/d_a_tag_island.cpp b/src/d/actor/d_a_tag_island.cpp
index 7d7958f2a..b0b2f6734 100644
--- a/src/d/actor/d_a_tag_island.cpp
+++ b/src/d/actor/d_a_tag_island.cpp
@@ -451,7 +451,7 @@ cPhs_State daTag_Island_c::create() {
     s32 swbit = getSwbit();
     makeEvId();
     eventInfo.setEventId(mEventId);
-    eventInfo.mMapToolId = getEventNo();
+    eventInfo.setToolId(getEventNo());
 
     if (mEventId != -1 && swbit != 0xFF && !dComIfGs_isSwitch(swbit, fopAcM_GetRoomNo(this))) {
         setActio(ACT_ARRIVAL);
diff --git a/src/d/actor/d_a_tag_msg.cpp b/src/d/actor/d_a_tag_msg.cpp
index b3d4b7ee1..ccda8f76c 100644
--- a/src/d/actor/d_a_tag_msg.cpp
+++ b/src/d/actor/d_a_tag_msg.cpp
@@ -179,7 +179,7 @@ static BOOL daTag_Msg_actionEvent(daTag_Msg_c* a_this) {
 static BOOL daTag_Msg_actionHunt(daTag_Msg_c* a_this) {
     u8 swBit;
 
-    if (a_this->eventInfo.mCommand == dEvtCmd_INTALK_e) {
+    if (a_this->eventInfo.checkCommandTalk()) {
         a_this->setActio(3);
         swBit = a_this->getSwbit();
         if ((swBit & 0xff) != 0xff) {
diff --git a/src/d/d_bg_s_acch.cpp b/src/d/d_bg_s_acch.cpp
index 7c815f31c..f66ee32a7 100644
--- a/src/d/d_bg_s_acch.cpp
+++ b/src/d/d_bg_s_acch.cpp
@@ -184,7 +184,7 @@ void dBgS_Acch::LineCheck(dBgS& i_bgs) {
         linChk.Set2(&old_pos, &pos, GetActorPid());
         linChk.SetExtChk(*this);
         if (i_bgs.LineCross(&linChk)) {
-            *pm_pos = linChk.GetLinP()->GetEnd();
+            *pm_pos = linChk.GetCross();
             OnLineCheckHit();
 
             if (pm_out_poly_info != NULL)
diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp
index a86958bb8..a3595b7d0 100644
--- a/src/d/d_camera.cpp
+++ b/src/d/d_camera.cpp
@@ -2216,7 +2216,7 @@ bool dCamera_c::bumpCheck(u32 i_flags) {
                     local_2a8 = mCenter + globe.Xyz();
                     if (!lineBGCheck(&mCenter, &local_2a8, 0x7f)) {
                         if (lineBGCheck(&m070, &local_2b4, &lin_chk1, 0x7f)) {
-                            local_29c = lin_chk1.GetLinP()->GetEnd();
+                            local_29c = lin_chk1.GetCross();
                             local_2b4 = compWallMargin(&local_29c, gaze_back_margin);
                         }
                         lineBGCheck(&mCenter, &local_2b4, &lin_chk1, i_flags);
@@ -2234,7 +2234,7 @@ bool dCamera_c::bumpCheck(u32 i_flags) {
                 setFlag(0x80);
                 setFlag(0x80);
 
-                local_290 = lin_chk1.GetLinP()->GetEnd();
+                local_290 = lin_chk1.GetCross();
 
                 local_284 = compWallMargin(&local_290, 0.5f + gaze_back_margin);
 
diff --git a/src/d/d_detect.cpp b/src/d/d_detect.cpp
index 8fc197681..e51c33137 100644
--- a/src/d/d_detect.cpp
+++ b/src/d/d_detect.cpp
@@ -104,7 +104,7 @@ bool dDetect_c::chk_quake_area(const cXyz* pos) const {
 
 /* 8009C32C-8009C588       .text search_tag_light__9dDetect_cFPvPv */
 void* dDetect_c::search_tag_light(void* i_proc, void* i_pos) {
-    if (fopAc_IsActor(i_proc) && fopAcM_GetName(i_proc) == fpcNm_Tag_Light_e) {
+    if (fopAcM_IsActor(i_proc) && fopAcM_GetName(i_proc) == fpcNm_Tag_Light_e) {
         daTagLight::Act_c* light = (daTagLight::Act_c*)i_proc;
         const cXyz* pos = (const cXyz*)i_pos;
         if (light->chk_inside(pos)) {
diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp
index c5a676aef..6c10fdf8c 100644
--- a/src/f_op/f_op_actor_mng.cpp
+++ b/src/f_op/f_op_actor_mng.cpp
@@ -1271,7 +1271,7 @@ void fopAcM_createWarpFlower(cXyz* p_pos, csXyz* p_angle, int i_roomNo, u8 param
 
 /* 80027920-80027970       .text enemySearchJugge__FPvPv */
 fopAc_ac_c * enemySearchJugge(void* ptr, void*) {
-    if (ptr != NULL && fopAc_IsActor(ptr)) {
+    if (ptr != NULL && fopAcM_IsActor(ptr)) {
         fopAc_ac_c * i_ac = (fopAc_ac_c *)ptr;
         if (i_ac->group == fopAc_ENEMY_e)
             return i_ac;