dAcObjBase var -> mVar

25 files changed, 142 insertions, 131 deletions

diff --git a/src/d/a/d_a_base.cpp b/src/d/a/d_a_base.cpp
index 8c8bf58b..922bfda5 100644
--- a/src/d/a/d_a_base.cpp
+++ b/src/d/a/d_a_base.cpp
@@ -77,10 +77,10 @@ dAcBase_c::dAcBase_c()
         setActorRef(s_Create_Parent);
     }
 
-    fProfile::fActorProfile_c *profile = (fProfile::fActorProfile_c *)((*fProfile::sProfileList)[profile_name]);
+    fProfile::fActorProfile_c *profile = (fProfile::fActorProfile_c *)((*fProfile::sProfileList)[mProfileName]);
     mActorProperties = profile->mActorProperties;
     if (mpActorInfo == nullptr) {
-        mpActorInfo = getActorInfoByProfileAndSubtype(profile_name, mActorSubtype);
+        mpActorInfo = getActorInfoByProfileAndSubtype(mProfileName, mActorSubtype);
     }
     someStr[0] = '\0';
 }
@@ -194,7 +194,7 @@ int dAcBase_c::preDelete() {
     }
 
     if (!checkActorProperty(AC_PROP_0x800) && checkActorProperty(AC_PROP_0x10000000) &&
-        fBase_c::getConnectParent()->lifecycle_state != TO_BE_DELETED) {
+        fBase_c::getConnectParent()->mLifecycleState != TO_BE_DELETED) {
         if (itemDroppingAndGivingRelated(nullptr, 0) != 0) {
             setEnemyDefeatFlag();
         }
@@ -382,9 +382,9 @@ dAcBase_c *dAcBase_c::findActor(char *objName, dAcBase_c *parent) {
 FORCE_INLINE dAcBase_c *findActor(dAcBase_c *parent) {
     dAcBase_c *foundActor;
     if (!parent) {
-        foundActor = (dAcBase_c *)fManager_c::searchBaseByGroupType(dBase_c::ACTOR, nullptr);
-    } else if (parent->group_type == 2) {
-        foundActor = (dAcBase_c *)fManager_c::searchBaseByGroupType(dBase_c::ACTOR, parent);
+        foundActor = (dAcBase_c *)fManager_c::searchBaseByGroupType(fBase_c::ACTOR, nullptr);
+    } else if (parent->mGroupType == fBase_c::ACTOR) {
+        foundActor = (dAcBase_c *)fManager_c::searchBaseByGroupType(fBase_c::ACTOR, parent);
     } else {
         foundActor = nullptr;
     }
@@ -498,7 +498,7 @@ f32 dAcBase_c::getSquareDistToPlayer() {
 // Some weirdness with the float registers being used
 // 8002d4b0
 void dAcBase_c::updateRoomId(f32 yOffset) {
-    if (getConnectParent()->profile_name != fProfile::ROOM) {
+    if (getConnectParent()->mProfileName != fProfile::ROOM) {
         mVec3_c actorPos(mPosition.x, mPosition.y + yOffset, mPosition.z);
 
         if (dBgS_ObjGndChk::CheckPos(actorPos)) {
@@ -750,8 +750,8 @@ void dAcBase_c::roundAngleToNearest90(s16 *dst_angle, s16 *src_angle) {
 void dAcBase_c::incrementKillCounter() {
     dAcObjBase_c *object = (dAcObjBase_c *)this; // Probably wrong
 
-    if (group_type == ACTOR && object->unkByteTargetFiRelated == 1) {
-        int killCounterId = object->targetFiTextId;
+    if (mGroupType == ACTOR && object->mTargetFiRelated == 1) {
+        int killCounterId = object->mTargetFiTextID;
 
         if (killCounterId < 91 && (killCounterId & 0x300) == 0) {
             FileManager *fileMgr = FileManager::GetInstance();
diff --git a/src/d/a/d_a_insect.cpp b/src/d/a/d_a_insect.cpp
index 995b2077..0360de38 100644
--- a/src/d/a/d_a_insect.cpp
+++ b/src/d/a/d_a_insect.cpp
@@ -30,7 +30,7 @@ bool dAcOInsect_c::checkForLinkScare() {
                 mLinkNearby = 1;
                 return true;
             }
-        } else if (dAcPy_c::LINK->forwardSpeed > 1.f) {
+        } else if (dAcPy_c::LINK->mSpeed > 1.f) {
             if (dAcPy_c::LINK->getDistanceTo(mPosition) < 30.f) {
                 mLinkNearby = 1;
                 return true;
@@ -62,7 +62,7 @@ bool dAcOInsect_c::isLinkUsingBugNet() {
 
 s32 dAcOInsect_c::getLinkSpeedLevel() {
     if (dAcPy_c::LINK != nullptr) {
-        f32 speed = fabsf(dAcPy_c::LINK->forwardSpeed);
+        f32 speed = fabsf(dAcPy_c::LINK->mSpeed);
         if (speed < 0.1f) {
             return 0;
         } else if (speed < 10.0f) {
@@ -139,9 +139,9 @@ void dAcOInsect_c::addAttentionTarget() {
 }
 
 void dAcOInsect_c::preAttention() {
-    poscopy2 = mPosition;
-    poscopy2.y += 20.f;
-    poscopy3 = poscopy2;
+    mPositionCopy2 = mPosition;
+    mPositionCopy2.y += 20.f;
+    mPositionCopy3 = mPositionCopy2;
 }
 
 f32 dAcOInsect_c::dAcOInsect_0x80() {
@@ -200,15 +200,15 @@ bool dAcOInsect_c::fn_8018FAA0() {
 }
 
 bool dAcOInsect_c::fn_8018FAD0() {
-    f32 speed = fabsf(forwardSpeed);
+    f32 speed = fabsf(mSpeed);
     if (cM::isLessThanZero(speed)) {
         fn_8018FDF0(mPlane_0x3A8.GetN());
         return true;
     } else {
-        f32 clampSpeed = speed < 5.0f ? forwardSpeed > 0.f ? forwardSpeed : -5.f : 5.f;
+        f32 clampSpeed = speed < 5.0f ? mSpeed > 0.f ? mSpeed : -5.f : 5.f;
 
         mVec3_c pos0 = mPosition + field_0x360;
-        mVec3_c pos1 = pos0 + field_0x36C * forwardSpeed;
+        mVec3_c pos1 = pos0 + field_0x36C * mSpeed;
         int linType = fn_801900B0(pos0, pos1);
         field_0x410[0] = pos0;
         field_0x434[0] = pos1;
diff --git a/src/d/a/d_a_item.cpp b/src/d/a/d_a_item.cpp
index 56ee740f..52b14820 100644
--- a/src/d/a/d_a_item.cpp
+++ b/src/d/a/d_a_item.cpp
@@ -320,9 +320,19 @@ STATE_DEFINE(dAcItem_c, WaitTurnOff);
 STATE_DEFINE(dAcItem_c, WaitSacredDewGetEffect);
 
 dAcItem_c::dAcItem_c()
-    : mStateMgr(*this, sStateID::null), mEff_0x8F4(this), mEff_0x928(this), mEff_0x95C(this), mEff_0x990(this),
-      mEff_0x9C4(this), mEff_0x9F8(this), mEff_0xA2C(this), mEff_0xA60(this), mNode(this),
-      mEventRelated(*this, nullptr), mDowsingTarget(this, DowsingTarget::SLOT_NONE), mItemQueuePrev(nullptr),
+    : mStateMgr(*this, sStateID::null),
+      mEff_0x8F4(this),
+      mEff_0x928(this),
+      mEff_0x95C(this),
+      mEff_0x990(this),
+      mEff_0x9C4(this),
+      mEff_0x9F8(this),
+      mEff_0xA2C(this),
+      mEff_0xA60(this),
+      mNode(this),
+      mEventRelated(*this, nullptr),
+      mDowsingTarget(this, DowsingTarget::SLOT_NONE),
+      mItemQueuePrev(nullptr),
       mItemQueueNext(nullptr) {
     mField_0xCD8 = 1.0f;
     mBaseScale = 1.0f;
@@ -348,7 +358,7 @@ dAcItem_c::dAcItem_c()
     mField_0xD66 = 0;
 
     sItemList.append(&mNode);
-    unkByteTargetFiRelated = 3;
+    mTargetFiRelated = 3;
 }
 dAcItem_c::~dAcItem_c() {
     delete mField_0xB3C;
diff --git a/src/d/a/d_a_salbage_obj.cpp b/src/d/a/d_a_salbage_obj.cpp
index cadf6137..ceedf95c 100644
--- a/src/d/a/d_a_salbage_obj.cpp
+++ b/src/d/a/d_a_salbage_obj.cpp
@@ -51,7 +51,7 @@ void dSalvageIfObj_c::doDemoThrow() {
 int dAcSalbageObj_c::actorExecute() {
     executeInternal();
     calcVelocity();
-    mPosition += velocity;
+    mPosition += mVelocity;
     mPosition += mStts.GetCcMove();
     if (isInStateWait()) {
         updateCc();
@@ -155,9 +155,9 @@ void dAcSalbageObj_c::initSalbageObj() {
     } else {
         switch (mBehavior) {
             case BEHAVIOR_CARRY: {
-                forwardSpeed = 0.0f;
-                velocity.set(0.0f, 0.0f, 0.0f);
-                forwardAccel = 0.0f;
+                mSpeed = 0.0f;
+                mVelocity.set(0.0f, 0.0f, 0.0f);
+                mAcceleration = 0.0f;
                 mSalvageIf.setHidden();
                 if (dSalvageMgr_c::sInstance->getCurrentSalvageObjId() != mSalvageIf.getSalvageObjId()) {
                     mStateMgr.changeState(StateID_Kill);
@@ -169,9 +169,9 @@ void dAcSalbageObj_c::initSalbageObj() {
                 break;
             }
             case BEHAVIOR_FLY: {
-                forwardSpeed = 0.0f;
-                velocity.set(0.0f, 0.0f, 0.0f);
-                forwardAccel = 0.0f;
+                mSpeed = 0.0f;
+                mVelocity.set(0.0f, 0.0f, 0.0f);
+                mAcceleration = 0.0f;
                 mStateMgr.changeState(StateID_Fly);
                 break;
             }
@@ -181,12 +181,12 @@ void dAcSalbageObj_c::initSalbageObj() {
                     return;
                 } else {
                     mBehavior = BEHAVIOR_STATIONARY;
-                    forwardAccel = -1.0f;
-                    forwardMaxSpeed = -40.0f;
+                    mAcceleration = -1.0f;
+                    mMaxSpeed = -40.0f;
                     initCcAndBg();
-                    forwardSpeed = 0.0f;
-                    forwardAccel = 0.0f;
-                    velocity.set(0.0f, 0.0f, 0.0f);
+                    mSpeed = 0.0f;
+                    mAcceleration = 0.0f;
+                    mVelocity.set(0.0f, 0.0f, 0.0f);
                     mStateMgr.changeState(StateID_Wait);
                 }
                 break;
@@ -301,10 +301,10 @@ void dAcSalbageObj_c::updateMdl() {
     }
 
     f32 scale = mScale.x;
-    poscopy3 = mPosition;
-    poscopy3.y += getPoscopy3YOffset() * scale;
-    poscopy2 = mPosition;
-    poscopy2.y += getPoscopy2YOffset() * scale;
+    mPositionCopy3 = mPosition;
+    mPositionCopy3.y += getPoscopy3YOffset() * scale;
+    mPositionCopy2 = mPosition;
+    mPositionCopy2.y += getPoscopy2YOffset() * scale;
 }
 
 void dAcSalbageObj_c::loadBehaviorFromParams() {
@@ -367,10 +367,10 @@ void dAcSalbageObj_c::initializeState_DemoThrow() {
     mRotation.y = result.atan2sX_Z();
     mRotation.x = -cM::atan2s(result.y, result.absXZ());
     mRotation.z = field_0x904;
-    angle.x = 0;
-    angle.y = mRotation.y;
-    angle.z = 0;
-    forwardMaxSpeed = -40.0f;
+    mAngle.x = 0;
+    mAngle.y = mRotation.y;
+    mAngle.z = 0;
+    mMaxSpeed = -40.0f;
     mBgObjAcch.Set(this, 1, &mBgAcchCir);
     mBgObjAcch.SetWaterNone();
     mBgObjAcch.SetRoofNone();
diff --git a/src/d/a/npc/d_a_npc.cpp b/src/d/a/npc/d_a_npc.cpp
index d9116af4..bab54cd3 100644
--- a/src/d/a/npc/d_a_npc.cpp
+++ b/src/d/a/npc/d_a_npc.cpp
@@ -41,9 +41,9 @@ bool dFlowNpc_c::handleEventInternal(const MsbFlowInfo *element) {
             extract2xU16Params(element, &exitId, &trial);
             if (field_0x10) {
                 dAcBase_c *ac = EventManager::getMainActorInEvent();
-                if (ac != nullptr && ac->profile_name == fProfile::NPC_TKE) {
+                if (ac != nullptr && ac->mProfileName == fProfile::NPC_TKE) {
                     static_cast<daNpcTke_c *>(ac)->setFinishFlags();
-                } else if (mpOwner->profile_name == fProfile::NPC_TKE) {
+                } else if (mpOwner->mProfileName == fProfile::NPC_TKE) {
                     static_cast<daNpcTke_c *>(mpOwner)->setFinishFlags();
                 }
             }
diff --git a/src/d/a/obj/d_a_obj_arrow.cpp b/src/d/a/obj/d_a_obj_arrow.cpp
index 56bf272f..ae95ba89 100644
--- a/src/d/a/obj/d_a_obj_arrow.cpp
+++ b/src/d/a/obj/d_a_obj_arrow.cpp
@@ -79,7 +79,7 @@ int dAcArrow_c::create() {
         mStateMgr.changeState(StateID_Wait);
     }
 
-    boundingBox.Set(mVec3_c(-6.0f, -6.0f, 0.0f), mVec3_c(6.0f, 6.0f, 110.0f));
+    mBoundingBox.Set(mVec3_c(-6.0f, -6.0f, 0.0f), mVec3_c(6.0f, 6.0f, 110.0f));
     field_0x684 = -1;
     field_0x68A = 300;
     f32 rnd = cM::rndF(20.0f);
diff --git a/src/d/a/obj/d_a_obj_boomerang.cpp b/src/d/a/obj/d_a_obj_boomerang.cpp
index 14e3a81a..dbc72dfd 100644
--- a/src/d/a/obj/d_a_obj_boomerang.cpp
+++ b/src/d/a/obj/d_a_obj_boomerang.cpp
@@ -59,7 +59,7 @@ void dAcBoomerang_c::areaCallback(mVec3_c *param1, u32 param2) {
     setChrAnimation(dAcBoomerang_c::RB_CUT);
 }
 void dAcBoomerang_c::atHitCallback(cCcD_Obj *i_objInfA, dAcObjBase_c *i_actorB, cCcD_Obj *i_objInfB) {
-    if (i_actorB != nullptr && i_actorB->GetLinkage().checkFlag(0x80)) {
+    if (i_actorB != nullptr && i_actorB->getLinkage().checkFlag(0x80)) {
         // Check if beetle can grab things
         if (dAcPy_c::hasBeetleVariantOrBetter(HOOK_BEETLE)) {
             // If beetle is already holding the object or is stationary
@@ -71,7 +71,7 @@ void dAcBoomerang_c::atHitCallback(cCcD_Obj *i_objInfA, dAcObjBase_c *i_actorB,
             if (tryGrabObject(i_actorB)) {
                 setChrAnimation(RB_HOLD);
                 mAnmChr[BOOMERANG_ANIM_PINCERS].setRate(0.f);
-                mAnmChr[BOOMERANG_ANIM_PINCERS].setFrameOnly(i_actorB->GetLinkage().field_0x24);
+                mAnmChr[BOOMERANG_ANIM_PINCERS].setFrameOnly(i_actorB->getLinkage().field_0x24);
                 return;
             }
         }
@@ -86,10 +86,10 @@ void dAcBoomerang_c::atHitCallback(cCcD_Obj *i_objInfA, dAcObjBase_c *i_actorB,
         field_0x8D8.y = 0.f;
 
         if (cM::isZero(field_0x8D8.normalize())) {
-            field_0x8D8.set(-angle.y.sin(), 0.f, -angle.y.cos());
+            field_0x8D8.set(-mAngle.y.sin(), 0.f, -mAngle.y.cos());
         }
-        field_0x8D8 *= velocity.absXZ();
-        field_0x8D8.y = -velocity.y;
+        field_0x8D8 *= mVelocity.absXZ();
+        field_0x8D8.y = -mVelocity.y;
 
         field_0x8D8.normalize();
 
@@ -292,7 +292,7 @@ const dAcBoomerang_c::ChrAnimation_t dAcBoomerang_c::sChrAnims[dAcBoomerang_c::R
 
 bool dAcBoomerang_c::tryGrabObject(dAcObjBase_c *pObj) {
     dAcPy_c *player = dAcPy_c::GetLink2();
-    if (checkField_0x8CC(FLAG_CONTROLLABLE) && GetLinkage().checkFlag(0x80)) {}
+    if (checkField_0x8CC(FLAG_CONTROLLABLE) && getLinkage().checkFlag(0x80)) {}
 }
 
 // ...
@@ -370,7 +370,7 @@ void dAcBoomerang_c::initializeState_Wait() {
     dAcPy_c::GetLink2()->onModelUpdateFlag(dAcPy_c::UPDATE_MODEL_BEETLE);
 }
 void dAcBoomerang_c::executeState_Wait() {
-    forwardSpeed = 0.f;
+    mSpeed = 0.f;
     placeOnArm();
     if (checkField_0x8CC(FLAG_REQUEST_MOVE)) {
         mStateMgr.changeState(StateID_Move);
@@ -388,7 +388,7 @@ void dAcBoomerang_c::initializeState_ReturnWait() {
     placeOnArm();
 }
 void dAcBoomerang_c::executeState_ReturnWait() {
-    forwardSpeed = 0.f;
+    mSpeed = 0.f;
     placeOnArm();
     if (mAnmChr[BOOMERANG_ANIM_PINCERS].isStop() || !dAcPy_c::GetLink2()->checkActionFlagsCont(0x10)) {
         startSound(SE_BE_CATCH);
@@ -409,7 +409,7 @@ void dAcBoomerang_c::initializeState_Move() {
     field_0x8C8 = 0;
 
     dAcPy_c *player = dAcPy_c::GetLink2();
-    forwardSpeed = player->getBeetleNormalSpeed();
+    mSpeed = player->getBeetleNormalSpeed();
 
     mSph0.ClrAtHit();
     mSph1.ClrTgHit();
@@ -420,10 +420,10 @@ void dAcBoomerang_c::initializeState_Move() {
     unsetField_0x8CC(FLAG_REQUEST_MOVE | FLAG_WING_EFFECT_ACTIVE | FLAG_0x10000);
     setField_0x8CC(FLAG_CONTROLLABLE | FLAG_0x80000);
 
-    angle.x = 2000 - player->vt_0x198();
+    mAngle.x = 2000 - player->vt_0x198();
 
-    mRotation.x.set(-angle.x);
-    mRotation.y.set(angle.y);
+    mRotation.x.set(-mAngle.x);
+    mRotation.y.set(mAngle.y);
     mRotation.z.set(0);
     field_0x8B2 = 0;
 
@@ -435,9 +435,9 @@ void dAcBoomerang_c::initializeState_Move() {
     field_0x8B8 = daPlayerActBase_c::fn_8005BAA0();
 
     // TODO regswap
-    field_0x8BE = angle.x - dPad::ex_c::m_current_ex->mMPLS.getVerticalAngle();
+    field_0x8BE = mAngle.x - dPad::ex_c::m_current_ex->mMPLS.getVerticalAngle();
 
-    field_0x8E4.fromXY(angle.x, angle.y, forwardSpeed);
+    field_0x8E4.fromXY(mAngle.x, mAngle.y, mSpeed);
 
     startSound(SE_BE_THROW);
     dJEffManager_c::spawnUIEffect(PARTICLE_RESOURCE_ID_MAPPING_3_, mVec3_c::Zero, nullptr, nullptr, nullptr, nullptr);
@@ -528,14 +528,14 @@ int dAcBoomerang_c::actorExecute() {
     setRoomId();
 
     mMdl.calc(false);
-    mMdl.getNodeWorldMtxMultVecZero(0, poscopy2);
-    poscopy3 = poscopy2;
+    mMdl.getNodeWorldMtxMultVecZero(0, mPositionCopy2);
+    mPositionCopy3 = mPositionCopy2;
 
     if (checkField_0x8CC(FLAG_WING_EFFECT_ACTIVE)) {
         mEff0.createContinuousEffect(PARTICLE_RESOURCE_ID_MAPPING_6_, mWorldMtx, nullptr, nullptr);
         mEff1.setTransform(mWorldMtx);
 
-        f32 ang = field_0x8E4.angle(velocity);
+        f32 ang = field_0x8E4.angle(mVelocity);
         ang = 10.f - mAng::fromRad(ang) * (7.f / 256.f);
         ang = nw4r::ut::Max(ang, 3.f);
         mEff1.setAwayFromCenterSpeed(ang);
diff --git a/src/d/a/obj/d_a_obj_fairy.cpp b/src/d/a/obj/d_a_obj_fairy.cpp
index 5de9133a..fe12be21 100644
--- a/src/d/a/obj/d_a_obj_fairy.cpp
+++ b/src/d/a/obj/d_a_obj_fairy.cpp
@@ -27,7 +27,7 @@ int dAcObjFairy_c::create() {
     mStateMgr.changeState(StateID_CureStart);
     mStateMgr.changeState(StateID_Wait);
     mModel.getModel().setPriorityDraw(0x7F, 0x7F);
-    boundingBox.Set(mVec3_c(-20.0f, -200.0f, -20.0f), mVec3_c(20.0f, 20.0f, 20.0f));
+    mBoundingBox.Set(mVec3_c(-20.0f, -200.0f, -20.0f), mVec3_c(20.0f, 20.0f, 20.0f));
 
     return SUCCEEDED;
 }
@@ -96,7 +96,7 @@ void dAcObjFairy_c::executeState_CatchDemo() {
 }
 void dAcObjFairy_c::finalizeState_CatchDemo() {
     field_0xB89 = 0;
-    clearObjectProperty(0x200);
+    unsetObjectProperty(0x200);
 }
 
 bool dAcObjFairy_c::shouldAvoidLink() const {
@@ -104,7 +104,7 @@ bool dAcObjFairy_c::shouldAvoidLink() const {
     if (dAcPy_c::LINK->isUsingBugnet()) {
         mVec3_c dist = dAcPy_c::LINK->getBugNetPos() - mPosition;
         bool isClose = false;
-        if (dist.mag() < 100.0f && velocity.dot(dist) > 0.0f) {
+        if (dist.mag() < 100.0f && mVelocity.dot(dist) > 0.0f) {
             isClose = true;
         }
 
diff --git a/src/d/a/obj/d_a_obj_switch.cpp b/src/d/a/obj/d_a_obj_switch.cpp
index 353c0524..6bd51b37 100644
--- a/src/d/a/obj/d_a_obj_switch.cpp
+++ b/src/d/a/obj/d_a_obj_switch.cpp
@@ -33,8 +33,8 @@ void dAcOswMdlCallback_c::timingB(u32 nodeId, nw4r::g3d::WorldMtxManip *manip, n
 }
 
 static bool isPushableBlock(dAcBase_c *actor) {
-    return actor->isActorPlayer() || actor->profile_name == fProfile::OBJ_PUSH_BLOCK ||
-           actor->profile_name == fProfile::OBJ_KIBAKO;
+    return actor->isActorPlayer() || actor->mProfileName == fProfile::OBJ_PUSH_BLOCK ||
+           actor->mProfileName == fProfile::OBJ_KIBAKO;
 }
 
 void dAcOsw_c::rideCallback(dBgW *unknown, dAcObjBase_c *actor, dAcObjBase_c *interactor) {
@@ -49,12 +49,12 @@ void dAcOsw_c::rideCallback(dBgW *unknown, dAcObjBase_c *actor, dAcObjBase_c *in
             return;
         }
         if (link->checkFlags0x340(0x800000) &&
-            !(link->getCurrentCarriedActor() && link->getCurrentCarriedActor()->GetLinkage().checkFlag(0x04))) {
+            !(link->getCurrentCarriedActor() && link->getCurrentCarriedActor()->getLinkage().checkFlag(0x04))) {
             return;
         }
     }
 
-    if (interactor->GetLinkage().checkState(dLinkage_c::STATE_ACTIVE)) {
+    if (interactor->getLinkage().checkState(dLinkage_c::STATE_ACTIVE)) {
         return;
     }
 
@@ -107,7 +107,7 @@ int dAcOsw_c::actorCreate() {
     } else {
         mStateMgr.changeState(StateID_OnWait);
     }
-    boundingBox.Set(mVec3_c(-90.0f, -10.0f, -90.0f), mVec3_c(90.0f, 70.0f, 90.0f));
+    mBoundingBox.Set(mVec3_c(-90.0f, -10.0f, -90.0f), mVec3_c(90.0f, 70.0f, 90.0f));
 
     return SUCCEEDED;
 }
diff --git a/src/d/a/obj/d_a_obj_tbox.cpp b/src/d/a/obj/d_a_obj_tbox.cpp
index 9863b382..c61e6886 100644
--- a/src/d/a/obj/d_a_obj_tbox.cpp
+++ b/src/d/a/obj/d_a_obj_tbox.cpp
@@ -823,7 +823,7 @@ dAcTbox_c::dAcTbox_c()
     field_0x120E = 0;
     mDoObstructedCheck = false;
     sTboxActorList.append(&mTboxListNode);
-    unkByteTargetFiRelated = 2;
+    mTargetFiRelated = 2;
 }
 
 dAcTbox_c::~dAcTbox_c() {
@@ -1125,22 +1125,22 @@ int dAcTbox_c::create() {
         case NORMAL: {
             static mVec3_c bbLo = mVec3_c(-65.0f, 0.0f, -100.0f);
             static mVec3_c bbUp = mVec3_c(65.0f, 150.0f, 45.0f);
-            boundingBox.Set(bbLo, bbUp);
+            mBoundingBox.Set(bbLo, bbUp);
         } break;
         case SMALL: {
             static mVec3_c bbLo = mVec3_c(-38.0f, 0.0f, -70.0f);
             static mVec3_c bbUp = mVec3_c(38.0f, 110.0f, 35.0f);
-            boundingBox.Set(bbLo, bbUp);
+            mBoundingBox.Set(bbLo, bbUp);
         } break;
         case BOSS: {
             static mVec3_c bbLo = mVec3_c(-90.0f, 0.0f, -140.0f);
             static mVec3_c bbUp = mVec3_c(90.0f, 170.0f, 60.0f);
-            boundingBox.Set(bbLo, bbUp);
+            mBoundingBox.Set(bbLo, bbUp);
         } break;
         case GODDESS: {
             static mVec3_c bbLo = mVec3_c(-65.0f, 0.0f, -100.0f);
             static mVec3_c bbUp = mVec3_c(65.0f, 150.0f, 50.0f);
-            boundingBox.Set(bbLo, bbUp);
+            mBoundingBox.Set(bbLo, bbUp);
         } break;
     }
 
@@ -1194,7 +1194,7 @@ int dAcTbox_c::actorExecute() {
     if (hasFlags) {
         setObjectProperty(0x200);
     } else {
-        clearObjectProperty(0x200);
+        unsetObjectProperty(0x200);
     }
 
     if (hasFlags) {
@@ -1330,7 +1330,7 @@ int dAcTbox_c::actorExecuteInEvent() {
     if (hasFlags) {
         setObjectProperty(0x200);
     } else {
-        clearObjectProperty(0x200);
+        unsetObjectProperty(0x200);
     }
 
     if (hasFlags) {
diff --git a/src/d/a/obj/d_a_obj_water_spout.cpp b/src/d/a/obj/d_a_obj_water_spout.cpp
index 2a7bfbff..052fa74e 100644
--- a/src/d/a/obj/d_a_obj_water_spout.cpp
+++ b/src/d/a/obj/d_a_obj_water_spout.cpp
@@ -39,7 +39,7 @@ int dAcOwaterSpout_c::create() {
         mScale.y *= 4.0f;
     }
     mMdl.getModel().setScale(mScale);
-    boundingBox.Set(mVec3_c(-400.0f, -250.0f, -400.0f), mVec3_c(400.0f, 250.0f, 400.0f));
+    mBoundingBox.Set(mVec3_c(-400.0f, -250.0f, -400.0f), mVec3_c(400.0f, 250.0f, 400.0f));
     return SUCCEEDED;
 }
 
diff --git a/src/d/col/bg/d_bg_s_acch.cpp b/src/d/col/bg/d_bg_s_acch.cpp
index a57bc638..0affa72e 100644
--- a/src/d/col/bg/d_bg_s_acch.cpp
+++ b/src/d/col/bg/d_bg_s_acch.cpp
@@ -110,14 +110,14 @@ void dBgS_Acch::Set(dAcObjBase_c *pObj, int tblSize, dBgS_AcchCir *pAcchCir) {
     mpMyObj = pObj;
     mActorId = pObj->getID();
     mpPos = &pObj->getPosition();
-    mpOldPos = &pObj->GetOldPosition();
-    mpSpeed = &pObj->GetVelocity();
+    mpOldPos = &pObj->getOldPosition();
+    mpSpeed = &pObj->getVelocity();
     if (mpSpeed) {
-        mSpeed = pObj->GetVelocity();
+        mSpeed = pObj->getVelocity();
     } else {
         mSpeed.set(0.0f, 0.0f, 0.0f);
     }
-    mpAngle = &pObj->GetAngle();
+    mpAngle = &pObj->getAngle();
     mpShapeAngle = &pObj->getRotation();
 }
 
diff --git a/src/d/col/cc/d_cc_s.cpp b/src/d/col/cc/d_cc_s.cpp
index 702042e4..01e67d6a 100644
--- a/src/d/col/cc/d_cc_s.cpp
+++ b/src/d/col/cc/d_cc_s.cpp
@@ -62,7 +62,7 @@ void dCcS::Dt() {
 
 bool dCcS::ChkRemoveActor(dAcObjBase_c *pActor) {
     bool ret = false;
-    if (pActor && (pActor->delete_request || pActor->lifecycle_state == fBase_c::TO_BE_DELETED)) {
+    if (pActor && (pActor->mDeleteRequest || pActor->mLifecycleState == fBase_c::TO_BE_DELETED)) {
         ret = true;
     }
     return ret;
diff --git a/src/d/d_base.cpp b/src/d/d_base.cpp
index ac9a7810..44a9718f 100644
--- a/src/d/d_base.cpp
+++ b/src/d/d_base.cpp
@@ -5,7 +5,7 @@ u32 dBase_c::s_DrawControlFlags;
 u32 dBase_c::s_NextExecuteControlFlags;
 
 dBase_c::dBase_c() : fBase_c() {
-    mBaseProperties = (*fProfile::sProfileList)[profile_name]->mBaseProperties;
+    mBaseProperties = (*fProfile::sProfileList)[mProfileName]->mBaseProperties;
 }
 
 void dBase_c::postDraw(fBase_c::MAIN_STATE_e status) {
@@ -53,7 +53,7 @@ void dBase_c::resetFlags() {
 }
 
 bool dBase_c::isActorPlayer() {
-    return profile_name == fProfile::PLAYER;
+    return mProfileName == fProfile::PLAYER;
 }
 
 int dBase_c::loadAsyncCallback() {
diff --git a/src/d/d_jnt_col.cpp b/src/d/d_jnt_col.cpp
index 7097c5a3..8d60b22f 100644
--- a/src/d/d_jnt_col.cpp
+++ b/src/d/d_jnt_col.cpp
@@ -18,7 +18,7 @@ int dJntCol_c::init(dAcObjBase_c *i_actorP, dJntColData_c const *i_jntColP, m3d:
     field_0x10 = 0;
 
     if (i_actorP) {
-        i_actorP->SetJntCol(this);
+        i_actorP->setJntCol(this);
         mpActor = i_actorP;
     }
 
diff --git a/src/d/d_linkage.cpp b/src/d/d_linkage.cpp
index 4be6c775..b2e3f719 100644
--- a/src/d/d_linkage.cpp
+++ b/src/d/d_linkage.cpp
@@ -72,8 +72,8 @@ bool dLinkage_c::tryAttach(
             return false;
         }
     }
-    pActor->clearObjectProperty(0x1000);
-    pActor->clearObjectProperty(0x4);
+    pActor->unsetObjectProperty(0x1000);
+    pActor->unsetObjectProperty(0x4);
     mControllingActor.link(pSrc);
     mState = STATE_ACTIVE;
     mType = type;
@@ -88,7 +88,7 @@ bool dLinkage_c::tryAttach(
     pLinkedActor = pRef;
     pRef->link(pActor);
     if ((pSrc == dAcPy_c::GetLink2() || type == CONNECTION_5) &&
-        pActor->getConnectParent()->profile_name == fProfile::ROOM) {
+        pActor->getConnectParent()->mProfileName == fProfile::ROOM) {
         pActor->addActorToRoom(-1);
         onFlag(0x20000000);
         pActor->setActorProperty(dAcBase_c::AC_PROP_0x2000000);
@@ -110,9 +110,9 @@ void dLinkage_c::fn_80050E00(dAcObjBase_c *pActor, const f32 speed, const f32 ve
 
 void dLinkage_c::fn_80050E40(dAcObjBase_c *pActor, const f32 speed, const f32 velocityY, mAng rot) {
     fn_80050EB0(pActor);
-    pActor->forwardSpeed = speed;
-    pActor->velocity.y = velocityY;
-    pActor->angle.y = rot;
+    pActor->mSpeed = speed;
+    pActor->mVelocity.y = velocityY;
+    pActor->mAngle.y = rot;
 }
 
 void dLinkage_c::fn_80050EA0(dAcObjBase_c *pActor) {
@@ -134,11 +134,11 @@ void dLinkage_c::fn_80050EB0(dAcObjBase_c *pActor) {
         MTXIdentity(carryTransMtx);
     } else if (mType == CONNECTION_4) {
         if (pActor) {
-            pActor->clearObjectProperty(0x4);
+            pActor->unsetObjectProperty(0x4);
         }
     } else if (mType == CONNECTION_7) {
         if (pActor) {
-            pActor->clearObjectProperty(0x1000);
+            pActor->unsetObjectProperty(0x1000);
         }
     }
 
@@ -204,7 +204,7 @@ void dLinkage_c::fn_80051190(dAcObjBase_c *pActor) {
 
         // If the Actor is linked to itself, return?
         dAcObjBase_c *pLinked = static_cast<dAcObjBase_c *>(pLinkedActor->p_owner);
-        if (pLinked && &pLinked->GetLinkage() == this) {
+        if (pLinked && &pLinked->getLinkage() == this) {
             return;
         }
     }
@@ -223,7 +223,7 @@ void dLinkage_c::fn_800511E0(dAcObjBase_c *pActor) {
     }
     mMtx_c &mtx = pActor->mWorldMtx;
     f32 y = field_0x1C * pActor->mScale.y;
-    mtx.transS(pActor->getPosition().x, pActor->getPosition().y + pActor->GetYOffset(), pActor->getPosition().z);
+    mtx.transS(pActor->getPosition().x, pActor->getPosition().y + pActor->getYOffset(), pActor->getPosition().z);
     if (mType == CONNECTION_1) {
         MTXConcat(mtx, carryTransMtx, mtx);
     }
@@ -247,5 +247,5 @@ void dLinkage_c::fn_800511E0(dAcObjBase_c *pActor) {
 
 bool dLinkage_c::fn_800513C0() const {
     return (mState == STATE_ACTIVE && (mType == CONNECTION_1 || mType == CONNECTION_6)) &&
-           !(mControllingActor.p_owner && mControllingActor.p_owner->profile_name == fProfile::E_GEROCK);
+           !(mControllingActor.p_owner && mControllingActor.p_owner->mProfileName == fProfile::E_GEROCK);
 }
diff --git a/src/d/d_player_act.cpp b/src/d/d_player_act.cpp
index 12851977..edc03b73 100644
--- a/src/d/d_player_act.cpp
+++ b/src/d/d_player_act.cpp
@@ -80,11 +80,11 @@ void daPlayerActBase_c::setPosRot(const mVec3_c *pos, const mAng3_c *rot, bool f
         if (pos != nullptr) {
             mPosition = *pos;
             mOldPosition = mPosition;
-            velocity.y = 0.0f;
+            mVelocity.y = 0.0f;
         }
         if (rot != nullptr) {
             mRotation = *rot;
-            angle.y = mRotation.y;
+            mAngle.y = mRotation.y;
         }
     }
 }
diff --git a/src/d/d_player_mdl.cpp b/src/d/d_player_mdl.cpp
index 5b640016..8e67a1bf 100644
--- a/src/d/d_player_mdl.cpp
+++ b/src/d/d_player_mdl.cpp
@@ -1860,7 +1860,7 @@ void daPlayerModelBase_c::updateCachedPositions() {
     static const Vec sPos1 = {12.0f, -8.0f, 0.0f};
     static const Vec sHeadPos = {0.0f, -28.0f, 0.0f};
 
-    mMainMdl.getNodeWorldMtxMultVec(PLAYER_MAIN_NODE_HEAD, sPos1, poscopy2);
+    mMainMdl.getNodeWorldMtxMultVec(PLAYER_MAIN_NODE_HEAD, sPos1, mPositionCopy2);
     mMainMdl.getNodeWorldMtxMultVec(PLAYER_MAIN_NODE_HEAD, sPosAboveLink, mPositionAboveLink);
     mMainMdl.getNodeWorldMtxMultVec(PLAYER_MAIN_NODE_HEAD, sHeadPos, mHeadTranslation);
 
@@ -1881,7 +1881,7 @@ void daPlayerModelBase_c::updateCachedPositions() {
         mVec3_c v(0.0f, 18.0f, 0.0f);
         v.rotX(field_0x1268);
         v.rotY(mRotation.y + field_0x126A);
-        poscopy2 += v;
+        mPositionCopy2 += v;
     }
 }
 
@@ -1891,16 +1891,16 @@ void daPlayerModelBase_c::setPosCopy3() {
     static const Vec posCopy3v2 = {0.0f, 95.0f, 0.0f};
     static const Vec posCopy3v3 = {0.0f, 14.0f, 0.0f};
     if (checkCurrentAction(/* FREE_FALL*/ 0x13) || checkCurrentAction(/* WALKING_ON_TIGHTROPE */ 0x81)) {
-        poscopy3 = mPosition;
-        poscopy3.y += 180.0f;
+        mPositionCopy3 = mPosition;
+        mPositionCopy3.y += 180.0f;
     } else if (checkCurrentAction(/* BEING_PULLED_BY_CLAWS */ 0x5A)) {
-        poscopy3 = poscopy2;
+        mPositionCopy3 = mPositionCopy2;
     } else if (checkActionFlags(FLG0_SWING_ROPE)) {
-        poscopy3 = mPosition;
+        mPositionCopy3 = mPosition;
     } else if (checkActionFlagsCont(0x20000000) || checkCurrentAction(0x70) ||
                checkCurrentAction(/* HANG_ON_ZIP */ 0x85)) {
-        poscopy3 = mPosition;
-        poscopy3.y -= 100.0f;
+        mPositionCopy3 = mPosition;
+        mPositionCopy3.y -= 100.0f;
     } else {
         // TODO maybe fakematch, is there a way to avoid this goto?
         if (checkActionFlags(FLG0_HANGING_LEDGE)) {
@@ -1913,14 +1913,14 @@ void daPlayerModelBase_c::setPosCopy3() {
             case 0x84: /* CLIMBING_ONTO_TIGHTROPE */ {
             label:
                 const nw4r::math::MTX34 *c = mHeadMdl.getLocalMtx();
-                poscopy3.x = c->_03;
-                poscopy3.y = c->_13;
-                poscopy3.z = c->_23;
+                mPositionCopy3.x = c->_03;
+                mPositionCopy3.y = c->_13;
+                mPositionCopy3.z = c->_23;
                 break;
             }
             case 0x09: {
                 // SLIDING
-                poscopy3 = mPosition + mVec3_c(posCopy3v2);
+                mPositionCopy3 = mPosition + mVec3_c(posCopy3v2);
                 break;
             }
             default: {
@@ -1940,10 +1940,10 @@ void daPlayerModelBase_c::setPosCopy3() {
                     }
                     f = mtx.m[1][3];
                 }
-                poscopy3.copyFrom(v);
-                poscopy3.x += mPosition.x;
-                poscopy3.y += f;
-                poscopy3.z += mPosition.z;
+                mPositionCopy3.copyFrom(v);
+                mPositionCopy3.x += mPosition.x;
+                mPositionCopy3.y += f;
+                mPositionCopy3.z += mPosition.z;
                 break;
             }
         }
diff --git a/src/d/d_room.cpp b/src/d/d_room.cpp
index a17e411d..9d6c48e7 100644
--- a/src/d/d_room.cpp
+++ b/src/d/d_room.cpp
@@ -222,7 +222,7 @@ s32 dRoom_c::foreachObject(foreachObjCallback cb) {
     }
 
     for (fBase_c *base = getConnectChild(); base != nullptr && base != start; base = getConnectTreeNext(base)) {
-        if (base->group_type == ACTOR || base->group_type == STAGE) {
+        if (base->mGroupType == ACTOR || base->mGroupType == STAGE) {
             cb(static_cast<dAcBase_c *>(base));
             count++;
         }
diff --git a/src/d/d_sc_game.cpp b/src/d/d_sc_game.cpp
index ebff6a1e..8c691c33 100644
--- a/src/d/d_sc_game.cpp
+++ b/src/d/d_sc_game.cpp
@@ -206,7 +206,7 @@ bool dScGame_c::attemptDelete() {
     if (mStageMgrRef.p_owner == nullptr) {
         return true;
     } else {
-        if (!mStageMgrRef.p_owner->delete_request) {
+        if (!mStageMgrRef.p_owner->mDeleteRequest) {
             mStageMgrRef.p_owner->deleteRequest();
         }
         return false;
diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp
index c97aeb0d..b86ba605 100644
--- a/src/d/d_stage.cpp
+++ b/src/d/d_stage.cpp
@@ -219,7 +219,7 @@ void dStage_c::setRoomVisited(int roomid) {
         return;
     }
 
-    if (dScGame_c::sInstance == nullptr || dScGame_c::GetInstance()->profile_name == fProfile::GAME) {
+    if (dScGame_c::sInstance == nullptr || dScGame_c::GetInstance()->mProfileName == fProfile::GAME) {
         u16 flag, shift;
         getFlagPositionForRoomVisit(roomid, &flag, &shift);
         DungeonflagManager *mg = DungeonflagManager::sInstance;
diff --git a/src/d/d_tag_processor.cpp b/src/d/d_tag_processor.cpp
index 5c76e740..af0c2be7 100644
--- a/src/d/d_tag_processor.cpp
+++ b/src/d/d_tag_processor.cpp
@@ -3,8 +3,8 @@
 #include "common.h"
 #include "d/a/d_a_base.h"
 #include "d/d_font_manager.h"
-#include "d/d_message.h"
 #include "d/d_lyt_hio.h"
+#include "d/d_message.h"
 #include "d/d_textwindow_unk.h"
 #include "d/lyt/d_lyt_util_items.h"
 #include "d/lyt/d_textbox.h"
@@ -26,6 +26,7 @@
 
 #include <libc.h>
 
+
 #define READ_U8(src, off) (*((const u8 *)((const u8 *)src + off)))
 #define READ_S8(src, off) (*((const s8 *)((const u8 *)src + off)))
 #define READ_U16(src, off) (*((const u16 *)((const u8 *)src + off)))
@@ -1569,9 +1570,9 @@ void dTagProcessor_c::somethingWithScrapperAndMusic(wchar_t *src) {
         dAcBase_c *parent = nullptr;
         while ((parent = ac = static_cast<dAcBase_c *>(fManager_c::searchBaseByGroupType(fBase_c::ACTOR, parent))) !=
                nullptr) {
-            if ((ac->profile_name >= fProfile::NPC_SLFB && ac->profile_name <= fProfile::NPC_SLFL) ||
-                (ac->profile_name >= fProfile::NPC_SLB && ac->profile_name <= fProfile::FLY_SLB) ||
-                ac->profile_name == fProfile::NPC_SLB2 || ac->profile_name == fProfile::NPC_DRBC) {
+            if ((ac->mProfileName >= fProfile::NPC_SLFB && ac->mProfileName <= fProfile::NPC_SLFL) ||
+                (ac->mProfileName >= fProfile::NPC_SLB && ac->mProfileName <= fProfile::FLY_SLB) ||
+                ac->mProfileName == fProfile::NPC_SLB2 || ac->mProfileName == fProfile::NPC_DRBC) {
                 dSndPlayerMgr_c::GetInstance()->setMsgActor(dLytMsgWindow_c::getInstance()->getMsgIdx(), ac);
                 return;
             }
diff --git a/src/d/lyt/meter/d_lyt_meter_ganbari_gauge.cpp b/src/d/lyt/meter/d_lyt_meter_ganbari_gauge.cpp
index 7e73fea9..cf7423f0 100644
--- a/src/d/lyt/meter/d_lyt_meter_ganbari_gauge.cpp
+++ b/src/d/lyt/meter/d_lyt_meter_ganbari_gauge.cpp
@@ -436,10 +436,10 @@ bool dLytMeterGanbariGauge_c::execute() {
         }
     }
 
-    mVec3_c diff = dAcPy_c::GetLink()->poscopy3 - dScGame_c::getCamera(0)->getPositionMaybe();
+    mVec3_c diff = dAcPy_c::GetLink()->mPositionCopy3 - dScGame_c::getCamera(0)->getPositionMaybe();
     f32 len = diff.mag();
     mVec3_c v;
-    d3d::fn_80016960(v, dAcPy_c::GetLink()->poscopy3);
+    d3d::fn_80016960(v, dAcPy_c::GetLink()->mPositionCopy3);
     if (!EventManager::isInEvent()) {
         field_0x524 = v;
     }
@@ -503,8 +503,7 @@ bool dLytMeterGanbariGauge_c::execute() {
     mVec2_c scaleV(scale, scale);
     mLyt.getLayout()->GetRootPane()->SetScale(scaleV);
 
-    if (!field_0x534 && len <= dLytMeter_HIO_c::GetInstance()->field_0x138 && !fn_80104710(false) &&
-        !isCrawling()) {
+    if (!field_0x534 && len <= dLytMeter_HIO_c::GetInstance()->field_0x138 && !fn_80104710(false) && !isCrawling()) {
         field_0x530 = 1;
     } else {
         field_0x530 = 0;
@@ -603,7 +602,7 @@ bool dLytMeterGanbariGauge_c::execute() {
 
     if (!EventManager::isInEvent() && !dAcPy_c::GetLink()->hasvt_0x1C0() &&
         !dAcPy_c::GetLink()->checkActionFlagsCont(0x10) &&
-        (d3d::fn_80016A90(dAcPy_c::GetLink()->poscopy3) || fn_80104710(false) || isCrawling()) &&
+        (d3d::fn_80016A90(dAcPy_c::GetLink()->mPositionCopy3) || fn_80104710(false) || isCrawling()) &&
         *mStateMgrWheel.getStateID() != StateID_Full && *mStateMgrMain.getStateID() == StateID_InvisibleWait &&
         !field_0x530) {
         mStateMgrMain.changeState(StateID_In);
@@ -612,7 +611,7 @@ bool dLytMeterGanbariGauge_c::execute() {
         mStateMgrMain.changeState(StateID_OutWait);
     } else if ((EventManager::isInEvent() || dAcPy_c::GetLink()->hasvt_0x1C0() ||
                 dAcPy_c::GetLink()->checkActionFlagsCont(0x10) ||
-                (!d3d::fn_80016A90(dAcPy_c::GetLink()->poscopy3) && !fn_80104710(false) && !isCrawling())) &&
+                (!d3d::fn_80016A90(dAcPy_c::GetLink()->mPositionCopy3) && !fn_80104710(false) && !isCrawling())) &&
                *mStateMgrMain.getStateID() == StateID_Wait) {
         mStateMgrMain.changeState(StateID_CameraOut);
     } else if (field_0x530 && *mStateMgrMain.getStateID() == StateID_Wait) {
diff --git a/src/d/lyt/meter/d_lyt_meter_plus_btn.cpp b/src/d/lyt/meter/d_lyt_meter_plus_btn.cpp
index f21efe7b..9c8ab2bf 100644
--- a/src/d/lyt/meter/d_lyt_meter_plus_btn.cpp
+++ b/src/d/lyt/meter/d_lyt_meter_plus_btn.cpp
@@ -246,7 +246,7 @@ void dLytMeterPlusBtn_c::setCall(bool shouldCall) {
 bool dLytMeterPlusBtn_c::hasSpecificMapMark() {
     dTgMapMark_c *mark = nullptr;
     while ((mark = static_cast<dTgMapMark_c *>(fManager_c::searchBaseByGroupType(fBase_c::STAGE, mark))) != nullptr) {
-        if (mark->checkActorProperty(dAcBase_c::AC_PROP_0x100) || mark->profile_name != fProfile::T_MAP_MARK ||
+        if (mark->checkActorProperty(dAcBase_c::AC_PROP_0x100) || mark->mProfileName != fProfile::T_MAP_MARK ||
             mark->rotz_shift0_0xf == 1) {
             continue;
         }
diff --git a/src/d/lyt/msg_window/d_lyt_msg_window.cpp b/src/d/lyt/msg_window/d_lyt_msg_window.cpp
index d43b29d9..4e08a12a 100644
--- a/src/d/lyt/msg_window/d_lyt_msg_window.cpp
+++ b/src/d/lyt/msg_window/d_lyt_msg_window.cpp
@@ -2,16 +2,17 @@
 
 #include "common.h"
 #include "d/a/obj/d_a_obj_base.h"
+#include "d/d_lyt_hio.h"
 #include "d/d_message.h"
 #include "d/d_pad.h"
 #include "d/d_stage_mgr.h"
 #include "d/d_tag_processor.h"
-#include "d/d_lyt_hio.h"
 #include "d/d_textwindow_unk.h"
 #include "d/lyt/d_lyt_control_game.h"
 #include "d/lyt/d_lyt_map.h"
 #include "d/lyt/d_textbox.h"
 
+
 // clang-format off
 // vtable order
 #include "d/lyt/meter/d_lyt_meter.h"
@@ -263,8 +264,8 @@ void dLytMsgWindow_c::initializeState_In() {
         param = 2;
     } else if (mpTagProcessor->getField_0x90D() == 3) {
         param = 1;
-    } else if (obj != nullptr && d3d::fn_80016A90(obj->poscopy2)) {
-        d3d::fn_80016960(field_0x768, obj->poscopy2);
+    } else if (obj != nullptr && d3d::fn_80016A90(obj->mPositionCopy2)) {
+        d3d::fn_80016960(field_0x768, obj->mPositionCopy2);
         mVec3_c v = field_0x768;
         v.z = 0.f;
         field_0x768 = v;