Skip to content

Name mSideStepLandComboTimer #3163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
linkRace wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Name mSideStepLandComboTimer #3163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/d/actor/d_a_alink.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

@TakaRikka TakaRikka Jun 20, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

think i'd prefer to call this something more like mSideRollCheckTimer

/* 0x02FB1 */ u8 mWolfLockNum;
/* 0x02FB2 */ u8 mMidnaTalkDelayTimer;
/* 0x02FB3 */ u8 field_0x2fb3;
Expand Down
10 changes: 5 additions & 5 deletions src/d/actor/d_a_alink.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down Expand Up @@ -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;
Expand All @@ -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()) {
Expand Down Expand Up @@ -18384,8 +18384,8 @@ int daAlink_c::execute() {
if (!checkWolf()) {
setHatAngle();

if (field_0x2fb0 != 0) {
field_0x2fb0--;
if (mSideStepLandComboTimer != 0) {
mSideStepLandComboTimer--;
}

footBgCheck();
Expand Down
2 changes: 1 addition & 1 deletion src/d/actor/d_a_alink_wolf.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down