Skip to content

refactor(ftSamus): replace raw motion state literals in SpecialLw #3677

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

Merged
PsiLupan merged 2 commits into from
Oct 16, 2026
Merged

refactor(ftSamus): replace raw motion state literals in SpecialLw #3677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe514a8
refactor(ftSamus): replace remaining raw motion state literals with n…
beammeupscottyyy Oct 12, 2026
05495d1
refactor(ftSamus): replace raw hex motion states with named constants…
beammeupscottyyy Oct 13, 2026
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
32 changes: 17 additions & 15 deletions src/melee/ft/kinds/ftSamus/ftsamusspeciallw0.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,16 +251,18 @@ void ftSs_SpecialLw_80129048(HSD_GObj* gobj)
{
Fighter* fp = GET_FIGHTER(gobj);
ftCommon_8007D5D4(fp);
Fighter_ChangeMotionState(gobj, 0x156, JOBJ_HIDDEN, fp->cur_anim_frame,
fp->frame_speed_mul, 0.0f, 0);
Fighter_ChangeMotionState(gobj, ftSs_MS_SpecialAirLw, JOBJ_HIDDEN,
fp->cur_anim_frame, fp->frame_speed_mul, 0.0f,
0);
}

void ftSs_SpecialLw_801290A4(HSD_GObj* gobj)
{
Fighter* fp = GET_FIGHTER(gobj);
ftCommon_8007D7FC(fp);
Fighter_ChangeMotionState(gobj, 0x155, JOBJ_HIDDEN, fp->cur_anim_frame,
fp->frame_speed_mul, 0.0f, 0);
Fighter_ChangeMotionState(gobj, ftSs_MS_SpecialLw, JOBJ_HIDDEN,
fp->cur_anim_frame, fp->frame_speed_mul, 0.0f,
0);
}

int ftSs_SpecialLw_80129100(HSD_GObj* gobj, int* arg1, int* arg2)
Expand Down Expand Up @@ -289,12 +291,12 @@ s32 ftSs_SpecialLw_80129158(HSD_GObj* gobj)
Fighter* fp = GET_FIGHTER(gobj);
s32 motion_state_index = fp->motion_id;
switch (motion_state_index) {
case 0x157:
case 0x158:
case 0x159:
case 0x15A:
case 0x15B:
case 0x15C:
case ftSs_MS_SpecialNStart:
case ftSs_MS_SpecialNHold:
case ftSs_MS_SpecialNCancel:
case ftSs_MS_SpecialN:
case ftSs_MS_SpecialAirNStart:
case ftSs_MS_SpecialAirN:
if (fp->x2070.x0.x2071_b6) {
return 1;
}
Expand All @@ -313,11 +315,11 @@ s32 ftSs_SpecialN_801291A8(HSD_GObj* gobj)
s32 motion_state_index = fp->motion_id;

switch (motion_state_index) {
case 0x157:
case 0x158:
case 0x15A:
case 0x15B:
case 0x15C:
case ftSs_MS_SpecialNStart:
case ftSs_MS_SpecialNHold:
case ftSs_MS_SpecialN:
case ftSs_MS_SpecialAirNStart:
case ftSs_MS_SpecialAirN:
return 0;
}

Expand Down
2 changes: 1 addition & 1 deletion src/melee/ft/kinds/ftSamus/ftsamusspeciallw1.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ void ftSs_SpecialLw_Enter(HSD_GObj* gobj)
ftSs_DatAttrs* samus_attr = fp->dat_attrs;

fp->gr_vel *= samus_attr->x6C;
if (fp->motion_id == 0x28) {
if (fp->motion_id == ftCo_MS_SquatWait) {
Fighter_ChangeMotionState(gobj, ftSs_MS_SpecialLwBomb, Ft_MF_None,
3.0f, 1.0f, 0.0f, NULL);
ftSamus_SpecialLw_StartAction_inner(gobj);
Expand Down
4 changes: 3 additions & 1 deletion src/melee/ft/kinds/ftSamus/ftsamusspecialn.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,9 @@ static void ftSs_SpecialN_801293BC(HSD_GObj* gobj)
}
x2230 = fp->u.ss.x2230;
it_802B56E4(fp->u.ss.x222C, &vec1, var_f0, x2230, samus_attr->x18);
if ((fp->motion_id == 348) || (fp->ground_or_air == GA_Air)) {
if ((fp->motion_id == ftSs_MS_SpecialAirN) ||
(fp->ground_or_air == GA_Air))
{
u8 unused1[28];
ftSamus_801293BC_inner(gobj);
}
Expand Down
Loading