Cleanup, improve readability of conditionals

6 files changed, 735 insertions, 608 deletions

diff --git a/src/d/actor/d_a_btd.cpp b/src/d/actor/d_a_btd.cpp
index 03e69355..aedddf98 100644
--- a/src/d/actor/d_a_btd.cpp
+++ b/src/d/actor/d_a_btd.cpp
@@ -2714,9 +2714,10 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
     i_this->mpDeadHeadMorf = new mDoExt_McaMorf(
         (J3DModelData*)dComIfG_getObjectRes("Btd", BTD_BMD_NAMAKUBI), NULL, NULL, NULL, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 0, NULL, 0, 0x11020203
     );
-    if ((i_this->mpDeadHeadMorf == NULL) || (pModel = i_this->mpDeadHeadMorf->getModel(), pModel == NULL)) {
+    if ((i_this->mpDeadHeadMorf == NULL) || (i_this->mpDeadHeadMorf->getModel() == NULL)) {
         return FALSE;
     }
+    pModel = i_this->mpDeadHeadMorf->getModel();
     i_this->mpDeadHeadBtkAnm = new mDoExt_btkAnm();
     if (i_this->mpDeadHeadBtkAnm == NULL) {
         return FALSE;
diff --git a/src/d/actor/d_a_door10.cpp b/src/d/actor/d_a_door10.cpp
index 0338e377..fb4e5a56 100644
--- a/src/d/actor/d_a_door10.cpp
+++ b/src/d/actor/d_a_door10.cpp
@@ -511,16 +511,25 @@ cPhs_State daDoor10_c::create() {
     }
 
     cPhs_State ret;
-    if (m364 != 0 && (ret = dComIfG_resLoad(&mPhase, "DoorBs")) != cPhs_COMPLEATE_e) {
-        return ret;
+    if (m364 != 0) {
+        ret = dComIfG_resLoad(&mPhase, "DoorBs");
+        if (ret != cPhs_COMPLEATE_e) {
+            return ret;
+        }
     }
 
-    if (chkMakeKey() && (ret = mKeyLock.keyResLoad()) != cPhs_COMPLEATE_e) {
-        return ret;
+    if (chkMakeKey()) {
+        ret = mKeyLock.keyResLoad();
+        if (ret != cPhs_COMPLEATE_e) {
+            return ret;
+        }
     }
 
-    if (mHkyo.chkUse() && (ret = mHkyo.resLoad()) != cPhs_COMPLEATE_e) {
-        return ret;
+    if (mHkyo.chkUse()) {
+        ret = mHkyo.resLoad();
+        if (ret != cPhs_COMPLEATE_e) {
+            return ret;
+        }
     }
 
     fopAcM_SetRoomNo(this, getFRoomNo());
diff --git a/src/d/actor/d_a_ki.cpp b/src/d/actor/d_a_ki.cpp
index 1ef5e415..5fc82513 100644
--- a/src/d/actor/d_a_ki.cpp
+++ b/src/d/actor/d_a_ki.cpp
@@ -1219,6 +1219,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
 #if VERSION == VERSION_DEMO
         model = i_this->mpMorf->getModel();
 #else
+        // Fakematch?
         if (i_this->mpMorf == NULL || (model = i_this->mpMorf->getModel()) == NULL) {
             return FALSE;
         }
diff --git a/src/d/actor/d_a_mo2.cpp b/src/d/actor/d_a_mo2.cpp
index 3d4f1348..bdbee65b 100644
--- a/src/d/actor/d_a_mo2.cpp
+++ b/src/d/actor/d_a_mo2.cpp
@@ -171,7 +171,7 @@ static void yari_off_check(mo2_class* i_this) {
     }
     if (i_this->mbThrowWeapon != 0) {
         daBoko_c* boko = (daBoko_c*)fopAcM_SearchByID(i_this->mWeaponPcId);
-        if ((boko != NULL) && (i_this->mSpawnWeaponActorMode != 2)) {
+        if (boko != NULL && i_this->mSpawnWeaponActorMode != 2) {
             boko->setRotAngleSpeed(cM_rndFX(2000.0f));
             s16 angleY = actor->shape_angle.y + 0x8000 + (s16)cM_rndFX(8000.0f);
             f32 speedY = 20.0f + cM_rndF(10.0f);
@@ -414,7 +414,7 @@ static BOOL nodeCallBack_P(J3DNode* node, int calcTiming) {
                 cXyz cStack_c8;
                 for (s32 i = 0; i < 16; i++) {
                     MtxPush();
-                    offset.x = (0.25f * (460.0f + (2.0f * (3.5f * (i)) - 28.0f))) - 10.0f;
+                    offset.x = (0.25f * (460.0f + (2.0f * (3.5f * i) - 28.0f))) - 10.0f;
                     MtxRotX(0.73919827f * i, 0);
                     MtxPosition(&offset, &cStack_c8);
                     MtxPull();
@@ -690,7 +690,7 @@ static BOOL daMo2_Draw(mo2_class* i_this) {
         shape->show();
     }
     shape = model->getModelData()->getMaterialNodePointer(0x00)->getShape();
-    if ((REG17_S(1) != 0) || (i_this->m2951 != 0)) {
+    if (REG17_S(1) != 0 || i_this->m2951 != 0) {
         shape->hide();
     } else {
         shape->show();
@@ -703,7 +703,7 @@ static BOOL daMo2_Draw(mo2_class* i_this) {
     if (i_this->mMode != 100) {
         i_this->m02C8.remove(model->getModelData());
     }
-    if ((i_this->mbHasInnateWeapon == 1) && (l_mo2HIO.m020 <= 1)) {
+    if (i_this->mbHasInnateWeapon == 1 && l_mo2HIO.m020 <= 1) {
         ke_disp(i_this);
     }
     daMo2_shadowDraw(i_this);
@@ -915,7 +915,7 @@ static fopAc_ac_c* search_bomb(mo2_class* i_this, int r26) {
             sp28.y = 50.0f + r24->current.pos.y - actor->eyePos.y;
             sp28.z = r24->current.pos.z - actor->current.pos.z;
             f32 f0 = std::sqrtf(SQUARE(sp28.x) + SQUARE(sp28.z));
-            if (f0 < f29 && !(f0 > 30.0f + i_this->m05C0) && !(daMo2_other_bg_check(i_this, r24) && r26)) {
+            if (f0 < f29 && !(f0 > 30.0f + i_this->m05C0) && (!daMo2_other_bg_check(i_this, r24) || !r26)) {
                 if (r26) {
                     if (std::fabsf(r24->current.pos.y + 50.0f - actor->eyePos.y) <= l_mo2HIO.m03C) {
                         s16 angleDiff = i_this->m05D4 - cM_atan2s(sp28.x, sp28.z);
@@ -959,7 +959,7 @@ static s32 daMo2_wepon_view_check(mo2_class* i_this) {
         return FALSE;
     }
     i_this->mWeaponPcId = search_wepon(i_this);
-    if ((i_this->mWeaponPcId != fpcM_ERROR_PROCESS_ID_e) && (fopAcM_SearchByID(i_this->mWeaponPcId) != NULL)) {
+    if (i_this->mWeaponPcId != fpcM_ERROR_PROCESS_ID_e && fopAcM_SearchByID(i_this->mWeaponPcId) != NULL) {
         return TRUE;
     }
     return FALSE;
@@ -1062,7 +1062,7 @@ static s32 daMo2_player_way_check(mo2_class* i_this) {
 
 /* 00003F04-00004040       .text wait_set__FP9mo2_class */
 static void wait_set(mo2_class* i_this) {
-    if ((i_this->mbHasInnateWeapon != 0) || (i_this->m2943 != 0)) {
+    if (i_this->mbHasInnateWeapon != 0 || i_this->m2943 != 0) {
         if (i_this->mMode == 1) {
             anm_init(i_this, MO2_BCK_KWAIT, 15.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, MO2_BAS_KWAIT);
             i_this->m05A4[1] = cM_rndF(100.0f) + 100.0f;
@@ -1113,7 +1113,7 @@ static void path_check(mo2_class* i_this) {
     cXyz local_c8;
     cXyz local_d4;
 
-    if ((i_this->ppd != NULL) && (i_this->mbHasInnateWeapon != 0 || (i_this->m2943 != 0))) {
+    if (i_this->ppd != NULL && (i_this->mbHasInnateWeapon != 0 || i_this->m2943 != 0)) {
         dBgS_LinChk chk;
         local_c8 = actor->current.pos;
         local_c8.y += REG13_F(0) + 10.0f;
@@ -1201,7 +1201,7 @@ static void attack_set(mo2_class* i_this, u8 param_2) {
     dVar7 = cM_rndF(100.0f);
     i_this->mWeaponSph.SetR(100.0f);
     if (i_this->mbHasInnateWeapon != 0) {
-        if (((player->checkPlayerGuard()) && (cM_rndF(1.0f) < 0.5f)) && (param_2 == 0)) {
+        if (player->checkPlayerGuard() && cM_rndF(1.0f) < 0.5f && param_2 == 0) {
             i_this->m2060 = 3;
             i_this->m206C = 9.0f;
             i_this->m2070 = 16.0f;
@@ -1326,7 +1326,7 @@ static void jyunkai(mo2_class* i_this) {
         case -1:
             {
                 i_this->mDamageReaction.mMode = 1;
-                if ((i_this->mbHasInnateWeapon != 0) || (i_this->m2943 != 0)) {
+                if (i_this->mbHasInnateWeapon != 0 || i_this->m2943 != 0) {
                     if (i_this->m2968 != 0) {
                         i_this->m2969 = i_this->m2969 + i_this->mHasPath;
                         if (i_this->m2969 >= (s8)i_this->ppd->m_num) {
@@ -1360,7 +1360,7 @@ static void jyunkai(mo2_class* i_this) {
             }
         case 1:
             {
-                if ((i_this->mbHasInnateWeapon != 0) || (i_this->m2943 != 0)) {
+                if (i_this->mbHasInnateWeapon != 0 || i_this->m2943 != 0) {
                     maxSpeed = 0x400;
                     dVar12 = l_mo2HIO.m050;
                 } else {
@@ -1370,12 +1370,12 @@ static void jyunkai(mo2_class* i_this) {
                 local_3c.x = i_this->m05C4.x - actor->current.pos.x;
                 local_3c.z = i_this->m05C4.z - actor->current.pos.z;
                 i_this->mDamageReaction.m4D0 = cM_atan2s(local_3c.x, local_3c.z);
-                if ((i_this->m2968 != 0) && (i_this->mbHasInnateWeapon != 0 || (i_this->m2943 != 0))) {
+                if (i_this->m2968 != 0 && (i_this->mbHasInnateWeapon != 0 || i_this->m2943 != 0)) {
                     fVar13 = std::sqrtf(SQUARE(local_3c.x) + SQUARE(local_3c.z));
                     if (fVar13 < (dVar12 * 0.25f) * 15.0f) {
                         dPnt* point = i_this->ppd->m_points;
                         point = &point[i_this->m2969];
-                        if (((point->mArg3 == 3) || (point->mArg3 == 7)) || (point->mArg3 == 8)) {
+                        if (point->mArg3 == 3 || point->mArg3 == 7 || point->mArg3 == 8) {
                             wait_set(i_this);
                             if (point->mArg3 >= 7) {
                                 i_this->m05A4[1] = cM_rndF(80.0f) + 70.0f;
@@ -1386,7 +1386,7 @@ static void jyunkai(mo2_class* i_this) {
                         }
                     }
                     path_check2(i_this);
-                    if (((i_this->mCoCyl.ChkCoHit()) || (i_this->mDamageReaction.mAcch.ChkWallHit())) && (i_this->m05A4[2] == 0)) {
+                    if ((i_this->mCoCyl.ChkCoHit() || i_this->mDamageReaction.mAcch.ChkWallHit()) && i_this->m05A4[2] == 0) {
                         wait_set(i_this);
                         i_this->m05A4[1] = cM_rndF(80.0f) + 70.0f;
                         i_this->mHasPath *= -1;
@@ -1394,8 +1394,9 @@ static void jyunkai(mo2_class* i_this) {
                     }
                 } else {
                     fVar13 = std::sqrtf(SQUARE(local_3c.x) + SQUARE(local_3c.z));
-                    if ((fVar13 < (dVar12 * 0.25f) * 2.0f) || (i_this->m05A4[2] == 0 && ((i_this->mDamageReaction.mAcch.ChkWallHit()) ||
-                                                                                         (ground_4_check(i_this, 1, actor->current.angle.y, 200.0f)))))
+                    if ((fVar13 < dVar12 * 0.25f * 2.0f) ||
+                        (i_this->m05A4[2] == 0 &&
+                            (i_this->mDamageReaction.mAcch.ChkWallHit() || ground_4_check(i_this, 1, actor->current.angle.y, 200.0f))))
                     {
                         wait_set(i_this);
                         i_this->mDamageReaction.mMode = 2;
@@ -1409,10 +1410,10 @@ static void jyunkai(mo2_class* i_this) {
             {
                 actor->speedF = 0.0f;
                 if (i_this->m05A4[1] == 0) {
-                    if ((i_this->m2968 != 0) && (i_this->mbHasInnateWeapon != 0 || (i_this->m2943 != 0))) {
+                    if (i_this->m2968 != 0 && (i_this->mbHasInnateWeapon != 0 || i_this->m2943 != 0)) {
                         dPnt* point = i_this->ppd->m_points;
                         point = &point[i_this->m2969];
-                        if ((point->mArg3 == 7) || (point->mArg3 == 8)) {
+                        if (point->mArg3 == 7 || point->mArg3 == 8) {
                             i_this->mDamageReaction.mMode = 4;
                             i_this->m05A4[1] = cM_rndF(100.0f) + 100.0f;
                             anm_init(i_this, MO2_BCK_KKEIKAI, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, MO2_BAS_KKEIKAI);
@@ -1425,10 +1426,10 @@ static void jyunkai(mo2_class* i_this) {
                         }
                     }
                     i_this->mDamageReaction.mMode = 0;
-                    if ((i_this->mPathIndex != 0xFF) && (i_this->m2968 == 0)) {
+                    if (i_this->mPathIndex != 0xFF && i_this->m2968 == 0) {
                         path_check(i_this);
                     }
-                    if (((i_this->mbHasInnateWeapon == 0) && (i_this->m2943 == 0)) && (i_this->m05AE == 0)) {
+                    if (i_this->mbHasInnateWeapon == 0 && i_this->m2943 == 0 && i_this->m05AE == 0) {
                         i_this->m2943 = 1;
                     }
                 }
@@ -1441,20 +1442,23 @@ static void jyunkai(mo2_class* i_this) {
             {
                 actor->speedF = 0.0f;
                 int frame = i_this->mpMorf->getFrame();
-                if ((frame == 3) || (frame == 0x35)) {
+                if (frame == 3 || frame == 0x35) {
                     fopAcM_monsSeStart(actor, JA_SE_CV_MO_SEARCH, 0);
                 }
-                if (((i_this->m05A4[1] == 0) && (i_this->mDamageReaction.mMode = 0, i_this->mPathIndex != 0xFF)) && (i_this->m2968 == 0)) {
-                    path_check(i_this);
+                if (i_this->m05A4[1] == 0) {
+                    i_this->mDamageReaction.mMode = 0;
+                    if (i_this->mPathIndex != 0xFF && i_this->m2968 == 0) {
+                        path_check(i_this);
+                    }
                 }
                 break;
             }
     }
     int iVar6 = fopAcM_otoCheck(actor, 1000.0f);
     iVar6 += search_sp;
-    if ((i_this->mbHasInnateWeapon != 0) || (i_this->m2943 != 0)) {
-        if ((iVar6 != 0) ||
-            (i_this->m05C0 < l_mo2HIO.m02C && (daMo2_player_view_check(i_this, &i_this->mDamageReaction.m714->current.pos, i_this->m05D6, l_mo2HIO.m038) != 0)))
+    if (i_this->mbHasInnateWeapon != 0 || i_this->m2943 != 0) {
+        if (iVar6 != 0 ||
+            (i_this->m05C0 < l_mo2HIO.m02C && daMo2_player_view_check(i_this, &i_this->mDamageReaction.m714->current.pos, i_this->m05D6, l_mo2HIO.m038) != 0))
         {
             if (i_this->mMode == 1) {
                 i_this->mDamageReaction.mAction = ACTION_NAGE;
@@ -1475,13 +1479,13 @@ static void jyunkai(mo2_class* i_this) {
             }
             fopAcM_monsSeStart(actor, JA_SE_CV_MO_FIND_ENEMY, 0);
         }
-    } else if ((i_this->m2943 == 0) && (i_this->mDamageReaction.mMode == 2)) {
+    } else if (i_this->m2943 == 0 && i_this->mDamageReaction.mMode == 2) {
         int frame = i_this->mpMorf->getFrame();
-        if (((frame == 0xb) || (frame == 0x19)) && (cM_rndF(1.0f) < 0.5f)) {
+        if ((frame == 0xb || frame == 0x19) && cM_rndF(1.0f) < 0.5f) {
             fopAcM_monsSeStart(actor, JA_SE_CV_MO_LOSE_LANCE, 0);
         }
     }
-    if ((i_this->mbHasInnateWeapon == 0) && (daMo2_wepon_view_check(i_this))) {
+    if (i_this->mbHasInnateWeapon == 0 && daMo2_wepon_view_check(i_this)) {
         i_this->mDamageReaction.mAction = ACTION_WEPON_SEARCH;
         i_this->mDamageReaction.mMode = -1;
     }
@@ -1502,7 +1506,7 @@ static void fight_run(mo2_class* i_this) {
 
     dVar9 = g_mDoCPd_cpadInfo[0].mMainStickPosX;
     i_this->mDamageReaction.m4D0 = i_this->m05D6;
-    if ((i_this->m05B0 == 0) && (i_this->mDamageReaction.mMode != 0)) {
+    if (i_this->m05B0 == 0 && i_this->mDamageReaction.mMode != 0) {
         maxSpeed = 0x400;
         if (i_this->mDamageReaction.mMode == 1) {
             maxSpeed = 0x800;
@@ -1526,7 +1530,7 @@ static void fight_run(mo2_class* i_this) {
                 i_this->m05F0 = l_mo2HIO.m024 + 4;
                 i_this->m05F2 = 4;
             } else {
-                if ((i_this->mbHasInnateWeapon != 0) || (i_this->m2943 != 0)) {
+                if (i_this->mbHasInnateWeapon != 0 || i_this->m2943 != 0) {
                     target = l_mo2HIO.m058;
                 } else {
                     target = l_mo2HIO.m05C;
@@ -1544,19 +1548,19 @@ static void fight_run(mo2_class* i_this) {
                     i_this->m05B0 = 0;
                     fight_run_set(i_this);
                 }
-                if ((i_this->m05B0 == 0) && (i_this->m05C0 < l_mo2HIO.m030)) {
+                if (i_this->m05B0 == 0 && i_this->m05C0 < l_mo2HIO.m030) {
                     i_this->mDamageReaction.mMode = 2;
                     i_this->m05A4[4] = 0x32;
                 }
             } else {
-                if ((i_this->m2964 == 0) && (i_this->mbHasInnateWeapon != 0)) {
+                if (i_this->m2964 == 0 && i_this->mbHasInnateWeapon != 0) {
                     i_this->m2964 = 1;
                     anm_init(i_this, MO2_BCK_DASH, 5.0f, J3DFrameCtrl::EMode_LOOP, l_mo2HIO.m070, MO2_BAS_DASH);
                 }
                 if (i_this->m2964 != 0) {
                     i_this->m2964 = i_this->m2964 + 1;
                 }
-                if ((i_this->m05B0 == 0) && (i_this->m05C0 < l_mo2HIO.m034)) {
+                if (i_this->m05B0 == 0 && i_this->m05C0 < l_mo2HIO.m034) {
                     i_this->mDamageReaction.mAction = ACTION_FIGHT;
                     i_this->mDamageReaction.mMode = 0;
                     return;
@@ -1565,13 +1569,13 @@ static void fight_run(mo2_class* i_this) {
             break;
         case 2:
             i_this->m2964 = 0;
-            if ((cM_rndF(1.0f) < 0.3f) && (i_this->mbHasInnateWeapon == 0)) {
+            if (cM_rndF(1.0f) < 0.3f && i_this->mbHasInnateWeapon == 0) {
                 i_this->mDamageReaction.mMode = 8;
                 wait_set(i_this);
                 i_this->m05A4[1] = cM_rndF(20.0f) + 20.0f;
             } else {
                 if (std::fabsf(dVar9) > 0.1f) {
-                    if ((i_this->mbHasInnateWeapon != 0) || (i_this->m2943 != 0)) {
+                    if (i_this->mbHasInnateWeapon != 0 || i_this->m2943 != 0) {
                         anm_init(i_this, MO2_BCK_BWALKLR, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, MO2_BAS_BWALKLR);
                     } else {
                         anm_init(i_this, MO2_BCK_NBWALKLR, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, MO2_BAS_NBWALKLR);
@@ -1583,14 +1587,14 @@ static void fight_run(mo2_class* i_this) {
                     }
                 } else {
                     if (i_this->m05C0 < l_mo2HIO.m034) {
-                        if ((i_this->mbHasInnateWeapon != 0) || (i_this->m2943 != 0)) {
+                        if (i_this->mbHasInnateWeapon != 0 || i_this->m2943 != 0) {
                             anm_init(i_this, MO2_BCK_BWALKFB, 10.0f, J3DFrameCtrl::EMode_LOOP, -1.0f, MO2_BAS_BWALKFB);
                         } else {
                             anm_init(i_this, MO2_BCK_NBWALKFB, 10.0f, J3DFrameCtrl::EMode_LOOP, -1.0f, MO2_BAS_NBWALKFB);
                         }
                         i_this->mDamageReaction.mMode = 4;
                     } else {
-                        if ((i_this->mbHasInnateWeapon != 0) || (i_this->m2943 != 0)) {
+                        if (i_this->mbHasInnateWeapon != 0 || i_this->m2943 != 0) {
                             anm_init(i_this, MO2_BCK_BWALKFB, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, MO2_BAS_BWALKFB);
                         } else {
                             anm_init(i_this, MO2_BCK_NBWALKFB, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, MO2_BAS_NBWALKFB);
@@ -1598,7 +1602,7 @@ static void fight_run(mo2_class* i_this) {
                         i_this->mDamageReaction.mMode = 3;
                     }
                 }
-                i_this->m05A4[1] = (s16)(int)(cM_rndF(20.0f) + 20.0f);
+                i_this->m05A4[1] = (s16)(cM_rndF(20.0f) + 20.0f);
             }
             break;
         case 3:
@@ -1615,7 +1619,7 @@ static void fight_run(mo2_class* i_this) {
                 }
             } else {
                 i_this->mDamageReaction.mMode = 3;
-                if ((i_this->mbHasInnateWeapon != 0) || (i_this->m2943 != 0)) {
+                if (i_this->mbHasInnateWeapon != 0 || i_this->m2943 != 0) {
                     anm_init(i_this, MO2_BCK_BWALKFB, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, MO2_BAS_BWALKFB);
                 } else {
                     anm_init(i_this, MO2_BCK_NBWALKFB, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, MO2_BAS_NBWALKFB);
@@ -1649,14 +1653,14 @@ static void fight_run(mo2_class* i_this) {
                 i_this->mDamageReaction.mMode = 2;
             }
     }
-    if ((i_this->mDamageReaction.mMode >= 3) && (i_this->m05BA <= 2)) {
+    if (i_this->mDamageReaction.mMode >= 3 && i_this->m05BA <= 2) {
         if (i_this->m05C0 > l_mo2HIO.m030 + 75.0f) {
             i_this->mDamageReaction.mAction = ACTION_JYUNKAI;
             path_check(i_this);
             wait_set(i_this);
             i_this->mDamageReaction.mMode = 0;
         }
-        if (((i_this->m05C0 < l_mo2HIO.m034 + 62.5f) && (i_this->m05C0 > l_mo2HIO.m034 - 62.5f)) && (i_this->m05A4[4] == 0)) {
+        if (((i_this->m05C0 < l_mo2HIO.m034 + 62.5f) && (i_this->m05C0 > l_mo2HIO.m034 - 62.5f)) && i_this->m05A4[4] == 0) {
             i_this->m05A4[4] = l_mo2HIO.m074;
             if (cM_rndF(100.0f) < l_mo2HIO.m078) {
                 i_this->mDamageReaction.mAction = ACTION_FIGHT;
@@ -1665,19 +1669,19 @@ static void fight_run(mo2_class* i_this) {
         }
         if (i_this->m05B6 == 0) {
             dAttention_c& attention = dComIfGp_getAttention();
-            if ((i_this->mbHasInnateWeapon != 0) && (player->getCutType() != 0 && ((cc_pl_cut_bit_get() & i_this->m2960) != 0))) {
-                if ((attention.Lockon()) && (actor == attention.LockonTarget(0))) {
+            if (i_this->mbHasInnateWeapon != 0 && (player->getCutType() != 0 && ((cc_pl_cut_bit_get() & i_this->m2960) != 0))) {
+                if (attention.Lockon() && actor == attention.LockonTarget(0)) {
                     i_this->mDamageReaction.mAction = ACTION_DEFENCE;
                     i_this->mDamageReaction.mMode = 0;
                 }
             }
         }
     }
-    if (((i_this->mbHasInnateWeapon != 0) && (i_this->m05C0 < l_mo2HIO.m034 - 62.5f)) &&
-        (daMo2_player_view_check(i_this, &i_this->mDamageReaction.m714->current.pos, i_this->m05D6, l_mo2HIO.m038)))
+    if ((i_this->mbHasInnateWeapon != 0 && (i_this->m05C0 < l_mo2HIO.m034 - 62.5f)) &&
+        daMo2_player_view_check(i_this, &i_this->mDamageReaction.m714->current.pos, i_this->m05D6, l_mo2HIO.m038))
     {
         i_this->m05A0++;
-        if ((i_this->m05A0 >= 0xF) && (cM_rndF(1.0f) < 0.5f)) {
+        if (i_this->m05A0 >= 0xF && cM_rndF(1.0f) < 0.5f) {
             i_this->m05A0 = 0;
             i_this->mDamageReaction.mAction = ACTION_OSHI;
             i_this->mDamageReaction.mMode = 0;
@@ -1691,7 +1695,7 @@ static void fight_run(mo2_class* i_this) {
         wait_set(i_this);
         i_this->mDamageReaction.mMode = -10;
     }
-    if ((i_this->mbHasInnateWeapon == 0) && (daMo2_wepon_view_check(i_this))) {
+    if (i_this->mbHasInnateWeapon == 0 && daMo2_wepon_view_check(i_this)) {
         i_this->mDamageReaction.mAction = ACTION_WEPON_SEARCH;
         i_this->mDamageReaction.mMode = -1;
     }
@@ -1746,7 +1750,7 @@ static fopAc_ac_c* yari_hit_check(mo2_class* i_this) {
     }
     if (i_this->m2060 == 5) {
         i_this->m2904 = i_this->m28F8;
-    } else if ((i_this->m2060 == 3) || (i_this->m2060 == 4)) {
+    } else if (i_this->m2060 == 3 || i_this->m2060 == 4) {
         i_this->m2904 = i_this->m28EC;
     } else {
         i_this->m2904 = i_this->m28D4;
@@ -1757,7 +1761,7 @@ static fopAc_ac_c* yari_hit_check(mo2_class* i_this) {
         i_this->m207C--;
         return NULL;
     }
-    if ((i_this->m2068 < i_this->m206C) || (i_this->m2068 > i_this->m2070)) {
+    if (i_this->m2068 < i_this->m206C || i_this->m2068 > i_this->m2070) {
         return NULL;
     }
     i_this->m2940 <<= 1;
@@ -1765,7 +1769,7 @@ static fopAc_ac_c* yari_hit_check(mo2_class* i_this) {
     i_this->mWeapon2Sph.SetAtSpl(mo2_at_kind[i_this->m2060]);
     i_this->mWeaponSph.SetAtSe(mo2_at_sm_kind[i_this->m2060]);
     i_this->mWeapon2Sph.SetAtSe(mo2_at_sm_kind[i_this->m2060]);
-    if ((i_this->m2060 == 2) || (i_this->m2060 == 1) || (i_this->m2060 == 5)) {
+    if (i_this->m2060 == 2 || i_this->m2060 == 1 || i_this->m2060 == 5) {
         i_this->mWeaponSph.SetAtType(AT_TYPE_UNK8);
         i_this->mWeapon2Sph.SetAtType(AT_TYPE_UNK8);
     } else {
@@ -1784,11 +1788,11 @@ static fopAc_ac_c* yari_hit_check(mo2_class* i_this) {
         i_this->mWeapon2Sph.MoveCAt(i_this->m2910);
         dComIfG_Ccsp()->Set(&i_this->mWeaponSph);
         dComIfG_Ccsp()->Set(&i_this->mWeapon2Sph);
-        if ((i_this->m2060 == 2) || (i_this->m2060 == 1)) {
+        if (i_this->m2060 == 2 || i_this->m2060 == 1) {
             dComIfG_Ccsp()->SetMass(&i_this->mWeaponSph, 3);
             dComIfG_Ccsp()->SetMass(&i_this->mWeapon2Sph, 3);
         }
-        if ((i_this->mWeaponSph.ChkAtHit()) || (i_this->mWeapon2Sph.ChkAtHit())) {
+        if (i_this->mWeaponSph.ChkAtHit() || i_this->mWeapon2Sph.ChkAtHit()) {
             if (i_this->mWeaponSph.ChkAtHit()) {
                 pcVar2 = i_this->mWeaponSph.GetAtHitObj();
             } else {
@@ -1840,9 +1844,9 @@ static void fight(mo2_class* i_this) {
             f32 r3 = info[i_this->m2064].speed;
             i_this->m2068 += r3;
             cLib_addCalc2(&actor->speedF, 0.0f, 1.0f, 20.0f);
-            if ((i_this->m2060 == 3) && (i_this->m2064 == 0)) {
+            if (i_this->m2060 == 3 && i_this->m2064 == 0) {
                 actor->speedF = 30.0f;
-            } else if ((i_this->m2060 == 5) && (i_this->m2064 == 1)) {
+            } else if (i_this->m2060 == 5 && i_this->m2064 == 1) {
                 if (i_this->m207E > 0) {
                     actor->speedF = 70.0f;
                 } else {
@@ -1851,7 +1855,7 @@ static void fight(mo2_class* i_this) {
                 i_this->m05F0 = l_mo2HIO.m024 + 3;
                 i_this->m05F2 = 4;
             }
-            if ((i_this->m2068 > i_this->m2074) && (daMo2_player_view_check(i_this, &i_this->mDamageReaction.m714->current.pos, i_this->m05D6, l_mo2HIO.m038)))
+            if (i_this->m2068 > i_this->m2074 && daMo2_player_view_check(i_this, &i_this->mDamageReaction.m714->current.pos, i_this->m05D6, l_mo2HIO.m038))
             {
                 i_this->mDamageReaction.m710 = 1;
             }
@@ -1883,23 +1887,23 @@ static void fight(mo2_class* i_this) {
                 }
             }
             if (i_this->m0594 == 0) {
-                if (((i_this->m2068 >= br_set_tm[i_this->m2060]) && (i_this->m2068 <= br_set_tm[i_this->m2060] + 2.0f)) && (i_this->m2060 == 2)) {
+                if (i_this->m2068 >= br_set_tm[i_this->m2060] && (i_this->m2068 <= br_set_tm[i_this->m2060] + 2.0f) && i_this->m2060 == 2) {
                     i_this->m05F0 = l_mo2HIO.m024 + 0x10;
                     i_this->m05F2 = 0;
                     i_this->m05EE = actor->current.angle.y + 0x2000 + REG0_S(8);
                 }
             }
-            if (((i_this->m2060 == 1) && (i_this->m2068 >= 31.0f)) && (i_this->m2068 <= 32.1f)) {
+            if (i_this->m2060 == 1 && i_this->m2068 >= 31.0f && i_this->m2068 <= 32.1f) {
                 i_this->m05F0 = l_mo2HIO.m024 + 8;
                 i_this->m05F2 = 2;
                 mDoAud_seStart(JA_SE_CM_LANCE_HIT_FLOOR, &i_this->m28D4, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor)));
             }
-            if ((i_this->m2060 == 2) && (i_this->m05A4[2] == 1)) {
+            if (i_this->m2060 == 2 && i_this->m05A4[2] == 1) {
                 i_this->m05F0 = l_mo2HIO.m024 + 4;
                 i_this->m05F2 = 4;
             }
             if (fopAcM_searchPlayerDistance(actor) < 500.0f) {
-                if ((i_this->m2068 < i_this->m2078) || (i_this->m2942 != 0)) {
+                if (i_this->m2068 < i_this->m2078 || i_this->m2942 != 0) {
                     i_this->mDamageReaction.m4D0 = i_this->m05D6;
                 }
                 cLib_addCalcAngleS2(&actor->current.angle.y, i_this->mDamageReaction.m4D0, 4, 0x800);
@@ -1958,7 +1962,7 @@ static void fight(mo2_class* i_this) {
                     } else {
                         if (i_this->m05C0 < l_mo2HIO.m030) {
                             if (daMo2_player_view_check(i_this, &i_this->mDamageReaction.m714->current.pos, i_this->m05D6, l_mo2HIO.m038)) {
-                                if ((cM_rndF(1.0f) < 0.5f) || (i_this->m207E < 0)) {
+                                if (cM_rndF(1.0f) < 0.5f || i_this->m207E < 0) {
                                     i_this->mDamageReaction.mAction = ACTION_FIGHT_RUN;
                                     i_this->mDamageReaction.mMode = 2;
                                     i_this->m05A4[1] = 0;
@@ -1966,7 +1970,7 @@ static void fight(mo2_class* i_this) {
                                     i_this->mDamageReaction.mMode = 0;
                                 }
                             } else {
-                                if ((i_this->mbHasInnateWeapon != 0) || (i_this->m2943 != 0)) {
+                                if (i_this->mbHasInnateWeapon != 0 || i_this->m2943 != 0) {
                                     i_this->mDamageReaction.mAction = ACTION_P_LOST;
                                     i_this->mDamageReaction.mMode = 0;
                                     i_this->m05A4[1] = 0;
@@ -2020,8 +2024,8 @@ static void nage(mo2_class* i_this) {
                 i_this->m2A48 = 1;
                 break;
             }
-            if (((i_this->m05B4 != 0) || (i_this->m2A0C != 0)) ||
-                (daMo2_player_view_check(i_this, &i_this->mDamageReaction.m714->current.pos, i_this->m05D6, l_mo2HIO.m038)))
+            if (i_this->m05B4 != 0 || i_this->m2A0C != 0 ||
+                daMo2_player_view_check(i_this, &i_this->mDamageReaction.m714->current.pos, i_this->m05D6, l_mo2HIO.m038))
             {
                 i_this->m05A4[1] = l_mo2HIO.m00A + l_mo2HIO.m00C;
                 i_this->m05A4[2] = l_mo2HIO.m00C;
@@ -2038,11 +2042,11 @@ static void nage(mo2_class* i_this) {
                 break;
             }
         case -9:
-            maxSpeed = (i_this->m05A4[0] != 0) ? (s16)0 : (s16)0x1000;
+            maxSpeed = i_this->m05A4[0] != 0 ? (s16)0 : (s16)0x1000;
             if (i_this->m05A4[1] == 0) {
                 iVar5 = 2;
             } else if (
-                (i_this->m05A4[2] == 0) && (daMo2_player_view_check(i_this, &i_this->mDamageReaction.m714->current.pos, i_this->m05D6, l_mo2HIO.m038) != 0)
+                i_this->m05A4[2] == 0 && daMo2_player_view_check(i_this, &i_this->mDamageReaction.m714->current.pos, i_this->m05D6, l_mo2HIO.m038) != 0
             )
             {
                 i_this->mDamageReaction.mMode = -5;
@@ -2085,7 +2089,7 @@ static void nage(mo2_class* i_this) {
             }
     }
     cLib_addCalcAngleS2(&actor->current.angle.y, i_this->mDamageReaction.m4D0, 3, maxSpeed);
-    if ((iVar5 != 0) || (daMo2_player_bg_check(i_this, &i_this->mDamageReaction.m714->current.pos) == 1)) {
+    if (iVar5 != 0 || daMo2_player_bg_check(i_this, &i_this->mDamageReaction.m714->current.pos) == 1) {
         i_this->mDamageReaction.mAction = ACTION_JYUNKAI;
         wait_set(i_this);
         if (iVar5 == 2) {
@@ -2131,7 +2135,7 @@ static void p_lost(mo2_class* i_this) {
             break;
         case 1:
             actor->speedF = 0.0f;
-            if (((i_this->m059C & 0x1F) == 0) && (cM_rndF(1.0f) < 0.5f)) {
+            if ((i_this->m059C & 0x1F) == 0 && cM_rndF(1.0f) < 0.5f) {
                 fopAcM_monsSeStart(actor, JA_SE_CV_MO_SEARCH, 0);
             }
             if (i_this->mpMorf->isStop()) {
@@ -2142,8 +2146,8 @@ static void p_lost(mo2_class* i_this) {
                 i_this->m05A4[1] = 0;
             }
     }
-    if ((((int)i_this->mpMorf->getFrame() > 25) && (i_this->m05A4[1] == 0)) &&
-        (daMo2_player_view_check(i_this, &i_this->mDamageReaction.m714->current.pos, i_this->m05D6, l_mo2HIO.m038)))
+    if (((int)i_this->mpMorf->getFrame() > 25 && i_this->m05A4[1] == 0) &&
+        daMo2_player_view_check(i_this, &i_this->mDamageReaction.m714->current.pos, i_this->m05D6, l_mo2HIO.m038))
     {
         i_this->mDamageReaction.mAction = ACTION_FIGHT_RUN;
         i_this->mDamageReaction.mMode = 2;
@@ -2307,7 +2311,7 @@ static void hukki(mo2_class* i_this) {
                 i_this->m05F2 = 3;
             }
             if (i_this->mpMorf->isStop()) {
-                if ((!player->checkGrabWear()) && (i_this->m05C0 < l_mo2HIO.m030)) {
+                if (!player->checkGrabWear() && i_this->m05C0 < l_mo2HIO.m030) {
                     i_this->mDamageReaction.mMode = 0xe;
                     i_this->m05A4[1] = 10;
                 } else {
@@ -2462,7 +2466,7 @@ static void wepon_search(mo2_class* i_this) {
     daBoko_c* boko = (daBoko_c*)fopAcM_SearchByID(i_this->mWeaponPcId);
     f32 dVar9;
 
-    if ((i_this->mDamageReaction.mMode < 2) && (boko == NULL || (boko != NULL && fopAcM_checkCarryNow(boko)))) {
+    if (i_this->mDamageReaction.mMode < 2 && (boko == NULL || boko != NULL && fopAcM_checkCarryNow(boko))) {
         i_this->mDamageReaction.mAction = ACTION_JYUNKAI;
         path_check(i_this);
         wait_set(i_this);
@@ -2495,7 +2499,7 @@ static void wepon_search(mo2_class* i_this) {
             actor->speedF = 0.0f;
             if (i_this->m05B2 == 0) {
                 cLib_addCalcAngleS2(&actor->current.angle.y, i_this->mDamageReaction.m4D0, 2, 0x3000);
-                if ((i_this->mpMorf->isStop()) || (i_this->m05A4[1] == 0)) {
+                if (i_this->mpMorf->isStop() || i_this->m05A4[1] == 0) {
                     i_this->mDamageReaction.mMode = 1;
                     i_this->m05AE = l_mo2HIO.m08A;
                     anm_init(i_this, MO2_BCK_SWALK, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, MO2_BAS_SWALK);
@@ -2518,7 +2522,7 @@ static void wepon_search(mo2_class* i_this) {
                     anm_init(i_this, MO2_BCK_SCATCH, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, MO2_BAS_SCATCH);
                     i_this->m05A4[1] = 0x1d;
                 } else {
-                    if ((i_this->m05AE == 0) || (i_this->mDamageReaction.mAcch.ChkWallHit())) {
+                    if (i_this->m05AE == 0 || i_this->mDamageReaction.mAcch.ChkWallHit()) {
                         i_this->m02E2 = 0x46;
                         i_this->mDamageReaction.mAction = ACTION_FIGHT_RUN;
                         i_this->m05A4[1] = 0;
@@ -2531,7 +2535,7 @@ static void wepon_search(mo2_class* i_this) {
             {
                 actor->speedF = 0.0f;
                 if (i_this->m05A4[1] == 0x18) {
-                    if ((boko != NULL) && !fopAcM_checkCarryNow(boko)) {
+                    if (boko != NULL && !fopAcM_checkCarryNow(boko)) {
                         i_this->mbHasInnateWeapon = 1;
                         fopAcM_delete(boko);
                         fopAcM_seStart(actor, JA_SE_CM_LANCE_PICKUP, 0);
@@ -2548,7 +2552,7 @@ static void wepon_search(mo2_class* i_this) {
                     cLib_addCalcAngleS2(&actor->current.angle.y, i_this->mDamageReaction.m4D0, 3, 0x800);
                 }
                 if (i_this->mpMorf->isStop()) {
-                    if (((l_mo2HIO.m009 == 0) && (!player->checkGrabWear())) && (i_this->m05C0 < l_mo2HIO.m030)) {
+                    if (l_mo2HIO.m009 == 0 && !player->checkGrabWear() && i_this->m05C0 < l_mo2HIO.m030) {
                         i_this->mDamageReaction.mAction = ACTION_FIGHT;
                         i_this->m2060 = 2;
                         i_this->m2068 = REG0_F(8) + 33.0f;
@@ -2649,7 +2653,7 @@ static void d_mahi(mo2_class* i_this) {
             i_this->m05A4[0] = 100;
             // Fall-through
         case 1:
-            if ((i_this->m05A4[0] <= 0x50) && (i_this->m05A4[0] >= 0x28)) {
+            if (i_this->m05A4[0] <= 0x50 && i_this->m05A4[0] >= 0x28) {
                 if (i_this->m05A4[0] == 0x50) {
                     enemy_piyo_set(actor);
                 }
@@ -2710,8 +2714,8 @@ static void d_dozou(mo2_class* i_this) {
             }
             // Fall-through
         case 1:
-            if (((i_this->mEnableSpawnSwitch != 0xFF) && (dComIfGs_isSwitch(i_this->mEnableSpawnSwitch, fopAcM_GetRoomNo(actor)))) ||
-                (i_this->mEnableSpawnSwitch == 0xFF && (dComIfGs_isEventBit(dSv_event_flag_c::COLORS_IN_HYRULE))))
+            if ((i_this->mEnableSpawnSwitch != 0xFF && dComIfGs_isSwitch(i_this->mEnableSpawnSwitch, fopAcM_GetRoomNo(actor))) ||
+                (i_this->mEnableSpawnSwitch == 0xFF && dComIfGs_isEventBit(dSv_event_flag_c::COLORS_IN_HYRULE)))
             {
                 i_this->mpMorf->setPlaySpeed(1.0f);
                 i_this->mDamageReaction.mMode = 2;
@@ -2803,7 +2807,7 @@ static void e3_demo(mo2_class* i_this) {
         case 2:
             cLib_addCalc0(&i_this->m2A40, 0.1f, 3.0f);
             cLib_addCalc2(&actor->speedF, l_mo2HIO.m058, 1.0f, 20.0f);
-            if ((i_this->m05C0 < l_mo2HIO.m030) || (ground_4_check(i_this, 1, actor->current.angle.y, 100.0f))) {
+            if (i_this->m05C0 < l_mo2HIO.m030 || ground_4_check(i_this, 1, actor->current.angle.y, 100.0f)) {
                 i_this->mDamageReaction.mMode = 3;
                 anm_init(i_this, MO2_BCK_KNAGE, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, MO2_BAS_KNAGE);
             }
@@ -2823,7 +2827,7 @@ static void e3_demo(mo2_class* i_this) {
             }
         case 4:
             cLib_addCalc2(&actor->speedF, l_mo2HIO.m058, 1.0f, 20.0f);
-            if ((fopAcM_searchPlayerDistance(actor) < 250.0f) || (ground_4_check(i_this, 1, actor->current.angle.y, 100.0f))) {
+            if (fopAcM_searchPlayerDistance(actor) < 250.0f || ground_4_check(i_this, 1, actor->current.angle.y, 100.0f)) {
                 i_this->mDamageReaction.mMode = 5;
                 anm_init(i_this, MO2_BCK_WAITDEMO, 15.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
                 i_this->m05A4[1] = 0x1E;
@@ -2867,7 +2871,7 @@ static void Mo2_move(mo2_class* i_this) {
         }
         i_this->m02E0 = 2;
         i_this->m05B4 = 5;
-        if ((std::fabsf(i_this->mDamageReaction.m478) > 40.0f) && (!i_this->mDamageReaction.mAcch.ChkGroundHit())) {
+        if (std::fabsf(i_this->mDamageReaction.m478) > 40.0f && !i_this->mDamageReaction.mAcch.ChkGroundHit()) {
             i_this->mWeaponSph.SetC(i_this->mDamageReaction.m100[0xc]);
             i_this->mWeaponSph.SetR(60.0f);
             i_this->mWeaponSph.OffAtVsPlayerBit();
@@ -2875,7 +2879,7 @@ static void Mo2_move(mo2_class* i_this) {
             i_this->mWeaponSph.SetAtSpl(dCcG_At_Spl_UNK1);
             dComIfG_Ccsp()->Set(&i_this->mWeaponSph);
             dComIfG_Ccsp()->SetMass(&i_this->mWeaponSph, 3);
-            if ((i_this->mWeaponSph.ChkAtHit() != 0) && (actor->speed.y < -50.0f)) {
+            if (i_this->mWeaponSph.ChkAtHit() != 0 && actor->speed.y < -50.0f) {
                 actor->speed.y = 0.0f;
                 i_this->mDamageReaction.m474 = 8000.0f;
             }
@@ -2888,9 +2892,9 @@ static void Mo2_move(mo2_class* i_this) {
         } else {
             i_this->mCoCyl.OffCoSetBit();
         }
-        if ((i_this->mDamageReaction.m48A) && (i_this->mDamageReaction.m488 == 0)) {
+        if (i_this->mDamageReaction.m48A && i_this->mDamageReaction.m488 == 0) {
             if (i_this->mDamageReaction.m48A == 1) {
-                if (((i_this->mMode != 1) || (rouya_mode == 0)) && (i_this->mDamageReaction.mAction != ACTION_P_LOST || (i_this->m05A4[1] == 0))) {
+                if ((i_this->mMode != 1 || rouya_mode == 0) && (i_this->mDamageReaction.mAction != ACTION_P_LOST || i_this->m05A4[1] == 0)) {
                     i_this->mDamageReaction.mAction = ACTION_FIGHT_RUN;
                     i_this->mDamageReaction.mMode = 0;
                     i_this->m05A4[1] = 0;
@@ -2986,7 +2990,7 @@ static void Mo2_move(mo2_class* i_this) {
             local_20.x = 0.0f;
             local_20.y = 0.0f;
             local_20.z = actor->speedF;
-            if (((i_this->mDamageReaction.mAction != ACTION_HUKKI) && (i_this->mDamageReaction.mAction != ACTION_FAIL)) && (i_this->mDamageReaction.m48A == 0))
+            if (i_this->mDamageReaction.mAction != ACTION_HUKKI && i_this->mDamageReaction.mAction != ACTION_FAIL && i_this->mDamageReaction.m48A == 0)
             {
                 i_this->mDamageReaction.m482 = actor->current.angle.y;
                 cMtx_YrotS(*calc_mtx, actor->current.angle.y + i_this->m05D8);
@@ -3071,7 +3075,7 @@ static u8 damage_check(mo2_class* i_this) {
     } else {
         i_this->m2928.y = -10000.0f;
         i_this->mDefenseSph.SetR(-200.0f);
-        if ((i_this->m05B4 == 0) && (i_this->mHeadSph.ChkTgHit() || (i_this->mTgCyl.ChkTgHit()))) {
+        if (i_this->m05B4 == 0 && (i_this->mHeadSph.ChkTgHit() || i_this->mTgCyl.ChkTgHit())) {
             i_this->m05A0 = 0;
             i_this->m2944 = -1;
             i_this->m294E = 0;
@@ -3107,18 +3111,18 @@ static u8 damage_check(mo2_class* i_this) {
                 return 0;
             }
             if (atInfo.mpObj->ChkAtType(AT_TYPE_FIRE | AT_TYPE_FIRE_ARROW)) {
-                (i_this->mEnemyFire).mFireDuration = REG0_S(2) + 100;
+                i_this->mEnemyFire.mFireDuration = REG0_S(2) + 100;
                 i_this->m05B4 = 0x32;
             }
             hp = actor->health;
             at_power_check(&atInfo);
-            if ((atInfo.mResultingAttackType == 10) || (atInfo.mResultingAttackType == 0xe)) {
+            if (atInfo.mResultingAttackType == 10 || atInfo.mResultingAttackType == 0xe) {
                 actor->health = 0x14;
             }
             atInfo.mpActor = cc_at_check(actor, &atInfo);
-            if ((atInfo.mResultingAttackType == 10) || (atInfo.mResultingAttackType == 0xe)) {
+            if (atInfo.mResultingAttackType == 10 || atInfo.mResultingAttackType == 0xe) {
                 actor->health = hp;
-                if ((atInfo.mResultingAttackType == 0xe) && (i_this->m2951 == 0)) {
+                if (atInfo.mResultingAttackType == 0xe && i_this->m2951 == 0) {
                     i_this->m2951 = 1;
                     i_this->mDamageReaction.mAction = ACTION_P_LOST;
                     i_this->mDamageReaction.mMode = -10;
@@ -3170,7 +3174,7 @@ static u8 damage_check(mo2_class* i_this) {
                 cMtx_YrotS(*calc_mtx, atInfo.m0C.y);
             }
         }
-        if ((iVar11 != 0) && (i_this->mMode == 1)) {
+        if (iVar11 != 0 && i_this->mMode == 1) {
             if (rouya_mode != 0) {
                 i_this->mDamageReaction.mAction = ACTION_NAGE;
                 i_this->mDamageReaction.mMode = -10;
@@ -3247,7 +3251,7 @@ static u8 damage_check(mo2_class* i_this) {
             }
         }
         if (iVar11 != 0) {
-            if ((actor->health <= 0) && (atInfo.mbDead != 0)) {
+            if (actor->health <= 0 && atInfo.mbDead != 0) {
                 fopAcM_monsSeStart(actor, JA_SE_CV_MO_FAINTED, 0);
                 if (fopAcM_CheckStatus(actor, fopAcStts_BOSS_e)) {
                     i_this->m2A1D = 0x32;
@@ -3389,7 +3393,7 @@ static BOOL daMo2_Execute(mo2_class* i_this) {
     }
     g_env_light.settingTevStruct(TEV_TYPE_ACTOR, &actor->current.pos, &actor->tevStr);
     enemy_fire(&i_this->mEnemyFire);
-    if ((i_this->m2A4B != 0) || (i_this->m2A4C == 1)) {
+    if (i_this->m2A4B != 0 || i_this->m2A4C == 1) {
         dComIfGp_setNextStage("majroom", 0, 0, 0xFF, 0.0f, 0, 1, 0);
         return TRUE;
     }
@@ -3399,7 +3403,7 @@ static BOOL daMo2_Execute(mo2_class* i_this) {
             mDoAud_seStop(JA_SE_MAJUTOU_ALERM, 30);
         }
     }
-    if ((i_this->m2970 != 0) || (actor->home.pos.y - actor->current.pos.y > 4000.0f)) {
+    if (i_this->m2970 != 0 || (actor->home.pos.y - actor->current.pos.y > 4000.0f)) {
         fopAcM_delete(actor);
         return TRUE;
     }
@@ -3421,7 +3425,7 @@ static BOOL daMo2_Execute(mo2_class* i_this) {
             i_this->mDamageReaction.mMode = 0;
         }
     }
-    if ((i_this->mDamageReaction.mAction == ACTION_JYUNKAI) && (player->checkGrabWear())) {
+    if (i_this->mDamageReaction.mAction == ACTION_JYUNKAI && player->checkGrabWear()) {
         if (i_this->mDamageReaction.mMode < 2) {
             l_mo2HIO.m02C = REG0_F(10) + 800.0f;
         } else {
@@ -3433,7 +3437,7 @@ static BOOL daMo2_Execute(mo2_class* i_this) {
         l_mo2HIO.m04C = -200.0f;
     }
     u8 r23 = 0;
-    if (((l_mo2HIO.m006 == 0) || (CPad_CHECK_TRIG_B(0))) || (CPad_CHECK_HOLD_Y(0))) {
+    if (l_mo2HIO.m006 == 0 || CPad_CHECK_TRIG_B(0) || CPad_CHECK_HOLD_Y(0)) {
         i_this->m059C++;
         for (s32 i = 0; i < 5; i++) {
             if (i_this->m05A4[i] != 0) {
@@ -3466,7 +3470,7 @@ static BOOL daMo2_Execute(mo2_class* i_this) {
         if (i_this->m05B6 != 0) {
             i_this->m05B6--;
         }
-        if (((dComIfGs_isCollect(0, 0)) || (dComIfGs_isCollect(0, 1))) || (dComIfGs_isCollect(0, 2) || (dComIfGs_isCollect(0, 3)))) {
+        if (dComIfGs_isCollect(0, 0) || dComIfGs_isCollect(0, 1) || dComIfGs_isCollect(0, 2) || dComIfGs_isCollect(0, 3)) {
             rouya_mode = 0;
         } else {
             rouya_mode = 1;
@@ -3512,7 +3516,7 @@ static BOOL daMo2_Execute(mo2_class* i_this) {
         switch (r3) {
             case 1:
                 anm_init(i_this, MO2_BCK_PAOMUKE, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, MO2_BAS_PAOMUKE);
-                if ((i_this->mbHasInnateWeapon != 0) && ((actor->health <= 0 || (r23 >= 4)) || (cM_rndF(1.0f) < 0.5f))) {
+                if (i_this->mbHasInnateWeapon != 0 && (actor->health <= 0 || r23 >= 4 || cM_rndF(1.0f) < 0.5f)) {
                     i_this->mSpawnWeaponActor = 1;
                 }
                 i_this->mDamageReaction.mAction = ACTION_JYUNKAI;
@@ -3521,9 +3525,10 @@ static BOOL daMo2_Execute(mo2_class* i_this) {
                 anm_init(i_this, MO2_BCK_PUTSUBUSE, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, MO2_BAS_PUTSUBUSE);
                 break;
             case 5:
-                if (((i_this->mMode != 1) || (rouya_mode == 0)) &&
+                if ((i_this->mMode != 1 || rouya_mode == 0) &&
                     (i_this->mDamageReaction.mAction != ACTION_FIGHT_RUN &&
-                     ((i_this->mDamageReaction.mAction != ACTION_HUKKI && (i_this->mDamageReaction.mAction != ACTION_P_LOST)) && (i_this->m05A4[1] == 0))))
+                     i_this->mDamageReaction.mAction != ACTION_HUKKI &&
+                     i_this->mDamageReaction.mAction != ACTION_P_LOST && i_this->m05A4[1] == 0))
                 {
                     wait_set(i_this);
                     i_this->mDamageReaction.mAction = ACTION_FIGHT_RUN;
@@ -3617,7 +3622,7 @@ static BOOL daMo2_Execute(mo2_class* i_this) {
             f32 f1 = dComIfG_Bgsp()->GroundCross(&gndChk);
             if (f1 != -G_CM3D_F_INF) {
                 r22 = -cM_atan2s(f1 - pos.y, tmp.z - pos.z);
-                if ((r22 > 0x2000) || (r22 < -0x2000)) {
+                if (r22 > 0x2000 || r22 < -0x2000) {
                     r22 = 0;
                 }
             }
@@ -3628,7 +3633,7 @@ static BOOL daMo2_Execute(mo2_class* i_this) {
             f1 = dComIfG_Bgsp()->GroundCross(&gndChk);
             if (f1 != -G_CM3D_F_INF) {
                 r21 = (s16)cM_atan2s(f1 - pos.y, tmp.x - pos.x);
-                if ((r21 > 0x2000) || (r21 < -0x2000)) {
+                if (r21 > 0x2000 || r21 < -0x2000) {
                     r21 = 0;
                 }
             }
@@ -3855,7 +3860,7 @@ static BOOL createHeap(fopAc_ac_c* a_this) {
         0x00080000,
         0x37441422
     );
-    if ((i_this->mpMorf == NULL) || (i_this->mpMorf->getModel() == NULL)) {
+    if (i_this->mpMorf == NULL || i_this->mpMorf->getModel() == NULL) {
         return FALSE;
     }
     J3DModel* model = i_this->mpMorf->getModel();
@@ -4081,7 +4086,7 @@ static cPhs_State daMo2_Create(fopAc_ac_c* a_this) {
         return res2;
     }
     i_this->mMode = fopAcM_GetParam(a_this);
-    if ((i_this->mMode == 1) && (kantera_get_init(i_this) != 0)) {
+    if (i_this->mMode == 1 && kantera_get_init(i_this) != 0) {
         return cPhs_INIT_e;
     }
     a_this->gbaName = 2;
@@ -4099,11 +4104,11 @@ static cPhs_State daMo2_Create(fopAc_ac_c* a_this) {
     if (i_this->mDeathSwitch == 0xFF) {
         i_this->mDeathSwitch = 0;
     }
-    if ((i_this->mDeathSwitch != 0) && (i_this->mDeathSwitch <= 0x7F)) {
+    if (i_this->mDeathSwitch != 0 && i_this->mDeathSwitch <= 0x7F) {
         fopAcM_OnStatus(a_this, fopAcStts_BOSS_e);
         search_sp = 1;
     }
-    if (((dComIfGs_isEventBit(dSv_event_flag_c::UNK_1101)) && (i_this->mDeathSwitch != 0)) &&
+    if ((dComIfGs_isEventBit(dSv_event_flag_c::UNK_1101) && i_this->mDeathSwitch != 0) &&
         (dComIfGs_isSwitch(i_this->mDeathSwitch, fopAcM_GetRoomNo(a_this))))
     {
         return cPhs_ERROR_e;
@@ -4135,16 +4140,16 @@ static cPhs_State daMo2_Create(fopAc_ac_c* a_this) {
     i_this->mbHasInnateWeapon = 1;
     i_this->mDamageReaction.mInvincibleTimer = 5;
 #if VERSION == VERSION_DEMO
-    if (((dComIfGs_isCollect(0, 0)) || (dComIfGs_isCollect(0, 1))) || (dComIfGs_isCollect(0, 2)))
+    if (dComIfGs_isCollect(0, 0) || dComIfGs_isCollect(0, 1) || dComIfGs_isCollect(0, 2))
 #else
-    if (((dComIfGs_isCollect(0, 0)) || (dComIfGs_isCollect(0, 1))) || (dComIfGs_isCollect(0, 2) || (dComIfGs_isCollect(0, 3))))
+    if (dComIfGs_isCollect(0, 0) || dComIfGs_isCollect(0, 1) || dComIfGs_isCollect(0, 2) || dComIfGs_isCollect(0, 3))
 #endif
     {
         rouya_mode = 0;
     } else {
         rouya_mode = 1;
     }
-    if ((i_this->mMode != 1) || (rouya_mode == 0)) {
+    if (i_this->mMode != 1 || rouya_mode == 0) {
         a_this->attention_info.flags = fopAc_Attn_LOCKON_BATTLE_e;
     }
     if (i_this->mMode == 5) {
diff --git a/src/d/actor/d_a_tn.cpp b/src/d/actor/d_a_tn.cpp
index fea89e49..69dbc0ee 100644
--- a/src/d/actor/d_a_tn.cpp
+++ b/src/d/actor/d_a_tn.cpp
@@ -107,7 +107,7 @@ static void tate_anm_init(tn_class* i_this, int bckFileIdx, f32 morf, u8 loopMod
 
 /* 000002D4-00000398       .text yoroi_anm_init__FP8tn_classifUcf */
 static void yoroi_anm_init(tn_class* i_this, int bckFileIdx, f32 morf, u8 loopMode, f32 speed) {
-    if ((i_this->m03EC != 0) || (!(i_this->mRemainingEquipmentPieces & EQUIPMENT_PIECE_BODY_ARMOR))) {
+    if (i_this->m03EC != 0 || !(i_this->mRemainingEquipmentPieces & EQUIPMENT_PIECE_BODY_ARMOR)) {
         return;
     }
     i_this->mpArmorMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("Tn", bckFileIdx), loopMode, morf, speed, 0.0f, -1.0f, NULL);
@@ -266,11 +266,11 @@ static BOOL nodeCallBack(J3DNode* node, int calcTiming) {
         fopAc_ac_c* actor = &i_this->actor;
         if (i_this != NULL) {
             if (
-                ((jntNo >= 0xB) && (jntNo < 0x12) && (i_this->mRemainingEquipmentPieces & EQUIPMENT_PIECE_SHIELD))
+                (jntNo >= 0xB && jntNo < 0x12 && (i_this->mRemainingEquipmentPieces & EQUIPMENT_PIECE_SHIELD))
 #if VERSION == VERSION_DEMO
-                && (i_this->mEnemyIce.mFreezeTimer == 0) && ((i_this->mDamageReaction.mAction != ACTION_S_DEMO) || (i_this->m0414_demo == 0))
+                && i_this->mEnemyIce.mFreezeTimer == 0 && (i_this->mDamageReaction.mAction != ACTION_S_DEMO || i_this->m0414_demo == 0)
 #else
-                && (i_this->mEnemyIce.mFreezeTimer == 0)
+                && i_this->mEnemyIce.mFreezeTimer == 0
 #endif
             )
             {
@@ -289,7 +289,7 @@ static BOOL nodeCallBack(J3DNode* node, int calcTiming) {
             offset.y = 0.0f;
             offset.z = 0.0f;
             cXyz local_38;
-            if (((u32)r28 <= 6) || (r28 == 7)) {
+            if ((u32)r28 <= 6 || r28 == 7) {
                 offset.x = 0.0f;
             } else if (r28 == 0x12) {
                 offset.x = 0.0f;
@@ -327,11 +327,11 @@ static BOOL nodeCallBack_P(J3DNode* node, int calcTiming) {
         tn_class* i_this = (tn_class*)model->getUserArea();
         if (i_this != NULL) {
             if (
-                ((jntNo >= 0xB) && (jntNo < 0x12) && (i_this->mRemainingEquipmentPieces & EQUIPMENT_PIECE_SHIELD))
+                (jntNo >= 0xB && jntNo < 0x12 && (i_this->mRemainingEquipmentPieces & EQUIPMENT_PIECE_SHIELD))
 #if VERSION == VERSION_DEMO
-                && (i_this->mEnemyIce.mFreezeTimer == 0) && ((i_this->mDamageReaction.mAction != ACTION_S_DEMO) || (i_this->m0414_demo == 0))
+                && i_this->mEnemyIce.mFreezeTimer == 0 && (i_this->mDamageReaction.mAction != ACTION_S_DEMO || i_this->m0414_demo == 0)
 #else
-                && (i_this->mEnemyIce.mFreezeTimer == 0)
+                && i_this->mEnemyIce.mFreezeTimer == 0
 #endif
             )
             {
@@ -373,7 +373,7 @@ static BOOL nodeCallBack_mimi(J3DNode* node, int calcTiming) {
         s32 jntNo = joint->getJntNo();
         J3DModel* model = j3dSys.getModel();
         tn_class* i_this = (tn_class*)model->getUserArea();
-        if ((i_this != NULL) && (i_this->mRemainingEquipmentPieces & EQUIPMENT_PIECE_HELMET)) {
+        if (i_this != NULL && (i_this->mRemainingEquipmentPieces & EQUIPMENT_PIECE_HELMET)) {
             MTXCopy(model->getAnmMtx(jntNo), *calc_mtx);
             cMtx_YrotM(*calc_mtx, -0x8000);
             model->setAnmMtx(jntNo, *calc_mtx);
@@ -412,7 +412,7 @@ static void part_draw(tn_class* i_this, s8 param_2) {
                     g_env_light.setLightTevColorType(model, &actor->tevStr);
                     i_this->mpArmorMorf->entryDL();
                 }
-            } else if ((i != 2) || (i_this->mRemainingEquipmentPieces & EQUIPMENT_PIECE_SHIELD)) {
+            } else if (i != 2 || (i_this->mRemainingEquipmentPieces & EQUIPMENT_PIECE_SHIELD)) {
                 model = i_this->mParts[i].mpPartModel;
                 if (param_2 != 0) {
                     dMat_control_c::iceUpdateDL(model, -1, NULL);
@@ -434,7 +434,7 @@ static BOOL daTn_Draw(tn_class* i_this) {
     cXyz local_24;
 
     J3DModel* model = i_this->mpBodyMorf->getModel();
-    if ((i_this->m1518 != 0) || (i_this->m02C1 != 0)) {
+    if (i_this->m1518 != 0 || i_this->m02C1 != 0) {
         return TRUE;
     }
     if (i_this->mEnemyIce.mFreezeTimer > 20) {
@@ -452,7 +452,7 @@ static BOOL daTn_Draw(tn_class* i_this) {
     g_env_light.setLightTevColorType(model, &actor->tevStr);
     i_this->mpBrkAnm->entry(model->getModelData());
     J3DShape* shape = model->getModelData()->getMaterialNodePointer(0)->getShape();
-    if ((DEMO_SELECT(REG17_S(1), REG0_S(1)) != 0) || (i_this->m1400 != 0)) {
+    if ((DEMO_SELECT(REG17_S(1), REG0_S(1)) != 0) || i_this->m1400 != 0) {
         shape->hide();
     } else {
         shape->show();
@@ -477,7 +477,7 @@ static BOOL daTn_Draw(tn_class* i_this) {
     if (i_this->mShadowId != 0) {
         if (i_this->m0C34 != 0) {
             fopAc_ac_c* boko_actor = fopAcM_SearchByID(i_this->mBokoPcId);
-            if ((boko_actor != NULL) && (boko_actor->model != NULL)) {
+            if (boko_actor != NULL && boko_actor->model != NULL) {
                 dComIfGd_addRealShadow(i_this->mShadowId, boko_actor->model);
             }
         }
@@ -883,7 +883,7 @@ static void path_check(tn_class* i_this) {
     cXyz local_c8;
     cXyz local_d4;
 
-    if ((i_this->ppd != NULL) && (i_this->m0C34 != 0 || (i_this->m13FF != 0))) {
+    if (i_this->ppd != NULL && (i_this->m0C34 != 0 || i_this->m13FF != 0)) {
         dBgS_LinChk chk;
         local_c8 = actor->current.pos;
         local_c8.y += 100.0f;
@@ -973,7 +973,7 @@ static void jyunkai(tn_class* i_this) {
         // Fall-through
         case -1:
             i_this->mDamageReaction.mMode = 1;
-            if ((i_this->m0C34 != 0) || (i_this->m13FF != 0)) {
+            if (i_this->m0C34 != 0 || i_this->m13FF != 0) {
                 if (i_this->m1424 != 0) {
                     i_this->m1425 += i_this->m1426;
                     if (i_this->m1425 >= (s8)i_this->ppd->m_num) {
@@ -1003,7 +1003,7 @@ static void jyunkai(tn_class* i_this) {
             i_this->mCountDownTimers[2] = 30;
         // Fall-through
         case 1:
-            if ((i_this->m0C34 != 0) || (i_this->m13FF != 0)) {
+            if (i_this->m0C34 != 0 || i_this->m13FF != 0) {
                 maxSpeed = 0x400;
                 f31 = l_tnHIO.m04C;
             } else {
@@ -1013,11 +1013,11 @@ static void jyunkai(tn_class* i_this) {
             local_3c.x = i_this->mPathXyz.x - actor->current.pos.x;
             local_3c.z = i_this->mPathXyz.z - actor->current.pos.z;
             i_this->mDamageReaction.m4D0 = cM_atan2s(local_3c.x, local_3c.z);
-            if ((i_this->m1424 != 0) && (i_this->m0C34 != 0 || (i_this->m13FF != 0))) {
+            if (i_this->m1424 != 0 && (i_this->m0C34 != 0 || i_this->m13FF != 0)) {
                 if (std::sqrtf(SQUARE(local_3c.x) + SQUARE(local_3c.z)) < (f31 * 0.25f) * 15.0f) {
                     dPnt* point = i_this->ppd->m_points;
                     point = &point[i_this->m1425];
-                    if (((point->mArg3 == 3) || (point->mArg3 == 7)) || (point->mArg3 == 8)) {
+                    if (point->mArg3 == 3 || point->mArg3 == 7 || point->mArg3 == 8) {
                         wait_set(i_this);
                         if (point->mArg3 >= 7) {
                             i_this->mCountDownTimers[1] = cM_rndF(80.0f) + 70.0f;
@@ -1029,8 +1029,8 @@ static void jyunkai(tn_class* i_this) {
                 }
             } else {
                 if ((std::sqrtf(SQUARE(local_3c.x) + SQUARE(local_3c.z)) < (f31 * 0.25f) * 2.0f) ||
-                    ((i_this->mCountDownTimers[2] == 0) &&
-                     ((i_this->mDamageReaction.mAcch.ChkWallHit()) || (ground_4_check(i_this, 1, actor->current.angle.y, 200.0f)))))
+                    (i_this->mCountDownTimers[2] == 0 &&
+                    (i_this->mDamageReaction.mAcch.ChkWallHit() || ground_4_check(i_this, 1, actor->current.angle.y, 200.0f))))
                 {
                     wait_set(i_this);
                     i_this->mDamageReaction.mMode = 2;
@@ -1042,10 +1042,10 @@ static void jyunkai(tn_class* i_this) {
         case 2:
             actor->speedF = 0.0f;
             if (i_this->mCountDownTimers[1] == 0) {
-                if ((i_this->m1424 != 0) && (i_this->m0C34 != 0 || (i_this->m13FF != 0))) {
+                if (i_this->m1424 != 0 && (i_this->m0C34 != 0 || i_this->m13FF != 0)) {
                     dPnt* point = i_this->ppd->m_points;
                     point = &point[i_this->m1425];
-                    if ((point->mArg3 == 7) || (point->mArg3 == 8)) {
+                    if (point->mArg3 == 7 || point->mArg3 == 8) {
                         i_this->mDamageReaction.mMode = 4;
                         i_this->mCountDownTimers[1] = cM_rndF(100.0f) + 100.0f;
                         if (point->mArg3 == 7) {
@@ -1057,7 +1057,7 @@ static void jyunkai(tn_class* i_this) {
                     }
                 }
                 i_this->mDamageReaction.mMode = 0;
-                if (((i_this->m0C34 == 0) && (i_this->m13FF == 0)) && (i_this->m03EA == 0)) {
+                if (i_this->m0C34 == 0 && i_this->m13FF == 0 && i_this->m03EA == 0) {
                     i_this->m13FF = 1;
                 }
             }
@@ -1075,12 +1075,12 @@ static void jyunkai(tn_class* i_this) {
     s32 r3 = fopAcM_otoCheck(actor, 1000.0f);
     if (i_this->mMantPcId != 0xFFFF) {
         mant_class* mant_actor = (mant_class*)fopAcM_SearchByID(i_this->mMantPcId);
-        if ((mant_actor != NULL) && (mant_actor->m1C0E != 0)) {
+        if (mant_actor != NULL && mant_actor->m1C0E != 0) {
             r3 |= 2;
         }
     }
     r3 += search_sp;
-    if ((i_this->m0C34 != 0) || (i_this->m13FF != 0)) {
+    if (i_this->m0C34 != 0 || i_this->m13FF != 0) {
         if (r3 != 0 || (i_this->mPlayerDistance < l_tnHIO.m028 &&
                         daTn_player_view_check(i_this, &i_this->mDamageReaction.m714->current.pos, i_this->mTargetAngle, get_view_H(i_this))))
         {
@@ -1089,7 +1089,7 @@ static void jyunkai(tn_class* i_this) {
             fopAcM_monsSeStart(actor, JA_SE_CV_TN_FOUND, 0);
         }
     }
-    if ((i_this->m0C34 == 0) && (daTn_wepon_view_check(i_this))) {
+    if (i_this->m0C34 == 0 && daTn_wepon_view_check(i_this)) {
         i_this->mDamageReaction.mAction = ACTION_WEPON_SEARCH;
         i_this->mDamageReaction.mMode = -1;
     }
@@ -1117,7 +1117,7 @@ static void fight_run(tn_class* i_this) {
     f32 stickPosX = g_mDoCPd_cpadInfo[0].mMainStickPosX;
     i_this->mDamageReaction.m710 = 1;
     i_this->mDamageReaction.m4D0 = i_this->mTargetAngle;
-    if ((i_this->m03EC == 0) && (i_this->mDamageReaction.mMode != 0)) {
+    if (i_this->m03EC == 0 && i_this->mDamageReaction.mMode != 0) {
         maxSpeed = 0x400;
         if (i_this->mDamageReaction.mMode == 1) {
             maxSpeed = 0x800;
@@ -1249,12 +1249,12 @@ static void fight_run(tn_class* i_this) {
             i_this->mDamageReaction.mMode = 0;
             return;
         }
-        if ((i_this->m0C34 != 0) && (player->checkCutCharge())) {
+        if (i_this->m0C34 != 0 && player->checkCutCharge()) {
             i_this->mDamageReaction.mAction = ACTION_FIGHT;
             i_this->mDamageReaction.mMode = 10;
             return;
         }
-        if (((i_this->mPlayerDistance < l_tnHIO.m030 + 62.5f) && (i_this->mPlayerDistance > l_tnHIO.m030 - 62.5f)) && (i_this->mCountDownTimers[3] == 0)) {
+        if (((i_this->mPlayerDistance < l_tnHIO.m030 + 62.5f) && (i_this->mPlayerDistance > l_tnHIO.m030 - 62.5f)) && i_this->mCountDownTimers[3] == 0) {
             i_this->mCountDownTimers[3] = l_tnHIO.m06C;
             if (cM_rndF(100.0f) < l_tnHIO.m070) {
                 i_this->mDamageReaction.mAction = ACTION_FIGHT;
@@ -1265,7 +1265,7 @@ static void fight_run(tn_class* i_this) {
         if (i_this->m03F2 == 0) {
             bool r27 = false;
             fopAc_ac_c* r28 = (fopAc_ac_c*)fpcM_Search(shot_s_sub, i_this);
-            if ((r28 != NULL) && (r28->speedF > 10.0f)) {
+            if (r28 != NULL && r28->speedF > 10.0f) {
                 local_54 = r28->current.pos - actor->eyePos;
                 if (local_54.abs() < r28->speedF * 10.0f) {
                     r27 = true;
@@ -1275,7 +1275,7 @@ static void fight_run(tn_class* i_this) {
             if (daTn_player_way_check(i_this) &&
                 (r27 || (player->getCutType() != daPy_py_c::CUT_TYPE_NONE && attention.Lockon() && actor == attention.LockonTarget(0))))
             {
-                if (!(i_this->m03D8 & 3) && ((i_this->mRemainingEquipmentPieces & EQUIPMENT_PIECE_SHIELD) && (cM_rndF(1.0f) <= 0.8f))) {
+                if (!(i_this->m03D8 & 3) && ((i_this->mRemainingEquipmentPieces & EQUIPMENT_PIECE_SHIELD) && cM_rndF(1.0f) <= 0.8f)) {
                     i_this->mDamageReaction.mAction = ACTION_DEFENCE;
                     i_this->mDamageReaction.mMode = 0;
                     if (player->getCutType() == daPy_py_c::CUT_TYPE_JUMPCUT_SWORD) {
@@ -1309,7 +1309,7 @@ static void fight_run(tn_class* i_this) {
         wait_set(i_this);
         i_this->mDamageReaction.mMode = -10;
     } else {
-        if ((i_this->m0C34 == 0) && (daTn_wepon_view_check(i_this))) {
+        if (i_this->m0C34 == 0 && daTn_wepon_view_check(i_this)) {
             i_this->mDamageReaction.mAction = ACTION_WEPON_SEARCH;
             i_this->mDamageReaction.mMode = -1;
         }
@@ -1360,7 +1360,7 @@ static fopAc_ac_c* wepon_hit_check(tn_class* i_this) {
         r5 = 0;
         r6 = 1000;
     }
-    if ((frame < r5) || (frame > r6)) {
+    if (frame < r5 || frame > r6) {
         return NULL;
     }
     if (i_this->m0C66 < 0) {
@@ -1401,7 +1401,7 @@ static fopAc_ac_c* wepon_hit_check(tn_class* i_this) {
         if (i_this->m0C48 <= 1) {
             i_this->mWeponSph.SetAtSpl(dCcG_At_Spl_UNK6);
             i_this->mWepon2Sph.SetAtSpl(dCcG_At_Spl_UNK6);
-        } else if ((i_this->m0C48 == 4) || (i_this->m0C48 == 5)) {
+        } else if (i_this->m0C48 == 4 || i_this->m0C48 == 5) {
             i_this->mWeponSph.SetAtSpl(dCcG_At_Spl_UNK7);
             i_this->mWepon2Sph.SetAtSpl(dCcG_At_Spl_UNK7);
         } else {
@@ -1410,7 +1410,7 @@ static fopAc_ac_c* wepon_hit_check(tn_class* i_this) {
         }
         dComIfG_Ccsp()->Set(&i_this->mWeponSph);
         dComIfG_Ccsp()->Set(&i_this->mWepon2Sph);
-        if ((i_this->mWeponSph.ChkAtHit()) || (i_this->mWepon2Sph.ChkAtHit())) {
+        if (i_this->mWeponSph.ChkAtHit() || i_this->mWepon2Sph.ChkAtHit()) {
             cCcD_Obj* hitObj;
             if (i_this->mWeponSph.ChkAtHit()) {
                 hitObj = i_this->mWeponSph.GetAtHitObj();
@@ -1488,7 +1488,7 @@ static void fight(tn_class* i_this) {
                     fopAcM_monsSeStart(actor, JA_SE_CV_TN_KAMAE_S, 0);
                 }
             } else {
-                if ((cM_rndF(100.0f) < l_tnHIO.m07C) || (i_this->mRemainingEquipmentPieces & EQUIPMENT_PIECE_BODY_ARMOR)) {
+                if (cM_rndF(100.0f) < l_tnHIO.m07C || (i_this->mRemainingEquipmentPieces & EQUIPMENT_PIECE_BODY_ARMOR)) {
                     anm_init(i_this, TN_BCK_BAT_SYOUTEI_S1, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, TN_BAS_BAT_SYOUTEI_S1);
                     i_this->m0C48 = 2;
                     fopAcM_monsSeStart(actor, JA_SE_CV_TN_PUNCH_S, 0);
@@ -1505,13 +1505,13 @@ static void fight(tn_class* i_this) {
             i_this->m0C67 = 0;
         case 1:
             {
-                if (((i_this->m0C48 == 3) && (i_this->mpBodyMorf->getFrame() >= 12.0f)) && (i_this->mpBodyMorf->getFrame() <= 30.0f)) {
+                if ((i_this->m0C48 == 3 && (i_this->mpBodyMorf->getFrame() >= 12.0f)) && (i_this->mpBodyMorf->getFrame() <= 30.0f)) {
                     if (i_this->m0C67 != 0) {
                         actor->speedF = REG0_F(10) + 80.0f;
                     } else {
                         actor->speedF = REG0_F(9) + 50.0f;
                     }
-                } else if (((i_this->m0C48 == 4) && (i_this->mpBodyMorf->getFrame() >= 4.0f)) && (i_this->mpBodyMorf->getFrame() <= 21.0f)) {
+                } else if ((i_this->m0C48 == 4 && (i_this->mpBodyMorf->getFrame() >= 4.0f)) && (i_this->mpBodyMorf->getFrame() <= 21.0f)) {
                     actor->speedF = REG0_F(16) + 50.0f;
                     frame = (int)i_this->mpBodyMorf->getFrame();
                     if (frame == 20) {
@@ -1548,8 +1548,8 @@ static void fight(tn_class* i_this) {
                             }
                         }
                     }
-                    if ((i_this->m0C48 == 0) || (i_this->m0C48 == 4)) {
-                        if ((i_this->mRemainingEquipmentPieces & EQUIPMENT_PIECE_BODY_ARMOR) || (i_this->m0C48 == 4)) {
+                    if (i_this->m0C48 == 0 || i_this->m0C48 == 4) {
+                        if ((i_this->mRemainingEquipmentPieces & EQUIPMENT_PIECE_BODY_ARMOR) || i_this->m0C48 == 4) {
                             frame = 21;
                         } else {
                             frame = 19;
@@ -1747,7 +1747,7 @@ static void wepon_search(tn_class* i_this) {
     cXyz local_30;
 
     fopAc_ac_c* boko_actor = fopAcM_SearchByID(i_this->mBokoPcId);
-    if (i_this->mDamageReaction.mMode < 2 && (boko_actor == NULL || (boko_actor != NULL && (fopAcM_checkCarryNow(boko_actor))))) {
+    if (i_this->mDamageReaction.mMode < 2 && (boko_actor == NULL || (boko_actor != NULL && fopAcM_checkCarryNow(boko_actor)))) {
         i_this->mDamageReaction.mAction = ACTION_JYUNKAI;
         path_check(i_this);
         wait_set(i_this);
@@ -1777,7 +1777,7 @@ static void wepon_search(tn_class* i_this) {
                 actor->speedF = 0.0f;
                 if (i_this->m03EE == 0) {
                     cLib_addCalcAngleS2(&actor->current.angle.y, i_this->mDamageReaction.m4D0, 2, 0x3000);
-                    if ((i_this->mpBodyMorf->isStop()) || (i_this->mCountDownTimers[1] == 0)) {
+                    if (i_this->mpBodyMorf->isStop() || i_this->mCountDownTimers[1] == 0) {
                         i_this->mDamageReaction.mMode = 1;
                         i_this->m03EA = l_tnHIO.m082;
                         fight_run_set(i_this);
@@ -1795,7 +1795,7 @@ static void wepon_search(tn_class* i_this) {
                     i_this->mDamageReaction.mAction = ACTION_FIGHT_RUN;
                     i_this->mCountDownTimers[1] = 0;
                     i_this->m13FF = 1;
-                } else if ((i_this->mDamageReaction.mAcch.ChkGroundHit()) && (i_this->mDamageReaction.mAcch.ChkWallHit())) {
+                } else if (i_this->mDamageReaction.mAcch.ChkGroundHit() && i_this->mDamageReaction.mAcch.ChkWallHit()) {
                     i_this->mDamageReaction.mAction = ACTION_JYUNKAI;
                     path_check(i_this);
                     wait_set(i_this);
@@ -1806,7 +1806,7 @@ static void wepon_search(tn_class* i_this) {
             case 2:
                 actor->speedF = 0.0f;
                 if (i_this->mCountDownTimers[1] == (s16)(REG0_S(7) + 0x12)) {
-                    if ((boko_actor != NULL) && (!fopAcM_checkCarryNow(boko_actor))) {
+                    if (boko_actor != NULL && !fopAcM_checkCarryNow(boko_actor)) {
                         i_this->m0C34 = 2;
                         fopAcM_setCarryNow(boko_actor, 0);
                     } else {
@@ -1932,7 +1932,7 @@ static void defence(tn_class* i_this) {
         case 1:
             actor->speedF = 0.0f;
             i_this->m1444 = 1;
-            if ((i_this->mCountDownTimers[1] == 0) && (player->getCutType() == daPy_py_c::CUT_TYPE_NONE)) {
+            if (i_this->mCountDownTimers[1] == 0 && player->getCutType() == daPy_py_c::CUT_TYPE_NONE) {
                 i_this->mDamageReaction.mAction = ACTION_FIGHT_RUN;
                 i_this->mCountDownTimers[1] = 0;
                 i_this->mDamageReaction.mMode = 0;
@@ -1987,7 +1987,7 @@ static void hukki(tn_class* i_this) {
                 }
             }
             if (i_this->mpBodyMorf->isStop()) {
-                if (!(player->checkGrabWear()) && (i_this->mPlayerDistance < l_tnHIO.m02C)) {
+                if (!player->checkGrabWear() && i_this->mPlayerDistance < l_tnHIO.m02C) {
                     i_this->mDamageReaction.mMode = 0xE;
                     i_this->mCountDownTimers[1] = 10;
                 } else {
@@ -2127,7 +2127,7 @@ static void d_mahi(tn_class* i_this) {
             i_this->mCountDownTimers[0] = 60;
         // Fall-through
         case 1:
-            if ((i_this->mCountDownTimers[0] <= 40) && (i_this->mCountDownTimers[0] >= 10)) {
+            if (i_this->mCountDownTimers[0] <= 40 && i_this->mCountDownTimers[0] >= 10) {
                 if (i_this->mCountDownTimers[0] == 40) {
                     enemy_piyo_set(actor);
                 }
@@ -2192,7 +2192,7 @@ static void stand(tn_class* i_this) {
     s32 r30 = fopAcM_otoCheck(actor, 1000.0f);
     if (i_this->mMantPcId != 0xFFFF) {
         mant_class* mant_actor = (mant_class*)fopAcM_SearchByID(i_this->mMantPcId);
-        if ((mant_actor != NULL) && (mant_actor->m1C0E != 0)) {
+        if (mant_actor != NULL && mant_actor->m1C0E != 0) {
             r30 |= 2;
         }
     }
@@ -2261,11 +2261,11 @@ static void stand(tn_class* i_this) {
             cLib_addCalc2(&actor->speedF, l_tnHIO.m054, 1.0f, 5.0f);
             break;
     }
-    if ((i_this->mDamageReaction.mMode < 10) && (r30 != 0)) {
+    if (i_this->mDamageReaction.mMode < 10 && r30 != 0) {
         i_this->mDamageReaction.mMode = 10;
         i_this->mCountDownTimers[1] = cM_rndF(10.0f) + 45.0f;
     }
-    if ((i_this->mCountDownTimers[2] == 0) && (i_this->mDamageReaction.mMode != 0x14)) {
+    if (i_this->mCountDownTimers[2] == 0 && i_this->mDamageReaction.mMode != 0x14) {
         f32 fVar8;
         if (i_this->mRangeOrFrozenAnim != 0xFF) {
             fVar8 = i_this->mRangeOrFrozenAnim * 10.0f;
@@ -2291,7 +2291,7 @@ static void stand(tn_class* i_this) {
             i_this->mDamageReaction.mMode = 0;
         }
     }
-    if ((i_this->m0C34 == 0) && (daTn_wepon_view_check(i_this))) {
+    if (i_this->m0C34 == 0 && daTn_wepon_view_check(i_this)) {
         i_this->mDamageReaction.mAction = ACTION_WEPON_SEARCH;
         i_this->mDamageReaction.mMode = -1;
     }
@@ -2368,7 +2368,7 @@ static void s_demo(tn_class* i_this) {
             if (r29 == 0xc1) {
                 fopAcM_monsSeStart(actor, JA_SE_CV_TN_KAMAE_L, 0);
             }
-            if ((r29 == 0xe7) || (r29 == 0x106)) {
+            if (r29 == 0xe7 || r29 == 0x106) {
                 fopAcM_monsSeStart(actor, JA_SE_CV_TN_ATTACK_L, 0);
             }
             if (i_this->mpBodyMorf->isStop()) {
@@ -2383,19 +2383,19 @@ static void s_demo(tn_class* i_this) {
                 actor->speed.y = 0.0f;
 #if VERSION == VERSION_DEMO
                 i_this->m0414_demo = REG0_S(8) + 0x4000;
-                if (!(dComIfGp_evmng_existence("btl_of_swroom")) && (s_check == 0)) {
+                if (!dComIfGp_evmng_existence("btl_of_swroom") && s_check == 0) {
                     return;
                 }
 
 #else
                 if (!dComIfGp_evmng_existence("btl_of_swroom")) {
-                    if (!(dComIfGp_evmng_existence("btl_of_swroom2")) && (s_check == 0)) {
+                    if (!dComIfGp_evmng_existence("btl_of_swroom2") && s_check == 0) {
                         return;
                     }
                 }
 #endif
                 int staffIdx = dComIfGp_evmng_getMyStaffId("Tn", NULL, 0);
-                if ((staffIdx != -1) || (s_check != 0)) {
+                if (staffIdx != -1 || s_check != 0) {
                     if (s_check == 0) {
                         if (strcmp(dComIfGp_getPEvtManager()->getMyNowCutName(staffIdx), "Appear")) {
                             return;
@@ -2440,10 +2440,10 @@ static void s_demo(tn_class* i_this) {
             }
         case 0xb:
 #if VERSION > VERSION_DEMO
-            if ((dComIfGp_evmng_existence("btl_of_swroom")) || (dComIfGp_evmng_existence("btl_of_swroom2"))) {
+            if (dComIfGp_evmng_existence("btl_of_swroom") || dComIfGp_evmng_existence("btl_of_swroom2")) {
                 int staffIdx = dComIfGp_evmng_getMyStaffId("Tn", NULL, 0);
                 if (staffIdx != -1) {
-                    if (!(strcmp(dComIfGp_getPEvtManager()->getMyNowCutName(staffIdx), "Appear2"))) {
+                    if (!strcmp(dComIfGp_getPEvtManager()->getMyNowCutName(staffIdx), "Appear2")) {
                         actor->current.pos.x = actor->home.pos.x;
                         daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
                         if (player != NULL) {
@@ -2606,7 +2606,7 @@ static void Tn_move(tn_class* i_this) {
     cLib_addCalcAngleS2(&i_this->m1404, 0, 2, 0x800);
     if (i_this->mDamageReaction.mMode <= -100) {
         i_this->m03F0 = 5;
-        if ((std::fabsf(i_this->mDamageReaction.m478) > 40.0f) && (!(i_this->mDamageReaction.mAcch.ChkGroundHit()))) {
+        if (std::fabsf(i_this->mDamageReaction.m478) > 40.0f && !i_this->mDamageReaction.mAcch.ChkGroundHit()) {
             i_this->mWeponSph.SetC(i_this->mDamageReaction.m100[12]);
             i_this->mWeponSph.SetR(60.0f);
             i_this->mWeponSph.OffAtVsPlayerBit();
@@ -2614,7 +2614,7 @@ static void Tn_move(tn_class* i_this) {
             i_this->mWeponSph.SetAtSpl(dCcG_At_Spl_UNK1);
             dComIfG_Ccsp()->Set(&i_this->mWeponSph);
             dComIfG_Ccsp()->SetMass(&i_this->mWeponSph, 3);
-            if ((i_this->mWeponSph.ChkAtHit()) && (actor->speed.y < -50.0f)) {
+            if (i_this->mWeponSph.ChkAtHit() && actor->speed.y < -50.0f) {
                 actor->speed.y = 0.0f;
                 i_this->mDamageReaction.m474 = 8000.0f;
             }
@@ -2623,7 +2623,7 @@ static void Tn_move(tn_class* i_this) {
     } else {
         i_this->mWeponSph.OnAtVsPlayerBit();
         i_this->mCoCyl.OnCoSetBit();
-        if ((i_this->mDamageReaction.m48A != 0) && (i_this->mDamageReaction.m488 == 0)) {
+        if (i_this->mDamageReaction.m48A != 0 && i_this->mDamageReaction.m488 == 0) {
             if (i_this->mDamageReaction.m48A == 1) {
                 i_this->mDamageReaction.mAction = ACTION_FIGHT_RUN;
                 i_this->mDamageReaction.mMode = 0;
@@ -2709,7 +2709,7 @@ static void Tn_move(tn_class* i_this) {
             }
 #endif
         }
-        if ((i_this->mBehaviorType == BEHAVIOR_GUARDS_AREA) && (i_this->mDamageReaction.mAction == ACTION_FIGHT_RUN)) {
+        if (i_this->mBehaviorType == BEHAVIOR_GUARDS_AREA && i_this->mDamageReaction.mAction == ACTION_FIGHT_RUN) {
             local_40 = actor->home.pos - actor->current.pos;
             if (i_this->mRangeOrFrozenAnim != 0xFF) {
                 fVar9 = (i_this->mRangeOrFrozenAnim * 10.0f) * 1.5f;
@@ -2728,7 +2728,7 @@ static void Tn_move(tn_class* i_this) {
         local_40.x = 0.0f;
         local_40.y = 0.0f;
         local_40.z = actor->speedF;
-        if (((i_this->mDamageReaction.mAction != ACTION_HUKKI) && (i_this->mDamageReaction.mAction != ACTION_FAIL)) && (i_this->mDamageReaction.m48A == 0)) {
+        if (i_this->mDamageReaction.mAction != ACTION_HUKKI && i_this->mDamageReaction.mAction != ACTION_FAIL && i_this->mDamageReaction.m48A == 0) {
             i_this->mDamageReaction.m482 = actor->current.angle.y;
             cMtx_YrotS(*calc_mtx, actor->current.angle.y + i_this->m0418);
         } else {
@@ -2814,12 +2814,6 @@ static u8 damage_check(tn_class* i_this) {
     mant_class* mant_actor;
     csXyz local_a0;
     csXyz local_a8;
-    cXyz local_50;
-    cXyz local_5c;
-    cXyz local_68;
-    cXyz local_74;
-    cXyz local_80;
-    cXyz local_8c;
     CcAtInfo atInfo;
 
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -2831,14 +2825,12 @@ static u8 damage_check(tn_class* i_this) {
     if (i_this->m1444 != 0) {
         i_this->m1444--;
         MTXCopy(i_this->mpBodyMorf->getModel()->getAnmMtx(0xF), *calc_mtx);
-        local_50.x = 0.0f;
-        local_50.y = 0.0f;
-        local_50.z = 0.0f;
+        cXyz local_50(0.0f, 0.0f, 0.0f);
         MtxPosition(&local_50, &i_this->m13E4);
         i_this->mDefenceSph.SetR(70.0f);
         i_this->mDefenceSph.SetC(i_this->m13E4);
     } else {
-        local_5c = actor->current.pos;
+        cXyz local_5c = actor->current.pos;
         local_5c.y = -20000.0f;
         i_this->mDefenceSph.SetC(local_5c);
     }
@@ -2846,14 +2838,12 @@ static u8 damage_check(tn_class* i_this) {
     if (i_this->mDefenceSph.ChkTgHit()) {
         def_se_set(actor, i_this->mDefenceSph.GetTgHitObj(), 0x40);
         cMtx_YrotS(*calc_mtx, actor->shape_angle.y);
-        local_68.x = 0.0f;
-        local_68.y = 0.0f;
-        local_68.z = -10.0f;
+        cXyz local_68(0.0f, 0.0f, -10.0f);
         MtxPosition(&local_68, &i_this->mDamageReaction.m42C);
         i_this->mDamageReaction.m4D4 = -10.0f;
         return 0;
     }
-    if ((i_this->m03F0 == 0) && (i_this->mHeadSph.ChkTgHit() || (i_this->mTgCyl.ChkTgHit()))) {
+    if (i_this->m03F0 == 0 && (i_this->mHeadSph.ChkTgHit() || i_this->mTgCyl.ChkTgHit())) {
         i_this->m03F0 = REG0_S(7) + 5;
         if (i_this->mHeadSph.ChkTgHit()) {
             r26 = 1;
@@ -2868,8 +2858,8 @@ static u8 damage_check(tn_class* i_this) {
         if (hitObj->ChkAtType(AT_TYPE_ICE_ARROW | AT_TYPE_LIGHT_ARROW)) {
             s8 r25 = 0;
             if (hitObj->ChkAtType(AT_TYPE_ICE_ARROW)) {
-                if (((r26 == 2) && (!(i_this->mRemainingEquipmentPieces & EQUIPMENT_PIECE_BODY_ARMOR))) ||
-                    (r26 == 1 && (!(i_this->mRemainingEquipmentPieces & EQUIPMENT_PIECE_HELMET))))
+                if ((r26 == 2 && !(i_this->mRemainingEquipmentPieces & EQUIPMENT_PIECE_BODY_ARMOR)) ||
+                    (r26 == 1 && !(i_this->mRemainingEquipmentPieces & EQUIPMENT_PIECE_HELMET)))
                 {
                     i_this->mEnemyIce.mFreezeDuration = REG0_S(4) + 60;
                     i_this->mEnemyIce.m00C = 1;
@@ -2888,7 +2878,7 @@ static u8 damage_check(tn_class* i_this) {
             if (r25 != 0) {
                 if (r25 == 2) {
                     for (s32 i = 0; i < ARRAY_SSIZE(i_this->mParts); i++) {
-                        if ((i <= 1) && (i_this->mParts[i].m08 >= 0)) {
+                        if (i <= 1 && i_this->mParts[i].m08 >= 0) {
                             yoroi_break(i_this, &i_this->mParts[i].m0C, (u8)i);
                         }
                         i_this->mParts[i].m08 = -1;
@@ -2922,11 +2912,11 @@ static u8 damage_check(tn_class* i_this) {
                 i_this->mEnemyFire.mFireDuration = REG0_S(2) + 100;
             }
         }
-        if (((r26 == 2) && (i_this->mRemainingEquipmentPieces & EQUIPMENT_PIECE_BODY_ARMOR)) ||
+        if ((r26 == 2 && (i_this->mRemainingEquipmentPieces & EQUIPMENT_PIECE_BODY_ARMOR)) ||
             (r26 == 1 && (i_this->mRemainingEquipmentPieces & EQUIPMENT_PIECE_HELMET)))
         {
-            fopAc_ac_c* hitActor = atInfo.mpObj->GetAc();
-            if ((hitActor != NULL) && (fopAcM_GetName(hitActor) == fpcNm_PLAYER_e)) {
+            fopAc_ac_c* hitActor = dCc_GetAc(atInfo.mpObj->GetAc());
+            if (hitActor != NULL && fopAcM_GetName(hitActor) == fpcNm_PLAYER_e) {
                 if (r26 == 1) {
                     if (player->getCutType() == daPy_py_c::CUT_TYPE_BT_JUMPCUT) {
                         at_power_check(&atInfo);
@@ -2939,7 +2929,7 @@ static u8 damage_check(tn_class* i_this) {
                         dScnPly_ply_c::setPauseTimer(REG0_S(7) + 6);
                         fopAcM_seStart(actor, JA_SE_CM_TN_HELMET_OUT, 0);
                         cXyz* particlePos = i_this->mTgCyl.GetTgHitPosP();
-                        local_74.set(2.0f, 2.0f, 2.0f);
+                        cXyz local_74(2.0f, 2.0f, 2.0f);
                         local_a0.x = local_a0.z = 0;
                         local_a0.y = fopAcM_searchPlayerAngleY(actor);
                         dComIfGp_particle_set(dPa_name::ID_AK_JN_OK, particlePos, &local_a0, &local_74);
@@ -2953,17 +2943,17 @@ static u8 damage_check(tn_class* i_this) {
                         r3 = -r3;
                     }
                     cXyz* particlePos = i_this->mTgCyl.GetTgHitPosP();
-                    local_80.set(2.0f, 2.0f, 2.0f);
+                    cXyz local_80(2.0f, 2.0f, 2.0f);
                     local_a8.x = local_a8.z = 0;
                     local_a8.y = fopAcM_searchPlayerAngleY(actor);
                     r26_2 = false;
                     if (i_this->mMantPcId != 0xFFFF) {
                         mant_actor = (mant_class*)fopAcM_SearchByID(i_this->mMantPcId);
-                        if ((mant_actor != NULL) && (mant_actor->m2834 != 0 || (mant_actor->m2836 != 0))) {
+                        if (mant_actor != NULL && (mant_actor->m2834 != 0 || mant_actor->m2836 != 0)) {
                             r26_2 = true;
                         }
                     }
-                    if (((u16)r3 > 0x4000) && (!r26_2)) {
+                    if ((u16)r3 > 0x4000 && !r26_2) {
                         i_this->m02DD |= 1;
                         fopAcM_OffStatus(actor, fopAcStts_CULL_e);
                         i_this->mDamageReaction.mAction = ACTION_D_SIT;
@@ -3021,14 +3011,14 @@ static u8 damage_check(tn_class* i_this) {
         }
         s8 r25 = actor->health;
         at_power_check(&atInfo);
-        if ((atInfo.mResultingAttackType == 10) || (atInfo.mResultingAttackType == 0xe)) {
+        if (atInfo.mResultingAttackType == 10 || atInfo.mResultingAttackType == 0xe) {
             actor->health = 20;
         }
         actor->stealItemBitNo = i_this->m1400;
         atInfo.mpActor = cc_at_check(actor, &atInfo);
-        if ((atInfo.mResultingAttackType == 10) || (atInfo.mResultingAttackType == 0xe)) {
+        if (atInfo.mResultingAttackType == 10 || atInfo.mResultingAttackType == 0xe) {
             actor->health = r25;
-            if ((atInfo.mResultingAttackType == 0xe) && (i_this->m1400 == 0)) {
+            if (atInfo.mResultingAttackType == 0xe && i_this->m1400 == 0) {
                 i_this->m1400 = 1;
             }
         }
@@ -3119,9 +3109,7 @@ static u8 damage_check(tn_class* i_this) {
             i_this->mDamageReaction.m428 = 26.0f;
     }
     if (i_this->mDamageReaction.m424 != 0) {
-        local_8c.x = 0.0f;
-        local_8c.y = 0.0f;
-        local_8c.z = -10.0f;
+        cXyz local_8c(0.0f, 0.0f, -10.0f);
         MtxPosition(&local_8c, &i_this->mDamageReaction.m42C);
         if (i_this->mDamageReaction.m428 < 25.0f) {
             i_this->mDamageReaction.m4D4 = -l_tnHIO.m0D0;
@@ -3130,7 +3118,7 @@ static u8 damage_check(tn_class* i_this) {
         }
     }
     if (r30 != 0) {
-        if ((actor->health <= 0) && (atInfo.mbDead != 0)) {
+        if (actor->health <= 0 && atInfo.mbDead != 0) {
             fopAcM_monsSeStart(actor, JA_SE_CV_TN_DIE, 0);
             if (fopAcM_CheckStatus(actor, fopAcStts_BOSS_e)) {
                 if (s_check == 0) {
@@ -3158,13 +3146,11 @@ static void part_move(tn_class* i_this, int partIndex) {
     tn_p* part;
     f32 dVar14;
     f32 fVar15;
-    cXyz local_134;
-    cXyz cStack_140;
 
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
     part = &i_this->mParts[partIndex];
     dBgS_GndChk gndChk;
-    local_134.set(0.0f, 0.0f, 0.0f);
+    cXyz local_134(0.0f, 0.0f, 0.0f);
     part->m42++;
     iVar12 = j_dt[partIndex];
     if (part->m44 != 0) {
@@ -3231,6 +3217,7 @@ static void part_move(tn_class* i_this, int partIndex) {
                 local_134.x = 0.0f;
                 local_134.y = 30.0f;
                 local_134.z = 20.0f;
+                cXyz cStack_140;
                 MtxPosition(&local_134, &cStack_140);
                 local_134 = part->m0C;
                 local_134.y += 30.0f;
@@ -3283,7 +3270,7 @@ static void part_move(tn_class* i_this, int partIndex) {
             if (part->m44 == 1) {
                 part->m08 = -1;
                 yoroi_break(i_this, &part->m0C, partIndex);
-                if ((partIndex == 0) && (i_this->mMantPcId != 0xFFFF)) {
+                if (partIndex == 0 && i_this->mMantPcId != 0xFFFF) {
                     mant_actor = (mant_class*)fopAcM_SearchByID(i_this->mMantPcId);
                     if (mant_actor != NULL) {
                         fopAcM_delete(mant_actor);
@@ -3301,7 +3288,7 @@ static void part_move(tn_class* i_this, int partIndex) {
     switch (part->m09) {
         case 0:
             MTXCopy(i_this->mpBodyMorf->getModel()->getAnmMtx(iVar12), *calc_mtx);
-            if ((partIndex == 0) && (i_this->m1402 != 0)) {
+            if (partIndex == 0 && i_this->m1402 != 0) {
                 fVar15 = (i_this->m1402 * cM_scos(i_this->m1402 * 0x5100) * -0.0033f) + 1.0f;
                 MtxScale(fVar15, fVar15, fVar15, true);
                 dVar14 = (i_this->m1402 * (REG0_F(16) + 0.01f));
@@ -3428,10 +3415,10 @@ static void spin_blur_set(tn_class* i_this) {
 static BOOL daTn_Execute(tn_class* i_this) {
     /* Nonmatching - retail-only regalloc */
     fopEn_enemy_c* actor = (fopEn_enemy_c*)&i_this->actor;
+    daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
     mant_class* mant_actor;
     daBoko_c* boko_actor;
 
-    daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
 #if VERSION > VERSION_DEMO
     if (i_this->m1520 != 0) {
         i_this->m1520--;
@@ -3440,6 +3427,7 @@ static BOOL daTn_Execute(tn_class* i_this) {
         }
     }
 #endif
+
     if (enemy_ice(&i_this->mEnemyIce)) {
         if (i_this->mEnemyIce.mLightShrinkTimer == 0) {
             if (i_this->mEnemyIce.mFreezeTimer == 23) {
@@ -3452,7 +3440,8 @@ static BOOL daTn_Execute(tn_class* i_this) {
             i_this->mpArmorMorf->play(NULL, 0, 0);
             i_this->mpShieldMorf->play(NULL, 0, 0);
         }
-        i_this->mpBodyMorf->getModel()->setBaseTRMtx(mDoMtx_stack_c::now);
+        J3DModel* model = i_this->mpBodyMorf->getModel();
+        model->setBaseTRMtx(mDoMtx_stack_c::get());
         i_this->mpBodyMorf->calc();
         i_this->mpShieldMorf->calc();
         for (s32 i = 0; i < ARRAY_SSIZE(i_this->mParts); i++) {
@@ -3473,7 +3462,7 @@ static BOOL daTn_Execute(tn_class* i_this) {
         return TRUE;
     }
     u8 r25 = 0;
-    if (((l_tnHIO.m006 == 0) || (CPad_CHECK_TRIG_B(0))) || (CPad_CHECK_HOLD_Y(0))) {
+    if (l_tnHIO.m006 == 0 || CPad_CHECK_TRIG_B(0) || CPad_CHECK_HOLD_Y(0)) {
         i_this->m03D8++;
         for (s32 i = 0; i < ARRAY_SSIZE(i_this->mCountDownTimers); i++) {
             if (i_this->mCountDownTimers[i] != 0) {
@@ -3565,7 +3554,7 @@ static BOOL daTn_Execute(tn_class* i_this) {
         switch (r3) {
             case 1:
                 anm_init(i_this, TN_BCK_BDOWN_A1, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
-                if ((i_this->m0C34 != 0) && ((actor->health <= 0) || (r25 >= 4) || (cM_rndF(1.0f) < 0.5f))) {
+                if (i_this->m0C34 != 0 && (actor->health <= 0 || r25 >= 4 || cM_rndF(1.0f) < 0.5f)) {
                     i_this->m0C38 = 1;
                 }
                 i_this->mDamageReaction.mAction = ACTION_JYUNKAI;
@@ -3574,7 +3563,7 @@ static BOOL daTn_Execute(tn_class* i_this) {
                 anm_init(i_this, TN_BCK_BDOWN_U1, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
                 break;
             case 5:
-                if ((i_this->mDamageReaction.mAction != ACTION_FIGHT_RUN) && (i_this->mDamageReaction.mAction != ACTION_HUKKI)) {
+                if (i_this->mDamageReaction.mAction != ACTION_FIGHT_RUN && i_this->mDamageReaction.mAction != ACTION_HUKKI) {
                     wait_set(i_this);
                     i_this->mDamageReaction.mAction = ACTION_FIGHT_RUN;
                     i_this->mDamageReaction.mMode = 0;
@@ -3689,7 +3678,7 @@ static BOOL daTn_Execute(tn_class* i_this) {
                 f32 f1 = dComIfG_Bgsp()->GroundCross(&gndChk);
                 if (f1 != -G_CM3D_F_INF) {
                     r22 = (s16)-cM_atan2s(f1 - pos.y, tmp.z - pos.z);
-                    if ((r22 > 0x2000) || (r22 < -0x2000)) {
+                    if (r22 > 0x2000 || r22 < -0x2000) {
                         r22 = 0;
                     }
                 }
@@ -3700,7 +3689,7 @@ static BOOL daTn_Execute(tn_class* i_this) {
                 f1 = dComIfG_Bgsp()->GroundCross(&gndChk);
                 if (f1 != -G_CM3D_F_INF) {
                     r23 = (s16)cM_atan2s(f1 - pos.y, tmp.x - pos.x);
-                    if ((r23 > 0x2000) || (r23 < -0x2000)) {
+                    if (r23 > 0x2000 || r23 < -0x2000) {
                         r23 = 0;
                     }
                 }
@@ -3967,7 +3956,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
             );
             i_this->mParts[i].mpPartModel = i_this->mpArmorMorf->getModel();
         } else {
-            if ((i == 1) && (i_this->mEquipmentType & EQUIPMENT_HELMET)) {
+            if (i == 1 && (i_this->mEquipmentType & EQUIPMENT_HELMET)) {
                 modelData = (J3DModelData*)dComIfG_getObjectRes("Tn", TN_BMD_TN_KABUTO2); // Mighty Darknut helmet
             } else {
                 modelData = (J3DModelData*)dComIfG_getObjectRes("Tn", part_bmd[i]);
@@ -3982,7 +3971,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
             if (i_this->mParts[i].mpPartBrkAnm == 0) {
                 return FALSE;
             }
-            if ((i == 1) && (i_this->mEquipmentType & EQUIPMENT_HELMET)) {
+            if (i == 1 && (i_this->mEquipmentType & EQUIPMENT_HELMET)) {
                 if (!i_this->mParts[i].mpPartBrkAnm->init(
                         i_this->mParts[i].mpPartModel->getModelData(),
                         (J3DAnmTevRegKey*)dComIfG_getObjectRes("Tn", TN_BRK_TN_KABUTO2),
@@ -4219,7 +4208,7 @@ static cPhs_State daTn_Create(fopAc_ac_c* a_this) {
     i_this->mPathIndex = (fopAcM_GetParam(a_this) >> 16) & 0xFF;
     i_this->mEnableSpawnSwitch = (fopAcM_GetParam(a_this) >> 24) & 0xFF;
     i_this->mDisableSpawnOnDeathSwitch = a_this->current.angle.z;
-    if ((REG0_S(0) != 0) || (i_this->mDisableSpawnOnDeathSwitch != 0 && (i_this->mDisableSpawnOnDeathSwitch <= 0x7F))) {
+    if (REG0_S(0) != 0 || (i_this->mDisableSpawnOnDeathSwitch != 0 && i_this->mDisableSpawnOnDeathSwitch <= 0x7F)) {
         fopAcM_OnStatus(a_this, fopAcStts_BOSS_e);
         search_sp = 1;
     }
@@ -4246,11 +4235,11 @@ static cPhs_State daTn_Create(fopAc_ac_c* a_this) {
     if (i_this->mDisableSpawnOnDeathSwitch == 0xFF) {
         i_this->mDisableSpawnOnDeathSwitch = 0;
     }
-    if ((i_this->mDisableSpawnOnDeathSwitch != 0) && (dComIfGs_isSwitch(i_this->mDisableSpawnOnDeathSwitch, fopAcM_GetRoomNo(a_this)))) {
+    if (i_this->mDisableSpawnOnDeathSwitch != 0 && (dComIfGs_isSwitch(i_this->mDisableSpawnOnDeathSwitch, fopAcM_GetRoomNo(a_this)))) {
         return cPhs_ERROR_e;
     }
     s_check = 0;
-    if ((i_this->mBehaviorType == BEHAVIOR_MINIBOSS) || (i_this->mBehaviorType == BEHAVIOR_MSWORD_CHAMBER_AMBUSH)) {
+    if (i_this->mBehaviorType == BEHAVIOR_MINIBOSS || i_this->mBehaviorType == BEHAVIOR_MSWORD_CHAMBER_AMBUSH) {
         fopAcM_OnStatus(a_this, fopAcStts_BOSS_e);
 #if VERSION > VERSION_DEMO
         search_sp = 1;
diff --git a/src/d/d_meter.cpp b/src/d/d_meter.cpp
index d2e0b2e3..50f9e627 100644
--- a/src/d/d_meter.cpp
+++ b/src/d/d_meter.cpp
@@ -733,11 +733,12 @@ void dMeter_alphaControl(sub_meter_class* i_Meter) {
 /* 801EFC40-801F01C0       .text dMeter_statusCheck__FP15sub_meter_class */
 void dMeter_statusCheck(sub_meter_class* i_Meter) {
     i_Meter->mStatusFlags = 0;
-    if ((!dComIfGp_2dShowCheck()) || (dCam_getBody()->chkFlag(0x2000000))) {
+    if (!dComIfGp_2dShowCheck() || (dCam_getBody()->chkFlag(0x2000000))) {
         i_Meter->mStatusFlags |= dMtrStts_UNK4000_e;
-    } else if (((dMeter_isAuctionFlag()) && (dComIfGp_getMesgStatus() == 0)) ||
-               (dComIfGs_isTmpBit(dSv_event_tmp_flag_c::UNK_0408) && (dComIfGp_getMesgStatus() == 0)) ||
-               (dComIfGp_evmng_startCheck("PUZZLE_GAME") || dComIfGp_evmng_startCheck("PUZZLE_RUPEE")))
+    } else if ((dMeter_isAuctionFlag() && dComIfGp_getMesgStatus() == 0) ||
+               (dComIfGs_isTmpBit(dSv_event_tmp_flag_c::UNK_0408) && dComIfGp_getMesgStatus() == 0) ||
+               dComIfGp_evmng_startCheck("PUZZLE_GAME") ||
+               dComIfGp_evmng_startCheck("PUZZLE_RUPEE"))
     {
         i_Meter->mStatusFlags |= dMtrStts_UNK80000_e;
         dComIfGp_setAStatus(dActStts_BLANK_e);
@@ -745,16 +746,16 @@ void dMeter_statusCheck(sub_meter_class* i_Meter) {
     } else if (dComIfGp_getOperateWind() == 2) {
         dComIfGp_setDoStatusForce(dActStts_CHOOSE_e);
         i_Meter->mStatusFlags |= dMtrStts_UNK400000_e;
-    } else if ((dComIfGp_getMiniGameType() == 8) && (!(dComIfGp_checkPlayerStatus0(0, daPyStts0_UNK10_e)))) {
+    } else if (dComIfGp_getMiniGameType() == 8 && !dComIfGp_checkPlayerStatus0(0, daPyStts0_UNK10_e)) {
         dComIfGp_setDoStatusForce(dActStts_bow_01);
         dComIfGp_setAStatusForce(dActStts_HIDDEN_e);
         i_Meter->mStatusFlags |= dMtrStts_UNK80000_e;
-    } else if ((dComIfGp_checkPlayerStatus1(0, daPyStts1_WIND_WAKER_CONDUCT_e)) && (dComIfGp_getAStatus() == dActStts_RETURN_e)) {
+    } else if (dComIfGp_checkPlayerStatus1(0, daPyStts1_WIND_WAKER_CONDUCT_e) && dComIfGp_getAStatus() == dActStts_RETURN_e) {
         i_Meter->mStatusFlags |= dMtrStts_UNK200000_e;
-    } else if ((dComIfGp_event_runCheck()) && (dMenu_getMenuStatus() != 4)) {
-        if (((dComIfGp_demo_mode() != 1) && (dComIfGp_getMesgStatus() != 0)) && !dComIfGp_getMetronome()) {
+    } else if (dComIfGp_event_runCheck() && dMenu_getMenuStatus() != 4) {
+        if (dComIfGp_demo_mode() != 1 && dComIfGp_getMesgStatus() != 0 && !dComIfGp_getMetronome()) {
             i_Meter->mStatusFlags |= dMtrStts_UNK100_e;
-        } else if ((dComIfGp_demo_mode() != 1) && dComIfGp_getMetronome()) {
+        } else if (dComIfGp_demo_mode() != 1 && dComIfGp_getMetronome()) {
             i_Meter->mStatusFlags |= dMtrStts_UNK200000_e;
             dComIfGp_setAStatusForce(dActStts_HIDDEN_e);
         } else {
@@ -762,8 +763,8 @@ void dMeter_statusCheck(sub_meter_class* i_Meter) {
         }
     }
     if (dMenu_flag() != 0) {
-        if (((dComIfGp_checkPlayerStatus1(0, daPyStts1_PICTO_BOX_AIM_e)) || (dComIfGp_getPictureStatus() == 2)) ||
-            (dComIfGp_getPictureStatus() == 3 || (dComIfGp_isHeapLockFlag() == 6)))
+        if (dComIfGp_checkPlayerStatus1(0, daPyStts1_PICTO_BOX_AIM_e) || dComIfGp_getPictureStatus() == 2 ||
+            dComIfGp_getPictureStatus() == 3 || dComIfGp_isHeapLockFlag() == 6)
         {
             i_Meter->mStatusFlags |= dMtrStts_UNK20000_e;
             dComIfGp_setAStatus(dActStts_BLANK_e);
@@ -779,7 +780,7 @@ void dMeter_statusCheck(sub_meter_class* i_Meter) {
             i_Meter->mStatusFlags |= dMtrStts_UNK20_e;
         }
     } else {
-        if (dComIfGp_getCb1Player() == daPy_getPlayerActorClass() || (daNpc_kam_c::m_hyoi_kamome != 0)) {
+        if (dComIfGp_getCb1Player() == daPy_getPlayerActorClass() || daNpc_kam_c::m_hyoi_kamome != 0) {
             i_Meter->mStatusFlags |= dMtrStts_UNK40000_e;
             if (dComIfGp_getAStatus() == dActStts_sword_01) {
                 dComIfGp_setAStatus(dActStts_BLANK_e);
@@ -804,8 +805,8 @@ void dMeter_statusCheck(sub_meter_class* i_Meter) {
             i_Meter->mStatusFlags |= dMtrStts_UNK100_e;
         } else if (dComIfGp_checkPlayerStatus0(0, daPyStts0_TELESCOPE_LOOK_e)) {
             i_Meter->mStatusFlags |= dMtrStts_UNK80_e;
-        } else if (((dComIfGp_checkPlayerStatus1(0, daPyStts1_PICTO_BOX_AIM_e)) || (dComIfGp_getPictureStatus() == 2)) || (dComIfGp_getPictureStatus() == 3) ||
-                   (dComIfGp_isHeapLockFlag() == 6))
+        } else if (dComIfGp_checkPlayerStatus1(0, daPyStts1_PICTO_BOX_AIM_e) || dComIfGp_getPictureStatus() == 2 || dComIfGp_getPictureStatus() == 3 ||
+                   dComIfGp_isHeapLockFlag() == 6)
         {
             i_Meter->mStatusFlags |= dMtrStts_UNK20000_e;
             dComIfGp_setAStatus(dActStts_BLANK_e);
@@ -1002,17 +1003,17 @@ const char* dMeter_heartTex(s16 param_1) {
 
 /* 801F0434-801F0608       .text dMeter_recollect_boss_data__Fv */
 void dMeter_recollect_boss_data() {
-    if ((dStage_stagInfo_GetSTType(dComIfGp_getStageStagInfo()) == dStageType_BOSS_e) && (dComIfGs_isStageBossEnemy())) {
-        if ((dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo()) == dSv_save_c::STAGE_DRC) && (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_3D80))) {
+    if ((dStage_stagInfo_GetSTType(dComIfGp_getStageStagInfo()) == dStageType_BOSS_e) && dComIfGs_isStageBossEnemy()) {
+        if ((dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo()) == dSv_save_c::STAGE_DRC) && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_3D80)) {
             dComIfGs_copyPlayerRecollectionData();
             dComIfGs_onEventBit(dSv_event_flag_c::UNK_3D80);
-        } else if ((dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo()) == dSv_save_c::STAGE_FW) && (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_3D40))) {
+        } else if ((dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo()) == dSv_save_c::STAGE_FW) && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_3D40)) {
             dComIfGs_copyPlayerRecollectionData();
             dComIfGs_onEventBit(dSv_event_flag_c::UNK_3D40);
-        } else if ((dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo()) == dSv_save_c::STAGE_ET) && (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_3D20))) {
+        } else if ((dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo()) == dSv_save_c::STAGE_ET) && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_3D20)) {
             dComIfGs_copyPlayerRecollectionData();
             dComIfGs_onEventBit(dSv_event_flag_c::UNK_3D20);
-        } else if ((dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo()) == dSv_save_c::STAGE_WT) && (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_3D10))) {
+        } else if ((dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo()) == dSv_save_c::STAGE_WT) && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_3D10)) {
             dComIfGs_copyPlayerRecollectionData();
             dComIfGs_onEventBit(dSv_event_flag_c::UNK_3D10);
         }
@@ -1218,7 +1219,7 @@ void dMeter_heartScaleInit(sub_meter_class* i_Meter) {
         fopMsgM_paneTrans(&i_Meter->mHeart[i], 0.0f, 0.0f);
         fopMsgM_paneTrans(&i_Meter->mHeartShadow[i], 0.0f, 0.0f);
         uVar2 = i_Meter->mCurrHP - 1;
-        if ((i == uVar2 / 4) && (i_Meter->mCurrHP != 0)) {
+        if ((i == uVar2 / 4) && i_Meter->mCurrHP != 0) {
             ((J2DPicture*)i_Meter->field_0x0f00.pane)->changeTexture(dMeter_heartTex(i_Meter->mHeart[i].mUserArea), 0);
             dMeter_heart_data_set(&i_Meter->field_0x0f00, &i_Meter->mHeart[i], &i_Meter->mHeartShadow[i]);
         }
@@ -1297,10 +1298,10 @@ void dMeter_heartAlpha(sub_meter_class* i_Meter) {
     f32 dVar5;
 
     if ((i_Meter->mStatusFlags & dMtrStts_UNK4000_e) ||
-        ((i_Meter->mStatusFlags & dMtrStts_UNK40_e) && (dComIfGp_event_checkHind(0x10)) && (!(dComIfGp_checkPlayerStatus1(0, daPyStts1_UNK2000_e)))) ||
-        (dMenu_getCollectMode() == 4) || (i_Meter->mStatusFlags & dMtrStts_UNK200000_e) || (i_Meter->mStatusFlags & dMtrStts_UNK80_e) ||
+        ((i_Meter->mStatusFlags & dMtrStts_UNK40_e) && dComIfGp_event_checkHind(0x10) && !dComIfGp_checkPlayerStatus1(0, daPyStts1_UNK2000_e)) ||
+        dMenu_getCollectMode() == 4 || (i_Meter->mStatusFlags & dMtrStts_UNK200000_e) || (i_Meter->mStatusFlags & dMtrStts_UNK80_e) ||
         (i_Meter->mStatusFlags & dMtrStts_UNK100000_e) || (i_Meter->mStatusFlags & dMtrStts_UNK20000_e) ||
-        ((i_Meter->mStatusFlags & dMtrStts_UNK20_e) || (i_Meter->mStatusFlags & dMtrStts_UNK80000_e)) || (dMeter_isAuctionFlag()) ||
+        (i_Meter->mStatusFlags & dMtrStts_UNK20_e) || (i_Meter->mStatusFlags & dMtrStts_UNK80000_e) || dMeter_isAuctionFlag() ||
         ((i_Meter->mStatusFlags & dMtrStts_UNK400000_e) || (i_Meter->mStatusFlags & dMtrStts_UNK800000_e)))
     {
         if (i_Meter->field_0x3014 > 0) {
@@ -1359,7 +1360,7 @@ void dMeter_LifeMove(sub_meter_class* i_Meter, bool bForce) {
 
     static bool soundOnFlag = false;
     bVar2 = false;
-    if (dComIfGp_getItemMaxLifeCount() != 0 || ((s16)dComIfGp_getItemLifeCount() != 0) || (bForce)) {
+    if (dComIfGp_getItemMaxLifeCount() != 0 || ((s16)dComIfGp_getItemLifeCount() != 0) || bForce) {
         maxHP = dComIfGs_getMaxLife() + dComIfGp_getItemMaxLifeCount();
         uVar3 = (s16)maxHP;
         if (dComIfGp_getItemMaxLifeCount() > 0) {
@@ -1392,11 +1393,11 @@ void dMeter_LifeMove(sub_meter_class* i_Meter, bool bForce) {
             soundOnFlag = true;
         }
     }
-    if ((i_Meter->field_0x300c != 0) || (bForce)) {
+    if (i_Meter->field_0x300c != 0 || bForce) {
         dMeter_maxLifeChange(i_Meter);
         bVar2 = true;
     }
-    if ((i_Meter->mAdjustHp != 0) || (bForce)) {
+    if (i_Meter->mAdjustHp != 0 || bForce) {
         dMeter_lifeChange(i_Meter, &soundOnFlag);
         bVar2 = true;
     }
@@ -1418,10 +1419,10 @@ void dMeter_BattleLifeMove(sub_meter_class* i_Meter, bool param_2) {
 
     static u8 point = 0;
     dVar4 = (i_Meter->mHeart[1].mPosCenterOrig.x - i_Meter->mHeart[0].mPosCenterOrig.x);
-    if ((point != daNpc_Ji1_c::game_life_point) || (!param_2)) {
+    if (point != daNpc_Ji1_c::game_life_point || !param_2) {
         for (s32 i = 0; i < 20; i++) {
             point = daNpc_Ji1_c::game_life_point;
-            if ((i == 1) || (i == 2)) {
+            if (i == 1 || i == 2) {
                 i_Meter->mHeart[i].mPosCenter.x = (s32)(g_meterHIO.field_0x4c + i_Meter->mHeart[i].mPosCenterOrig.x) * (g_meterHIO.field_0x58 * dVar4);
                 i_Meter->mHeartShadow[i].mPosCenter.x =
                     (s32)(g_meterHIO.field_0x4c + i_Meter->mHeartShadow[i].mPosCenterOrig.x) * (g_meterHIO.field_0x58 * dVar4);
@@ -1462,7 +1463,7 @@ void dMeter_heartColor(sub_meter_class* i_Meter) {
     JUtility::TColor white(0xFF, 0xFF, 0xFF, 0xFF);
     JUtility::TColor black(0x00, 0x00, 0x00, 0x00);
 
-    if ((daPy_getPlayerActorClass()->checkSoupPowerUp()) && (dComIfGp_getMiniGameType() != 6)) {
+    if (daPy_getPlayerActorClass()->checkSoupPowerUp() && dComIfGp_getMiniGameType() != 6) {
         JUtility::TColor white2 = -1;
         JUtility::TColor black2 = -1;
         if (i_Meter->mHeartShadow[0].mUserArea == 0) {
@@ -1535,7 +1536,7 @@ void dMeter_weponInit(sub_meter_class* i_Meter) {
     i_Meter->field_0x28d0.mUserArea = 0;
     i_Meter->field_0x301a = 0;
     dComIfGp_setAStatus(dActStts_BLANK_e);
-    if ((dComIfGp_getAStatus() == dActStts_RETURN_e) || (dComIfGp_getAStatus() == dActStts_RETURN_e)) {
+    if (dComIfGp_getAStatus() == dActStts_RETURN_e || dComIfGp_getAStatus() == dActStts_RETURN_e) {
         pArc = dComIfGp_getMenuArchive();
     } else {
         pArc = dComIfGp_getActionIconArchive();
@@ -1579,20 +1580,20 @@ void dMeter_weponMove(sub_meter_class* i_Meter) {
         } else {
             dVar5 = fopMsgM_valueIncrease(10, 0x14 - iVar3, 0);
         }
-        uVar2 = -(f32)(dVar5 * -255.0f);
+        uVar2 = -f32(dVar5 * -255.0f);
         white.g = uVar2;
         white.r = uVar2;
         ((J2DPicture*)i_Meter->field_0x1d38.pane)->setWhite(black);
         ((J2DPicture*)i_Meter->field_0x1d38.pane)->setBlack(white);
-        i_Meter->field_0x1d38.mNowAlpha = (i_Meter->field_0x1d00.mInitAlpha) - (i_Meter->field_0x1d00.mInitAlpha - 0x78) * dVar5;
+        i_Meter->field_0x1d38.mNowAlpha = i_Meter->field_0x1d00.mInitAlpha - (i_Meter->field_0x1d00.mInitAlpha - 0x78) * dVar5;
     } else if (i_Meter->field_0x1d38.mUserArea != 0) {
         ((J2DPicture*)i_Meter->field_0x1d38.pane)->setWhite(JUtility::TColor(0xFF, 0xFF, 0xFF, 0xFF));
         ((J2DPicture*)i_Meter->field_0x1d38.pane)->setBlack(JUtility::TColor(0x00, 0x00, 0xFF, 0x00));
         i_Meter->field_0x1d38.mNowAlpha = i_Meter->field_0x1d00.mInitAlpha;
         i_Meter->field_0x1d38.mUserArea = 0;
     }
-    if (((dComIfGp_getDoStatus() == dActStts_ba_sake__dupe_31) || (dComIfGp_getDoStatus() == dActStts_ba_nageru__dupe_2D)) ||
-        (dComIfGp_getDoStatus() == dActStts_ba_motu__dupe_2E))
+    if (dComIfGp_getDoStatus() == dActStts_ba_sake__dupe_31 || dComIfGp_getDoStatus() == dActStts_ba_nageru__dupe_2D ||
+        dComIfGp_getDoStatus() == dActStts_ba_motu__dupe_2E)
     {
         JUtility::TColor white = -1;
         white.a = 0x00;
@@ -1624,7 +1625,7 @@ void dMeter_weponMove(sub_meter_class* i_Meter) {
         ((J2DPicture*)i_Meter->field_0x1e18[1].pane)->setBlack(0x00000000);
     }
     sVar1 = i_Meter->field_0x28d0.mUserArea;
-    if ((sVar1 != 0) && (sVar1 <= 0xc)) {
+    if (sVar1 != 0 && sVar1 <= 0xc) {
         dMeter_weponAnime(i_Meter);
         i_Meter->field_0x28d0.mUserArea++;
         if (i_Meter->field_0x28d0.mUserArea > 0xc) {
@@ -1665,10 +1666,12 @@ void dMeter_weponChange(sub_meter_class* i_Meter) {
                 ((J2DPicture*)i_Meter->field_0x2828.pane)->changeTexture(i_Meter->actionTex[0], 0);
                 ((J2DPicture*)i_Meter->field_0x2860.pane)->changeTexture(i_Meter->actionTex[0], 0);
                 ((J2DPicture*)i_Meter->field_0x1d00.pane)->changeTexture(i_Meter->actionTex[0], 0);
-            } else if (((((dComIfGp_getAStatus() == dActStts_boko_stick) || (dComIfGp_getAStatus() == dActStts_hatchet)) ||
-                         (dComIfGp_getAStatus() == dActStts_iron_club)) ||
-                        (dComIfGp_getAStatus() == dActStts_longsword || (dComIfGp_getAStatus() == dActStts_spear))) ||
-                       (dComIfGp_getAStatus() == dActStts_spear__dupe_3C))
+            } else if (dComIfGp_getAStatus() == dActStts_boko_stick ||
+                       dComIfGp_getAStatus() == dActStts_hatchet ||
+                       dComIfGp_getAStatus() == dActStts_iron_club ||
+                       dComIfGp_getAStatus() == dActStts_longsword ||
+                       dComIfGp_getAStatus() == dActStts_spear ||
+                       dComIfGp_getAStatus() == dActStts_spear__dupe_3C)
             {
                 pArc = dComIfGp_getItemIconArchive();
                 pFilename = dMeter_actionTex(dComIfGp_getAStatus());
@@ -1678,7 +1681,7 @@ void dMeter_weponChange(sub_meter_class* i_Meter) {
                 ((J2DPicture*)i_Meter->field_0x2860.pane)->changeTexture(i_Meter->actionTex[0], 0);
                 ((J2DPicture*)i_Meter->field_0x1d00.pane)->changeTexture(i_Meter->actionTex[0], 0);
             } else {
-                if ((dComIfGp_getAStatus() == dActStts_RETURN_e) || (dComIfGp_getAStatus() == dActStts_RETURN_e)) {
+                if (dComIfGp_getAStatus() == dActStts_RETURN_e || dComIfGp_getAStatus() == dActStts_RETURN_e) {
                     pArc = dComIfGp_getMenuArchive();
                 } else {
                     pArc = dComIfGp_getActionIconArchive();
@@ -1707,11 +1710,11 @@ void dMeter_weponAnime(sub_meter_class* i_Meter) {
 
     uVar1 = i_Meter->field_0x28d0.mUserArea;
     if (uVar1 <= 7) {
-        dVar2 = (((s32)(uVar1) * 5.0f) / 7.0f);
+        dVar2 = ((uVar1 * 5.0f) / 7.0f);
     } else if (uVar1 <= 10) {
-        dVar2 = (5.0f - ((s32)(uVar1 - 7) * 13.0f) / 3.0f);
+        dVar2 = (5.0f - ((uVar1 - 7) * 13.0f) / 3.0f);
     } else {
-        dVar2 = -8.0f + (8.0f * (s32)(uVar1 - 10) / 2.0f);
+        dVar2 = -8.0f + (8.0f * (uVar1 - 10) / 2.0f);
     }
     i_Meter->field_0x1d00.pane->move(i_Meter->field_0x1d00.mPosTopLeft.x, i_Meter->field_0x1d00.mPosTopLeft.y + dVar2);
     i_Meter->field_0x2828.pane->move(i_Meter->field_0x2828.mPosTopLeft.x, i_Meter->field_0x2828.mPosTopLeft.y + dVar2);
@@ -1730,9 +1733,9 @@ void dMeter_weponTrans(sub_meter_class* i_Meter) {
     static f32 expX = 0.0f;
     static f32 expY = 0.0f;
     if ((i_Meter->mStatusFlags & dMtrStts_UNK4000_e) ||
-        ((i_Meter->mStatusFlags & dMtrStts_UNK40_e) && ((dComIfGp_event_checkHind(4)) && (!(i_Meter->mStatusFlags & dMtrStts_UNK20_e)))) ||
-        ((i_Meter->mStatusFlags & dMtrStts_UNK80_e) && (dComIfGp_getScopeMesgStatus() != fopMsgStts_UNKB_e)) ||
-        (((i_Meter->mStatusFlags & dMtrStts_UNK100_e) && (dComIfGp_getAStatus() != dActStts_CANCEL_e)) || (dComIfGp_getAStatus() == dActStts_HIDDEN_e)))
+        ((i_Meter->mStatusFlags & dMtrStts_UNK40_e) && dComIfGp_event_checkHind(4) && !(i_Meter->mStatusFlags & dMtrStts_UNK20_e)) ||
+        ((i_Meter->mStatusFlags & dMtrStts_UNK80_e) && dComIfGp_getScopeMesgStatus() != fopMsgStts_UNKB_e) ||
+        (((i_Meter->mStatusFlags & dMtrStts_UNK100_e) && dComIfGp_getAStatus() != dActStts_CANCEL_e) || dComIfGp_getAStatus() == dActStts_HIDDEN_e))
     {
         if (moveStatus != 1) {
             moveFlag = 1;
@@ -1753,13 +1756,13 @@ void dMeter_weponTrans(sub_meter_class* i_Meter) {
             }
             moveStatus = 9;
         } else if (dStage_stagInfo_GetUpButton(dComIfGp_getStageStagInfo()) == 0) {
-            if ((((dMeter_Info.mButtonIconMode == 0) || (dMeter_Info.mButtonIconMode == 1)) || (dMeter_Info.mButtonIconMode == 2)) || (dMeter_Info.mButtonIconMode == 3)) {
+            if (dMeter_Info.mButtonIconMode == 0 || dMeter_Info.mButtonIconMode == 1 || dMeter_Info.mButtonIconMode == 2 || dMeter_Info.mButtonIconMode == 3) {
                 if (moveStatus != 8) {
                     moveFlag = 1;
                     dMeter_offBit8(&i_Meter->field_0x3026, 2);
                 }
                 moveStatus = 8;
-            } else if (((dMeter_Info.mButtonIconMode == 7) || (dMeter_Info.mButtonIconMode == 8)) || (dMeter_Info.mButtonIconMode == 9 || (dMeter_Info.mButtonIconMode == 10))) {
+            } else if (dMeter_Info.mButtonIconMode == 7 || dMeter_Info.mButtonIconMode == 8 || dMeter_Info.mButtonIconMode == 9 || dMeter_Info.mButtonIconMode == 10) {
                 if (moveStatus != 10) {
                     moveFlag = 1;
                     dMeter_offBit8(&i_Meter->field_0x3026, 2);
@@ -1779,8 +1782,8 @@ void dMeter_weponTrans(sub_meter_class* i_Meter) {
                 moveStatus = 9;
             }
         }
-    } else if (((i_Meter->mStatusFlags & dMtrStts_UNK80_e) || (i_Meter->mStatusFlags & dMtrStts_UNK100000_e)) ||
-               ((i_Meter->mStatusFlags & dMtrStts_UNK200000_e) && (!(i_Meter->mStatusFlags & dMtrStts_UNK10_e))))
+    } else if ((i_Meter->mStatusFlags & dMtrStts_UNK80_e) || (i_Meter->mStatusFlags & dMtrStts_UNK100000_e) ||
+               ((i_Meter->mStatusFlags & dMtrStts_UNK200000_e) && !(i_Meter->mStatusFlags & dMtrStts_UNK10_e)))
     {
         if (moveStatus != 2) {
             moveFlag = 1;
@@ -1793,7 +1796,7 @@ void dMeter_weponTrans(sub_meter_class* i_Meter) {
             dMeter_offBit8(&i_Meter->field_0x3026, 2);
         }
         moveStatus = 3;
-    } else if ((dMenu_flag()) && (dMenu_getPushMenuButton() == 1 || (dMenu_getMenuStatus() == 1 && (dMenu_getPushMenuButton() == 0)))) {
+    } else if (dMenu_flag() && (dMenu_getPushMenuButton() == 1 || (dMenu_getMenuStatus() == 1 && dMenu_getPushMenuButton() == 0))) {
         if (dMenu_getItemMode() == 0) {
             if (moveStatus != 4) {
                 moveFlag = 1;
@@ -1807,7 +1810,7 @@ void dMeter_weponTrans(sub_meter_class* i_Meter) {
             }
             moveStatus = 5;
         }
-    } else if ((dMenu_flag()) && (dMenu_getPushMenuButton() == 2 || (dMenu_getMenuStatus() == 2 && (dMenu_getPushMenuButton() == 0)))) {
+    } else if (dMenu_flag() && (dMenu_getPushMenuButton() == 2 || (dMenu_getMenuStatus() == 2 && dMenu_getPushMenuButton() == 0))) {
         if (moveStatus != 5) {
             moveFlag = 1;
             dMeter_offBit8(&i_Meter->field_0x3026, 2);
@@ -1831,7 +1834,7 @@ void dMeter_weponTrans(sub_meter_class* i_Meter) {
             dMeter_offBit8(&i_Meter->field_0x3026, 2);
         }
         moveStatus = 5;
-    } else if ((i_Meter->mStatusFlags & dMtrStts_UNK100_e) && (dComIfGp_getAStatus() == dActStts_CANCEL_e)) {
+    } else if ((i_Meter->mStatusFlags & dMtrStts_UNK100_e) && dComIfGp_getAStatus() == dActStts_CANCEL_e) {
         if (moveStatus != 7) {
             moveFlag = 1;
             dMeter_offBit8(&i_Meter->field_0x3026, 2);
@@ -1936,9 +1939,9 @@ void dMeter_weponAlpha(sub_meter_class* i_Meter) {
     f32 dVar4;
 
     static s16 alphaNowFrame = 0;
-    if (((i_Meter->mStatusFlags & dMtrStts_UNK400_e) && (dComIfGp_getAStatus() == dActStts_sword_01)) ||
-        ((i_Meter->mStatusFlags & dMtrStts_UNK2000_e) && (dComIfGp_getAStatus() != dActStts_SPEAK_e)) ||
-        (((i_Meter->mStatusFlags & dMtrStts_UNK2_e) && (dComIfGp_getAStatus() == dActStts_sword_01)) &&
+    if (((i_Meter->mStatusFlags & dMtrStts_UNK400_e) && dComIfGp_getAStatus() == dActStts_sword_01) ||
+        ((i_Meter->mStatusFlags & dMtrStts_UNK2000_e) && dComIfGp_getAStatus() != dActStts_SPEAK_e) ||
+        (((i_Meter->mStatusFlags & dMtrStts_UNK2_e) && dComIfGp_getAStatus() == dActStts_sword_01) &&
          (strcmp(dComIfGp_getStartStageName(), "Ojhous") && strcmp(dComIfGp_getStartStageName(), "Orichh"))) ||
         ((i_Meter->mStatusFlags & dMtrStts_UNK8000_e) || (i_Meter->mStatusFlags & dMtrStts_UNK10000_e)))
     {
@@ -1952,8 +1955,8 @@ void dMeter_weponAlpha(sub_meter_class* i_Meter) {
             }
         }
     } else {
-        if ((!(i_Meter->mStatusFlags & dMtrStts_UNK2_e)) ||
-            ((dComIfGp_getAStatus() != dActStts_sword_01 && (dComIfGp_getAStatus() != dActStts_BLANK_e)) && (!dMenu_flag())) ||
+        if (!(i_Meter->mStatusFlags & dMtrStts_UNK2_e) ||
+            (dComIfGp_getAStatus() != dActStts_sword_01 && dComIfGp_getAStatus() != dActStts_BLANK_e && !dMenu_flag()) ||
             (!strcmp(dComIfGp_getStartStageName(), "Ojhous") || (!strcmp(dComIfGp_getStartStageName(), "Orichh"))))
         {
             i_Meter->field_0x3024 |= 2;
@@ -1971,9 +1974,9 @@ void dMeter_weponAlpha(sub_meter_class* i_Meter) {
         fopMsgM_setNowAlphaZero(&i_Meter->field_0x2860);
         fopMsgM_setNowAlpha(&i_Meter->field_0x2898, dVar4);
         fopMsgM_setNowAlpha(&i_Meter->field_0x28d0, dVar4);
-    } else if ((dComIfGp_getAStatus() == dActStts_sword_01) || (dComIfGp_getAStatus() == dActStts_boko_stick) || (dComIfGp_getAStatus() == dActStts_hatchet) ||
-               (dComIfGp_getAStatus() == dActStts_iron_club) || (dComIfGp_getAStatus() == dActStts_longsword) || (dComIfGp_getAStatus() == dActStts_spear) ||
-               (dComIfGp_getAStatus() == dActStts_spear__dupe_3C))
+    } else if (dComIfGp_getAStatus() == dActStts_sword_01 || dComIfGp_getAStatus() == dActStts_boko_stick || dComIfGp_getAStatus() == dActStts_hatchet ||
+               dComIfGp_getAStatus() == dActStts_iron_club || dComIfGp_getAStatus() == dActStts_longsword || dComIfGp_getAStatus() == dActStts_spear ||
+               dComIfGp_getAStatus() == dActStts_spear__dupe_3C)
     {
         fopMsgM_setNowAlphaZero(&i_Meter->field_0x1d00);
         fopMsgM_setNowAlpha(&i_Meter->field_0x2828, dVar4);
@@ -1989,7 +1992,7 @@ void dMeter_weponAlpha(sub_meter_class* i_Meter) {
         fopMsgM_setNowAlpha(&i_Meter->field_0x28d0, dVar4);
         fopMsgM_setNowAlpha(&i_Meter->field_0x2908, dVar4);
     }
-    if ((dMeter_isBit8(&i_Meter->field_0x3026, 2) != 0) && (i_Meter->field_0x2828.mUserArea == 0)) {
+    if (dMeter_isBit8(&i_Meter->field_0x3026, 2) != 0 && i_Meter->field_0x2828.mUserArea == 0) {
         i_Meter->field_0x1d00.pane->show();
         i_Meter->field_0x2828.pane->show();
         i_Meter->field_0x2860.pane->show();
@@ -2045,7 +2048,7 @@ void dMeter_actionDraw(sub_meter_class* i_Meter) {
 /* 801F386C-801F3B60       .text dMeter_actionForce__FP15sub_meter_class */
 void dMeter_actionForce(sub_meter_class* i_Meter) {
     if ((i_Meter->mStatusFlags & dMtrStts_UNK4000_e) ||
-        ((i_Meter->mStatusFlags & dMtrStts_UNK40_e) && (dComIfGp_event_checkHind(4)) && (!(i_Meter->mStatusFlags & dMtrStts_UNK20_e))))
+        ((i_Meter->mStatusFlags & dMtrStts_UNK40_e) && dComIfGp_event_checkHind(4) && !(i_Meter->mStatusFlags & dMtrStts_UNK20_e)))
     {
         dComIfGp_setDoStatus(dActStts_BLANK_e);
         return;
@@ -2058,18 +2061,18 @@ void dMeter_actionForce(sub_meter_class* i_Meter) {
             dComIfGp_setAStatus(dActStts_RETURN_e);
         }
         if ((i_Meter->mStatusFlags & dMtrStts_UNK20_e) && (dStage_stagInfo_GetUpButton(dComIfGp_getStageStagInfo()) == 0)) {
-            if (((dMeter_Info.mButtonIconMode == 0) || (dMeter_Info.mButtonIconMode == 1 || (dMeter_Info.mButtonIconMode == 2))) || (dMeter_Info.mButtonIconMode == 3)) {
+            if (dMeter_Info.mButtonIconMode == 0 || dMeter_Info.mButtonIconMode == 1 || dMeter_Info.mButtonIconMode == 2 || dMeter_Info.mButtonIconMode == 3) {
                 if (dMeter_Info.mButtonIconMode == 0) {
                     dComIfGp_setDoStatus(dActStts_ba_zoom01);
                 } else if (dMeter_Info.mButtonIconMode == 1) {
                     dComIfGp_setDoStatus(dActStts_ba_zoom02);
-                } else if ((dMeter_Info.mButtonIconMode == 2) || (dMeter_Info.mButtonIconMode == 3)) {
+                } else if (dMeter_Info.mButtonIconMode == 2 || dMeter_Info.mButtonIconMode == 3) {
                     dComIfGp_setDoStatus(dActStts_BLANK_e);
                 }
                 dComIfGp_setRStatus(dActStts_CHARTS_e);
                 return;
             }
-            if ((((dMeter_Info.mButtonIconMode == 7) || (dMeter_Info.mButtonIconMode == 8)) || (dMeter_Info.mButtonIconMode == 9)) || (dMeter_Info.mButtonIconMode == 10)) {
+            if (dMeter_Info.mButtonIconMode == 7 || dMeter_Info.mButtonIconMode == 8 || dMeter_Info.mButtonIconMode == 9 || dMeter_Info.mButtonIconMode == 10) {
                 if (dMeter_Info.mButtonIconMode == 10) {
                     dComIfGp_setDoStatus(dActStts_OPEN_e);
                 } else {
@@ -2124,8 +2127,8 @@ void dMeter_actionChange(sub_meter_class* i_Meter) {
             i_Meter->field_0x1e18[0].mUserArea = 1;
         } else if (dComIfGp_getDoStatus() == dActStts_PARRY_e) {
             mDoAud_seStart(JA_SE_SP_ATTACK_ON);
-        } else if (((dComIfGp_getDoStatus() != dActStts_ba_sake__dupe_31) && (dComIfGp_getDoStatus() != dActStts_ba_nageru__dupe_2D)) &&
-                   (dComIfGp_getDoStatus() != dActStts_ba_motu__dupe_2E))
+        } else if (dComIfGp_getDoStatus() != dActStts_ba_sake__dupe_31 && dComIfGp_getDoStatus() != dActStts_ba_nageru__dupe_2D &&
+                   dComIfGp_getDoStatus() != dActStts_ba_motu__dupe_2E)
         {
             if (dComIfGp_getDoStatus() == dActStts_bow_01) {
                 pArc = dComIfGp_getItemIconArchive();
@@ -2135,7 +2138,7 @@ void dMeter_actionChange(sub_meter_class* i_Meter) {
                 ((J2DPicture*)i_Meter->field_0x27b8.pane)->changeTexture(i_Meter->actionTex[1], 0);
                 ((J2DPicture*)i_Meter->field_0x27f0.pane)->changeTexture(i_Meter->actionTex[1], 0);
             } else {
-                if ((dComIfGp_getDoStatus() == dActStts_RETURN_e) || (dComIfGp_getDoStatus() == dActStts_RETURN_e)) {
+                if (dComIfGp_getDoStatus() == dActStts_RETURN_e || dComIfGp_getDoStatus() == dActStts_RETURN_e) {
                     pArc = dComIfGp_getMenuArchive();
                 } else {
                     pArc = dComIfGp_getActionIconArchive();
@@ -2168,10 +2171,10 @@ void dMeter_actionTrans(sub_meter_class* i_Meter) {
     static f32 expX = 0.0f;
     static f32 expY = 0.0f;
     if ((i_Meter->mStatusFlags & dMtrStts_UNK4000_e) ||
-        ((i_Meter->mStatusFlags & dMtrStts_UNK40_e) && (dComIfGp_event_checkHind(2)) && (!(i_Meter->mStatusFlags & dMtrStts_UNK20_e))) ||
-        ((i_Meter->mStatusFlags & dMtrStts_UNK80_e) || (i_Meter->mStatusFlags & dMtrStts_UNK100000_e)) ||
-        ((i_Meter->mStatusFlags & dMtrStts_UNK200000_e) && (!(i_Meter->mStatusFlags & dMtrStts_UNK20_e)) && (!(i_Meter->mStatusFlags & dMtrStts_UNK10_e))) ||
-        (dComIfGp_getDoStatus() == dActStts_HIDDEN_e))
+        ((i_Meter->mStatusFlags & dMtrStts_UNK40_e) && dComIfGp_event_checkHind(2) && !(i_Meter->mStatusFlags & dMtrStts_UNK20_e)) ||
+        (i_Meter->mStatusFlags & dMtrStts_UNK80_e) || (i_Meter->mStatusFlags & dMtrStts_UNK100000_e) ||
+        ((i_Meter->mStatusFlags & dMtrStts_UNK200000_e) && !(i_Meter->mStatusFlags & dMtrStts_UNK20_e) && !(i_Meter->mStatusFlags & dMtrStts_UNK10_e)) ||
+        dComIfGp_getDoStatus() == dActStts_HIDDEN_e)
     {
         if (moveStatus != 1) {
             moveFlag = 1;
@@ -2187,19 +2190,19 @@ void dMeter_actionTrans(sub_meter_class* i_Meter) {
             moveStatus = 9;
         } else {
             if (dStage_stagInfo_GetUpButton(dComIfGp_getStageStagInfo()) == 0) {
-                if ((((dMeter_Info.mButtonIconMode == 0) || (dMeter_Info.mButtonIconMode == 1)) || (dMeter_Info.mButtonIconMode == 2)) || (dMeter_Info.mButtonIconMode == 3)) {
+                if (dMeter_Info.mButtonIconMode == 0 || dMeter_Info.mButtonIconMode == 1 || dMeter_Info.mButtonIconMode == 2 || dMeter_Info.mButtonIconMode == 3) {
                     if (moveStatus != 8) {
                         moveFlag = 1;
                         dMeter_offBit8(&i_Meter->field_0x3026, 1);
                     }
                     moveStatus = 8;
-                } else if (((dMeter_Info.mButtonIconMode == 7) || (dMeter_Info.mButtonIconMode == 8)) || (dMeter_Info.mButtonIconMode == 9 || (dMeter_Info.mButtonIconMode == 10))) {
+                } else if (dMeter_Info.mButtonIconMode == 7 || dMeter_Info.mButtonIconMode == 8 || dMeter_Info.mButtonIconMode == 9 || dMeter_Info.mButtonIconMode == 10) {
                     if (moveStatus != 0xb) {
                         moveFlag = 1;
                         dMeter_offBit8(&i_Meter->field_0x3026, 1);
                     }
                     moveStatus = 0xb;
-                } else if ((dMeter_Info.mButtonIconMode == 0xb) || (dMeter_Info.mButtonIconMode == 6)) {
+                } else if (dMeter_Info.mButtonIconMode == 0xb || dMeter_Info.mButtonIconMode == 6) {
                     if (moveStatus != 1) {
                         moveFlag = 1;
                         dMeter_offBit8(&i_Meter->field_0x3026, 1);
@@ -2220,7 +2223,7 @@ void dMeter_actionTrans(sub_meter_class* i_Meter) {
             dMeter_offBit8(&i_Meter->field_0x3026, 1);
         }
         moveStatus = 2;
-    } else if ((dMenu_flag()) && (dMenu_getPushMenuButton() == 1 || (dMenu_getMenuStatus() == 1 && (dMenu_getPushMenuButton() == 0)))) {
+    } else if (dMenu_flag() && (dMenu_getPushMenuButton() == 1 || (dMenu_getMenuStatus() == 1 && dMenu_getPushMenuButton() == 0))) {
         if (dMenu_getItemMode() == 0) {
             if (moveStatus != 3) {
                 moveFlag = 1;
@@ -2234,7 +2237,7 @@ void dMeter_actionTrans(sub_meter_class* i_Meter) {
             }
             moveStatus = 4;
         }
-    } else if ((dMenu_flag()) && (dMenu_getPushMenuButton() == 2 || (dMenu_getMenuStatus() == 2 && (dMenu_getPushMenuButton() == 0)))) {
+    } else if (dMenu_flag() && (dMenu_getPushMenuButton() == 2 || (dMenu_getMenuStatus() == 2 && dMenu_getPushMenuButton() == 0))) {
         if (moveStatus != 4) {
             moveFlag = 1;
             dMeter_offBit8(&i_Meter->field_0x3026, 1);
@@ -2385,8 +2388,13 @@ void dMeter_actionAlpha(sub_meter_class* i_Meter) {
 
     static s16 alphaNowFrame = 0;
     if (((i_Meter->mStatusFlags & dMtrStts_UNK20_e) && (dStage_stagInfo_GetUpButton(dComIfGp_getStageStagInfo()) == 0)) &&
-        (dMeter_Info.mButtonIconMode == 2 ||
-         (((dMeter_Info.mButtonIconMode == 3 || (dMeter_Info.mButtonIconMode == 7)) || (dMeter_Info.mButtonIconMode == 8)) || (dMeter_Info.mButtonIconMode == 9))))
+        (
+            dMeter_Info.mButtonIconMode == 2 ||
+            dMeter_Info.mButtonIconMode == 3 ||
+            dMeter_Info.mButtonIconMode == 7 ||
+            dMeter_Info.mButtonIconMode == 8 ||
+            dMeter_Info.mButtonIconMode == 9
+        ))
     {
         if (alphaNowFrame > 3) {
             alphaNowFrame--;
@@ -2431,8 +2439,8 @@ void dMeter_actionAlpha(sub_meter_class* i_Meter) {
         fopMsgM_setNowAlphaZero(&i_Meter->field_0x27f0);
         fopMsgM_setNowAlpha(&i_Meter->field_0x1e18[0], dVar2);
         fopMsgM_setNowAlpha(&i_Meter->field_0x1da8[0], dVar2);
-    } else if (((dComIfGp_getDoStatus() == dActStts_PARRY_e) || (dComIfGp_getDoStatus() == dActStts_ba_sake__dupe_31)) ||
-               (dComIfGp_getDoStatus() == dActStts_ba_nageru__dupe_2D || (dComIfGp_getDoStatus() == dActStts_ba_motu__dupe_2E)))
+    } else if (dComIfGp_getDoStatus() == dActStts_PARRY_e || dComIfGp_getDoStatus() == dActStts_ba_sake__dupe_31 ||
+               dComIfGp_getDoStatus() == dActStts_ba_nageru__dupe_2D || dComIfGp_getDoStatus() == dActStts_ba_motu__dupe_2E)
     {
         fopMsgM_setNowAlphaZero(&i_Meter->field_0x1d38);
         fopMsgM_setNowAlpha(&i_Meter->field_0x1e18[1], dVar2);
@@ -2465,7 +2473,7 @@ void dMeter_actionAlpha(sub_meter_class* i_Meter) {
         fopMsgM_setNowAlphaZero(&i_Meter->field_0x27f0);
     }
     fopMsgM_setNowAlpha(&i_Meter->field_0x2908, dVar2);
-    if ((dMeter_isBit8(&i_Meter->field_0x3026, 1) != 0) && (i_Meter->field_0x27b8.mUserArea == 0)) {
+    if (dMeter_isBit8(&i_Meter->field_0x3026, 1) != 0 && i_Meter->field_0x27b8.mUserArea == 0) {
         i_Meter->field_0x1d38.pane->show();
         i_Meter->field_0x27b8.pane->show();
         i_Meter->field_0x27f0.pane->show();
@@ -2530,7 +2538,6 @@ void dMeter_xyInit(sub_meter_class* i_Meter) {
 
 /* 801F4FEC-801F5248       .text dMeter_xyMove__FP15sub_meter_class */
 void dMeter_xyMove(sub_meter_class* i_Meter) {
-    u8 dVar1;
     bool bVar2;
     bool bVar3;
     cXyz local_38;
@@ -2542,9 +2549,9 @@ void dMeter_xyMove(sub_meter_class* i_Meter) {
             dMeter_xyItemChange(i_Meter, itemBtn);
             bVar2 = false;
 #if VERSION == VERSION_DEMO
-            if ((i_Meter->field_0x3021[itemBtn] == dItemNo_MAGIC_ARROW_e) || (i_Meter->field_0x3021[itemBtn] == dItemNo_LIGHT_ARROW_e))
+            if (i_Meter->field_0x3021[itemBtn] == dItemNo_MAGIC_ARROW_e || i_Meter->field_0x3021[itemBtn] == dItemNo_LIGHT_ARROW_e)
 #else
-            if ((dComIfGp_getSelectItem(itemBtn) != dItemNo_MAGIC_ARROW_e) && (dComIfGp_getSelectItem(itemBtn) != dItemNo_LIGHT_ARROW_e))
+            if (dComIfGp_getSelectItem(itemBtn) != dItemNo_MAGIC_ARROW_e && dComIfGp_getSelectItem(itemBtn) != dItemNo_LIGHT_ARROW_e)
 #endif
             {
                 i_Meter->field_0x2320[itemBtn].pane->hide();
@@ -2560,10 +2567,9 @@ void dMeter_xyMove(sub_meter_class* i_Meter) {
     }
     dMeter_xyTrans(i_Meter);
     for (int itemBtn = 0; itemBtn < dItemBtn_COUNT_e; itemBtn++) {
-        dVar1 = dComIfGp_getSelectItem(itemBtn);
-        if ((dVar1 == dItemNo_MAGIC_ARROW_e) || (dVar1 == dItemNo_LIGHT_ARROW_e)) {
+        if (dComIfGp_getSelectItem(itemBtn) == dItemNo_MAGIC_ARROW_e || dComIfGp_getSelectItem(itemBtn) == dItemNo_LIGHT_ARROW_e) {
             dMeter_xyBowLightAnime(i_Meter, itemBtn);
-        } else if (dVar1 == dItemNo_FOREST_WATER_e) {
+        } else if (dComIfGp_getSelectItem(itemBtn) == dItemNo_FOREST_WATER_e) {
             bVar3 = true;
             local_38.set(i_Meter->field_0x2080[itemBtn].mPosCenter.x - 320.0f, i_Meter->field_0x2080[itemBtn].mPosCenter.y - 240.0f, 0.0f);
             for (s32 j = 0; j < 2; j++) {
@@ -2644,13 +2650,13 @@ int dMeter_xyEquipItem(int i_itemBtn) {
 
 /* 801F543C-801F57B0       .text dMeter_xyItemNumberSet__FP15sub_meter_classi */
 void dMeter_xyItemNumberSet(sub_meter_class* i_Meter, int i_itemBtn) {
-    if ((dComIfGp_getSelectItem(i_itemBtn) == dItemNo_PICTO_BOX_e) || (dComIfGp_getSelectItem(i_itemBtn) == dItemNo_DELUXE_PICTO_BOX_e)) {
+    if (dComIfGp_getSelectItem(i_itemBtn) == dItemNo_PICTO_BOX_e || dComIfGp_getSelectItem(i_itemBtn) == dItemNo_DELUXE_PICTO_BOX_e) {
         dMeter_PaneHide(&i_Meter->field_0x1f30[i_itemBtn]);
         dMeter_PaneShow(&i_Meter->field_0x1fd8[i_itemBtn]);
         dMeter_numberSet(i_Meter->field_0x1fd8[i_itemBtn].pane, dComIfGs_getPictureNum());
         dMeter_numberColor((J2DPicture*)i_Meter->field_0x1fd8[i_itemBtn].pane, dComIfGs_getPictureNum(), 3);
-    } else if ((dComIfGp_getSelectItem(i_itemBtn) == dItemNo_BOW_e) ||
-               (dComIfGp_getSelectItem(i_itemBtn) == dItemNo_MAGIC_ARROW_e || (dComIfGp_getSelectItem(i_itemBtn) == dItemNo_LIGHT_ARROW_e)))
+    } else if (dComIfGp_getSelectItem(i_itemBtn) == dItemNo_BOW_e ||
+               (dComIfGp_getSelectItem(i_itemBtn) == dItemNo_MAGIC_ARROW_e || dComIfGp_getSelectItem(i_itemBtn) == dItemNo_LIGHT_ARROW_e))
     {
         dMeter_PaneShow(&i_Meter->field_0x1f30[i_itemBtn]);
         dMeter_PaneShow(&i_Meter->field_0x1fd8[i_itemBtn]);
@@ -2673,7 +2679,7 @@ void dMeter_xyItemNumberSet(sub_meter_class* i_Meter, int i_itemBtn) {
         }
         dMeter_numberSet(i_Meter->field_0x1fd8[i_itemBtn].pane, dComIfGs_getBombNum() % 10);
         dMeter_numberColor((J2DPicture*)i_Meter->field_0x1fd8[i_itemBtn].pane, dComIfGs_getBombNum(), dComIfGs_getBombMax());
-    } else if ((dComIfGs_getSelectItem(i_itemBtn) >= dInvSlot_BeastFirst_e) && (dComIfGs_getSelectItem(i_itemBtn) <= dInvSlot_BeastLast_e - 1)) {
+    } else if (dComIfGs_getSelectItem(i_itemBtn) >= dInvSlot_BeastFirst_e && (dComIfGs_getSelectItem(i_itemBtn) <= dInvSlot_BeastLast_e - 1)) {
         dMeter_PaneShow(&i_Meter->field_0x1f30[i_itemBtn]);
         dMeter_PaneShow(&i_Meter->field_0x1fd8[i_itemBtn]);
         int beastIdx = dMeter_xyEquipItem(i_itemBtn);
@@ -2686,7 +2692,7 @@ void dMeter_xyItemNumberSet(sub_meter_class* i_Meter, int i_itemBtn) {
         dMeter_numberSet(i_Meter->field_0x1fd8[i_itemBtn].pane, dComIfGs_getBeastNum(beastIdx) % 10);
         dMeter_numberColor((J2DPicture*)i_Meter->field_0x1fd8[i_itemBtn].pane, dComIfGs_getBeastNum(beastIdx), 99);
     } else {
-        if ((dComIfGs_getSelectItem(i_itemBtn) >= dInvSlot_BaitFirst_e) && (dComIfGs_getSelectItem(i_itemBtn) <= dInvSlot_BaitLast_e - 1)) {
+        if (dComIfGs_getSelectItem(i_itemBtn) >= dInvSlot_BaitFirst_e && (dComIfGs_getSelectItem(i_itemBtn) <= dInvSlot_BaitLast_e - 1)) {
             if (dComIfGp_getSelectItem(i_itemBtn) == dItemNo_HYOI_PEAR_e) {
                 dMeter_PaneHide(&i_Meter->field_0x1f30[i_itemBtn]);
                 dMeter_PaneHide(&i_Meter->field_0x1fd8[i_itemBtn]);
@@ -2722,7 +2728,7 @@ void dMeter_xyBowLightAnime(sub_meter_class* i_Meter, int param_2) {
         dVar4 = fopMsgM_valueIncrease(0x3c, 0x78 - iVar2, 0);
     }
     dVar5 = (1.0f - (dVar4 * 0.39999998f));
-    lVar6 = ((i_Meter->field_0x2320[0].mInitAlpha) - ((i_Meter->field_0x2320[0].mInitAlpha - 50.0f) * dVar4));
+    lVar6 = (i_Meter->field_0x2320[0].mInitAlpha - ((i_Meter->field_0x2320[0].mInitAlpha - 50.0f) * dVar4));
     for (s32 i = 0; i < 3; i++) {
         // TODO: this indexing seems wrong. field_0x2320 may be a 2D array of 3x3
         fopMsgM_paneScaleXY(&(&i_Meter->field_0x2320[param_2])[i*3], dVar5);
@@ -2753,9 +2759,9 @@ void dMeter_xyItemCountUp(sub_meter_class* i_Meter) {
         dComIfGs_setPictureNum(sVar4);
         bVar3 = true;
     }
-    if ((((dComIfGs_checkGetItem(dItemNo_BOW_e)) || (dComIfGs_checkGetItem(dItemNo_MAGIC_ARROW_e)) || (dComIfGs_checkGetItem(dItemNo_LIGHT_ARROW_e))) &&
-         (dComIfGp_getItemArrowNumCount() != 0)) ||
-        (arrowMax != dComIfGs_getArrowMax()))
+    if (((dComIfGs_checkGetItem(dItemNo_BOW_e) || dComIfGs_checkGetItem(dItemNo_MAGIC_ARROW_e) || dComIfGs_checkGetItem(dItemNo_LIGHT_ARROW_e)) &&
+         dComIfGp_getItemArrowNumCount() != 0) ||
+        arrowMax != dComIfGs_getArrowMax())
     {
         if (g_meterHIO.field_0x62 != 0) {
             dComIfGp_clearItemArrowNumCount();
@@ -2772,7 +2778,7 @@ void dMeter_xyItemCountUp(sub_meter_class* i_Meter) {
         arrowMax = dComIfGs_getArrowMax();
         bVar3 = 1;
     }
-    if (((dComIfGs_checkGetItem(dItemNo_BOMB_BAG_e)) && (dComIfGp_getItemBombNumCount() != 0)) || (bombMax != dComIfGs_getBombMax())) {
+    if ((dComIfGs_checkGetItem(dItemNo_BOMB_BAG_e) && dComIfGp_getItemBombNumCount() != 0) || bombMax != dComIfGs_getBombMax()) {
         if (g_meterHIO.field_0x63 != 0) {
             g_dComIfG_gameInfo.play.mItemBombNumCount = 0;
         }
@@ -2881,7 +2887,7 @@ void dMeter_xyItemChange(sub_meter_class* i_Meter, int i_itemBtn) {
                 i_Meter->field_0x2470[i_itemBtn].pane->show();
                 var_r4 = dItemNo_BOW_e;
             }
-            if ((var_r4 == dItemNo_MAGIC_ARROW_e) || (var_r4 == dItemNo_LIGHT_ARROW_e)) {
+            if (var_r4 == dItemNo_MAGIC_ARROW_e || var_r4 == dItemNo_LIGHT_ARROW_e) {
                 var_r4 = dItemNo_BOW_e;
             }
             pArc = dComIfGp_getItemIconArchive();
@@ -2907,126 +2913,204 @@ void dMeter_xyRotateZ(fopMsgM_pane_class* param_1, f32 param_2, f32 param_3) {
 
 /* 801F6084-801F69A0       .text dMeter_xyAlpha__FP15sub_meter_class */
 void dMeter_xyAlpha(sub_meter_class* i_Meter) {
-    u8 dVar2;
     f32 dVar10;
     f32 dVar11;
     f32 dVar12;
 
     static s16 alphaNowFrame[] = {0x0000, 0x0000, 0x0000};
 
-    if ((!(i_Meter->mStatusFlags & dMtrStts_UNK4000_e)) && ((!(i_Meter->mStatusFlags & dMtrStts_UNK40_e)) || (!(dComIfGp_event_checkHind(1))))) {
-        if ((((((!(i_Meter->mStatusFlags & dMtrStts_UNK100_e)) && (!(i_Meter->mStatusFlags & dMtrStts_UNK10_e))) &&
-               (!(i_Meter->mStatusFlags & dMtrStts_UNK800000_e))) &&
-              (!(i_Meter->mStatusFlags & dMtrStts_UNK20_e) || (dStage_stagInfo_GetUpButton(dComIfGp_getStageStagInfo()) != 1))) &&
-             (!(i_Meter->mStatusFlags & dMtrStts_UNK80_e) &&
-              (!(i_Meter->mStatusFlags & dMtrStts_UNK100000_e) && (!(i_Meter->mStatusFlags & dMtrStts_UNK200000_e))))) &&
-            (!(i_Meter->mStatusFlags & dMtrStts_UNK20000_e) &&
-             ((!(i_Meter->mStatusFlags & dMtrStts_UNK40000_e) && (!(i_Meter->mStatusFlags & dMtrStts_UNK80000_e))) &&
-              (!(i_Meter->mStatusFlags & dMtrStts_UNK400000_e)))))
+    if (
+        !(i_Meter->mStatusFlags & dMtrStts_UNK4000_e) &&
+        (!(i_Meter->mStatusFlags & dMtrStts_UNK40_e) || !dComIfGp_event_checkHind(1)) &&
+        !(i_Meter->mStatusFlags & dMtrStts_UNK100_e) &&
+        !(i_Meter->mStatusFlags & dMtrStts_UNK10_e) &&
+        !(i_Meter->mStatusFlags & dMtrStts_UNK800000_e) &&
+        (!(i_Meter->mStatusFlags & dMtrStts_UNK20_e) || (dStage_stagInfo_GetUpButton(dComIfGp_getStageStagInfo()) != 1)) &&
+        !(i_Meter->mStatusFlags & dMtrStts_UNK80_e) &&
+        !(i_Meter->mStatusFlags & dMtrStts_UNK100000_e) &&
+        !(i_Meter->mStatusFlags & dMtrStts_UNK200000_e) &&
+        !(i_Meter->mStatusFlags & dMtrStts_UNK20000_e) &&
+        !(i_Meter->mStatusFlags & dMtrStts_UNK40000_e) &&
+        !(i_Meter->mStatusFlags & dMtrStts_UNK80000_e) &&
+        !(i_Meter->mStatusFlags & dMtrStts_UNK400000_e)
+    )
+    {
+        if (i_Meter->mStatusFlags & dMtrStts_UNK8_e) {
+            for (s32 i = 0; i < 3; i++) {
+                if (alphaNowFrame[i] < 5) {
+                    alphaNowFrame[i]++;
+                } else {
+                    alphaNowFrame[i] = 5;
+                }
+            }
+        } else if (!(i_Meter->mStatusFlags & dMtrStts_UNK8_e) &&
+                    (((i_Meter->mStatusFlags & dMtrStts_UNK800_e) || (i_Meter->mStatusFlags & dMtrStts_UNK2000_e)) ||
+                    ((i_Meter->mStatusFlags & dMtrStts_UNK8000_e) ||
+                        ((i_Meter->mStatusFlags & dMtrStts_UNK200_e) || (i_Meter->mStatusFlags & dMtrStts_UNK10000_e)))))
         {
-            if (i_Meter->mStatusFlags & dMtrStts_UNK8_e) {
-                for (s32 i = 0; i < 3; i++) {
-                    if (alphaNowFrame[i] < 5) {
+            for (s32 i = 0; i < 3; i++) {
+                if (alphaNowFrame[i] > 3) {
+                    alphaNowFrame[i]--;
+                } else {
+                    if (alphaNowFrame[i] < 3) {
                         alphaNowFrame[i]++;
                     } else {
-                        alphaNowFrame[i] = 5;
+                        alphaNowFrame[i] = 3;
                     }
                 }
-            } else if ((!(i_Meter->mStatusFlags & dMtrStts_UNK8_e)) &&
-                       (((i_Meter->mStatusFlags & dMtrStts_UNK800_e) || (i_Meter->mStatusFlags & dMtrStts_UNK2000_e)) ||
-                        ((i_Meter->mStatusFlags & dMtrStts_UNK8000_e) ||
-                         ((i_Meter->mStatusFlags & dMtrStts_UNK200_e) || (i_Meter->mStatusFlags & dMtrStts_UNK10000_e)))))
-            {
-                for (s32 i = 0; i < 3; i++) {
-                    if (alphaNowFrame[i] > 3) {
-                        alphaNowFrame[i]--;
+            }
+        } else if ((i_Meter->mStatusFlags & dMtrStts_UNK20_e) && (dStage_stagInfo_GetUpButton(dComIfGp_getStageStagInfo()) == 0)) {
+            for (s32 i = 0; i < 3; i++) {
+                if (i == 1) {
+                    if (alphaNowFrame[i] < 5) {
+                        alphaNowFrame[i]++;
                     } else {
-                        if (alphaNowFrame[i] < 3) {
-                            alphaNowFrame[i]++;
-                        } else {
-                            alphaNowFrame[i] = 3;
-                        }
+                        alphaNowFrame[i] = 5;
                     }
+                } else if ((s32)alphaNowFrame[i] > 0) {
+                    alphaNowFrame[i] = alphaNowFrame[i] + -1;
+                } else {
+                    alphaNowFrame[i] = 0;
                 }
-            } else {
-                if ((i_Meter->mStatusFlags & dMtrStts_UNK20_e) && (dStage_stagInfo_GetUpButton(dComIfGp_getStageStagInfo()) == 0)) {
-                    for (s32 i = 0; i < 3; i++) {
-                        if (i == 1) {
-                            if (alphaNowFrame[i] < 5) {
-                                alphaNowFrame[i]++;
-                            } else {
-                                alphaNowFrame[i] = 5;
-                            }
-                        } else if ((s32)alphaNowFrame[i] > 0) {
-                            alphaNowFrame[i] = alphaNowFrame[i] + -1;
-                        } else {
-                            alphaNowFrame[i] = 0;
-                        }
+            }
+        } else {
+            for (int itemBtn = 0; itemBtn < dItemBtn_COUNT_e; itemBtn++) {
+                if (((i_Meter->mStatusFlags & dMtrStts_UNK1000_e) && dComIfGp_getSelectItem(itemBtn) != dItemNo_GRAPPLING_HOOK_e) ||
+                    ((i_Meter->mStatusFlags & dMtrStts_UNK80_e) && dComIfGp_getSelectItem(itemBtn) != dItemNo_TELESCOPE_e) ||
+                    (
+                        (i_Meter->mStatusFlags & dMtrStts_UNK20000_e) && (
+                            dComIfGp_getSelectItem(itemBtn) != dItemNo_PICTO_BOX_e || dComIfGp_getSelectItem(itemBtn) != dItemNo_DELUXE_PICTO_BOX_e)
+                        ) ||
+                    (
+                        (i_Meter->mStatusFlags & dMtrStts_UNK400_e) &&
+                        dComIfGp_getMiniGameType() != 1 &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_SAIL_e &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_TELESCOPE_e &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_WIND_WAKER_e &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_GRAPPLING_HOOK_e &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_BOOMERANG_e &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_TINGLE_TUNER_e &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_PICTO_BOX_e &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_DELUXE_PICTO_BOX_e &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_MAGIC_ARMOR_e &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_BAIT_BAG_e &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_HYOI_PEAR_e &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_BIRD_BAIT_5_e &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_BOW_e &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_MAGIC_ARROW_e &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_LIGHT_ARROW_e &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_BOMB_BAG_e &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_HOOKSHOT_e &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_EMPTY_BOTTLE_e &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_RED_POTION_e &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_GREEN_POTION_e &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_BLUE_POTION_e &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_HALF_SOUP_BOTTLE_e &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_SOUP_BOTTLE_e &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_WATER_BOTTLE_e &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_FAIRY_BOTTLE_e &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_FIREFLY_BOTTLE_e &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_FOREST_WATER_e
+                    ) ||
+                    (
+                        dComIfGp_getMiniGameType() == 1 &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_SAIL_e &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_TELESCOPE_e
+                    ) ||
+                    (
+                        dStage_stagInfo_GetSTType(dComIfGp_getStageStagInfo()) == dStageType_BOSS_e &&
+                        (
+                            (strcmp(dComIfGp_getStartStageName(), "Xboss0") == 0) ||
+                            (strcmp(dComIfGp_getStartStageName(), "Xboss1") == 0) ||
+                            (strcmp(dComIfGp_getStartStageName(), "Xboss2") == 0) ||
+                            (strcmp(dComIfGp_getStartStageName(), "Xboss3") == 0)
+                        ) &&
+                        (
+                            dComIfGp_getSelectItem(itemBtn) == dItemNo_WATER_BOTTLE_e ||
+                            dComIfGp_getSelectItem(itemBtn) == dItemNo_FIREFLY_BOTTLE_e ||
+                            dComIfGp_getSelectItem(itemBtn) == dItemNo_FOREST_WATER_e
+                        )
+                    ) ||
+                    (
+                        (i_Meter->mStatusFlags & dMtrStts_UNK2_e) &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_TINGLE_TUNER_e &&
+                        (
+                            dComIfGp_getSelectItem(itemBtn) != dItemNo_WIND_WAKER_e ||
+                            (strcmp(dComIfGp_getStartStageName(), "Otkura") != 0)) &&
+                        (
+                            dComIfGp_getSelectItem(itemBtn) != dItemNo_GRAPPLING_HOOK_e ||
+                            (strcmp(dComIfGp_getStartStageName(), "Abesso") != 0)
+                        ) &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_PICTO_BOX_e &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_DELUXE_PICTO_BOX_e &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_SPOILS_BAG_e &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_SKULL_NECKLACE_e &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_BOKOBABA_SEED_e &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_GOLDEN_FEATHER_e &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_KNIGHTS_CREST_e &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_RED_JELLY_e &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_GREEN_JELLY_e &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_BLUE_JELLY_e &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_JOY_PENDANT_e &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_BAIT_BAG_e &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_BIRD_BAIT_5_e &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_HYOI_PEAR_e &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_EMPTY_BOTTLE_e &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_RED_POTION_e &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_GREEN_POTION_e &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_BLUE_POTION_e &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_HALF_SOUP_BOTTLE_e &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_SOUP_BOTTLE_e &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_WATER_BOTTLE_e &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_FAIRY_BOTTLE_e &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_FIREFLY_BOTTLE_e &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_FOREST_WATER_e &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_DELIVERY_BAG_e &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_TOWN_FLOWER_e &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_SEA_FLOWER_e &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_EXOTIC_FLOWER_e &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_HEROS_FLAG_e &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_BIG_CATCH_FLAG_e &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_BIG_SALE_FLAG_e &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_PINWHEEL_e &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_SICKLE_MOON_FLAG_e &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_SKULL_TOWER_IDOL_e &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_FOUNTAIN_IDOL_e &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_POSTMAN_STATUE_e &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_SHOP_GURU_STATUE_e &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_FATHER_LETTER_e &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_NOTE_TO_MOM_e &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_MAGGIES_LETTER_e &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_MOBLINS_LETTER_e &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_CABANA_DEED_e &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_COMPLIMENTARY_ID_e &&
+                        dComIfGp_getSelectItem(itemBtn) != dItemNo_FILL_UP_COUPON_e
+                    )
+                )
+                {
+                    if (alphaNowFrame[itemBtn] > 3) {
+                        alphaNowFrame[itemBtn]--;
+                    } else if (alphaNowFrame[itemBtn] < 3) {
+                        alphaNowFrame[itemBtn]++;
+                    } else {
+                        alphaNowFrame[itemBtn] = 3;
                     }
                 } else {
-                    for (int itemBtn = 0; itemBtn < dItemBtn_COUNT_e; itemBtn++) {
-                        if (((i_Meter->mStatusFlags & dMtrStts_UNK1000_e) && (dComIfGp_getSelectItem(itemBtn) != dItemNo_GRAPPLING_HOOK_e)) ||
-                            ((i_Meter->mStatusFlags & dMtrStts_UNK80_e) && (dComIfGp_getSelectItem(itemBtn) != dItemNo_TELESCOPE_e)) ||
-                            ((i_Meter->mStatusFlags & dMtrStts_UNK20000_e) &&
-                             ((dVar2 = dComIfGp_getSelectItem(itemBtn), ((dVar2 == dItemNo_PICTO_BOX_e) == 0)) || (dVar2 != dItemNo_DELUXE_PICTO_BOX_e))) ||
-                            ((i_Meter->mStatusFlags & dMtrStts_UNK400_e) && (dComIfGp_getMiniGameType() != 1) &&
-                             (dVar2 = dComIfGp_getSelectItem(itemBtn), ((dVar2 == dItemNo_SAIL_e) == 0)) && (dVar2 != dItemNo_TELESCOPE_e) &&
-                             (dVar2 != dItemNo_WIND_WAKER_e) && (dVar2 != dItemNo_GRAPPLING_HOOK_e) && (dVar2 != dItemNo_BOOMERANG_e) &&
-                             (dVar2 != dItemNo_TINGLE_TUNER_e) && (dVar2 != dItemNo_PICTO_BOX_e) && (dVar2 != dItemNo_DELUXE_PICTO_BOX_e) && (dVar2 != dItemNo_MAGIC_ARMOR_e) &&
-                             (dVar2 != dItemNo_BAIT_BAG_e) && (dVar2 != dItemNo_HYOI_PEAR_e) && (dVar2 != dItemNo_BIRD_BAIT_5_e) && (dVar2 != dItemNo_BOW_e) &&
-                             (dVar2 != dItemNo_MAGIC_ARROW_e) && (dVar2 != dItemNo_LIGHT_ARROW_e) && (dVar2 != dItemNo_BOMB_BAG_e) && (dVar2 != dItemNo_HOOKSHOT_e) &&
-                             (dVar2 != dItemNo_EMPTY_BOTTLE_e) && (dVar2 != dItemNo_RED_POTION_e) && (dVar2 != dItemNo_GREEN_POTION_e) &&
-                             (dVar2 != dItemNo_BLUE_POTION_e) && (dVar2 != dItemNo_HALF_SOUP_BOTTLE_e) && (dVar2 != dItemNo_SOUP_BOTTLE_e) &&
-                             (dVar2 != dItemNo_WATER_BOTTLE_e) && (dVar2 != dItemNo_FAIRY_BOTTLE_e) && (dVar2 != dItemNo_FIREFLY_BOTTLE_e) &&
-                             (dVar2 != dItemNo_FOREST_WATER_e)) ||
-                            ((dComIfGp_getMiniGameType() == 1) && (dVar2 = dComIfGp_getSelectItem(itemBtn), ((dVar2 == dItemNo_SAIL_e) == 0)) &&
-                             (dVar2 != dItemNo_TELESCOPE_e)) ||
-                            ((dStage_stagInfo_GetSTType(dComIfGp_getStageStagInfo()) == dStageType_BOSS_e) &&
-                             ((strcmp(dComIfGp_getStartStageName(), "Xboss0") == 0) || (strcmp(dComIfGp_getStartStageName(), "Xboss1") == 0) ||
-                              (strcmp(dComIfGp_getStartStageName(), "Xboss2") == 0) || (strcmp(dComIfGp_getStartStageName(), "Xboss3") == 0)) &&
-                             ((dVar2 = dComIfGp_getSelectItem(itemBtn), (dVar2 == dItemNo_WATER_BOTTLE_e)) || ((u8)dVar2 == dItemNo_FIREFLY_BOTTLE_e) ||
-                              (dVar2 == dItemNo_FOREST_WATER_e))) ||
-                            ((i_Meter->mStatusFlags & dMtrStts_UNK2_e) && (dVar2 = dComIfGp_getSelectItem(itemBtn), (dVar2 == dItemNo_TINGLE_TUNER_e) == 0) &&
-                             ((dVar2 != dItemNo_WIND_WAKER_e) || (strcmp(dComIfGp_getStartStageName(), "Otkura") != 0)) &&
-                             ((dComIfGp_getSelectItem(itemBtn) != dItemNo_GRAPPLING_HOOK_e) || (strcmp(dComIfGp_getStartStageName(), "Abesso") != 0)) &&
-                             (dVar2 = dComIfGp_getSelectItem(itemBtn), ((dVar2 == dItemNo_PICTO_BOX_e) == 0)) && (dVar2 != dItemNo_DELUXE_PICTO_BOX_e) && (dVar2 != dItemNo_SPOILS_BAG_e) &&
-                             (dVar2 != dItemNo_SKULL_NECKLACE_e) && (dVar2 != dItemNo_BOKOBABA_SEED_e) && (dVar2 != dItemNo_GOLDEN_FEATHER_e) &&
-                             (dVar2 != dItemNo_KNIGHTS_CREST_e) && (dVar2 != dItemNo_RED_JELLY_e) && (dVar2 != dItemNo_GREEN_JELLY_e) && (dVar2 != dItemNo_BLUE_JELLY_e) &&
-                             (dVar2 != dItemNo_JOY_PENDANT_e) && (dVar2 != dItemNo_BAIT_BAG_e) && (dVar2 != dItemNo_BIRD_BAIT_5_e) && (dVar2 != dItemNo_HYOI_PEAR_e) &&
-                             (dVar2 != dItemNo_EMPTY_BOTTLE_e) && (dVar2 != dItemNo_RED_POTION_e) && (dVar2 != dItemNo_GREEN_POTION_e) &&
-                             (dVar2 != dItemNo_BLUE_POTION_e) && (dVar2 != dItemNo_HALF_SOUP_BOTTLE_e) && (dVar2 != dItemNo_SOUP_BOTTLE_e) &&
-                             (dVar2 != dItemNo_WATER_BOTTLE_e) && (dVar2 != dItemNo_FAIRY_BOTTLE_e) && (dVar2 != dItemNo_FIREFLY_BOTTLE_e) &&
-                             (dVar2 != dItemNo_FOREST_WATER_e) && (dVar2 != dItemNo_DELIVERY_BAG_e) && (dVar2 != dItemNo_TOWN_FLOWER_e) && (dVar2 != dItemNo_SEA_FLOWER_e) &&
-                             (dVar2 != dItemNo_EXOTIC_FLOWER_e) && (dVar2 != dItemNo_HEROS_FLAG_e) && (dVar2 != dItemNo_BIG_CATCH_FLAG_e) && (dVar2 != dItemNo_BIG_SALE_FLAG_e) && (dVar2 != dItemNo_PINWHEEL_e) &&
-                             (dVar2 != dItemNo_SICKLE_MOON_FLAG_e) && (dVar2 != dItemNo_SKULL_TOWER_IDOL_e) && (dVar2 != dItemNo_FOUNTAIN_IDOL_e) && (dVar2 != dItemNo_POSTMAN_STATUE_e) &&
-                             (dVar2 != dItemNo_SHOP_GURU_STATUE_e) && (dVar2 != dItemNo_FATHER_LETTER_e) && (dVar2 != dItemNo_NOTE_TO_MOM_e) && (dVar2 != dItemNo_MAGGIES_LETTER_e) &&
-                             (dVar2 != dItemNo_MOBLINS_LETTER_e) && (dVar2 != dItemNo_CABANA_DEED_e) && (dVar2 != dItemNo_COMPLIMENTARY_ID_e) && (dVar2 != dItemNo_FILL_UP_COUPON_e)))
-                        {
-                            if (alphaNowFrame[itemBtn] > 3) {
-                                alphaNowFrame[itemBtn]--;
-                            } else if (alphaNowFrame[itemBtn] < 3) {
-                                alphaNowFrame[itemBtn]++;
-                            } else {
-                                alphaNowFrame[itemBtn] = 3;
-                            }
-                        } else {
-                            if (alphaNowFrame[itemBtn] < 5) {
-                                alphaNowFrame[itemBtn]++;
-                            } else {
-                                alphaNowFrame[itemBtn] = 5;
-                            }
-                            switch (itemBtn) {
-                            case 0:
-                                i_Meter->field_0x3024 |= 4;
-                                break;
-                            case 1:
-                                i_Meter->field_0x3024 |= 8;
-                                break;
-                            case 2:
-                                i_Meter->field_0x3024 |= 0x20;
-                                break;
-                            }
-                        }
+                    if (alphaNowFrame[itemBtn] < 5) {
+                        alphaNowFrame[itemBtn]++;
+                    } else {
+                        alphaNowFrame[itemBtn] = 5;
+                    }
+                    switch (itemBtn) {
+                    case 0:
+                        i_Meter->field_0x3024 |= 4;
+                        break;
+                    case 1:
+                        i_Meter->field_0x3024 |= 8;
+                        break;
+                    case 2:
+                        i_Meter->field_0x3024 |= 0x20;
+                        break;
                     }
                 }
             }
@@ -3077,7 +3161,7 @@ void dMeter_xyTrans(sub_meter_class* i_Meter) {
     static f32 nowY = 0.0f;
     if ((i_Meter->mStatusFlags & dMtrStts_UNK4000_e) || ((i_Meter->mStatusFlags & dMtrStts_UNK40_e) && dComIfGp_event_checkHind(1)) ||
         (i_Meter->mStatusFlags & dMtrStts_UNK100_e) ||
-        (((dMenu_flag() && (dMenu_getPushMenuButton() == 2 || (dMenu_getMenuStatus() == 2 && (dMenu_getPushMenuButton() == 0)))) ||
+        (((dMenu_flag() && (dMenu_getPushMenuButton() == 2 || (dMenu_getMenuStatus() == 2 && dMenu_getPushMenuButton() == 0))) ||
           (i_Meter->mStatusFlags & dMtrStts_UNK800000_e)) ||
          (((((i_Meter->mStatusFlags & dMtrStts_UNK20_e) && (dStage_stagInfo_GetUpButton(dComIfGp_getStageStagInfo()) == 1)) ||
             (i_Meter->mStatusFlags & dMtrStts_UNK80_e)) ||
@@ -3091,7 +3175,7 @@ void dMeter_xyTrans(sub_meter_class* i_Meter) {
             dMeter_offBit8(&i_Meter->field_0x3026, 4);
         }
         moveStatus = 1;
-    } else if ((dMenu_flag()) && (dMenu_getPushMenuButton() == 1 || (dMenu_getMenuStatus() == 1 && (dMenu_getPushMenuButton() == 0)))) {
+    } else if (dMenu_flag() && (dMenu_getPushMenuButton() == 1 || (dMenu_getMenuStatus() == 1 && dMenu_getPushMenuButton() == 0))) {
         if (dMenu_getItemMode() == 0) {
             if (moveStatus != 2) {
                 moveFlag = 1;
@@ -3107,13 +3191,13 @@ void dMeter_xyTrans(sub_meter_class* i_Meter) {
         }
     } else {
         if (i_Meter->mStatusFlags & dMtrStts_UNK20_e) {
-            if ((((dMeter_Info.mButtonIconMode == 0) || (dMeter_Info.mButtonIconMode == 1)) || (dMeter_Info.mButtonIconMode == 2)) || (dMeter_Info.mButtonIconMode == 3)) {
+            if (dMeter_Info.mButtonIconMode == 0 || dMeter_Info.mButtonIconMode == 1 || dMeter_Info.mButtonIconMode == 2 || dMeter_Info.mButtonIconMode == 3) {
                 if (moveStatus != 3) {
                     moveFlag = 1;
                     dMeter_offBit8(&i_Meter->field_0x3026, 4);
                 }
                 moveStatus = 3;
-            } else if (((dMeter_Info.mButtonIconMode == 7) || (dMeter_Info.mButtonIconMode == 8)) || (dMeter_Info.mButtonIconMode == 9 || (dMeter_Info.mButtonIconMode == 10))) {
+            } else if (dMeter_Info.mButtonIconMode == 7 || dMeter_Info.mButtonIconMode == 8 || dMeter_Info.mButtonIconMode == 9 || dMeter_Info.mButtonIconMode == 10) {
                 if (moveStatus != 4) {
                     moveFlag = 1;
                     dMeter_offBit8(&i_Meter->field_0x3026, 4);
@@ -3202,7 +3286,7 @@ void dMeter_rInit(sub_meter_class* i_Meter) {
     i_Meter->field_0x1cc8.mUserArea = 0;
     i_Meter->field_0x301c = 0;
     dComIfGp_setRStatus(dActStts_BLANK_e);
-    if ((dComIfGp_getRStatus() == dActStts_RETURN_e) || (dComIfGp_getRStatus() == dActStts_RETURN_e)) {
+    if (dComIfGp_getRStatus() == dActStts_RETURN_e || dComIfGp_getRStatus() == dActStts_RETURN_e) {
         pArc = dComIfGp_getMenuArchive();
     } else {
         pArc = dComIfGp_getActionIconArchive();
@@ -3223,7 +3307,7 @@ void dMeter_rMove(sub_meter_class* i_Meter) {
     }
     if (i_Meter->field_0x1cc8.mUserArea != 0) {
         if (dComIfGp_getRStatus() != dActStts_BLANK_e) {
-            if ((dComIfGp_getRStatus() == dActStts_RETURN_e) || (dComIfGp_getRStatus() == dActStts_RETURN_e)) {
+            if (dComIfGp_getRStatus() == dActStts_RETURN_e || dComIfGp_getRStatus() == dActStts_RETURN_e) {
                 pArc = dComIfGp_getMenuArchive();
             } else {
                 pArc = dComIfGp_getActionIconArchive();
@@ -3259,12 +3343,24 @@ void dMeter_rAlpha(sub_meter_class* i_Meter) {
     f32 dVar6;
 
     static s16 alphaNowFrame = 0;
-    if (((i_Meter->mStatusFlags & dMtrStts_UNK4000_e) || ((i_Meter->mStatusFlags & dMtrStts_UNK40_e) && (dComIfGp_event_checkHind(8)))) ||
-        (((((i_Meter->mStatusFlags & dMtrStts_UNK100_e) || (i_Meter->mStatusFlags & dMtrStts_UNK200_e)) || (i_Meter->mStatusFlags & dMtrStts_UNK8_e)) ||
-          ((i_Meter->mStatusFlags & dMtrStts_UNK10_e) || (i_Meter->mStatusFlags & dMtrStts_UNK800000_e))) ||
-         ((i_Meter->mStatusFlags & dMtrStts_UNK20_e) || ((i_Meter->mStatusFlags & dMtrStts_UNK80_e) || (i_Meter->mStatusFlags & dMtrStts_UNK100000_e)))) ||
-        ((i_Meter->mStatusFlags & dMtrStts_UNK200000_e) ||
-         (((i_Meter->mStatusFlags & dMtrStts_UNK40000_e) || (i_Meter->mStatusFlags & dMtrStts_UNK80000_e)) || (i_Meter->mStatusFlags & dMtrStts_UNK400000_e))))
+    if (
+        (
+            (i_Meter->mStatusFlags & dMtrStts_UNK4000_e) ||
+            ((i_Meter->mStatusFlags & dMtrStts_UNK40_e) && dComIfGp_event_checkHind(8)) ||
+            (i_Meter->mStatusFlags & dMtrStts_UNK100_e) ||
+            (i_Meter->mStatusFlags & dMtrStts_UNK200_e) ||
+            (i_Meter->mStatusFlags & dMtrStts_UNK8_e) ||
+            (i_Meter->mStatusFlags & dMtrStts_UNK10_e) ||
+            (i_Meter->mStatusFlags & dMtrStts_UNK800000_e) ||
+            (i_Meter->mStatusFlags & dMtrStts_UNK20_e) ||
+            (i_Meter->mStatusFlags & dMtrStts_UNK80_e) ||
+            (i_Meter->mStatusFlags & dMtrStts_UNK100000_e) ||
+            (i_Meter->mStatusFlags & dMtrStts_UNK200000_e) ||
+            (i_Meter->mStatusFlags & dMtrStts_UNK40000_e) ||
+            (i_Meter->mStatusFlags & dMtrStts_UNK80000_e) ||
+            (i_Meter->mStatusFlags & dMtrStts_UNK400000_e)
+        )
+    )
     {
         if (alphaNowFrame < 5) {
             alphaNowFrame++;
@@ -3302,7 +3398,7 @@ void dMeter_rAlpha(sub_meter_class* i_Meter) {
         fopMsgM_setNowAlpha(&i_Meter->field_0x26a0, dVar5);
         fopMsgM_setNowAlpha(&i_Meter->field_0x26d8, dVar5);
     }
-    if ((dMeter_isBit8(&i_Meter->field_0x3026, 8) != 0) && (i_Meter->field_0x1cc8.mUserArea == 0)) {
+    if (dMeter_isBit8(&i_Meter->field_0x3026, 8) != 0 && i_Meter->field_0x1cc8.mUserArea == 0) {
         i_Meter->field_0x1cc8.pane->show();
     } else {
         i_Meter->field_0x1cc8.pane->hide();
@@ -3316,8 +3412,8 @@ void dMeter_rTrans(sub_meter_class* i_Meter) {
     static s16 moveStatus = 0;
     static f32 nowX = 0.0f;
     static f32 nowY = 0.0f;
-    if ((i_Meter->mStatusFlags & dMtrStts_UNK4000_e) || ((i_Meter->mStatusFlags & dMtrStts_UNK40_e) && (dComIfGp_event_checkHind(8))) ||
-        ((i_Meter->mStatusFlags & dMtrStts_UNK100_e) || (dComIfGp_getRStatus() == dActStts_HIDDEN_e)))
+    if ((i_Meter->mStatusFlags & dMtrStts_UNK4000_e) || ((i_Meter->mStatusFlags & dMtrStts_UNK40_e) && dComIfGp_event_checkHind(8)) ||
+        ((i_Meter->mStatusFlags & dMtrStts_UNK100_e) || dComIfGp_getRStatus() == dActStts_HIDDEN_e))
     {
         if (moveStatus != 1) {
             moveFlag = 1;
@@ -3339,9 +3435,9 @@ void dMeter_rTrans(sub_meter_class* i_Meter) {
                 }
                 moveStatus = 4;
             } else {
-                if (((dMenu_flag()) && (dComIfGp_getPictureStatus() != 2) &&
-                     ((dMenu_getPushMenuButton() == 1) || ((dMenu_getMenuStatus() == 1) && (dMenu_getPushMenuButton() == 0)))) ||
-                    ((dMenu_flag()) && ((dMenu_getPushMenuButton() == 2) || ((dMenu_getMenuStatus() == 2) && (dMenu_getPushMenuButton() == 0)))) ||
+                if ((dMenu_flag() && dComIfGp_getPictureStatus() != 2 &&
+                     (dMenu_getPushMenuButton() == 1 || (dMenu_getMenuStatus() == 1 && dMenu_getPushMenuButton() == 0))) ||
+                    (dMenu_flag() && (dMenu_getPushMenuButton() == 2 || (dMenu_getMenuStatus() == 2 && dMenu_getPushMenuButton() == 0))) ||
                     (i_Meter->mStatusFlags & dMtrStts_UNK800000_e) ||
                     ((i_Meter->mStatusFlags & dMtrStts_UNK20_e) && (dStage_stagInfo_GetUpButton(dComIfGp_getStageStagInfo()) == 1)) ||
                     (i_Meter->mStatusFlags & dMtrStts_UNK80_e) ||
@@ -3355,14 +3451,14 @@ void dMeter_rTrans(sub_meter_class* i_Meter) {
                     moveStatus = 1;
                 } else {
                     if (i_Meter->mStatusFlags & dMtrStts_UNK20_e) {
-                        if (((dMeter_Info.mButtonIconMode == 0) || (dMeter_Info.mButtonIconMode == 1)) || (dMeter_Info.mButtonIconMode == 2 || (dMeter_Info.mButtonIconMode == 3))) {
+                        if (dMeter_Info.mButtonIconMode == 0 || dMeter_Info.mButtonIconMode == 1 || dMeter_Info.mButtonIconMode == 2 || dMeter_Info.mButtonIconMode == 3) {
                             if (moveStatus != 3) {
                                 moveFlag = 1;
                                 dMeter_offBit8(&i_Meter->field_0x3026, 8);
                             }
                             moveStatus = 3;
-                        } else if ((((dMeter_Info.mButtonIconMode == 7) || (dMeter_Info.mButtonIconMode == 8)) || (dMeter_Info.mButtonIconMode == 9)) ||
-                                   (dMeter_Info.mButtonIconMode == 10))
+                        } else if (dMeter_Info.mButtonIconMode == 7 || dMeter_Info.mButtonIconMode == 8 || dMeter_Info.mButtonIconMode == 9 ||
+                                   dMeter_Info.mButtonIconMode == 10)
                         {
                             if (moveStatus != 5) {
                                 moveFlag = 1;
@@ -3455,31 +3551,29 @@ void dMeter_enemyMove(sub_meter_class* i_Meter) {
     stage_stag_info_class* stage_info = dComIfGp_getStageStagInfo();
     JUT_ASSERT(7176, stage_info != NULL);
     if (attention != NULL) {
-        if (((!dMenu_flag()) && (!dComIfGp_event_runCheck())) && (attention->LockonTarget(0) != NULL) &&
-            ((((((attention->LockonTarget(0)->max_health > 0.0f) && (dComIfGs_isCollect(4, 1) != 0)) &&
-                ((attention->LockonTruth() & 0xff) != 0 &&
-                 (attention->LockonTarget(0)->group == fopAc_ENEMY_e && (fopAcM_GetName(attention->LockonTarget(0)) != fpcNm_BTD_e)))) &&
-               (fopAcM_GetName(attention->LockonTarget(0)) != fpcNm_BMD_e)) &&
-              (((fopAcM_GetName(attention->LockonTarget(0)) != fpcNm_BDK_e && (fopAcM_GetName(attention->LockonTarget(0)) != fpcNm_BPW_e)) &&
-                (fopAcM_GetName(attention->LockonTarget(0)) != fpcNm_BGN_e)) &&
-               (fopAcM_GetName(attention->LockonTarget(0)) != fpcNm_BGN2_e && (fopAcM_GetName(attention->LockonTarget(0)) != fpcNm_BGN3_e)))) &&
-             ((fopAcM_GetName(attention->LockonTarget(0)) != fpcNm_GND_e &&
-               (fopAcM_GetName(attention->LockonTarget(0)) != fpcNm_BST_e || ((fopAcM_GetParam(attention->LockonTarget(0)) & 0xfU) != 0))) &&
-              (fopAcM_GetName(attention->LockonTarget(0)) != fpcNm_BWD_e))))
+        if (!dMenu_flag() && !dComIfGp_event_runCheck() && attention->LockonTarget(0) != NULL && attention->LockonTarget(0)->max_health > 0.0f &&
+            dComIfGs_isCollect(4, 1) != 0 && (attention->LockonTruth() & 0xFF) != 0 && attention->LockonTarget(0)->group == fopAc_ENEMY_e &&
+            fopAcM_GetName(attention->LockonTarget(0)) != fpcNm_BTD_e && fopAcM_GetName(attention->LockonTarget(0)) != fpcNm_BMD_e &&
+            fopAcM_GetName(attention->LockonTarget(0)) != fpcNm_BDK_e && fopAcM_GetName(attention->LockonTarget(0)) != fpcNm_BPW_e &&
+            fopAcM_GetName(attention->LockonTarget(0)) != fpcNm_BGN_e && fopAcM_GetName(attention->LockonTarget(0)) != fpcNm_BGN2_e &&
+            fopAcM_GetName(attention->LockonTarget(0)) != fpcNm_BGN3_e && fopAcM_GetName(attention->LockonTarget(0)) != fpcNm_GND_e &&
+            (fopAcM_GetName(attention->LockonTarget(0)) != fpcNm_BST_e || (fopAcM_GetParam(attention->LockonTarget(0)) & 0xF) != 0) &&
+            fopAcM_GetName(attention->LockonTarget(0)) != fpcNm_BWD_e)
         {
             dMeter_zakoEnemyMove(i_Meter);
         } else {
             dMeter_zakoEnemyHide(i_Meter);
         }
     }
-    if ((((!dMenu_flag()) && (dComIfGs_isCollect(4, 1) != 0)) && (!dComIfGp_event_runCheck())) &&
-        ((!(i_Meter->mStatusFlags & dMtrStts_UNK80_e)) && (!(i_Meter->mStatusFlags & dMtrStts_UNK20000_e))) &&
-        ((dStage_stagInfo_GetSTType(stage_info) == dStageType_BOSS_e) || (fopAcM_SearchByName(fpcNm_BDK_e) != NULL)))
+    if (!dMenu_flag() && dComIfGs_isCollect(4, 1) != 0 && !dComIfGp_event_runCheck() &&
+        !(i_Meter->mStatusFlags & dMtrStts_UNK80_e) && !(i_Meter->mStatusFlags & dMtrStts_UNK20000_e) &&
+        (dStage_stagInfo_GetSTType(stage_info) == dStageType_BOSS_e || fopAcM_SearchByName(fpcNm_BDK_e) != NULL))
     {
-        if (((dComIfGs_isStageBossDemo() != 0) && (dComIfGs_isStageBossEnemy() == 0)) ||
-            (strcmp(dComIfGp_getStartStageName(), "Xboss0") == 0 ||
-             ((strcmp(dComIfGp_getStartStageName(), "Xboss1") == 0 || (strcmp(dComIfGp_getStartStageName(), "Xboss2") == 0)) ||
-              (strcmp(dComIfGp_getStartStageName(), "Xboss3") == 0))))
+        if ((dComIfGs_isStageBossDemo() != 0 && dComIfGs_isStageBossEnemy() == 0) ||
+            strcmp(dComIfGp_getStartStageName(), "Xboss0") == 0 ||
+            strcmp(dComIfGp_getStartStageName(), "Xboss1") == 0 ||
+            strcmp(dComIfGp_getStartStageName(), "Xboss2") == 0 ||
+            strcmp(dComIfGp_getStartStageName(), "Xboss3") == 0)
         {
             fopAc_ac_c* pfVar3;
             if (fopAcM_SearchByName(fpcNm_BTD_e) != NULL) {
@@ -3524,7 +3618,7 @@ void dMeter_zakoEnemyMove(sub_meter_class* i_Meter) {
         i_Meter->field_0x0560.mPosTopLeft.x = local_38.x + 50.0f;
     }
     i_Meter->field_0x0560.mPosTopLeft.y = local_38.y;
-    dVar5 = ((f32)(pfVar4->health / (f32)(pfVar4->max_health)));
+    dVar5 = pfVar4->health / (f32)pfVar4->max_health;
     fVar1 = i_Meter->field_0x0528.mPosTopLeftOrig.x - i_Meter->field_0x0560.mPosTopLeftOrig.x;
     fVar2 = i_Meter->field_0x0528.mPosTopLeftOrig.y - i_Meter->field_0x0560.mPosTopLeftOrig.y;
     i_Meter->field_0x0528.mPosTopLeft.x = i_Meter->field_0x0560.mPosTopLeft.x + fVar1;
@@ -3580,7 +3674,7 @@ void dMeter_bossEnemyMove(sub_meter_class* i_Meter, fopAc_ac_c* param_2) {
     f32 dVar5;
 
     if (param_2->max_health != 0) {
-        fVar2 = (f32)(param_2->health) / (f32)(param_2->max_health);
+        fVar2 = (f32)param_2->health / (f32)param_2->max_health;
     } else {
         fVar2 = g_meterHIO.field_0xc;
     }
@@ -3835,10 +3929,10 @@ void dMeter_magicMove(sub_meter_class* i_Meter) {
 
 /* 801F9048-801F961C       .text dMeter_magicGaugeMove__FP15sub_meter_class */
 void dMeter_magicGaugeMove(sub_meter_class* i_Meter) {
-    uint uVar2;
+    u32 uVar2;
     s16 sVar4;
     u16 uVar5;
-    uint uVar7;
+    u32 uVar7;
     u16 uVar8;
 
     static bool soundOnFlag = false;
@@ -3869,7 +3963,7 @@ void dMeter_magicGaugeMove(sub_meter_class* i_Meter) {
         g_dComIfG_gameInfo.play.mItemMaxMagicCount = 0;
     }
 #if VERSION > VERSION_DEMO
-    if ((i_Meter->field_0x3018 != dComIfGs_getMaxMagic()) || (i_Meter->field_0x0f38[2].mUserArea == 0)) {
+    if (i_Meter->field_0x3018 != dComIfGs_getMaxMagic() || i_Meter->field_0x0f38[2].mUserArea == 0) {
         if (i_Meter->field_0x3018 < dComIfGs_getMaxMagic()) {
             i_Meter->field_0x3018++;
         } else if (i_Meter->field_0x3018 > dComIfGs_getMaxMagic()) {
@@ -3899,14 +3993,14 @@ void dMeter_magicGaugeMove(sub_meter_class* i_Meter) {
     if (dComIfGs_getMagic() > dComIfGs_getMaxMagic()) {
         dComIfGs_setMagic(dComIfGs_getMaxMagic());
     }
-    if (!(fopOvlpM_IsDoingReq()) &&
+    if (!fopOvlpM_IsDoingReq() &&
         (!(i_Meter->mStatusFlags & dMtrStts_UNK40_e) ||
-         (!(dComIfGp_event_checkHind(0x20)) || (!(dComIfGp_evmng_checkStartDemo()) || (dComIfGp_checkPlayerStatus1(0, daPyStts1_UNK2000_e))))))
+         !dComIfGp_event_checkHind(0x20) || !dComIfGp_evmng_checkStartDemo() || dComIfGp_checkPlayerStatus1(0, daPyStts1_UNK2000_e)))
     {
         uVar8 = (i_Meter->field_0x0f38[0].mSizeOrig.x * (f32)(dComIfGs_getMagic()) * 25.0f);
         uVar5 = i_Meter->field_0x3016;
         uVar7 = uVar5;
-        uVar2 = uVar8 & 0xffff;
+        uVar2 = uVar8;
         if (uVar7 < uVar2) {
             if ((int)(uVar2 - uVar7) < 0x271) {
                 i_Meter->field_0x3016 = uVar8;
@@ -4170,12 +4264,18 @@ void dMeter_magicTransScale(sub_meter_class* i_Meter, f32 param_2, f32 param_3,
 void dMeter_magicColor(sub_meter_class* i_Meter) {
     f32 dVar12;
 
-    if ((!(i_Meter->mStatusFlags & dMtrStts_UNK8_e)) && (!(i_Meter->mStatusFlags & dMtrStts_UNK10_e)) && (!(i_Meter->mStatusFlags & dMtrStts_UNK800000_e)) &&
-        (!(i_Meter->mStatusFlags & dMtrStts_UNK100_e)) &&
-        ((daPy_getPlayerActorClass()->checkEquipDragonShield()) || (g_dComIfG_gameInfo.play.field_0x4965 & 1) ||
-         (daPy_getPlayerLinkActorClass()->checkCutRollChange() || (dComIfGp_checkPlayerStatus1(0, daPyStts1_DEKU_LEAF_FLY_e))) ||
-         ((dComIfGp_checkPlayerStatus0(0, daPyStts0_BOW_AIM_e)) && (daArrow_c::getKeepType() != 0) && (daPy_getPlayerActorClass()->getItemID() != -1))))
-    {
+    if (!(i_Meter->mStatusFlags & dMtrStts_UNK8_e) &&
+        !(i_Meter->mStatusFlags & dMtrStts_UNK10_e) &&
+        !(i_Meter->mStatusFlags & dMtrStts_UNK800000_e) &&
+        !(i_Meter->mStatusFlags & dMtrStts_UNK100_e) &&
+        (
+            daPy_getPlayerActorClass()->checkEquipDragonShield() ||
+            (g_dComIfG_gameInfo.play.field_0x4965 & 1) ||
+           (daPy_getPlayerLinkActorClass()->checkCutRollChange() ||
+            dComIfGp_checkPlayerStatus1(0, daPyStts1_DEKU_LEAF_FLY_e)) ||
+            (dComIfGp_checkPlayerStatus0(0, daPyStts0_BOW_AIM_e) && daArrow_c::getKeepType() != 0 && (daPy_getPlayerActorClass()->getItemID() != -1))
+        )
+    ) {
         JUtility::TColor color1;
         JUtility::TColor color2;
         if (i_Meter->field_0x0f38[4].mUserArea == 0) {
@@ -4217,12 +4317,12 @@ void dMeter_magicColor(sub_meter_class* i_Meter) {
 
 /* 801FA378-801FA53C       .text dMeter_magicAlpha__FP15sub_meter_class */
 void dMeter_magicAlpha(sub_meter_class* i_Meter) {
-    if ((dComIfGs_getMaxMagic() == 0) || (i_Meter->mStatusFlags & dMtrStts_UNK4000_e) ||
-        ((i_Meter->mStatusFlags & dMtrStts_UNK40_e) && ((dComIfGp_event_checkHind(0x20)) && (!(dComIfGp_checkPlayerStatus1(0, daPyStts1_UNK2000_e))))) ||
-        (dMenu_getCollectMode() == 4) || (i_Meter->mStatusFlags & dMtrStts_UNK200000_e) || (i_Meter->mStatusFlags & dMtrStts_UNK80_e) ||
+    if (dComIfGs_getMaxMagic() == 0 || (i_Meter->mStatusFlags & dMtrStts_UNK4000_e) ||
+        ((i_Meter->mStatusFlags & dMtrStts_UNK40_e) && dComIfGp_event_checkHind(0x20) && !dComIfGp_checkPlayerStatus1(0, daPyStts1_UNK2000_e)) ||
+        dMenu_getCollectMode() == 4 || (i_Meter->mStatusFlags & dMtrStts_UNK200000_e) || (i_Meter->mStatusFlags & dMtrStts_UNK80_e) ||
         (i_Meter->mStatusFlags & dMtrStts_UNK100000_e) || (i_Meter->mStatusFlags & dMtrStts_UNK20000_e) || (i_Meter->mStatusFlags & dMtrStts_UNK20_e) ||
-        (i_Meter->mStatusFlags & dMtrStts_UNK80000_e) || (dMeter_isAuctionFlag()) || (i_Meter->mStatusFlags & dMtrStts_UNK400000_e) ||
-        (i_Meter->mStatusFlags & dMtrStts_UNK800000_e) || ((strcmp(dComIfGp_getStartStageName(), "Ojhous") == 0) && (dComIfGp_getMiniGameType() == 6)))
+        (i_Meter->mStatusFlags & dMtrStts_UNK80000_e) || dMeter_isAuctionFlag() || (i_Meter->mStatusFlags & dMtrStts_UNK400000_e) ||
+        (i_Meter->mStatusFlags & dMtrStts_UNK800000_e) || ((strcmp(dComIfGp_getStartStageName(), "Ojhous") == 0) && dComIfGp_getMiniGameType() == 6))
     {
         if (i_Meter->field_0x10f8.mUserArea > 0) {
             i_Meter->field_0x10f8.mUserArea--;
@@ -4289,13 +4389,13 @@ void dMeter_menuLRMove(sub_meter_class* i_Meter) {
     f32 dVar7;
 
     static u8 frame = dMenu_getPushMenuButton();
-    if ((i_Meter->mStatusFlags & dMtrStts_UNK200000_e) || (dMenu_getCollectMode() == 5)) {
+    if ((i_Meter->mStatusFlags & dMtrStts_UNK200000_e) || dMenu_getCollectMode() == 5) {
         fopMsgM_setNowAlphaZero(&i_Meter->field_0x0250);
         fopMsgM_setNowAlphaZero(&i_Meter->field_0x0288);
     } else {
         sVar5 = 0x14;
         if (frame != dMenu_getPushMenuButton()) {
-            if ((frame != 0) && (dMenu_getPushMenuButton() != 0)) {
+            if (frame != 0 && dMenu_getPushMenuButton() != 0) {
                 sVar5 = g_menuHIO.field_0x92 * 2;
                 i_Meter->field_0x0250.mUserArea = sVar5;
                 i_Meter->field_0x0288.mUserArea = 1;
@@ -4364,28 +4464,45 @@ void dMeter_menuPlusMove(sub_meter_class* i_Meter) {
         i_Meter->field_0x3027 = 0;
         i_Meter->field_0x0100[0].mUserArea = dComIfGs_isDungeonItemCompass();
     }
-    if ((i_Meter->mStatusFlags & dMtrStts_UNK4000_e) || (fopOvlpM_IsDoingReq()) ||
-        ((i_Meter->mStatusFlags & dMtrStts_UNK40_e) && (dComIfGp_event_checkHind(0x100))) ||
-        (((((((((i_Meter->mStatusFlags & dMtrStts_UNK200000_e) || (i_Meter->mStatusFlags & dMtrStts_UNK100_e)) || (i_Meter->mStatusFlags & dMtrStts_UNK80_e)) ||
-              ((i_Meter->mStatusFlags & dMtrStts_UNK100000_e) || (i_Meter->mStatusFlags & dMtrStts_UNK20000_e))) ||
-             (i_Meter->mStatusFlags & dMtrStts_UNK8_e)) ||
-            (((i_Meter->mStatusFlags & dMtrStts_UNK10_e) || (i_Meter->mStatusFlags & dMtrStts_UNK800000_e)) ||
-             ((i_Meter->mStatusFlags & dMtrStts_UNK20_e) || (((i_Meter->mStatusFlags & dMtrStts_UNK80000_e) || (i_Meter->mStatusFlags & dMtrStts_UNK800_e)) ||
-                                                             (i_Meter->mStatusFlags & dMtrStts_UNK1000_e))))) ||
-           (((!(i_Meter->mStatusFlags & dMtrStts_UNK400_e)) && (strcmp(dComIfGp_getNextStageName(), "MajyuE") == 0)) &&
-            (!(dComIfGs_isEventBit(dSv_event_flag_c::UNK_0801))))) ||
-          ((!(i_Meter->mStatusFlags & dMtrStts_UNK400_e)) &&
-           ((strcmp(dComIfGp_getNextStageName(), "Hyrule") == 0 || (strcmp(dComIfGp_getNextStageName(), "Hyroom") == 0)) ||
-            (strcmp(dComIfGp_getNextStageName(), "kenroom") == 0)))) ||
-         (dComIfGp_getMiniGameType() == 1 || (dComIfGp_getMiniGameType() == 6))))
-    {
+    if (
+        (i_Meter->mStatusFlags & dMtrStts_UNK4000_e) ||
+        fopOvlpM_IsDoingReq() ||
+        ((i_Meter->mStatusFlags & dMtrStts_UNK40_e) && dComIfGp_event_checkHind(0x100)) ||
+        (i_Meter->mStatusFlags & dMtrStts_UNK200000_e) ||
+        (i_Meter->mStatusFlags & dMtrStts_UNK100_e) ||
+        (i_Meter->mStatusFlags & dMtrStts_UNK80_e) ||
+        (i_Meter->mStatusFlags & dMtrStts_UNK100000_e) ||
+        (i_Meter->mStatusFlags & dMtrStts_UNK20000_e) ||
+        (i_Meter->mStatusFlags & dMtrStts_UNK8_e) ||
+        (i_Meter->mStatusFlags & dMtrStts_UNK10_e) ||
+        (i_Meter->mStatusFlags & dMtrStts_UNK800000_e) ||
+        (i_Meter->mStatusFlags & dMtrStts_UNK20_e) ||
+        (i_Meter->mStatusFlags & dMtrStts_UNK80000_e) ||
+        (i_Meter->mStatusFlags & dMtrStts_UNK800_e) ||
+        (i_Meter->mStatusFlags & dMtrStts_UNK1000_e) ||
+        (
+            (!(i_Meter->mStatusFlags & dMtrStts_UNK400_e) &&
+            (strcmp(dComIfGp_getNextStageName(), "MajyuE") == 0)) &&
+            !dComIfGs_isEventBit(dSv_event_flag_c::UNK_0801)
+        ) ||
+        (
+            !(i_Meter->mStatusFlags & dMtrStts_UNK400_e) &&
+            (
+                strcmp(dComIfGp_getNextStageName(), "Hyrule") == 0 ||
+                strcmp(dComIfGp_getNextStageName(), "Hyroom") == 0 ||
+                strcmp(dComIfGp_getNextStageName(), "kenroom") == 0
+            )
+        ) ||
+        dComIfGp_getMiniGameType() == 1 ||
+        dComIfGp_getMiniGameType() == 6
+    ) {
         if (moveStatus != 1) {
             moveFlag = 1;
         }
         moveStatus = 1;
     } else {
-        if ((i_Meter->field_0x3020 == 1) || (i_Meter->field_0x3020 == 2)) {
-            if (((s32)dMeter_mMapCtrlDisp.field_0x0 != 0x0) && (dMap_isEnableDispMap())) {
+        if (i_Meter->field_0x3020 == 1 || i_Meter->field_0x3020 == 2) {
+            if (((s32)dMeter_mMapCtrlDisp.field_0x0 != 0x0) && dMap_isEnableDispMap()) {
                 if (moveStatus != 2) {
                     moveFlag = 1;
                 }
@@ -4406,7 +4523,7 @@ void dMeter_menuPlusMove(sub_meter_class* i_Meter) {
                 }
                 moveStatus = 6;
             }
-        } else if (((i_Meter->field_0x3020 == 5) || (i_Meter->field_0x3020 == 9)) || (i_Meter->field_0x3020 == 3)) {
+        } else if (i_Meter->field_0x3020 == 5 || i_Meter->field_0x3020 == 9 || i_Meter->field_0x3020 == 3) {
             if (moveStatus != 4) {
                 moveFlag = 1;
             }
@@ -4432,8 +4549,8 @@ void dMeter_menuPlusMove(sub_meter_class* i_Meter) {
             sMainParts1->search('cry1')->hide();
             sMainParts1->search('cry3')->hide();
             i_Meter->field_0x0100[0].pane->show();
-            if (((dComIfGs_isEventBit(dSv_event_flag_c::UNK_0908)) && (dStage_stagInfo_GetUpButton(dComIfGp_getStageStagInfo()) == 0)) ||
-                ((dStage_stagInfo_GetUpButton(dComIfGp_getStageStagInfo()) == 1) && (!(i_Meter->mStatusFlags & dMtrStts_UNK400000_e))))
+            if ((dComIfGs_isEventBit(dSv_event_flag_c::UNK_0908) && dStage_stagInfo_GetUpButton(dComIfGp_getStageStagInfo()) == 0) ||
+                (dStage_stagInfo_GetUpButton(dComIfGp_getStageStagInfo()) == 1 && !(i_Meter->mStatusFlags & dMtrStts_UNK400000_e)))
             {
                 i_Meter->field_0x0100[1].pane->show();
             } else {
@@ -4448,8 +4565,8 @@ void dMeter_menuPlusMove(sub_meter_class* i_Meter) {
             i_Meter->field_0x02c0.pane->show();
             sMainParts1->search('cry1')->show();
             i_Meter->field_0x0100[0].pane->hide();
-            if (((dComIfGs_isEventBit(dSv_event_flag_c::UNK_0908)) && (dStage_stagInfo_GetUpButton(dComIfGp_getStageStagInfo()) == 0)) ||
-                ((dStage_stagInfo_GetUpButton(dComIfGp_getStageStagInfo()) == 1) && (!(i_Meter->mStatusFlags & dMtrStts_UNK400000_e))))
+            if ((dComIfGs_isEventBit(dSv_event_flag_c::UNK_0908) && dStage_stagInfo_GetUpButton(dComIfGp_getStageStagInfo()) == 0) ||
+                (dStage_stagInfo_GetUpButton(dComIfGp_getStageStagInfo()) == 1 && !(i_Meter->mStatusFlags & dMtrStts_UNK400000_e)))
             {
                 i_Meter->field_0x0100[1].pane->show();
                 sMainParts1->search('cry3')->show();
@@ -4465,8 +4582,8 @@ void dMeter_menuPlusMove(sub_meter_class* i_Meter) {
             y = g_meterHIO.field_0x9e;
             i_Meter->field_0x02c0.pane->show();
             sMainParts1->search('cry1')->show();
-            if (((dComIfGs_isEventBit(dSv_event_flag_c::UNK_0908)) && (dStage_stagInfo_GetUpButton(dComIfGp_getStageStagInfo()) == 0)) ||
-                ((dStage_stagInfo_GetUpButton(dComIfGp_getStageStagInfo()) == 1) && (!(i_Meter->mStatusFlags & dMtrStts_UNK400000_e))))
+            if ((dComIfGs_isEventBit(dSv_event_flag_c::UNK_0908) && dStage_stagInfo_GetUpButton(dComIfGp_getStageStagInfo()) == 0) ||
+                (dStage_stagInfo_GetUpButton(dComIfGp_getStageStagInfo()) == 1 && !(i_Meter->mStatusFlags & dMtrStts_UNK400000_e)))
             {
                 sMainParts1->search('cry3')->show();
             } else {
@@ -4484,8 +4601,8 @@ void dMeter_menuPlusMove(sub_meter_class* i_Meter) {
             sMainParts1->search('cry1')->hide();
             sMainParts1->search('cry3')->hide();
             i_Meter->field_0x0100[0].pane->hide();
-            if (((dComIfGs_isEventBit(dSv_event_flag_c::UNK_0908)) && (dStage_stagInfo_GetUpButton(dComIfGp_getStageStagInfo()) == 0)) ||
-                ((dStage_stagInfo_GetUpButton(dComIfGp_getStageStagInfo()) == 1) && (!(i_Meter->mStatusFlags & dMtrStts_UNK400000_e))))
+            if ((dComIfGs_isEventBit(dSv_event_flag_c::UNK_0908) && dStage_stagInfo_GetUpButton(dComIfGp_getStageStagInfo()) == 0) ||
+                (dStage_stagInfo_GetUpButton(dComIfGp_getStageStagInfo()) == 1 && !(i_Meter->mStatusFlags & dMtrStts_UNK400000_e)))
             {
                 i_Meter->field_0x0100[1].pane->show();
             } else {
@@ -4497,8 +4614,8 @@ void dMeter_menuPlusMove(sub_meter_class* i_Meter) {
         case 6:
             x = g_meterHIO.field_0x9c;
             y = g_meterHIO.field_0x9e;
-            if (((dComIfGs_isEventBit(dSv_event_flag_c::UNK_0908)) && (dStage_stagInfo_GetUpButton(dComIfGp_getStageStagInfo()) == 0)) ||
-                ((dStage_stagInfo_GetUpButton(dComIfGp_getStageStagInfo()) == 1) && (!(i_Meter->mStatusFlags & dMtrStts_UNK400000_e))))
+            if ((dComIfGs_isEventBit(dSv_event_flag_c::UNK_0908) && dStage_stagInfo_GetUpButton(dComIfGp_getStageStagInfo()) == 0) ||
+                (dStage_stagInfo_GetUpButton(dComIfGp_getStageStagInfo()) == 1 && !(i_Meter->mStatusFlags & dMtrStts_UNK400000_e)))
             {
                 i_Meter->field_0x02c0.pane->show();
                 sMainParts1->search('cry1')->hide();
@@ -4516,8 +4633,8 @@ void dMeter_menuPlusMove(sub_meter_class* i_Meter) {
         case 7:
             x = g_meterHIO.field_0x9c;
             y = g_meterHIO.field_0x9e;
-            if (((dComIfGs_isEventBit(dSv_event_flag_c::UNK_0908)) && (dStage_stagInfo_GetUpButton(dComIfGp_getStageStagInfo()) == 0)) ||
-                ((dStage_stagInfo_GetUpButton(dComIfGp_getStageStagInfo()) == 1) && (!(i_Meter->mStatusFlags & dMtrStts_UNK400000_e))))
+            if ((dComIfGs_isEventBit(dSv_event_flag_c::UNK_0908) && (dStage_stagInfo_GetUpButton(dComIfGp_getStageStagInfo()) == 0)) ||
+                ((dStage_stagInfo_GetUpButton(dComIfGp_getStageStagInfo()) == 1) && !(i_Meter->mStatusFlags & dMtrStts_UNK400000_e)))
             {
                 i_Meter->field_0x02c0.pane->show();
                 sMainParts1->search('cry1')->show();
@@ -4565,7 +4682,7 @@ void dMeter_menuPlusMove(sub_meter_class* i_Meter) {
             break;
         }
     }
-    if ((moveStatus == 4) || (moveStatus == 5)) {
+    if (moveStatus == 4 || moveStatus == 5) {
         local_98_x[0] = ((i_Meter->field_0x12f0.mPosCenter.x + i_Meter->field_0x12f0.mSize.x / 2.0f) - i_Meter->field_0x0100[0].mPosCenterOrig.x) -
                         i_Meter->field_0x0100[0].mSizeOrig.x / 2.0f;
         fVar1 = i_Meter->field_0x12f0.mPosCenter.y;
@@ -4603,7 +4720,7 @@ void dMeter_menuPlusMove(sub_meter_class* i_Meter) {
     dVar13 = fopMsgM_valueIncrease(5, 5 - i_Meter->field_0x02c0.mUserArea, 0);
     fopMsgM_setNowAlpha(&i_Meter->field_0x02c0, dVar13);
     dMap_c::setMapAlpha(dVar13 * 255.0f);
-    if (!(dKyw_gbwind_use_check()) || (dMenu_flag())) {
+    if (!dKyw_gbwind_use_check() || dMenu_flag()) {
         fopMsgM_setNowAlphaZero(&i_Meter->field_0x02f8);
     } else {
         fopMsgM_setNowAlpha(&i_Meter->field_0x02f8, dVar13);
@@ -4667,7 +4784,7 @@ void dMeter_windMove(sub_meter_class* i_Meter) {
         }
         dMeter_windStatus = dComIfGp_getOperateWind();
     } else {
-        if (((dComIfGp_getOperateWind() != 2) && (dMeter_windID != fpcM_ERROR_PROCESS_ID_e)) && (fopMsgM_SearchByID(dMeter_windID) == NULL)) {
+        if (dComIfGp_getOperateWind() != 2 && dMeter_windID != fpcM_ERROR_PROCESS_ID_e && fopMsgM_SearchByID(dMeter_windID) == NULL) {
             dMeter_windID = fpcM_ERROR_PROCESS_ID_e;
         }
     }
@@ -4675,16 +4792,16 @@ void dMeter_windMove(sub_meter_class* i_Meter) {
 
 /* 801FBD7C-801FBF24       .text dMeter_metronomeMove__FP15sub_meter_class */
 void dMeter_metronomeMove(sub_meter_class* i_Meter) {
-    if (((dComIfGp_getMetronome() && (!(i_Meter->mStatusFlags & dMtrStts_UNK8_e))) && (!(i_Meter->mStatusFlags & dMtrStts_UNK10_e))) &&
-        ((!(i_Meter->mStatusFlags & dMtrStts_UNK800000_e)) && (!(i_Meter->mStatusFlags & dMtrStts_UNK20_e))))
+    if (dComIfGp_getMetronome() && !(i_Meter->mStatusFlags & dMtrStts_UNK8_e) && !(i_Meter->mStatusFlags & dMtrStts_UNK10_e) &&
+        !(i_Meter->mStatusFlags & dMtrStts_UNK800000_e) && !(i_Meter->mStatusFlags & dMtrStts_UNK20_e))
     {
-        if ((i_Meter->field_0x3028 == 0) && (dMn_c == NULL)) {
+        if (i_Meter->field_0x3028 == 0 && dMn_c == NULL) {
             dMn_c = new dMetronome_c();
             JUT_ASSERT(9008, dMn_c != NULL);
             dMn_c->_create();
             dMn_c->initialize();
         }
-        if ((dMn_c != NULL) && ((u8)dMn_c->_open() != 0)) {
+        if (dMn_c != NULL && ((u8)dMn_c->_open() != 0)) {
             dMn_c->_move();
         }
         i_Meter->field_0x3028 = 1;
@@ -4697,7 +4814,7 @@ void dMeter_metronomeMove(sub_meter_class* i_Meter) {
                     i_Meter->field_0x3028 = 2;
                 }
             }
-        } else if ((i_Meter->field_0x3028 == 2) && (dMn_c != NULL)) {
+        } else if (i_Meter->field_0x3028 == 2 && dMn_c != NULL) {
             i_Meter->field_0x3028 = 0;
             dMn_c->_delete();
             delete dMn_c;
@@ -4713,11 +4830,11 @@ void dMeter_rupyAlpha(sub_meter_class* i_Meter) {
     cXyz local_2c;
     cXyz local_38;
 
-    if ((i_Meter->mStatusFlags & dMtrStts_UNK4000_e) || ((i_Meter->mStatusFlags & dMtrStts_UNK40_e) && (dComIfGp_event_checkHind(0x80))) ||
+    if ((i_Meter->mStatusFlags & dMtrStts_UNK4000_e) || ((i_Meter->mStatusFlags & dMtrStts_UNK40_e) && dComIfGp_event_checkHind(0x80)) ||
         (i_Meter->mStatusFlags & dMtrStts_UNK200000_e) || (i_Meter->mStatusFlags & dMtrStts_UNK80_e) || (i_Meter->mStatusFlags & dMtrStts_UNK100000_e) ||
         (i_Meter->mStatusFlags & dMtrStts_UNK400000_e) || (i_Meter->mStatusFlags & dMtrStts_UNK20000_e) || (i_Meter->mStatusFlags & dMtrStts_UNK8_e) ||
         (i_Meter->mStatusFlags & dMtrStts_UNK10_e) || (i_Meter->mStatusFlags & dMtrStts_UNK800000_e) || (i_Meter->mStatusFlags & dMtrStts_UNK20_e) ||
-        (dComIfGp_getMiniGameType() == 1 || (dComIfGp_getMiniGameType() == 6)))
+        (dComIfGp_getMiniGameType() == 1 || dComIfGp_getMiniGameType() == 6))
     {
         dVar7 = dMeter_alphaClose(&i_Meter->field_0x2a20.mUserArea, &i_Meter->field_0x19f0[0].mUserArea);
         if (i_Meter->mpRupyParticle != NULL) {
@@ -4844,8 +4961,8 @@ void dMeter_rupyMove(sub_meter_class* i_Meter) {
         local_28[3] = uVar3 % 10;
         for (s32 i = 0; i < 4; i++) {
             dMeter_rupy_num(acStack_38, local_28[i]);
-            ((J2DPicture*)(i_Meter->field_0x19f0[i].pane))->changeTexture(acStack_38, 0);
-            ((J2DPicture*)(i_Meter->field_0x1b40[i].pane))->changeTexture(acStack_38, 0);
+            ((J2DPicture*)i_Meter->field_0x19f0[i].pane)->changeTexture(acStack_38, 0);
+            ((J2DPicture*)i_Meter->field_0x1b40[i].pane)->changeTexture(acStack_38, 0);
         }
         g_dComIfG_gameInfo.play.mItemNowRupee = i_Meter->mRupyCount;
     }
@@ -4858,22 +4975,22 @@ void dMeter_walletChange(sub_meter_class* i_Meter) {
         f32 x = (i_Meter->field_0x19f0[1].mPosTopLeftOrig.x - i_Meter->field_0x19f0[0].mPosTopLeftOrig.x);
         i_Meter->field_0x19f0[0].pane->hide();
         i_Meter->field_0x1b40[0].pane->hide();
-        ((J2DPicture*)(i_Meter->field_0x2a20).pane)->setBlack(0x0A280A00);
-        ((J2DPicture*)(i_Meter->field_0x2a20).pane)->setWhite(0x28FF28FF);
+        ((J2DPicture*)i_Meter->field_0x2a20.pane)->setBlack(0x0A280A00);
+        ((J2DPicture*)i_Meter->field_0x2a20.pane)->setWhite(0x28FF28FF);
         fopMsgM_paneTrans(&i_Meter->field_0x2a20, x, 0.0f);
         fopMsgM_paneTrans(&i_Meter->field_0x2a58, x, 0.0f);
     } else if (dComIfGs_getWalletSize() == 1) {
         i_Meter->field_0x19f0[0].pane->show();
         i_Meter->field_0x1b40[0].pane->show();
-        ((J2DPicture*)(i_Meter->field_0x2a20).pane)->setBlack(0x1414A000);
-        ((J2DPicture*)(i_Meter->field_0x2a20).pane)->setWhite(0x32C8FFFF);
+        ((J2DPicture*)i_Meter->field_0x2a20.pane)->setBlack(0x1414A000);
+        ((J2DPicture*)i_Meter->field_0x2a20.pane)->setWhite(0x32C8FFFF);
         fopMsgM_paneTrans(&i_Meter->field_0x2a20, 0.0f, 0.0f);
         fopMsgM_paneTrans(&i_Meter->field_0x2a58, 0.0f, 0.0f);
     } else {
         i_Meter->field_0x19f0[0].pane->show();
         i_Meter->field_0x1b40[0].pane->show();
-        ((J2DPicture*)(i_Meter->field_0x2a20).pane)->setBlack(0x50280000);
-        ((J2DPicture*)(i_Meter->field_0x2a20).pane)->setWhite(0xFF8C00FF);
+        ((J2DPicture*)i_Meter->field_0x2a20.pane)->setBlack(0x50280000);
+        ((J2DPicture*)i_Meter->field_0x2a20.pane)->setWhite(0xFF8C00FF);
         fopMsgM_paneTrans(&i_Meter->field_0x2a20, 0.0f, 0.0f);
         fopMsgM_paneTrans(&i_Meter->field_0x2a58, 0.0f, 0.0f);
     }
@@ -4944,7 +5061,7 @@ void dMeter_keyAlpha(sub_meter_class* i_Meter) {
     local_28[2] = 0x2d;
     local_28[3] = 0x32;
     local_28[4] = 0x3A;
-    if ((i_Meter->mStatusFlags & dMtrStts_UNK4000_e) || ((i_Meter->mStatusFlags & dMtrStts_UNK40_e) && (dComIfGp_event_checkHind(0x40))) ||
+    if ((i_Meter->mStatusFlags & dMtrStts_UNK4000_e) || ((i_Meter->mStatusFlags & dMtrStts_UNK40_e) && dComIfGp_event_checkHind(0x40)) ||
         (i_Meter->mStatusFlags & dMtrStts_UNK200000_e) || (i_Meter->mStatusFlags & dMtrStts_UNK80_e) || (i_Meter->mStatusFlags & dMtrStts_UNK100000_e) ||
         (i_Meter->mStatusFlags & dMtrStts_UNK400000_e) || (i_Meter->mStatusFlags & dMtrStts_UNK20000_e) || (i_Meter->mStatusFlags & dMtrStts_UNK400_e) ||
         (i_Meter->mStatusFlags & dMtrStts_UNK8_e) || (i_Meter->mStatusFlags & dMtrStts_UNK10_e) || (i_Meter->mStatusFlags & dMtrStts_UNK800000_e) ||
@@ -5039,7 +5156,7 @@ void dMeter_compassGetOnProc(sub_meter_class* i_Meter) {
     switch (i_Meter->field_0x3020) {
     case 1:
         if (((s32)dMeter_mMapCtrlDisp.field_0x0 != 0) &&
-            ((!(i_Meter->mStatusFlags & dMtrStts_UNK400_e)) || (dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo()) == dSv_save_c::STAGE_TOTG)))
+            (!(i_Meter->mStatusFlags & dMtrStts_UNK400_e) || dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo()) == dSv_save_c::STAGE_TOTG))
         {
             i_Meter->field_0x3020 = 2;
             i_Meter->field_0x3029 = 1;
@@ -5065,7 +5182,7 @@ void dMeter_compassGetOnProc(sub_meter_class* i_Meter) {
         dMeter_compassDirOpen(i_Meter);
         break;
     case 3:
-        if (((CPad_CHECK_TRIG_RIGHT(0) && (!(CPad_CHECK_TRIG_UP(0)))) && (!(CPad_CHECK_TRIG_DOWN(0)))) || (i_Meter->field_0x1948.mUserArea != 0)) {
+        if ((CPad_CHECK_TRIG_RIGHT(0) && !CPad_CHECK_TRIG_UP(0) && !CPad_CHECK_TRIG_DOWN(0)) || i_Meter->field_0x1948.mUserArea != 0) {
             i_Meter->field_0x3020 = 6;
             i_Meter->field_0x1948.mUserArea = 1;
             dMeter_compassWindOpen(i_Meter);
@@ -5074,7 +5191,7 @@ void dMeter_compassGetOnProc(sub_meter_class* i_Meter) {
         }
         break;
     case 6:
-        if ((CPad_CHECK_TRIG_LEFT(0) && (!(CPad_CHECK_TRIG_UP(0)))) && (!(CPad_CHECK_TRIG_DOWN(0)))) {
+        if (CPad_CHECK_TRIG_LEFT(0) && !CPad_CHECK_TRIG_UP(0) && !CPad_CHECK_TRIG_DOWN(0)) {
             i_Meter->field_0x3020 = 8;
             i_Meter->field_0x1948.mUserArea = 0;
             dMeter_compassWindClose(i_Meter);
@@ -5083,7 +5200,7 @@ void dMeter_compassGetOnProc(sub_meter_class* i_Meter) {
         }
         break;
     case 8:
-        if ((CPad_CHECK_TRIG_RIGHT(0) && (!(CPad_CHECK_TRIG_UP(0)))) && (!(CPad_CHECK_TRIG_DOWN(0)))) {
+        if (CPad_CHECK_TRIG_RIGHT(0) && !CPad_CHECK_TRIG_UP(0) && !CPad_CHECK_TRIG_DOWN(0)) {
             i_Meter->field_0x3020 = 6;
             i_Meter->field_0x1948.mUserArea = 1;
             dMeter_compassWindOpen(i_Meter);
@@ -5212,16 +5329,16 @@ void dMeter_compassWindClose(sub_meter_class* i_Meter) {
     dVar9 = ((i_Meter->field_0x16a8.pane->mBounds.f.x - i_Meter->field_0x16a8.pane->mBounds.i.x) / 2.0f - (fVar1 / 2.0f));
     dVar8 = ((i_Meter->field_0x16a8.pane->mBounds.f.y - i_Meter->field_0x16a8.pane->mBounds.i.y) / 2.0f);
     i_Meter->field_0x12f0.mUserArea--;
-    if ((dComIfGs_getTime() >= 90.0f) && (dComIfGs_getTime() < 270.0f)) {
+    if (dComIfGs_getTime() >= 90.0f && dComIfGs_getTime() < 270.0f) {
         sVar6 = 0;
     } else {
         sVar6 = 1;
     }
     if (i_Meter->field_0x12f0.mUserArea <= 5) {
         i_Meter->field_0x12f0.mUserArea = 5;
-        if ((((dComIfGp_roomControl_getTimePass()) && (!i_Meter->field_0x2f68)) ||
-             (!(dComIfGp_roomControl_getTimePass()) && (i_Meter->field_0x2f68))) ||
-            (!(dComIfGp_roomControl_getTimePass()) && (i_Meter->field_0x3012 != sVar6)))
+        if ((dComIfGp_roomControl_getTimePass() && !i_Meter->field_0x2f68) ||
+            (!dComIfGp_roomControl_getTimePass() && i_Meter->field_0x2f68) ||
+            (!dComIfGp_roomControl_getTimePass() && i_Meter->field_0x3012 != sVar6))
         {
             dMeter_clockShow(i_Meter);
             i_Meter->field_0x3020 = 6;
@@ -5288,13 +5405,13 @@ void dMeter_compassDirClose(sub_meter_class* i_Meter) {
 void dMeter_compassAnimeMove(sub_meter_class* i_Meter) {
     s16 sVar2;
 
-    if ((dComIfGs_getTime() >= 90.0f) && (dComIfGs_getTime() < 270.0f)) {
+    if (dComIfGs_getTime() >= 90.0f && dComIfGs_getTime() < 270.0f) {
         sVar2 = 0;
     } else {
         sVar2 = 1;
     }
-    if (((!(CPad_CHECK_TRIG_LEFT(0)) || (CPad_CHECK_TRIG_UP(0))) || (CPad_CHECK_TRIG_DOWN(0))) &&
-        (!(dComIfGp_roomControl_getTimePass()) || (i_Meter->field_0x2f68)) && (dComIfGp_roomControl_getTimePass() || (!i_Meter->field_0x2f68)))
+    if ((!CPad_CHECK_TRIG_LEFT(0) || CPad_CHECK_TRIG_UP(0) || CPad_CHECK_TRIG_DOWN(0)) &&
+        (!dComIfGp_roomControl_getTimePass() || i_Meter->field_0x2f68) && (dComIfGp_roomControl_getTimePass() || !i_Meter->field_0x2f68))
     {
         if (dComIfGp_roomControl_getTimePass()) {
             return;
@@ -5324,7 +5441,7 @@ void dMeter_compassValueInit(sub_meter_class* i_Meter) {
     } else {
         i_Meter->field_0x2f68 = 0.0f;
     }
-    if ((dComIfGs_getTime() >= 90.0f) && (dComIfGs_getTime() < 270.0f)) {
+    if (dComIfGs_getTime() >= 90.0f && dComIfGs_getTime() < 270.0f) {
         i_Meter->field_0x3012 = 0;
     } else {
         i_Meter->field_0x3012 = 1;
@@ -5399,14 +5516,14 @@ void dMeter_compassInit(sub_meter_class* i_Meter) {
 
 /* 801FE2EC-801FE444       .text dMeter_compassMove__FP15sub_meter_class */
 void dMeter_compassMove(sub_meter_class* i_Meter) {
-    if ((i_Meter->mStatusFlags & dMtrStts_UNK4000_e) || ((i_Meter->mStatusFlags & dMtrStts_UNK40_e) && (dComIfGp_event_checkHind(0x100))) ||
+    if ((i_Meter->mStatusFlags & dMtrStts_UNK4000_e) || ((i_Meter->mStatusFlags & dMtrStts_UNK40_e) && dComIfGp_event_checkHind(0x100)) ||
         (i_Meter->mStatusFlags & dMtrStts_UNK200000_e))
     {
         dMeter_compassValueInit(i_Meter);
     } else if ((i_Meter->mStatusFlags & dMtrStts_UNK100_e) || (i_Meter->mStatusFlags & dMtrStts_UNK80_e) || (i_Meter->mStatusFlags & dMtrStts_UNK100000_e) ||
                (i_Meter->mStatusFlags & dMtrStts_UNK20000_e) || (i_Meter->mStatusFlags & dMtrStts_UNK8_e) || (i_Meter->mStatusFlags & dMtrStts_UNK10_e) ||
-               ((i_Meter->mStatusFlags & dMtrStts_UNK800000_e) || (i_Meter->mStatusFlags & dMtrStts_UNK20_e)) || (dComIfGp_getMiniGameType() == 1) ||
-               (dComIfGp_getMiniGameType() == 8))
+               ((i_Meter->mStatusFlags & dMtrStts_UNK800000_e) || (i_Meter->mStatusFlags & dMtrStts_UNK20_e)) || dComIfGp_getMiniGameType() == 1 ||
+               dComIfGp_getMiniGameType() == 8)
     {
         dMeter_compassValueInit(i_Meter);
     } else if ((i_Meter->mStatusFlags & dMtrStts_UNK400_e) && (dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo()) != dSv_save_c::STAGE_TOTG)) {
@@ -5431,7 +5548,7 @@ void dMeter_clockShow(sub_meter_class* i_Meter) {
     } else {
         i_Meter->field_0x2f68 = 0.0f;
     }
-    if ((dComIfGs_getTime() >= 90.0f) && (dComIfGs_getTime() < 270.0f)) {
+    if (dComIfGs_getTime() >= 90.0f && dComIfGs_getTime() < 270.0f) {
         i_Meter->field_0x3012 = 0;
     } else {
         i_Meter->field_0x3012 = 1;
@@ -5478,7 +5595,7 @@ void dMeter_clockShow(sub_meter_class* i_Meter) {
         }
         i_Meter->field_0x1670.pane->hide();
         i_Meter->field_0x16a8.pane->hide();
-        if ((dComIfGs_getTime() >= 90.0f) && (dComIfGs_getTime() < 270.0f)) {
+        if (dComIfGs_getTime() >= 90.0f && dComIfGs_getTime() < 270.0f) {
             i_Meter->field_0x16e0.pane->show();
             i_Meter->field_0x17f8.pane->hide();
             i_Meter->field_0x1830.pane->show();
@@ -5705,23 +5822,23 @@ void dMeter_mapMove(sub_meter_class* i_Meter) {
             }
         }
     }
-    if ((!(i_Meter->mStatusFlags & dMtrStts_UNK4000_e)) && ((!(i_Meter->mStatusFlags & dMtrStts_UNK40_e)) || (!(dComIfGp_event_checkHind(0x100)))) &&
-        (!(i_Meter->mStatusFlags & dMtrStts_UNK200000_e)) && (!(i_Meter->mStatusFlags & dMtrStts_UNK100_e)) && (!(i_Meter->mStatusFlags & dMtrStts_UNK80_e)) &&
-        (!(i_Meter->mStatusFlags & dMtrStts_UNK100000_e)) && (!(i_Meter->mStatusFlags & dMtrStts_UNK20000_e)) && (!(i_Meter->mStatusFlags & dMtrStts_UNK8_e)) &&
-        (((!(i_Meter->mStatusFlags & dMtrStts_UNK10_e)) && (!(i_Meter->mStatusFlags & dMtrStts_UNK20_e))) && (dMap_isEnableDispMap())) &&
-        ((strcmp(dComIfGp_getNextStageName(), "MajyuE") != 0) || (dComIfGs_isEventBit(dSv_event_flag_c::UNK_0801))))
+    if (!(i_Meter->mStatusFlags & dMtrStts_UNK4000_e) && (!(i_Meter->mStatusFlags & dMtrStts_UNK40_e) || !dComIfGp_event_checkHind(0x100)) &&
+        !(i_Meter->mStatusFlags & dMtrStts_UNK200000_e) && !(i_Meter->mStatusFlags & dMtrStts_UNK100_e) && !(i_Meter->mStatusFlags & dMtrStts_UNK80_e) &&
+        !(i_Meter->mStatusFlags & dMtrStts_UNK100000_e) && !(i_Meter->mStatusFlags & dMtrStts_UNK20000_e) && !(i_Meter->mStatusFlags & dMtrStts_UNK8_e) &&
+        !(i_Meter->mStatusFlags & dMtrStts_UNK10_e) && !(i_Meter->mStatusFlags & dMtrStts_UNK20_e) && dMap_isEnableDispMap() &&
+        ((strcmp(dComIfGp_getNextStageName(), "MajyuE") != 0) || dComIfGs_isEventBit(dSv_event_flag_c::UNK_0801)))
     {
         if ((i_Meter->mStatusFlags & dMtrStts_UNK400_e) && (dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo()) != dSv_save_c::STAGE_TOTG)) {
-            if (((s32)dMeter_mMapCtrlDisp.field_0x0 != 0) && (dMap_isEnableDispMap())) {
+            if (((s32)dMeter_mMapCtrlDisp.field_0x0 != 0) && dMap_isEnableDispMap()) {
                 dMeter_mMapCtrlDisp.field_0x0 = 0;
                 dMeter_mMapCtrlDisp.field_0x1 = 7;
             }
         } else {
-            if (!(CPad_CHECK_TRIG_UP(0)) && !(CPad_CHECK_TRIG_DOWN(0)) && (!(dComIfGp_getMiniGameType() == 1)) &&
-                ((CPad_CHECK_TRIG_LEFT(0) != 0) || (CPad_CHECK_TRIG_RIGHT(0))))
+            if (!CPad_CHECK_TRIG_UP(0) && !CPad_CHECK_TRIG_DOWN(0) && dComIfGp_getMiniGameType() != 1 &&
+                (CPad_CHECK_TRIG_LEFT(0) != 0 || CPad_CHECK_TRIG_RIGHT(0)))
             {
                 if (CPad_CHECK_TRIG_LEFT(0) != 0) {
-                    if ((dMap_c::getMapAlpha() != 0) && ((s32)dMeter_mMapCtrlDisp.field_0x0 != 0)) {
+                    if (dMap_c::getMapAlpha() != 0 && ((s32)dMeter_mMapCtrlDisp.field_0x0 != 0)) {
                         if (dMap_isEnableDispMap()) {
                             dMeter_mMapCtrlDisp.field_0x0 = 0;
                             dMeter_mMapCtrlDisp.field_0x1 = 0;
@@ -5729,7 +5846,7 @@ void dMeter_mapMove(sub_meter_class* i_Meter) {
                         i_Meter->field_0x3029 = 0;
                         mDoAud_seStart(JA_SE_MAP_CANCEL);
                     }
-                } else if ((CPad_CHECK_TRIG_RIGHT(0) != 0) && (dMap_c::getMapAlpha() != 0)) {
+                } else if (CPad_CHECK_TRIG_RIGHT(0) != 0 && dMap_c::getMapAlpha() != 0) {
                     if ((s32)dMeter_mMapCtrlDisp.field_0x0 == 0) {
                         if (dMap_isEnableDispMap()) {
                             dMeter_mMapCtrlDisp.field_0x0 = 1;
@@ -5745,7 +5862,7 @@ void dMeter_mapMove(sub_meter_class* i_Meter) {
                         mDoAud_seStart(JA_SE_MAP_ZOOM);
                     }
                 }
-            } else if ((i_Meter->field_0x3029 != 0) && ((i_Meter->field_0x3020 == 1 && ((s32)dMeter_mMapCtrlDisp.field_0x0 == 0)) && (dMap_isEnableDispMap())))
+            } else if (i_Meter->field_0x3029 != 0 && i_Meter->field_0x3020 == 1 && (s32)dMeter_mMapCtrlDisp.field_0x0 == 0 && dMap_isEnableDispMap())
             {
                 dMeter_mMapCtrlDisp.field_0x0 = 1;
                 dMeter_mMapCtrlDisp.field_0x1 = 7;
@@ -5769,7 +5886,7 @@ void dMeter_mapMove(sub_meter_class* i_Meter) {
             } else {
                 dMap_c::setMapDispMode(0);
             }
-            if (((s32)dMeter_mMapCtrlDisp.field_0x0 != 0) && (mapTimer != 6)) {
+            if ((s32)dMeter_mMapCtrlDisp.field_0x0 != 0 && mapTimer != 6) {
                 mapTimer = 6;
             }
         }
@@ -5792,7 +5909,7 @@ void dMeter_arwInit(sub_meter_class* i_Meter) {
         JKRArchive* archive = dComIfGp_getItemIconArchive();
         JKRArchive::readTypeResource(i_Meter->arrowTex[i], 0xc00, 'TIMG', arrowTexImage[uVar1], archive);
         DCStoreRangeNoSync(i_Meter->arrowTex[i], 0xc00);
-        ((J2DPicture*)(i_Meter->field_0x2940[i].pane))->changeTexture(i_Meter->arrowTex[i], 0);
+        ((J2DPicture*)i_Meter->field_0x2940[i].pane)->changeTexture(i_Meter->arrowTex[i], 0);
         fopMsgM_setNowAlphaZero(&i_Meter->field_0x2940[i]);
         fopMsgM_setNowAlphaZero(&i_Meter->field_0x29b0[i]);
         fopMsgM_setAlpha(&i_Meter->field_0x2940[i]);
@@ -5818,16 +5935,21 @@ void dMeter_arwMove(sub_meter_class* i_Meter) {
     static u8 arrowType = daArrow_c::getKeepType();
     static u8 oldType = arrowType;
     dVar16 = (i_Meter->field_0x29b0[0].mPosCenterOrig.x - i_Meter->field_0x29b0[1].mPosCenterOrig.x);
-    if (((((dComIfGp_checkPlayerStatus0(0, daPyStts0_BOW_AIM_e)) && (!(i_Meter->mStatusFlags & dMtrStts_UNK4000_e))) &&
-          (!(i_Meter->mStatusFlags & dMtrStts_UNK40_e))) &&
-         (((!(i_Meter->mStatusFlags & dMtrStts_UNK200000_e)) && (!(i_Meter->mStatusFlags & dMtrStts_UNK80_e))) &&
-          ((!(i_Meter->mStatusFlags & dMtrStts_UNK100000_e)) &&
-           ((!(i_Meter->mStatusFlags & dMtrStts_UNK20000_e)) && (!(i_Meter->mStatusFlags & dMtrStts_UNK8_e)))))) &&
-        ((!(i_Meter->mStatusFlags & dMtrStts_UNK10_e)) &&
-         ((((!(i_Meter->mStatusFlags & dMtrStts_UNK800000_e)) && (!(i_Meter->mStatusFlags & dMtrStts_UNK20_e))) &&
-           (!(i_Meter->mStatusFlags & dMtrStts_UNK100_e))) &&
-          (dComIfGp_getMiniGameType() != 8))))
-    {
+    if (
+        dComIfGp_checkPlayerStatus0(0, daPyStts0_BOW_AIM_e) &&
+        !(i_Meter->mStatusFlags & dMtrStts_UNK4000_e) &&
+        !(i_Meter->mStatusFlags & dMtrStts_UNK40_e) &&
+        !(i_Meter->mStatusFlags & dMtrStts_UNK200000_e) &&
+        !(i_Meter->mStatusFlags & dMtrStts_UNK80_e) &&
+        !(i_Meter->mStatusFlags & dMtrStts_UNK100000_e) &&
+        !(i_Meter->mStatusFlags & dMtrStts_UNK20000_e) &&
+        !(i_Meter->mStatusFlags & dMtrStts_UNK8_e) &&
+        !(i_Meter->mStatusFlags & dMtrStts_UNK10_e) &&
+        !(i_Meter->mStatusFlags & dMtrStts_UNK800000_e) &&
+        !(i_Meter->mStatusFlags & dMtrStts_UNK20_e) &&
+        !(i_Meter->mStatusFlags & dMtrStts_UNK100_e) &&
+        dComIfGp_getMiniGameType() != 8
+    ) {
         if (arrowType != daArrow_c::getKeepType()) {
             archive = dComIfGp_getItemIconArchive();
             JKRArchive::readTypeResource(i_Meter->arrowTex[0], 0xc00, 'TIMG', arrowTexImage[arrowType], archive);
@@ -5995,7 +6117,7 @@ void dMeter_moveItemMove(sub_meter_class* i_Meter) {
             moveItemPane->changeTexture(i_Meter->moveIconTex[0], 0);
         } else {
             u8 uVar2_2 = dComIfGs_getItem(dMeter_itemNum);
-            if ((uVar2_2 == 0x35) || (uVar2_2 == 0x36)) {
+            if (uVar2_2 == 0x35 || uVar2_2 == 0x36) {
                 uVar2_2 = 0x27;
             }
             archive = dComIfGp_getItemIconArchive();
@@ -6050,7 +6172,7 @@ void dMeter_moveItemMove(sub_meter_class* i_Meter) {
 /* 80200398-8020042C       .text dMeter_moveItemDraw__FP15sub_meter_class */
 void dMeter_moveItemDraw(sub_meter_class* i_Meter) {
     s16 uVar1 = g_menuHIO.field_0xc8;
-    if (((dMeter_itemMoveFlagCheck()) && (dMeter_itemTimer != 0)) && (moveItemPane != NULL)) {
+    if (dMeter_itemMoveFlagCheck() && dMeter_itemTimer != 0 && moveItemPane != NULL) {
         moveItemPane->draw(item_parts.mPosTopLeft.x, item_parts.mPosTopLeft.y, item_parts.mSize.x, item_parts.mSize.y, false, false, false);
         if (dMeter_itemTimer >= uVar1) {
             dMeter_itemMoveFlag = 0;
@@ -6151,7 +6273,7 @@ void dMeter_swimMove(sub_meter_class* i_Meter) {
     }
     if (i_Meter->field_0x2da0.mUserArea == 0) {
         if (dComIfGp_getItemTimeCount() != 0) {
-            if ((sScrTimer1 == NULL) && (sScrTimer2 == NULL)) {
+            if (sScrTimer1 == NULL && sScrTimer2 == NULL) {
                 dMeter_swimInit(i_Meter);
             }
             i_Meter->field_0x2da0.mUserArea = 1;
@@ -6179,7 +6301,7 @@ void dMeter_swimMove(sub_meter_class* i_Meter) {
         }
     } else if (i_Meter->field_0x2da0.mUserArea == 1) {
         if (dComIfGp_getItemTimeCount() != 0) {
-            if (((!dMenu_flag()) && (!dComIfGp_event_runCheck())) && (dComIfGp_getItemSwimTimerStatus() != false)) {
+            if (!dMenu_flag() && !dComIfGp_event_runCheck() && dComIfGp_getItemSwimTimerStatus() != false) {
                 dMeter_swimOpenProc(i_Meter);
             } else {
                 dMeter_swimPaneHide(i_Meter);
@@ -6187,7 +6309,7 @@ void dMeter_swimMove(sub_meter_class* i_Meter) {
         } else {
             dMeter_swimPaneHide(i_Meter);
             i_Meter->field_0x2da0.mUserArea = 0;
-            if ((sScrTimer1 != NULL) && (sScrTimer2 != NULL)) {
+            if (sScrTimer1 != NULL && sScrTimer2 != NULL) {
                 dComIfGp_getSwimResArchive()->removeResourceAll();
                 delete sScrTimer1;
                 delete sScrTimer2;
@@ -6197,7 +6319,7 @@ void dMeter_swimMove(sub_meter_class* i_Meter) {
         }
     } else if (i_Meter->field_0x2da0.mUserArea == 2) {
         if (dComIfGp_getItemTimeCount() != 0) {
-            if (((!dMenu_flag()) && (!dComIfGp_event_runCheck())) && (dComIfGp_getItemSwimTimerStatus() != false)) {
+            if (!dMenu_flag() && !dComIfGp_event_runCheck() && dComIfGp_getItemSwimTimerStatus() != false) {
                 dMeter_swimMoveProc(i_Meter);
             } else {
                 dMeter_swimPaneHide(i_Meter);
@@ -6205,7 +6327,7 @@ void dMeter_swimMove(sub_meter_class* i_Meter) {
         } else {
             dMeter_swimPaneHide(i_Meter);
             i_Meter->field_0x2da0.mUserArea = 0;
-            if ((sScrTimer1 != NULL) && (sScrTimer2 != NULL)) {
+            if (sScrTimer1 != NULL && sScrTimer2 != NULL) {
                 dComIfGp_getSwimResArchive()->removeResourceAll();
                 delete sScrTimer1;
                 delete sScrTimer2;
@@ -6346,7 +6468,7 @@ void dMeter_swimMainBlink(sub_meter_class* i_Meter) {
     int uVar7 = ++i_Meter->field_0x2dd8.mUserArea;
     uVar5 = i_Meter->field_0x3000;
     if ((int)uVar7 < (int)uVar5) {
-        fVar2 = ((f32)uVar7 / (f32)(uVar5));
+        fVar2 = ((f32)uVar7 / (f32)uVar5);
         local_100.r = (75.0f + (fVar2 * (f32)(i_Meter->field_0x2f04.r - 0x4B)));
         local_100.g = (75.0f + (fVar2 * (f32)(i_Meter->field_0x2f04.g - 0x4B)));
         local_100.b = (255.0f + (fVar2 * (f32)(i_Meter->field_0x2f04.b - 0xFF)));
@@ -6355,18 +6477,18 @@ void dMeter_swimMainBlink(sub_meter_class* i_Meter) {
         local_104.b = (i_Meter->field_0x2ef0.b + fVar2 * (i_Meter->field_0x2ef8.b - i_Meter->field_0x2ef0.b));
         local_108.r = (i_Meter->field_0x2ef4.r + fVar2 * (i_Meter->field_0x2efc.r - i_Meter->field_0x2ef4.r));
         local_108.g = (i_Meter->field_0x2ef4.g + fVar2 * (i_Meter->field_0x2efc.g - i_Meter->field_0x2ef4.g));
-        local_108.b = ((i_Meter->field_0x2ef4.b) + fVar2 * (i_Meter->field_0x2efc.b - i_Meter->field_0x2ef4.b));
+        local_108.b = (i_Meter->field_0x2ef4.b + fVar2 * (i_Meter->field_0x2efc.b - i_Meter->field_0x2ef4.b));
     } else {
         if ((int)uVar7 < (s16)(uVar5 * 2)) {
-            fVar2 = ((f32)(uVar7 - (f32)(uVar5)) / (f32)(uVar5));
+            fVar2 = (f32)(uVar7 - (f32)uVar5) / (f32)uVar5;
             local_100.r = (i_Meter->field_0x2f04.r + fVar2 * (0x4b - i_Meter->field_0x2f04.r));
             local_100.g = (i_Meter->field_0x2f04.g + fVar2 * (0x4b - i_Meter->field_0x2f04.g));
             local_100.b = (i_Meter->field_0x2f04.b + fVar2 * (0xff - i_Meter->field_0x2f04.b));
             local_104.r = (i_Meter->field_0x2ef8.r + fVar2 * (i_Meter->field_0x2ef0.r - i_Meter->field_0x2ef8.r));
             local_104.g = (i_Meter->field_0x2ef8.g + fVar2 * (i_Meter->field_0x2ef0.g - i_Meter->field_0x2ef8.g));
             local_104.b = (i_Meter->field_0x2ef8.b + fVar2 * (i_Meter->field_0x2ef0.b - i_Meter->field_0x2ef8.b));
-            local_108.r = ((i_Meter->field_0x2efc.r) + fVar2 * (i_Meter->field_0x2ef4.r - i_Meter->field_0x2efc.r));
-            local_108.g = ((i_Meter->field_0x2efc.g) + fVar2 * (i_Meter->field_0x2ef4.g - i_Meter->field_0x2efc.g));
+            local_108.r = (i_Meter->field_0x2efc.r + fVar2 * (i_Meter->field_0x2ef4.r - i_Meter->field_0x2efc.r));
+            local_108.g = (i_Meter->field_0x2efc.g + fVar2 * (i_Meter->field_0x2ef4.g - i_Meter->field_0x2efc.g));
             local_108.b = (i_Meter->field_0x2efc.b + fVar2 * (i_Meter->field_0x2ef4.b - i_Meter->field_0x2efc.b));
         } else if ((int)uVar7 >= (s16)(uVar5 * 2)) {
             i_Meter->field_0x2dd8.mUserArea = 0;
@@ -6431,7 +6553,7 @@ void dMeter_swimMainDown(sub_meter_class* i_Meter) {
     s16 sVar1;
 
     sVar1 = (s16)dComIfGp_getItemTimeCount();
-    dMeter_paneBottomScaleY(&i_Meter->field_0x2d30, ((f32)(sVar1) / (f32)(i_Meter->field_0x2d30.mUserArea)));
+    dMeter_paneBottomScaleY(&i_Meter->field_0x2d30, ((f32)sVar1 / (f32)i_Meter->field_0x2d30.mUserArea));
     i_Meter->field_0x2da0.mPosTopLeft.y =
         (i_Meter->field_0x2d30.mPosCenterOrig.y - i_Meter->field_0x2d30.mSizeOrig.y / 2.0f) - i_Meter->field_0x2d30.mPosTopLeft.y;
     i_Meter->field_0x2da0.mPosCenter.y = i_Meter->field_0x2da0.mPosTopLeft.y + i_Meter->field_0x2da0.mSize.y / 2.0f;
@@ -6439,7 +6561,7 @@ void dMeter_swimMainDown(sub_meter_class* i_Meter) {
     i_Meter->field_0x2cf8.mPosCenter.y = i_Meter->field_0x2da0.mPosCenter.y;
     fopMsgM_cposMove(&i_Meter->field_0x2cf8);
     if (sVar1 > 0) {
-        if ((!dComIfGp_event_runCheck()) && (dComIfGp_getItemSwimTimerStatus() != false)) {
+        if (!dComIfGp_event_runCheck() && dComIfGp_getItemSwimTimerStatus() != false) {
             g_dComIfG_gameInfo.play.mAirMeter--;
         }
         if (dComIfGp_getItemTimeCount() == 0) {
@@ -6530,7 +6652,7 @@ void dMeter_swimLightBirth(sub_meter_class* i_Meter) {
     i_Meter->field_0x2f74[iVar3] = (cM_rndF(3.0f) + 5.0f);
     i_Meter->field_0x2f98[iVar3] = cM_rndFX(5.0f);
     i_Meter->field_0x2a90[iVar3].mUserArea = 1;
-    i_Meter->field_0x2a90[iVar3].mPosCenter.y = (i_Meter->field_0x2d30).mPosTopLeft.y + g_meterHIO.field_0x13c;
+    i_Meter->field_0x2a90[iVar3].mPosCenter.y = i_Meter->field_0x2d30.mPosTopLeft.y + g_meterHIO.field_0x13c;
     fopMsgM_cposMove(&i_Meter->field_0x2a90[iVar3]);
     i_Meter->field_0x3010 = cM_rndF((f32)g_meterHIO.field_0x138);
 }
@@ -6549,9 +6671,9 @@ void dMeter_swimLightAnime(sub_meter_class* i_Meter, s16 param_2) {
 
     sVar2 = g_meterHIO.field_0x136;
     iVar5 = g_meterHIO.field_0x136;
-    iVar4 = (int)(s16)(g_meterHIO.field_0x136 + g_meterHIO.field_0x138);
+    iVar4 = (s16)(g_meterHIO.field_0x136 + g_meterHIO.field_0x138);
     sVar1 = i_Meter->field_0x2a90[param_2].mUserArea;
-    dVar6 = sin((f32)((int)sVar1 * 0.5235988f));
+    dVar6 = sin((f32)(sVar1 * 0.5235988f));
     i_Meter->field_0x2a90[param_2].mPosCenter.x = i_Meter->field_0x2a90[param_2].mPosCenterOrig.x + i_Meter->field_0x2f98[param_2] * dVar6;
     i_Meter->field_0x2a90[param_2].mPosCenter.y = i_Meter->field_0x2a90[param_2].mPosCenter.y - i_Meter->field_0x2f74[param_2];
     i_Meter->field_0x2a90[param_2].mSize.x = g_meterHIO.field_0x7e;
@@ -6605,7 +6727,7 @@ void dMeter_arrowInit(sub_meter_class* i_Meter) {
 void dMeter_arrowCheckStatus(sub_meter_class* i_Meter) {
     if ((g_dComIfG_gameInfo.play.getDirection() & 1) != 0) {
         if (i_Meter->field_0x2e10[0].mUserArea == 0) {
-            if ((i_Meter->field_0x3025 == 0) || (i_Meter->field_0x3025 == 0x14)) {
+            if (i_Meter->field_0x3025 == 0 || i_Meter->field_0x3025 == 0x14) {
                 i_Meter->field_0x2e10[0].mUserArea = 1;
             }
         }
@@ -6614,7 +6736,7 @@ void dMeter_arrowCheckStatus(sub_meter_class* i_Meter) {
     }
     if ((g_dComIfG_gameInfo.play.getDirection() & 2) != 0) {
         if (i_Meter->field_0x2e10[1].mUserArea == 0) {
-            if ((i_Meter->field_0x3025 == 0) || (i_Meter->field_0x3025 == 0x14)) {
+            if (i_Meter->field_0x3025 == 0 || i_Meter->field_0x3025 == 0x14) {
                 i_Meter->field_0x2e10[1].mUserArea = 1;
             }
         }
@@ -6623,7 +6745,7 @@ void dMeter_arrowCheckStatus(sub_meter_class* i_Meter) {
     }
     if ((g_dComIfG_gameInfo.play.getDirection() & 4) != 0) {
         if (i_Meter->field_0x2e10[2].mUserArea == 0) {
-            if ((i_Meter->field_0x3025 == 0) || (i_Meter->field_0x3025 == 0x14)) {
+            if (i_Meter->field_0x3025 == 0 || i_Meter->field_0x3025 == 0x14) {
                 i_Meter->field_0x2e10[2].mUserArea = 1;
             }
         }
@@ -6632,7 +6754,7 @@ void dMeter_arrowCheckStatus(sub_meter_class* i_Meter) {
     }
     if ((g_dComIfG_gameInfo.play.getDirection() & 8) != 0) {
         if (i_Meter->field_0x2e10[3].mUserArea == 0) {
-            if (i_Meter->field_0x3025 == 0 || (i_Meter->field_0x3025 == 0x14)) {
+            if (i_Meter->field_0x3025 == 0 || i_Meter->field_0x3025 == 0x14) {
                 i_Meter->field_0x2e10[3].mUserArea = 1;
             }
         }
@@ -6770,7 +6892,7 @@ void dMeter_arrowErase(fopMsgM_pane_class* param_1) {
 
 /* 80203354-80203410       .text dMeter_arrowMove__FP15sub_meter_class */
 void dMeter_arrowMove(sub_meter_class* i_Meter) {
-    if ((dComIfGp_getAdvanceDirection() != 0) && (!dMenu_flag())) {
+    if (dComIfGp_getAdvanceDirection() != 0 && !dMenu_flag()) {
         dMeter_arrowCheckStatus(i_Meter);
         i_Meter->field_0x3025++;
         dMeter_arrowAnime(i_Meter);
@@ -7040,7 +7162,7 @@ static BOOL dMeter_Draw(sub_meter_class* i_Meter) {
     fopMsgM_setAlpha(&i_Meter->field_0x1830);
     fopMsgM_setAlpha(&i_Meter->field_0x1910);
     fopMsgM_setAlpha(&i_Meter->field_0x1948);
-    if ((i_Meter->field_0x1830.pane->isVisible()) && (i_Meter->field_0x3020 == 7)) {
+    if (i_Meter->field_0x1830.pane->isVisible() && i_Meter->field_0x3020 == 7) {
         for (s32 i = 0; i < 3; i++) {
             clock[i].mC0.a = i_Meter->field_0x1830.mNowAlpha;
         }
@@ -7073,13 +7195,13 @@ static BOOL dMeter_Draw(sub_meter_class* i_Meter) {
         for (s32 i = 0; i < 3; i++) {
             dComIfGd_set2DOpa(&clock[i]);
         }
-        if ((sScrTimer1 != NULL) && (sScrTimer2 != NULL)) {
+        if (sScrTimer1 != NULL && sScrTimer2 != NULL) {
             dComIfGd_set2DOpa(&tekari);
         }
         dComIfGd_set2DOpaTop(&meter2);
         dMeter_moveItemDraw(i_Meter);
-        if ((i_Meter->field_0x3028 == 1) && dComIfGp_getMetronome() && (!(i_Meter->mStatusFlags & dMtrStts_UNK8_e)) &&
-            (!(i_Meter->mStatusFlags & dMtrStts_UNK10_e)) && (!(i_Meter->mStatusFlags & dMtrStts_UNK800000_e)) && (!(i_Meter->mStatusFlags & dMtrStts_UNK20_e)))
+        if (i_Meter->field_0x3028 == 1 && dComIfGp_getMetronome() && !(i_Meter->mStatusFlags & dMtrStts_UNK8_e) &&
+            !(i_Meter->mStatusFlags & dMtrStts_UNK10_e) && !(i_Meter->mStatusFlags & dMtrStts_UNK800000_e) && !(i_Meter->mStatusFlags & dMtrStts_UNK20_e))
         {
             dComIfGd_set2DOpa(dMn_c);
         }
@@ -7229,7 +7351,7 @@ static BOOL dMeter_Delete(sub_meter_class* i_Meter) {
     delete sMainParts1;
     delete sMainParts2;
     delete sMainParts3;
-    if ((sScrTimer1 != NULL) && (sScrTimer2 != NULL)) {
+    if (sScrTimer1 != NULL && sScrTimer2 != NULL) {
         dComIfGp_getSwimResArchive()->removeResourceAll();
         delete sScrTimer1;
         delete sScrTimer2;
@@ -7469,7 +7591,7 @@ void mapCtrlDisp_c::moveMapCtrlDisp() {
         dMap_c::setIconDispMode(dMapIconDisp_NONE_e);
     }
     if (field_0x0 != 0) {
-        if (((field_0x4 != 0) && (cLib_addCalcAngleS(&field_0x4, 0, 2, 0x3c, 10) == 0)) && ((field_0x1 & 4) == 0)) {
+        if (field_0x4 != 0 && cLib_addCalcAngleS(&field_0x4, 0, 2, 0x3c, 10) == 0 && ((field_0x1 & 4) == 0)) {
             mDoAud_seStart(JA_SE_MAP_SHOW_END);
         }
     } else {