From 14acd692bbca6ef44413cfe716db126c576d953d Mon Sep 17 00:00:00 2001 From: "Lincoln (Link) Race" Date: Tue, 19 May 2026 11:16:46 -0700 Subject: [PATCH] Name mSideStepLandComboTimer This is the field used to count the frames to convert a second jump press into a side roll combo --- include/d/actor/d_a_alink.h | 2 +- src/d/actor/d_a_alink.cpp | 10 +++++----- src/d/actor/d_a_alink_wolf.inc | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/d/actor/d_a_alink.h b/include/d/actor/d_a_alink.h index 7c70ea54e57..034db0eaff5 100644 --- a/include/d/actor/d_a_alink.h +++ b/include/d/actor/d_a_alink.h @@ -4158,7 +4158,7 @@ class daAlink_c : public daPy_py_c { /* 0x02FAD */ u8 mPeepExitID; /* 0x02FAE */ u8 mUseButtonFlags; /* 0x02FAF */ u8 field_0x2faf; - /* 0x02FB0 */ u8 field_0x2fb0; + /* 0x02FB0 */ u8 mSideStepLandComboTimer; /* 0x02FB1 */ u8 mWolfLockNum; /* 0x02FB2 */ u8 mMidnaTalkDelayTimer; /* 0x02FB3 */ u8 field_0x2fb3; diff --git a/src/d/actor/d_a_alink.cpp b/src/d/actor/d_a_alink.cpp index 12d1cd397a6..ee996392d09 100644 --- a/src/d/actor/d_a_alink.cpp +++ b/src/d/actor/d_a_alink.cpp @@ -11836,7 +11836,7 @@ BOOL daAlink_c::checkMoveDoAction() { } int direction = getDirectionFromShapeAngle(); - if (field_0x2fb0 != 0 && direction != DIR_BACKWARD && checkSideRollAction(direction)) { + if (mSideStepLandComboTimer != 0 && direction != DIR_BACKWARD && checkSideRollAction(direction)) { return true; } @@ -15827,7 +15827,7 @@ int daAlink_c::procSideStepLandInit() { field_0x3478 = mpHIO->mSideStep.m.mBackLandAnm.mCancelFrame; field_0x2f98 = 2; mProcVar1.field_0x300a = 0; - field_0x2fb0 = 0; + mSideStepLandComboTimer = 0; field_0x2fcc = 10; } else { daAlink_ANM anm_id; @@ -15843,7 +15843,7 @@ int daAlink_c::procSideStepLandInit() { setSingleAnimeParam(anm_id, &mpHIO->mSideStep.m.mSideLandAnm); field_0x3478 = mpHIO->mSideStep.m.mSideLandAnm.mCancelFrame; mProcVar1.field_0x300a = 1; - field_0x2fb0 = 8; + mSideStepLandComboTimer = 8; field_0x2fcc = 0; if (checkEnemyGroup(mTargetedActor) && mEquipItem == 0x103 && checkNoUpperAnime()) { @@ -18384,8 +18384,8 @@ int daAlink_c::execute() { if (!checkWolf()) { setHatAngle(); - if (field_0x2fb0 != 0) { - field_0x2fb0--; + if (mSideStepLandComboTimer != 0) { + mSideStepLandComboTimer--; } footBgCheck(); diff --git a/src/d/actor/d_a_alink_wolf.inc b/src/d/actor/d_a_alink_wolf.inc index 79df1401c0d..7ef4f00da85 100644 --- a/src/d/actor/d_a_alink_wolf.inc +++ b/src/d/actor/d_a_alink_wolf.inc @@ -490,7 +490,7 @@ void daAlink_c::changeLink(int param_0) { resetWolfAtCollision(); resetWolfBallGrab(); deleteEquipItem(FALSE, FALSE); - field_0x2fb0 = 0; + mSideStepLandComboTimer = 0; for (int i = 0; i < 10; i++) { mWolfLockAcKeep[i].clearData();