Couple names in dMeterMap_c (#3142)

2 files changed, 38 insertions, 38 deletions

diff --git a/include/d/d_meter_map.h b/include/d/d_meter_map.h
index ecf645a6ac..b17f51846e 100644
--- a/include/d/d_meter_map.h
+++ b/include/d/d_meter_map.h
@@ -89,7 +89,7 @@ public:
     virtual void draw();
     virtual ~dMeterMap_c();
 
-    bool isDispPosInsideFlg() { return field_0x2d != 0; }
+    bool isDispPosInsideFlg() { return mMapIsInside != 0; }
     dMeterMap_c* getMapPointer() { return (dMeterMap_c*)mMap; }
     void setSizeW(f32 w) { mSizeW = w; }
     void setSizeH(f32 h) { mSizeH = h; }
@@ -108,15 +108,15 @@ private:
     /* 0x0C */ s32 mIsCompass;
     /* 0x10 */ s32 mIsMap;
     /* 0x14 */ u32 field_0x14;
-    /* 0x18 */ f32 field_0x18;
-    /* 0x1C */ f32 field_0x1c;
+    /* 0x18 */ f32 mDrawPosX;
+    /* 0x1C */ f32 mDrawPosY;
     /* 0x20 */ f32 mSizeW;
     /* 0x24 */ f32 mSizeH;
-    /* 0x28 */ s16 field_0x28;
+    /* 0x28 */ s16 mSlidePositionOffset;
     /* 0x2A */ u8 field_0x2a;
     /* 0x2B */ u8 field_0x2b;
     /* 0x2C */ u8 mMapAlpha;
-    /* 0x2D */ u8 field_0x2d;
+    /* 0x2D */ u8 mMapIsInside;
     /* 0x2E */ u8 field_0x2e;
     /* 0x30 */ int field_0x30;
 };
diff --git a/src/d/d_meter_map.cpp b/src/d/d_meter_map.cpp
index 79bffe0018..e37c28398f 100644
--- a/src/d/d_meter_map.cpp
+++ b/src/d/d_meter_map.cpp
@@ -302,12 +302,12 @@ bool dMeterMap_c::isEventRunCheck() {
 f32 dMeterMap_c::getMapDispEdgeLeftX_Layout() {
     #if (PLATFORM_WII || PLATFORM_SHIELD)
     if (mDoGph_gInf_c::isWide()) {
-        return g_meter_mapHIO.mWideBottomLeftX + field_0x28;
+        return g_meter_mapHIO.mWideBottomLeftX + mSlidePositionOffset;
     }
 
-    return g_meter_mapHIO.mNormalBottomLeftX + field_0x28;
+    return g_meter_mapHIO.mNormalBottomLeftX + mSlidePositionOffset;
     #else
-    return field_0x28 + 35;
+    return mSlidePositionOffset + 35;
     #endif
 }
 
@@ -349,14 +349,14 @@ s16 dMeterMap_c::getDispPosOutSide_OffsetX() {
 void dMeterMap_c::setDispPosInsideFlg_SE_On() {
     if (isEnableDispMapAndMapDispSizeTypeNo()) {
         dComIfGp_mapShow();
-        field_0x2d = 1;
+        mMapIsInside = 1;
         field_0x2e = 7;
     }
 }
 
 void dMeterMap_c::setDispPosOutsideFlg_SE_On() {
     dComIfGp_mapHide();
-    field_0x2d = 0;
+    mMapIsInside = 0;
     field_0x2e = 7;
 }
 
@@ -456,44 +456,44 @@ void dMeterMap_c::_create(J2DScreen* unused) {
     field_0x2a = 0;
 
     if (dComIfGp_checkMapShow()) {
-        field_0x2d = 1;
+        mMapIsInside = 1;
 
         if (!isEnableDispMapAndMapDispSizeTypeNo()) {
-            field_0x2d = 0;
+            mMapIsInside = 0;
         }
 
         if (!isMapOpenCheck()) {
-            field_0x2d = 0;
+            mMapIsInside = 0;
         }
     } else {
-        field_0x2d = 0;
+        mMapIsInside = 0;
     }
 
-    if (field_0x2d != 0) {
-        field_0x2d = 1;
-        field_0x28 = getDispPosInside_OffsetX();
+    if (mMapIsInside != 0) {
+        mMapIsInside = 1;
+        mSlidePositionOffset = getDispPosInside_OffsetX();
         dMeter2Info_setMapStatus(1);
     } else {
-        field_0x2d = 0;
-        field_0x28 = getDispPosOutSide_OffsetX();
+        mMapIsInside = 0;
+        mSlidePositionOffset = getDispPosOutSide_OffsetX();
         dMeter2Info_setMapStatus(0);
     }
 
     field_0x2e = 0;
-    field_0x28 = 0;
+    mSlidePositionOffset = 0;
     field_0x30 = 0;
                  /* dSv_event_flag_c::M_085 - Twilight Hyrule Field - Midna dialogue right before Boss Bug's Tear of Light appears */
     field_0x2b = dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[118]);
 }
 
 void dMeterMap_c::setDispPosOutSide() {
-    field_0x2d = 0;
-    field_0x28 = getDispPosOutSide_OffsetX();
+    mMapIsInside = 0;
+    mSlidePositionOffset = getDispPosOutSide_OffsetX();
 }
 
 void dMeterMap_c::setDispPosInSide() {
-    field_0x2d = 1;
-    field_0x28 = getDispPosInside_OffsetX();
+    mMapIsInside = 1;
+    mSlidePositionOffset = getDispPosInside_OffsetX();
 }
 
 void dMeterMap_c::_delete() {
@@ -506,7 +506,7 @@ void dMeterMap_c::_delete() {
     }
 
     if (isEnableDispMapAndMapDispSizeTypeNo()) {
-        if (field_0x2d != 0) {
+        if (mMapIsInside != 0) {
             dComIfGp_mapShow();
         } else {
             dComIfGp_mapHide();
@@ -548,16 +548,16 @@ void dMeterMap_c::_move(u32 param_0) {
         ctrlShowMap();
     }
 
-    if (field_0x2d != 0) {
-        if (field_0x28 != getDispPosInside_OffsetX()) {
-            if (!cLib_addCalcAngleS(&field_0x28, getDispPosInside_OffsetX(), 2, 60, 10)) {
+    if (mMapIsInside != 0) {
+        if (mSlidePositionOffset != getDispPosInside_OffsetX()) {
+            if (!cLib_addCalcAngleS(&mSlidePositionOffset, getDispPosInside_OffsetX(), 2, 60, 10)) {
                 #if DEBUG
                 cLib_checkBit<u8>((int)field_0x2e, 4);
                 #endif
             }
         }
     } else {
-        cLib_addCalcAngleS(&field_0x28, getDispPosOutSide_OffsetX(), 2, 60, 10);
+        cLib_addCalcAngleS(&mSlidePositionOffset, getDispPosOutSide_OffsetX(), 2, 60, 10);
     }
 
     Vec map_pos = dMapInfo_n::getMapPlayerPos();
@@ -579,8 +579,8 @@ void dMeterMap_c::_move(u32 param_0) {
     mSizeH = (s16)sizeH;
     #endif
 
-    field_0x18 = field_0x28 + getMapDispEdgeLeftX_Layout();
-    field_0x1c = getMapDispEdgeBottomY_Layout() - mSizeH;
+    mDrawPosX = mSlidePositionOffset + getMapDispEdgeLeftX_Layout();
+    mDrawPosY = getMapDispEdgeBottomY_Layout() - mSizeH;
 
     mMap->_move(map_pos.x, map_pos.z, stayNo, map_pos.y);
     field_0x30 = dComIfGp_event_runCheck();
@@ -609,8 +609,8 @@ void dMeterMap_c::draw() {
         graf->setup2D();
         f32 sizeX = mSizeW;
         f32 sizeY = mSizeH;
-        f32 tmp2 = field_0x18;
-        f32 tmp3 = field_0x1c;
+        f32 drawPosX = mDrawPosX;
+        f32 drawPosY = mDrawPosY;
 
         u8 alpha = mMapAlpha;
         #if DEBUG
@@ -620,7 +620,7 @@ void dMeterMap_c::draw() {
         #endif
         mMapJ2DPicture->setAlpha(alpha);
 
-        mMapJ2DPicture->draw(tmp2, tmp3, sizeX, sizeY, false, false, false);
+        mMapJ2DPicture->draw(drawPosX, drawPosY, sizeX, sizeY, false, false, false);
         mMapJ2DPicture->calcMtx();
     }
 }
@@ -640,7 +640,7 @@ void dMeterMap_c::ctrlShowMap() {
             dMeter2Info_getPauseStatus() == 2 || dMeter2Info_getPauseStatus() == 6)
         {
             #if !DEBUG
-            if (dMeter2Info_getMapStatus() == 0 && field_0x2d == 0) {
+            if (dMeter2Info_getMapStatus() == 0 && mMapIsInside == 0) {
                 setDispPosInsideFlg_SE_On();
                 Z2GetAudioMgr()->seStart(Z2SE_SY_MAP_OPEN_S, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
                                             -1.0f, 0);
@@ -653,7 +653,7 @@ void dMeterMap_c::ctrlShowMap() {
             #if DEBUG
                 dMeter2Info_getMapStatus() == 0 &&
             #else
-                dMeter2Info_getMapStatus() == 1 && field_0x2d != 0 &&
+                dMeter2Info_getMapStatus() == 1 && mMapIsInside != 0 &&
             #endif
                 isFmapScreen()
             ) {
@@ -690,7 +690,7 @@ void dMeterMap_c::ctrlShowMap() {
             dMeter2Info_resetPauseStatus();
             if (isDmapScreen()) {
                 #if !DEBUG
-                if (dMeter2Info_getMapStatus() == 0 && field_0x2d == 0) {
+                if (dMeter2Info_getMapStatus() == 0 && mMapIsInside == 0) {
                     setDispPosInsideFlg_SE_On();
                     Z2GetAudioMgr()->seStart(Z2SE_SY_MAP_OPEN_S, NULL, 0, 0, 1.0f, 1.0f,
                                                 -1.0f, -1.0f, 0);
@@ -703,7 +703,7 @@ void dMeterMap_c::ctrlShowMap() {
                 #if DEBUG
                     dMeter2Info_getMapStatus() == 0
                 #else
-                    dMeter2Info_getMapStatus() == 1 && field_0x2d != 0
+                    dMeter2Info_getMapStatus() == 1 && mMapIsInside != 0
                 #endif
                 ) {
                     dMeter2Info_setMapStatus(6);