diff --git a/include/d/actor/d_a_player_main.h b/include/d/actor/d_a_player_main.h
index 64071d11a..ebb844c8f 100644
--- a/include/d/actor/d_a_player_main.h
+++ b/include/d/actor/d_a_player_main.h
@@ -1785,7 +1785,6 @@ public:
             mCurProc == daPyProc_GRAB_THROW_e;
     }
     BOOL checkNoControll() const { return dComIfGp_getPlayer(0) != this; }
-    void clearDamageWait() {}
     void exchangeGrabActor(fopAc_ac_c* actor) { mActorKeepGrab.setData(actor); }
     void getDekuLeafWindPos() const {}
     void getBoomerangCatchPos() const {}
@@ -1808,11 +1807,13 @@ public:
     
     int getStartRoomNo() { return fopAcM_GetParam(this) & 0x3F; }
     int getStartMode() { return (fopAcM_GetParam(this) >> 0x0C) & 0xF; }
+    static int getStartModeFromParam(u32 param) { return (param >> 0x0C) & 0xF; }
     int getStartEvent() { return (fopAcM_GetParam(this) >> 0x18) & 0xFF; }
     
     void onModeFlg(u32 flag) { mModeFlg |= flag; }
     void offModeFlg(u32 flag) { mModeFlg &= ~flag; }
     u32 checkModeFlg(u32 flag) const { return mModeFlg & flag; }
+    void clearDamageWait() { offModeFlg(ModeFlg_DAMAGE); }
     
     request_of_phase_process_class* getPhase() { return &mPhase; }
     
@@ -1842,8 +1843,13 @@ public:
     BOOL checkPlayerDemoMode() const { return mDemo.getDemoType()  != 0; }
     void checkSpecialDemoMode() const {}
     
-    void checkAttentionLock() {}
+    f32 getAnmSpeedStickRate(f32 param_0, f32 param_1) {
+        return param_0 + (mStickDistance * (param_1 - param_0));
+    }
+    void seStartSystem(u32 i_seNum) { mDoAud_seStart(i_seNum); }
+    BOOL checkAttentionLock() { return mpAttention->Lockon(); }
     void checkBoomerangRock() {}
+    
     void checkBothItemEquipAnime() const {}
     void checkCrawlWaterIn() {}
     void checkDoubleItemEquipAnime() const {}
@@ -1854,12 +1860,9 @@ public:
     void checkRopeThrowAnime() const {}
     void checkShieldEquip() const {}
     void checkSwordEquipAnime() const {}
-    void getAnmSpeedStickRate(f32, f32) {}
     void getBombWaterPillarBrk() {} // mpGwp00BrkData?
     void getBombWaterPillarBtk() {} // mpGwp00BtkData?
-    void getStartModeFromParam(u32) {}
     void getTactLeftHandPos() const {}
-    void seStartSystem(u32) {}
     void setFootEffectPosType(u8) {}
     void setSpeedAndAngleBoomerang() {}
     void setSpeedAndAngleBow() {}
@@ -2180,7 +2183,7 @@ public:
     /* 0x35A4 */ f32 m35A4;
     /* 0x35A8 */ f32 m35A8;
     /* 0x35AC */ f32 m35AC;
-    /* 0x35B0 */ f32 mStickDistance; // 
+    /* 0x35B0 */ f32 mStickDistance;
     /* 0x35B4 */ f32 m35B4;
     /* 0x35B8 */ f32 m35B8;
     /* 0x35BC */ f32 mVelocity;
diff --git a/include/m_Do/m_Do_audio.h b/include/m_Do/m_Do_audio.h
index d7738375f..9137761ae 100644
--- a/include/m_Do/m_Do_audio.h
+++ b/include/m_Do/m_Do_audio.h
@@ -47,7 +47,6 @@ extern mDoAud_zelAudio_c g_mDoAud_zelAudio;
 void mDoAud_setSceneName(const char*, s32, s32);
 void mDoAud_Execute();
 BOOL mDoAud_isUsedHeapForStreamBuffer();
-int mDoAud_load1stDynamicWave();
 int mDoAud_getTactDirection(int stick, int ret);
 
 extern JKRSolidHeap* g_mDoAud_audioHeap;
@@ -64,7 +63,9 @@ inline void mDoAud_subBgmStop() {
     mDoAud_zelAudio_c::getInterface()->subBgmStop();
 }
 
-inline void mDoAud_changeSubBgmStatus(u32 status) {
+inline void mDoAud_changeBgmStatus(s32 status) {}
+
+inline void mDoAud_changeSubBgmStatus(s32 status) {
     mDoAud_zelAudio_c::getInterface()->changeSubBgmStatus(status);
 }
 
@@ -92,7 +93,27 @@ inline int mDoAud_checkPlayingSubBgmFlag() {
     return mDoAud_zelAudio_c::getInterface()->checkPlayingSubBgmFlag();
 }
 
-inline void mDoAud_prepareLandingDemo(u32 idx) {
+inline s32 mDoAud_checkFirstWaves() {
+    return mDoAud_zelAudio_c::getInterface()->checkFirstWaves();
+}
+
+inline void mDoAud_loadStaticWaves() {
+    mDoAud_zelAudio_c::getInterface()->loadStaticWaves();
+}
+
+int mDoAud_load1stDynamicWave();
+
+inline void mDoAud_load2ndDynamicWave() {
+    mDoAud_zelAudio_c::getInterface()->load2ndDynamicWave();
+}
+
+inline void mDoAud_check1stDynamicWave() {}
+
+inline bool mDoAud_checkAllWaveLoadStatus() {
+    return mDoAud_zelAudio_c::getInterface()->checkAllWaveLoadStatus();
+}
+
+inline void mDoAud_prepareLandingDemo(s32 idx) {
     mDoAud_zelAudio_c::getInterface()->prepareLandingDemo(idx);
 }
 
@@ -108,10 +129,6 @@ inline void mDoAud_sceneBgmStart() {
     mDoAud_zelAudio_c::getInterface()->sceneBgmStart();
 }
 
-inline void mDoAud_load2ndDynamicWave() {
-    mDoAud_zelAudio_c::getInterface()->load2ndDynamicWave();
-}
-
 inline void mDoAud_taktModeMute() {
     mDoAud_zelAudio_c::getInterface()->taktModeMute();
 }
@@ -131,10 +148,6 @@ inline void mDoAud_seStart(u32 i_seNum, Vec* i_sePos, u32 param_2, s8 i_reverb)
     mDoAud_zelAudio_c::getInterface()->seStart(i_seNum, i_sePos, param_2, i_reverb, 1.0f, 1.0f, -1.0f, -1.0f, 0);
 }
 
-inline void mDoAud_messageSePlay(u16 i_seNum, Vec* i_sePos = NULL, s8 i_reverb = 0) {
-    mDoAud_zelAudio_c::getInterface()->messageSePlay(i_seNum, i_sePos, i_reverb);
-}
-
 inline void mDoAud_seStart(u32 i_seNum, Vec* i_sePos, u32 param_2) {
     mDoAud_zelAudio_c::getInterface()->seStart(i_seNum, i_sePos, param_2, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
 }
@@ -147,6 +160,10 @@ inline void mDoAud_seStart(u32 i_seNum) {
     mDoAud_zelAudio_c::getInterface()->seStart(i_seNum, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
 }
 
+inline void mDoAud_messageSePlay(u16 i_seNum, Vec* i_sePos = NULL, s8 i_reverb = 0) {
+    mDoAud_zelAudio_c::getInterface()->messageSePlay(i_seNum, i_sePos, i_reverb);
+}
+
 inline void mDoAud_bgmSetSwordUsing(s32 param_1) {
     mDoAud_zelAudio_c::getInterface()->bgmSetSwordUsing(param_1);
 }
@@ -155,10 +172,18 @@ inline void mDoAud_seStop(u32 i_seNum, s32 param_2) {
     mDoAud_zelAudio_c::getInterface()->seStop(i_seNum, param_2);
 }
 
+inline void mDoAud_seStop(u32 i_seNum) {
+    mDoAud_zelAudio_c::getInterface()->seStop(i_seNum, 0);
+}
+
 inline void mDoAud_seStopActor(Vec* param_1, u32 param_2) {
     mDoAud_zelAudio_c::getInterface()->seStopActor(param_1, param_2);
 }
 
+inline void mDoAud_seStopActor(Vec* param_0) {
+    mDoAud_zelAudio_c::getInterface()->seStopActor(param_0, -1);
+}
+
 inline void mDoAud_seDeleteObject(Vec* i_sePos) {
     mDoAud_zelAudio_c::getInterface()->seDeleteObject(i_sePos);
 }
@@ -171,16 +196,16 @@ inline void mDoAud_linkVoiceStart(u32 param_0, Vec* i_sePos, u8 param_3, s8 para
     mDoAud_zelAudio_c::getInterface()->linkVoiceStart(param_0, i_sePos, param_3, param_4);
 }
 
-inline void mDoAud_getCameraMapInfo(u32 param_0) {
-    mDoAud_zelAudio_c::getInterface()->getCameraMapInfo(param_0);
+inline void mDoAud_setLinkSwordType(s32 param_0, s32 param_1) {
+    mDoAud_zelAudio_c::getInterface()->setLinkSwordType(param_0, param_1);
 }
 
-inline void mDoAud_setCameraGroupInfo(u8 param_0) {
-    mDoAud_zelAudio_c::getInterface()->setCameraGroupInfo(param_0);
+inline void mDoAud_setLinkShieldType(s32 param_0, s32 param_1) {
+    mDoAud_zelAudio_c::getInterface()->setLinkShieldType(param_0, param_1);
 }
 
-inline void mDoAud_getCameraInfo(Vec* param_0, MtxP param_1, u32 param_2) {
-    mDoAud_zelAudio_c::getInterface()->getCameraInfo(param_0, param_1, param_2);
+inline void mDoAud_setLinkBootsType(s32 param_0) {
+    mDoAud_zelAudio_c::getInterface()->setLinkBootsType(param_0);
 }
 
 inline void mDoAud_setLinkGroupInfo(u8 param_0) {
@@ -195,11 +220,27 @@ inline void mDoAud_setLinkHp(s32 param_0, s32 param_1) {
     mDoAud_zelAudio_c::getInterface()->setLinkHp(param_0, param_1);
 }
 
+inline void mDoAud_bgmNowKaitengiri() {
+    mDoAud_zelAudio_c::getInterface()->bgmNowKaitengiri();
+}
+
+inline void mDoAud_getCameraMapInfo(u32 param_0) {
+    mDoAud_zelAudio_c::getInterface()->getCameraMapInfo(param_0);
+}
+
+inline void mDoAud_setCameraGroupInfo(u8 param_0) {
+    mDoAud_zelAudio_c::getInterface()->setCameraGroupInfo(param_0);
+}
+
+inline void mDoAud_getCameraInfo(Vec* param_0, MtxP param_1, u32 param_2) {
+    mDoAud_zelAudio_c::getInterface()->getCameraInfo(param_0, param_1, param_2);
+}
+
 inline void mDoAud_setShipSailState(s32 state) {
     mDoAud_zelAudio_c::getInterface()->setShipSailState(state);
 }
 
-inline void mDoAud_shipCruiseSePlay(Vec* i_sePos, f32 param_1) {
+inline void mDoAud_shipCruiseSePlay(cXyz* i_sePos, f32 param_1) {
     mDoAud_zelAudio_c::getInterface()->shipCruiseSePlay(i_sePos, param_1);
 }
 
@@ -337,10 +378,6 @@ inline void mDoAud_bgmNowBattle(f32 distance) {
     mDoAud_zelAudio_c::getInterface()->bgmNowBattle(distance);
 }
 
-inline bool mDoAud_checkAllWaveLoadStatus() {
-    return mDoAud_zelAudio_c::getInterface()->checkAllWaveLoadStatus();
-}
-
 inline void mDoAud_initSeaEnvPos() {
     mDoAud_zelAudio_c::getInterface()->initSeaEnvPos();
 }
@@ -393,4 +430,8 @@ inline void mDoAud_talkOut() {
     mDoAud_zelAudio_c::getInterface()->talkOut();
 }
 
+inline void mDoAud_checkSePlaying(u32 param_0) {}
+inline void mDoAud_heartGaugeOn() {}
+inline void mDoAud_resetRecover() {}
+
 #endif /* M_DO_AUDIO_H */
diff --git a/src/JAZelAudio/JAIZelBasic.cpp b/src/JAZelAudio/JAIZelBasic.cpp
index e49be4c87..a9c0269da 100644
--- a/src/JAZelAudio/JAIZelBasic.cpp
+++ b/src/JAZelAudio/JAIZelBasic.cpp
@@ -1577,7 +1577,7 @@ void JAIZelBasic::stSkyCloistersProcess() {
 u32 JAIZelBasic::getRandomU32(u32 param_1) {
     u32 tmp = jai_rng_seed;
     jai_rng_seed = tmp * 2;
-    jai_rng_seed += (tmp >> 0x1f ^ tmp >> 6 & 0x10);
+    jai_rng_seed += (tmp >> 0x1f ^ (tmp >> 6 & 0x10));
     tmp = (jai_rng_seed / param_1);
     return jai_rng_seed - tmp * param_1;
 }
diff --git a/src/d/actor/d_a_bomb3.inc b/src/d/actor/d_a_bomb3.inc
index 02b73d12b..ddcff213a 100644
--- a/src/d/actor/d_a_bomb3.inc
+++ b/src/d/actor/d_a_bomb3.inc
@@ -1195,7 +1195,7 @@ void daBomb_c::se_cannon_fly_set() {
 /* 800DC400-800DC44C       .text se_cannon_fly_stop__8daBomb_cFv */
 void daBomb_c::se_cannon_fly_stop() {
     if(field_0x77F) {
-        mDoAud_seStopActor(&current.pos, -1);
+        mDoAud_seStopActor(&current.pos);
         field_0x77F = 0;
     }
 }
diff --git a/src/d/actor/d_a_player_boomerang.inc b/src/d/actor/d_a_player_boomerang.inc
index 072320fe5..9c6915879 100644
--- a/src/d/actor/d_a_player_boomerang.inc
+++ b/src/d/actor/d_a_player_boomerang.inc
@@ -102,7 +102,7 @@ BOOL daPy_lk_c::checkNextBoomerangMode() {
     if (!checkBoomerangAnime()) {
         seStartOnlyReverb(JA_SE_LK_ITEM_TAKEOUT);
     }
-    if (mpAttention->Lockon()) {
+    if (checkAttentionLock()) {
         return procBoomerangMove_init();
     } else {
         return procBoomerangSubject_init();
@@ -166,7 +166,7 @@ BOOL daPy_lk_c::procBoomerangSubject() {
 
     setShapeAngleToAtnActor();
 
-    if (mpAttention->Lockon()) {
+    if (checkAttentionLock()) {
         setSpeedAndAngleAtn();
     }
 
@@ -256,7 +256,7 @@ BOOL daPy_lk_c::procBoomerangCatch_init() {
 
 /* 80149E1C-80149ECC       .text procBoomerangCatch__9daPy_lk_cFv */
 BOOL daPy_lk_c::procBoomerangCatch() {
-    if (mpAttention->Lockon()) {
+    if (checkAttentionLock()) {
         setSpeedAndAngleAtn();
     } else {
         setSpeedAndAngleNormal(daPy_HIO_move_c0::m.field_0x0);
diff --git a/src/d/actor/d_a_player_bottle.inc b/src/d/actor/d_a_player_bottle.inc
index 1de3dd779..c6537a322 100644
--- a/src/d/actor/d_a_player_bottle.inc
+++ b/src/d/actor/d_a_player_bottle.inc
@@ -569,7 +569,7 @@ BOOL daPy_lk_c::procBottleGet() {
         m355E = 1;
     }
     if (frameCtrl.checkPass(39.0f)) {
-        mDoAud_seStart(JA_SE_ME_ITEM_GET_S);
+        seStartSystem(JA_SE_ME_ITEM_GET_S);
         dComIfGp_setMesgBgmOn2();
     }
     return true;
diff --git a/src/d/actor/d_a_player_bow.inc b/src/d/actor/d_a_player_bow.inc
index a2b161add..c6649fbaa 100644
--- a/src/d/actor/d_a_player_bow.inc
+++ b/src/d/actor/d_a_player_bow.inc
@@ -177,7 +177,7 @@ BOOL daPy_lk_c::checkNextActionBowReady() {
                 setBowReloadAnime();
                 makeArrow();
                 if (mActorKeepEquip.getActor() == NULL) {
-                    mDoAud_seStart(JA_SE_ITEM_TARGET_OUT);
+                    seStartSystem(JA_SE_ITEM_TARGET_OUT);
                 }
             } else if (daArrow_c::changeArrowMp()) {
                 if (mEquipItem != dItem_BOW_e) {
@@ -208,7 +208,7 @@ void daPy_lk_c::checkNextActionBowFly() {
 
 /* 8014A680-8014A6F4       .text checkNextBowMode__9daPy_lk_cFv */
 BOOL daPy_lk_c::checkNextBowMode() {
-    if (mpAttention->Lockon()) {
+    if (checkAttentionLock()) {
         return procBowMove_init();
     } else {
         return procBowSubject_init();
@@ -259,7 +259,7 @@ BOOL daPy_lk_c::procBowSubject_init() {
 BOOL daPy_lk_c::procBowSubject() {
     dComIfGp_setDoStatus(dActStts_RETURN_e);
 
-    if (mpAttention->Lockon()) {
+    if (checkAttentionLock()) {
         setSpeedAndAngleAtn();
     }
 
@@ -296,7 +296,7 @@ BOOL daPy_lk_c::procBowMove_init() {
 BOOL daPy_lk_c::procBowMove() {
     if (mpAttnActorLockOn != NULL) {
         setSpeedAndAngleAtnActor();
-    } else if (!mpAttention->Lockon() && mActorKeepEquip.getActor() == NULL) {
+    } else if (!checkAttentionLock() && mActorKeepEquip.getActor() == NULL) {
         resetActAnimeUpper(UPPER_MOVE2_e, -1.0f);
     } else {
         setSpeedAndAngleAtn();
diff --git a/src/d/actor/d_a_player_climb.inc b/src/d/actor/d_a_player_climb.inc
index b4e99e186..d908c9d75 100644
--- a/src/d/actor/d_a_player_climb.inc
+++ b/src/d/actor/d_a_player_climb.inc
@@ -15,8 +15,7 @@
 
 /* 80135B50-80135B74       .text getClimbMoveAnmSpeed__9daPy_lk_cFv */
 f32 daPy_lk_c::getClimbMoveAnmSpeed() {
-    return daPy_HIO_ladder_c0::m.field_0x34 +
-           (mStickDistance * (daPy_HIO_ladder_c0::m.field_0x30 - daPy_HIO_ladder_c0::m.field_0x34));
+    return getAnmSpeedStickRate(daPy_HIO_ladder_c0::m.field_0x34, daPy_HIO_ladder_c0::m.field_0x30);
 }
 
 /* 80135B74-80135DA0       .text setClimbShapeOffset__9daPy_lk_cFv */
diff --git a/src/d/actor/d_a_player_crawl.inc b/src/d/actor/d_a_player_crawl.inc
index 43ab781a8..3e353a448 100644
--- a/src/d/actor/d_a_player_crawl.inc
+++ b/src/d/actor/d_a_player_crawl.inc
@@ -19,19 +19,14 @@
 /* 801387A4-801387EC       .text getCrawlMoveAnmSpeed__9daPy_lk_cFv */
 f32 daPy_lk_c::getCrawlMoveAnmSpeed() {
     if (mProcVar0.m3570 != 0) {
-        f32 fVar1 = 1.5f;
-        f32 fVar2 = 0.5f;
-        return (mStickDistance * fVar1) + fVar2;
+        return getAnmSpeedStickRate(0.5f, 2.0f);
     }
-    return daPy_HIO_crouch_c0::m.field_0x34 +
-           (mStickDistance * (daPy_HIO_crouch_c0::m.field_0x30 - daPy_HIO_crouch_c0::m.field_0x34));
+    return getAnmSpeedStickRate(daPy_HIO_crouch_c0::m.field_0x34, daPy_HIO_crouch_c0::m.field_0x30);
 }
 
 /* 801387EC-80138868       .text getCrawlMoveSpeed__9daPy_lk_cFv */
 f32 daPy_lk_c::getCrawlMoveSpeed() {
-    float fVar1;
-
-    fVar1 = mFrameCtrlUnder[UNDER_MOVE0_e].getFrame();
+    f32 fVar1 = mFrameCtrlUnder[UNDER_MOVE0_e].getFrame();
     if (fVar1 >= 17.0f) {
         fVar1 = fVar1 - 17.0f;
     }
@@ -466,7 +461,7 @@ BOOL daPy_lk_c::procCrawlMove() {
                        checkCrawlSideWall(&spF4, &spDC, &spC4, &spD0, &sp08, &sp0A)))
         {
             mProcVar0.m3570 = 1;
-            mResetFlg0 = mResetFlg0 | 0x1000;
+            onResetFlg0(daPyRFlg0_UNK1000);
             m370C = ((spD0 + spC4) * 0.5f) - spB8;
             m34D4 = sp0A + 0x4000;
         }
diff --git a/src/d/actor/d_a_player_dproc.inc b/src/d/actor/d_a_player_dproc.inc
index d179552c4..4abe98b6d 100644
--- a/src/d/actor/d_a_player_dproc.inc
+++ b/src/d/actor/d_a_player_dproc.inc
@@ -208,7 +208,7 @@ BOOL daPy_lk_c::dProcTalk_init() {
     }
     dComIfGp_setPlayerStatus0(0, daPyStts0_UNK10_e);
     if (mDemo.getParam0() != 1) {
-        mDoAud_seStart(JA_SE_TALK_START);
+        seStartSystem(JA_SE_TALK_START);
     }
     initShipRideUseItem(iVar2, 0);
     return true;
@@ -398,7 +398,7 @@ void daPy_lk_c::setGetItemSound(u16 param_1, int param_2) {
     if (param_1 == dItem_GREEN_RUPEE_e || param_1 == dItem_BLUE_RUPEE_e || param_1 == dItem_YELLOW_RUPEE_e ||
         param_1 == dItem_RED_RUPEE_e || param_1 == dItem_PURPLE_RUPEE_e || param_1 == TINCLE_RUPEE1)
     {
-        mDoAud_seStart(JA_SE_ME_ITEM_GET_S);
+        seStartSystem(JA_SE_ME_ITEM_GET_S);
         dComIfGp_setMesgBgmOn2();
     } else if ((param_1 == dItem_HEART_CONTAINER_e) ||
                (param_1 == dItem_HEART_PIECE_e && ((dComIfGs_getMaxLife() % 4) == 3)))
@@ -411,7 +411,7 @@ void daPy_lk_c::setGetItemSound(u16 param_1, int param_2) {
         mDoAud_subBgmStart(JA_BGM_ITEM_GET_S);
         dComIfGp_setMesgBgmOn();
     } else if (param_2 != dItem_HEART_e) {
-        mDoAud_seStart(JA_SE_ME_ITEM_GET_S);
+        seStartSystem(JA_SE_ME_ITEM_GET_S);
         dComIfGp_setMesgBgmOn2();
     } else {
         mDoAud_subBgmStart(JA_BGM_ITEM_GET);
@@ -1453,7 +1453,7 @@ BOOL daPy_lk_c::dProcPresent_init() {
         dProcPresent_init_sub();
     }
     dComIfGp_setPlayerStatus0(0, daPyStts0_UNK10_e);
-    mDoAud_seStart(JA_SE_TALK_START);
+    seStartSystem(JA_SE_TALK_START);
     m3574 = 0;
     return true;
 }
@@ -1584,9 +1584,7 @@ BOOL daPy_lk_c::dProcStandItemPut() {
     } else if (mFrameCtrlUnder[UNDER_MOVE0_e].getRate() > -0.01f) {
         fopAc_ac_c* grab_actor = mActorKeepGrab.getActor();
         if (grab_actor != NULL) {
-            mDoAud_seStart(
-                JA_SE_LK_W_DAIZA_ATTACH, &grab_actor->current.pos, NULL, dComIfGp_getReverb(grab_actor->current.roomNo)
-            );
+            fopAcM_seStartCurrent(grab_actor, JA_SE_LK_W_DAIZA_ATTACH, 0);
         }
         freeGrabItem();
         dComIfGp_evmng_cutEnd(mStaffIdx);
@@ -1746,7 +1744,7 @@ BOOL daPy_lk_c::dProcAgbUse_init() {
     setAnimeEquipItem();
     mVelocity = 0.0f;
     setSingleMoveAnime(ANM_USETCEIVER, 1.0f, 0.0f, -1, daPy_HIO_basic_c0::m.field_0xC);
-    mDoAud_seStart(JA_SE_TALK_START);
+    seStartSystem(JA_SE_TALK_START);
     initShipRideUseItem(iVar2, 2);
     return true;
 }
diff --git a/src/d/actor/d_a_player_fan.inc b/src/d/actor/d_a_player_fan.inc
index a2eca37ee..026a6ef86 100644
--- a/src/d/actor/d_a_player_fan.inc
+++ b/src/d/actor/d_a_player_fan.inc
@@ -107,7 +107,7 @@ BOOL daPy_lk_c::checkFanGlideProc(int param_0) {
         if (dComIfGs_getMagic() >= 1) {
             return procFanGlide_init(param_0);
         }
-        mDoAud_seStart(JA_SE_ITEM_TARGET_OUT);
+        seStartSystem(JA_SE_ITEM_TARGET_OUT);
     }
     return false;
 }
diff --git a/src/d/actor/d_a_player_food.inc b/src/d/actor/d_a_player_food.inc
index 152f0fe66..38ee333b4 100644
--- a/src/d/actor/d_a_player_food.inc
+++ b/src/d/actor/d_a_player_food.inc
@@ -34,7 +34,7 @@ BOOL daPy_lk_c::procFoodThrow_init() {
         return TRUE;
     }
     if (m3630 != fpcM_ERROR_PROCESS_ID_e) {
-        mDoAud_seStart(JA_SE_ITEM_TARGET_OUT);
+        seStartSystem(JA_SE_ITEM_TARGET_OUT);
         return FALSE;
     }
 
diff --git a/src/d/actor/d_a_player_grab.inc b/src/d/actor/d_a_player_grab.inc
index 94423345a..4290b12e0 100644
--- a/src/d/actor/d_a_player_grab.inc
+++ b/src/d/actor/d_a_player_grab.inc
@@ -222,7 +222,7 @@ BOOL daPy_lk_c::checkNextActionGrab() {
         dComIfGp_setDoStatus(dActStts_OPEN_e);
     } else if (iVar3 != 0) {
         dComIfGp_setDoStatus(dActStts_DROP_e);
-    } else if (mpAttention->Lockon()) {
+    } else if (checkAttentionLock()) {
         int direction = getDirectionFromShapeAngle();
         if (mStickDistance <= 0.05f ||
             (mStickDistance > 0.05f && (direction == DIR_FORWARD || direction == DIR_BACKWARD)))
@@ -735,7 +735,7 @@ BOOL daPy_lk_c::procGrabWait() {
         return checkNextMode(0);
     }
 
-    if (mpAttention->Lockon()) {
+    if (checkAttentionLock()) {
         setSpeedAndAngleAtn();
     } else {
         setSpeedAndAngleNormal(daPy_HIO_move_c0::m.field_0x0);
@@ -755,7 +755,7 @@ BOOL daPy_lk_c::procGrabWait() {
         if (checkGrabAnime()) {
             m_pbCalc[PART_UPPER_e]->setRatio(2, 1.0f);
         }
-    } else if (shape_angle.y != m34DE && !mpAttention->Lockon()) {
+    } else if (shape_angle.y != m34DE && !checkAttentionLock()) {
         float fVar2;
         if (checkNoResetFlg1(daPyFlg1_UNK800000)) {
             fVar2 = -1.0f;
@@ -798,7 +798,7 @@ BOOL daPy_lk_c::procGrabHeavyWait() {
         return checkNextMode(0);
     }
 
-    if (!mpAttention->Lockon() && mStickDistance > 0.05f) {
+    if (!checkAttentionLock() && mStickDistance > 0.05f) {
         cLib_addCalcAngleS(
             &shape_angle.y,
             m34E8,
diff --git a/src/d/actor/d_a_player_hammer.inc b/src/d/actor/d_a_player_hammer.inc
index ace880dcd..568c039dd 100644
--- a/src/d/actor/d_a_player_hammer.inc
+++ b/src/d/actor/d_a_player_hammer.inc
@@ -37,7 +37,7 @@ void daPy_lk_c::setHammerQuake(cBgS_PolyInfo* param_1, const cXyz* param_2, int
     float local_54;
     BOOL bVar2;
     int attrib_code;
-    int iVar6;
+    u32 iVar6;
     JPABaseEmitter* emitter;
     f32 dVar9;
     int iStack_58;
@@ -248,7 +248,7 @@ BOOL daPy_lk_c::procHammerFrontSwingReady_init() {
     );
     current.angle.y = shape_angle.y;
     mVelocity = 0.0f;
-    if (mpAttention->Lockon() || mStickDistance <= 0.05f) {
+    if (checkAttentionLock() || mStickDistance <= 0.05f) {
         m34D4 = shape_angle.y;
     } else {
         m34D4 = m34E8;
@@ -296,7 +296,7 @@ BOOL daPy_lk_c::procHammerFrontSwing_init() {
     current.angle.y = shape_angle.y;
     mVelocity = 0.0f;
     voiceStart(1);
-    if (mpAttention->Lockon() || mStickDistance <= 0.05f) {
+    if (checkAttentionLock() || mStickDistance <= 0.05f) {
         m34D4 = shape_angle.y;
     } else {
         m34D4 = m34E8;
diff --git a/src/d/actor/d_a_player_hang.inc b/src/d/actor/d_a_player_hang.inc
index d3abf490b..b8d755ad7 100644
--- a/src/d/actor/d_a_player_hang.inc
+++ b/src/d/actor/d_a_player_hang.inc
@@ -15,8 +15,7 @@
 
 /* 80133F1C-80133F40       .text getHangMoveAnmSpeed__9daPy_lk_cFv */
 f32 daPy_lk_c::getHangMoveAnmSpeed() {
-    return daPy_HIO_hang_c0::m.field_0x24 +
-           (mStickDistance * (daPy_HIO_hang_c0::m.field_0x28 - daPy_HIO_hang_c0::m.field_0x24));
+    return getAnmSpeedStickRate(daPy_HIO_hang_c0::m.field_0x24, daPy_HIO_hang_c0::m.field_0x28);
 }
 
 /* 80133F40-80133FB4       .text getHangDirectionFromAngle__9daPy_lk_cFv */
diff --git a/src/d/actor/d_a_player_hook.inc b/src/d/actor/d_a_player_hook.inc
index fb27d5c63..db0df2f0f 100644
--- a/src/d/actor/d_a_player_hook.inc
+++ b/src/d/actor/d_a_player_hook.inc
@@ -94,11 +94,11 @@ void daPy_lk_c::setHookshotSight() {
             if (mSightPacket.getLockFlg()) {
                 mSightPacket.incFrame();
                 if (mSightPacket.checkSEFrame()) {
-                    mDoAud_seStart(JA_SE_INDICATOR_1);
+                    seStartSystem(JA_SE_INDICATOR_1);
                 }
             } else {
                 mSightPacket.onLockFlg();
-                mDoAud_seStart(JA_SE_INDICATOR_1);
+                seStartSystem(JA_SE_INDICATOR_1);
             }
         } else {
             mSightPacket.offLockFlg();
@@ -186,7 +186,7 @@ BOOL daPy_lk_c::checkNextHookshotMode() {
         m355E = 0;
         seStartOnlyReverb(JA_SE_LK_ITEM_TAKEOUT);
     }
-    if (mpAttention->Lockon()) {
+    if (checkAttentionLock()) {
         return procHookshotMove_init();
     } else {
         return procHookshotSubject_init();
@@ -222,7 +222,7 @@ BOOL daPy_lk_c::procHookshotSubject() {
         dComIfGp_setDoStatus(dActStts_RETURN_e);
     }
 
-    if (mpAttention->Lockon()) {
+    if (checkAttentionLock()) {
         setSpeedAndAngleAtn();
     }
 
@@ -274,7 +274,7 @@ BOOL daPy_lk_c::procHookshotMove() {
     if (hookshot->checkWait()) {
         if (mpAttnActorLockOn != NULL) {
             setSpeedAndAngleAtnActor();
-        } else if (m355E == 0 && !mpAttention->Lockon()) {
+        } else if (m355E == 0 && !checkAttentionLock()) {
             resetActAnimeUpper(UPPER_MOVE2_e, -1.0f);
         } else {
             setSpeedAndAngleAtn();
diff --git a/src/d/actor/d_a_player_ladder.inc b/src/d/actor/d_a_player_ladder.inc
index d4603dd6b..393e3ec9a 100644
--- a/src/d/actor/d_a_player_ladder.inc
+++ b/src/d/actor/d_a_player_ladder.inc
@@ -15,8 +15,7 @@
 
 /* 80132F34-80132F58       .text getLadderMoveAnmSpeed__9daPy_lk_cFv */
 f32 daPy_lk_c::getLadderMoveAnmSpeed() {
-    return daPy_HIO_ladder_c0::m.field_0x28 +
-           (mStickDistance * (daPy_HIO_ladder_c0::m.field_0x24 - daPy_HIO_ladder_c0::m.field_0x28));
+    return getAnmSpeedStickRate(daPy_HIO_ladder_c0::m.field_0x28, daPy_HIO_ladder_c0::m.field_0x24);
 }
 
 /* 80132F58-80133058       .text setLadderFootSe__9daPy_lk_cFv */
diff --git a/src/d/actor/d_a_player_main.cpp b/src/d/actor/d_a_player_main.cpp
index 1f1369286..d38ef7858 100644
--- a/src/d/actor/d_a_player_main.cpp
+++ b/src/d/actor/d_a_player_main.cpp
@@ -299,10 +299,11 @@ BOOL daPy_lk_c::jointBeforeCB(int jnt_no, J3DTransformInfo* param_2, Quaternion*
     } else if (jnt_no == 0) {
         local_38.x = m34F2;
         local_38.z = m34F4;
-    } else if ((((jnt_no == 10) || (jnt_no == 0xB)) &&
-                (dComIfGp_checkPlayerStatus0(0, daPyStts0_SHIP_RIDE_e))) &&
-               (m_old_fdata->getOldFrameFlg() != false))
-    {
+    } else if (
+        (jnt_no == 0xA || jnt_no == 0xB) &&
+        dComIfGp_checkPlayerStatus0(0, daPyStts0_SHIP_RIDE_e) &&
+        m_old_fdata->getOldFrameFlg() != false
+    ) {
         if (dComIfGp_getShipActor() != NULL) {
             if (!fpcM_IsCreating(fopAcM_GetID(dComIfGp_getShipActor()))) {
                 if (!checkShipNotNormalMode()) {
@@ -335,14 +336,14 @@ BOOL daPy_lk_c::jointBeforeCB(int jnt_no, J3DTransformInfo* param_2, Quaternion*
             param_2->mTranslate.z = 0.0f;
         }
     }
-    if ((jnt_no == 0x1E) && ((m34E0 != 0 || (m34E4 != 0)))) {
+    if (jnt_no == 0x1E && (m34E0 != 0 || m34E4 != 0)) {
         local_38.y = m34E4;
         local_38.z = m34E0;
     }
-    if ((local_38.x != 0) || (local_38.y != 0) || (local_38.z != 0)) {
+    if (local_38.x != 0 || local_38.y != 0 || local_38.z != 0) {
         m34C6 = m34C6 | 1;
         m3658 = *param_3;
-        if ((local_38.x != 0) || (local_38.y != 0)) {
+        if (local_38.x != 0 || local_38.y != 0) {
             local_20 = *param_3;
             JMAEulerToQuat(local_38.x, local_38.y, 0, &afStack_30);
             mDoMtx_QuatConcat(&local_20, &afStack_30, param_3);
@@ -353,10 +354,11 @@ BOOL daPy_lk_c::jointBeforeCB(int jnt_no, J3DTransformInfo* param_2, Quaternion*
             mDoMtx_QuatConcat(&local_20, &afStack_30, param_3);
         }
     }
-    if (((checkUpperGuardAnime()) && (mCurProc != daPyProc_BACK_JUMP_e)) ||
-        (((checkGrabAnime()) || (m_anm_heap_upper[UPPER_MOVE0_e].mIdx == LKANM_BCK_ATNBOKO)) ||
-         (m_anm_heap_upper[UPPER_MOVE0_e].mIdx == LKANM_BCK_ATNHAM)) ||
-        (checkUpperReadyThrowAnime()))
+    if ((checkUpperGuardAnime() && mCurProc != daPyProc_BACK_JUMP_e) ||
+        checkGrabAnime() ||
+        m_anm_heap_upper[UPPER_MOVE0_e].mIdx == LKANM_BCK_ATNBOKO ||
+        m_anm_heap_upper[UPPER_MOVE0_e].mIdx == LKANM_BCK_ATNHAM ||
+        checkUpperReadyThrowAnime())
     {
         if (jnt_no == 0) {
             m3648 = *param_3;
@@ -415,23 +417,23 @@ BOOL daPy_lk_c::jointCB0(int param_1) {
 
     if (checkEquipAnime()) {
         if (!checkModeFlg(ModeFlg_00000001)) {
-            if ((param_1 == 1) || (param_1 == 0xD)) {
+            if (param_1 == 1 || param_1 == 0xD) {
                 m_pbCalc[PART_UPPER_e]->setRatio(2, 0.0f);
-            } else if ((param_1 == 4) || (param_1 == 0x1c)) {
+            } else if (param_1 == 4 || param_1 == 0x1c) {
                 m_pbCalc[PART_UPPER_e]->setRatio(2, 1.0f);
             }
         }
-    } else if ((checkUpperReadyAnime()) ||
-               (checkUpperAnime(LKANM_BCK_ROPETHROW)) ||
-               ((mCurProc != daPyProc_GRAB_WAIT_e) && checkGrabAnime()))
+    } else if (checkUpperReadyAnime() ||
+               checkUpperAnime(LKANM_BCK_ROPETHROW) ||
+               (mCurProc != daPyProc_GRAB_WAIT_e && checkGrabAnime()))
     {
         if (param_1 == 0xF) {
             m_pbCalc[PART_UPPER_e]->setRatio(2, 0.0f);
         } else if (param_1 == 0x1C) {
             m_pbCalc[PART_UPPER_e]->setRatio(2, 1.0f);
         }
-    } else if ((dComIfGp_checkPlayerStatus0(0, daPyStts0_SHIP_RIDE_e)) &&
-               (!checkShipNotNormalMode()))
+    } else if (dComIfGp_checkPlayerStatus0(0, daPyStts0_SHIP_RIDE_e) &&
+               !checkShipNotNormalMode())
     {
         if (param_1 == 0xF) {
             m_pbCalc[PART_UPPER_e]->setRatio(2, 1.0f);
@@ -439,16 +441,16 @@ BOOL daPy_lk_c::jointCB0(int param_1) {
             m_pbCalc[PART_UPPER_e]->setRatio(2, 0.0f);
         }
     } else if (checkUpperGuardAnime()) {
-        if ((param_1 == 0) || (param_1 == 0xD)) {
+        if (param_1 == 0 || param_1 == 0xD) {
             if (param_1 == 0) {
                 guard_rate = m_pbCalc[PART_UPPER_e]->getRatio(2);
             }
             m_pbCalc[PART_UPPER_e]->setRatio(2, 1.0f);
-        } else if ((param_1 == 4) || (param_1 == 0x1C)) {
+        } else if (param_1 == 4 || param_1 == 0x1C) {
             m_pbCalc[PART_UPPER_e]->setRatio(2, guard_rate);
         }
-    } else if ((dComIfGp_checkPlayerStatus1(0, daPyStts1_WIND_WAKER_CONDUCT_e)) &&
-               ((mCurProc != daPyProc_TACT_PLAY_e || (mProcVar0.m3570 != 0))))
+    } else if (dComIfGp_checkPlayerStatus1(0, daPyStts1_WIND_WAKER_CONDUCT_e) &&
+               (mCurProc != daPyProc_TACT_PLAY_e || mProcVar0.m3570 != 0))
     {
         if (param_1 == 4) {
             m_pbCalc[PART_UPPER_e]->setRatio(2, 1.0f);
@@ -693,10 +695,9 @@ u16 daPy_lk_c::checkNormalFace() {
     if (checkNoResetFlg1(daPyFlg1_UNK1000000) && !checkModeFlg(ModeFlg_00000001)) {
         return daPyFace_TDASHKAZE;
     }
-    if (((checkUpperReadyAnime() || ((checkNoResetFlg1(daPyFlg1_UNK400) ||
-                                      (mpAttnActorLockOn != NULL &&
-                                       (fopAcM_GetGroup(mpAttnActorLockOn) == fopAc_ENEMY_e))))) ||
-         checkEquipHeavyBoots()) ||
+    if (checkUpperReadyAnime() || checkNoResetFlg1(daPyFlg1_UNK400) ||
+        (mpAttnActorLockOn != NULL && fopAcM_GetGroup(mpAttnActorLockOn) == fopAc_ENEMY_e) ||
+        checkEquipHeavyBoots() ||
         mEquipItem == dItem_SKULL_HAMMER_e)
     {
         return daPyFace_TMABAC;
@@ -704,7 +705,7 @@ u16 daPy_lk_c::checkNormalFace() {
     if (checkBossBgm()) {
         return daPyFace_TMABAC;
     }
-    if (mpAttention->Lockon()) {
+    if (checkAttentionLock()) {
         return daPyFace_TMABACB;
     }
     if (mEquipItem != daPyItem_NONE_e) {
@@ -726,15 +727,13 @@ u16 daPy_lk_c::checkNormalFace() {
     }
     if (mCurProc == daPyProc_WAIT_e && !dComIfGp_event_runCheck()) {
         f32 dVar7 = cM_rnd();
-        if (((m_tex_anm_heap.mIdx == LKANM_BTP_TMABAA ||
-              m_tex_anm_heap.mIdx == LKANM_BTP_TMABAB) &&
-             dVar7 < 0.01f) ||
-            (((m_tex_anm_heap.mIdx == LKANM_BTP_TMABACC && dVar7 >= 0.01f))))
+        if (((m_tex_anm_heap.mIdx == LKANM_BTP_TMABAA || m_tex_anm_heap.mIdx == LKANM_BTP_TMABAB) && dVar7 < 0.01f) ||
+            (m_tex_anm_heap.mIdx == LKANM_BTP_TMABACC && dVar7 >= 0.01f))
         {
             return daPyFace_TMABACC;
         }
-        if (((dStage_stagInfo_GetSTType(dComIfGp_getStageStagInfo()) == dStageType_DUNGEON_e) ||
-             dStage_stagInfo_GetSTType(dComIfGp_getStageStagInfo()) == dStageType_SUBDUNGEON_e))
+        if (dStage_stagInfo_GetSTType(dComIfGp_getStageStagInfo()) == dStageType_DUNGEON_e ||
+            dStage_stagInfo_GetSTType(dComIfGp_getStageStagInfo()) == dStageType_SUBDUNGEON_e)
         {
             return daPyFace_TMABAB;
         }
@@ -773,10 +772,13 @@ void daPy_lk_c::setTextureAnime(u16 param_1, int param_2) {
     }
     dVar9 = cM_rnd();
     if (m_tex_scroll_heap.mIdx != btk_idx) {
-        if (((bVar3 && checkModeFlg(ModeFlg_00000001)) && daPy_matAnm_c::m_maba_flg != 0) &&
-            (((!dComIfGp_event_runCheck() && mpAttnActorLockOn == NULL) && btk_idx == LKANM_BTK_TMABA)))
+        if (bVar3 && checkModeFlg(ModeFlg_00000001) &&
+            daPy_matAnm_c::m_maba_flg != 0 &&
+            !dComIfGp_event_runCheck() &&
+            mpAttnActorLockOn == NULL &&
+            btk_idx == LKANM_BTK_TMABA)
         {
-            if (daPy_matAnm_c::m_maba_timer == 0) {
+            if (daPy_matAnm_c::getMabaTimer() == 0) {
                 if (dVar9 < 0.44f) {
                     btk_idx = LKANM_BTK_TMABA;
                 } else {
@@ -800,8 +802,8 @@ void daPy_lk_c::setTextureAnime(u16 param_1, int param_2) {
                     }
                 }
                 m_tex_scroll_heap.mIdx = btk_idx;
-                if ((m_tex_scroll_heap.field_0x2 == 0xFFFF) &&
-                    (m_tex_scroll_heap.field_0x4 == 0xFFFF))
+                if (m_tex_scroll_heap.field_0x2 == 0xFFFF &&
+                    m_tex_scroll_heap.field_0x4 == 0xFFFF)
                 {
                     setTextureScrollResource(loadTextureScrollResource(btk_idx, 0), param_2);
                 }
@@ -811,16 +813,14 @@ void daPy_lk_c::setTextureAnime(u16 param_1, int param_2) {
             }
         } else {
             m_tex_scroll_heap.mIdx = btk_idx;
-            if ((m_tex_scroll_heap.field_0x2 == 0xFFFF) && (m_tex_scroll_heap.field_0x4 == 0xFFFF))
+            if (m_tex_scroll_heap.field_0x2 == 0xFFFF && m_tex_scroll_heap.field_0x4 == 0xFFFF)
             {
                 setTextureScrollResource(loadTextureScrollResource(btk_idx, 0), param_2);
             }
         }
-    } else if ((((bVar3 && (checkModeFlg(ModeFlg_00000001))) && (!dComIfGp_event_runCheck())) &&
-                ((daPy_matAnm_c::m_maba_timer == 0 && (mpAttnActorLockOn == NULL)))) &&
-               (((btk_idx == LKANM_BTK_TMABA && ((m_tex_scroll_heap.field_0x2 == 0xFFFF &&
-                                      (m_tex_scroll_heap.field_0x4 == 0xFFFF)))) &&
-                 (cM_rnd() < 0.025f))))
+    } else if (bVar3 && checkModeFlg(ModeFlg_00000001) && !dComIfGp_event_runCheck() &&
+               daPy_matAnm_c::getMabaTimer() == 0 && mpAttnActorLockOn == NULL && btk_idx == LKANM_BTK_TMABA &&
+               m_tex_scroll_heap.field_0x2 == 0xFFFF && m_tex_scroll_heap.field_0x4 == 0xFFFF && cM_rnd() < 0.025f)
     {
         if (dVar9 < 0.125f) {
             m_tex_scroll_heap.mIdx = LKANM_BTK_TEUP;
@@ -894,36 +894,27 @@ void daPy_lk_c::setDemoTextureAnime(u16 btpIdx, u16 btkIdx, int r30, u16 r31) {
 
 /* 80105040-80105164       .text resetDemoTextureAnime__9daPy_lk_cFv */
 void daPy_lk_c::resetDemoTextureAnime() {
-    u16 uVar3;
-
     if (m_tex_anm_heap.field_0x4 != 0xFFFF) {
         m_tex_anm_heap.field_0x4 = 0xFFFF;
         m_tex_anm_heap.field_0x6 = 0xFFFF;
-        uVar3 = m_tex_anm_heap.field_0x2;
-        if (uVar3 != 0xFFFF) {
-            setTextureAnimeResource(loadTextureAnimeResource(uVar3, FALSE), 0);
+        if (m_tex_anm_heap.field_0x2 != 0xFFFF) {
+            setTextureAnimeResource(loadTextureAnimeResource(m_tex_anm_heap.field_0x2, FALSE), 0);
+        } else if (m_tex_anm_heap.mIdx != 0xFFFF) {
+            setTextureAnimeResource(loadTextureAnimeResource(m_tex_anm_heap.mIdx, FALSE), 0);
         } else {
-            uVar3 = m_tex_anm_heap.mIdx;
-            if (uVar3 != 0xFFFF) {
-                setTextureAnimeResource(loadTextureAnimeResource(uVar3, FALSE), 0);
-            } else {
-                setTextureAnime(0, 0);
-            }
+            setTextureAnime(0, 0);
         }
     }
+
     if (m_tex_scroll_heap.field_0x4 != 0xFFFF) {
         m_tex_scroll_heap.field_0x4 = 0xFFFF;
         m_tex_scroll_heap.field_0x6 = 0xFFFF;
-        uVar3 = m_tex_scroll_heap.field_0x2;
-        if (uVar3 != 0xFFFF) {
-            setTextureScrollResource(loadTextureScrollResource(uVar3, FALSE), 0);
+        if (m_tex_scroll_heap.field_0x2 != 0xFFFF) {
+            setTextureScrollResource(loadTextureScrollResource(m_tex_scroll_heap.field_0x2, FALSE), 0);
+        } else if (m_tex_scroll_heap.mIdx != 0xFFFF) {
+            setTextureScrollResource(loadTextureScrollResource(m_tex_scroll_heap.mIdx, FALSE), 0);
         } else {
-            uVar3 = m_tex_scroll_heap.mIdx;
-            if (uVar3 != 0xFFFF) {
-                setTextureScrollResource(loadTextureScrollResource(uVar3, FALSE), 0);
-            } else {
-                setTextureAnime(0, 0);
-            }
+            setTextureAnime(0, 0);
         }
     }
 }
@@ -962,8 +953,8 @@ void daPy_lk_c::playTextureAnime() {
         if (mCurProc == daPyProc_DEMO_TOOL_e) {
             m3530 = mFrameCtrlUnder[UNDER_MOVE0_e].getFrame();
             m3532 = m3530;
-        } else if ((m_tex_anm_heap.field_0x6 == 0xFFFE) &&
-                   (checkMabaAnimeBtp(m_tex_anm_heap.field_0x4)))
+        } else if (m_tex_anm_heap.field_0x6 == 0xFFFE &&
+                   checkMabaAnimeBtp(m_tex_anm_heap.field_0x4))
         {
             if (m3530 != 0) {
                 m3530++;
@@ -988,7 +979,7 @@ void daPy_lk_c::playTextureAnime() {
             m3530 = mFrameCtrlUpper[UPPER_MOVE2_e].getFrame();
             m3532 = m3530;
         }
-    } else if ((checkModeFlg(ModeFlg_00000400)) || ((m34C3 == 9) || (m34C3 == 10))) {
+    } else if (checkModeFlg(ModeFlg_00000400) || m34C3 == 9 || m34C3 == 10) {
         m3530 = mFrameCtrlUnder[UNDER_MOVE0_e].getFrame();
         m3532 = m3530;
     } else if (checkModeFlg(ModeFlg_00000100)) {
@@ -1103,10 +1094,10 @@ s32 daPy_lk_c::setItemModel() {
     MtxP pMVar13 = mpCLModel->getAnmMtx(0x8);
     MtxP pMVar6 = mpCLModel->getAnmMtx(0xC);
     daBoko_c* pfVar11 = (daBoko_c*)mActorKeepEquip.getActor();
-    if ((pfVar11 != NULL) && (mEquipItem == daPyItem_BOKO_e)) {
+    if (pfVar11 != NULL && mEquipItem == daPyItem_BOKO_e) {
         mDoMtx_stack_c::transS(40.0f, 47.0f, 2.1f);
         mDoMtx_stack_c::XYZrotM(0x3E38, -0x5D4, 0x66F8);
-        if ((fopAcM_GetParam(pfVar11) == 2) || (fopAcM_GetParam(pfVar11) == 3)) {
+        if (fopAcM_GetParam(pfVar11) == 2 || fopAcM_GetParam(pfVar11) == 3) {
             mDoMtx_stack_c::transM(0.0f, 0.0f, 20.0f);
         } else if (fopAcM_GetParam(pfVar11) == 4) {
             mDoMtx_stack_c::transM(0.0f, 0.0f, 70.0f);
@@ -1119,7 +1110,7 @@ s32 daPy_lk_c::setItemModel() {
     }
     if (mpEquipItemBtk != NULL) {
         dVar16 = mpEquipItemBtk->getFrame();
-        if ((dVar16 > 0.0f || (cM_rnd() < 0.02f))) {
+        if ((dVar16 > 0.0f || cM_rnd() < 0.02f)) {
             dVar16 += 1.0f;
             if (dVar16 >= mpEquipItemBtk->getFrameMax()) {
                 dVar16 = 0.0f;
@@ -1184,14 +1175,14 @@ s32 daPy_lk_c::setItemModel() {
                 if (mpBottleCapModel != NULL) {
                     mpBottleCapModel->setBaseTRMtx(pMVar13);
                 }
-            } else if ((mEquipItem == dItem_HOOKSHOT_e) && (pfVar11 != NULL)) {
+            } else if (mEquipItem == dItem_HOOKSHOT_e && pfVar11 != NULL) {
                 if (fopAcM_GetParam(pfVar11) != 0) {
                     if (fopAcM_GetParam(pfVar11) == 1) {
                         m35EC += 1.0f;
                     } else {
                         m35EC -= 1.0f;
                     }
-                    fVar2 = (mSwordAnim.getBckAnm()->getFrameMax());
+                    fVar2 = mSwordAnim.getBckAnm()->getFrameMax();
                     fVar1 = m35EC;
                     if (fVar1 < 0.0f) {
                         m35EC = fVar1 + fVar2;
@@ -1199,8 +1190,8 @@ s32 daPy_lk_c::setItemModel() {
                         m35EC = fVar1 - fVar2;
                     }
                 }
-            } else if ((mEquipItem == dItem_WIND_WAKER_e) &&
-                       (mCurProc != daPyProc_TACT_WAIT_e && (mpEquipItemBrk != NULL)))
+            } else if (mEquipItem == dItem_WIND_WAKER_e &&
+                       mCurProc != daPyProc_TACT_WAIT_e && mpEquipItemBrk != NULL)
             {
                 fVar1 = mpEquipItemBrk->getFrame() - 1.0f;
                 if (fVar1 < 0.0f) {
@@ -1215,7 +1206,7 @@ s32 daPy_lk_c::setItemModel() {
                 mpEquipItemModel->setBaseTRMtx(mpCLModel->getAnmMtx(0x4));
             }
         }
-        if ((mSwordAnim.getBckAnm() != NULL) && (mCurProc != daPyProc_DEMO_TALISMAN_WAIT_e)) {
+        if (mSwordAnim.getBckAnm() != NULL && mCurProc != daPyProc_DEMO_TALISMAN_WAIT_e) {
             mSwordAnim.entry(mpEquipItemModel->getModelData(), m35EC);
             if (mpSwordModel1 != NULL) {
                 mSwordAnim.entry(mpSwordModel1->getModelData(), m35EC);
@@ -1241,7 +1232,7 @@ s32 daPy_lk_c::setItemModel() {
             r27 = 3;
             mSwgripmsabBckAnim.entry(mpSwgripmsModel->getModelData(), 1.0f);
             mpTswgripmsabBrk->setFrame(1.0f);
-            if ((mpEquipItemModel != NULL) && (mEquipItem == daPyItem_SWORD_e)) {
+            if (mpEquipItemModel != NULL && mEquipItem == daPyItem_SWORD_e) {
                 mpEquipItemModel->getModelData()
                     ->getJointNodePointer(0x00)
                     ->getMesh()
@@ -1257,7 +1248,7 @@ s32 daPy_lk_c::setItemModel() {
                 r27 = 2;
             }
             mpTswgripmsabBrk->setFrame(0.0f);
-            if ((mpEquipItemModel != NULL) && (mEquipItem == daPyItem_SWORD_e)) {
+            if (mpEquipItemModel != NULL && mEquipItem == daPyItem_SWORD_e) {
                 mpEquipItemModel->getModelData()
                     ->getJointNodePointer(0x00)
                     ->getMesh()
@@ -1267,22 +1258,22 @@ s32 daPy_lk_c::setItemModel() {
         }
     }
     dVar16 = mpTswgripmsBtk->getFrame();
-    if ((dVar16 > 0.1f) || (cM_rnd() < 0.02f)) {
+    if (dVar16 > 0.1f || cM_rnd() < 0.02f) {
         dVar16 += 1.0f;
-        if (dVar16 >= (mpTswgripmsBtk->getFrameMax())) {
+        if (dVar16 >= mpTswgripmsBtk->getFrameMax()) {
             dVar16 = 0.0f;
         }
         mpTswgripmsBtk->setFrame(dVar16);
     }
     if (mEquipItem == daPyItem_SWORD_e) {
         mpEquippedSwordModel->setBaseTRMtx(pMVar13);
-        mDoAud_zelAudio_c::getInterface()->setLinkSwordType(r27, 1);
+        mDoAud_setLinkSwordType(r27, 1);
     } else {
         mDoMtx_stack_c::transS(-11.25f, 4.5f, 0.45f);
         mDoMtx_stack_c::ZrotM(-0x1C71);
         mDoMtx_stack_c::revConcat(pMVar14);
         mpEquippedSwordModel->setBaseTRMtx(mDoMtx_stack_c::get());
-        mDoAud_zelAudio_c::getInterface()->setLinkSwordType(r27, 2);
+        mDoAud_setLinkSwordType(r27, 2);
     }
     mpEquippedSwordModel->calc();
     int r27_2;
@@ -1291,9 +1282,9 @@ s32 daPy_lk_c::setItemModel() {
         mpEquippedShieldModel = mpShmsModel;
         if (mpTshmsBtk != NULL) {
             dVar16 = mpTshmsBtk->getFrame();
-            if ((dVar16 > 0.0f || (cM_rnd() < 0.02f))) {
+            if ((dVar16 > 0.0f || cM_rnd() < 0.02f)) {
                 dVar16 += 1.0f;
-                if (dVar16 >= (mpTshmsBtk->getFrameMax())) {
+                if (dVar16 >= mpTshmsBtk->getFrameMax()) {
                     dVar16 = 0.0f;
                 }
                 mpTshmsBtk->setFrame(dVar16);
@@ -1308,14 +1299,14 @@ s32 daPy_lk_c::setItemModel() {
     }
     if (mCurProc == daPyProc_DEMO_LAST_COMBO_e) {
         mpEquippedShieldModel->setBaseTRMtx(mpCLModel->getBaseTRMtx());
-        mDoAud_zelAudio_c::getInterface()->setLinkShieldType(r27_2, 1);
-    } else if ((((mCurProc != daPyProc_DEMO_TOOL_e) && (mEquipItem == daPyItem_SWORD_e)) ||
-                ((mCurProc == daPyProc_DEMO_TOOL_e && (m34D4 == 1)))) ||
-               (((checkPlayerGuard() && (mEquipItem != dItem_SKULL_HAMMER_e)) ||
-                 (mCurProc == daPyProc_GUARD_CRASH_e))))
+        mDoAud_setLinkShieldType(r27_2, 1);
+    } else if ((mCurProc != daPyProc_DEMO_TOOL_e && mEquipItem == daPyItem_SWORD_e) ||
+               (mCurProc == daPyProc_DEMO_TOOL_e && m34D4 == 1) ||
+               (checkPlayerGuard() && mEquipItem != dItem_SKULL_HAMMER_e) ||
+               mCurProc == daPyProc_GUARD_CRASH_e)
     {
         mpEquippedShieldModel->setBaseTRMtx(pMVar6);
-        mDoAud_zelAudio_c::getInterface()->setLinkShieldType(r27_2, 1);
+        mDoAud_setLinkShieldType(r27_2, 1);
     } else {
         if (r27_2 == 2) {
             mDoMtx_stack_c::transS(15.5f, 4.75f, -0.2f);
@@ -1325,10 +1316,10 @@ s32 daPy_lk_c::setItemModel() {
         mDoMtx_stack_c::ZrotM(-0x4000);
         mDoMtx_stack_c::revConcat(pMVar14);
         mpEquippedShieldModel->setBaseTRMtx(mDoMtx_stack_c::get());
-        if ((r27_2 == 2) && (((m_anm_heap_under[UNDER_MOVE0_e].mIdx == LKANM_BCK_WALK ||
-                                (m_anm_heap_under[UNDER_MOVE0_e].mIdx == LKANM_BCK_WALKS)) ||
-                               ((m_anm_heap_under[UNDER_MOVE0_e].mIdx == LKANM_BCK_DASHS ||
-                                 (m_anm_heap_under[UNDER_MOVE0_e].mIdx == LKANM_BCK_DASH))))))
+        if (r27_2 == 2 && (m_anm_heap_under[UNDER_MOVE0_e].mIdx == LKANM_BCK_WALK ||
+                           m_anm_heap_under[UNDER_MOVE0_e].mIdx == LKANM_BCK_WALKS ||
+                           m_anm_heap_under[UNDER_MOVE0_e].mIdx == LKANM_BCK_DASHS ||
+                           m_anm_heap_under[UNDER_MOVE0_e].mIdx == LKANM_BCK_DASH))
         {
             MtxP mtx = mDoMtx_stack_c::get();
             dVar16 = mtx[0][3];
@@ -1345,7 +1336,7 @@ s32 daPy_lk_c::setItemModel() {
             mDoMtx_stack_c::now[2][3] = dVar17;
             mpEquippedShieldModel->setBaseTRMtx(mDoMtx_stack_c::get());
         }
-        mDoAud_zelAudio_c::getInterface()->setLinkShieldType(r27_2, 2);
+        mDoAud_setLinkShieldType(r27_2, 2);
     }
     mAtngshaBck.entry(mpEquippedShieldModel->getModelData(), m35E8);
     mpEquippedShieldModel->calc();
@@ -1353,9 +1344,9 @@ s32 daPy_lk_c::setItemModel() {
     simpleAnmPlay(mpYmsls00Btk);
     if (checkEquipHeavyBoots()) {
         setBootsModel(&mpHbootsModels[0]);
-        mDoAud_zelAudio_c::getInterface()->setLinkBootsType(1);
+        mDoAud_setLinkBootsType(1);
     } else {
-        mDoAud_zelAudio_c::getInterface()->setLinkBootsType(0);
+        mDoAud_setLinkBootsType(0);
     }
     if (dComIfGs_getSelectEquip(2) == dItem_POWER_BRACELETS_e) {
         mpPringModel->setAnmMtx(0x1, mpCLModel->getAnmMtx(0x7));
@@ -1366,28 +1357,27 @@ s32 daPy_lk_c::setItemModel() {
 
 /* 80106660-801066DC       .text checkUpperReadyAnime__9daPy_lk_cCFv */
 BOOL daPy_lk_c::checkUpperReadyAnime() const {
-    return ((((checkBoomerangReadyAnime()) || (checkBowReadyAnime())) || (checkRopeReadyAnime())) ||
-            (checkHookshotReadyAnime()));
+    return checkBoomerangReadyAnime() || checkBowReadyAnime() || checkRopeReadyAnime() || checkHookshotReadyAnime();
 }
 
 /* 801066DC-80106750       .text checkUpperReadyThrowAnime__9daPy_lk_cCFv */
 BOOL daPy_lk_c::checkUpperReadyThrowAnime() const {
-    return ((((checkBoomerangAnime()) || (checkBowAnime())) || (checkRopeAnime())) ||
-            (checkHookshotReadyAnime()));
+    return checkBoomerangAnime() || checkBowAnime() || checkRopeAnime() || checkHookshotReadyAnime();
 }
 
 /* 80106750-801067D8       .text checkNoCollisionCorret__9daPy_lk_cFv */
 BOOL daPy_lk_c::checkNoCollisionCorret() {
-    if (((checkModeFlg(ModeFlg_HANG | ModeFlg_ROPE | ModeFlg_IN_SHIP | ModeFlg_LADDER |
-                       ModeFlg_CAUGHT)) ||
-         (mDemo.getDemoType() == 1)) ||
-        (mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK0A_e) ||
-        (((mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK1E_e) ||
-          (checkResetFlg0(daPyRFlg0_UNK1000))) ||
-         ((eventInfo.checkCommandDoor() ||
-           ((mCurProc == daPyProc_VERTICAL_JUMP_e || (mCurProc == daPyProc_CRAWL_END_e))))) ||
-         (mCurProc == daPyProc_VOMIT_WAIT_e)) ||
-        ((mCurProc == daPyProc_DEMO_DOOR_OPEN_e || (mCurProc == daPyProc_HOOKSHOT_FLY_e))))
+    if (checkModeFlg(ModeFlg_HANG | ModeFlg_ROPE | ModeFlg_IN_SHIP | ModeFlg_LADDER | ModeFlg_CAUGHT) ||
+        mDemo.getDemoType() == 1 ||
+        mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK0A_e ||
+        mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK1E_e ||
+        checkResetFlg0(daPyRFlg0_UNK1000) ||
+        eventInfo.checkCommandDoor() ||
+        mCurProc == daPyProc_VERTICAL_JUMP_e ||
+        mCurProc == daPyProc_CRAWL_END_e ||
+        mCurProc == daPyProc_VOMIT_WAIT_e ||
+        mCurProc == daPyProc_DEMO_DOOR_OPEN_e ||
+        mCurProc == daPyProc_HOOKSHOT_FLY_e)
     {
         return true;
     }
@@ -1404,7 +1394,7 @@ s32 daPy_lk_c::setDrawHandModel() {
     if (mCurProc == daPyProc_DEMO_TOOL_e) {
         uVar4 = mLeftHandIdx;
         uVar5 = mRightHandIdx;
-    } else if ((checkGrabAnime()) || (checkBoomerangThrowAnime()) || (checkBoomerangCatchAnime())) {
+    } else if (checkGrabAnime() || checkBoomerangThrowAnime() || checkBoomerangCatchAnime()) {
         uVar4 = 0;
         uVar5 = 0;
     } else if (checkHookshotReadyAnime()) {
@@ -1419,7 +1409,7 @@ s32 daPy_lk_c::setDrawHandModel() {
     } else if (checkBoomerangReadyAnime()) {
         uVar4 = 0;
         uVar5 = 7;
-    } else if ((checkBottleItem(mEquipItem)) || (checkPhotoBoxItem(mEquipItem))) {
+    } else if (checkBottleItem(mEquipItem) || checkPhotoBoxItem(mEquipItem)) {
         uVar4 = 6;
         uVar5 = mRightHandIdx;
     } else if (checkBowItem(mEquipItem)) {
@@ -1435,8 +1425,8 @@ s32 daPy_lk_c::setDrawHandModel() {
         } else {
             uVar5 = mRightHandIdx;
         }
-    } else if (((mEquipItem == dItem_GRAPPLING_HOOK_e) && (!checkModeFlg(ModeFlg_ROPE))) ||
-               ((mEquipItem == dItem_SKULL_HAMMER_e && (mCutType == 0))))
+    } else if ((mEquipItem == dItem_GRAPPLING_HOOK_e && !checkModeFlg(ModeFlg_ROPE)) ||
+               (mEquipItem == dItem_SKULL_HAMMER_e && mCutType == 0))
     {
         uVar4 = 3;
         uVar5 = 8;
@@ -1456,18 +1446,18 @@ s32 daPy_lk_c::setDrawHandModel() {
         uVar4 = 1;
         uVar5 = mRightHandIdx;
     } else {
-        if ((mEquipItem == daPyItem_NONE_e) && (checkUpperAnime(LKANM_BCK_TAKEBOTH))) {
+        if (mEquipItem == daPyItem_NONE_e && checkUpperAnime(LKANM_BCK_TAKEBOTH)) {
             uVar4 = 1;
-        } else if ((mEquipItem == daPyItem_NONE_e) && (checkItemEquipAnime())) {
+        } else if (mEquipItem == daPyItem_NONE_e && checkItemEquipAnime()) {
             uVar4 = 0;
         } else {
             uVar4 = mLeftHandIdx;
         }
-        if ((checkPlayerGuard()) || (mCurProc == daPyProc_GUARD_CRASH_e)) {
+        if (checkPlayerGuard() || mCurProc == daPyProc_GUARD_CRASH_e) {
             uVar5 = 8;
-        } else if ((mEquipItem == daPyItem_NONE_e) && (checkUpperAnime(LKANM_BCK_TAKEBOTH))) {
+        } else if (mEquipItem == daPyItem_NONE_e && checkUpperAnime(LKANM_BCK_TAKEBOTH)) {
             uVar5 = 7;
-        } else if ((mEquipItem == daPyItem_NONE_e) && (checkItemEquipAnime())) {
+        } else if (mEquipItem == daPyItem_NONE_e && checkItemEquipAnime()) {
             uVar5 = 0;
         } else {
             uVar5 = mRightHandIdx;
@@ -1518,8 +1508,8 @@ void daPy_lk_c::updateDLSetLight(J3DModel* model, u32 param_2) {
 /* 80106CB0-80106D8C       .text hideHatAndBackle__9daPy_lk_cFP11J3DMaterial */
 void daPy_lk_c::hideHatAndBackle(J3DMaterial* param_1) {
     for (int i = 0; param_1 != NULL; i++) {
-        if (((!checkNoResetFlg1(daPyFlg1_FREEZE_STATE)) && ((i == 2 || (i == 5)))) ||
-            ((i == 4) && ((checkCaughtShapeHide()) || (checkNoResetFlg1(daPyFlg1_CASUAL_CLOTHES)))))
+        if ((!checkNoResetFlg1(daPyFlg1_FREEZE_STATE) && (i == 2 || i == 5)) ||
+            (i == 4 && (checkCaughtShapeHide() || checkNoResetFlg1(daPyFlg1_CASUAL_CLOTHES))))
         {
             param_1->getShape()->hide();
         } else {
@@ -1558,7 +1548,7 @@ void daPy_lk_c::drawShadow() {
     local_30.y = pMVar3[1][3];
     local_30.z = pMVar3[2][3];
     if (checkGrabWear()) {
-        if ((-G_CM3D_F_INF != mAcch.GetGroundH()) && (dComIfG_Bgsp()->ChkPolySafe(mAcch.m_gnd))) {
+        if (-G_CM3D_F_INF != mAcch.GetGroundH() && dComIfG_Bgsp()->ChkPolySafe(mAcch.m_gnd)) {
             dComIfGd_setSimpleShadow2(&local_30, mAcch.GetGroundH(), 30.0f, mAcch.m_gnd, 0, 1.0f,
                                       &dDlst_shadowControl_c::mSimpleTexObj);
         }
@@ -1592,7 +1582,7 @@ void daPy_lk_c::drawShadow() {
                                        &dDlst_shadowControl_c::mSimpleTexObj);
         m3614 = iVar4;
         if ((u32)m3614 != 0) {
-            if ((checkNoResetFlg1(daPyFlg1_CASUAL_CLOTHES)) && (!checkCaughtShapeHide())) {
+            if (checkNoResetFlg1(daPyFlg1_CASUAL_CLOTHES) && !checkCaughtShapeHide()) {
                 dComIfGd_addRealShadow(m3614, mpKatsuraModel);
             }
             if (checkSwordEquip()
@@ -1611,7 +1601,7 @@ void daPy_lk_c::drawShadow() {
                 && !checkDemoSwordNoDraw(0)
 #endif
             ) &&
-                ((!checkBowItem(mEquipItem) || (!checkPlayerGuard()))))
+                (!checkBowItem(mEquipItem) || !checkPlayerGuard()))
             {
                 dComIfGd_addRealShadow(m3614, mpEquipItemModel);
             }
@@ -1627,12 +1617,12 @@ void daPy_lk_c::drawShadow() {
             fopAc_ac_c* pfVar10;
             if (mActorKeepGrab.getID() != fpcM_ERROR_PROCESS_ID_e) {
                 pfVar10 = fopAcM_SearchByID(mActorKeepGrab.getID());
-                if ((pfVar10 != NULL) && fopAcM_GetModel(pfVar10) != NULL) {
+                if (pfVar10 != NULL && fopAcM_GetModel(pfVar10) != NULL) {
                     dComIfGd_addRealShadow(m3614, fopAcM_GetModel(pfVar10));
                 }
             } else if (mActorKeepEquip.getID() != fpcM_ERROR_PROCESS_ID_e) {
                 pfVar10 = fopAcM_SearchByID(mActorKeepEquip.getID());
-                if ((pfVar10 != NULL) && (fopAcM_GetModel(pfVar10) != NULL)) {
+                if (pfVar10 != NULL && fopAcM_GetModel(pfVar10) != NULL) {
                     dComIfGd_addRealShadow(m3614, fopAcM_GetModel(pfVar10));
                 }
             }
@@ -1654,10 +1644,9 @@ void daPy_lk_c::offBodyEffect() {
     if (m3460[0].getEmitter() != NULL) {
         m3460[0].getEmitter()->stopDrawParticle();
     }
-    if (m3460[1].getEmitter() == NULL) {
-        return;
+    if (m3460[1].getEmitter() != NULL) {
+        m3460[1].getEmitter()->stopDrawParticle();
     }
-    m3460[1].getEmitter()->stopDrawParticle();
 }
 
 /* 8010728C-80107308       .text onBodyEffect__9daPy_lk_cFv */
@@ -1674,10 +1663,9 @@ void daPy_lk_c::onBodyEffect() {
     if (m3460[0].getEmitter() != NULL) {
         m3460[0].getEmitter()->playDrawParticle();
     }
-    if (m3460[1].getEmitter() == NULL) {
-        return;
+    if (m3460[1].getEmitter() != NULL) {
+        m3460[1].getEmitter()->playDrawParticle();
     }
-    m3460[1].getEmitter()->playDrawParticle();
 }
 
 /* 80107308-80108204       .text draw__9daPy_lk_cFv */
@@ -2024,18 +2012,18 @@ void daPy_lk_c::setAtnList() {
     mpAttnActorX = NULL;
     mpAttnActorY = NULL;
     mpAttnActorZ = NULL;
-    if (mpAttention->Lockon()) {
+    if (checkAttentionLock()) {
         dComIfGp_clearPlayerStatus0(0, daPyStts0_BOOMERANG_WAIT_e);
     }
-    if ((mActorKeepThrow.getActor() != NULL) &&
-        (dComIfGp_checkPlayerStatus0(0, daPyStts0_BOOMERANG_WAIT_e)))
+    if (mActorKeepThrow.getActor() != NULL &&
+        dComIfGp_checkPlayerStatus0(0, daPyStts0_BOOMERANG_WAIT_e))
     {
         mpAttnActorLockOn = mActorKeepThrow.getActor();
         mpAttnActorA = mpAttnActorLockOn;
     } else {
-        if (mpAttention->Lockon()) {
+        if (checkAttentionLock()) {
             mpAttnEntryA = mpAttention->GetLockonList(0);
-            if ((mpAttnEntryA != NULL) && (mpAttention->LockonTruth())) {
+            if (mpAttnEntryA != NULL && mpAttention->LockonTruth()) {
                 mpAttnActorLockOn = mpAttnEntryA->getActor();
                 mpAttnActorA = mpAttnActorLockOn;
                 onResetFlg0(daPyRFlg0_ATTENTION_LOCK);
@@ -2117,8 +2105,8 @@ BOOL daPy_lk_c::setTalkStatus() {
         return false;
     }
     if (mpAttnEntryA != NULL) {
-        if ((mpAttnEntryA->mType == fopAc_Attn_TYPE_SPEAK_e) ||
-            ((mpAttnEntryA->mType == fopAc_Attn_TYPE_TALK_e) && (mpAttnActorA == mpAttnActorLockOn)))
+        if (mpAttnEntryA->mType == fopAc_Attn_TYPE_SPEAK_e ||
+            (mpAttnEntryA->mType == fopAc_Attn_TYPE_TALK_e && mpAttnActorA == mpAttnActorLockOn))
         {
             if ((mpAttnActorA->attention_info.flags & fopAc_Attn_TALKFLAG_NOTALK_e)) {
                 return false;
@@ -2140,10 +2128,8 @@ BOOL daPy_lk_c::setTalkStatus() {
 
 /* 80108634-801086C8       .text setHintActor__9daPy_lk_cFv */
 int daPy_lk_c::setHintActor() {
-    if (((dComIfGp_att_getZHint() != 0) && (!dComIfGp_event_runCheck())) &&
-        (mDemo.getDemoType() == 0))
-    {
-        daPy_py_c::setDoButtonQuake();
+    if (dComIfGp_att_getZHint() != 0 && !dComIfGp_event_runCheck() && mDemo.getDemoType() == 0) {
+        setDoButtonQuake();
         onResetFlg0(daPyRFlg0_UNK100);
         dComIfGp_setDoStatus(dActStts_ba_sake__dupe_31);
         return true;
@@ -2162,19 +2148,19 @@ void daPy_lk_c::setDoStatusBasic() {
         } else {
             fVar1 = daPy_HIO_basic_c0::m.field_0x1C;
         }
-        if ((mpAttention->Lockon()) || ((mActorKeepThrow.getActor() != NULL &&
-                                         (mpAttnActorLockOn == mActorKeepThrow.getActor()))))
+        if (checkAttentionLock() ||
+            (mActorKeepThrow.getActor() != NULL && mpAttnActorLockOn == mActorKeepThrow.getActor()))
         {
-            if ((mStickDistance > 0.05f) && (direction != DIR_FORWARD)) {
-                if ((mEquipItem == daPyItem_BOKO_e) && (direction == DIR_BACKWARD)) {
+            if (mStickDistance > 0.05f && direction != DIR_FORWARD) {
+                if (mEquipItem == daPyItem_BOKO_e && direction == DIR_BACKWARD) {
                     dComIfGp_setDoStatus(dActStts_THROW_e);
                 } else {
                     dComIfGp_setDoStatus(dActStts_JUMP_e);
                 }
             } else {
-                if ((!checkPlayerGuard()) &&
-                    (((mEquipItem == daPyItem_BOKO_e || (mEquipItem == daPyItem_SWORD_e)) ||
-                      (mEquipItem == dItem_SKULL_HAMMER_e))))
+                if (!checkPlayerGuard() && (mEquipItem == daPyItem_BOKO_e ||
+                                            mEquipItem == daPyItem_SWORD_e ||
+                                            mEquipItem == dItem_SKULL_HAMMER_e))
                 {
                     if (mEquipItem == daPyItem_BOKO_e) {
                         dComIfGp_setDoStatus(dActStts_THROW_e);
@@ -2187,8 +2173,8 @@ void daPy_lk_c::setDoStatusBasic() {
                     dComIfGp_setDoStatus(dActStts_ATTACK_e);
                 }
             }
-        } else if (((checkNoUpperAnime()) && (mEquipItem != daPyItem_NONE_e)) &&
-                   ((checkModeFlg(ModeFlg_00000004) && (mStickDistance <= fVar1))))
+        } else if (checkNoUpperAnime() && mEquipItem != daPyItem_NONE_e &&
+                   checkModeFlg(ModeFlg_00000004) && mStickDistance <= fVar1)
         {
             if (mEquipItem == daPyItem_BOKO_e) {
                 dComIfGp_setDoStatus(dActStts_THROW_e);
@@ -2207,15 +2193,14 @@ void daPy_lk_c::setDoStatusBasic() {
 
 /* 801088E8-80108A9C       .text setDoStatus__9daPy_lk_cFv */
 void daPy_lk_c::setDoStatus() {
-    uint uVar4;
-
     if (setHintActor()) {
         return;
     }
-    if ((mpAttnActorLockOn == NULL) && (mpAttnEntryA == NULL)) {
+    
+    if (mpAttnActorLockOn == NULL && mpAttnEntryA == NULL) {
         if (checkResetFlg0(daPyRFlg0_UNK8)) {
             dComIfGp_setRStatus(dActStts_GRAB_e);
-            if (((mFrontWallType == 7) || (mFrontWallType == 8)) || (mFrontWallType == 9)) {
+            if (mFrontWallType == 7 || mFrontWallType == 8 || mFrontWallType == 9) {
                 dComIfGp_setDoStatus(dActStts_CLIMB_e);
             } else if (mFrontWallType == 2) {
                 dComIfGp_setDoStatus(dActStts_SIDLE_e);
@@ -2227,17 +2212,19 @@ void daPy_lk_c::setDoStatus() {
         }
     }
     if (mpAttnEntryA != NULL) {
-        uVar4 = checkNoResetFlg0(daPy_FLG0(daPyFlg0_UNK20000000 | daPyFlg0_UNK80000000));
-        if ((!uVar4) && ((mpAttnEntryA->mType == fopAc_Attn_TYPE_DOOR_e ||
-                          (mpAttnEntryA->mType == fopAc_Attn_TYPE_TREASURE_e))))
+        // TODO: is there an inline for checkNoResetFlg0(daPy_FLG0(daPyFlg0_UNK20000000 | daPyFlg0_UNK80000000)) ?
+        if ((!checkNoResetFlg0(daPy_FLG0(daPyFlg0_UNK20000000 | daPyFlg0_UNK80000000))) &&
+            (mpAttnEntryA->mType == fopAc_Attn_TYPE_DOOR_e || (mpAttnEntryA->mType == fopAc_Attn_TYPE_TREASURE_e)))
         {
             dComIfGp_setDoStatus(dActStts_OPEN_e);
-        } else if ((!uVar4) && (mpAttnEntryA->mType == fopAc_Attn_TYPE_SHIP_e)) {
+        } else if ((!checkNoResetFlg0(daPy_FLG0(daPyFlg0_UNK20000000 | daPyFlg0_UNK80000000))) &&
+                   mpAttnEntryA->mType == fopAc_Attn_TYPE_SHIP_e)
+        {
             if (!dComIfGp_checkPlayerStatus0(0, daPyStts0_SHIP_RIDE_e)) {
                 dComIfGp_setDoStatus(dActStts_GET_IN_SHIP_e);
             }
         } else if (mpAttnEntryA->mType == fopAc_Attn_TYPE_CARRY_e) {
-            if (!(fopAcM_CheckStatus(mpAttnActorA, fopAcStts_CARRY_e))) {
+            if (!fopAcM_CheckStatus(mpAttnActorA, fopAcStts_CARRY_e)) {
                 if (fopAcM_GetName(mpAttnActorA) == PROC_BOKO) {
                     dComIfGp_setDoStatus(dActStts_PICK_UP_e);
                 } else {
@@ -2280,12 +2267,12 @@ void daPy_lk_c::setNormalSpeedF(f32 param_1, f32 param_2, f32 param_3, f32 param
     f32 dVar6;
     f32 dVar10;
 
-    if (((dComIfGp_event_runCheck()) || (checkHeavyStateOn())) || (checkGrabWear())) {
+    if (dComIfGp_event_runCheck() || checkHeavyStateOn() || checkGrabWear()) {
         dVar10 = mMaxNormalSpeed * mStickDistance;
     } else {
         dVar10 = mStickDistance * (mMaxNormalSpeed * mStickDistance);
     }
-    if ((mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK0E_e) || (getSlidePolygon() != NULL)) {
+    if (mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK0E_e || getSlidePolygon() != NULL) {
         return;
     }
     if (mAcch.ChkWallHit()) {
@@ -2318,7 +2305,7 @@ void daPy_lk_c::setNormalSpeedF(f32 param_1, f32 param_2, f32 param_3, f32 param
         temp_f3 = param_3;
         dVar6 = 0.0f;
     }
-    if (!(cM3d_IsZero(param_1))) {
+    if (!cM3d_IsZero(param_1)) {
         mVelocity += param_1;
         if (mVelocity > dVar10) {
             mVelocity = dVar10;
@@ -2375,7 +2362,7 @@ void daPy_lk_c::posMoveFromFootPos() {
     cXyz sp68;
     sp68 = spB0[m34BC] - mFootData[m34BC].field_0x018;
     f32 f31_2 = sp68.absXZ();
-    if ((m3598 < 1.0f) && (std::abs(m35B4 - mStickDistance) < 0.2f)) {
+    if (m3598 < 1.0f && std::abs(m35B4 - mStickDistance) < 0.2f) {
         f31_2 = ((f31_2 * 0.3f) + 0.7f * m359C);
     }
     sp7C.z = mVelocity * (1.0f - m3598);
@@ -2385,7 +2372,7 @@ void daPy_lk_c::posMoveFromFootPos() {
         sp7C.z += (f31_2 * m3598);
     }
     s16 r3;
-    if (((!mAcch.ChkGroundHit()) || (!dComIfG_Bgsp()->ChkPolySafe(mAcch.m_gnd))) || (m3580 == 8)) {
+    if (!mAcch.ChkGroundHit() || !dComIfG_Bgsp()->ChkPolySafe(mAcch.m_gnd) || m3580 == 8) {
         r3 = 0;
     } else {
         r3 = getGroundAngle(&mAcch.m_gnd, current.angle.y);
@@ -2410,8 +2397,8 @@ void daPy_lk_c::posMoveFromFootPos() {
                 (1.0f + (daPy_HIO_swim_c0::m.field_0x7C * getSwimTimerRate()));
             speed.x = f1 * cM_ssin(current.angle.y);
             speed.z = f1 * cM_scos(current.angle.y);
-        } else if (((mCurProc != daPyProc_CUT_ROLL_e) || (!dComIfGp_event_runCheck())) ||
-                   (mDemo.getDemoType() != 0 || (mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK2B_e)))
+        } else if (mCurProc != daPyProc_CUT_ROLL_e || !dComIfGp_event_runCheck() ||
+                   mDemo.getDemoType() != 0 || mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK2B_e)
         {
             speed.x = speedF * cM_ssin(current.angle.y);
             speed.z = speedF * cM_scos(current.angle.y);
@@ -2572,7 +2559,7 @@ void daPy_lk_c::posMove() {
                 current.pos.z += m3730.z;
             }
         }
-    } else if (((!dComIfGp_event_runCheck() && mDemo.getDemoType() == 0) && daPy_getPlayerActorClass() == this) &&
+    } else if (!dComIfGp_event_runCheck() && mDemo.getDemoType() == 0 && daPy_getPlayerActorClass() == this &&
                mCurProc == daPyProc_HANG_MOVE_e)
     {
         f32 dVar13 = mStts.GetCCMoveP()->absXZ();
@@ -2588,7 +2575,7 @@ void daPy_lk_c::posMove() {
     }
     m3644 = 0.0f;
     mStts.GetCCMoveP()->zero();
-    if (((m34C2 == 1 || m34C2 == 8) || m34C2 == 9) || m34C2 == 5) {
+    if (m34C2 == 1 || m34C2 == 8 || m34C2 == 9 || m34C2 == 5) {
         cXyz sp5C;
         if (m34C2 == 1 || m34C2 == 5) {
             sp5C = m3700 - sp8C;
@@ -2728,7 +2715,7 @@ void daPy_lk_c::setSpeedAndAngleNormal(s16 param_1) {
         if (checkGrabWear()) {
             dVar11 *= 1.0f / (daPy_HIO_move_c0::m.field_0x74 * daPy_HIO_move_c0::m.field_0x74);
         }
-        if ((!mpAttention->Lockon() && cLib_distanceAngleS(m34E8, current.angle.y) > 0x7800) &&
+        if ((!checkAttentionLock() && cLib_distanceAngleS(m34E8, current.angle.y) > 0x7800) &&
             mCurProc != daPyProc_MOVE_TURN_e)
         {
             if (checkModeFlg(ModeFlg_00000001)) {
@@ -2798,7 +2785,7 @@ void daPy_lk_c::setSpeedAndAngleNormal(s16 param_1) {
     } else {
         dVar9 = 0.0f;
     }
-    if ((!mpAttention->Lockon() && mCurProc != daPyProc_MOVE_TURN_e) &&
+    if ((!checkAttentionLock() && mCurProc != daPyProc_MOVE_TURN_e) &&
         mStickDistance > 0.05f)
     {
         sVar6 = shape_angle.y;
@@ -2914,11 +2901,16 @@ void daPy_lk_c::setFrameCtrl(J3DFrameCtrl* frameCtrl, u8 attribute, s16 start, s
 
 /* 8010ACEC-8010AD2C       .text checkAtnWaitAnime__9daPy_lk_cFv */
 BOOL daPy_lk_c::checkAtnWaitAnime() {
-    if ((mpAttnActorLockOn != NULL &&
-         ((fopAcM_GetGroup(mpAttnActorLockOn) == fopAc_ENEMY_e ||
-           fopAcM_GetName(mpAttnActorLockOn) == PROC_BOOMERANG))) ||
-        (mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK17_e))
-    {
+    if (
+        (
+            mpAttnActorLockOn != NULL &&
+            (
+                fopAcM_GetGroup(mpAttnActorLockOn) == fopAc_ENEMY_e ||
+                fopAcM_GetName(mpAttnActorLockOn) == PROC_BOOMERANG
+            )
+        ) ||
+        mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK17_e
+    ) {
         return true;
     }
     return false;
@@ -3067,7 +3059,7 @@ void daPy_lk_c::setBlendMoveAnime(f32 param_1) {
             in_f27 = 0.0f;
             #endif
             if (checkModeFlg(ModeFlg_00000001)) {
-                if (mpAttention->Lockon()) {
+                if (checkAttentionLock()) {
                     if (checkUpperGuardAnime()) {
                         setMoveAnime(0.0f, daPy_HIO_atnMove_c0::m.field_0x24,
                                      daPy_HIO_atnMove_c0::m.field_0x28, ANM_ATNRS, ANM_ATNWRS, 2,
@@ -3087,7 +3079,7 @@ void daPy_lk_c::setBlendMoveAnime(f32 param_1) {
                     }
                     return;
                 }
-                if (shape_angle.y != m34DE && !mpAttention->Lockon()) {
+                if (shape_angle.y != m34DE && !checkAttentionLock()) {
                     s16 r3 = (s16)(shape_angle.y - m34DE);
                     if (r3 > 0) {
                         r27 = ANM_ATNWLS;
@@ -3123,9 +3115,8 @@ void daPy_lk_c::setBlendMoveAnime(f32 param_1) {
                 in_f27 = daPy_HIO_move_c0::m.field_0x38;
             }
             setMoveAnime(f25, in_f27, f29, r28, r27, r24, param_1);
-            if ((r28 == ANM_WAITB &&
-                 ((!dComIfGp_event_runCheck() || mDemo.getDemoType() != 3))) &&
-                (mFrameCtrlUnder[UNDER_MOVE0_e].checkPass(15.0f)))
+            if (r28 == ANM_WAITB && (!dComIfGp_event_runCheck() || mDemo.getDemoType() != 3) &&
+                mFrameCtrlUnder[UNDER_MOVE0_e].checkPass(15.0f))
             {
                 if (dComIfGs_getLife() <= 2) {
                     voiceStart(21);
@@ -3593,9 +3584,9 @@ void daPy_lk_c::deleteEquipItem(BOOL param_1) {
 
 /* 8010C71C-8010C7F4       .text setFallVoice__9daPy_lk_cFv */
 void daPy_lk_c::setFallVoice() {
-    if ((!checkNoResetFlg0(daPyFlg0_NO_FALL_VOICE) &&
-         ((((!checkNoResetFlg0(daPyFlg0_UNK80) || m35D0 < mAcch.GetGroundH()) || m3580 == 4) ||
-           -G_CM3D_F_INF == mAcch.GetGroundH()))) &&
+    if (!checkNoResetFlg0(daPyFlg0_NO_FALL_VOICE) &&
+        (!checkNoResetFlg0(daPyFlg0_UNK80) || m35D0 < mAcch.GetGroundH() || m3580 == 4 ||
+         -G_CM3D_F_INF == mAcch.GetGroundH()) &&
         (m35F0 - current.pos.y > 500.0f))
     {
         if (current.pos.y - mAcch.GetGroundH() >= 100.0f * daPy_HIO_fall_c0::m.field_0x14) {
@@ -3735,7 +3726,7 @@ BOOL daPy_lk_c::changeDragonShield(int param_1) {
             dComIfGp_setItemMagicCount(-1);
         }
     } else if (param_1 != 0) {
-        mDoAud_seStart(JA_SE_ITEM_TARGET_OUT);
+        seStartSystem(JA_SE_ITEM_TARGET_OUT);
     }
     return true;
 }
@@ -3747,11 +3738,9 @@ BOOL daPy_lk_c::checkNewItemChange(u8 param_1) {
     if (uVar4 == dItem_MAGIC_ARMOR_e) {
         return changeDragonShield(1);
     }
-    if (((((uVar4 == dItem_IRON_BOOTS_e || uVar4 == WATER_BOOTS) ||
-           uVar4 == dItem_TINGLE_TUNER_e) ||
-          ((uVar4 == NORMAL_SAIL || isEsa(uVar4)))) ||
-         ((isDaizaItem(uVar4) || ((isEmono(uVar4) || checkBottleItem(uVar4)))))) ||
-        ((uVar4 >= dItem_FATHER_LETTER_e && uVar4 <= KAISEN_PRESENT2)))
+    if (uVar4 == dItem_IRON_BOOTS_e || uVar4 == WATER_BOOTS || uVar4 == dItem_TINGLE_TUNER_e || uVar4 == NORMAL_SAIL ||
+        isEsa(uVar4) || isDaizaItem(uVar4) || isEmono(uVar4) || checkBottleItem(uVar4) ||
+        (uVar4 >= dItem_FATHER_LETTER_e && uVar4 <= KAISEN_PRESENT2))
     {
         if (mAcch.ChkGroundHit() && (!daPy_lk_c::checkPlayerFly())) {
             if (uVar4 == dItem_IRON_BOOTS_e || uVar4 == WATER_BOOTS) {
@@ -3791,7 +3780,7 @@ BOOL daPy_lk_c::checkNewItemChange(u8 param_1) {
         if (uVar4 == dItem_BOMB_BAG_e &&
             (mActivePlayerBombs >= 3 || dComIfGs_getBombNum() == 0))
         {
-            mDoAud_seStart(JA_SE_ITEM_TARGET_OUT);
+            seStartSystem(JA_SE_ITEM_TARGET_OUT);
             return false;
         } else {
             mReadyItemBtn = param_1;
@@ -3874,8 +3863,7 @@ void daPy_lk_c::checkItemAction() {
     {
         mReadyItemBtn = dItemBtn_Z_e;
     }
-    if (((checkEquipAnime() || checkUpperAnime(LKANM_BCK_BOOMTHROW)) ||
-         checkUpperAnime(LKANM_BCK_BOOMCATCH)) ||
+    if (checkEquipAnime() || checkUpperAnime(LKANM_BCK_BOOMTHROW) || checkUpperAnime(LKANM_BCK_BOOMCATCH) ||
         checkUpperAnime(LKANM_BCK_ROPETHROW))
     {
         J3DFrameCtrl& frameCtrl = mFrameCtrlUpper[UPPER_MOVE2_e];
@@ -3910,61 +3898,55 @@ void daPy_lk_c::checkItemAction() {
                 mFrameCtrlUpper[UPPER_MOVE0_e].setRate(daPy_HIO_atnMove_c0::m.field_0x24);
                 mFrameCtrlUpper[UPPER_MOVE1_e].setRate(0.0f);
             }
-        } else {
-            if (checkEquipAnime()) {
-                if (mEquipItem == daPyItem_SWORD_e &&
-                    (((checkUpperAnime(LKANM_BCK_REST) &&
-                       (frameCtrl.checkPass(7.0f - frameCtrl.getRate()))) ||
-                      ((((checkUpperAnime(LKANM_BCK_TAKE) &&
-                          (frameCtrl.checkPass(7.0f - frameCtrl.getRate()))) ||
-                         ((checkUpperAnime(LKANM_BCK_TAKEBOTH) &&
-                           (frameCtrl.checkPass(daPy_HIO_item_c0::m.field_0x30 -
-                                                frameCtrl.getRate()))))) ||
-                        ((checkSingleItemEquipAnime() &&
-                          (frameCtrl.checkPass(daPy_HIO_item_c0::m.field_0x20 -
-                                               frameCtrl.getRate())))))))))
+        } else if (checkEquipAnime()) {
+            if (mEquipItem == daPyItem_SWORD_e &&
+                ((checkUpperAnime(LKANM_BCK_REST) && frameCtrl.checkPass(7.0f - frameCtrl.getRate())) ||
+                 (checkUpperAnime(LKANM_BCK_TAKE) && frameCtrl.checkPass(7.0f - frameCtrl.getRate())) ||
+                 (checkUpperAnime(LKANM_BCK_TAKEBOTH) &&
+                  frameCtrl.checkPass(daPy_HIO_item_c0::m.field_0x30 - frameCtrl.getRate())) ||
+                 (checkSingleItemEquipAnime() &&
+                  frameCtrl.checkPass(daPy_HIO_item_c0::m.field_0x20 - frameCtrl.getRate()))))
+            {
+                seStartOnlyReverb(JA_SE_LK_SW_PUTIN_S);
+            }
+            if (std::fabsf(frameCtrl.getRate()) < 0.01f) {
+                resetActAnimeUpper(UPPER_MOVE2_e, daPy_HIO_basic_c0::m.field_0xC);
+            } else if ((checkUpperAnime(LKANM_BCK_REST) && frameCtrl.checkPass(7.0f)) ||
+                        (checkUpperAnime(LKANM_BCK_TAKE) && frameCtrl.checkPass(7.0f)) ||
+                        (checkUpperAnime(LKANM_BCK_TAKEBOTH) && frameCtrl.checkPass(daPy_HIO_item_c0::m.field_0x30)) ||
+                        (checkSingleItemEquipAnime() && frameCtrl.checkPass(daPy_HIO_item_c0::m.field_0x20)))
+            {
+                if ((mEquipItem != daPyItem_NONE_e && mEquipItem != daPyItem_SWORD_e) ||
+                    (m3562 != daPyItem_NONE_e && m3562 != daPyItem_SWORD_e))
                 {
-                    seStartOnlyReverb(JA_SE_LK_SW_PUTIN_S);
+                    seStartOnlyReverb(JA_SE_LK_ITEM_TAKEOUT);
                 }
-                if (std::fabsf(frameCtrl.getRate()) < 0.01f) {
-                    resetActAnimeUpper(UPPER_MOVE2_e, daPy_HIO_basic_c0::m.field_0xC);
-                } else if ((checkUpperAnime(LKANM_BCK_REST) && frameCtrl.checkPass(7.0f)) ||
-                           (checkUpperAnime(LKANM_BCK_TAKE) && frameCtrl.checkPass(7.0f)) ||
-                           (checkUpperAnime(LKANM_BCK_TAKEBOTH) && frameCtrl.checkPass(daPy_HIO_item_c0::m.field_0x30)) ||
-                           (checkSingleItemEquipAnime() && frameCtrl.checkPass(daPy_HIO_item_c0::m.field_0x20)))
-                {
-                    if ((mEquipItem != daPyItem_NONE_e && mEquipItem != daPyItem_SWORD_e) ||
-                        (m3562 != daPyItem_NONE_e && m3562 != daPyItem_SWORD_e))
-                    {
-                        seStartOnlyReverb(JA_SE_LK_ITEM_TAKEOUT);
-                    }
-                    BOOL var_r28;
-                    if (mEquipItem == daPyItem_NONE_e) {
-                        var_r28 = 0;
-                    } else {
-                        var_r28 = 1;
-                    }
-                    deleteEquipItem(FALSE);
-                    mEquipItem = m3562;
-                    if (!dComIfGp_event_runCheck() && mDemo.getDemoType() == 0) {
-                        if (mEquipItem != daPyItem_SWORD_e || !checkNoResetFlg1(daPyFlg1_UNK4000000)) {
-                            if ((mpAttention->Lockon() || mEquipItem != daPyItem_SWORD_e) || var_r28) {
-                                onResetFlg0(daPyRFlg0_UNK80);
-                            }
+                BOOL var_r28;
+                if (mEquipItem == daPyItem_NONE_e) {
+                    var_r28 = 0;
+                } else {
+                    var_r28 = 1;
+                }
+                deleteEquipItem(FALSE);
+                mEquipItem = m3562;
+                if (!dComIfGp_event_runCheck() && mDemo.getDemoType() == 0) {
+                    if (mEquipItem != daPyItem_SWORD_e || !checkNoResetFlg1(daPyFlg1_UNK4000000)) {
+                        if ((checkAttentionLock() || mEquipItem != daPyItem_SWORD_e) || var_r28) {
+                            onResetFlg0(daPyRFlg0_UNK80);
                         }
                     }
-                    if (mCurProc == daPyProc_DEMO_STAND_ITEM_PUT_e) {
-                        resetActAnimeUpper(UPPER_MOVE2_e, -1.0f);
-                    } else if (mEquipItem == daPyItem_SWORD_e) {
-                        seStartOnlyReverb(JA_SE_LK_SW_PULLOUT_S);
+                }
+                if (mCurProc == daPyProc_DEMO_STAND_ITEM_PUT_e) {
+                    resetActAnimeUpper(UPPER_MOVE2_e, -1.0f);
+                } else if (mEquipItem == daPyItem_SWORD_e) {
+                    seStartOnlyReverb(JA_SE_LK_SW_PULLOUT_S);
 #if VERSION == VERSION_DEMO
-                        setSwordModel();
+                    setSwordModel();
 #else
-                        setSwordModel(FALSE);
+                    setSwordModel(FALSE);
 #endif
-                    } else {
-                        makeItemType();
-                    }
+                } else {
+                    makeItemType();
                 }
             }
         }
@@ -4017,7 +3999,7 @@ int daPy_lk_c::orderTalk() {
              dComIfGp_getSelectItem(dItemBtn_X_e) != dItem_HYOI_PEAR_e) &&
             m3630 != fpcM_ERROR_PROCESS_ID_e)
         {
-            mDoAud_seStart(JA_SE_ITEM_TARGET_OUT);
+            seStartSystem(JA_SE_ITEM_TARGET_OUT);
             return false;
         }
         fopAcM_orderTalkXBtnEvent(this, mpAttnActorX);
@@ -4032,7 +4014,7 @@ int daPy_lk_c::orderTalk() {
              dComIfGp_getSelectItem(dItemBtn_Y_e) != dItem_HYOI_PEAR_e) &&
             m3630 != fpcM_ERROR_PROCESS_ID_e)
         {
-            mDoAud_seStart(JA_SE_ITEM_TARGET_OUT);
+            seStartSystem(JA_SE_ITEM_TARGET_OUT);
             return false;
         }
         fopAcM_orderTalkYBtnEvent(this, mpAttnActorY);
@@ -4047,7 +4029,7 @@ int daPy_lk_c::orderTalk() {
              dComIfGp_getSelectItem(dItemBtn_Z_e) != dItem_HYOI_PEAR_e) &&
             m3630 != fpcM_ERROR_PROCESS_ID_e)
         {
-            mDoAud_seStart(JA_SE_ITEM_TARGET_OUT);
+            seStartSystem(JA_SE_ITEM_TARGET_OUT);
             return false;
         }
         fopAcM_orderTalkZBtnEvent(this, mpAttnActorZ);
@@ -4284,7 +4266,7 @@ BOOL daPy_lk_c::checkNextActionFromButton() {
                 return procBackJump_init();
             }
         } else if (dComIfGp_getDoStatus() == dActStts_ATTACK_e) {
-            if (!mpAttention->Lockon() && mStickDistance > 0.05f) {
+            if (!checkAttentionLock() && mStickDistance > 0.05f) {
                 shape_angle.y = m34E8;
             }
             return procFrontRoll_init(daPy_HIO_roll_c0::m.field_0xC);
@@ -4305,7 +4287,7 @@ BOOL daPy_lk_c::checkNextActionFromButton() {
 void daPy_lk_c::setShieldGuard() {
     f32 local_18 = m_pbCalc[PART_UPPER_e]->getRatio(2);
     if (checkGuardSlip() ||
-        (!checkEquipAnime() && !checkGrabAnime() && mpAttention->Lockon() && mEquipItem != daPyItem_BOKO_e &&
+        (!checkEquipAnime() && !checkGrabAnime() && checkAttentionLock() && mEquipItem != daPyItem_BOKO_e &&
          dComIfGs_getSelectEquip(1) != dItem_NONE_e && checkGuardAccept() &&
          (mActorKeepEquip.getID() == fpcM_ERROR_PROCESS_ID_e || mActorKeepEquip.getActor() != NULL)))
     {
@@ -4335,8 +4317,8 @@ void daPy_lk_c::setShieldGuard() {
                     m_pbCalc[PART_UPPER_e]->setRatio(2, local_18);
                 }
             }
-            if ((m_anm_heap_under[UNDER_MOVE0_e].mIdx == LKANM_BCK_ATNLS) ||
-                (m_anm_heap_under[UNDER_MOVE0_e].mIdx == LKANM_BCK_ATNRS))
+            if (m_anm_heap_under[UNDER_MOVE0_e].mIdx == LKANM_BCK_ATNLS ||
+                m_anm_heap_under[UNDER_MOVE0_e].mIdx == LKANM_BCK_ATNRS)
             {
                 mAnmRatioUpper[UPPER_MOVE2_e].getAnmTransform()->setFrame(
                     mFrameCtrlUnder[UNDER_MOVE0_e].getFrame());
@@ -4398,7 +4380,7 @@ BOOL daPy_lk_c::checkNextMode(int r29) {
         return procVomitJump_init(3);
     }
     
-    BOOL r24 = mpAttention->Lockon() ||
+    BOOL r24 = checkAttentionLock() ||
         (mActorKeepThrow.getActor() != NULL && mpAttnActorLockOn == mActorKeepThrow.getActor()) ||
         checkUpperReadyThrowAnime() ||
         mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK17_e;
@@ -4415,11 +4397,11 @@ BOOL daPy_lk_c::checkNextMode(int r29) {
     if (checkNextActionFromButton()) {
         return true;
     }
-    if (r29 != 0 && ((!(mStickDistance > 0.05f) && !spActionButton()))) {
+    if (r29 != 0 && !(mStickDistance > 0.05f) && !spActionButton()) {
         mMaxNormalSpeed = f31;
         return false;
     }
-    
+
     BOOL r3;
     if (r24) {
         if (checkBoomerangAnime()) {
@@ -4984,12 +4966,9 @@ BOOL daPy_lk_c::setDamagePoint(f32 amount) {
 
 /* 80110338-80110448       .text checkNormalDamage__9daPy_lk_cFi */
 BOOL daPy_lk_c::checkNormalDamage(int param_1) {
-    f32 fVar2;
-    if ((checkGrabAnime() || mCurProc != daPyProc_MOVE_e) ||
-        (std::abs((mVelocity * (m3580 == 8 ? fVar2 = 1.0f : fVar2 = cM_scos(m34E2))) /
-                  mMaxNormalSpeed) < 0.9f) ||
-        ((!checkNoDamageMode() && !dComIfGs_checkBottle(dItem_FAIRY_BOTTLE_e)) &&
-            !(dComIfGs_getLife() > param_1)))
+    if (checkGrabAnime() || mCurProc != daPyProc_MOVE_e ||
+        (std::abs(mVelocity * (m3580 == 8 ? 1.0f : cM_scos(m34E2)) / mMaxNormalSpeed) < 0.9f) ||
+        (!checkNoDamageMode() && !dComIfGs_checkBottle(dItem_FAIRY_BOTTLE_e) && dComIfGs_getLife() <= param_1))
     {
         return true;
     }
@@ -5353,7 +5332,7 @@ BOOL daPy_lk_c::changeAutoJumpProc() {
             } else {
                 dVar11 = daPy_HIO_wallCatch_c0::m.field_0x54;
             }
-            if ((mStaffIdx != -1) && (dComIfGp_evmng_getMyIntegerP(mStaffIdx, "fall"))) {
+            if (mStaffIdx != -1 && dComIfGp_evmng_getMyIntegerP(mStaffIdx, "fall")) {
                 return procFall_init(0, dVar11);
             } else {
                 return procFall_init(1, dVar11);
@@ -5417,15 +5396,15 @@ BOOL daPy_lk_c::changeDemoProc() {
         if (checkModeFlg(ModeFlg_04000000)) {
             return true;
         }
-        if (((dComIfGp_checkPlayerStatus0(0, daPyStts0_SHIP_RIDE_e)) && (fopAcM_getTalkEventPartner(this) != NULL)) &&
-            (fopAcM_getTalkEventPartner(this) == dComIfGp_getShipActor()))
+        if ((dComIfGp_checkPlayerStatus0(0, daPyStts0_SHIP_RIDE_e) && fopAcM_getTalkEventPartner(this) != NULL) &&
+            fopAcM_getTalkEventPartner(this) == dComIfGp_getShipActor())
         {
             return procShipPaddle_init();
         }
         onNoResetFlg0(daPyFlg0_UNK100000);
         fopAc_ac_c* grab_actor = mActorKeepGrab.getActor();
         if (grab_actor != NULL) {
-            if ((fopAcM_CheckStatus(grab_actor, fopAcStts_UNK10000_e)) && !checkGrabSpecialHeavyState()) {
+            if (fopAcM_CheckStatus(grab_actor, fopAcStts_UNK10000_e) && !checkGrabSpecialHeavyState()) {
                 return procGrabThrow_init(0);
             } else {
                 return procGrabPut_init();
@@ -5462,13 +5441,13 @@ BOOL daPy_lk_c::changeDemoProc() {
         }
         return procSlowFall_init();
     } else if (demo_mode == daPy_demo_c::DEMO_UNK1F_e) {
-        if (((!checkModeFlg(
+        if ((!checkModeFlg(
                  ModeFlg_MIDAIR | ModeFlg_HANG | ModeFlg_ROPE | ModeFlg_IN_SHIP | ModeFlg_CLIMB | ModeFlg_SWIM |
                  ModeFlg_LADDER | ModeFlg_04000000 | ModeFlg_CAUGHT
-             )) &&
-             ((((checkUpperReadyThrowAnime() || m34C3 == 2) || m34C3 == 1) || (m34C3 == 4 || m34C3 == 9)) ||
-              (m34C3 == 10 || mCurProc == daPyProc_GRAB_WAIT_e))) ||
-            (dComIfGp_checkPlayerStatus0(0, daPyStts0_SHIP_RIDE_e)))
+             ) &&
+             (checkUpperReadyThrowAnime() || m34C3 == 2 || m34C3 == 1 || m34C3 == 4 || m34C3 == 9 || m34C3 == 10 ||
+              mCurProc == daPyProc_GRAB_WAIT_e)) ||
+            dComIfGp_checkPlayerStatus0(0, daPyStts0_SHIP_RIDE_e))
         {
             onNoResetFlg0(daPyFlg0_UNK100000);
             return dProcLookWait_init();
@@ -5478,13 +5457,13 @@ BOOL daPy_lk_c::changeDemoProc() {
         }
     } else if (demo_mode == daPy_demo_c::DEMO_UNK22_e) {
         onNoResetFlg0(daPyFlg0_UNK100000);
-        if ((mCurProc == daPyProc_TACT_PLAY_e) || mCurProc == daPyProc_TACT_PLAY_END_e) {
+        if (mCurProc == daPyProc_TACT_PLAY_e || mCurProc == daPyProc_TACT_PLAY_END_e) {
             return true;
         }
         return procTactWait_init(mDemo.getParam0());
     } else if (demo_mode == daPy_demo_c::DEMO_UNK33_e) {
         fopAc_ac_c* grab_actor = mActorKeepGrab.getActor();
-        if ((grab_actor == NULL) || (grab_actor != dComIfGp_getCb1Player())) {
+        if (grab_actor == NULL || grab_actor != dComIfGp_getCb1Player()) {
             deleteEquipItem(FALSE);
             freeGrabItem();
             mActorKeepGrab.setData(dComIfGp_getCb1Player());
@@ -5494,7 +5473,7 @@ BOOL daPy_lk_c::changeDemoProc() {
     } else if (demo_mode == daPy_demo_c::DEMO_UNK3D_e) {
         onNoResetFlg0(daPyFlg0_UNK100000);
         return procBottleOpen_init(dComIfGp_event_getPreItemNo());
-    } else if ((((checkNoResetFlg0(daPyFlg0_UNK100000)) || mCurProc == daPyProc_SUBJECTIVITY_e) ||
+    } else if (((checkNoResetFlg0(daPyFlg0_UNK100000) || mCurProc == daPyProc_SUBJECTIVITY_e) ||
                 checkUpperReadyThrowAnime()) &&
                (demo_mode == daPy_demo_c::DEMO_UNK2A_e || demo_mode == daPy_demo_c::DEMO_UNK01_e ||
                 demo_mode == daPy_demo_c::DEMO_UNK02_e || demo_mode == daPy_demo_c::DEMO_UNK03_e ||
@@ -5515,17 +5494,16 @@ BOOL daPy_lk_c::changeDemoProc() {
 
 /* 80111A80-80111B80       .text changeDeadProc__9daPy_lk_cFv */
 BOOL daPy_lk_c::changeDeadProc() {
-    if ((((!dComIfGp_event_runCheck()) && (mDemo.getDemoType() == 0)) &&
-         (dComIfGs_getLife() == 0)) &&
-        (!checkModeFlg(ModeFlg_DAMAGE)))
+    if (!dComIfGp_event_runCheck() && mDemo.getDemoType() == 0 && dComIfGs_getLife() == 0 &&
+        !checkModeFlg(ModeFlg_DAMAGE))
     {
         if (dComIfGs_checkBottle(dItem_FAIRY_BOTTLE_e)) {
             makeFairy(&current.pos, daNpc_Fa1_c::Type_LINK_DOWN_e);
             dComIfGs_setBottleItemIn(dItem_FAIRY_BOTTLE_e, dItem_EMPTY_BOTTLE_e);
             return false;
         }
-        if (((mAcch.ChkGroundHit()) || (dComIfGp_checkPlayerStatus0(0, daPyStts0_SHIP_RIDE_e))) ||
-            (checkModeFlg(ModeFlg_SWIM)))
+        if (mAcch.ChkGroundHit() || dComIfGp_checkPlayerStatus0(0, daPyStts0_SHIP_RIDE_e) ||
+            checkModeFlg(ModeFlg_SWIM))
         {
             return dProcDead_init();
         }
@@ -5566,7 +5544,7 @@ void daPy_lk_c::setOldRootQuaternion(s16 param_1, s16 param_2, s16 param_3) {
 
     if (m_old_fdata->getOldFrameFlg() != false) {
         Quaternion* pQVar1 = m_old_fdata->getOldFrameQuaternion(0);
-        if ((param_1 != 0) || (param_2 != 0)) {
+        if (param_1 != 0 || param_2 != 0) {
             JMAEulerToQuat(param_1, param_2, 0, &afStack_28);
             local_38 = *pQVar1;
             mDoMtx_QuatConcat(&afStack_28, &local_38, m_old_fdata->getOldFrameQuaternion(0));
@@ -5581,11 +5559,10 @@ void daPy_lk_c::setOldRootQuaternion(s16 param_1, s16 param_2, s16 param_3) {
 
 /* 80111E54-80111EFC       .text checkRestHPAnime__9daPy_lk_cFv */
 BOOL daPy_lk_c::checkRestHPAnime() {
-    if ((((!checkPlayerGuard()) && (checkNoUpperAnime())) &&
-         (mpAttnActorLockOn == NULL)) &&
-        ((((mDemo.getDemoType() == 0 && (!checkModeFlg(ModeFlg_IN_SHIP))) &&
-           (dComIfGs_getLife() <= daPy_HIO_move_c0::m.field_0xE)) ||
-          (mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK12_e))))
+    if (!checkPlayerGuard() && checkNoUpperAnime() && mpAttnActorLockOn == NULL &&
+        ((mDemo.getDemoType() == 0 && !checkModeFlg(ModeFlg_IN_SHIP) &&
+          dComIfGs_getLife() <= daPy_HIO_move_c0::m.field_0xE) ||
+         mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK12_e))
     {
         return true;
     }
@@ -5629,11 +5606,11 @@ BOOL daPy_lk_c::checkPhotoBoxItem(int itemNo) const {
 
 /* 80112064-80112100       .text checkScopeEnd__9daPy_lk_cFv */
 BOOL daPy_lk_c::checkScopeEnd() {
-    if ((dComIfGp_getScopeMesgStatus() == 11) &&
-        ((cancelTrigger()) || (checkNoResetFlg0(daPyFlg0_SCOPE_CANCEL))))
+    if (dComIfGp_getScopeMesgStatus() == 11 &&
+        (cancelTrigger() || checkNoResetFlg0(daPyFlg0_SCOPE_CANCEL)))
     {
-        if ((dComIfGp_checkPlayerStatus0(0, daPyStts0_TELESCOPE_LOOK_e)) || (cancelTrigger())) {
-            mDoAud_seStart(JA_SE_ITM_SUBMENU_OUT);
+        if (dComIfGp_checkPlayerStatus0(0, daPyStts0_TELESCOPE_LOOK_e) || cancelTrigger()) {
+            seStartSystem(JA_SE_ITM_SUBMENU_OUT);
         }
         return true;
     }
@@ -5643,13 +5620,13 @@ BOOL daPy_lk_c::checkScopeEnd() {
 /* 80112100-8011215C       .text setSubjectMode__9daPy_lk_cFv */
 void daPy_lk_c::setSubjectMode() {
     dComIfGp_setPlayerStatus0(0, daPyStts0_UNK2000_e);
-    mDoAud_seStart(JA_SE_SUBJ_VIEW_IN);
+    seStartSystem(JA_SE_SUBJ_VIEW_IN);
 }
 
 /* 8011215C-801121C8       .text checkMaskDraw__9daPy_lk_cFv */
 BOOL daPy_lk_c::checkMaskDraw() {
     dDemo_actor_c* demo_actor = dComIfGp_demo_getActor(demoActorID);
-    if ((demo_actor == NULL) && (dComIfGs_isCollect(4, 1))) {
+    if (demo_actor == NULL && dComIfGs_isCollect(4, 1)) {
         return true;
     } else {
         return false;
@@ -5661,7 +5638,7 @@ BOOL daPy_lk_c::checkSubjectEnd(BOOL i_playSound) {
     // TODO: these trigger/button checks are likely inlines
     if(dComIfGp_event_runCheck() || (mItemTrigger & (BTN_A | BTN_B)) || (mItemButton & BTN_L) || dComIfGp_checkCameraAttentionStatus(mCameraInfoIdx, 0x2000)) {
         if(i_playSound) {
-            mDoAud_seStart(JA_SE_SUBJ_VIEW_OUT);
+            seStartSystem(JA_SE_SUBJ_VIEW_OUT);
         }
 
         onResetFlg0(daPyRFlg0_UNK10000000);
@@ -5699,7 +5676,7 @@ BOOL daPy_lk_c::commonProcInit(daPy_PROC proc) {
     BOOL temp_r28;
     
     if (mCurProc == daPyProc_SLIP_e) {
-        mDoAud_seStop(JA_SE_LK_RUN_SLIP, 0);
+        mDoAud_seStop(JA_SE_LK_RUN_SLIP);
     } else if (mCurProc == daPyProc_GRAB_MISS_e || (mCurProc == daPyProc_GRAB_READY_e && proc != daPyProc_GRAB_MISS_e)) {
         mActorKeepRope.clearData();
     } else if (mCurProc == daPyProc_DEMO_TALISMAN_WAIT_e) {
@@ -5880,7 +5857,7 @@ BOOL daPy_lk_c::procScope_init(int param_1) {
     mVelocity = 0.0f;
     setBlendMoveAnime(daPy_HIO_basic_c0::m.field_0xC);
     current.angle.y = shape_angle.y;
-    mDoAud_seStart(JA_SE_ITM_SUBMENU_IN_1);
+    seStartSystem(JA_SE_ITM_SUBMENU_IN_1);
     offNoResetFlg0(daPyFlg0_SCOPE_CANCEL);
     if (param_1 == 0x20) {
         dComIfGp_setPlayerStatus0(0, daPyStts0_TELESCOPE_LOOK_e);
@@ -5929,7 +5906,7 @@ BOOL daPy_lk_c::procSubjectivity() {
         checkSubjectEnd(FALSE) ||
         (mProcVar0.m3570 != 0 && !spActionButton() // Player released R while crouching
     )) {
-        mDoAud_seStart(JA_SE_SUBJ_VIEW_OUT);
+        seStartSystem(JA_SE_SUBJ_VIEW_OUT);
         if(mProcVar0.m3570 != 0) {
             if(mEquipItem == daPyItem_NONE_e) {
                 return procCrouch_init();
@@ -6011,9 +5988,7 @@ BOOL daPy_lk_c::procControllWait() {
 
 /* 80112E60-80113044       .text procWait_init__9daPy_lk_cFv */
 BOOL daPy_lk_c::procWait_init() {
-    if ((mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK2A_e) &&
-        (m_tex_scroll_heap.field_0x6 == 0xFFFF))
-    {
+    if (mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK2A_e && m_tex_scroll_heap.field_0x6 == 0xFFFF) {
         changeTextureAnime(LKANM_BTP_TMABACC, LKANM_BTK_TEUR, -1);
         voiceStart(38);
         m34D0 = 0x14;
@@ -6021,9 +5996,8 @@ BOOL daPy_lk_c::procWait_init() {
     if (mCurProc == daPyProc_WAIT_e) {
         return false;
     }
-    if ((((!dComIfGp_event_runCheck() && (mCurProc == daPyProc_FREE_WAIT_e)) &&
-          (mFrameCtrlUnder[UNDER_MOVE0_e].getRate() > 0.01f)) &&
-         (checkNoUpperAnime())))
+    if (!dComIfGp_event_runCheck() && mCurProc == daPyProc_FREE_WAIT_e &&
+        mFrameCtrlUnder[UNDER_MOVE0_e].getRate() > 0.01f && checkNoUpperAnime())
     {
         return false;
     }
@@ -6031,7 +6005,7 @@ BOOL daPy_lk_c::procWait_init() {
     commonProcInit(daPyProc_WAIT_e);
     mVelocity = 0.0f;
     int iVar4 = checkRestHPAnime();
-    if ((iVar4 != 0) && (iVar3 == 0)) {
+    if (iVar4 != 0 && iVar3 == 0) {
         s32 uVar2 = m_tex_anm_heap.mIdx == mTexAnmIndexTable[daPyFace_TMABAF].mBtpIdx;
         u16 uVar1 = m3530;
         setSingleMoveAnime(ANM_WAITATOB, daPy_HIO_move_c0::m.field_0x68,
@@ -6056,12 +6030,10 @@ BOOL daPy_lk_c::procWait_init() {
 
 /* 80113044-801133FC       .text procWait__9daPy_lk_cFv */
 BOOL daPy_lk_c::procWait() {
-    if ((m36A0.abs2XZ() <= (1.0f / 999999.9f)) && (m36AC.abs2XZ() >= 25.0f)) {
+    if (m36A0.abs2XZ() <= (1.0f / 999999.9f) && m36AC.abs2XZ() >= 25.0f) {
         return procIceSlipAlmostFall_init();
     }
-    if ((((!dComIfGp_event_runCheck()) && (mDemo.getDemoType() == 0)) && (spLTrigger())) &&
-        (mAcch.ChkWallHit()))
-    {
+    if (!dComIfGp_event_runCheck() && mDemo.getDemoType() == 0 && spLTrigger() && mAcch.ChkWallHit()) {
         dBgS_AcchCir* pdVar5 = &mAcchCir[0];
         for (int i = 0; i < 3; i++, pdVar5++) {
             if (pdVar5->ChkWallHit()) {
@@ -6076,7 +6048,7 @@ BOOL daPy_lk_c::procWait() {
         }
     }
     s16 sVar2 = shape_angle.y;
-    if (mpAttention->Lockon()) {
+    if (checkAttentionLock()) {
         setSpeedAndAngleAtn();
     } else {
         setSpeedAndAngleNormal(daPy_HIO_move_c0::m.field_0x0);
@@ -6084,13 +6056,13 @@ BOOL daPy_lk_c::procWait() {
     m35A0 = 0.0f;
     if (!checkNextMode(0)) {
         if (m34C3 == 0) {
-            if ((mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.01f) || (!checkRestHPAnime())) {
+            if (mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.01f || !checkRestHPAnime()) {
                 setBlendMoveAnime(daPy_HIO_basic_c0::m.field_0xC);
                 offModeFlg(ModeFlg_00000400);
                 onModeFlg(ModeFlg_00000100);
             }
-        } else if ((checkRestHPAnime()) &&
-                   (m_anm_heap_under[UNDER_MOVE0_e].mIdx != LKANM_BCK_WAITB))
+        } else if (checkRestHPAnime() &&
+                   m_anm_heap_under[UNDER_MOVE0_e].mIdx != LKANM_BCK_WAITB)
         {
             s32 uVar3 = m_tex_anm_heap.mIdx == mTexAnmIndexTable[daPyFace_TMABAF].mBtpIdx;
             u16 uVar1 = m3530;
@@ -6115,11 +6087,8 @@ BOOL daPy_lk_c::procWait() {
                 m34D0 = 0x14;
             }
         }
-        if (((((!dComIfGp_event_runCheck()) &&
-               (m_anm_heap_under[UNDER_MOVE0_e].mIdx == LKANM_BCK_WAITS)) &&
-              (checkNoUpperAnime())) &&
-             ((daPy_matAnm_c::m_eye_move_flg == 0 && (m3566 == 0)))) &&
-            ((m3568 == 0 && (m3564 == 0))))
+        if (!dComIfGp_event_runCheck() && m_anm_heap_under[UNDER_MOVE0_e].mIdx == LKANM_BCK_WAITS &&
+            checkNoUpperAnime() && daPy_matAnm_c::m_eye_move_flg == 0 && m3566 == 0 && m3568 == 0 && m3564 == 0)
         {
             m34D2--;
             if (m34D2 == 0) {
@@ -6159,7 +6128,7 @@ BOOL daPy_lk_c::procFreeWait_init() {
 
 /* 801134A0-801135C4       .text procFreeWait__9daPy_lk_cFv */
 BOOL daPy_lk_c::procFreeWait() {
-    if (mpAttention->Lockon()) {
+    if (checkAttentionLock()) {
         setSpeedAndAngleAtn();
     } else {
         setSpeedAndAngleNormal(daPy_HIO_move_c0::m.field_0x0);
@@ -6173,7 +6142,7 @@ BOOL daPy_lk_c::procFreeWait() {
             }
         }
     }
-    if ((!checkNextMode(0)) && (dComIfGp_event_runCheck())) {
+    if (!checkNextMode(0) && dComIfGp_event_runCheck()) {
         mFrameCtrlUnder[UNDER_MOVE0_e].setRate(0.0f);
         procWait_init();
     }
@@ -6194,8 +6163,8 @@ BOOL daPy_lk_c::procMove_init() {
 /* 80113628-801136D4       .text procMove__9daPy_lk_cFv */
 BOOL daPy_lk_c::procMove() {
     setSpeedAndAngleNormal(daPy_HIO_move_c0::m.field_0x0);
-    if (((!checkNextMode(0)) && (!changeFrontWallTypeProc())) && (!checkIceSlipFall())) {
-        if ((mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK02_e)) {
+    if (!checkNextMode(0) && !changeFrontWallTypeProc() && !checkIceSlipFall()) {
+        if (mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK02_e) {
             // Fakematch? Regalloc doesn't match unless all three of these vars are given temps.
             f32 vel = mVelocity;
             f32 temp1 = mMaxNormalSpeed;
@@ -6224,9 +6193,7 @@ BOOL daPy_lk_c::procAtnMove_init() {
 /* 80113738-801137B4       .text procAtnMove__9daPy_lk_cFv */
 BOOL daPy_lk_c::procAtnMove() {
     setSpeedAndAngleAtn();
-    if ((!checkNextMode(0)) &&
-        (((mDirection != DIR_FORWARD) || (!changeFrontWallTypeProc())) && (!checkIceSlipFall())))
-    {
+    if (!checkNextMode(0) && (mDirection != DIR_FORWARD || !changeFrontWallTypeProc()) && !checkIceSlipFall()) {
         setBlendAtnMoveAnime(-1.0f);
     }
     return true;
@@ -6245,7 +6212,7 @@ BOOL daPy_lk_c::procAtnActorWait_init() {
     } else {
         sVar2 = 0;
     }
-    if ((mDirection == DIR_LEFT) || ((mDirection != DIR_RIGHT) && !(sVar2 - shape_angle.y < 0))) {
+    if (mDirection == DIR_LEFT || (mDirection != DIR_RIGHT && sVar2 - shape_angle.y >= 0)) {
         mDirection = DIR_LEFT;
     } else {
         mDirection = DIR_RIGHT;
@@ -6285,7 +6252,7 @@ BOOL daPy_lk_c::procAtnActorMove_init() {
 /* 80113960-801139C0       .text procAtnActorMove__9daPy_lk_cFv */
 BOOL daPy_lk_c::procAtnActorMove() {
     setSpeedAndAngleAtnActor();
-    if ((!checkNextMode(0)) && (!checkIceSlipFall())) {
+    if (!checkNextMode(0) && !checkIceSlipFall()) {
         setBlendAtnMoveAnime(-1.0f);
     }
     return true;
@@ -6397,17 +6364,15 @@ BOOL daPy_lk_c::procCrouchDefense_init() {
 /* 80113DBC-80114014       .text procCrouchDefense__9daPy_lk_cFv */
 BOOL daPy_lk_c::procCrouchDefense() {
     dComIfGp_setRStatus(dActStts_DEFEND_e);
-    if ((dCam_getBody()->ChangeModeOK(4)) && (current.pos.y >= m35D0)) {
+    if (dCam_getBody()->ChangeModeOK(4) && current.pos.y >= m35D0) {
         onResetFlg0(daPyRFlg0_UNK4000000);
-        if (((dComIfGp_checkCameraAttentionStatus(mCameraInfoIdx, 0x1000))) &&
-            (!dComIfGp_event_runCheck()))
-        {
+        if (dComIfGp_checkCameraAttentionStatus(mCameraInfoIdx, 0x1000) && !dComIfGp_event_runCheck()) {
             return procSubjectivity_init(1);
         }
     }
     cLib_addCalc(&mVelocity, 0.0f, daPy_HIO_move_c0::m.field_0x24, daPy_HIO_move_c0::m.field_0x1C,
                  daPy_HIO_move_c0::m.field_0x20);
-    if ((mpAttention->Lockon()) || (!spActionButton())) {
+    if (checkAttentionLock() || !spActionButton()) {
         current.angle.y = shape_angle.y;
         mDirection = DIR_RIGHT;
         checkNextMode(0);
@@ -6435,10 +6400,14 @@ BOOL daPy_lk_c::procCrouchDefenseSlip_init() {
     current.angle.y = cM_atan2s(damage_vec->x, damage_vec->z);
     dCcD_GObjInf* pfVar3 = mCyl.GetTgHitGObj();
     f32 dVar5;
-    if ((pfVar3 != NULL) &&
-        ((pfVar3->GetAtSpl() == dCcG_At_Spl_UNK5 || (pfVar3->GetAtSpl() == dCcG_At_Spl_UNK6)) ||
-         (pfVar3->GetAtSpl() == dCcG_At_Spl_UNK7)))
-    {
+    if (
+        pfVar3 != NULL &&
+        (
+            pfVar3->GetAtSpl() == dCcG_At_Spl_UNK5 ||
+            pfVar3->GetAtSpl() == dCcG_At_Spl_UNK6 ||
+            pfVar3->GetAtSpl() == dCcG_At_Spl_UNK7
+        )
+    ) {
         setSingleMoveAnime(ANM_DIFENCEA, daPy_HIO_nockback_c0::m.field_0x8,
                            daPy_HIO_nockback_c0::m.field_0xC, daPy_HIO_nockback_c0::m.field_0x0,
                            daPy_HIO_nockback_c0::m.field_0x10);
@@ -6522,23 +6491,20 @@ BOOL daPy_lk_c::procCrouch() {
     cXyz local_68;
 
     dComIfGp_setRStatus(dActStts_CROUCH_e);
-    if ((dCam_getBody()->ChangeModeOK(4)) && (current.pos.y >= m35D0)) {
+    if (dCam_getBody()->ChangeModeOK(4) && current.pos.y >= m35D0) {
         onResetFlg0(daPyRFlg0_UNK4000000);
-        if (((dComIfGp_checkCameraAttentionStatus(mCameraInfoIdx, 0x1000))) &&
-            (!dComIfGp_event_runCheck()))
-        {
+        if (dComIfGp_checkCameraAttentionStatus(mCameraInfoIdx, 0x1000) && !dComIfGp_event_runCheck()) {
             return procSubjectivity_init(1);
         }
     }
     cLib_addCalc(&mVelocity, 0.0f, daPy_HIO_move_c0::m.field_0x24, daPy_HIO_move_c0::m.field_0x1C,
                  daPy_HIO_move_c0::m.field_0x20);
-    if ((!spActionButton()) ||
-        (((mpAttention->Lockon()) && (dComIfGs_getSelectEquip(1) != dItem_NONE_e)) &&
-         (checkGuardAccept())))
+    if (!spActionButton() ||
+        (checkAttentionLock() && dComIfGs_getSelectEquip(1) != dItem_NONE_e && checkGuardAccept()))
     {
         checkNextMode(0);
     } else {
-        if (((m_old_fdata->getOldFrameRate() < 0.01f) && (mStickDistance > 0.05f)) &&
+        if ((m_old_fdata->getOldFrameRate() < 0.01f && mStickDistance > 0.05f) &&
             !(m35D0 > current.pos.y + 15.0f))
         {
             mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
@@ -6645,7 +6611,7 @@ BOOL daPy_lk_c::procSlip_init() {
     mVelocity = speedF * daPy_HIO_slip_c0::m.field_0x8;
     if (daPy_HIO_slip_c0::m.field_0x0 == 1) {
         mVelocity = mMaxNormalSpeed;
-    } else if ((daPy_HIO_slip_c0::m.field_0x0 == 2) && (mVelocity > mMaxNormalSpeed)) {
+    } else if (daPy_HIO_slip_c0::m.field_0x0 == 2 && mVelocity > mMaxNormalSpeed) {
         mVelocity = mMaxNormalSpeed;
     }
     m34BE = 2;
@@ -6695,7 +6661,7 @@ BOOL daPy_lk_c::procSlip() {
 
 /* 80114D2C-80114DE4       .text procSlideFront_init__9daPy_lk_cFs */
 BOOL daPy_lk_c::procSlideFront_init(s16 param_1) {
-    if ((mCurProc == daPyProc_SLIDE_FRONT_e) || (mCurProc == daPyProc_SLIDE_BACK_e)) {
+    if (mCurProc == daPyProc_SLIDE_FRONT_e || mCurProc == daPyProc_SLIDE_BACK_e) {
         return false;
     }
     commonProcInit(daPyProc_SLIDE_FRONT_e);
@@ -6730,7 +6696,7 @@ BOOL daPy_lk_c::procSlideFront() {
 
 /* 80114EE8-80114FA0       .text procSlideBack_init__9daPy_lk_cFs */
 BOOL daPy_lk_c::procSlideBack_init(s16 param_1) {
-    if ((mCurProc == daPyProc_SLIDE_BACK_e) || (mCurProc == daPyProc_SLIDE_FRONT_e)) {
+    if (mCurProc == daPyProc_SLIDE_BACK_e || mCurProc == daPyProc_SLIDE_FRONT_e) {
         return false;
     }
     commonProcInit(daPyProc_SLIDE_BACK_e);
@@ -6840,9 +6806,8 @@ BOOL daPy_lk_c::procFrontRoll_init(f32 param_1) {
         }
     }
     current.angle.y = shape_angle.y;
-    if ((mAcchCir[0].ChkWallHit()) &&
-        (cLib_distanceAngleS(current.angle.y + 0x8000, mAcchCir[0].GetWallAngleY()) <=
-         daPy_HIO_roll_c0::m.field_0x4))
+    if (mAcchCir[0].ChkWallHit() &&
+        cLib_distanceAngleS(current.angle.y + 0x8000, mAcchCir[0].GetWallAngleY()) <= daPy_HIO_roll_c0::m.field_0x4)
     {
         mProcVar0.m3570 = 0;
     } else {
@@ -6872,16 +6837,15 @@ BOOL daPy_lk_c::procFrontRoll() {
         if (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() > daPy_HIO_roll_c0::m.field_0x10) {
             checkNextMode(1);
         } else {
-            if ((speedF >= daPy_HIO_roll_c0::m.field_0x3C) &&
-                (!checkNoResetFlg1(daPyFlg1_UNK100000)))
+            if (speedF >= daPy_HIO_roll_c0::m.field_0x3C &&
+                !checkNoResetFlg1(daPyFlg1_UNK100000))
             {
-                if ((checkNoResetFlg0(daPyFlg0_UNK8)) ||
-                    ((mProcVar0.m3570 != 0) && (mAcch.ChkWallHit()) && (mAcchCir[0].ChkWallHit()) &&
-                     (cLib_distanceAngleS(current.angle.y + 0x8000, mAcchCir[0].GetWallAngleY()) <=
-                      daPy_HIO_roll_c0::m.field_0x4) &&
-                     (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() >=
-                      daPy_HIO_roll_c0::m.field_0x34) &&
-                     (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() <= daPy_HIO_roll_c0::m.field_0x38)))
+                if (checkNoResetFlg0(daPyFlg0_UNK8) ||
+                    (mProcVar0.m3570 != 0 && mAcch.ChkWallHit() && mAcchCir[0].ChkWallHit() &&
+                     cLib_distanceAngleS(current.angle.y + 0x8000, mAcchCir[0].GetWallAngleY()) <=
+                         daPy_HIO_roll_c0::m.field_0x4 &&
+                     mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() >= daPy_HIO_roll_c0::m.field_0x34 &&
+                     mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() <= daPy_HIO_roll_c0::m.field_0x38))
                 {
                     if (!checkNoResetFlg0(daPyFlg0_UNK8)) {
                         m3620 = dComIfG_Bgsp()->GetMtrlSndId(mAcchCir[0]);
@@ -6908,13 +6872,16 @@ BOOL daPy_lk_c::procFrontRollCrash_init() {
     mDoAud_seStart(JA_SE_LK_BODYATTACK, &current.pos, m3620, mReverb);
     onResetFlg0(daPyRFlg0_FRONT_ROLL_CRASH);
     dKy_Sound_set(current.pos, 100, fopAcM_GetID(this), 5);
-    if ((mAcch.ChkWallHit()) && (mAcchCir[0].ChkWallHit())) {
-        daObjMovebox::Act_c* iVar1 =
-            (daObjMovebox::Act_c*)dComIfG_Bgsp()->GetActorPointer(mAcchCir[0]);
-        if ((iVar1 != 0) && (fopAcM_GetName(iVar1) == PROC_Obj_Movebox) &&
-            ((iVar1->mType == 0) || (iVar1->mType == 5)))
-        {
-            iVar1->mbRollCrash = 1;
+    if (mAcch.ChkWallHit() && mAcchCir[0].ChkWallHit()) {
+        fopAc_ac_c* actor = dComIfG_Bgsp()->GetActorPointer(mAcchCir[0]);
+        if (actor != 0 && fopAcM_GetName(actor) == PROC_Obj_Movebox) {
+            daObjMovebox::Act_c* movebox = (daObjMovebox::Act_c*)actor;
+            if (
+                movebox->mType == daObjMovebox::Act_c::TYPE_BREAKABLE_WOODEN_CRATE ||
+                movebox->mType == daObjMovebox::Act_c::TYPE_GOLDEN_CRATE
+            ) {
+                movebox->set_rollCrash();
+            }
         }
     }
     return true;
@@ -6931,7 +6898,7 @@ BOOL daPy_lk_c::procFrontRollCrash() {
             }
         }
     }
-    if ((mAcch.ChkGroundHit()) && (checkModeFlg(ModeFlg_MIDAIR))) {
+    if (mAcch.ChkGroundHit() && checkModeFlg(ModeFlg_MIDAIR)) {
         mVelocity = 0.0f;
         mFrameCtrlUnder[UNDER_MOVE0_e].setRate(daPy_HIO_roll_c0::m.field_0x24);
         voiceStart(9);
@@ -7039,7 +7006,7 @@ BOOL daPy_lk_c::procBackJump_init() {
 
 /* 80115BFC-80115CA0       .text procBackJump__9daPy_lk_cFv */
 BOOL daPy_lk_c::procBackJump() {
-    if ((mAcch.ChkGroundHit()) && (mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.01f)) {
+    if (mAcch.ChkGroundHit() && mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.01f) {
         procBackJumpLand_init();
     } else {
         if (checkFanGlideProc(0)) {
@@ -7067,9 +7034,8 @@ BOOL daPy_lk_c::procBackJumpLand_init() {
     if (checkHeavyStateOn()) {
         dComIfGp_getVibration().StartShock(5, -0x31, cXyz(0.0f, 1.0f, 0.0f));
     }
-    if ((((mEquipItem == daPyItem_SWORD_e) || (mEquipItem == daPyItem_BOKO_e)) &&
-         (!daPy_dmEcallBack_c::checkCurse())) &&
-        (checkNoUpperAnime()))
+    if ((mEquipItem == daPyItem_SWORD_e || mEquipItem == daPyItem_BOKO_e) &&
+        !daPy_dmEcallBack_c::checkCurse() && checkNoUpperAnime())
     {
         mProcVar0.m3570 = 1;
     } else {
@@ -7092,7 +7058,7 @@ BOOL daPy_lk_c::procBackJumpLand() {
     } else {
         if (mProcVar0.m3570 != 0) {
             mProcVar0.m3570 = 0;
-            if ((abs(m3578) > 0xf800) && (mEquipItem == daPyItem_SWORD_e)) {
+            if (abs(m3578) > 0xf800 && mEquipItem == daPyItem_SWORD_e) {
                 procCutTurn_init(1);
             }
         }
@@ -7138,7 +7104,7 @@ BOOL daPy_lk_c::procAutoJump_init() {
 /* 8011602C-801163D4       .text procAutoJump__9daPy_lk_cFv */
 BOOL daPy_lk_c::procAutoJump() {
     if (m34D0 == 0) {
-        if ((mStickDistance > 0.05f) && (getDirectionFromCurrentAngle() == DIR_BACKWARD)) {
+        if (mStickDistance > 0.05f && getDirectionFromCurrentAngle() == DIR_BACKWARD) {
             cLib_chaseF(&mVelocity, 0.0f, (daPy_HIO_autoJump_c0::m.field_0x3C * mStickDistance));
         } else if (mStickDistance <= 0.05f) {
             cLib_chaseF(&mVelocity, 0.0f, (0.1f * daPy_HIO_autoJump_c0::m.field_0x3C));
@@ -7150,7 +7116,7 @@ BOOL daPy_lk_c::procAutoJump() {
         cLib_chaseF(&mVelocity, daPy_HIO_move_c0::m.field_0x18, daPy_HIO_autoJump_c0::m.field_0x1C);
     }
     checkNextActionItemFly();
-    if ((checkJumpFlower()) || (checkJumpRideShip())) {
+    if (checkJumpFlower() || checkJumpRideShip()) {
         return true;
     }
     if (mAcch.ChkGroundHit()) {
@@ -7159,9 +7125,8 @@ BOOL daPy_lk_c::procAutoJump() {
     if (checkFanGlideProc(0)) {
         return true;
     }
-    if ((!checkGrabAnime()) &&
-        ((((changeFrontWallTypeProc() || (changeRopeSwingProc())) || (checkJumpCutFromButton())) ||
-          (checkItemChangeFromButton()))))
+    if (!checkGrabAnime() &&
+        (changeFrontWallTypeProc() || changeRopeSwingProc() || checkJumpCutFromButton() || checkItemChangeFromButton()))
     {
         return true;
     }
@@ -7169,11 +7134,11 @@ BOOL daPy_lk_c::procAutoJump() {
     if (m34D0 > 0) {
         m34D0--;
         dComIfGp_setDoStatus(dActStts_LET_GO_e);
-        if ((mAcch.ChkWallHit()) || (mCyl.ChkCoHit())) {
+        if (mAcch.ChkWallHit() || mCyl.ChkCoHit()) {
             m34D2--;
         }
-        if ((doTrigger()) || (m34D2 == 0)) {
-            if ((doTrigger()) && (mActorKeepGrab.getActor() != NULL)) {
+        if (doTrigger() || m34D2 == 0) {
+            if (doTrigger() && mActorKeepGrab.getActor() != NULL) {
                 mActorKeepGrab.getActor()->speedF = speedF;
             }
             freeGrabItem();
@@ -7188,10 +7153,9 @@ BOOL daPy_lk_c::procAutoJump() {
                 speed.y = 0.0f;
             }
         }
-    } else if ((speed.y < -gravity) && (mProcVar0.m3570 != 2)) {
-        if (((mActorKeepGrab.getActor() != NULL) &&
-             (fopAcM_GetName(mActorKeepGrab.getActor()) == PROC_NPC_MD)) &&
-            (dComIfGs_isEventBit(0x1620)))
+    } else if (speed.y < -gravity && mProcVar0.m3570 != 2) {
+        if (mActorKeepGrab.getActor() != NULL && fopAcM_GetName(mActorKeepGrab.getActor()) == PROC_NPC_MD &&
+            dComIfGs_isEventBit(0x1620))
         {
             speed.y = 5.0f;
             gravity = 0.0f;
@@ -7203,9 +7167,7 @@ BOOL daPy_lk_c::procAutoJump() {
         offModeFlg(ModeFlg_00000400);
         setTextureAnime(0x37, 0);
         resetSeAnime();
-    } else if ((m3688.y > current.pos.y) &&
-               (m_tex_anm_heap.mIdx != mTexAnmIndexTable[daPyFace_TLAVADAM].mBtpIdx))
-    {
+    } else if (m3688.y > current.pos.y && (m_tex_anm_heap.mIdx != mTexAnmIndexTable[daPyFace_TLAVADAM].mBtpIdx)) {
         setTextureAnime(0x37, 0);
     }
     setFallVoice();
@@ -7331,7 +7293,7 @@ BOOL daPy_lk_c::procFall_init(int param_1, f32 param_2) {
     if (mCurProc == daPyProc_FALL_e) {
         return false;
     }
-    if ((mCurProc == daPyProc_SLIDE_FRONT_e) || (mCurProc == daPyProc_SLIDE_BACK_e)) {
+    if (mCurProc == daPyProc_SLIDE_FRONT_e || mCurProc == daPyProc_SLIDE_BACK_e) {
         bVar2 = true;
     } else {
         bVar2 = false;
@@ -7351,7 +7313,7 @@ BOOL daPy_lk_c::procFall_init(int param_1, f32 param_2) {
     setTextureAnime(0x37, 0);
     resetSeAnime();
     mProcVar0.m3570 = 0;
-    if ((current.angle.y == shape_angle.y) && (!checkGrabAnime())) {
+    if (current.angle.y == shape_angle.y && !checkGrabAnime()) {
         if (mVelocity > 1.0f) {
             m34D0 = 2;
         } else {
@@ -7361,7 +7323,7 @@ BOOL daPy_lk_c::procFall_init(int param_1, f32 param_2) {
         m34D0 = 0;
     }
     m34D2 = 8;
-    if ((cLib_distanceAngleS(current.angle.y, shape_angle.y) < 0x4800) && (!bVar2)) {
+    if (cLib_distanceAngleS(current.angle.y, shape_angle.y) < 0x4800 && !bVar2) {
         m34D4 = 1;
     } else {
         m34D4 = 0;
@@ -7373,7 +7335,7 @@ BOOL daPy_lk_c::procFall_init(int param_1, f32 param_2) {
 
 /* 80116A38-80116C14       .text procFall__9daPy_lk_cFv */
 BOOL daPy_lk_c::procFall() {
-    if (((mProcVar0.m3570 == 0) && (m3688.y > current.pos.y)) &&
+    if ((mProcVar0.m3570 == 0 && m3688.y > current.pos.y) &&
         (m_tex_anm_heap.mIdx != mTexAnmIndexTable[daPyFace_TLAVADAM].mBtpIdx))
     {
         setTextureAnime(0x37, 0);
@@ -7383,7 +7345,7 @@ BOOL daPy_lk_c::procFall() {
         cLib_addCalc(&mVelocity, 0.0f, 0.2f, 1.0f, 0.1f);
     }
     checkNextActionItemFly();
-    if (checkJumpFlower() || ((m3574 != 0) && (checkJumpRideShip()))) {
+    if (checkJumpFlower() || (m3574 != 0 && checkJumpRideShip())) {
         return true;
     }
     if (mAcch.ChkGroundHit()) {
@@ -7397,17 +7359,17 @@ BOOL daPy_lk_c::procFall() {
             if ((int)m34D2 > 0) {
                 m34D2--;
             }
-            if (((mStickDistance > 0.05f) && (getDirectionFromShapeAngle() == 0)) && (m34D2 == 0)) {
+            if (mStickDistance > 0.05f && getDirectionFromShapeAngle() == 0 && m34D2 == 0) {
                 if (changeFrontWallTypeProc()) {
                     return true;
                 }
             }
         } else if (m34D0 == 2) {
-            if ((changeFrontWallTypeProc()) || (changeRopeSwingProc())) {
+            if (changeFrontWallTypeProc() || changeRopeSwingProc()) {
                 return true;
             }
         }
-        if ((m34D4 != 0) && (checkJumpCutFromButton())) {
+        if (m34D4 != 0 && checkJumpCutFromButton()) {
             return true;
         }
     }
@@ -7615,7 +7577,7 @@ BOOL daPy_lk_c::procDamage() {
     mBodyAngle.y = 0;
     dVar5 = cLib_addCalc(&mVelocity, 0.0f, daPy_HIO_damage_c0::m.field_0x1C,
                          daPy_HIO_damage_c0::m.field_0x20, daPy_HIO_damage_c0::m.field_0x24);
-    if ((dVar5 <= 0.001f) && (mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.01f)) {
+    if (dVar5 <= 0.001f && mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.01f) {
         checkNextMode(0);
     } else if (mVelocity < daPy_HIO_damage_c0::m.field_0x2C) {
         resetFootEffect();
@@ -7685,7 +7647,7 @@ BOOL daPy_lk_c::procLargeDamage_init(int param_1, int param_2, s16 param_3, s16
         } else {
             current.angle.y = shape_angle.y + 0x8000;
         }
-    } else if ((param_1 == -2) || (param_1 == -9)) {
+    } else if (param_1 == -2 || param_1 == -9) {
         if (param_1 == -2) {
             current.angle.y = m3550;
             setDamagePoint(-1.0f);
@@ -7705,7 +7667,7 @@ BOOL daPy_lk_c::procLargeDamage_init(int param_1, int param_2, s16 param_3, s16
         iVar7 = getDirectionFromAngle(sVar3);
         seStartOnlyReverb(JA_SE_LK_DAMAGE_LARGE);
         dComIfGp_getVibration().StartShock(6, -0x21, cXyz(0.0f, 1.0f, 0.0f));
-    } else if ((param_1 == -1) || (param_1 == -6)) {
+    } else if (param_1 == -1 || param_1 == -6) {
         damage_vec = getDamageVec(&mCyl);
         current.angle.y = cM_atan2s(damage_vec->x, damage_vec->z);
         iVar7 = getDirectionFromAngle(current.angle.y - shape_angle.y);
@@ -7837,13 +7799,13 @@ BOOL daPy_lk_c::procLargeDamage() {
             } else {
                 if ((m34D6 & 2)) {
                     voiceStart(2);
-                    mDoAud_seStart(JA_SE_MAJUTOU_JAIL_DOOR);
+                    seStartSystem(JA_SE_MAJUTOU_JAIL_DOOR);
                     mAcch.ClrWallNone();
                     mAcch.OffLineCheckNone();
                 }
                 procLargeDamageUp_init(mProcVar0.m3570, (u32)m34D6 >> 3 & 1, m34F2, m34F4);
             }
-        } else if ((mAcch.ChkWallHit()) && (mVelocity > m35A0)) {
+        } else if (mAcch.ChkWallHit() && mVelocity > m35A0) {
             dBgS_AcchCir* pdVar7 = &mAcchCir[0];
             for (int i = 0; i < 3; i++, pdVar7++) {
                 if (pdVar7->ChkWallHit()) {
@@ -7889,7 +7851,7 @@ BOOL daPy_lk_c::procLargeDamageUp_init(int param_1, int param_2, s16 param_3, s1
         dVar7 = 0.5f;
         m34D0 = 0;
         m35A0 = 36.0f;
-    } else if ((param_1 == -1) || param_1 == -2) {
+    } else if (param_1 == -1 || param_1 == -2) {
         dVar4 = ANM_DAMFBUP;
         dVar6 = 7.0f;
         sVar3 = -1;
@@ -7902,7 +7864,7 @@ BOOL daPy_lk_c::procLargeDamageUp_init(int param_1, int param_2, s16 param_3, s1
             m34D0 = 0;
             dVar7 = 0.5f;
         }
-    } else if ((param_1 == -4) || dComIfGp_evmng_startCheck("ICE_FAILED")) {
+    } else if (param_1 == -4 || dComIfGp_evmng_startCheck("ICE_FAILED")) {
         dVar4 = ANM_DAMFBUP;
         dVar7 = 0.0f;
         dVar6 = 7.0f;
@@ -8008,9 +7970,7 @@ BOOL daPy_lk_c::procLargeDamageUp() {
         } else {
             dComIfGp_evmng_cutEnd(mStaffIdx);
         }
-        if ((m34D0 == 0) ||
-            ((mProcVar0.m3570 == -4 && (g_mDoCPd_cpadInfo[0].mMainStickValue > 0.05f))))
-        {
+        if (m34D0 == 0 || (mProcVar0.m3570 == -4 && g_mDoCPd_cpadInfo[0].mMainStickValue > 0.05f)) {
             mFrameCtrlUnder[UNDER_MOVE0_e].setRate(0.5f);
         }
     } else if (mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.01f) {
@@ -8230,7 +8190,7 @@ BOOL daPy_lk_c::procElecDamage() {
     } else {
         dComIfGp_event_reset();
         endDemoMode();
-        if ((mAcch.ChkGroundHit()) && m34D6 == 0) {
+        if (mAcch.ChkGroundHit() && m34D6 == 0) {
             checkNextMode(0);
         } else {
             if (m34D6 != 0) {
@@ -8259,9 +8219,9 @@ BOOL daPy_lk_c::procGuardSlip_init() {
         dVar5 = ANM_ATNGAR;
     }
     dCcD_GObjInf* iVar4 = mCyl.GetTgHitGObj();
-    if ((iVar4 != NULL) &&
-        (((iVar4->GetAtSpl() == dCcG_At_Spl_UNK5 || (iVar4->GetAtSpl() == dCcG_At_Spl_UNK6)) ||
-          (iVar4->GetAtSpl() == dCcG_At_Spl_UNK7))))
+    if (iVar4 != NULL && (iVar4->GetAtSpl() == dCcG_At_Spl_UNK5 ||
+                          iVar4->GetAtSpl() == dCcG_At_Spl_UNK6 ||
+                          iVar4->GetAtSpl() == dCcG_At_Spl_UNK7))
     {
         setSingleMoveAnime(dVar5, daPy_HIO_nockback_c0::m.field_0x8,
                            daPy_HIO_nockback_c0::m.field_0xC, daPy_HIO_nockback_c0::m.field_0x0,
@@ -8365,7 +8325,7 @@ BOOL daPy_lk_c::procIceSlipFall() {
         psVar1 = &m34F4;
     }
     cLib_chaseAngleS(psVar1, m34D4, daPy_HIO_iceSlip_c0::m.field_0x2);
-    if ((mAcch.ChkGroundHit()) && !changeSlideProc()) {
+    if (mAcch.ChkGroundHit() && !changeSlideProc()) {
         procIceSlipFallUp_init(mProcVar0.m3570, m34F2, m34F4);
     }
     return true;
@@ -8512,7 +8472,7 @@ BOOL daPy_lk_c::procBootsEquip() {
                 checkNextMode(1);
             }
         } else {
-            if ((frameCtrl.checkPass(15.0f)) && checkEquipHeavyBoots()) {
+            if (frameCtrl.checkPass(15.0f) && checkEquipHeavyBoots()) {
                 dComIfGp_getVibration().StartShock(5, -0x31, cXyz(0.0f, 1.0f, 0.0f));
             }
         }
@@ -8602,7 +8562,7 @@ BOOL daPy_lk_c::procNotUse() {
 /* 80119DA0-80119EBC       .text getGroundAngle__9daPy_lk_cFP13cBgS_PolyInfos */
 s16 daPy_lk_c::getGroundAngle(cBgS_PolyInfo* param_1, s16 param_2) {
     cM3dGPla* plane = dComIfG_Bgsp()->GetTriPla(*param_1);
-    if ((plane == NULL) || (!cBgW_CheckBGround(plane->GetNP()->y))) {
+    if (plane == NULL || !cBgW_CheckBGround(plane->GetNP()->y)) {
         return 0;
     }
     f32 cos = cM_scos((cM_atan2s(plane->GetNP()->x, plane->GetNP()->z) - param_2));
@@ -8892,7 +8852,7 @@ void daPy_lk_c::autoGroundHit() {
     if (mTinkleHoverTimer == 0) {
         offNoResetFlg0(daPyFlg0_HOVER_BOOTS);
     }
-    if ((!dComIfGp_event_runCheck()) && (mDemo.getDemoType() == 0)) {
+    if (!dComIfGp_event_runCheck() && mDemo.getDemoType() == 0) {
         if (mTinkleHoverTimer > 0) {
             mTinkleHoverTimer--;
         }
@@ -8906,7 +8866,7 @@ void daPy_lk_c::autoGroundHit() {
         return;
     }
     if (fVar2 < 0.0f) {
-        if ((fVar2 >= -30.1f) && (uVar4 == 0)) {
+        if (fVar2 >= -30.1f && uVar4 == 0) {
             current.pos.y = fVar1;
             mAcch.SetGroundHit();
             speed.y = 0.0f;
@@ -8919,7 +8879,7 @@ void daPy_lk_c::autoGroundHit() {
     if (!(mTinkleHoverTimer > 0)) {
         return;
     }
-    if ((dComIfGp_event_runCheck()) && (mDemo.getDemoType() != 5)) {
+    if (dComIfGp_event_runCheck() && mDemo.getDemoType() != 5) {
         return;
     }
     current.pos.y = old.pos.y;
@@ -8964,7 +8924,7 @@ void daPy_lk_c::setNeckAngle() {
     BOOL r28;
     r28 = false;
     mDoMtx_multVecSR(mpCLModel->getAnmMtx(0x1), &cXyz::BaseZ, &sp94);
-    
+
     fopAc_ac_c* r24;
     if (dComIfGp_checkPlayerStatus0(0, daPyStts0_UNK10_e)) {
         r24 = fopAcM_getTalkEventPartner(this);
@@ -8974,14 +8934,14 @@ void daPy_lk_c::setNeckAngle() {
     if (r24 == NULL) {
         r24 = dCam_getBody()->GetForceLockOnActor();
     }
-    
+
     fopAc_ac_c* r23_2;
     if (mpAttention->GetLockonList(0) != NULL) {
         r23_2 = mpAttention->GetLockonList(0)->getActor();
     } else {
         r23_2 = NULL;
     }
-    
+
     if (dComIfGp_checkPlayerStatus1(0, daPyStts1_WIND_WAKER_CONDUCT_e)) {
         mDoMtx_multVec(mpCLModel->getAnmMtx(0x8), &l_tact_top, &spA0);
         sp18 = &spA0;
@@ -8991,9 +8951,7 @@ void daPy_lk_c::setNeckAngle() {
             sp18 = &dComIfGp_getCb1Player()->eyePos;
             r28 = true;
         }
-    } else if ((dComIfGp_checkPlayerStatus0(0, daPyStts0_SHIP_RIDE_e)) &&
-               (!checkShipNotNormalMode()))
-    {
+    } else if (dComIfGp_checkPlayerStatus0(0, daPyStts0_SHIP_RIDE_e) && !checkShipNotNormalMode()) {
         if (dComIfGp_checkPlayerStatus0(0, daPyStts0_UNK10_e) && fopAcM_getTalkEventPartner(this) != NULL &&
             dComIfGp_getShipActor() != NULL && fopAcM_getTalkEventPartner(this) == dComIfGp_getShipActor() &&
             cLib_distanceAngleS(cLib_targetAngleY(&current.pos, &dComIfGp_getShipActor()->eyePos), m34DE) <= 0x6000)
@@ -9001,64 +8959,59 @@ void daPy_lk_c::setNeckAngle() {
             sp18 = &dComIfGp_getShipActor()->eyePos;
             r28 = true;
         } else {
-            spA0.set(r25[0][3] + 20000.0f * cM_ssin(m34DE), r25[1][3],
-                         r25[2][3] + 20000.0f * cM_scos(m34DE));
+            spA0.set(r25[0][3] + 20000.0f * cM_ssin(m34DE), r25[1][3], r25[2][3] + 20000.0f * cM_scos(m34DE));
             sp18 = &spA0;
         }
     } else if (mCurProc == daPyProc_SHIP_CRANE_e) {
-        if ((m34D4 == 0) && (dComIfGp_getShipActor() != NULL)) {
+        if (m34D4 == 0 && dComIfGp_getShipActor() != NULL) {
             sp18 = dComIfGp_getShipActor()->m0434;
             r28 = true;
         }
     } else if (m_tex_anm_heap.mIdx == LKANM_BTP_TDASHKAZE) {
-        if (checkHeavyStateOn() && (m373C.abs2XZ() > 25.0f)) {
-            spA0.set(current.pos.x - 100.0f * m373C.x, 120.0f + current.pos.y,
-                         current.pos.z - 100.0f * m373C.z);
-        } else if (!checkHeavyStateOn() && (m3730.abs2XZ() > 25.0f)) {
-            spA0.set(current.pos.x - 100.0f * m3730.x, 120.0f + current.pos.y,
-                         current.pos.z - 100.0f * m3730.z);
+        if (checkHeavyStateOn() && m373C.abs2XZ() > 25.0f) {
+            spA0.set(current.pos.x - 100.0f * m373C.x, 120.0f + current.pos.y, current.pos.z - 100.0f * m373C.z);
+        } else if (!checkHeavyStateOn() && m3730.abs2XZ() > 25.0f) {
+            spA0.set(current.pos.x - 100.0f * m3730.x, 120.0f + current.pos.y, current.pos.z - 100.0f * m3730.z);
         } else {
-            spA0.set(current.pos.x - (100.0f * m3644) * cM_ssin(m3640), 120.0f + current.pos.y,
-                         current.pos.z - (100.0f * m3644) * cM_scos(m3640));
+            spA0.set(
+                current.pos.x - (100.0f * m3644) * cM_ssin(m3640),
+                120.0f + current.pos.y,
+                current.pos.z - (100.0f * m3644) * cM_scos(m3640)
+            );
         }
         sp18 = &spA0;
         r28 = true;
-    } else if ((r24 != NULL) &&
-               (cLib_distanceAngleS(cLib_targetAngleY(&current.pos, &r24->eyePos), m34DE) <=
-                0x6000))
-    {
+    } else if (r24 != NULL && cLib_distanceAngleS(cLib_targetAngleY(&current.pos, &r24->eyePos), m34DE) <= 0x6000) {
         sp18 = &(r24->eyePos);
         r28 = true;
     } else if (checkModeFlg(ModeFlg_00000080 | ModeFlg_08000000)) {
-        if ((!dComIfGp_event_runCheck()) || (mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK39_e)) {
+        if (!dComIfGp_event_runCheck() || mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK39_e) {
             if (dComIfGp_att_getLookTarget() != NULL) {
                 sp18 = &dComIfGp_att_getLookTarget()->eyePos;
                 r28 = true;
+            } else if (
+                checkAttentionPosAngle(r23_2, &sp18) ||
+                checkAttentionPosAngle(mpAttnActorAction, &sp18) ||
+                checkAttentionPosAngle(mpAttnActorX, &sp18) ||
+                checkAttentionPosAngle(mpAttnActorY, &sp18) ||
+                checkAttentionPosAngle(mpAttnActorZ, &sp18)
+            ) {
+                r28 = true;
             } else {
-                if ((((checkAttentionPosAngle(r23_2, &sp18)) ||
-                      (checkAttentionPosAngle(mpAttnActorAction, &sp18))) ||
-                     (checkAttentionPosAngle(mpAttnActorX, &sp18))) ||
-                    ((checkAttentionPosAngle(mpAttnActorY, &sp18) ||
-                      (checkAttentionPosAngle(mpAttnActorZ, &sp18)))))
+                if (dComIfGp_getDetect().chk_attention(&spA0) &&
+                    cLib_distanceAngleS(cLib_targetAngleY(&current.pos, &spA0), m34DE) <= 0x6000)
                 {
+                    sp18 = &spA0;
                     r28 = true;
-                } else {
-                    if (dComIfGp_getDetect().chk_attention(&spA0) &&
-                        (cLib_distanceAngleS(cLib_targetAngleY(&current.pos, &spA0), m34DE) <=
-                         0x6000))
-                    {
+                } else if (m34C3 == 10) {
+                    spA0.set(
+                        current.pos.x - 10.0f * (m3730.x + m36B8.x),
+                        120.0f + current.pos.y,
+                        current.pos.z - 10.0f * (m3730.z + m36B8.z)
+                    );
+                    if (cLib_distanceAngleS(cLib_targetAngleY(&current.pos, &spA0), m34DE) <= 0x6000) {
                         sp18 = &spA0;
                         r28 = true;
-                    } else if (m34C3 == 10) {
-                        spA0.set(current.pos.x - 10.0f * (m3730.x + m36B8.x),
-                                     120.0f + current.pos.y,
-                                     current.pos.z - 10.0f * (m3730.z + m36B8.z));
-                        if (cLib_distanceAngleS(cLib_targetAngleY(&current.pos, &spA0),
-                                                m34DE) <= 0x6000)
-                        {
-                            sp18 = &spA0;
-                            r28 = true;
-                        }
                     }
                 }
             }
@@ -9070,12 +9023,13 @@ void daPy_lk_c::setNeckAngle() {
             }
         } else {
             u32 mode = mDemo.getDemoMode();
-            if (mCurProc == daPyProc_DEMO_LOOK_WAIT_e ||
+            if (
+                mCurProc == daPyProc_DEMO_LOOK_WAIT_e ||
                 mode == daPy_demo_c::DEMO_UNK04_e ||
                 mode == daPy_demo_c::DEMO_UNK01_e ||
                 mode == daPy_demo_c::DEMO_UNK02_e ||
-                mode == daPy_demo_c::DEMO_UNK03_e)
-            {
+                mode == daPy_demo_c::DEMO_UNK03_e
+            ) {
                 r24 = getDemoLookActor();
                 if (r24 != NULL) {
                     sp18 = &r24->eyePos;
@@ -9084,7 +9038,7 @@ void daPy_lk_c::setNeckAngle() {
             }
         }
     }
-    
+
     mDoMtx_multVec(r25, &l_head_center_offset, &spC4);
     mDoMtx_multVec(r25, &l_eye_offset, &sp88);
     spAC = sp88 - spC4;
@@ -9097,9 +9051,7 @@ void daPy_lk_c::setNeckAngle() {
     s16 r4;
     r24_2 = cM_atan2s(-spAC.y, spAC.absXZ()) - m3564;
     r25_2 = (cM_atan2s(spAC.x, spAC.z) - m34DE) - m3566;
-    if (((checkModeFlg(ModeFlg_00000080 | ModeFlg_08000000)) && (sp18 != NULL)) &&
-        (!checkUpperAnime(LKANM_BCK_DAMDASH)))
-    {
+    if (checkModeFlg(ModeFlg_00000080 | ModeFlg_08000000) && sp18 != NULL && !checkUpperAnime(LKANM_BCK_DAMDASH)) {
         spB8 = *sp18 - spC4;
         r27 = cM_atan2s(-spB8.y, spB8.absXZ());
         r23_3 = cM_atan2s(spB8.x, spB8.z) - m34DE;
@@ -9116,9 +9068,8 @@ void daPy_lk_c::setNeckAngle() {
         } else if (r23_3 < -daPy_HIO_ship_c0::m.field_0x0) {
             r23_3 = -daPy_HIO_ship_c0::m.field_0x0;
         }
-        if ((checkModeFlg(ModeFlg_00000080)) &&
-            (m_anm_heap_upper[UPPER_MOVE0_e].mIdx != LKANM_BCK_DASHKAZE) &&
-            (m_anm_heap_upper[UPPER_MOVE1_e].mIdx != LKANM_BCK_DASHKAZE))
+        if (checkModeFlg(ModeFlg_00000080) && m_anm_heap_upper[UPPER_MOVE0_e].mIdx != LKANM_BCK_DASHKAZE &&
+            m_anm_heap_upper[UPPER_MOVE1_e].mIdx != LKANM_BCK_DASHKAZE)
         {
             if (r28) {
                 r30 = (r27 >> 1) - r24_2;
@@ -9140,9 +9091,8 @@ void daPy_lk_c::setNeckAngle() {
     } else if (mCurProc == daPyProc_DAMAGE_e) {
         r4 = m3564;
         r23 = m3566;
-    } else if (((mCurProc == daPyProc_LADDER_MOVE_e) ||
-                (mCurProc == daPyProc_CLIMB_MOVE_UP_DOWN_e)) &&
-               (mDirection == DIR_FORWARD))
+    } else if ((mCurProc == daPyProc_LADDER_MOVE_e || mCurProc == daPyProc_CLIMB_MOVE_UP_DOWN_e) &&
+               mDirection == DIR_FORWARD)
     {
         r4 = -0x1800;
         r23 = 0;
@@ -9153,7 +9103,7 @@ void daPy_lk_c::setNeckAngle() {
             r4 = 0;
         }
         r23 = 0x1800 * cM_ssin(m34D4);
-    } else if ((m34C3 == 1) && (m3580 != 8)) {
+    } else if (m34C3 == 1 && m3580 != 8) {
         r28 = false;
         r4 = m34E2 >> 1;
         if (r4 > 8000) {
@@ -9171,7 +9121,7 @@ void daPy_lk_c::setNeckAngle() {
         r23 = 0;
         r29 = 0;
     }
-    
+
     cLib_addCalcAngleS(&m3564, r4, 3, 0x1000, 0x100);
     cLib_addCalcAngleS(&m3566, r23, 3, 0x1000, 0x100);
     if (checkModeFlg(ModeFlg_00000080)) {
@@ -9211,9 +9161,8 @@ void daPy_lk_c::setNeckAngle() {
         } else if (mCurProc == daPyProc_CLIMB_MOVE_SIDE_e) {
             f0 = -cM_scos(m34D4);
             f1 = cM_ssin(m34D4);
-        } else if (((mCurProc == daPyProc_GRAB_HEAVY_WAIT_e) ||
-                    (mCurProc == daPyProc_GRAB_WAIT_e)) ||
-                   (mCurProc == daPyProc_WAIT_e))
+        } else if (mCurProc == daPyProc_GRAB_HEAVY_WAIT_e || mCurProc == daPyProc_GRAB_WAIT_e ||
+                   mCurProc == daPyProc_WAIT_e)
         {
             f0 = 0.0f;
             f1 = m35A0;
@@ -9251,9 +9200,7 @@ void daPy_lk_c::setNeckAngle() {
         } else if (f1 < -1.0f) {
             f1 = -1.0f;
         }
-        if (((!checkNoResetFlg1(daPyFlg1_CONFUSE)) && (!checkNoResetFlg1(daPyFlg1_UNK1000000))) &&
-            (m351C != 0))
-        {
+        if (!checkNoResetFlg1(daPyFlg1_CONFUSE) && !checkNoResetFlg1(daPyFlg1_UNK1000000) && m351C != 0) {
             if (m351C > 0) {
                 f31 = -0.16f * f1;
                 f30 = 0.12f * f1;
@@ -9285,13 +9232,13 @@ void daPy_lk_c::setNeckAngle() {
 
 /* 8011BE08-8011BEA4       .text checkOriginalHatAnimation__9daPy_lk_cFv */
 void daPy_lk_c::checkOriginalHatAnimation() {
-    if ((((checkModeFlg(ModeFlg_WHIDE | ModeFlg_SWIM | ModeFlg_CRAWL)) ||
-          (mCurProc == daPyProc_VOMIT_WAIT_e)) ||
-         (mCurProc == daPyProc_ELEC_DAMAGE_e)) ||
-        ((mCurProc == daPyProc_DEMO_DOOR_OPEN_e ||
-          ((!strcmp(dComIfGp_getStartStageName(), "GTower") &&
-            (dComIfGp_getStartStageLayer() == 9))))))
-    {
+    if (
+        checkModeFlg(ModeFlg_WHIDE | ModeFlg_SWIM | ModeFlg_CRAWL) ||
+        mCurProc == daPyProc_VOMIT_WAIT_e ||
+        mCurProc == daPyProc_ELEC_DAMAGE_e ||
+        mCurProc == daPyProc_DEMO_DOOR_OPEN_e ||
+        (!strcmp(dComIfGp_getStartStageName(), "GTower") && dComIfGp_getStartStageLayer() == 9)
+    ) {
         onResetFlg0(daPyRFlg0_UNK800000);
     }
 }
@@ -9382,7 +9329,7 @@ void daPy_lk_c::setHatAngle() {
     sp94.x = m3718.x - spA0.x;
     sp94.y = (m3718.y - spA0.y) - 7.5f;
     sp94.z = m3718.z - spA0.z;
-    if (!(checkModeFlg(ModeFlg_WHIDE)) || (checkGrabWear())) {
+    if (!checkModeFlg(ModeFlg_WHIDE) || checkGrabWear()) {
         sp94 += spAC * f29;
     }
     if (std::abs(sp94.x) < 0.01f) {
@@ -9399,9 +9346,9 @@ void daPy_lk_c::setHatAngle() {
     r4_3 = cM_atan2s(-f28, -sp94.y);
     if (m34F6 < 0) {
         r4_3 = 0x7800;
-    } else if ((r4_3 < 0x800) && (-0x7800 < r4_3)) {
+    } else if (r4_3 < 0x800 && -0x7800 < r4_3) {
         r4_3 = 0x800;
-    } else if ((0x7800 < r4_3) || (r4_3 <= -0x7800)) {
+    } else if (0x7800 < r4_3 || r4_3 <= -0x7800) {
         r4_3 = 0x7800;
     }
     cLib_addCalcAngleS2(&m34F6, r4_3, 5, 0x400);
@@ -9482,7 +9429,7 @@ void daPy_lk_c::setHatAngle() {
     }
     f32 f29_2;
     f29_2 = f28_2;
-    if (r31 && (!checkNoResetFlg1(daPyFlg1_CASUAL_CLOTHES))) {
+    if (r31 && !checkNoResetFlg1(daPyFlg1_CASUAL_CLOTHES)) {
         f28_2 = 3.5f;
         f29_2 = 1.0f;
         mDoAud_seStart(JA_SE_LK_HAT_SWING, &eyePos, 0, mReverb);
@@ -9660,7 +9607,7 @@ void daPy_lk_c::checkLightHit() {
         mDoMtx_multVecSR(mpEquippedShieldModel->getBaseTRMtx(), &l_ms_light_local_vec, &lightVec);
         if (lightHit) {
             onResetFlg0(daPyRFlg0_UNK200000);
-        } else if ((mLightCyl.ChkTgHit()) && (mLightCyl.GetTgRVecP()->inprod(lightVec) < 0.0f)) {
+        } else if (mLightCyl.ChkTgHit() && mLightCyl.GetTgRVecP()->inprod(lightVec) < 0.0f) {
             onResetFlg0(daPyRFlg0_UNK200000);
         }
         if (mFanLightCps.ChkAtHit()) {
@@ -9673,7 +9620,7 @@ void daPy_lk_c::checkLightHit() {
             s16 angleY = cM_atan2s(lightVec.x, lightVec.z);
             m3438.setAngle(cM_atan2s(-lightVec.y, lightVec.absXZ()), angleY, 0);
             if (m3438.getEmitter() != NULL) {
-                if ((mFanLightCps.GetAtHitAc() != 0) &&
+                if (mFanLightCps.GetAtHitAc() != 0 &&
                     (fopAcM_GetName(mFanLightCps.GetAtHitAc()) == PROC_BPW))
                 {
                     m3438.getEmitter()->setGlobalScale(boss_scale);
@@ -9695,8 +9642,8 @@ void daPy_lk_c::checkLightHit() {
         }
         resetCurse();
     }
-    if ((!dComIfGp_checkPlayerStatus0(0, daPyStts0_UNK2000_e)) &&
-        (checkResetFlg0(daPyRFlg0_UNK200000)))
+    if (!dComIfGp_checkPlayerStatus0(0, daPyStts0_UNK2000_e) &&
+        checkResetFlg0(daPyRFlg0_UNK200000))
     {
         if (m342C.getEmitter() == NULL) {
             m342C.makeEmitter(dPa_name::ID_SCENE_8226, mpEquippedShieldModel->getBaseTRMtx(),
@@ -9800,7 +9747,7 @@ void daPy_lk_c::setCollision() {
     } else if (mCurProc == daPyProc_BACK_JUMP_e) {
         spD0.y = 30.0f + current.pos.y;
         mCyl.SetH(81.25f);
-    } else if ((mCurProc == daPyProc_BT_JUMP_CUT_e) || (mCurProc == daPyProc_BT_JUMP_e && (speed.y <= 0.0f))) {
+    } else if (mCurProc == daPyProc_BT_JUMP_CUT_e || (mCurProc == daPyProc_BT_JUMP_e && speed.y <= 0.0f)) {
         spD0.y = link_root_mtx[1][3];
         mCyl.SetH(125.0f - (spD0.y - current.pos.y));
         mCyl.SetR(22.5f);
@@ -9813,8 +9760,7 @@ void daPy_lk_c::setCollision() {
         mCyl.SetH(40.1f + (mpCLModel->getAnmMtx(0xE)[1][3] - spD0.y));
     }
     mCyl.SetC(spD0);
-    if (checkModeFlg(ModeFlg_DAMAGE) ||
-        (((checkGuardSlip()) || (mCurProc == daPyProc_VOMIT_WAIT_e)) || (mDamageWaitTimer != 0)))
+    if (checkModeFlg(ModeFlg_DAMAGE) || checkGuardSlip() || mCurProc == daPyProc_VOMIT_WAIT_e || mDamageWaitTimer != 0)
     {
         mCyl.OffTgSetBit();
         mCyl.ClrTgHit();
@@ -9837,7 +9783,7 @@ void daPy_lk_c::setCollision() {
     if (checkResetFlg0(daPyRFlg0_UNK2)) {
         if (checkResetFlg0(daPyRFlg0_UNK1)) {
             setCutWaterSplash();
-            if ((mCurProc == daPyProc_CUT_TURN_e) || (mCurProc == daPyProc_CUT_ROLL_e)) {
+            if (mCurProc == daPyProc_CUT_TURN_e || mCurProc == daPyProc_CUT_ROLL_e) {
                 mAtCyl.StartCAt(current.pos);
             } else {
                 setSwordAtCollision();
@@ -9852,8 +9798,8 @@ void daPy_lk_c::setCollision() {
                     mpCutfBrk->setFrame(0.0f);
                 }
             }
-            if (((mCurProc != daPyProc_CUT_F_e) && (mCurProc != daPyProc_BT_VERTICAL_JUMP_CUT_e)) &&
-                (mCurProc != daPyProc_FAN_SWING_e))
+            if (mCurProc != daPyProc_CUT_F_e && mCurProc != daPyProc_BT_VERTICAL_JUMP_CUT_e &&
+                mCurProc != daPyProc_FAN_SWING_e)
             {
                 int iVar12;
                 if ((mCurProc == daPyProc_HAMMER_FRONT_SWING_e) || (mCurProc == daPyProc_WEAPON_FRONT_SWING_e)) {
@@ -9862,7 +9808,7 @@ void daPy_lk_c::setCollision() {
                     iVar12 = 10.0f * mFrameCtrlUnder[UNDER_MOVE0_e].getFrame();
                 }
                 mSwBlur.initSwBlur(mpCLModel->getBaseTRMtx(), iVar12, getBlurTopRate(), getSwordBlurColor());
-                if ((mCurProc == daPyProc_CUT_TURN_e) || (mCurProc == daPyProc_CUT_ROLL_e)) {
+                if (mCurProc == daPyProc_CUT_TURN_e || mCurProc == daPyProc_CUT_ROLL_e) {
                     static const GXColor n_roll_prm0 = {0xC8, 0xFF, 0x40, 0xFF};
                     static const GXColor n_roll_prm1 = {0xFF, 0xFF, 0xDC, 0xFF};
                     static const GXColor n_roll_env = {0xC8, 0xFF, 0x78, 0xFF};
@@ -9909,7 +9855,7 @@ void daPy_lk_c::setCollision() {
                         prm0 = &nm_turn_prm0;
                         prm1 = &nm_turn_prm1;
                         env = &nm_turn_env;
-                    } else if ((mCurProc == daPyProc_CUT_ROLL_e) || (checkNoResetFlg1(daPyFlg1_UNK8000))) {
+                    } else if (mCurProc == daPyProc_CUT_ROLL_e || checkNoResetFlg1(daPyFlg1_UNK8000)) {
                         if (checkNormalSwordEquip()) {
                             if (mCurProc == daPyProc_CUT_ROLL_e) {
                                 dVar27 = daPy_HIO_cutRoll_c0::m.field_0x18;
@@ -10031,8 +9977,8 @@ void daPy_lk_c::setCollision() {
         } else {
             int r26 = mSwBlur.field_0x018;
             int r23 = (int)(10.0f * mFrameCtrlUnder[UNDER_MOVE0_e].getFrame());
-            if (((mCurProc != daPyProc_CUT_F_e) && (mCurProc != daPyProc_BT_VERTICAL_JUMP_CUT_e)) &&
-                (mCurProc != daPyProc_FAN_SWING_e))
+            if (mCurProc != daPyProc_CUT_F_e && mCurProc != daPyProc_BT_VERTICAL_JUMP_CUT_e &&
+                mCurProc != daPyProc_FAN_SWING_e)
             {
                 if (mCurProc == daPyProc_JUMP_CUT_LAND_e) {
                     r23 = 0x95;
@@ -10058,8 +10004,8 @@ void daPy_lk_c::setCollision() {
             }
         }
 
-        if ((mCurProc == daPyProc_CUT_TURN_e) || (mCurProc == daPyProc_CUT_ROLL_e)) {
-            mDoAud_zelAudio_c::getInterface()->bgmNowKaitengiri();
+        if (mCurProc == daPyProc_CUT_TURN_e || mCurProc == daPyProc_CUT_ROLL_e) {
+            mDoAud_bgmNowKaitengiri();
             mAtCyl.OnAtSetBit();
             mAtCps[0].OffAtSetBit();
             mAtCps[1].OffAtSetBit();
@@ -10089,7 +10035,7 @@ void daPy_lk_c::setCollision() {
         } else {
             mSwBlur.field_0x014 += -10;
         }
-        if ((mCurProc == daPyProc_BOTTLE_OPEN_e) && (m34D6 != 0)) {
+        if (mCurProc == daPyProc_BOTTLE_OPEN_e && m34D6 != 0) {
             mAtCps[0].OnAtSetBit();
             dComIfG_Ccsp()->Set(&mAtCps[0]);
             if (m34D4 != 0) {
@@ -10276,9 +10222,9 @@ void daPy_lk_c::setAttentionPos() {
         attention_info.position.y = 92.5f + mCyl.GetCP()->y;
     } else if (checkModeFlg(ModeFlg_SWIM)) {
         attention_info.position.y = 20.05f + current.pos.y;
-    } else if ((checkModeFlg(ModeFlg_WHIDE)) && (checkNoResetFlg0(daPyFlg0_UNK10000))) {
+    } else if (checkModeFlg(ModeFlg_WHIDE) && checkNoResetFlg0(daPyFlg0_UNK10000)) {
         attention_info.position.y = (92.5f + mpCLModel->getBaseTRMtx()[1][3]) - 30.0f;
-    } else if ((checkModeFlg(ModeFlg_IN_SHIP)) && (ship != NULL && (!ship->getFlyFlg()))) {
+    } else if (checkModeFlg(ModeFlg_IN_SHIP) && ship != NULL && !ship->getFlyFlg()) {
         // !@bug(?): l_ship_offset is probably supposed to be x, not z.
         attention_info.position.x = ship->current.pos.x + cM_ssin(ship->shape_angle.y) * l_ship_offset.z;
         if (checkNoResetFlg0(daPyFlg0_UNK80)) {
@@ -10333,7 +10279,7 @@ void daPy_lk_c::setDemoData() {
         return;
     }
     dComIfGp_clearPlayerStatus0(0, daPyStts0_BOOMERANG_WAIT_e);
-    if ((dComIfGp_event_chkEventFlag(0x20)) == 0) {
+    if (dComIfGp_event_chkEventFlag(0x20) == 0) {
         if (mCurProc == daPyProc_SCOPE_e) {
             procWait_init();
         } else if (mCurProc == daPyProc_SHIP_SCOPE_e) {
@@ -10343,7 +10289,7 @@ void daPy_lk_c::setDemoData() {
     if (mCurProc == daPyProc_SUBJECTIVITY_e) {
         procWait_init();
     }
-    if ((mDemo.getDemoType() == 4) && (!dComIfGp_evmng_checkStartDemo())) {
+    if (mDemo.getDemoType() == 4 && !dComIfGp_evmng_checkStartDemo()) {
         mDemo.setDemoType(2);
     }
     if (demo_actor_p != NULL) {
@@ -10373,8 +10319,8 @@ void daPy_lk_c::setDemoData() {
         if (demo_actor_p->checkEnable(dDemo_actor_c::ENABLE_SHAPE_e)) {
             if (dComIfGs_getClearCount() == 0) {
                 u32 shape = demo_actor_p->getShapeId();
-                if ((checkNoResetFlg1(daPyFlg1_CASUAL_CLOTHES) && (shape == 0)) ||
-                    (!checkNoResetFlg1(daPyFlg1_CASUAL_CLOTHES) && (shape == 1)))
+                if ((checkNoResetFlg1(daPyFlg1_CASUAL_CLOTHES) && shape == 0) ||
+                    (!checkNoResetFlg1(daPyFlg1_CASUAL_CLOTHES) && shape == 1))
                 {
                     ResTIMG casualLinktex = *mpCurrLinktex;
                     *mpCurrLinktex = mOtherLinktex;
@@ -10388,7 +10334,7 @@ void daPy_lk_c::setDemoData() {
             }
         }
     } else {
-        if ((mDemo.getDemoType() == 0) && (dComIfGp_event_runCheck())) {
+        if (mDemo.getDemoType() == 0 && dComIfGp_event_runCheck()) {
             mDemo.setDemoType(2);
         }
         if (mStaffIdx != -1) {
@@ -10397,10 +10343,14 @@ void daPy_lk_c::setDemoData() {
                 // Take the first 3 chars in cut_name, convert them to integers, and calculate
                 // demo_mode
                 demo_mode = ((cut_name[0] - '0') * 100 + (cut_name[1] - '0') * 10 + (cut_name[2] - '0'));
-                if ((mDemo.getDemoType() != 4) &&
-                    ((demo_mode == daPy_demo_c::DEMO_UNK01_e || (demo_mode == daPy_demo_c::DEMO_UNK2A_e)) ||
-                     (demo_mode == daPy_demo_c::DEMO_UNK17_e)))
-                {
+                if (
+                    mDemo.getDemoType() != 4 &&
+                    (
+                        demo_mode == daPy_demo_c::DEMO_UNK01_e ||
+                        demo_mode == daPy_demo_c::DEMO_UNK2A_e ||
+                        demo_mode == daPy_demo_c::DEMO_UNK17_e
+                    )
+                ) {
                     if (mAcch.ChkGroundHit() && !daPy_lk_c::checkPlayerFly()) {
                         mVelocity = 0.0f;
                         speedF = 0.0f;
@@ -10439,7 +10389,7 @@ void daPy_lk_c::setDemoData() {
             }
         }
     }
-    if ((demo_mode == daPy_demo_c::DEMO_UNK27_e) && (dComIfGp_getShipActor() == NULL)) {
+    if ((demo_mode == daPy_demo_c::DEMO_UNK27_e) && dComIfGp_getShipActor() == NULL) {
         demo_mode = daPy_demo_c::DEMO_UNK01_e;
     }
     if (mDemo.getDemoType() == 4) {
@@ -10457,7 +10407,7 @@ void daPy_lk_c::setDemoData() {
         }
         return;
     }
-    if ((mDemo.getDemoType() == 1) || (mDemo.getDemoType() == 2 && (mStaffIdx != -1))) {
+    if (mDemo.getDemoType() == 1 || (mDemo.getDemoType() == 2 && mStaffIdx != -1)) {
         if (prm0_p != NULL) {
             mDemo.setParam0(*prm0_p);
         } else {
@@ -10476,7 +10426,7 @@ void daPy_lk_c::setDemoData() {
             mDemo.setMoveAngle(angle);
             if (demo_mode == daPy_demo_c::DEMO_UNK04_e && mDemo.getParam0() != 0) {
                 deleteEquipItem(FALSE);
-                if ((mDemo.getParam0() == 1) && (checkSwordEquip())) {
+                if (mDemo.getParam0() == 1 && checkSwordEquip()) {
 #if VERSION == VERSION_DEMO
                     setSwordModel();
 #else
@@ -10509,10 +10459,10 @@ void daPy_lk_c::setDemoData() {
                 demo_mode = daPy_demo_c::DEMO_UNK02_e;
             }
             f32 dVar22 = sp44.abs2XZ();
-            if ((dVar22 < 100.0f) || ((dVar22 < 2500.0f) && (std::abs(mVelocity) < 0.001f))) {
+            if (dVar22 < 100.0f || (dVar22 < 2500.0f && std::abs(mVelocity) < 0.001f)) {
                 demo_mode = daPy_demo_c::DEMO_UNK01_e;
                 mVelocity = 0.0f;
-            } else if (((demo_mode == daPy_demo_c::DEMO_UNK02_e) && (dVar22 < 400.0f)) || (dVar22 < 2500.0f)) {
+            } else if ((demo_mode == daPy_demo_c::DEMO_UNK02_e && dVar22 < 400.0f) || dVar22 < 2500.0f) {
                 mDemo.setStick(0.0f);
             }
             mDemo.setMoveAngle(cM_atan2s(sp44.x, sp44.z));
@@ -10523,7 +10473,7 @@ void daPy_lk_c::setDemoData() {
     } else if (mDemo.getDemoType() != 3) {
         mDemo.setDemoMode(demo_mode);
     }
-    if (((checkModeFlg(ModeFlg_00080000)) || (mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK06_e)) ||
+    if ((checkModeFlg(ModeFlg_00080000) || (mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK06_e)) ||
         (mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK08_e))
     {
         dComIfGp_setPlayerStatus0(0, daPyStts0_UNK10_e);
@@ -10543,9 +10493,6 @@ void daPy_lk_c::setDemoData() {
 
 /* 8011F9C0-8011FF50       .text setStickData__9daPy_lk_cFv */
 void daPy_lk_c::setStickData() {
-    bool bVar1;
-    u8 bVar2;
-
     m34CA = mItemButton;
     mItemTrigger = 0;
     mItemButton = 0;
@@ -10560,10 +10507,11 @@ void daPy_lk_c::setStickData() {
             if (CPad_CHECK_HOLD_A(0)) {
                 mItemButton |= BTN_A;
             }
-        } else if ((((dComIfGp_event_runCheck() != 0) || (mDemo.getDemoType() != 0)) &&
-                    (!dComIfGp_checkPlayerStatus1(0, daPyStts1_WIND_WAKER_CONDUCT_e))) &&
-                   ((mCurProc != daPyProc_NOT_USE_e && (mCurProc != daPyProc_BOTTLE_GET_e))))
-        {
+        } else if (
+            (dComIfGp_event_runCheck() != 0 || mDemo.getDemoType() != 0) &&
+            !dComIfGp_checkPlayerStatus1(0, daPyStts1_WIND_WAKER_CONDUCT_e) &&
+            mCurProc != daPyProc_NOT_USE_e && mCurProc != daPyProc_BOTTLE_GET_e
+        ) {
             if ((mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK02_e) ||
                 (mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK03_e))
             {
@@ -10584,14 +10532,14 @@ void daPy_lk_c::setStickData() {
             m34E8 = 0;
         } else {
             mStickDistance = g_mDoCPd_cpadInfo[0].mMainStickValue;
-            if ((checkNoResetFlg1(daPyFlg1_CONFUSE)) && (dComIfGp_event_runCheck() == 0)) {
+            if (checkNoResetFlg1(daPyFlg1_CONFUSE) && dComIfGp_event_runCheck() == 0) {
                 m34DC = g_mDoCPd_cpadInfo[0].mMainStickAngle;
             } else {
                 m34DC = g_mDoCPd_cpadInfo[0].mMainStickAngle + 0x8000;
             }
             m34E8 = m34DC + dCam_getControledAngleY(dComIfGp_getCamera(mCameraInfoIdx));
-            bVar2 = dComIfGp_getButtonActionMode();
-            bVar1 = false;
+            u8 bVar2 = dComIfGp_getButtonActionMode();
+            bool bVar1 = false;
             if (CPad_CHECK_TRIG_B(0)) {
                 if ((dComIfGp_getButtonActionMode() & 2) != 0) {
                     mItemTrigger |= BTN_B;
@@ -10607,21 +10555,21 @@ void daPy_lk_c::setStickData() {
                 }
             }
             if (CPad_CHECK_TRIG_X(0)) {
-                if (((bVar2 & 4) != 0) && (mTinkleHoverTimer == 0)) {
+                if (((bVar2 & 4) != 0) && mTinkleHoverTimer == 0) {
                     mItemTrigger |= BTN_X;
                 } else {
                     bVar1 = true;
                 }
             }
             if (CPad_CHECK_TRIG_Y(0)) {
-                if (((bVar2 & 8) != 0) && (mTinkleHoverTimer == 0)) {
+                if (((bVar2 & 8) != 0) && mTinkleHoverTimer == 0) {
                     mItemTrigger |= BTN_Y;
                 } else {
                     bVar1 = true;
                 }
             }
             if (CPad_CHECK_TRIG_Z(0)) {
-                if (((bVar2 & 0x20) != 0) && (mTinkleHoverTimer == 0)) {
+                if (((bVar2 & 0x20) != 0) && mTinkleHoverTimer == 0) {
                     mItemTrigger |= BTN_Z;
                 } else {
                     bVar1 = true;
@@ -10633,20 +10581,20 @@ void daPy_lk_c::setStickData() {
             if (mDoCPd_R_LOCK_TRIGGER(0)) {
                 mItemTrigger |= BTN_R;
             }
-            if ((CPad_CHECK_HOLD_A(0)) && ((bVar2 & 1) != 0)) {
+            if (CPad_CHECK_HOLD_A(0) && ((bVar2 & 1) != 0)) {
                 mItemButton |= BTN_A;
             }
-            if ((CPad_CHECK_HOLD_B(0)) && ((bVar2 & 2) != 0)) {
+            if (CPad_CHECK_HOLD_B(0) && ((bVar2 & 2) != 0)) {
                 mItemButton |= BTN_B;
             }
             if (mTinkleHoverTimer == 0) {
-                if ((CPad_CHECK_HOLD_X(0)) && ((bVar2 & 4) != 0)) {
+                if (CPad_CHECK_HOLD_X(0) && ((bVar2 & 4) != 0)) {
                     mItemButton |= BTN_X;
                 }
-                if ((CPad_CHECK_HOLD_Y(0)) && ((bVar2 & 8) != 0)) {
+                if (CPad_CHECK_HOLD_Y(0) && ((bVar2 & 8) != 0)) {
                     mItemButton |= BTN_Y;
                 }
-                if ((CPad_CHECK_HOLD_Z(0)) && ((bVar2 & 0x20) != 0)) {
+                if (CPad_CHECK_HOLD_Z(0) && ((bVar2 & 0x20) != 0)) {
                     mItemButton |= BTN_Z;
                 }
             }
@@ -10662,8 +10610,8 @@ void daPy_lk_c::setStickData() {
             if (checkGrabWear()) {
                 mStickDistance = mStickDistance * daPy_HIO_move_c0::m.field_0x74;
             }
-            if (bVar1 && (dComIfGp_event_runCheck() == 0)) {
-                mDoAud_seStart(JA_SE_ITEM_TARGET_OUT);
+            if (bVar1 && dComIfGp_event_runCheck() == 0) {
+                seStartSystem(JA_SE_ITEM_TARGET_OUT);
             }
         }
     }
@@ -10849,7 +10797,7 @@ void daPy_lk_c::checkFallCode() {
             }
             daPy_py_c::changePlayer((daPy_py_c*)this);
             if ((!strcmp(dComIfGp_getStartStageName(), "GanonM")) && current.roomNo == 1) {
-                mDoAud_seStart(JA_SE_LK_MAZE_WARP_IN);
+                seStartSystem(JA_SE_LK_MAZE_WARP_IN);
             }
             if (!eventInfo.checkCommandDoor()) {
                 mDemo.setDemoType(3);
@@ -10885,7 +10833,7 @@ BOOL daPy_lk_c::startRestartRoom(u32 mode, int eventInfoIdx, f32 param_3, int i_
 
         if (dComIfGp_getMiniGameType() == 1) {
             dComIfGp_setNextStage("sea", 1, 48);
-            mDoAud_seStart(JA_SE_FORCE_BACK);
+            seStartSystem(JA_SE_FORCE_BACK);
             daNpc_Sarace_c::ship_race_result = 3;
             mTinkleShieldTimer = 0;
             return TRUE;
@@ -10902,7 +10850,7 @@ BOOL daPy_lk_c::startRestartRoom(u32 mode, int eventInfoIdx, f32 param_3, int i_
             dComIfGp_setNextStage(dComIfGp_getStartStageName(), 0x80, current.roomNo, -1, 0.0f, mode);
             u32 roomParam = setParamData(-1, 0, eventInfoIdx, 0);
             dComIfGs_setRestartRoomParam(roomParam);
-            mDoAud_seStart(JA_SE_FORCE_BACK);
+            seStartSystem(JA_SE_FORCE_BACK);
             return TRUE;
         }
 
@@ -10952,7 +10900,7 @@ BOOL daPy_lk_c::startRestartRoom(u32 mode, int eventInfoIdx, f32 param_3, int i_
                     int roomNo = dComIfGs_getRestartRoomNo();
                     u32 roomParam = setParamData(roomNo, 0, eventInfoIdx, 0);
                     dStage_restartRoom(roomParam, mode);
-                    mDoAud_seStart(JA_SE_FORCE_BACK);
+                    seStartSystem(JA_SE_FORCE_BACK);
                 }
                 return TRUE;
             }
@@ -10965,7 +10913,7 @@ BOOL daPy_lk_c::startRestartRoom(u32 mode, int eventInfoIdx, f32 param_3, int i_
         if (mCurProc != daPyProc_DEMO_DEAD_e) {
             u32 roomParam = setParamData(-1, 0, eventInfoIdx, 0);
             dComIfGs_setRestartRoomParam(roomParam);
-            mDoAud_seStart(JA_SE_FORCE_BACK);
+            seStartSystem(JA_SE_FORCE_BACK);
         }
 
         return TRUE;
@@ -11059,7 +11007,7 @@ void daPy_lk_c::setStepsOffset() {
     local_2c.z = current.pos.z + speedF * cM_scos(current.angle.y);
     mGndChk.SetPos(&local_2c);
     dVar5 = dComIfG_Bgsp()->GroundCross(&mGndChk);
-    if ((checkNoResetFlg0(daPyFlg0_UNK80000000)) && (current.pos.y > dVar5)) {
+    if (checkNoResetFlg0(daPyFlg0_UNK80000000) && current.pos.y > dVar5) {
         dVar5 = current.pos.y;
     }
     fVar1 = (dVar5 - current.pos.y) - (-speedF * dVar6);
@@ -11083,13 +11031,11 @@ void daPy_lk_c::setBeltConveyerPower() {
     int local_58;
     cXyz cStack_3c;
 
-    if (((((!checkHeavyStateOn()) && (!dComIfGp_event_runCheck())) && (mDemo.getDemoType() == 0)) &&
-         (!checkNoResetFlg0((daPy_FLG0)(daPyFlg0_UNK20000000 | daPyFlg0_UNK80000000)))) &&
-        ((mAcch.ChkGroundHit() || (checkModeFlg(ModeFlg_SWIM)))))
+    if (!checkHeavyStateOn() && !dComIfGp_event_runCheck() && mDemo.getDemoType() == 0 &&
+        !checkNoResetFlg0((daPy_FLG0)(daPyFlg0_UNK20000000 | daPyFlg0_UNK80000000)) &&
+        (mAcch.ChkGroundHit() || checkModeFlg(ModeFlg_SWIM)))
     {
-        if ((dComIfG_Bgsp()->ChkPolySafe(mAcch.m_gnd)) &&
-            (dPath_GetPolyRoomPathVec(mAcch.m_gnd, &cStack_3c, &local_58)))
-        {
+        if (dComIfG_Bgsp()->ChkPolySafe(mAcch.m_gnd) && dPath_GetPolyRoomPathVec(mAcch.m_gnd, &cStack_3c, &local_58)) {
             cStack_3c.normalizeZP();
         } else {
             cStack_3c = cXyz::Zero;
@@ -11118,15 +11064,14 @@ void daPy_lk_c::setWindAtPower() {
 
     if (mWindCyl.ChkTgHit()) {
         dCcD_GObjInf* iVar4 = mWindCyl.GetTgHitGObj();
-        if ((iVar4 != NULL) && (iVar4->GetAtSpl() == dCcG_At_Spl_UNK1)) {
+        if (iVar4 != NULL && iVar4->GetAtSpl() == dCcG_At_Spl_UNK1) {
             m34BA = 1;
         } else {
             m34BA = 0;
         }
     }
-    if (((mWindCyl.ChkTgHit()) &&
-         (((mDamageWaitTimer == 0 || (m34BA == 0)) && (!dComIfGp_event_runCheck())))) &&
-        ((mDemo.getDemoType() == 0 && (mCurProc != daPyProc_FAN_GLIDE_e))))
+    if (mWindCyl.ChkTgHit() && (mDamageWaitTimer == 0 || m34BA == 0) && !dComIfGp_event_runCheck() &&
+        mDemo.getDemoType() == 0 && mCurProc != daPyProc_FAN_GLIDE_e)
     {
         local_58 = *mWindCyl.GetTgRVecP();
         dVar6 = local_58.absXZ();
@@ -11153,13 +11098,13 @@ void daPy_lk_c::setWindAtPower() {
         }
     }
     if (mCurProc != daPyProc_FAN_GLIDE_e) {
-        if ((dComIfGp_event_runCheck()) || (mDemo.getDemoType() != 0)) {
+        if (dComIfGp_event_runCheck() || mDemo.getDemoType() != 0) {
             m373C.x = 0.0f;
             m373C.z = 0.0f;
         } else {
             cLib_addCalcPosXZ(&m373C, local_58, 0.5f, fVar2, 0.5f);
         }
-        if (((checkHeavyStateOn()) || (dComIfGp_event_runCheck())) || (mDemo.getDemoType() != 0)) {
+        if (checkHeavyStateOn() || dComIfGp_event_runCheck() || mDemo.getDemoType() != 0) {
             m3730.x = 0.0f;
             m3730.z = 0.0f;
         } else {
@@ -12472,17 +12417,15 @@ cPhs_State daPy_lk_c::makeBgWait() {
         m352E--;
     }
     mAcch.CrrPos(*dComIfG_Bgsp());
-    if ((-G_CM3D_F_INF == mAcch.GetGroundH()) ||
-        (((m352E != 0 && (dComIfG_Bgsp()->ChkMoveBG(mAcch.m_gnd))) &&
-          (fopAcM_GetName(dComIfG_Bgsp()->GetActorPointer(mAcch.m_gnd)) ==
-           PROC_TBOX))))
+    if (-G_CM3D_F_INF == mAcch.GetGroundH() ||
+        (m352E != 0 && dComIfG_Bgsp()->ChkMoveBG(mAcch.m_gnd) &&
+         fopAcM_GetName(dComIfG_Bgsp()->GetActorPointer(mAcch.m_gnd)) == PROC_TBOX))
     {
         return cPhs_INIT_e;
     }
-    if (((fopAcM_GetParam(this) & 0x80) != 0) && (m352E != 0)) {
-        if (!(dComIfG_Bgsp()->ChkMoveBG(mAcch.m_gnd)) ||
-            (fopAcM_GetName(dComIfG_Bgsp()->GetActorPointer(mAcch.m_gnd)) !=
-             PROC_OBJ_IKADA))
+    if (((fopAcM_GetParam(this) & 0x80) != 0) && m352E != 0) {
+        if (!dComIfG_Bgsp()->ChkMoveBG(mAcch.m_gnd) ||
+            fopAcM_GetName(dComIfG_Bgsp()->GetActorPointer(mAcch.m_gnd)) != PROC_OBJ_IKADA)
         {
             return cPhs_INIT_e;
         }
@@ -12497,14 +12440,11 @@ cPhs_State daPy_lk_c::makeBgWait() {
     setRoomInfo();
     int startMode = getStartMode();
     u8 sceneMode = dComIfGs_getLastSceneMode();
-    if ((((startMode == 2) || (startMode == 9)) ||
-         ((sceneMode == 6 || ((startMode == 5 && (sceneMode == 1)))))) ||
-        ((sceneMode == 5 && (((!strcmp(dComIfGp_getStartStageName(), "Pjavdou") ||
-                               (!strcmp(dComIfGp_getStartStageName(), "ShipD"))) ||
-                              ((!strcmp(dComIfGp_getStartStageName(), "Siren") &&
-                                ((((fopAcM_GetRoomNo(this) == 0 && (current.pos.z > 1400.0f)) &&
-                                   (current.pos.x < 400.0f)) &&
-                                  (current.pos.x > -400.0f))))))))))
+    if (startMode == 2 || startMode == 9 || sceneMode == 6 || (startMode == 5 && sceneMode == 1) ||
+        (sceneMode == 5 &&
+         (!strcmp(dComIfGp_getStartStageName(), "Pjavdou") || !strcmp(dComIfGp_getStartStageName(), "ShipD") ||
+          (!strcmp(dComIfGp_getStartStageName(), "Siren") && fopAcM_GetRoomNo(this) == 0 && current.pos.z > 1400.0f &&
+           current.pos.x < 400.0f && current.pos.x > -400.0f))))
     {
         if (!dComIfGs_isEventBit(0xf80)) {
             if (changeSwimProc()) {
@@ -12540,7 +12480,7 @@ cPhs_State daPy_lk_c::makeBgWait() {
                 procTactPlayEnd_init(-2);
             } else if (sceneMode == 6) {
                 ship->setStartModeThrow();
-            } else if ((sceneMode == 4) || (sceneMode == 5)) {
+            } else if (sceneMode == 4 || sceneMode == 5) {
                 mDemo.setDemoType(4);
                 mDoAud_subBgmStop();
                 procShipRestart_init();
@@ -12556,7 +12496,7 @@ cPhs_State daPy_lk_c::makeBgWait() {
         mDemo.setDemoType(4);
         mDoAud_bgmStart(JA_BGM_I_MAJU_JAIL);
         procLargeDamage_init(-7, 0, 0, 0);
-    } else if ((sceneMode == 4) || (sceneMode == 5)) {
+    } else if (sceneMode == 4 || sceneMode == 5) {
         if (changeSwimProc()) {
             procSwimWait_init(0);
             m34C2 = 0;
@@ -12566,7 +12506,7 @@ cPhs_State daPy_lk_c::makeBgWait() {
             mDoAud_subBgmStop();
             procLargeDamageUp_init(sceneMode == 4 ? -1 : -2, 1, 0, 0);
         }
-    } else if ((startMode == 1) || (startMode == 5)) {
+    } else if (startMode == 1 || startMode == 5) {
         if (mEventIdx == 0xFF) {
             mVelocity = dComIfGs_getLastSceneSpeedF();
             mDemo.setDemoType(4);
@@ -12743,7 +12683,7 @@ int daPy_lk_c::setMoveAnime(f32 f27, f32 f28, f32 f25, daPy_ANM r27, daPy_ANM r2
     J3DFrameCtrl& frameCtrl0 = mFrameCtrlUnder[UNDER_MOVE0_e];
     J3DFrameCtrl& frameCtrl1 = mFrameCtrlUnder[UNDER_MOVE1_e];
     f32 f31;
-    if (((m34C3 == 0) || (m34C3 == 9)) || (m34C3 == 10)) {
+    if ((m34C3 == 0 || m34C3 == 9) || m34C3 == 10) {
         f31 = 0.0f;
     } else {
         f31 = r3->getFrame() / r3->getFrameMax();
@@ -12792,14 +12732,14 @@ int daPy_lk_c::setMoveAnime(f32 f27, f32 f28, f32 f25, daPy_ANM r27, daPy_ANM r2
     if (f29 >= 0.0f) {
         m_old_fdata->initOldFrameMorf(f29, 0, 0x2A);
     }
-    if ((mDirection == DIR_BACKWARD) ||
-        ((mCurProc == daPyProc_ROPE_SWING_e && (!checkModeFlg(ModeFlg_00000400)))))
+    if (mDirection == DIR_BACKWARD ||
+        (mCurProc == daPyProc_ROPE_SWING_e && !checkModeFlg(ModeFlg_00000400)))
     {
         setTextureAnime(mAnmDataTable[r28].mTexAnmIdx, 0);
     } else {
         setTextureAnime(mAnmDataTable[r27].mTexAnmIdx, 0);
     }
-    if ((r29 == 5) || (r29 == 2)) {
+    if (r29 == 5 || r29 == 2) {
         setSeAnime(&m_anm_heap_under[UNDER_MOVE0_e], &frameCtrl0);
     } else {
         setSeAnime(&m_anm_heap_under[UNDER_MOVE1_e], &frameCtrl1);
@@ -13027,7 +12967,7 @@ BOOL daPy_lk_c::setThrowDamage(cXyz* r4, s16 r5, f32 f30, f32 f31, int r6) {
 
 /* 80128B50-80128C10       .text setPlayerPosAndAngle__9daPy_lk_cFP4cXyzs */
 void daPy_lk_c::setPlayerPosAndAngle(cXyz* param_1, s16 param_2) {
-    if (!(dComIfGp_event_runCheck()) && (dComIfGp_getScopeType() != 1)) {
+    if (!(dComIfGp_event_runCheck()) && dComIfGp_getScopeType() != 1) {
         return;
     }
     if (param_1 != NULL) {
@@ -13096,17 +13036,19 @@ void daPy_lk_c::endDemoMode() {
     mDemo.setParam1(0);
     mDemo.setStick(1.0f);
     resetDemoTextureAnime();
-    if ((mEquipItem == daPyItem_UNK104_e) || (mEquipItem == daPyItem_UNK10A_e)) {
+    if (mEquipItem == daPyItem_UNK104_e || mEquipItem == daPyItem_UNK10A_e) {
         deleteEquipItem(FALSE);
         offNoResetFlg1(daPyFlg1_SHIP_TACT);
     }
     mDoAud_taktModeMuteOff();
-    if ((((mAcch.ChkGroundHit()) &&
-          (!checkModeFlg(ModeFlg_MIDAIR | ModeFlg_HANG | ModeFlg_ROPE | ModeFlg_IN_SHIP |
-                         ModeFlg_CLIMB | ModeFlg_SWIM | ModeFlg_LADDER | ModeFlg_04000000 |
-                         ModeFlg_CAUGHT))) &&
-         (mCurProc != daPyProc_LARGE_DAMAGE_UP_e)) &&
-        ((mCurProc != daPyProc_DEMO_DEAD_e && (mCurProc != daPyProc_DEMO_LAVA_DAMAGE_e))))
+    if (mAcch.ChkGroundHit() &&
+        !checkModeFlg(
+            ModeFlg_MIDAIR | ModeFlg_HANG | ModeFlg_ROPE | ModeFlg_IN_SHIP | ModeFlg_CLIMB | ModeFlg_SWIM |
+            ModeFlg_LADDER | ModeFlg_04000000 | ModeFlg_CAUGHT
+        ) &&
+        mCurProc != daPyProc_LARGE_DAMAGE_UP_e &&
+        mCurProc != daPyProc_DEMO_DEAD_e &&
+        mCurProc != daPyProc_DEMO_LAVA_DAMAGE_e)
     {
         if (dComIfGp_checkPlayerStatus0(0, daPyStts0_TELESCOPE_LOOK_e)) {
             procScope_init(0x20);
diff --git a/src/d/actor/d_a_player_rope.inc b/src/d/actor/d_a_player_rope.inc
index 67fdc2d98..118437a97 100644
--- a/src/d/actor/d_a_player_rope.inc
+++ b/src/d/actor/d_a_player_rope.inc
@@ -328,7 +328,7 @@ BOOL daPy_lk_c::checkNextActionRopeReady() {
             } else {
                 return true;
             }
-        } else if (!mpAttention->Lockon()) {
+        } else if (!checkAttentionLock()) {
             dComIfGp_setDoStatus(dActStts_RETURN_e);
         }
         if (((itemButton()) && (mEquipItem == getReadyItem())) && (m355C == 0)) {
@@ -363,7 +363,7 @@ BOOL daPy_lk_c::checkNextRopeMode() {
         m355E = 0;
         seStartOnlyReverb(JA_SE_LK_ITEM_TAKEOUT);
     }
-    if (mpAttention->Lockon()) {
+    if (checkAttentionLock()) {
         return procRopeMove_init();
     } else {
         return procRopeSubject_init();
@@ -404,7 +404,7 @@ BOOL daPy_lk_c::procRopeSubject_init() {
 
     current.angle.y = shape_angle.y;
 
-    mDoAud_seStart(JA_SE_CAMERA_L_MOVE);
+    seStartSystem(JA_SE_CAMERA_L_MOVE);
 
     mProcVar0.m3570 = 0;
     m3600 = -1.0f;
@@ -426,7 +426,7 @@ BOOL daPy_lk_c::procRopeSubject() {
         dComIfGp_setPlayerStatus0(0, daPyStts0_UNK40000_e);
     }
 
-    if (mpAttention->Lockon()) {
+    if (checkAttentionLock()) {
         setSpeedAndAngleAtn();
     }
 
@@ -446,11 +446,11 @@ BOOL daPy_lk_c::procRopeSubject() {
                 mSightPacket.incFrame();
 
                 if (mSightPacket.checkSEFrame()) {
-                    mDoAud_seStart(JA_SE_INDICATOR_1);
+                    seStartSystem(JA_SE_INDICATOR_1);
                 }
             } else {
                 mSightPacket.onLockFlg();
-                mDoAud_seStart(JA_SE_INDICATOR_1);
+                seStartSystem(JA_SE_INDICATOR_1);
             }
         } else {
             mSightPacket.offLockFlg();
@@ -765,7 +765,7 @@ BOOL daPy_lk_c::procRopeSwing() {
         procRopeHangWait_init(0);
     } else if (f30 > 0.6f) {
         if (cM_fcos(sp0C) > 0.77f) {
-            mDoAud_seStart(JA_SE_LK_ROPE_SWING_F, &mRopePos, NULL, mReverb);
+            mDoAud_seStart(JA_SE_LK_ROPE_SWING_F, &mRopePos, 0, mReverb);
         }
     }
 
@@ -1157,7 +1157,7 @@ BOOL daPy_lk_c::procRopeMove() {
         if (mpAttnActorLockOn != NULL) {
             setSpeedAndAngleAtnActor();
         } else {
-            if ((m355E == 0) && (!mpAttention->Lockon())) {
+            if ((m355E == 0) && (!checkAttentionLock())) {
                 resetActAnimeUpper(UPPER_MOVE2_e, -1.0f);
             } else {
                 setSpeedAndAngleAtn();
@@ -1202,7 +1202,7 @@ BOOL daPy_lk_c::procRopeThrowCatch() {
     if (!checkItemModeActorPointer()) {
         return true;
     }
-    if (mpAttention->Lockon()) {
+    if (checkAttentionLock()) {
         dComIfGp_clearPlayerStatus0(0, daPyStts0_UNK40000_e);
     } else {
         dComIfGp_setPlayerStatus0(0, daPyStts0_UNK40000_e);
diff --git a/src/d/actor/d_a_player_ship.inc b/src/d/actor/d_a_player_ship.inc
index 4f75f7f03..78e602c6c 100644
--- a/src/d/actor/d_a_player_ship.inc
+++ b/src/d/actor/d_a_player_ship.inc
@@ -238,7 +238,7 @@ void daPy_lk_c::setShipRidePos(int param_0) {
 
 /* 801403E0-80140480       .text setShipAttentionAnmSpeed__9daPy_lk_cFf */
 void daPy_lk_c::setShipAttentionAnmSpeed(f32 param_0) {
-    if (mpAttention->Lockon()) {
+    if (checkAttentionLock()) {
         mFrameCtrlUnder[UNDER_MOVE0_e].setRate(daPy_HIO_atnMove_c0::m.field_0x24);
         mFrameCtrlUpper[UPPER_MOVE2_e].setRate(param_0);
     } else {
@@ -706,7 +706,7 @@ BOOL daPy_lk_c::procShipScope_init(int param_0) {
     setShipRidePos(0);
     setSingleMoveAnime(ANM_WAITS, daPy_HIO_move_c0::m.field_0x38, 0.0f, -1, 5.0f);
     dComIfGp_setPlayerStatus0(0, daPyStts0_SHIP_RIDE_e);
-    mDoAud_seStart(JA_SE_ITM_SUBMENU_IN_1);
+    seStartSystem(JA_SE_ITM_SUBMENU_IN_1);
     offNoResetFlg0(daPyFlg0_SCOPE_CANCEL);
     mEquipItem = dComIfGp_getSelectItem(mReadyItemBtn);
     if (param_0 != 0) {
@@ -785,7 +785,7 @@ BOOL daPy_lk_c::procShipBoomerang() {
             if (checkUpperAnime(LKANM_BCK_BOOMWAIT)) {
                 setShipAttentionAnmSpeed(daPy_HIO_boom_c0::m.field_0x18);
                 checkNextActionBoomerangReady();
-                if (mpAttention->Lockon()) {
+                if (checkAttentionLock()) {
                     setShipAttnetionBodyAngle();
                 } else {
                     m34DA = 0;
@@ -835,7 +835,7 @@ BOOL daPy_lk_c::procShipHookshot_init() {
     dComIfGp_setPlayerStatus0(0, daPyStts0_HOOKSHOT_AIM_e | daPyStts0_SHIP_RIDE_e);
     setShipRidePos(0);
     m34D4 = ship->shape_angle.y;
-    if (mpAttention->Lockon()) {
+    if (checkAttentionLock()) {
         mProcVar0.m3570 = 1;
     } else {
         mProcVar0.m3570 = 0;
@@ -852,7 +852,7 @@ BOOL daPy_lk_c::procShipHookshot() {
     setShipRidePos(0);
     dComIfGp_setDoStatus(dActStts_RETURN_e);
     daHookshot_c* hookshot = (daHookshot_c*)mActorKeepEquip.getActor();
-    if (doTrigger() || hookshot == NULL || (mProcVar0.m3570 != 0 && m355E == 0 && !mpAttention->Lockon())) {
+    if (doTrigger() || hookshot == NULL || (mProcVar0.m3570 != 0 && m355E == 0 && !checkAttentionLock())) {
         procShipPaddle_init();
         deleteEquipItem(TRUE);
         return true;
@@ -863,7 +863,7 @@ BOOL daPy_lk_c::procShipHookshot() {
     if (hookshot->checkWait()) {
         setShipAttentionAnmSpeed(1.0f);
     }
-    if (mpAttention->Lockon()) {
+    if (checkAttentionLock()) {
         if (hookshot->checkWait()) {
             setShipAttnetionBodyAngle();
         } else {
@@ -879,7 +879,7 @@ BOOL daPy_lk_c::procShipHookshot() {
         shape_angle.y += (s16)(ship->shape_angle.y - m34D4);
     }
     if (hookshot->checkWait()) {
-        if (!mpAttention->Lockon()) {
+        if (!checkAttentionLock()) {
             setHookshotSight();
         } else {
             mSightPacket.offDrawFlg();
@@ -915,7 +915,7 @@ BOOL daPy_lk_c::procShipBow_init() {
     setShipRidePos(0);
     m34D4 = ship->shape_angle.y;
     m34DA = 0;
-    if (mpAttention->Lockon() && mDemo.getDemoMode() != daPy_demo_c::DEMO_UNK44_e) {
+    if (checkAttentionLock() && mDemo.getDemoMode() != daPy_demo_c::DEMO_UNK44_e) {
         mProcVar0.m3570 = 1;
     } else {
         mProcVar0.m3570 = 0;
@@ -932,7 +932,7 @@ BOOL daPy_lk_c::procShipBow() {
     setShipRidePos(0);
     if (mDemo.getDemoMode() != daPy_demo_c::DEMO_UNK44_e) {
         dComIfGp_setDoStatus(dActStts_RETURN_e);
-        if (doTrigger() || ((!mpAttention->Lockon() && mActorKeepEquip.getActor() == NULL) && mProcVar0.m3570 != 0)) {
+        if (doTrigger() || ((!checkAttentionLock() && mActorKeepEquip.getActor() == NULL) && mProcVar0.m3570 != 0)) {
             procShipPaddle_init();
             deleteEquipItem(TRUE);
             return true;
@@ -944,7 +944,7 @@ BOOL daPy_lk_c::procShipBow() {
     if (checkBowWaitAnime()) {
         setShipAttentionAnmSpeed(1.0f);
     }
-    if (mpAttention->Lockon() && (mDemo.getDemoMode() != daPy_demo_c::DEMO_UNK44_e)) {
+    if (checkAttentionLock() && (mDemo.getDemoMode() != daPy_demo_c::DEMO_UNK44_e)) {
         setShipAttnetionBodyAngle();
         mProcVar0.m3570 = 1;
     } else {
diff --git a/src/d/actor/d_a_player_swim.inc b/src/d/actor/d_a_player_swim.inc
index 693bc7554..dc8eb2b3f 100644
--- a/src/d/actor/d_a_player_swim.inc
+++ b/src/d/actor/d_a_player_swim.inc
@@ -22,7 +22,7 @@ void daPy_lk_c::setSpeedAndAngleSwim() {
     BOOL bVar3 = false;
 
     if (mCurProc != daPyProc_SWIM_UP_e) {
-        if (!mpAttention->Lockon()) {
+        if (!checkAttentionLock()) {
             if (mStickDistance > 0.05f) {
                 oldAngleY = shape_angle.y;
 
@@ -510,7 +510,7 @@ BOOL daPy_lk_c::procSwimMove() {
     J3DFrameCtrl* mFrameCtrl = mFrameCtrlUnder;
 
     int direction;
-    if (!mpAttention->Lockon()) {
+    if (!checkAttentionLock()) {
         direction = DIR_FORWARD;
     }
     else if (mStickDistance > 0.05f) {
diff --git a/src/d/actor/d_a_player_sword.inc b/src/d/actor/d_a_player_sword.inc
index 846a3dfd2..c03efb2c2 100644
--- a/src/d/actor/d_a_player_sword.inc
+++ b/src/d/actor/d_a_player_sword.inc
@@ -409,7 +409,7 @@ int daPy_lk_c::changeCutProc() {
     m34C4++;
     int direction = getCutDirection() - 1;
     short sVar2;
-    if (mpAttention->Lockon() || mStickDistance <= 0.05f) {
+    if (checkAttentionLock() || mStickDistance <= 0.05f) {
         sVar2 = shape_angle.y;
     } else {
         sVar2 = m34E8;
@@ -434,7 +434,7 @@ int daPy_lk_c::changeCutProc() {
         } else if (direction == DIR_RIGHT) {
             procCutR_init(sVar2);
         } else if (direction == DIR_NONE) {
-            if (mpAttention->Lockon()) {
+            if (checkAttentionLock()) {
                 procCutA_init(sVar2);
             } else {
                 procCutL_init(sVar2);
@@ -1708,7 +1708,7 @@ BOOL daPy_lk_c::procCutTurnMove() {
         }
     }
     if (m34D0 != -1) {
-        mDoAud_seStart(JA_SE_LK_SWORD_CHARGE);
+        seStartSystem(JA_SE_LK_SWORD_CHARGE);
     }
     if (changeSlideProc()) {
         return true;
diff --git a/src/d/actor/d_a_player_tact.inc b/src/d/actor/d_a_player_tact.inc
index efcbd49fe..f154ddb77 100644
--- a/src/d/actor/d_a_player_tact.inc
+++ b/src/d/actor/d_a_player_tact.inc
@@ -117,7 +117,7 @@ BOOL daPy_lk_c::checkTactLastInput() {
 /* 8014D9F8-8014DA78       .text setTactZev__9daPy_lk_cFUiiPc */
 void daPy_lk_c::setTactZev(fpc_ProcID tactZevPartnerId, int r30, char* r31) {
     if (tactZevPartnerId != fpcM_ERROR_PROCESS_ID_e) {
-        mDoAud_seStart(JA_SE_PRE_TAKT);
+        seStartSystem(JA_SE_PRE_TAKT);
     }
     mTactZevPartnerId = tactZevPartnerId;
     m34CC = r30;
@@ -256,7 +256,7 @@ BOOL daPy_lk_c::procTactWait_init(int r30) {
 
     if (r30 == -1) {
         dCam_getBody()->StartEventCamera(0xC, fopAcM_GetID(this), 0);
-        mDoAud_seStart(JA_SE_TAKT_USE_BEGIN);
+        seStartSystem(JA_SE_TAKT_USE_BEGIN);
     }
 
     mDoAud_tact_reset();
@@ -333,7 +333,7 @@ BOOL daPy_lk_c::procTactWait() {
         if (m34D2 != 0) {
             resetActAnimeUpper(UPPER_MOVE2_e, -1.0f);
             resetActAnimeUpper(UPPER_MOVE1_e, -1.0f);
-            mDoAud_seStart(JA_SE_TAKT_USE_CANCEL);
+            seStartSystem(JA_SE_TAKT_USE_CANCEL);
         }
 
         g_dComIfG_gameInfo.play.field_0x4947 = 0;
@@ -461,7 +461,7 @@ BOOL daPy_lk_c::procTactWait() {
             ((mProcVar0.m3570 == -1 || mProcVar0.m3570 == -3) && (m3574 >= 0 && m3574 != 6 && m3574 != 7 && dComIfGs_isTact(m3574))))
         {
             m34D2 = 30;
-            mDoAud_seStart(JA_SE_WTAKT_MATCH_SIGNAL);
+            seStartSystem(JA_SE_WTAKT_MATCH_SIGNAL);
             m35A0 = 0.0f;
         } else {
             m3574 = -1;
@@ -650,7 +650,7 @@ BOOL daPy_lk_c::procTactPlay() {
             }
         }
     } else if (mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.01f) {
-        mDoAud_seStart(JA_SE_TAKT_MATCHED);
+        seStartSystem(JA_SE_TAKT_MATCHED);
         fopMsgM_messageSendOn();
         m34D0 = 1;
 
@@ -685,7 +685,7 @@ BOOL daPy_lk_c::procTactPlayEnd_init(int r30) {
         dCam_getBody()->EndEventCamera(fopAcM_GetID(this));
         dComIfGp_event_setTalkPartner(dComIfGp_getCb1Player());
         fopAcM_orderChangeEvent(this, dComIfGp_getCb1Player(), l_tact_event_label, 0, -1);
-        mDoAud_seStart(JA_SE_CTRL_LINK_TO_NPC);
+        seStartSystem(JA_SE_CTRL_LINK_TO_NPC);
     } else if (r30 == 5) {
         dCam_getBody()->EndEventCamera(fopAcM_GetID(this));
         fopAcM_orderChangeEvent(this, l_tact_night_event_label, 0, -1);
@@ -806,7 +806,7 @@ BOOL daPy_lk_c::procTactPlayOriginal_init() {
 
 /* 8014F690-8014F8A0       .text procTactPlayOriginal__9daPy_lk_cFv */
 BOOL daPy_lk_c::procTactPlayOriginal() {
-    mDoAud_seStart(JA_SE_LK_WTAKT_USING);
+    seStartSystem(JA_SE_LK_WTAKT_USING);
 
     if (m_old_fdata->getOldFrameRate() < 0.01f) {
         if (m34D6 > 0) {
diff --git a/src/d/actor/d_a_player_weapon.inc b/src/d/actor/d_a_player_weapon.inc
index 75381310e..3095d2a01 100644
--- a/src/d/actor/d_a_player_weapon.inc
+++ b/src/d/actor/d_a_player_weapon.inc
@@ -57,7 +57,7 @@ BOOL daPy_lk_c::procWeaponNormalSwing_init() {
     m3700 = cXyz::Zero;
     m34C2 = 1;
     voiceStart(1);
-    if (mpAttention->Lockon() || mStickDistance <= 0.05f) {
+    if (checkAttentionLock() || mStickDistance <= 0.05f) {
         m34D4 = shape_angle.y;
     } else {
         m34D4 = m34E8;
@@ -238,7 +238,7 @@ BOOL daPy_lk_c::procWeaponFrontSwingReady_init() {
     );
     current.angle.y = shape_angle.y;
     mVelocity = 0.0f;
-    if (mpAttention->Lockon() || mStickDistance <= 0.05f) {
+    if (checkAttentionLock() || mStickDistance <= 0.05f) {
         m34D4 = shape_angle.y;
     } else {
         m34D4 = m34E8;
@@ -287,7 +287,7 @@ BOOL daPy_lk_c::procWeaponFrontSwing_init() {
     current.angle.y = shape_angle.y;
     mVelocity = 0.0f;
     voiceStart(1);
-    if (mpAttention->Lockon() || mStickDistance <= 0.05f) {
+    if (checkAttentionLock() || mStickDistance <= 0.05f) {
         m34D4 = shape_angle.y;
     } else {
         m34D4 = m34E8;
diff --git a/src/d/actor/d_a_player_whide.inc b/src/d/actor/d_a_player_whide.inc
index 73ef344ca..db4785153 100644
--- a/src/d/actor/d_a_player_whide.inc
+++ b/src/d/actor/d_a_player_whide.inc
@@ -15,16 +15,13 @@
 
 /* 8013707C-801371E0       .text setBlendWHideMoveAnime__9daPy_lk_cFf */
 void daPy_lk_c::setBlendWHideMoveAnime(f32 param_0) {
-    float fVar1;
-    float fVar2;
-    float fVar3;
-    float fVar4;
-    float fVar5;
-    float fVar6;
-    float fVar7;
-    s16 sVar1;
-    daPy_ANM dVar5;
+    f32 fVar1;
+    f32 fVar5;
     daPy_ANM dVar6;
+    s16 sVar1;
+    f32 fVar6;
+    f32 fVar3;
+    daPy_ANM dVar5;
 
     if (!checkNoResetFlg0(daPyFlg0_UNK10000)) {
         fVar1 = daPy_HIO_wall_c0::m.field_0x14;
@@ -51,20 +48,24 @@ void daPy_lk_c::setBlendWHideMoveAnime(f32 param_0) {
             dVar5 = ANM_WALLWLDW;
         }
     }
-    fVar5 *= fVar4;
+    fVar5 *= param_0;
+    
+    f32 fVar7;
     fVar7 = mVelocity / mMaxNormalSpeed;
     if (fVar7 < 0.0f) {
         fVar7 = 0.0f;
     }
+    f32 fVar4;
     if (fVar7 < fVar3) {
         fVar4 = 1.0f - fVar7 / fVar3;
         m3598 = 1.0f;
     } else {
         fVar4 = 0.0f;
-        fVar2 = 1.0f;
-        m3598 = (fVar2 - ((fVar2 - fVar6) * (fVar7 - fVar3)) / (fVar2 - fVar3));
+        m3598 = (1.0f - ((1.0f - fVar6) * (fVar7 - fVar3)) / (1.0f - fVar3));
     }
+    
     setMoveAnime(fVar4, fVar1, 0.0f, dVar5, dVar6, 5, fVar5);
+    
     mFrameCtrlUnder[UNDER_MOVE0_e].setEnd(sVar1);
     mFrameCtrlUnder[UNDER_MOVE1_e].setFrame(mFrameCtrlUnder[UNDER_MOVE1_e].getEnd() - 0.001f);
     mFrameCtrlUnder[UNDER_MOVE1_e].setRate(0.0f);
diff --git a/src/d/d_com_inf_game.cpp b/src/d/d_com_inf_game.cpp
index f58a164a7..0ce78705e 100644
--- a/src/d/d_com_inf_game.cpp
+++ b/src/d/d_com_inf_game.cpp
@@ -1171,13 +1171,12 @@ void dComIfGs_setGameStartStage() {
             daPy_lk_c* player_p = daPy_getPlayerLinkActorClass();
             point = player_p->mRestartPoint;
 
-            s8 temp_r3 = player_p->current.roomNo;
-            room_no = temp_r3;
+            room_no = fopAcM_GetRoomNo(player_p);
 
-            stage_scls_info_class* scls_p;
-            if (temp_r3 >= 0 && point != 0xFF && dComIfGs_checkSeaLandingEvent(room_no)) {
+            if (fopAcM_GetRoomNo(player_p) >= 0 && point != 0xFF && dComIfGs_checkSeaLandingEvent(room_no)) {
                 strcpy(stage_name, dComIfGp_getStartStageName());
             } else {
+                stage_scls_info_class* scls_p;
                 if (dComIfGp_getShipActor() != NULL) {
                     scls_p = dComIfGd_getMeshSceneList(dComIfGp_getShipActor()->current.pos);
                 } else {
diff --git a/src/d/d_s_logo.cpp b/src/d/d_s_logo.cpp
index 3b1539575..c8ce9eec8 100644
--- a/src/d/d_s_logo.cpp
+++ b/src/d/d_s_logo.cpp
@@ -629,7 +629,7 @@ cPhs_State phase_0(dScnLogo_c* i_this) {
     if (!cDyl_InitAsyncIsDone())
         return cPhs_INIT_e;
 
-    if (mDoAud_zelAudio_c::isInitFlag() && JAIZelBasic::getInterface()->checkFirstWaves())
+    if (mDoAud_zelAudio_c::isInitFlag() && mDoAud_checkFirstWaves())
         return cPhs_INIT_e;
 
 #if VERSION == VERSION_PAL
@@ -904,7 +904,7 @@ cPhs_State phase_2(dScnLogo_c* i_this) {
     l_FmapDataCommand = mDoDvdThd_toMainRam_c::create("/res/FmapDat/FmapDat.bin", JKRArchive::DEFAULT_MOUNT_DIRECTION, NULL);
     JUT_ASSERT(VERSION_SELECT(1426, 1426, 1751, 1791), l_FmapDataCommand != NULL);
 
-    JAIZelBasic::getInterface()->loadStaticWaves();
+    mDoAud_loadStaticWaves();
     mDoGph_gInf_c::setTickRate((OS_BUS_CLOCK / 4) / 60);
     mDoGph_gInf_c::waitBlanking(0);
     mDoGph_gInf_c::startFadeIn(30);
diff --git a/src/d/d_save.cpp b/src/d/d_save.cpp
index 0e9715ae7..de5ce440b 100644
--- a/src/d/d_save.cpp
+++ b/src/d/d_save.cpp
@@ -969,10 +969,10 @@ void dSv_player_config_c::init() {
     u32 soundMode = OSGetSoundMode();
     if (soundMode == 0) {
         mSoundMode = 0;
-        JAIZelBasic::getInterface()->setOutputMode(0);
+        mDoAud_setOutputMode(0);
     } else {
         mSoundMode = 1;
-        JAIZelBasic::getInterface()->setOutputMode(1);
+        mDoAud_setOutputMode(1);
     }
 
     mAttentionType = 0;
diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp
index fcc19831e..afbf8d2c9 100644
--- a/src/d/d_stage.cpp
+++ b/src/d/d_stage.cpp
@@ -1477,7 +1477,7 @@ int dStage_playerInit(dStage_dt_c* i_stage, void* i_data, int num, void* i_file)
         appen->base.angle = player_data->base.angle;
         appen->base.setID = player_data->base.setID;
 
-        if (roomParam != 0 && (int)((appen->base.parameters >> 0xC) & 0xF) != 2) {
+        if (roomParam != 0 && daPy_lk_c::getStartModeFromParam(appen->base.parameters) != 2) {
             appen->base.parameters = (roomParam & 0xFFFFFFC0) | (appen->base.parameters & 0x3F);
         }
     }