From fe514a8b650be7ff46ca5075850e6d85364230e9 Mon Sep 17 00:00:00 2001 From: beammeupscottyyy Date: Mon, 12 Oct 2026 03:34:08 -0400 Subject: [PATCH 1/2] refactor(ftSamus): replace remaining raw motion state literals with named constants --- src/melee/ft/kinds/ftSamus/ftsamusspeciallw0.c | 10 ++++++---- src/melee/ft/kinds/ftSamus/ftsamusspeciallw1.c | 2 +- src/melee/ft/kinds/ftSamus/ftsamusspecialn.c | 4 +++- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/melee/ft/kinds/ftSamus/ftsamusspeciallw0.c b/src/melee/ft/kinds/ftSamus/ftsamusspeciallw0.c index e49480be27..86331037ef 100644 --- a/src/melee/ft/kinds/ftSamus/ftsamusspeciallw0.c +++ b/src/melee/ft/kinds/ftSamus/ftsamusspeciallw0.c @@ -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) diff --git a/src/melee/ft/kinds/ftSamus/ftsamusspeciallw1.c b/src/melee/ft/kinds/ftSamus/ftsamusspeciallw1.c index cec94f2cfd..e7ff891650 100644 --- a/src/melee/ft/kinds/ftSamus/ftsamusspeciallw1.c +++ b/src/melee/ft/kinds/ftSamus/ftsamusspeciallw1.c @@ -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); diff --git a/src/melee/ft/kinds/ftSamus/ftsamusspecialn.c b/src/melee/ft/kinds/ftSamus/ftsamusspecialn.c index b9ff001f9c..0b42ad00d8 100644 --- a/src/melee/ft/kinds/ftSamus/ftsamusspecialn.c +++ b/src/melee/ft/kinds/ftSamus/ftsamusspecialn.c @@ -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); } From 05495d19c01b1db730a47e9920ed64cd531de04a Mon Sep 17 00:00:00 2001 From: beammeupscottyyy Date: Tue, 13 Oct 2026 02:27:37 -0400 Subject: [PATCH 2/2] refactor(ftSamus): replace raw hex motion states with named constants in SpecialN callbacks --- .../ft/kinds/ftSamus/ftsamusspeciallw0.c | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/melee/ft/kinds/ftSamus/ftsamusspeciallw0.c b/src/melee/ft/kinds/ftSamus/ftsamusspeciallw0.c index 86331037ef..0c5b6bfc2e 100644 --- a/src/melee/ft/kinds/ftSamus/ftsamusspeciallw0.c +++ b/src/melee/ft/kinds/ftSamus/ftsamusspeciallw0.c @@ -291,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; } @@ -315,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; }