From 35bc1e4d7a2a0d7e60e070e0b09f86f81ab93adf Mon Sep 17 00:00:00 2001 From: baxlek <115663151+baxlek@users.noreply.github.com> Date: Tue, 25 Aug 2026 19:51:50 -0500 Subject: [PATCH] Combine easySurface and easyZoraSwim into easySwim --- src/d/actor/d_a_alink_swim.inc | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/d/actor/d_a_alink_swim.inc b/src/d/actor/d_a_alink_swim.inc index 9b18321252..b0f958484e 100644 --- a/src/d/actor/d_a_alink_swim.inc +++ b/src/d/actor/d_a_alink_swim.inc @@ -660,11 +660,11 @@ void daAlink_c::setSwimMoveAnime() { field_0x3478 = mpHIO->mSwim.m.mUnderwaterMinAnmSpeed; field_0x347c = mpHIO->mSwim.m.mUnderwaterMaxAnmSpeed; - IF_DUSK(const bool easyZoraSwim = DUSK_IF_ELSE(dusk::getSettings().game.holdToMash.zoraSwim, false)); + IF_DUSK(const bool easySwim = DUSK_IF_ELSE(dusk::getSettings().game.holdToMash.swimming, false)); if (mMaxSpeed < mpHIO->mSwim.m.mUnderwaterMaxSpeed) { mMaxSpeed = mpHIO->mSwim.m.mUnderwaterMaxSpeed; - } else if (easyZoraSwim ? doButton() : doTrigger()) { + } else if (easySwim ? doButton() : doTrigger()) { mMaxSpeed += 0.75f; if (mMaxSpeed > temp_f29) { mMaxSpeed = temp_f29; @@ -1337,9 +1337,7 @@ int daAlink_c::procSwimHookshotMove() { return procSwimDiveInit(); } - IF_DUSK(const bool easySurface = DUSK_IF_ELSE(dusk::getSettings().game.holdToMash.surface, false)); - - if (checkUpSwimButtonAccept() && (easySurface ? doButton() : doTrigger())) { + if (checkUpSwimButtonAccept() && (easySwim ? doButton() : doTrigger())) { field_0x3000 = 30; return procSwimMoveInit(); }