Combine easySurface and easyZoraSwim into easySwim

This commit is contained in:
baxlek
2026-08-25 19:51:50 -05:00
committed by GitHub
parent 6b63bd1945
commit 35bc1e4d7a
+3 -5
View File
@@ -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();
}