From 534f5d4e72b584ef200d7d1f5ad66397accb6f71 Mon Sep 17 00:00:00 2001
From: LagoLunatic <LagoLunatic@users.noreply.github.com>
Date: Wed, 7 May 2025 23:00:35 -0400
Subject: [PATCH] player_crawl and player_hammer 100%, misc player cleanup

---
 include/d/actor/d_a_npc_so.h         |   4 +-
 include/d/actor/d_a_player.h         |   5 +-
 src/d/actor/d_a_item.cpp             |   2 +-
 src/d/actor/d_a_player_bow.inc       |  18 +-
 src/d/actor/d_a_player_crawl.inc     | 396 ++++++++++++------------
 src/d/actor/d_a_player_dproc.inc     |   7 +-
 src/d/actor/d_a_player_hammer.inc    | 238 +++++++-------
 src/d/actor/d_a_player_hang.inc      |   2 +-
 src/d/actor/d_a_player_main.cpp      | 444 ++++++++++++---------------
 src/d/actor/d_a_player_main_data.inc |   2 +-
 src/d/actor/d_a_player_npc.cpp       |  16 +-
 src/d/actor/d_a_player_rope.inc      |  62 ++--
 12 files changed, 549 insertions(+), 647 deletions(-)

diff --git a/include/d/actor/d_a_npc_so.h b/include/d/actor/d_a_npc_so.h
index e7cbf4501..25ec1c9f9 100644
--- a/include/d/actor/d_a_npc_so.h
+++ b/include/d/actor/d_a_npc_so.h
@@ -11,7 +11,7 @@ public:
         
     };
 
-    void getMiniGameRestArrow() {}
+    int getMiniGameRestArrow() { return 10 - mB78; }
     void isAnm(signed char) {}
     void modeProcInit(int) {}
 
@@ -128,6 +128,8 @@ public:
 
 public:
     /* Place member variables here */
+    /* 0x290 */ u8 m290[0xB78 - 0x290];
+    /* 0xB78 */ int mB78;
 };
 
 class daNpc_So_HIO_c {
diff --git a/include/d/actor/d_a_player.h b/include/d/actor/d_a_player.h
index b19f27d6e..8628819e2 100644
--- a/include/d/actor/d_a_player.h
+++ b/include/d/actor/d_a_player.h
@@ -469,6 +469,7 @@ public:
     void offConfuse() { offNoResetFlg1(daPyFlg1_CONFUSE); }
     bool checkConfuse() const { return checkNoResetFlg1(daPyFlg1_CONFUSE); }
     bool checkFreezeState() const { return checkNoResetFlg1(daPyFlg1_FREEZE_STATE); }
+    bool checkUseArrowEffect() const { return checkNoResetFlg1(daPyFlg1_USE_ARROW_EFFECT); }
     void onUseArrowEffect() { onNoResetFlg1(daPyFlg1_USE_ARROW_EFFECT); }
     void offUseArrowEffect() { offNoResetFlg1(daPyFlg1_USE_ARROW_EFFECT); }
     void onLetterReadEyeMove() { onNoResetFlg1(daPyFlg1_LETTER_READ_EYE_MOVE); }
@@ -516,13 +517,9 @@ public:
     void checkBowMiniGame() const {}
     void checkSoupPowerUp() const {}
     void checkSubjectAccept() const {}
-    void checkUseArrowEffect() const {}
     void getRopeJumpLand() const {}
     void checkRopeForceEnd() const {}
     
-    // This class's weak virtual functions tend to cause weak function ordering issues in TUs that use them.
-    // The proper way to match this is still unknown, so some of the definitions have been temporarily commented out
-    // here so that they can be fakematched instead.
     virtual MtxP getLeftHandMatrix() = 0;
     virtual MtxP getRightHandMatrix() = 0;
     virtual f32 getGroundY() = 0;
diff --git a/src/d/actor/d_a_item.cpp b/src/d/actor/d_a_item.cpp
index 53d445a6e..ccb7e7caa 100644
--- a/src/d/actor/d_a_item.cpp
+++ b/src/d/actor/d_a_item.cpp
@@ -1287,7 +1287,7 @@ void daItem_c::mode_wait() {
         break;
     }
     
-    if (mAcch.ChkWaterHit() && mAcch.m_wtr.GetHeight() > current.pos.y ||
+    if ((mAcch.ChkWaterHit() && mAcch.m_wtr.GetHeight() > current.pos.y) ||
         (daSea_ChkArea(current.pos.x, current.pos.z) && daSea_calcWave(current.pos.x, current.pos.z) > current.pos.y))
     {
         mode_water_init();
diff --git a/src/d/actor/d_a_player_bow.inc b/src/d/actor/d_a_player_bow.inc
index f54d366d1..6d4d998e7 100644
--- a/src/d/actor/d_a_player_bow.inc
+++ b/src/d/actor/d_a_player_bow.inc
@@ -11,6 +11,7 @@
  */
 
 #include "d/actor/d_a_arrow.h"
+#include "d/actor/d_a_npc_so.h"
 #include "d/actor/d_a_player_HIO.h"
 #include "d/actor/d_a_player_main.h"
 #include "d/d_procname.h"
@@ -66,19 +67,16 @@ BOOL daPy_lk_c::checkBowAnime() const {
 
 /* 8014A080-8014A180       .text makeArrow__9daPy_lk_cFv */
 void daPy_lk_c::makeArrow() {
-    /* Nonmatching - missing "cntlzw" instruction, "getItemPartner" */    
-    s32 uVar1 = (0x44 - mDemo.getDemoMode()) >> 5 & 0xff;
-    if (((uVar1 == 0) && (dComIfGs_getArrowNum() != 0)) ||
-        ((uVar1 != 0 && ((((fopAc_ac_c*)dComIfGp_event_getItemPartner() != 0 &&
-                           (fopAcM_GetName(dComIfGp_event_getPt1()) == PROC_NPC_SO)) &&
-                          (0 < 10 - (dComIfGp_event_getPt1()->actor_type)))))))
+    /* Nonmatching - weird gameinfo load */
+    BOOL r4 = mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK44_e;
+    if ((!r4 && dComIfGs_getArrowNum() != 0) ||
+        (r4 && dComIfGp_event_getPt1() != NULL && fopAcM_GetName(dComIfGp_event_getPt1()) == PROC_NPC_SO &&
+         ((daNpc_So_c*)dComIfGp_event_getPt1())->getMiniGameRestArrow() > 0))
     {
-        fopAc_ac_c* arrow_p = (fopAc_ac_c*)fopAcM_fastCreate(PROC_ARROW, 0, &current.pos,
-                                                             current.roomNo, NULL, NULL, -1, NULL);
+        fopAc_ac_c* arrow_p = (fopAc_ac_c*)fopAcM_fastCreate(PROC_ARROW, 0, &current.pos, current.roomNo);
         mActorKeepEquip.setData(arrow_p);
     }
     m355C = 0;
-    return;
 }
 
 /* 8014A180-8014A1CC       .text deleteArrow__9daPy_lk_cFv */
@@ -172,7 +170,7 @@ BOOL daPy_lk_c::checkNextActionBowReady() {
         if (mFrameCtrlUpper[UPPER_MOVE2_e].getRate() < 0.01f) {
             if (m355E == 0 && bowButton() &&
                 (mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK44_e || mEquipItem == getReadyItem()) &&
-                !checkNoResetFlg1(daPyFlg1_USE_ARROW_EFFECT))
+                !checkUseArrowEffect())
             {
                 setBowReloadAnime();
                 makeArrow();
diff --git a/src/d/actor/d_a_player_crawl.inc b/src/d/actor/d_a_player_crawl.inc
index 7e886120c..984279238 100644
--- a/src/d/actor/d_a_player_crawl.inc
+++ b/src/d/actor/d_a_player_crawl.inc
@@ -35,8 +35,7 @@ f32 daPy_lk_c::getCrawlMoveSpeed() {
     if (fVar1 >= 17.0f) {
         fVar1 = fVar1 - 17.0f;
     }
-    return (daPy_HIO_crouch_c0::m.field_0x3C * mFrameCtrlUnder[UNDER_MOVE0_e].getRate()) *
-           cM_fsin((M_PI / 17) * fVar1);
+    return (daPy_HIO_crouch_c0::m.field_0x3C * mFrameCtrlUnder[UNDER_MOVE0_e].getRate()) * cM_fsin((M_PI / 17) * fVar1);
 }
 
 /* 80138868-801389D0       .text setCrawlMoveDirectionArrow__9daPy_lk_cFv */
@@ -145,9 +144,17 @@ BOOL daPy_lk_c::changeCrawlAutoMoveProc(cXyz* param_1) {
             var_r29 |= 8;
         }
     }
-    if (cM3d_Len2dSqPntAndSegLine(0.5f * (sp34.x + sp28.x), 0.5f * (sp34.z + sp28.z), sp70.x,
-                                  sp70.z, param_1->x - (75.0f * temp_f31),
-                                  param_1->z - (75.0f * temp_f30), &sp64.x, &sp64.z, &spC))
+    if (cM3d_Len2dSqPntAndSegLine(
+            0.5f * (sp34.x + sp28.x),
+            0.5f * (sp34.z + sp28.z),
+            sp70.x,
+            sp70.z,
+            param_1->x - (75.0f * temp_f31),
+            param_1->z - (75.0f * temp_f30),
+            &sp64.x,
+            &sp64.z,
+            &spC
+        ))
     {
         sp64.y = current.pos.y;
         return procCrawlAutoMove_init(var_r29, &sp64);
@@ -163,7 +170,7 @@ int daPy_lk_c::getCrawlMoveVec(cXyz* param_0, cXyz* param_1, cXyz* param_2) {
         int iVar4 = dComIfG_Bgsp()->GetSpecialCode(mLinkLinChk);
         f32 fVar1 = triPla->GetNP()->y;
         bool bVar2;
-        if (!((fVar1 >= 0.5f) || (fVar1 < -0.8f))) {
+        if (!(fVar1 >= 0.5f || fVar1 < -0.8f)) {
             bVar2 = true;
         } else {
             bVar2 = false;
@@ -175,7 +182,7 @@ int daPy_lk_c::getCrawlMoveVec(cXyz* param_0, cXyz* param_1, cXyz* param_2) {
             param_2->y = local_3c.y;
             param_2->z = -dVar7 * triPla->GetNP()->z;
             return true;
-        } else if ((iVar4 == 1) || (fVar1 < 0.643832f && (iVar4 == 2))) {
+        } else if (iVar4 == 1 || (fVar1 < 0.643832f && iVar4 == 2)) {
             *param_2 = (*param_1 - mLinkLinChk.GetCross());
             return true;
         }
@@ -195,7 +202,7 @@ void daPy_lk_c::crawlBgCheck(cXyz* param_0, cXyz* param_1) {
     iVar1 = getCrawlMoveVec(&cStack_50, param_0, &cStack_44);
     mDoMtx_multVec(mpCLModel->getBaseTRMtx(), &l_crawl_top_up_offset, &cStack_50);
     iVar2 = getCrawlMoveVec(&cStack_50, param_1, &cStack_38);
-    if ((iVar1 != 0) && (iVar2 != 0)) {
+    if (iVar1 != 0 && iVar2 != 0) {
         if (cStack_44.abs2() > cStack_38.abs()) {
             current.pos -= cStack_44;
         } else {
@@ -209,7 +216,9 @@ void daPy_lk_c::crawlBgCheck(cXyz* param_0, cXyz* param_1) {
 }
 
 /* 801390B8-801392BC       .text checkCrawlSideWall__9daPy_lk_cFP4cXyzP4cXyzP4cXyzP4cXyzPsPs */
-BOOL daPy_lk_c::checkCrawlSideWall(cXyz* param_1, cXyz* param_2, cXyz* param_3, cXyz* param_4, s16* param_5, s16* param_6) {
+BOOL daPy_lk_c::checkCrawlSideWall(
+    cXyz* param_1, cXyz* param_2, cXyz* param_3, cXyz* param_4, s16* param_5, s16* param_6
+) {
     cXyz local_78;
     cXyz local_90;
 
@@ -225,11 +234,9 @@ BOOL daPy_lk_c::checkCrawlSideWall(cXyz* param_1, cXyz* param_2, cXyz* param_3,
             *param_4 = mLinkLinChk.GetCross();
             pfVar1 = dComIfG_Bgsp()->GetTriPla(mLinkLinChk);
             *param_6 = cM_atan2s(pfVar1->GetNP()->x, pfVar1->GetNP()->z);
-            cXyz local_9c = (*param_3 - *param_4);
+            cXyz local_9c = *param_3 - *param_4;
             f32 temp_f31 = local_9c.abs2XZ();
-            if (cLib_distanceAngleS(*param_5, *param_6) > 0x7F00 && temp_f31 < 5625.0f &&
-                temp_f31 > 3600.0f)
-            {
+            if (cLib_distanceAngleS(*param_5, *param_6) > 0x7F00 && temp_f31 < 5625.0f && temp_f31 > 3600.0f) {
                 return true;
             }
         }
@@ -242,7 +249,7 @@ void daPy_lk_c::setDoStatusCrawl() {
     dComIfGp_setRStatus(dActStts_CROUCH_e);
     if (dComIfGp_checkCameraAttentionStatus(mCameraInfoIdx, 0x80)) {
         dComIfGp_setAStatus(dActStts_RETURN_e);
-        if (checkSubjectEnd(1) || (m35D0 > current.pos.y)) {
+        if (checkSubjectEnd(1) || m35D0 > current.pos.y) {
             dComIfGp_clearPlayerStatus0(0, daPyStts0_UNK2000_e);
         } else {
             dComIfGp_setPlayerStatus0(0, daPyStts0_UNK2000_e);
@@ -250,15 +257,13 @@ void daPy_lk_c::setDoStatusCrawl() {
     } else if (dCam_getBody()->ChangeModeOK(4)) {
         if (m35D0 <= current.pos.y) {
             onResetFlg0(daPyRFlg0_UNK4000000);
-            if (((dComIfGp_checkCameraAttentionStatus(mCameraInfoIdx, 0x1000))) &&
-                (!dComIfGp_event_runCheck()))
-            {
+            if (dComIfGp_checkCameraAttentionStatus(mCameraInfoIdx, 0x1000) && !dComIfGp_event_runCheck()) {
                 setSubjectMode();
             }
         }
     }
-    if ((dComIfGp_checkCameraAttentionStatus(mCameraInfoIdx, 0x80)) &&
-        ((mCurProc != daPyProc_CRAWL_MOVE_e || (mProcVar0.m3570 == 0))))
+    if (dComIfGp_checkCameraAttentionStatus(mCameraInfoIdx, 0x80) &&
+        (mCurProc != daPyProc_CRAWL_MOVE_e || mProcVar0.m3570 == 0))
     {
         setBodyAngleToCamera();
         if (mBodyAngle.x > 0) {
@@ -267,7 +272,6 @@ void daPy_lk_c::setDoStatusCrawl() {
     } else {
         mBodyAngle.x = 0;
     }
-    return;
 }
 
 /* 80139424-801394F0       .text procCrawlStart_init__9daPy_lk_cFv */
@@ -301,9 +305,9 @@ BOOL daPy_lk_c::procCrawlStart() {
     local_20.y = 50.0f;
     mDoMtx_multVec(mpCLModel->getBaseTRMtx(), &local_20, &cStack_38);
     crawlBgCheck(&cStack_38, &cStack_38);
-    if ((!spActionButton()) || (m35D0 > 15.0f + current.pos.y)) {
+    if (!spActionButton() || m35D0 > 15.0f + current.pos.y) {
         procCrawlEnd_init(0, shape_angle.x, shape_angle.z);
-    } else if ((mStickDistance > 0.05f) &&
+    } else if (mStickDistance > 0.05f &&
                ((mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.01f) ||
                 (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() > daPy_HIO_crouch_c0::m.field_0x28)))
     {
@@ -372,10 +376,8 @@ BOOL daPy_lk_c::procCrawlMove_init(s16 param_0, s16 param_1) {
 
 /* 80139878-8013A004       .text procCrawlMove__9daPy_lk_cFv */
 BOOL daPy_lk_c::procCrawlMove() {
-    /* Nonmatching - cXyz */
     J3DFrameCtrl& frameCtrl = mFrameCtrlUnder[UNDER_MOVE0_e];
     float fVar1;
-    short sVar3;
     BOOL bVar4;
     BOOL bVar5;
     int iVar6;
@@ -383,25 +385,32 @@ BOOL daPy_lk_c::procCrawlMove() {
     int iVar8;
     int iVar9;
     f32 dVar11;
-    cXyz aVStack_3c;
-    cXyz cStack_48;
-    cXyz VStack_54;
-    cXyz cStack_60;
-    cXyz cStack_6c;
-    cXyz cStack_d8;
+    cXyz sp124;
+    cXyz sp118;
+    cXyz sp10C;
+    cXyz sp100;
+    cXyz spF4;
+    cXyz spE8;
+    cXyz spDC;
+    cXyz spD0;
+    cXyz spC4;
+    cXyz spB8;
+    cXyz spAC;
+    cXyz spA0;
+    cXyz sp94;
+    cXyz sp88;
 
     setDoStatusCrawl();
-    mDoMtx_multVec(mpCLModel->getBaseTRMtx(), &l_crawl_stand_up_offset, &cStack_48);
-    mDoMtx_multVec(mpCLModel->getBaseTRMtx(), &l_crawl_front_up_offset, &aVStack_3c);
-    mDoMtx_multVec(mpCLModel->getBaseTRMtx(), &l_crawl_back_up_offset, &VStack_54);
-    mDoMtx_multVecSR(mpCLModel->getBaseTRMtx(), &l_crawl_min_side_offset, &cStack_60);
-    iVar6 = checkNotCrawlStand(&cStack_48);
-    iVar7 = checkNotCrawlStand(&aVStack_3c);
-    iVar8 = checkNotCrawlStand(&VStack_54);
-    if (((((iVar6 != 0) || (iVar7 != 0)) || (iVar8 != 0)) ||
-         ((checkNotCrawlStand(&aVStack_3c, &cStack_60) ||
-           (checkNotCrawlStand(&VStack_54, &cStack_60))))) ||
-        (checkNotCrawlStand(&cStack_48, &cStack_60)))
+    mDoMtx_multVec(mpCLModel->getBaseTRMtx(), &l_crawl_stand_up_offset, &sp118);
+    mDoMtx_multVec(mpCLModel->getBaseTRMtx(), &l_crawl_front_up_offset, &sp124);
+    mDoMtx_multVec(mpCLModel->getBaseTRMtx(), &l_crawl_back_up_offset, &sp10C);
+    mDoMtx_multVecSR(mpCLModel->getBaseTRMtx(), &l_crawl_min_side_offset, &sp100);
+    iVar6 = checkNotCrawlStand(&sp118);
+    iVar7 = checkNotCrawlStand(&sp124);
+    iVar8 = checkNotCrawlStand(&sp10C);
+    if ((((iVar6 != 0 || iVar7 != 0) || iVar8 != 0) ||
+         (checkNotCrawlStand(&sp124, &sp100) || checkNotCrawlStand(&sp10C, &sp100))) ||
+        checkNotCrawlStand(&sp118, &sp100))
     {
         bVar5 = false;
         onModeFlg(ModeFlg_04000000);
@@ -409,9 +418,7 @@ BOOL daPy_lk_c::procCrawlMove() {
         bVar5 = true;
         offModeFlg(ModeFlg_04000000);
     }
-    if (((bVar5 != false) && (!spActionButton())) ||
-        ((getSlidePolygon() != NULL || (m35D0 > current.pos.y + 15.0f))))
-    {
+    if ((bVar5 != false && !spActionButton()) || (getSlidePolygon() != NULL || m35D0 > current.pos.y + 15.0f)) {
         procCrawlEnd_init(1, shape_angle.x, shape_angle.z);
     } else {
         bVar4 = false;
@@ -423,7 +430,7 @@ BOOL daPy_lk_c::procCrawlMove() {
         } else {
             bVar4 = true;
         }
-        if (((bVar4 == true) || (frameCtrl.checkPass(0.0f))) || (frameCtrl.checkPass(17.0f))) {
+        if ((bVar4 == true || frameCtrl.checkPass(0.0f)) || frameCtrl.checkPass(17.0f)) {
             if (mStickDistance > 0.05f) {
                 if (getDirectionFromShapeAngle() != 1) {
                     frameCtrl.setRate(dVar11);
@@ -433,49 +440,42 @@ BOOL daPy_lk_c::procCrawlMove() {
                     frameCtrl.setLoop(frameCtrl.getEnd());
                 }
                 initSeAnime();
-            } else {
-                if (!bVar4) {
-                    if (frameCtrl.checkPass(0.0f)) {
-                        fVar1 = 0.0f;
-                    } else {
-                        fVar1 = 17.0f;
-                    }
-                    frameCtrl.setRate(0.0f);
-                    frameCtrl.setFrame(fVar1);
-                    ((mAnmRatioUnder[UNDER_MOVE0_e]).getAnmTransform())->setFrame(fVar1);
+            } else if (!bVar4) {
+                if (frameCtrl.checkPass(0.0f)) {
+                    fVar1 = 0.0f;
+                } else {
+                    fVar1 = 17.0f;
                 }
+                frameCtrl.setRate(0.0f);
+                frameCtrl.setFrame(fVar1);
+                ((mAnmRatioUnder[UNDER_MOVE0_e]).getAnmTransform())->setFrame(fVar1);
             }
         }
         iVar9 = mProcVar0.m3570;
         mProcVar0.m3570 = 0;
-        cXyz spC0;
-        cXyz spB4;
-        cXyz spA8;
-        cXyz sp9C;
-        cXyz sp90;
-        s16 sp16;
-        s16 sp14;
+        s16 sp0A;
+        s16 sp08;
 
-        mDoMtx_multVec(mpCLModel->getBaseTRMtx(), &l_crawl_side_offset, &spC0);
-        mDoMtx_multVec(mpCLModel->getBaseTRMtx(), &l_crawl_top_up_offset, &cStack_6c);
+        mDoMtx_multVec(mpCLModel->getBaseTRMtx(), &l_crawl_side_offset, &spE8);
+        mDoMtx_multVec(mpCLModel->getBaseTRMtx(), &l_crawl_top_up_offset, &spF4);
 
         if (frameCtrl.getRate() >= 0.0f) {
-            sp90 = (aVStack_3c - cStack_6c) * 0.5f;
+            spB8 = (sp124 - spF4) * 0.5f;
         } else if (frameCtrl.getRate() < 0.0f) {
-            sp90 = (cStack_48 - cStack_6c) * 0.5f;
+            spB8 = (sp10C - spF4) * 0.5f;
         }
 
-        spC0 += sp90;
-        cStack_6c += sp90;
-        spB4 = (cStack_6c * 2.0f) - spC0;
+        spE8 += spB8;
+        spF4 += spB8;
+        spDC = (spF4 * 2.0f) - spE8;
 
-        if (((iVar9 == 0) && checkCrawlSideWall(&cStack_6c, &spC0, &spA8, &sp9C, &sp16, &sp14)) ||
-            checkCrawlSideWall(&cStack_6c, &spB4, &sp9C, &spA8, &sp14, &sp16))
+        if (!bVar5 && (checkCrawlSideWall(&spF4, &spE8, &spD0, &spC4, &sp0A, &sp08) ||
+                       checkCrawlSideWall(&spF4, &spDC, &spC4, &spD0, &sp08, &sp0A)))
         {
             mProcVar0.m3570 = 1;
             mResetFlg0 = mResetFlg0 | 0x1000;
-            m370C = ((spA8 + sp9C) * 0.5f) - sp90;
-            m34D4 = sp16 + 0x4000;
+            m370C = ((spD0 + spC4) * 0.5f) - spB8;
+            m34D4 = sp0A + 0x4000;
         }
 
         if (mProcVar0.m3570 != 0) {
@@ -492,42 +492,37 @@ BOOL daPy_lk_c::procCrawlMove() {
                 cLib_addCalc(&current.pos.z, m370C.z, 0.5f, 10.0f, 1.0f);
             }
         } else {
-            if (((iVar9 != 0) && (iVar6 != 0)) &&
-                ((iVar7 != 0 &&
-                  ((iVar8 != 0 && (iVar6 = changeCrawlAutoMoveProc(&cStack_6c), iVar6 != 0))))))
-            {
+            if (iVar9 != 0 && iVar6 != 0 && iVar7 != 0 && iVar8 != 0 && changeCrawlAutoMoveProc(&spF4)) {
                 return true;
             }
-            if ((mStickDistance > 0.05f) && (frameCtrl.getRate() > 0.0f)) {
-                cXyz sp20;
-                cXyz sp2C;
-                cXyz sp38;
-                sVar3 = shape_angle.y;
+            if (mStickDistance > 0.05f && (frameCtrl.getRate() > 0.0f)) {
+                s16 r24 = shape_angle.y;
 
-                cLib_addCalcAngleS(&shape_angle.y, m34E8, daPy_HIO_crouch_c0::m.field_0x8,
-                                   daPy_HIO_crouch_c0::m.field_0xA,
-                                   daPy_HIO_crouch_c0::m.field_0xC);
+                cLib_addCalcAngleS(
+                    &shape_angle.y,
+                    m34E8,
+                    daPy_HIO_crouch_c0::m.field_0x8,
+                    daPy_HIO_crouch_c0::m.field_0xA,
+                    daPy_HIO_crouch_c0::m.field_0xC
+                );
 
-                if (sVar3 != shape_angle.y) {
-                    if ((s16)(sVar3 - shape_angle.y) > 0) {
-                        cMtx_multVec(mpCLModel->getBaseTRMtx(), &l_crawl_lside_front_offset, &sp20);
-                        cMtx_multVec(mpCLModel->getBaseTRMtx(), &l_crawl_lside_offset, &sp38);
+                if (shape_angle.y != r24) {
+                    if ((s16)(shape_angle.y - r24) > 0) {
+                        cMtx_multVec(mpCLModel->getBaseTRMtx(), &l_crawl_lside_front_offset, &spAC);
+                        cMtx_multVec(mpCLModel->getBaseTRMtx(), &l_crawl_lside_offset, &sp94);
                     } else {
-                        cMtx_multVec(mpCLModel->getBaseTRMtx(), &l_crawl_rside_front_offset, &sp20);
-                        cMtx_multVec(mpCLModel->getBaseTRMtx(), &l_crawl_rside_offset, &sp38);
+                        cMtx_multVec(mpCLModel->getBaseTRMtx(), &l_crawl_rside_front_offset, &spAC);
+                        cMtx_multVec(mpCLModel->getBaseTRMtx(), &l_crawl_rside_offset, &sp94);
                     }
 
-                    mGndChk.SetPos(&sp20);
-                    sp2C.set(sp20.x - sp38.x, dComIfG_Bgsp()->GroundCross(&mGndChk) - sp38.y,
-                             sp20.z - sp38.z);
+                    mGndChk.SetPos(&spAC);
+                    spA0.set(spAC.x - sp94.x, dComIfG_Bgsp()->GroundCross(&mGndChk) - sp94.y, spAC.z - sp94.z);
 
-                    if (cLib_distanceAngleS((cM_atan2s(-sp2C.x, sp2C.absXZ())), shape_angle.x) >
-                        0x800)
-                    {
-                        shape_angle.y = sVar3;
+                    if (cLib_distanceAngleS((cM_atan2s(-spA0.y, spA0.absXZ())), shape_angle.x) > 0x800) {
+                        shape_angle.y = r24;
                     }
-                    current.angle.y = shape_angle.y;
                 }
+                current.angle.y = shape_angle.y;
             }
         }
         dVar11 = getCrawlMoveSpeed();
@@ -535,11 +530,11 @@ BOOL daPy_lk_c::procCrawlMove() {
         if (mVelocity < 0.0f) {
             mVelocity *= -1.0f;
             current.angle.y = shape_angle.y + 0x8000;
-            mDoMtx_multVec(mpCLModel->getBaseTRMtx(), &l_crawl_back_offset, &cStack_d8);
-            crawlBgCheck(&cStack_d8, &VStack_54);
+            mDoMtx_multVec(mpCLModel->getBaseTRMtx(), &l_crawl_back_offset, &sp88);
+            crawlBgCheck(&sp88, &sp10C);
         } else {
-            mDoMtx_multVec(mpCLModel->getBaseTRMtx(), &l_crawl_front_offset, &cStack_d8);
-            crawlBgCheck(&cStack_d8, &aVStack_3c);
+            mDoMtx_multVec(mpCLModel->getBaseTRMtx(), &l_crawl_front_offset, &sp88);
+            crawlBgCheck(&sp88, &sp124);
         }
     }
     return true;
@@ -569,7 +564,6 @@ BOOL daPy_lk_c::procCrawlAutoMove_init(int param_0, cXyz* param_1) {
 
 /* 8013A0F0-8013A630       .text procCrawlAutoMove__9daPy_lk_cFv */
 BOOL daPy_lk_c::procCrawlAutoMove() {
-    /* Nonmatching */
     f32 fVar2;
     f32 fVar3;
 
@@ -579,7 +573,7 @@ BOOL daPy_lk_c::procCrawlAutoMove() {
     s16 sVar4 = shape_angle.y;
     s16 sVar5 = current.angle.y;
     if (m34D0 > 0) {
-        if ((frameCtrl.checkPass(0.0f)) || (frameCtrl.checkPass(17.0f))) {
+        if (frameCtrl.checkPass(0.0f) || frameCtrl.checkPass(17.0f)) {
             fVar3 = 0.0f;
             if (frameCtrl.checkPass(0.0f)) {
                 fVar2 = 0.0f;
@@ -590,105 +584,102 @@ BOOL daPy_lk_c::procCrawlAutoMove() {
             frameCtrl.setFrame(fVar2);
             mAnmRatioUnder[UNDER_MOVE0_e].getAnmTransform()->setFrame(fVar2);
             mVelocity = fVar3;
-        } else {
-            if (std::fabsf(frameCtrl.getRate()) < 0.01f) {
-                mVelocity = 0.0f;
-                m34D0--;
-            }
+        } else if (std::fabsf(frameCtrl.getRate()) < 0.01f) {
+            mVelocity = 0.0f;
+            m34D0--;
         }
         setCrawlMoveDirectionArrow();
         setDoStatusCrawl();
         shape_angle.y = sVar4;
         current.angle.y = sVar5;
-    } else {
-        if (m34D0 == 0) {
-            setCrawlMoveDirectionArrow();
-            if (mStickDistance > 0.05f) {
-                int direction = getDirectionFromShapeAngle();
-                f32 fVar2 = cM_ssin(shape_angle.y);
-                f32 fVar3 = cM_scos(shape_angle.y);
-                if ((direction == DIR_LEFT) && ((mProcVar0.m3570 & 4))) {
-                    m370C.x += 75.0f * fVar3;
-                    m370C.z -= 75.0f * fVar2;
-                    m34D4 = current.angle.y + 0x4000;
-                    if (current.angle.y == shape_angle.y) {
-                        m35A0 = 1.0f;
-                    } else {
-                        m35A0 = -1.0f;
-                    }
-                    m34D0 = -1;
-                } else if ((direction == DIR_RIGHT) && ((mProcVar0.m3570 & 8))) {
-                    m370C.x -= 75.0f * fVar3;
-                    m370C.z += 75.0f * fVar2;
-                    m34D4 = current.angle.y + -0x4000;
-                    if (current.angle.y == shape_angle.y) {
-                        m35A0 = 1.0f;
-                    } else {
-                        m35A0 = -1.0f;
-                    }
-                    m34D0 = -1;
-                } else if (((mProcVar0.m3570 & 1)) &&
-                           (((shape_angle.y == current.angle.y && (direction == DIR_FORWARD)) ||
-                             ((shape_angle.y != current.angle.y && (direction == DIR_BACKWARD))))))
-                {
-                    m370C.x += 75.0f * cM_ssin(current.angle.y);
-                    m370C.z += 75.0f * cM_scos(current.angle.y);
-                    m34D4 = shape_angle.y;
-                    m35A0 = 0.0f;
-                    m34D0 = -1;
-                } else if (((shape_angle.y == current.angle.y) && (direction == DIR_BACKWARD)) || ((shape_angle.y != current.angle.y && (direction == DIR_FORWARD)))) {
-                    current.angle.y += 0x8000;
-                    m370C.x -= 75.0f * cM_ssin(current.angle.y);
-                    m370C.z -= 75.0f * cM_scos(current.angle.y);
-                    m34D4 = shape_angle.y;
-                    m35A0 = 0.0f;
-                    m34D0 = -1;
+    } else if (m34D0 == 0) {
+        setCrawlMoveDirectionArrow();
+        if (mStickDistance > 0.05f) {
+            int direction = getDirectionFromShapeAngle();
+            f32 fVar2 = cM_ssin(shape_angle.y);
+            f32 fVar3 = cM_scos(shape_angle.y);
+            if (direction == DIR_LEFT && (mProcVar0.m3570 & 4)) {
+                m370C.x += 75.0f * fVar3;
+                m370C.z -= 75.0f * fVar2;
+                m34D4 = current.angle.y + 0x4000;
+                if (current.angle.y == shape_angle.y) {
+                    m35A0 = 1.0f;
+                } else {
+                    m35A0 = -1.0f;
                 }
-                if (m34D0 == -1) {
-                    g_dComIfG_gameInfo.play.mDirection = 0;
-                    if (shape_angle.y == current.angle.y) {
-                        frameCtrl.setRate(2.0f);
-                        frameCtrl.setLoop(0);
-                    } else {
-                        frameCtrl.setRate(-2.0f);
-                        frameCtrl.setLoop(frameCtrl.getEnd());
-                    }
-                    initSeAnime();
+                m34D0 = -1;
+            } else if (direction == DIR_RIGHT && (mProcVar0.m3570 & 8)) {
+                m370C.x -= 75.0f * fVar3;
+                m370C.z += 75.0f * fVar2;
+                m34D4 = current.angle.y + -0x4000;
+                if (current.angle.y == shape_angle.y) {
+                    m35A0 = 1.0f;
+                } else {
+                    m35A0 = -1.0f;
                 }
-            } else {
-                setDoStatusCrawl();
-                shape_angle.y = sVar4;
-                current.angle.y = sVar5;
+                m34D0 = -1;
+            } else if ((mProcVar0.m3570 & 1) && ((shape_angle.y == current.angle.y && direction == DIR_FORWARD) ||
+                                                    (shape_angle.y != current.angle.y && direction == DIR_BACKWARD)))
+            {
+                m370C.x += 75.0f * cM_ssin(current.angle.y);
+                m370C.z += 75.0f * cM_scos(current.angle.y);
+                m34D4 = shape_angle.y;
+                m35A0 = 0.0f;
+                m34D0 = -1;
+            } else if ((shape_angle.y == current.angle.y && direction == DIR_BACKWARD) ||
+                        (shape_angle.y != current.angle.y && direction == DIR_FORWARD))
+            {
+                current.angle.y += 0x8000;
+                m370C.x -= 75.0f * cM_ssin(current.angle.y);
+                m370C.z -= 75.0f * cM_scos(current.angle.y);
+                m34D4 = shape_angle.y;
+                m35A0 = 0.0f;
+                m34D0 = -1;
+            }
+            if (m34D0 == -1) {
+                g_dComIfG_gameInfo.play.mDirection = 0;
+                if (shape_angle.y == current.angle.y) {
+                    frameCtrl.setRate(2.0f);
+                    frameCtrl.setLoop(0);
+                } else {
+                    frameCtrl.setRate(-2.0f);
+                    frameCtrl.setLoop(frameCtrl.getEnd());
+                }
+                initSeAnime();
             }
         } else {
-            BOOL bVar1 = true;
-            if (m34D6 > 0) {
-                m34D6--;
+            setDoStatusCrawl();
+            shape_angle.y = sVar4;
+            current.angle.y = sVar5;
+        }
+    } else {
+        BOOL bVar1 = true;
+        if (m34D6 > 0) {
+            m34D6--;
+        }
+        if (std::fabsf(m35A0) > 0.5f) {
+            if (cLib_addCalcAngleS(&shape_angle.y, m34D4, 5, 0x480, 0x80)) {
+                bVar1 = 0;
             }
-            if (std::fabsf(m35A0) > 0.5f) {
-                if (cLib_addCalcAngleS(&shape_angle.y, m34D4, 5, 0x480, 0x80)) {
-                    bVar1 = 0;
-                }
-                if (m35A0 < -0.5f) {
-                    current.angle.y = shape_angle.y + 0x8000;
-                } else {
-                    current.angle.y = shape_angle.y;
-                }
-                cLib_addCalc(&current.pos.x, m370C.x, 0.5f, 3.0f, 1.0f);
-                cLib_addCalc(&current.pos.z, m370C.z, 0.5f, 3.0f, 1.0f);
-            }
-            cXyz local_28 = m370C - current.pos;
-            if (cLib_distanceAngleS(cM_atan2s(local_28.x, local_28.z), current.angle.y) < 0x6000) {
-                bVar1 = false;
-            }
-            mVelocity = getCrawlMoveSpeed();
-            if (mVelocity < 0.0f) {
-                mVelocity *=-1.0f;
+            if (m35A0 < -0.5f) {
                 current.angle.y = shape_angle.y + 0x8000;
+            } else {
+                current.angle.y = shape_angle.y;
             }
-            if ((bVar1 != 0) || (m34D6 == 0)) {
-                procCrawlMove_init(shape_angle.x, shape_angle.z);
-            }
+            cLib_addCalc(&current.pos.x, m370C.x, 0.5f, 3.0f, 1.0f);
+            cLib_addCalc(&current.pos.z, m370C.z, 0.5f, 3.0f, 1.0f);
+        }
+        cXyz local_28 = m370C - current.pos;
+        if (cLib_distanceAngleS(cM_atan2s(local_28.x, local_28.z), current.angle.y) < 0x6000) {
+            bVar1 = false;
+        }
+        mVelocity = getCrawlMoveSpeed();
+        if (mVelocity < 0.0f) {
+            mVelocity *= -1.0f;
+            current.angle.y = shape_angle.y + 0x8000;
+        }
+        if (bVar1 != 0 || m34D6 == 0) {
+            procCrawlMove_init(shape_angle.x, shape_angle.z);
         }
     }
     return true;
@@ -710,13 +701,18 @@ BOOL daPy_lk_c::procCrawlEnd_init(int param_1, s16 param_2, s16 param_3) {
     } else {
         fVar1 = -1.0f;
     }
-    setSingleMoveAnime(ANM_LIE, daPy_HIO_crouch_c0::m.field_0x40, daPy_HIO_crouch_c0::m.field_0x44,
-                       daPy_HIO_crouch_c0::m.field_0xE, fVar1);
+    setSingleMoveAnime(
+        ANM_LIE,
+        daPy_HIO_crouch_c0::m.field_0x40,
+        daPy_HIO_crouch_c0::m.field_0x44,
+        daPy_HIO_crouch_c0::m.field_0xE,
+        fVar1
+    );
     if (param_1 == 0) {
         if (daPy_HIO_crouch_c0::m.field_0x44 > dVar4) {
             dVar4 = daPy_HIO_crouch_c0::m.field_0x44;
         } else if (daPy_HIO_crouch_c0::m.field_0xE <= dVar4) {
-            dVar4 = (daPy_HIO_crouch_c0::m.field_0xE - 0.001f);
+            dVar4 = daPy_HIO_crouch_c0::m.field_0xE - 0.001f;
         }
         mFrameCtrlUnder[UNDER_MOVE0_e].setFrame(dVar4);
         mAnmRatioUnder[UNDER_MOVE0_e].getAnmTransform()->setFrame(dVar4);
@@ -738,14 +734,12 @@ BOOL daPy_lk_c::procCrawlEnd() {
     m35E4 = m35A0 * (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() - daPy_HIO_crouch_c0::m.field_0x48);
     if (mFrameCtrlUnder[UNDER_MOVE0_e].getRate() > -0.01f) {
         checkNextMode(0);
-    } else {
-        if (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() < daPy_HIO_crouch_c0::m.field_0x48) {
-            if (!checkNextMode(1)) {
-                m34C2 = 1;
-            }
-        } else {
+    } else if (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() < daPy_HIO_crouch_c0::m.field_0x48) {
+        if (!checkNextMode(1)) {
             m34C2 = 1;
         }
+    } else {
+        m34C2 = 1;
     }
     return true;
 }
diff --git a/src/d/actor/d_a_player_dproc.inc b/src/d/actor/d_a_player_dproc.inc
index 384665f01..64a7e00bc 100644
--- a/src/d/actor/d_a_player_dproc.inc
+++ b/src/d/actor/d_a_player_dproc.inc
@@ -884,8 +884,11 @@ BOOL daPy_lk_c::dProcDead() {
             dGameover_c* this_01;
             cLib_chaseF(&m35A0, 0.0f, 0.01f);
             f32 dVar3 = 1.0f - m35A0;
-            if ((m3628 != fpcM_ERROR_PROCESS_ID_e) && (this_01 = (dGameover_c*)fopMsgM_SearchByID(m3628), this_01)) {
-                this_01->setBackAlpha(dVar3);
+            if ((m3628 != fpcM_ERROR_PROCESS_ID_e)) {
+                this_01 = (dGameover_c*)fopMsgM_SearchByID(m3628);
+                if (this_01) {
+                    this_01->setBackAlpha(dVar3);
+                }
             }
             if (((m35A0 < 0.38f) && (m3628 != fpcM_ERROR_PROCESS_ID_e)) &&
                 (this_01 = (dGameover_c*)fopMsgM_SearchByID(m3628), this_01))
diff --git a/src/d/actor/d_a_player_hammer.inc b/src/d/actor/d_a_player_hammer.inc
index dba878f8d..5241f420a 100644
--- a/src/d/actor/d_a_player_hammer.inc
+++ b/src/d/actor/d_a_player_hammer.inc
@@ -61,29 +61,27 @@ void daPy_lk_c::setHammerQuake(cBgS_PolyInfo* param_1, const cXyz* param_2, int
         }
         mDoAud_seStart(JA_SE_LK_HAMMER_HIT, &mSwordTopPos, iVar6, mReverb);
     }
-    if ((param_1 != NULL) && (m355C == 0)) {
+    if (param_1 != NULL && m355C == 0) {
         mDoMtx_stack_c::transS(param_2->x, param_2->y, param_2->z);
-        mDoMtx_stack_c::ZXYrotM(getGroundAngle(param_1, shape_angle.y), shape_angle.y,
-                                getGroundAngle(param_1, shape_angle.y + -0x4000));
+        mDoMtx_stack_c::ZXYrotM(
+            getGroundAngle(param_1, shape_angle.y), shape_angle.y, getGroundAngle(param_1, shape_angle.y + -0x4000)
+        );
         mDoMtx_stack_c::transM(0.0f, 0.0f, -30.0f);
         local_38.x = mDoMtx_stack_c::now[0][3];
         local_38.y = mDoMtx_stack_c::now[1][3];
         local_38.z = mDoMtx_stack_c::now[2][3];
-        if ((!fopAcM_getWaterY(&local_38, &local_54)) || (local_54 < (5.0f + local_38.y))) {
+        if (!fopAcM_getWaterY(&local_38, &local_54) || (local_54 < (5.0f + local_38.y))) {
             emitter = dComIfGp_particle_setP1(dPa_name::ID_COMMON_0214, &local_38);
             if (emitter != NULL) {
-                JPASetRMtxTVecfromMtx(mDoMtx_stack_c::get(), emitter->mGlobalRotation,
-                                      emitter->mGlobalTranslation);
+                JPASetRMtxTVecfromMtx(mDoMtx_stack_c::get(), emitter->mGlobalRotation, emitter->mGlobalTranslation);
             }
             emitter = dComIfGp_particle_setP1(dPa_name::ID_COMMON_0215, &local_38);
             if (emitter != NULL) {
-                JPASetRMtxTVecfromMtx(mDoMtx_stack_c::get(), emitter->mGlobalRotation,
-                                      emitter->mGlobalTranslation);
+                JPASetRMtxTVecfromMtx(mDoMtx_stack_c::get(), emitter->mGlobalRotation, emitter->mGlobalTranslation);
             }
             emitter = dComIfGp_particle_setP1(dPa_name::ID_COMMON_0216, &local_38);
             if (emitter != NULL) {
-                JPASetRMtxTVecfromMtx(mDoMtx_stack_c::get(), emitter->mGlobalRotation,
-                                      emitter->mGlobalTranslation);
+                JPASetRMtxTVecfromMtx(mDoMtx_stack_c::get(), emitter->mGlobalRotation, emitter->mGlobalTranslation);
             }
             bVar2 = false;
         } else {
@@ -95,17 +93,17 @@ void daPy_lk_c::setHammerQuake(cBgS_PolyInfo* param_1, const cXyz* param_2, int
         if (bVar2) {
             attrib_code = dBgS_Attr_WATER_e;
             dComIfGp_particle_setP1(dPa_name::ID_COMMON_027C, &local_38);
-            dComIfGp_particle_setShipTail(dPa_name::ID_COMMON_003D, &local_38, NULL, NULL, 0xFF,
-                                          &dPa_control_c::mSingleRippleEcallBack);
+            dComIfGp_particle_setShipTail(
+                dPa_name::ID_COMMON_003D, &local_38, NULL, NULL, 0xFF, &dPa_control_c::mSingleRippleEcallBack
+            );
         } else {
             attrib_code = dComIfG_Bgsp()->GetAttributeCode(*param_1);
         }
-        emitter = dComIfGp_particle_setSimpleLand(attrib_code, &local_38, NULL, 1.0f, 1.0f, 1.0f,
-                                                  &tevStr, &iStack_58, 0x1E);
+        emitter =
+            dComIfGp_particle_setSimpleLand(attrib_code, &local_38, NULL, 1.0f, 1.0f, 1.0f, &tevStr, &iStack_58, 0x1E);
         if (emitter != NULL) {
-            JPASetRMtxTVecfromMtx(mDoMtx_stack_c::get(), emitter->mGlobalRotation,
-                                  emitter->mGlobalTranslation);
-            if ((attrib_code == dBgS_Attr_WATER_e) || (attrib_code == dBgS_Attr_GRASS_e)) {
+            JPASetRMtxTVecfromMtx(mDoMtx_stack_c::get(), emitter->mGlobalRotation, emitter->mGlobalTranslation);
+            if (attrib_code == dBgS_Attr_WATER_e || attrib_code == dBgS_Attr_GRASS_e) {
                 emitter->setRate(60.0f);
                 emitter->setSpread(1.0f);
                 if (attrib_code == dBgS_Attr_WATER_e) {
@@ -128,7 +126,6 @@ void daPy_lk_c::setHammerQuake(cBgS_PolyInfo* param_1, const cXyz* param_2, int
     }
     m355C = 1;
     dKy_Sound_set(current.pos, 500, fopAcM_GetID(this), 10);
-    return;
 }
 
 /* 801508FC-80150B60       .text setHammerWaterSplash__9daPy_lk_cFv */
@@ -136,27 +133,26 @@ void daPy_lk_c::setHammerWaterSplash() {
     f32 local_50;
     cXyz local_28;
 
-    if ((mCurProc != daPyProc_HAMMER_FRONT_SWING_e) ||
-        (m35EC <= mFrameCtrlUnder[UNDER_MOVE0_e].getRate()))
-    {
+    if (mCurProc != daPyProc_HAMMER_FRONT_SWING_e || (m35EC <= mFrameCtrlUnder[UNDER_MOVE0_e].getRate())) {
         return;
     }
     if (m355C == 0) {
         local_28 = m36C4 - mSwordTopPos;
         local_28.normalize();
         local_28 = mSwordTopPos + (local_28 * 30.0f);
-        if ((fopAcM_getWaterY(&local_28, &local_50)) && (local_50 >= local_28.y + 5.0f)) {
+        if (fopAcM_getWaterY(&local_28, &local_50) && local_50 >= local_28.y + 5.0f) {
             local_28.y += 150.0f;
             mGndChk.SetPos(&local_28);
             if (!(local_50 < dComIfG_Bgsp()->GroundCross(&mGndChk) + 5.0f)) {
                 local_28.y = local_50;
                 dComIfGp_particle_setP1(dPa_name::ID_COMMON_027C, &local_28);
-                dComIfGp_particle_setShipTail(dPa_name::ID_COMMON_003D, &local_28, NULL, NULL, 0xFF,
-                                              &dPa_control_c::mSingleRippleEcallBack);
+                dComIfGp_particle_setShipTail(
+                    dPa_name::ID_COMMON_003D, &local_28, NULL, NULL, 0xFF, &dPa_control_c::mSingleRippleEcallBack
+                );
                 GXColor amb, dif;
                 dKy_get_seacolor(&amb, &dif);
-                JPABaseEmitter* emitter = dComIfGp_particle_setP1(
-                    dPa_name::ID_COMMON_0023, &local_28, NULL, NULL, 0xFF, NULL, -1, &amb);
+                JPABaseEmitter* emitter =
+                    dComIfGp_particle_setP1(dPa_name::ID_COMMON_0023, &local_28, NULL, NULL, 0xFF, NULL, -1, &amb);
                 if (emitter != NULL) {
                     emitter->setRate(60.0f);
                     emitter->setSpread(1.0f);
@@ -168,7 +164,6 @@ void daPy_lk_c::setHammerWaterSplash() {
             }
         }
     }
-    return;
 }
 
 /* 80150B60-80150C40       .text procHammerSideSwing_init__9daPy_lk_cFv */
@@ -200,45 +195,43 @@ BOOL daPy_lk_c::procHammerSideSwing() {
         mDirection = DIR_RIGHT;
         checkNextMode(0);
         return true;
-    } else {
-        if (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() > daPy_HIO_ham_c0::m.field_0x10) {
-            f32 dVar4 = mVelocity;
-            u8 orig_direction = mDirection;
-            mVelocity = 0.0f;
-            mDirection = DIR_RIGHT;
-            if (checkNextMode(1)) {
-                return true;
-            }
-            mVelocity = dVar4;
-            mDirection = orig_direction;
-        }
-        if (changeCutReverseProc(ANM_CUTREL)) {
-            setHammerQuake(NULL, NULL, -1);
+    }
+    if (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() > daPy_HIO_ham_c0::m.field_0x10) {
+        f32 dVar4 = mVelocity;
+        u8 orig_direction = mDirection;
+        mVelocity = 0.0f;
+        mDirection = DIR_RIGHT;
+        if (checkNextMode(1)) {
             return true;
-        } else {
-            if (mpAttnActorLockOn != NULL) {
-                setShapeAngleToAtnActor();
-                m34D4 = shape_angle.y;
-            } else {
-                cLib_addCalcAngleS(
-                    &shape_angle.y,
-                    m34D4,
-                    daPy_HIO_turn_c0::m.field_0x4,
-                    daPy_HIO_turn_c0::m.field_0x0,
-                    daPy_HIO_turn_c0::m.field_0x2
-                );
-            }
-            current.angle.y = shape_angle.y;
-            if ((mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() >= daPy_HIO_ham_c0::m.field_0x18) &&
-                (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() < daPy_HIO_ham_c0::m.field_0x1C))
-            {
-                if (!checkNoResetFlg0(daPyFlg0_CUT_AT_FLG)) {
-                    onResetFlg0(daPyRFlg0_UNK1);
-                    seStartSwordCut(JA_SE_LK_HAMMER_SWING);
-                }
-                onResetFlg0(daPyRFlg0_UNK2);
-            }
         }
+        mVelocity = dVar4;
+        mDirection = orig_direction;
+    }
+    if (changeCutReverseProc(ANM_CUTREL)) {
+        setHammerQuake(NULL, NULL, -1);
+        return true;
+    }
+    if (mpAttnActorLockOn != NULL) {
+        setShapeAngleToAtnActor();
+        m34D4 = shape_angle.y;
+    } else {
+        cLib_addCalcAngleS(
+            &shape_angle.y,
+            m34D4,
+            daPy_HIO_turn_c0::m.field_0x4,
+            daPy_HIO_turn_c0::m.field_0x0,
+            daPy_HIO_turn_c0::m.field_0x2
+        );
+    }
+    current.angle.y = shape_angle.y;
+    if ((mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() >= daPy_HIO_ham_c0::m.field_0x18) &&
+        (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() < daPy_HIO_ham_c0::m.field_0x1C))
+    {
+        if (!checkNoResetFlg0(daPyFlg0_CUT_AT_FLG)) {
+            onResetFlg0(daPyRFlg0_UNK1);
+            seStartSwordCut(JA_SE_LK_HAMMER_SWING);
+        }
+        onResetFlg0(daPyRFlg0_UNK2);
     }
     return true;
 }
@@ -255,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 (mpAttention->Lockon() || mStickDistance <= 0.05f) {
         m34D4 = shape_angle.y;
     } else {
         m34D4 = m34E8;
@@ -273,22 +266,21 @@ BOOL daPy_lk_c::procHammerFrontSwingReady() {
     m35EC = mFrameCtrlUnder[UNDER_MOVE0_e].getFrame();
     if (mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.01f) {
         return procHammerFrontSwing_init();
-    } else {
-        if (mpAttnActorLockOn != NULL) {
-            setShapeAngleToAtnActor();
-            m34D4 = shape_angle.y;
-        } else {
-            cLib_addCalcAngleS(
-                &shape_angle.y,
-                m34D4,
-                daPy_HIO_turn_c0::m.field_0x4,
-                daPy_HIO_turn_c0::m.field_0x0,
-                daPy_HIO_turn_c0::m.field_0x2
-            );
-        }
-        current.angle.y = shape_angle.y;
-        return true;
     }
+    if (mpAttnActorLockOn != NULL) {
+        setShapeAngleToAtnActor();
+        m34D4 = shape_angle.y;
+    } else {
+        cLib_addCalcAngleS(
+            &shape_angle.y,
+            m34D4,
+            daPy_HIO_turn_c0::m.field_0x4,
+            daPy_HIO_turn_c0::m.field_0x0,
+            daPy_HIO_turn_c0::m.field_0x2
+        );
+    }
+    current.angle.y = shape_angle.y;
+    return true;
 }
 
 /* 80150F98-801510DC       .text procHammerFrontSwing_init__9daPy_lk_cFv */
@@ -304,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 (mpAttention->Lockon() || mStickDistance <= 0.05f) {
         m34D4 = shape_angle.y;
     } else {
         m34D4 = m34E8;
@@ -322,66 +314,53 @@ BOOL daPy_lk_c::procHammerFrontSwing_init() {
 
 /* 801510DC-801513D4       .text procHammerFrontSwing__9daPy_lk_cFv */
 BOOL daPy_lk_c::procHammerFrontSwing() {
-    /* Nonmatching - regalloc */
-    f32 fVar1;
-    f32 fVar2;
-    f32 fVar3;
-    f32 fVar4;
-    int iVar5;
-    int iVar6;
-    int iVar7;
-    f32 dVar8;
-    f32 dVar10;
-    cXyz local_58;
-
     m35EC = mFrameCtrlUnder[UNDER_MOVE0_e].getFrame();
-    fVar1 = mFrameCtrlUnder[UNDER_MOVE0_e].getRate();
-    if (fVar1 < 0.01f) {
+    f32 f1 = mFrameCtrlUnder[UNDER_MOVE0_e].getRate();
+    if (f1 < 0.01f) {
         if (m34D0 == 0) {
-            procHammerFrontSwingEnd_init();
+            return procHammerFrontSwingEnd_init();
         } else {
             m34D0--;
         }
         return true;
     }
-    if ((m35EC > fVar1) && (changeCutReverseProc(ANM_CUTREL))) {
+    if (m35EC > f1 && changeCutReverseProc(ANM_CUTREL)) {
         if (mCurProc == daPyProc_HAMMER_FRONT_SWING_e) {
-            local_58.set(mSwordTopPos.x, current.pos.y + 300.0f, mSwordTopPos.z);
-            mGndChk.SetPos(&local_58);
-            dVar8 = dComIfG_Bgsp()->GroundCross(&mGndChk);
-            local_58.y = dVar8;
-            if (dVar8 > mSwordTopPos.y) {
-                iVar5 = -1;
-                iVar7 = 0;
-                dVar8 = 300.0f;
-                dVar10 = C_BG_MIN_HEIGHT;
-                for (iVar6 = 0; iVar6 < mSwBlur.field_0x014; iVar6++, iVar7++) {
-                    local_58.set(mSwBlur.field_0x034[iVar7].x, dVar8 + mSwBlur.field_0x034[iVar7].y,
-                                 mSwBlur.field_0x034[iVar7].z);
-                    mGndChk.SetPos(&local_58);
-                    local_58.y = dComIfG_Bgsp()->GroundCross(&mGndChk);
-                    if ((dVar10 != local_58.y) && (mSwBlur.field_0x034[iVar7].y > local_58.y)) {
-                        iVar5 = dComIfG_Bgsp()->GetMtrlSndId(mGndChk);
+            cXyz sp08(mSwordTopPos.x, current.pos.y + 300.0f, mSwordTopPos.z);
+            mGndChk.SetPos(&sp08);
+            sp08.y = dComIfG_Bgsp()->GroundCross(&mGndChk);
+            if (sp08.y > mSwordTopPos.y) {
+                int r27;
+                int r26;
+                r26 = -1;
+                f32 f30 = 300.0f;
+                f32 f31 = C_BG_MIN_HEIGHT;
+                for (r27 = 0; r27 < mSwBlur.field_0x014; r27++) {
+                    sp08.set(mSwBlur.field_0x034[r27].x, f30 + mSwBlur.field_0x034[r27].y, mSwBlur.field_0x034[r27].z);
+                    mGndChk.SetPos(&sp08);
+                    sp08.y = dComIfG_Bgsp()->GroundCross(&mGndChk);
+                    if (f31 != sp08.y && mSwBlur.field_0x034[r27].y > sp08.y) {
+                        r26 = dComIfG_Bgsp()->GetMtrlSndId(mGndChk);
                         break;
                     }
                 }
-                fVar1 = mFrameCtrlUnder[UNDER_MOVE0_e].getRate();
-                fVar3 = (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() - fVar1) - 0.1f * iVar6 * fVar1;
-                if ((iVar6 != 0) && (iVar6 < mSwBlur.field_0x014)) {
-                    fVar2 = (&mSwBlur.field_0x034[0])[iVar6].y;
-                    fVar4 = (&mSwBlur.field_0x028)[iVar6].y - fVar2;
-                    if (std::abs(fVar4) > 1.0f) {
-                        fVar3 = fVar3 + 0.1f * (1.0f - (local_58.y - fVar2) / fVar4) * fVar1;
+                f32 f4 = mFrameCtrlUnder[UNDER_MOVE0_e].getRate();
+                f32 f5 = (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() - f4) - 0.1f * (r27 * f4);
+                if (r27 != 0 && r27 < mSwBlur.field_0x014) {
+                    f32 f6 = mSwBlur.field_0x034[r27].y - mSwBlur.field_0x034[r27 - 1].y;
+                    if (std::abs(f6) > 1.0f) {
+                        f32 temp = (1.0f - (sp08.y - (&mSwBlur.field_0x034[0])[r27 - 1].y) / f6);
+                        f5 = f5 + 0.1f * (temp * f4);
                     }
                 }
-                if (fVar3 < 0.0f) {
-                    fVar3 = 0.0f;
+                if (f5 < 0.0f) {
+                    f5 = 0.0f;
                 }
-                mFrameCtrlUnder[UNDER_MOVE0_e].setFrame(fVar3);
+                mFrameCtrlUnder[UNDER_MOVE0_e].setFrame(f5);
                 mFrameCtrlUnder[UNDER_MOVE0_e].setRate(0.0f);
-                m35EC = fVar3;
+                m35EC = f5;
                 m34D0 = 10;
-                setHammerQuake(&mGndChk, &local_58, iVar5);
+                setHammerQuake(&mGndChk, &sp08, r26);
                 return true;
             }
         } else {
@@ -393,8 +372,13 @@ BOOL daPy_lk_c::procHammerFrontSwing() {
         setShapeAngleToAtnActor();
         m34D4 = shape_angle.y;
     } else {
-        cLib_addCalcAngleS(&shape_angle.y, m34D4, daPy_HIO_turn_c0::m.field_0x4,
-                           daPy_HIO_turn_c0::m.field_0x0, daPy_HIO_turn_c0::m.field_0x2);
+        cLib_addCalcAngleS(
+            &shape_angle.y,
+            m34D4,
+            daPy_HIO_turn_c0::m.field_0x4,
+            daPy_HIO_turn_c0::m.field_0x0,
+            daPy_HIO_turn_c0::m.field_0x2
+        );
     }
     current.angle.y = shape_angle.y;
     onResetFlg0(daPyRFlg0_UNK2);
diff --git a/src/d/actor/d_a_player_hang.inc b/src/d/actor/d_a_player_hang.inc
index 1fa3fedc8..03bb0a907 100644
--- a/src/d/actor/d_a_player_hang.inc
+++ b/src/d/actor/d_a_player_hang.inc
@@ -495,7 +495,7 @@ BOOL daPy_lk_c::procHangMove() {
                         cM3dGPla* triPla = dComIfG_Bgsp()->GetTriPla(mLinkLinChk);
                         s16 sVar6 = cM_atan2s(triPla->GetNP()->x, triPla->GetNP()->z) + 0x8000;
                         if (sVar6 != shape_angle.y) {
-                            if ((short)(current.angle.y - shape_angle.y) > 0) {
+                            if ((s16)(current.angle.y - shape_angle.y) > 0) {
                                 current.angle.y = sVar6 + 0x4000;
                             } else {
                                 current.angle.y = sVar6 + -0x4000;
diff --git a/src/d/actor/d_a_player_main.cpp b/src/d/actor/d_a_player_main.cpp
index 322f26275..6c137e973 100644
--- a/src/d/actor/d_a_player_main.cpp
+++ b/src/d/actor/d_a_player_main.cpp
@@ -658,7 +658,7 @@ u16 daPy_lk_c::checkNormalFace() {
     if (mFace != daPyFace_UNKNOWN) {
         return mFace;
     }
-    if ((checkResetFlg0(daPyRFlg0_UNK40000))) {
+    if (checkResetFlg0(daPyRFlg0_UNK40000)) {
         return daPyFace_TMABAG;
     }
     if (checkUpperAnime(LKANM_BCK_GRABWAITB)) {
@@ -667,7 +667,7 @@ u16 daPy_lk_c::checkNormalFace() {
     if (checkUpperAnime(LKANM_BCK_GRABWAIT)) {
         return daPyFace_TMABAE;
     }
-    if ((daPy_dmEcallBack_c::checkCurse()) || (checkRestHPAnime())) {
+    if ((daPy_dmEcallBack_c::checkCurse()) || checkRestHPAnime()) {
         return daPyFace_TMABAF;
     }
     if (checkNoDamageMode()) {
@@ -682,14 +682,14 @@ u16 daPy_lk_c::checkNormalFace() {
     if (checkNoResetFlg0(daPyFlg0_HEAVY_STATE)) {
         return daPyFace_TMABAH;
     }
-    if (checkNoResetFlg1(daPyFlg1_UNK1000000) && (!checkModeFlg(ModeFlg_00000001))) {
+    if (checkNoResetFlg1(daPyFlg1_UNK1000000) && !checkModeFlg(ModeFlg_00000001)) {
         return daPyFace_TDASHKAZE;
     }
     if (((checkUpperReadyAnime() || ((checkNoResetFlg1(daPyFlg1_UNK400) ||
-                                      ((mpAttnActorLockOn != NULL) &&
+                                      (mpAttnActorLockOn != NULL &&
                                        (fopAcM_GetGroup(mpAttnActorLockOn) == fopAc_ENEMY_e))))) ||
-         (checkEquipHeavyBoots())) ||
-        (mEquipItem == dItem_SKULL_HAMMER_e))
+         checkEquipHeavyBoots()) ||
+        mEquipItem == dItem_SKULL_HAMMER_e)
     {
         return daPyFace_TMABAC;
     }
@@ -716,12 +716,12 @@ u16 daPy_lk_c::checkNormalFace() {
             return daPyFace_TMABACC;
         }
     }
-    if ((mCurProc == daPyProc_WAIT_e) && (!dComIfGp_event_runCheck())) {
+    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;
         }
@@ -744,9 +744,9 @@ void daPy_lk_c::setTextureAnime(u16 param_1, int param_2) {
     }
     u16 btp_idx = mTexAnmIndexTable[param_1].mBtpIdx;
     u16 btk_idx = mTexAnmIndexTable[param_1].mBtkIdx;
-    if (((param_1 < 0x13) &&
-         (checkMabaAnimeBtp(m_tex_anm_heap.mIdx))) &&
-        (mFace == daPyFace_UNKNOWN))
+    if ((param_1 < 0x13 &&
+         checkMabaAnimeBtp(m_tex_anm_heap.mIdx)) &&
+        mFace == daPyFace_UNKNOWN)
     {
         param_2 = m3530;
         bVar3 = true;
@@ -754,19 +754,19 @@ void daPy_lk_c::setTextureAnime(u16 param_1, int param_2) {
         bVar3 = false;
     }
     if (m_tex_anm_heap.mIdx == btp_idx) {
-        if ((mFace == daPyFace_UNKNOWN) && (!checkModeFlg(ModeFlg_00000100 | ModeFlg_00000400))) {
+        if (mFace == daPyFace_UNKNOWN && !checkModeFlg(ModeFlg_00000100 | ModeFlg_00000400)) {
             m3530 = param_2;
         }
     } else {
         m_tex_anm_heap.mIdx = btp_idx;
-        if ((m_tex_anm_heap.field_0x2 == 0xFFFF) && (m_tex_anm_heap.field_0x4 == 0xFFFF)) {
+        if (m_tex_anm_heap.field_0x2 == 0xFFFF && m_tex_anm_heap.field_0x4 == 0xFFFF) {
             setTextureAnimeResource(loadTextureAnimeResource(btp_idx, 0), 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 (dVar9 < 0.44f) {
@@ -834,7 +834,6 @@ void daPy_lk_c::setTextureAnime(u16 param_1, int param_2) {
         setTextureScrollResource(loadTextureScrollResource(m_tex_scroll_heap.mIdx, 0), 0);
         daPy_matAnm_c::onMabaFlg();
     }
-    return;
 }
 
 /* 80104E08-80104EC8       .text setPriTextureAnime__9daPy_lk_cFUsi */
@@ -919,7 +918,6 @@ void daPy_lk_c::resetDemoTextureAnime() {
             }
         }
     }
-    return;
 }
 
 /* 80105164-80105220       .text setTextureScrollResource__9daPy_lk_cFP19J3DAnmTextureSRTKeyi */
@@ -1019,7 +1017,6 @@ void daPy_lk_c::playTextureAnime() {
             m3532 = mpTexScrollResData->getFrameMax();
         }
     }
-    return;
 }
 
 /* 8010552C-8010558C       .text checkPlayerGuard__9daPy_lk_cCFv */
@@ -1048,7 +1045,6 @@ void daPy_lk_c::setOutPower(f32 param_1, s16 param_2, int param_3) {
     if (param_3 != 0) {
         onNoResetFlg1(daPyFlg1_UNK10000000);
     }
-    return;
 }
 
 /* 801056E4-80105814       .text checkSightLine__9daPy_lk_cFfP4cXyz */
@@ -1094,7 +1090,6 @@ void daPy_lk_c::setBootsModel(J3DModel** pBootModels) {
 
 /* 80105910-80106660       .text setItemModel__9daPy_lk_cFv */
 s32 daPy_lk_c::setItemModel() {
-    /* Nonmatching - regalloc */
     f32 fVar1;
     f32 fVar2;
     f32 dVar15;
@@ -1134,8 +1129,7 @@ s32 daPy_lk_c::setItemModel() {
         if (mEquipItem == daPyItem_UNK10A_e) {
             mDoMtx_stack_c::transS(50.0f, -48.0f, -14.0f);
             mDoMtx_stack_c::XYZrotM(-0x33FC, -0x2CC, 0x3519);
-            mDoMtx_stack_c::revConcat(dComIfGp_getShipActor()->mpHeadAnm->getModel()->getAnmMtx(0) +
-                                      0x1e);
+            mDoMtx_stack_c::revConcat(dComIfGp_getShipActor()->mpHeadAnm->getModel()->getAnmMtx(0x0A));
             mpEquipItemModel->setBaseTRMtx(mDoMtx_stack_c::get());
         } else if (mEquipItem == daPyItem_UNK104_e) {
             mDoMtx_stack_c::transS(14.5f, 34.5f, 0.0f);
@@ -1156,73 +1150,66 @@ s32 daPy_lk_c::setItemModel() {
             } else {
                 mpEquipItemModel->setBaseTRMtx(mpCLModel->getAnmMtx(0xF));
             }
-        } else if ((mEquipItem == dItem_DEKU_LEAF_e) || (mEquipItem == daPyItem_SWORD_e) ||
-                   (mEquipItem == dItem_WIND_WAKER_e) ||
-                   ((mEquipItem == dItem_SKULL_HAMMER_e || (mEquipItem == dItem_HOOKSHOT_e) ||
-                     ((mEquipItem == dItem_TINGLE_TUNER_e ||
-                       ((checkBottleItem(mEquipItem) || (checkPhotoBoxItem(mEquipItem)))))))))
+        } else if (mEquipItem == dItem_DEKU_LEAF_e || mEquipItem == daPyItem_SWORD_e ||
+                   mEquipItem == dItem_WIND_WAKER_e || mEquipItem == dItem_SKULL_HAMMER_e ||
+                   mEquipItem == dItem_HOOKSHOT_e || mEquipItem == dItem_TINGLE_TUNER_e ||
+                   checkBottleItem(mEquipItem) || checkPhotoBoxItem(mEquipItem))
         {
             mpEquipItemModel->setBaseTRMtx(pMVar13);
-            if ((mEquipItem == dItem_DEKU_LEAF_e) &&
-                ((mCurProc != daPyProc_FAN_SWING_e && (mCurProc != daPyProc_FAN_GLIDE_e))))
+            if (mEquipItem == dItem_DEKU_LEAF_e &&
+                (mCurProc != daPyProc_FAN_SWING_e && mCurProc != daPyProc_FAN_GLIDE_e))
             {
                 setShapeFanLeaf();
-            } else {
-                if (checkBottleItem(mEquipItem)) {
-                    if (mpBottleContentsModel != NULL) {
-                        if (mEquipItem == dItem_FIREFLY_BOTTLE_e) {
-                            cXyz bottleScale; // ?
-                            fVar1 =
-                                1.0f +
-                                0.1f * cM_ssin(cM_rad2s(((37.699112f * mpEquipItemBrk->getFrame()) /
-                                                         mpEquipItemBrk->getFrameMax())));
-                            bottleScale.setall(fVar1);
-                            mDoMtx_stack_c::transS(11.0f, 0.0f, 0.0f);
-                            mDoMtx_stack_c::revConcat(pMVar13);
-                            mpBottleContentsModel->setBaseTRMtx(mDoMtx_stack_c::get());
-                            mpBottleContentsModel->setBaseScale(bottleScale);
-                            simpleAnmPlay(mpEquipItemBrk);
-                        } else {
-                            mpBottleContentsModel->setBaseTRMtx(pMVar13);
-                        }
-                    }
-                    if (mpBottleCapModel != NULL) {
-                        mpBottleCapModel->setBaseTRMtx(pMVar13);
-                    }
-                } 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());
-                            fVar1 = m35EC;
-                            if (fVar1 < 0.0f) {
-                                m35EC = fVar1 + fVar2;
-                            } else if (fVar1 >= fVar2) {
-                                m35EC = fVar1 - fVar2;
-                            }
-                        }
-                    } else if ((mEquipItem == dItem_WIND_WAKER_e) &&
-                               ((mCurProc != daPyProc_TACT_WAIT_e && (mpEquipItemBrk != NULL))))
-                    {
-                        fVar1 = mpEquipItemBrk->getFrame() - 1.0f;
-                        if (fVar1 < 0.0f) {
-                            fVar1 = 0.0f;
-                        }
-                        mpEquipItemBrk->setFrame(fVar1);
+            } else if (checkBottleItem(mEquipItem)) {
+                if (mpBottleContentsModel != NULL) {
+                    if (mEquipItem == dItem_FIREFLY_BOTTLE_e) {
+                        cXyz bottleScale; // ?
+                        fVar1 =
+                            1.0f + 0.1f * cM_ssin(cM_rad2s(
+                                              (37.699112f * mpEquipItemBrk->getFrame()) / mpEquipItemBrk->getFrameMax()
+                                          ));
+                        bottleScale.setall(fVar1);
+                        mDoMtx_stack_c::transS(11.0f, 0.0f, 0.0f);
+                        mDoMtx_stack_c::revConcat(pMVar13);
+                        mpBottleContentsModel->setBaseTRMtx(mDoMtx_stack_c::get());
+                        mpBottleContentsModel->setBaseScale(bottleScale);
+                        simpleAnmPlay(mpEquipItemBrk);
+                    } else {
+                        mpBottleContentsModel->setBaseTRMtx(pMVar13);
                     }
                 }
+                if (mpBottleCapModel != NULL) {
+                    mpBottleCapModel->setBaseTRMtx(pMVar13);
+                }
+            } 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());
+                    fVar1 = m35EC;
+                    if (fVar1 < 0.0f) {
+                        m35EC = fVar1 + fVar2;
+                    } else if (fVar1 >= fVar2) {
+                        m35EC = fVar1 - fVar2;
+                    }
+                }
+            } else if ((mEquipItem == dItem_WIND_WAKER_e) &&
+                       (mCurProc != daPyProc_TACT_WAIT_e && (mpEquipItemBrk != NULL)))
+            {
+                fVar1 = mpEquipItemBrk->getFrame() - 1.0f;
+                if (fVar1 < 0.0f) {
+                    fVar1 = 0.0f;
+                }
+                mpEquipItemBrk->setFrame(fVar1);
             }
+        } else if (checkBowItem(mEquipItem)) {
+            mpEquipItemModel->setBaseTRMtx(pMVar6);
         } else {
-            if (checkBowItem(mEquipItem)) {
-                mpEquipItemModel->setBaseTRMtx(pMVar6);
-            } else {
-                if (mEquipItem == daPyItem_UNK102_e) {
-                    mpEquipItemModel->setBaseTRMtx(mpCLModel->getAnmMtx(0x4));
-                }
+            if (mEquipItem == daPyItem_UNK102_e) {
+                mpEquipItemModel->setBaseTRMtx(mpCLModel->getAnmMtx(0x4));
             }
         }
         if ((mSwordAnim.getBckAnm() != NULL) && (mCurProc != daPyProc_DEMO_TALISMAN_WAIT_e)) {
@@ -1238,17 +1225,17 @@ s32 daPy_lk_c::setItemModel() {
         }
     }
     mpEquippedSwordModel = mpSwgripmsModel;
-    s32 lVar12;
+    s32 r27;
     if (!checkSwordEquip()) {
-        lVar12 = 0;
+        r27 = 0;
         mSwgripmsabBckAnim.entry(mpSwgripmsModel->getModelData(), 0.0f);
         mpTswgripmsabBrk->setFrame(0.0f);
     } else {
         if (checkNormalSwordEquip()) {
-            lVar12 = 1;
+            r27 = 1;
             mpEquippedSwordModel = mpSwgripaModel;
         } else if (checkFinalMasterSwordEquip()) {
-            lVar12 = 3;
+            r27 = 3;
             mSwgripmsabBckAnim.entry(mpSwgripmsModel->getModelData(), 1.0f);
             mpTswgripmsabBrk->setFrame(1.0f);
             if ((mpEquipItemModel != NULL) && (mEquipItem == daPyItem_SWORD_e)) {
@@ -1261,10 +1248,10 @@ s32 daPy_lk_c::setItemModel() {
         } else {
             if (dComIfGs_getSelectEquip(0) == dItem_MASTER_SWORD_2_e) {
                 mSwgripmsabBckAnim.entry(mpSwgripmsModel->getModelData(), 1.0f);
-                lVar12 = 4;
+                r27 = 4;
             } else {
                 mSwgripmsabBckAnim.entry(mpSwgripmsModel->getModelData(), 0.0f);
-                lVar12 = 2;
+                r27 = 2;
             }
             mpTswgripmsabBrk->setFrame(0.0f);
             if ((mpEquipItemModel != NULL) && (mEquipItem == daPyItem_SWORD_e)) {
@@ -1286,17 +1273,18 @@ s32 daPy_lk_c::setItemModel() {
     }
     if (mEquipItem == daPyItem_SWORD_e) {
         mpEquippedSwordModel->setBaseTRMtx(pMVar13);
-        mDoAud_zelAudio_c::getInterface()->setLinkSwordType(lVar12, 1);
+        mDoAud_zelAudio_c::getInterface()->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(lVar12, 2);
+        mDoAud_zelAudio_c::getInterface()->setLinkSwordType(r27, 2);
     }
     mpEquippedSwordModel->calc();
+    int r27_2;
     if (dComIfGs_getSelectEquip(1) == dItem_MIRROR_SHIELD_e) {
-        lVar12 = 2;
+        r27_2 = 2;
         mpEquippedShieldModel = mpShmsModel;
         if (mpTshmsBtk != NULL) {
             dVar16 = mpTshmsBtk->getFrame();
@@ -1309,24 +1297,24 @@ s32 daPy_lk_c::setItemModel() {
             }
         }
     } else if (dComIfGs_getSelectEquip(1) != dItem_NONE_e) {
-        lVar12 = 1;
+        r27_2 = 1;
         mpEquippedShieldModel = mpShaModel;
     } else {
-        lVar12 = 0;
+        r27_2 = 0;
         mpEquippedShieldModel = mpShaModel;
     }
     if (mCurProc == daPyProc_DEMO_LAST_COMBO_e) {
         mpEquippedShieldModel->setBaseTRMtx(mpCLModel->getBaseTRMtx());
-        mDoAud_zelAudio_c::getInterface()->setLinkShieldType(lVar12, 1);
+        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))))
     {
         mpEquippedShieldModel->setBaseTRMtx(pMVar6);
-        mDoAud_zelAudio_c::getInterface()->setLinkShieldType(lVar12, 1);
+        mDoAud_zelAudio_c::getInterface()->setLinkShieldType(r27_2, 1);
     } else {
-        if (lVar12 == 2) {
+        if (r27_2 == 2) {
             mDoMtx_stack_c::transS(15.5f, 4.75f, -0.2f);
         } else {
             mDoMtx_stack_c::transS(15.5f, 4.75f, 0.0f);
@@ -1334,7 +1322,7 @@ s32 daPy_lk_c::setItemModel() {
         mDoMtx_stack_c::ZrotM(-0x4000);
         mDoMtx_stack_c::revConcat(pMVar14);
         mpEquippedShieldModel->setBaseTRMtx(mDoMtx_stack_c::get());
-        if ((lVar12 == 2) && (((m_anm_heap_under[UNDER_MOVE0_e].mIdx == LKANM_BCK_WALK ||
+        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))))))
@@ -1353,7 +1341,7 @@ s32 daPy_lk_c::setItemModel() {
             mDoMtx_stack_c::now[2][3] = dVar17;
             mpEquippedShieldModel->setBaseTRMtx(mDoMtx_stack_c::get());
         }
-        mDoAud_zelAudio_c::getInterface()->setLinkShieldType(lVar12, 2);
+        mDoAud_zelAudio_c::getInterface()->setLinkShieldType(r27_2, 2);
     }
     mAtngshaBck.entry(mpEquippedShieldModel->getModelData(), m35E8);
     mpEquippedShieldModel->calc();
@@ -1538,7 +1526,6 @@ void daPy_lk_c::hideHatAndBackle(J3DMaterial* param_1) {
     if (checkNoResetFlg1(daPyFlg1_CASUAL_CLOTHES)) {
         mpCLModelData->getJointNodePointer(0x29)->getMesh()->getShape()->hide();
     }
-    return;
 }
 
 /* 80106D8C-80106E50       .text drawMirrorLightModel__9daPy_lk_cFv */
@@ -1551,7 +1538,6 @@ void daPy_lk_c::drawMirrorLightModel() {
         dComIfGd_getXluList()->entryImm(&mMirrorPacket, 0xFF);
         updateDLSetLight(mpYmsls00Model, 0);
     }
-    return;
 }
 
 /* 80106E50-80107210       .text drawShadow__9daPy_lk_cFv */
@@ -1626,7 +1612,6 @@ void daPy_lk_c::drawShadow() {
             }
         }
     }
-    return;
 }
 
 /* 80107210-8010728C       .text offBodyEffect__9daPy_lk_cFv */
@@ -1647,7 +1632,6 @@ void daPy_lk_c::offBodyEffect() {
         return;
     }
     m3460[1].getEmitter()->stopDrawParticle();
-    return;
 }
 
 /* 8010728C-80107308       .text onBodyEffect__9daPy_lk_cFv */
@@ -1668,7 +1652,6 @@ void daPy_lk_c::onBodyEffect() {
         return;
     }
     m3460[1].getEmitter()->playDrawParticle();
-    return;
 }
 
 /* 80107308-80108204       .text draw__9daPy_lk_cFv */
@@ -2023,7 +2006,6 @@ void daPy_lk_c::setAtnList() {
     if (mpAttnEntryZ != NULL) {
         mpAttnActorZ = mpAttnEntryZ->getActor();
     }
-    return;
 }
 
 /* 8010841C-8010848C       .text setActor__16daPy_actorKeep_cFv */
@@ -2165,7 +2147,6 @@ void daPy_lk_c::setDoStatusBasic() {
             }
         }
     }
-    return;
 }
 
 /* 801088E8-80108A9C       .text setDoStatus__9daPy_lk_cFv */
@@ -2212,7 +2193,6 @@ void daPy_lk_c::setDoStatus() {
         }
     }
     setDoStatusBasic();
-    return;
 }
 
 /* 80108A9C-80108B08       .text getDirectionFromAngle__9daPy_lk_cFs */
@@ -2290,7 +2270,6 @@ void daPy_lk_c::setNormalSpeedF(f32 param_1, f32 param_2, f32 param_3, f32 param
     } else {
         cLib_addCalc(&mVelocity, dVar6, param_2, temp_f3, param_4);
     }
-    return;
 }
 
 /* 80108D80-8010959C       .text posMoveFromFootPos__9daPy_lk_cFv */
@@ -2333,7 +2312,7 @@ void daPy_lk_c::posMoveFromFootPos() {
         dVar14 = cM_ssin(m34E0);
         dVar12 = cM_scos(m34E0);
         for (iVar7 = 0; iVar7 < 2; iVar7++) {
-            local_90 = (local_78[0] + local_b4);
+            local_90 = local_78[0] + local_b4;
             local_b4 *= 0.5f;
             local_78[iVar7].x = mDoMtx_stack_c::now[1][3];
             local_78[iVar7].y = mDoMtx_stack_c::now[1][3] - dVar14;
@@ -2344,7 +2323,7 @@ void daPy_lk_c::posMoveFromFootPos() {
         } else {
             m34BC = 1;
         }
-        local_c0 = (local_b4 - mFootData[0].field_0x018);
+        local_c0 = local_b4 - mFootData[0].field_0x018;
         dVar12 = local_c0.absXZ();
         if ((m3598 < 1.0f) && (std::abs(m35B4 - mStickDistance) < 0.2f)) {
             dVar12 = ((dVar12 * 0.3f) + 0.7f * m359C);
@@ -2422,7 +2401,7 @@ void daPy_lk_c::posMoveFromFootPos() {
         if (checkHeavyStateOn()) {
             speed.y += gravity * 2.25f;
             if (speed.y < (maxFallSpeed * 1.5f)) {
-                speed.y = (maxFallSpeed * 1.5f);
+                speed.y = maxFallSpeed * 1.5f;
             }
         } else {
             speed.y += gravity;
@@ -2440,7 +2419,6 @@ void daPy_lk_c::posMoveFromFootPos() {
         }
         m359C = dVar12;
     }
-    return;
 }
 
 /* 8010959C-80109E80       .text posMove__9daPy_lk_cFv */
@@ -2592,7 +2570,6 @@ void daPy_lk_c::posMove() {
             current.pos.y += local_a0.y;
         }
     }
-    return;
 }
 
 /* 80109E80-80109ED8       .text setShapeAngleToAtnActor__9daPy_lk_cFv */
@@ -2684,7 +2661,7 @@ void daPy_lk_c::setBodyAngleXReadyAnime() {
 
     mDoMtx_multVecZero(mpCLModel->getAnmMtx(0x2), &local_1c);
     if (mpAttnActorLockOn != NULL) {
-        local_28 = (mpAttnActorLockOn->eyePos - local_1c);
+        local_28 = mpAttnActorLockOn->eyePos - local_1c;
         local_28.y = local_28.y - 20.0f;
         if (local_28.abs() < 1.0f) {
             sVar3 = 0;
@@ -2700,7 +2677,6 @@ void daPy_lk_c::setBodyAngleXReadyAnime() {
         sVar3 = 0;
     }
     cLib_addCalcAngleS(&mBodyAngle.x, sVar3, 4, 0xc00, 0x180);
-    return;
 }
 
 /* 8010A4D4-8010A96C       .text setSpeedAndAngleNormal__9daPy_lk_cFs */
@@ -2714,7 +2690,7 @@ void daPy_lk_c::setSpeedAndAngleNormal(s16 param_1) {
 
     if (mStickDistance > 0.05f) {
         bVar2 = false;
-        dVar11 = (mStickDistance * mStickDistance);
+        dVar11 = mStickDistance * mStickDistance;
         if (checkHeavyStateOn()) {
             dVar11 *= 1.0f / (daPy_HIO_move_c0::m.field_0x80 * daPy_HIO_move_c0::m.field_0x80);
         }
@@ -2804,7 +2780,6 @@ void daPy_lk_c::setSpeedAndAngleNormal(s16 param_1) {
     }
     setNormalSpeedF(dVar9, daPy_HIO_move_c0::m.field_0x24, daPy_HIO_move_c0::m.field_0x1C,
                     daPy_HIO_move_c0::m.field_0x20);
-    return;
 }
 
 /* 8010A96C-8010AA90       .text setSpeedAndAngleAtn__9daPy_lk_cFv */
@@ -2890,7 +2865,6 @@ void daPy_lk_c::setSpeedAndAngleAtnActor() {
         daPy_HIO_atnMove_c0::m.field_0x10,
         daPy_HIO_atnMove_c0::m.field_0x14
     );
-    return;
 }
 
 /* 8010AC8C-8010ACEC       .text setFrameCtrl__9daPy_lk_cFP12J3DFrameCtrlUcssff */
@@ -2939,7 +2913,7 @@ void daPy_lk_c::setBlendMoveAnime(f32 param_1) {
     }
     f32 dVar18 = (std::abs(mVelocity * fVar1) / mMaxNormalSpeed);
     J3DFrameCtrl& frameCtrl = mFrameCtrlUnder[UNDER_MOVE1_e];
-    if ((dComIfGp_event_runCheck()) || (mDemo.getDemoType() != 0)) {
+    if (dComIfGp_event_runCheck() || (mDemo.getDemoType() != 0)) {
         dVar17 = daPy_HIO_move_c0::m.field_0x44;
         dVar16 = daPy_HIO_move_c0::m.field_0x64;
     } else if (checkHeavyStateOn()) {
@@ -2956,7 +2930,7 @@ void daPy_lk_c::setBlendMoveAnime(f32 param_1) {
     } else if (checkHeavyStateOn()) {
         if (((m373C.abs2XZ() > 25.0f) &&
                 (cLib_distanceAngleS(cM_atan2s(m373C.x, m373C.z), shape_angle.y) >= 0x4000)) ||
-            (((checkNoResetFlg1(daPyFlg1_UNK10000000)) && (m3644 > 5.0f)) &&
+            ((checkNoResetFlg1(daPyFlg1_UNK10000000) && m3644 > 5.0f) &&
                 (cLib_distanceAngleS(m3640, shape_angle.y) >= 0x4000)))
         {
             dVar10 = ANM_WALKHBOOTSKAZE;
@@ -2973,7 +2947,7 @@ void daPy_lk_c::setBlendMoveAnime(f32 param_1) {
                 offNoResetFlg1(daPyFlg1_UNK1000000);
             }
         }
-    } else if ((m3580 != 8) && (m34E2 <= -0x11C7)) {
+    } else if (m3580 != 8 && m34E2 <= -0x11C7) {
         dVar10 = ANM_WALKSLOPE;
         dVar9 = ANM_WALKSLOPE;
         if (!checkNoResetFlg1(daPyFlg1_UNK80)) {
@@ -2983,9 +2957,9 @@ void daPy_lk_c::setBlendMoveAnime(f32 param_1) {
     } else {
         dVar10 = ANM_WALK;
         dVar14 = m3730.abs2XZ();
-        if (((dVar14 > 25.0f) &&
+        if ((dVar14 > 25.0f &&
                 (cLib_distanceAngleS(cM_atan2s(m3730.x, m3730.z), shape_angle.y) >= 0x4000)) ||
-            (((checkNoResetFlg1(daPyFlg1_UNK10000000)) && (m3644 > 5.0f)) &&
+            ((checkNoResetFlg1(daPyFlg1_UNK10000000) && m3644 > 5.0f) &&
                 (cLib_distanceAngleS(m3640, shape_angle.y) >= 0x4000)))
         {
             dVar9 = ANM_DASHKAZE;
@@ -3021,11 +2995,11 @@ void daPy_lk_c::setBlendMoveAnime(f32 param_1) {
     } else {
         bVar3 = false;
     }
-    if ((mStickDistance < 0.05f) &&
-        ((dVar14 >= 25.0f || ((dVar14 >= 0.09f && ((m34C3 == 9 || (m34C3 == 10))))))))
+    if (mStickDistance < 0.05f &&
+        ((dVar14 >= 25.0f || ((dVar14 >= 0.09f && ((m34C3 == 9 || m34C3 == 10)))))))
     {
         seStartMapInfo(JA_SE_LK_SLIP_SUS);
-        if (((m34C3 != 9) && (bVar3)) || ((m34C3 != 10 && (!bVar3)))) {
+        if ((m34C3 != 9 && (bVar3)) || ((m34C3 != 10 && (!bVar3)))) {
             if (bVar3) {
                 setSingleMoveAnime(ANM_SLIPICE, daPy_HIO_iceSlip_c0::m.field_0x10,
                                    daPy_HIO_iceSlip_c0::m.field_0x14,
@@ -3052,14 +3026,14 @@ void daPy_lk_c::setBlendMoveAnime(f32 param_1) {
         if (m34C3 == 9) {
             param_1 = daPy_HIO_basic_c0::m.field_0xC;
         }
-        if ((dVar18 < daPy_HIO_move_c0::m.field_0x2C) || (checkHeavyStateOn())) {
+        if (dVar18 < daPy_HIO_move_c0::m.field_0x2C || checkHeavyStateOn()) {
             if (checkHeavyStateOn()) {
-                dVar14 = (dVar18 / daPy_HIO_move_c0::m.field_0x80);
+                dVar14 = dVar18 / daPy_HIO_move_c0::m.field_0x80;
                 if (dVar14 > 0.55f) {
                     bVar4 = true;
                 }
             } else {
-                dVar14 = (dVar18 / daPy_HIO_move_c0::m.field_0x2C);
+                dVar14 = dVar18 / daPy_HIO_move_c0::m.field_0x2C;
             }
             dVar11 = ANM_WAITS;
             if (checkModeFlg(ModeFlg_00000001)) {
@@ -3073,8 +3047,8 @@ void daPy_lk_c::setBlendMoveAnime(f32 param_1) {
                 }
                 fVar1 = m3598 = 0.0f;
                 iVar6 = 2;
-                if (((checkNoResetFlg1(daPyFlg1_CONFUSE)) && (mDemo.getDemoType() == 0)) &&
-                    (!dComIfGp_event_runCheck()))
+                if ((checkNoResetFlg1(daPyFlg1_CONFUSE) && (mDemo.getDemoType() == 0)) &&
+                    !dComIfGp_event_runCheck())
                 {
                     if (m_anm_heap_under[UNDER_MOVE0_e].mIdx != LKANM_BCK_WAITQ) {
                         setSingleMoveAnime(ANM_WAITQ, daPy_HIO_move_c0::m.field_0x84, fVar1, -1,
@@ -3083,7 +3057,7 @@ void daPy_lk_c::setBlendMoveAnime(f32 param_1) {
                     }
                     return;
                 }
-                if ((shape_angle.y != m34DE) && (!mpAttention->Lockon())) {
+                if (shape_angle.y != m34DE && !mpAttention->Lockon()) {
                     sVar5 = (s16)(shape_angle.y - m34DE);
                     if (sVar5 > 0) {
                         dVar10 = ANM_ATNWLS;
@@ -3167,7 +3141,6 @@ void daPy_lk_c::setBlendMoveAnime(f32 param_1) {
             setHandModel(dVar10);
         }
     }
-    return;
 }
 
 /* 8010B798-8010BB08       .text setBlendAtnBackMoveAnime__9daPy_lk_cFf */
@@ -3209,7 +3182,7 @@ void daPy_lk_c::setBlendAtnBackMoveAnime(f32 param_1) {
         dVar6 = fVar1;
         setMoveAnime(fVar1, daPy_HIO_atnMoveB_c0::m.field_0x24, daPy_HIO_atnMoveB_c0::m.field_0x28,
                      ANM_ATNWB, ANM_ATNDB, 4, param_1);
-        m3598 = (1.0f - dVar6);
+        m3598 = 1.0f - dVar6;
         if ((frameCtrl.checkPass(5.0f)) || (frameCtrl.checkPass(15.0f))) {
             onResetFlg0(daPyRFlg0_RIGHT_FOOT_ON_GROUND);
         } else if ((frameCtrl.checkPass(3.0f)) || (frameCtrl.checkPass(13.0f))) {
@@ -3237,7 +3210,6 @@ void daPy_lk_c::setBlendAtnBackMoveAnime(f32 param_1) {
         resetFootEffect();
     }
     setHandModel(ANM_ATNDB);
-    return;
 }
 
 /* 8010BB08-8010C010       .text setBlendAtnMoveAnime__9daPy_lk_cFf */
@@ -3352,7 +3324,7 @@ void daPy_lk_c::setBlendAtnMoveAnime(f32 param_1) {
                     fVar3 = 1.9f * daPy_HIO_atnMove_c0::m.field_0x2C;
                     onResetFlg0(daPyRFlg0_UNK40000);
                 } else {
-                    fVar3 = (daPy_HIO_atnMove_c0::m.field_0x2C * dVar11);
+                    fVar3 = daPy_HIO_atnMove_c0::m.field_0x2C * dVar11;
                 }
                 setMoveAnime(1.0f, fVar3, fVar3, dVar9, dVar9, 4, dVar6);
                 m3598 = 0.0f;
@@ -3382,7 +3354,6 @@ void daPy_lk_c::setBlendAtnMoveAnime(f32 param_1) {
         }
         setHandModel(dVar9);
     }
-    return;
 }
 
 /* 8010C010-8010C100       .text setAnimeEquipSword__9daPy_lk_cFi */
@@ -3606,7 +3577,6 @@ void daPy_lk_c::setFallVoice() {
             setTextureAnime(0x56, 0);
         }
     }
-    return;
 }
 
 /* 8010C7F4-8010C854       .text keepItemData__9daPy_lk_cFv */
@@ -3975,7 +3945,6 @@ void daPy_lk_c::checkItemAction() {
             }
         }
     }
-    return;
 }
 
 /* 8010D754-8010D810       .text getSlidePolygon__9daPy_lk_cFv */
@@ -4372,7 +4341,6 @@ void daPy_lk_c::setShieldGuard() {
     } else {
         mCyl.OffTgShield();
     }
-    return;
 }
 
 /* 8010E75C-8010E7C4       .text checkItemModeActorPointer__9daPy_lk_cFv */
@@ -4396,7 +4364,6 @@ BOOL daPy_lk_c::checkNextActionItemFly() {
             checkNextActionBoomerangFly();
         }
     }
-    return;
 }
 
 /* 8010E828-8010EC78       .text checkNextMode__9daPy_lk_cFi */
@@ -4605,7 +4572,7 @@ void daPy_lk_c::setFrontWallType() {
             iVar10 = dComIfG_Bgsp()->GetWallCode(mLinkLinChk);
             if (iVar10 != 4 && iVar10 != 5) {
                 iVar9 = 2;
-                dVar12 = (2.0f * dVar12);
+                dVar12 = 2.0f * dVar12;
                 for (; iVar9 >= 0; iVar9--) {
                     spA8.set(current.pos.x, current.pos.y + ((mAcchCir[iVar9]).GetWallH()), current.pos.z);
                     sp9C.set(spA8.x - (dVar12 * pVVar6->GetNP()->x), spA8.y, spA8.z - (dVar12 * pVVar6->GetNP()->z));
@@ -4946,7 +4913,7 @@ BOOL daPy_lk_c::changeLandProc(f32 param_1) {
     f32 dVar6;
     f32 dVar7;
 
-    dVar7 = (m35F0 - current.pos.y);
+    dVar7 = m35F0 - current.pos.y;
     if ((mCurrAttributeCode != dBgS_Attr_GIANT_FLOWER_e) &&
         ((dVar7 >= (100.0f * daPy_HIO_fall_c0::m.field_0x14))))
     {
@@ -5035,7 +5002,6 @@ void daPy_lk_c::setDashDamage() {
     mDamageWaitTimer = daPy_HIO_dam_c0::m.field_0x2;
     voiceStart(2);
     seStartOnlyReverb(JA_SE_LK_DAMAGE_NORMAL);
-    return;
 }
 
 /* 801104E4-8011054C       .text checkAtHitEnemy__9daPy_lk_cFP12dCcD_GObjInf */
@@ -5618,7 +5584,6 @@ void daPy_lk_c::setOldRootQuaternion(s16 param_1, s16 param_2, s16 param_3) {
             mDoMtx_QuatConcat(&afStack_28, &local_38, m_old_fdata->getOldFrameQuaternion(0));
         }
     }
-    return;
 }
 
 /* 80111E54-80111EFC       .text checkRestHPAnime__9daPy_lk_cFv */
@@ -8700,7 +8665,7 @@ int daPy_lk_c::setLegAngle(f32 param_1, int param_2, s16* param_3, s16* param_4)
     if (std::abs(param_1) < 0.1f) {
         return false;
     }
-    dVar9 = (0.5f * param_1);
+    dVar9 = 0.5f * param_1;
     if (dVar9 > 10.0f) {
         dVar9 = 10.0f;
     }
@@ -8822,7 +8787,7 @@ void daPy_lk_c::footBgCheck() {
     dVar15 = C_BG_MIN_HEIGHT;
     do {
         cStack_dc = ((local_ac[iVar11] + local_a0[iVar11]) * 0.5f);
-        local_f4 = (cStack_dc - pdVar9->field_0x018);
+        local_f4 = cStack_dc - pdVar9->field_0x018;
         dVar14 = local_f4.abs2XZ();
         if ((dVar14 < dVar20) && (uVar2 != 0)) {
             if (pdVar9->field_0x001 != 0) {
@@ -8960,7 +8925,6 @@ void daPy_lk_c::footBgCheck() {
         iVar8 = iVar8 + 4;
         pdVar9 = pdVar9 + 1;
     } while (iVar11 < 2);
-    return;
 }
 
 /* 8011ABB0-8011AC78       .text setWaterY__9daPy_lk_cFv */
@@ -8983,7 +8947,6 @@ void daPy_lk_c::setWaterY() {
             dPa_control_c::onStatus(1);
         }
     }
-    return;
 }
 
 /* 8011AC78-8011AD9C       .text autoGroundHit__9daPy_lk_cFv */
@@ -9027,7 +8990,6 @@ void daPy_lk_c::autoGroundHit() {
     mAcch.SetGroundHit();
     speed.y = 0.0f;
     onNoResetFlg0(daPyFlg0_UNK80000000);
-    return;
 }
 
 /* 8011AD9C-8011AE20       .text checkAttentionPosAngle__9daPy_lk_cFP10fopAc_ac_cPP4cXyz */
@@ -9187,7 +9149,7 @@ void daPy_lk_c::setNeckAngle() {
     
     mDoMtx_multVec(r25, &l_head_center_offset, &spC4);
     mDoMtx_multVec(r25, &l_eye_offset, &sp88);
-    spAC = (sp88 - spC4);
+    spAC = sp88 - spC4;
 
     s16 r23_3;
     s16 r24_2;
@@ -9200,7 +9162,7 @@ void daPy_lk_c::setNeckAngle() {
     if (((checkModeFlg(ModeFlg_00000080 | ModeFlg_08000000)) && (sp18 != NULL)) &&
         (!checkUpperAnime(LKANM_BCK_DAMDASH)))
     {
-        spB8 = (*sp18 - spC4);
+        spB8 = *sp18 - spC4;
         r27 = cM_atan2s(-spB8.y, spB8.absXZ());
         r23_3 = cM_atan2s(spB8.x, spB8.z) - m34DE;
         if (spB8.absXZ() < 30.0f) {
@@ -9394,7 +9356,6 @@ void daPy_lk_c::checkOriginalHatAnimation() {
     {
         onResetFlg0(daPyRFlg0_UNK800000);
     }
-    return;
 }
 
 /* 8011BEA4-8011CBA4       .text setHatAngle__9daPy_lk_cFv */
@@ -9448,7 +9409,7 @@ void daPy_lk_c::setHatAngle() {
     }
     mDoMtx_multVec(pMVar12, &l_head_center_offset, &VStack_10c);
     mDoMtx_multVec(pMVar12, &l_eye_offset, &VStack_10c);
-    local_130 = (local_130 - VStack_10c);
+    local_130 = local_130 - VStack_10c;
     uVar14 = cM_atan2s(local_130.x, local_130.z);
     if (local_fc - pMVar12[1][3] < 0.0f) {
         uVar14 += 0x8000;
@@ -9496,7 +9457,7 @@ void daPy_lk_c::setHatAngle() {
     local_dc.y = (m3718.y - local_d0.y) - 7.5f;
     local_dc.z = m3718.z - local_d0.z;
     if (!(checkModeFlg(ModeFlg_WHIDE)) || (checkGrabWear())) {
-        cStack_13c = (local_dc * dVar18);
+        cStack_13c = local_dc * dVar18;
         local_dc += cStack_13c;
     }
     if (std::abs(local_dc.x) < 0.01f) {
@@ -9621,7 +9582,6 @@ void daPy_lk_c::setHatAngle() {
             m3518 = -0x1000;
         }
     }
-    return;
 }
 
 /* 8011CBA4-8011CCF4       .text setMoveSlantAngle__9daPy_lk_cFv */
@@ -9642,7 +9602,7 @@ void daPy_lk_c::setMoveSlantAngle() {
                                daPy_HIO_move_c0::m.field_0xC, daPy_HIO_move_c0::m.field_0x8,
                                daPy_HIO_move_c0::m.field_0xA);
         } else {
-            sVar2 = (m351C * daPy_HIO_move_c0::m.field_0x54);
+            sVar2 = m351C * daPy_HIO_move_c0::m.field_0x54;
             if (sVar2 == 0) {
                 m351C = 0;
             } else {
@@ -9673,11 +9633,10 @@ void daPy_lk_c::setWaistAngle() {
         if (m3580 == 8) {
             sVar2 = 0;
         } else {
-            sVar2 = (0.7f * m34E2 * fVar1);
+            sVar2 = 0.7f * m34E2 * fVar1;
         }
     }
     cLib_addCalcAngleS(&m34E0, sVar2, 2, 0x800, 0x200);
-    return;
 }
 
 /* 8011CDB4-8011D070       .text setWorldMatrix__9daPy_lk_cFv */
@@ -9724,7 +9683,6 @@ void daPy_lk_c::setWorldMatrix() {
             shape_angle.z = cM_atan2s(-dVar6, local_44.x);
         }
     }
-    return;
 }
 
 /* 8011D070-8011D0E4       .text setAtParam__9daPy_lk_cFUli11dCcG_At_SplUcUcUcf */
@@ -9819,7 +9777,6 @@ void daPy_lk_c::checkLightHit() {
         m342C.getEmitter()->setGlobalAlpha(0);
         m342C.end();
     }
-    return;
 }
 
 /* 8011D4D0-8011D6C4       .text setSwordAtCollision__9daPy_lk_cFv */
@@ -9846,7 +9803,6 @@ void daPy_lk_c::setSwordAtCollision() {
     mAtCps[0].SetAtVec(local_7c);
     mAtCps[1].SetAtVec(local_7c);
     mAtCps[2].SetAtVec(local_7c);
-    return;
 }
 
 /* 8011D6C4-8011D788       .text getBlurTopRate__9daPy_lk_cFv */
@@ -10253,13 +10209,13 @@ void daPy_lk_c::setCollision() {
         local_e8.x = mFanWindCps.GetEndP()->x;
         local_e8.y = mFanWindCps.GetEndP()->y;
         local_e8.z = mFanWindCps.GetEndP()->z;
-        dVar27 = (m3534 / 10.0f);
+        dVar27 = m3534 / 10.0f;
         fVar4 = (dVar27 * (daPy_HIO_fan_c0::m.field_0x18 - daPy_HIO_fan_c0::m.field_0x1C) +
                  daPy_HIO_fan_c0::m.field_0x1C);
         fVar3 = cM_scos(m3538);
         afStack_a0.set(fVar4 * cM_ssin(m3536) * fVar3, -fVar4 * cM_ssin(m3538),
                        fVar4 * cM_scos(m3536) * fVar3);
-        local_100 = (local_e8 + afStack_a0);
+        local_100 = local_e8 + afStack_a0;
         mArrowLinChk.Set(&local_e8, &local_100, this);
         if (dComIfG_Bgsp()->LineCross(&mArrowLinChk)) {
             pfVar15 = dComIfG_Bgsp()->GetTriPla(mArrowLinChk);
@@ -10366,7 +10322,6 @@ void daPy_lk_c::setCollision() {
         mFanLightCps.ResetAtHit();
         mFanLightCps.OffAtSetBit();
     }
-    return;
 }
 
 /* 8011EC0C-8011EEBC       .text setAttentionPos__9daPy_lk_cFv */
@@ -10419,7 +10374,6 @@ void daPy_lk_c::setAttentionPos() {
         }
         attention_info.position.y = 92.5f + mpCLModel->getBaseTRMtx()[1][3];
     }
-    return;
 }
 
 /* 8011EEBC-8011EF94       .text setRoomInfo__9daPy_lk_cFv */
@@ -10600,7 +10554,7 @@ void daPy_lk_c::setDemoData() {
         if (mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK0E_e) {
             if (mDemo.getTimer() != 0) {
                 mDemo.decTimer();
-                local_78 = (current.pos - home.pos);
+                local_78 = current.pos - home.pos;
                 dVar22 = local_78.abs2XZ();
                 if (dVar22 > 90000.0f) {
                     mDemo.setTimer(0);
@@ -10698,7 +10652,6 @@ void daPy_lk_c::setDemoData() {
     {
         dComIfGp_evmng_cutEnd(mStaffIdx);
     }
-    return;
 }
 
 /* 8011F9C0-8011FF50       .text setStickData__9daPy_lk_cFv */
@@ -10845,7 +10798,6 @@ void daPy_lk_c::setStickData() {
             m3578 = 0;
         }
     }
-    return;
 }
 
 /* 8011FF50-801200F8       .text setBgCheckParam__9daPy_lk_cFv */
@@ -10943,21 +10895,19 @@ void daPy_lk_c::checkFallCode() {
     f32 dVar6;
     cXyz local_44;
 
-    if ((m3580 == 4) || (C_BG_MIN_HEIGHT == mAcch.GetGroundH())) {
-        bVar4 = (m35D0 > mAcch.GetGroundH()) ? TRUE : FALSE;
-        if (((((!bVar4) && (checkModeFlg(ModeFlg_MIDAIR))) &&
-              ((!checkModeFlg(ModeFlg_HOOKSHOT) &&
-                (m35F4 - current.pos.y > 100.0f * daPy_HIO_fall_c0::m.field_0x14)))) ||
-             ((bVar4 && (checkModeFlg(ModeFlg_SWIM))))) ||
-            ((mAcch.ChkGroundHit() &&
-              (!checkNoResetFlg0(daPy_FLG0(daPyFlg0_UNK20000000 | daPyFlg0_UNK80000000))))))
+    if (m3580 == 4 || C_BG_MIN_HEIGHT == mAcch.GetGroundH()) {
+        bVar4 = m35D0 > mAcch.GetGroundH() ? TRUE : FALSE;
+        if (((((!bVar4) && checkModeFlg(ModeFlg_MIDAIR)) &&
+              (!checkModeFlg(ModeFlg_HOOKSHOT) && (m35F4 - current.pos.y > 100.0f * daPy_HIO_fall_c0::m.field_0x14))) ||
+             (bVar4 && checkModeFlg(ModeFlg_SWIM))) ||
+            (mAcch.ChkGroundHit() && (!checkNoResetFlg0(daPy_FLG0(daPyFlg0_UNK20000000 | daPyFlg0_UNK80000000)))))
         {
             startRestartRoom(5, 0xC9, -1.0f, 0);
             mAcch.ClrGroundHit();
         }
         return;
     }
-    if ((checkNoResetFlg0(daPyFlg0_DEKU_SP_RETURN_FLG)) && (checkModeFlg(ModeFlg_SWIM))) {
+    if (checkNoResetFlg0(daPyFlg0_DEKU_SP_RETURN_FLG) && checkModeFlg(ModeFlg_SWIM)) {
         startRestartRoom(5, 0xC9, -1.0f, 0);
         return;
     }
@@ -10967,81 +10917,73 @@ void daPy_lk_c::checkFallCode() {
     if (iVar1 == 0x3f) {
         return;
     }
-    if (((!checkModeFlg(ModeFlg_SWIM)) && (!mAcch.ChkGroundHit())) &&
-        (mCurProc != daPyProc_FAN_GLIDE_e))
+    if ((checkModeFlg(ModeFlg_SWIM) || mAcch.ChkGroundHit()) || mCurProc == daPyProc_FAN_GLIDE_e ||
+        ((dComIfGp_checkPlayerStatus0(0, daPyStts0_SHIP_RIDE_e) && ship != NULL && !ship->checkForceMove()) ||
+         (m3580 == 5 && m35F4 - current.pos.y > 500.0f)))
     {
-        if ((dComIfGp_checkPlayerStatus0(0, daPyStts0_SHIP_RIDE_e)) && (ship != NULL)) {
-            if (!ship->checkForceMove())
-                goto LAB_80120430;
+        g_dComIfG_gameInfo.play.mFwaterTimer = 1;
+        dVar6 = speedF;
+        dVar5 = 1.5f;
+        if (dVar6 < dVar5) {
+            dVar5 = dVar5;
+        } else if (dVar6 > daPy_HIO_move_c0::m.field_0x18) {
+            dVar5 = daPy_HIO_move_c0::m.field_0x18;
+        } else {
+            dVar5 = dVar6;
         }
-        if ((m3580 != 5) || !(m35F4 - current.pos.y > 500.0f))
-            goto LAB_80120704;
-    }
-LAB_80120430:
-    g_dComIfG_gameInfo.play.mFwaterTimer = 1;
-    dVar6 = speedF;
-    dVar5 = 1.5f;
-    if (dVar6 < dVar5) {
-        dVar5 = dVar5;
-    } else if (dVar6 > daPy_HIO_move_c0::m.field_0x18) {
-        dVar5 = daPy_HIO_move_c0::m.field_0x18;
-    } else {
-        dVar5 = dVar6;
-    }
-    if (dComIfGp_checkPlayerStatus0(0, daPyStts0_SHIP_RIDE_e)) {
-        uVar3 = 1;
-        if (dComIfGp_getShipActor() != NULL) {
-            dComIfGp_getShipActor()->onSceneChange();
-        }
-    } else {
-        if (checkModeFlg(ModeFlg_CRAWL)) {
-            if (mFrameCtrlUnder[UNDER_MOVE0_e].getRate() >= 0.0f) {
-                uVar3 = 2;
-            } else {
-                uVar3 = 3;
+        if (dComIfGp_checkPlayerStatus0(0, daPyStts0_SHIP_RIDE_e)) {
+            uVar3 = 1;
+            if (dComIfGp_getShipActor() != NULL) {
+                dComIfGp_getShipActor()->onSceneChange();
             }
         } else {
-            uVar3 = 0;
+            if (checkModeFlg(ModeFlg_CRAWL)) {
+                if (mFrameCtrlUnder[UNDER_MOVE0_e].getRate() >= 0.0f) {
+                    uVar3 = 2;
+                } else {
+                    uVar3 = 3;
+                }
+            } else {
+                uVar3 = 0;
+            }
         }
-    }
-    if (m3580 == 5) {
-        mAcch.ClrGroundHit();
-    }
-    if (!eventInfo.checkCommandDoor()) {
-        if (!dComIfGp_event_compulsory(this)) {
-            return;
-        }
-    }
-    if (dStage_changeSceneExitId(mAcch.m_gnd, dVar5, uVar3, bVar2)) {
-        onNoResetFlg1(daPyFlg1_UNK100000);
-        if (dComIfGs_isEventBit(0x3e10)) {
-            dComIfGs_onEventBit(0x3e01);
-        }
-        daPy_py_c::changePlayer((daPy_py_c*)this);
-        if ((!strcmp(dComIfGp_getStartStageName(), "GanonM")) && (current.roomNo == 1)) {
-            mDoAud_seStart(JA_SE_LK_MAZE_WARP_IN);
+        if (m3580 == 5) {
+            mAcch.ClrGroundHit();
         }
         if (!eventInfo.checkCommandDoor()) {
-            mDemo.setDemoType(3);
-            if (m3580 == 5) {
-                mDemo.setDemoMode(daPy_demo_c::DEMO_UNK11_e);
-            } else if (((checkModeFlg(ModeFlg_SWIM)) || (m34C3 == 1)) || (m34C3 == 4)) {
-                mDemo.setDemoMode(daPy_demo_c::DEMO_UNK0E_e);
-                mVelocity *= 0.75f;
-            } else {
-                mDemo.setDemoMode(daPy_demo_c::DEMO_UNK02_e);
+            if (!dComIfGp_event_compulsory(this)) {
+                return;
             }
-            local_44 = current.pos - old.pos;
-            dVar5 = local_44.abs();
-            if (dVar5 > 0.1f) {
-                mDemo.setMoveAngle(cM_atan2s(local_44.x, local_44.z));
-            } else {
-                mDemo.setMoveAngle(current.angle.y);
+        }
+        if (dStage_changeSceneExitId(mAcch.m_gnd, dVar5, uVar3, bVar2)) {
+            onNoResetFlg1(daPyFlg1_UNK100000);
+            if (dComIfGs_isEventBit(0x3e10)) {
+                dComIfGs_onEventBit(0x3e01);
+            }
+            daPy_py_c::changePlayer((daPy_py_c*)this);
+            if ((!strcmp(dComIfGp_getStartStageName(), "GanonM")) && current.roomNo == 1) {
+                mDoAud_seStart(JA_SE_LK_MAZE_WARP_IN);
+            }
+            if (!eventInfo.checkCommandDoor()) {
+                mDemo.setDemoType(3);
+                if (m3580 == 5) {
+                    mDemo.setDemoMode(daPy_demo_c::DEMO_UNK11_e);
+                } else if ((checkModeFlg(ModeFlg_SWIM) || m34C3 == 1) || m34C3 == 4) {
+                    mDemo.setDemoMode(daPy_demo_c::DEMO_UNK0E_e);
+                    mVelocity *= 0.75f;
+                } else {
+                    mDemo.setDemoMode(daPy_demo_c::DEMO_UNK02_e);
+                }
+                local_44 = current.pos - old.pos;
+                dVar5 = local_44.abs();
+                if (dVar5 > 0.1f) {
+                    mDemo.setMoveAngle(cM_atan2s(local_44.x, local_44.z));
+                } else {
+                    mDemo.setMoveAngle(current.angle.y);
+                }
             }
         }
     }
-LAB_80120704:
-    return;
 }
 
 /* 80120724-80120BBC       .text startRestartRoom__9daPy_lk_cFUlifi */
@@ -11202,7 +11144,7 @@ void daPy_lk_c::setShapeAngleOnGround() {
             local_68 = local_44 - local_50;
             sVar2 = cM_atan2s(-local_68.y, local_68.absXZ());
             iVar3 = cLib_distanceAngleS(sVar2, shape_angle.x);
-            if ((((iVar3 < 0x1000) && (dVar8 > 0.0f)) && (dVar7 > 0.0f)) &&
+            if (((iVar3 < 0x1000 && dVar8 > 0.0f) && dVar7 > 0.0f) &&
                 (std::abs((dVar8 - dVar7)) > 0.05f))
             {
                 shape_angle.x = sVar2 * m35E4;
@@ -11214,7 +11156,6 @@ void daPy_lk_c::setShapeAngleOnGround() {
         }
         shape_angle.z = m35E4 * getGroundAngle(&mAcch.m_gnd, shape_angle.y + -0x4000);
     }
-    return;
 }
 
 /* 80120F94-801211B8       .text setStepsOffset__9daPy_lk_cFv */
@@ -11245,7 +11186,6 @@ void daPy_lk_c::setStepsOffset() {
             m35C4 += fVar1 * 0.7f;
         }
     }
-    return;
 }
 
 /* 801211B8-8012135C       .text setBeltConveyerPower__9daPy_lk_cFv */
@@ -11280,7 +11220,6 @@ void daPy_lk_c::setBeltConveyerPower() {
     } else {
         m36B8 = cXyz::Zero;
     }
-    return;
 }
 
 /* 8012135C-801216A8       .text setWindAtPower__9daPy_lk_cFv */
@@ -11340,7 +11279,6 @@ void daPy_lk_c::setWindAtPower() {
             cLib_addCalcPosXZ(&m3730, local_58, 0.5f, fVar2, 0.5f);
         }
     }
-    return;
 }
 
 /* 801216A8-80121870       .text checkRoofRestart__9daPy_lk_cFv */
@@ -11383,7 +11321,6 @@ void daPy_lk_c::checkRoofRestart() {
             }
         }
     }
-    return;
 }
 
 /* 80121870-80122D30       .text execute__9daPy_lk_cFv */
@@ -12915,14 +12852,14 @@ int daPy_lk_c::setMoveAnime(f32 param_1, f32 param_2, f32 param_3, daPy_ANM para
     getUnderUpperAnime(pdVar5, &local_bc, &local_c0, 0, 0x2400);
     getUnderUpperAnime(pdVar6, &local_c4, &local_c8, 1, 0x2400);
     dVar7 = 1.0f;
-    fVar2 = (dVar7 - param_1);
+    fVar2 = dVar7 - param_1;
     mAnmRatioUnder[UNDER_MOVE0_e].setRatio(fVar2);
     mAnmRatioUnder[UNDER_MOVE1_e].setRatio(param_1);
     mAnmRatioUpper[UPPER_MOVE0_e].setRatio(fVar2);
     mAnmRatioUpper[UPPER_MOVE1_e].setRatio(param_1);
     dVar10 = local_bc->getFrameMax();
     dVar12 = local_c4->getFrameMax();
-    dVar7 = (dVar7 / dVar10);
+    dVar7 = dVar7 / dVar10;
     fVar2 = (param_2 + (param_1 * (((param_3 * dVar10) / dVar12) - param_2)));
     param_2 = fVar2;
     setFrameCtrl(&frameCtrl0, local_bc->getAttribute(), 0, dVar8, fVar2, (dVar15 * dVar10));
@@ -13106,7 +13043,6 @@ void daPy_lk_c::simpleAnmPlay(J3DAnmBase* i_anm) {
         }
     }
     i_anm->setFrame(frame);
-    return;
 }
 
 /* 8012887C-801288A0       .text setHandModel__9daPy_lk_cFQ29daPy_lk_c8daPy_ANM */
@@ -13202,7 +13138,6 @@ void daPy_lk_c::setPlayerPosAndAngle(cXyz* param_1, s16 param_2) {
     l_debug_keep_pos = current.pos;
     l_debug_shape_angle = shape_angle;
     l_debug_current_angle = current.angle;
-    return;
 }
 
 /* 80128C10-80128CE4       .text setPlayerPosAndAngle__9daPy_lk_cFP4cXyzP5csXyz */
@@ -13222,7 +13157,6 @@ void daPy_lk_c::setPlayerPosAndAngle(cXyz* param_1, csXyz* param_2) {
     l_debug_keep_pos = current.pos;
     l_debug_shape_angle = shape_angle;
     l_debug_current_angle = current.angle;
-    return;
 }
 
 /* 80128CE4-80128DC0       .text setPlayerPosAndAngle__9daPy_lk_cFPA4_f */
@@ -13239,7 +13173,6 @@ void daPy_lk_c::setPlayerPosAndAngle(MtxP param_1) {
         l_debug_shape_angle = shape_angle;
         l_debug_current_angle = current.angle;
     }
-    return;
 }
 
 /* 80128DC0-80128F8C       .text endDemoMode__9daPy_lk_cFv */
@@ -13292,7 +13225,6 @@ void daPy_lk_c::endDemoMode() {
     } else if (mCurProc == daPyProc_DEMO_BOSS_WARP_e) {
         procWait_init();
     }
-    return;
 }
 
 /* 80128F8C-8012901C       .text getBokoFlamePos__9daPy_lk_cFP4cXyz */
diff --git a/src/d/actor/d_a_player_main_data.inc b/src/d/actor/d_a_player_main_data.inc
index bf0fa9cf3..36614b807 100644
--- a/src/d/actor/d_a_player_main_data.inc
+++ b/src/d/actor/d_a_player_main_data.inc
@@ -2,7 +2,7 @@
 #include "d/actor/d_a_player_main.h"
 #include "d/actor/d_a_player_main_data.h"
 
-#include "weak_data_1811.h" // IWYU pragma: keep
+#include "weak_data_2100_2080.h" // IWYU pragma: keep
 
 char l_arcName[] = "Link";
 
diff --git a/src/d/actor/d_a_player_npc.cpp b/src/d/actor/d_a_player_npc.cpp
index 19da6988b..b6d819005 100644
--- a/src/d/actor/d_a_player_npc.cpp
+++ b/src/d/actor/d_a_player_npc.cpp
@@ -15,16 +15,14 @@ int daPy_npc_c::check_initialRoom() {
         mAcch.CrrPos(*dComIfG_Bgsp());
         if (mAcch.GetGroundH() == C_BG_MIN_HEIGHT || dComIfG_Bgsp()->GetGroundCode(mAcch.m_gnd) == 4) {
             return 0;
-        } else {
-            int roomNo = dComIfG_Bgsp()->GetRoomId(mAcch.m_gnd);
-            if (roomNo < 0 || !dComIfGp_roomControl_checkStatusFlag(roomNo, 0x10)) {
-                return 0;
-            } else {
-                fopAcM_SetHomeRoomNo(this, roomNo);
-                fopAcM_SetRoomNo(this, roomNo);
-                return -1;
-            }
         }
+        int roomNo = dComIfG_Bgsp()->GetRoomId(mAcch.m_gnd);
+        if (roomNo < 0 || !dComIfGp_roomControl_checkStatusFlag(roomNo, 0x10)) {
+            return 0;
+        }
+        fopAcM_SetHomeRoomNo(this, roomNo);
+        fopAcM_SetRoomNo(this, roomNo);
+        return -1;
     }
     return 1;
 }
diff --git a/src/d/actor/d_a_player_rope.inc b/src/d/actor/d_a_player_rope.inc
index 8d79689aa..a923e79ef 100644
--- a/src/d/actor/d_a_player_rope.inc
+++ b/src/d/actor/d_a_player_rope.inc
@@ -58,7 +58,7 @@ int daPy_lk_c::changeRopeSwingProc() {
     if (mCyl.ChkCoHit() != 0) {
         fopAc_ac_c* pfVar2 = mCyl.GetCoHitAc();
         if ((pfVar2 != NULL) && (fopAcM_GetName(pfVar2) == PROC_HIMO3)) {
-            cXyz local_24 = (pfVar2->current.pos - current.pos);
+            cXyz local_24 = pfVar2->current.pos - current.pos;
             if ((local_24.abs() - 95.0f >= 100.0f) && (pfVar2->current.pos.y > current.pos.y)) {
                 return procRopeSwing_init(pfVar2, 0x1800);
             }
@@ -109,16 +109,15 @@ int daPy_lk_c::changeRopeToHangProc() {
     mLinkLinChk.Set(&local_1c, &local_28, this);
     if (!dComIfG_Bgsp()->LineCross(&mLinkLinChk)) {
         return false;
+    }
+    cM3dGPla* pfVar4 = dComIfG_Bgsp()->GetTriPla(mLinkLinChk);
+    s16 iVar5 = cM_atan2s(pfVar4->GetNP()->x, pfVar4->GetNP()->z);
+    if (cLib_distanceAngleS(iVar5, shape_angle.y + 0x8000) > 0x2000) {
+        return false;
     } else {
-        cM3dGPla* pfVar4 = dComIfG_Bgsp()->GetTriPla(mLinkLinChk);
-        s16 iVar5 = cM_atan2s(pfVar4->GetNP()->x, pfVar4->GetNP()->z);
-        if (cLib_distanceAngleS(iVar5, shape_angle.y + 0x8000) > 0x2000) {
-            return false;
-        } else {
-            m352C = iVar5;
-            procRopeUpHang_init();
-            return true;
-        }
+        m352C = iVar5;
+        procRopeUpHang_init();
+        return true;
     }
 }
 
@@ -274,7 +273,8 @@ BOOL daPy_lk_c::checkNextActionRopeReady() {
     u32 uVar2 = fopAcM_GetParam(rope);
     if (uVar2 == 2) {
         return procRopeReady_init();
-    } else if (uVar2 == 0) {
+    }
+    if (uVar2 == 0) {
         if (checkUpperAnime(LKANM_BCK_ROPETHROW)) {
             if (mFrameCtrlUpper[UPPER_MOVE2_e].getRate() < 0.01f) {
                 return procRopeThrowCatch_init();
@@ -465,7 +465,7 @@ BOOL daPy_lk_c::procRopeReady() {
     mRopePos = mActorKeepEquip.getActor()->current.pos;
     m370C.x = mRopePos.x;
     m370C.z = mRopePos.z;
-    cXyz local_48 = (m370C - current.pos);
+    cXyz local_48 = m370C - current.pos;
     f32 dVar5 = local_48.abs();
     cLib_chaseF(&m35A0, 50.0f, 5.0f);
     shape_angle.x = (0.025f * (m34D4 * m35A0));
@@ -493,7 +493,7 @@ BOOL daPy_lk_c::procRopeSwing_init(fopAc_ac_c* param_0, s16 param_1) {
             fopAcM_SetParam(param_0, 1);
             deleteEquipItem(TRUE);
             mEquipItem = dItem_GRAPPLING_HOOK_e;
-            local_84 = (param_0->current.pos - current.pos);
+            local_84 = param_0->current.pos - current.pos;
             dVar8 = (local_84.abs() - 95.0f);
             dVar9 = ((himo2_class*)param_0)->field_0x15F8.y;
             if (dVar8 > dVar9) {
@@ -505,11 +505,11 @@ BOOL daPy_lk_c::procRopeSwing_init(fopAc_ac_c* param_0, s16 param_1) {
     } else {
         param_0 = mActorKeepRope.getActor();
     }
-    local_84 = (param_0->current.pos - current.pos);
+    local_84 = param_0->current.pos - current.pos;
     m35A0 = local_84.abs();
     f32 dVar11 = std::sqrtf(2.0f / m35A0);
     m35A4 = dVar11;
-    dVar11 = (M_PI / 2 / m35A4);
+    dVar11 = M_PI / 2 / m35A4;
     if (pfVar7 != NULL) {
         m34D4 = daPy_HIO_rope_c0::m.field_0x0;
         if (checkSpecialRope()) {
@@ -530,7 +530,7 @@ BOOL daPy_lk_c::procRopeSwing_init(fopAc_ac_c* param_0, s16 param_1) {
         dVar8 = ((f32)sVar4 / m34D4);
         dVar9 = std::sqrtf(1.0f - (dVar8 * dVar8));
         dVar8 = cM_atan2f(dVar8, dVar9);
-        m35A8 = (dVar8 / m35A4);
+        m35A8 = dVar8 / m35A4;
         dVar8 = std::sqrtf(local_78.y * local_78.y + local_78.z * local_78.z);
         m34D6 = cM_atan2s(-local_78.x, dVar8);
         if (m34D6 > 0) {
@@ -585,8 +585,8 @@ BOOL daPy_lk_c::procRopeSwing() {
     fopAc_ac_c* rope = mActorKeepRope.getActor();
     mRopePos = rope->current.pos;
     dComIfGp_setRStatus(dActStts_STOP_e);
-    f32 f30 = (m35A8 * m35A4);
-    f32 dVar13 = (m35AC * m35A4);
+    f32 f30 = m35A8 * m35A4;
+    f32 dVar13 = m35AC * m35A4;
     mDoMtx_stack_c::ZrotS(-shape_angle.z);
     mDoMtx_stack_c::XrotM(-shape_angle.x);
     mDoMtx_stack_c::YrotM(-shape_angle.y);
@@ -622,14 +622,14 @@ BOOL daPy_lk_c::procRopeSwing() {
     m35A8 = m35A8 + (dVar11 + f30);
     m35AC = m35AC + (dVar11 + dVar13);
     f32 sp0C = m35A8 * m35A4;
-    f30 = (m35AC * m35A4);
+    f30 = m35AC * m35A4;
     if (sp0C >= M_PI) {
         sp0C = sp0C - M_PI * 2;
         m35A8 = sp0C / m35A4;
     }
     if (f30 >= M_PI) {
-        f30 = (f30 - M_PI * 2);
-        m35AC = (f30 / m35A4);
+        f30 = f30 - M_PI * 2;
+        m35AC = f30 / m35A4;
     }
     if ((checkModeFlg(ModeFlg_00000400)) && (mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.01f)) {
         offModeFlg(ModeFlg_00000400);
@@ -680,11 +680,7 @@ BOOL daPy_lk_c::procRopeSwing() {
     cLib_addCalcAngleS(&shape_angle.x, r28_2, 8, 0xc00, 0x100);
     dVar13 = cM_fcos(f30);
     cLib_addCalcAngleS(
-        &shape_angle.z,
-        m34D6 * cM_fsin(f30 - 1.0995574f),
-        8,
-        0x400 + (0x800 * dVar13),
-        0x80 + (0x80 * dVar13)
+        &shape_angle.z, m34D6 * cM_fsin(f30 - 1.0995574f), 8, 0x400 + (0x800 * dVar13), 0x80 + (0x80 * dVar13)
     );
     cXyz sp1C(0.0f, -m35A0, 0.0f);
     mDoMtx_stack_c::transS(mRopePos.x, mRopePos.y, mRopePos.z);
@@ -879,11 +875,11 @@ BOOL daPy_lk_c::procRopeUp_init() {
     mProcVar0.m3570 = 0;
     f32 dVar4;
     if (checkBossGomaStage()) {
-        dVar4 = (mRopePos.y - 200.0f);
+        dVar4 = mRopePos.y - 200.0f;
     } else {
-        dVar4 = (mRopePos.y - 100.0f);
+        dVar4 = mRopePos.y - 100.0f;
         f32 dVar5 = checkRopeRoofHit(shape_angle.y);
-        dVar5 = (dVar5 - 60.0f);
+        dVar5 = dVar5 - 60.0f;
         if (dVar5 < dVar4) {
             dVar4 = dVar5;
         } else if ((fopAcM_GetName(rope)) == PROC_HIMO2 || (checkSpecialRope())) {
@@ -893,12 +889,10 @@ BOOL daPy_lk_c::procRopeUp_init() {
     if (dVar4 <= current.pos.y) {
         if (specialRopeHangUp()) {
             return true;
+        } else if (changeRopeToHangProc()) {
+            return true;
         } else {
-            if (changeRopeToHangProc()) {
-                return true;
-            } else {
-                return procRopeHangWait_init(0);
-            }
+            return procRopeHangWait_init(0);
         }
     } else {
         commonProcInit(daPyProc_ROPE_UP_e);