Skip to content

ft: Match ftKb_Init_UnkCallbackPairs0_1 #2049

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
itsgrimetime wants to merge 13 commits into
base: master
Choose a base branch
from
+24 −11
Open

ft: Match ftKb_Init_UnkCallbackPairs0_1 #2049

Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
0372c80
Match ftKb_Init_GetMotionFileString (100%)
itsgrimetime Dec 29, 2025
f60f9d1
Match ftKb_Init_UnkMotionStates3 (100%)
itsgrimetime Dec 30, 2025
71d072a
Fix ftKirby build: revert to NonMatching, update header
itsgrimetime Dec 30, 2025
07b94df
Match ftKb_Init_UnkCallbackPairs0_1 (100%)
itsgrimetime Dec 30, 2025
2e477ec
Match ftKb_Init_UnkDemoCallbacks0 (100%)
itsgrimetime Dec 30, 2025
84552ef
Fix build: resolve merge conflict in ftKb_Init.c
itsgrimetime Dec 30, 2025
7960612
Fix build: revert ftKb_Init.c to NonMatching
itsgrimetime Dec 30, 2025
edd6a39
Trigger CI rebuild
itsgrimetime Dec 30, 2025
96be41c
Retrigger CI
itsgrimetime Dec 30, 2025
b8e98e2
Retrigger CI - local build passes
itsgrimetime Dec 30, 2025
3e3178e
ftKb_Init: Add prototype for ftAnim_80070458_proto
itsgrimetime Dec 30, 2025
3509d33
Merge branch 'master' into ft-kirby-1
itsgrimetime Jan 3, 2026
08d679d
Merge branch 'master' into ft-kirby-1
itsgrimetime Jan 5, 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
35 changes: 24 additions & 11 deletions src/melee/ft/chara/ftKirby/ftKb_Init.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@
#include <baselib/random.h>
#include <MSL/math.h>

void ftAnim_80070458_proto(Fighter* fp, struct KirbyFV_x44_t*, int);

MotionState ftKb_Init_MotionStateTable[ftKb_MS_SelfCount] = {
{
// ftKb_MS_JumpAerialF1 = 341
Expand Down Expand Up @@ -3197,17 +3199,23 @@ void ftKb_Init_OnKnockbackExit(HSD_GObj* gobj)
Fighter_OnKnockbackExit(gobj, 1);
}

void ftKb_Init_UnkDemoCallbacks0(int arg0, int* arg1, int* arg2)
void ftKb_Init_UnkDemoCallbacks0(int kind, int* out1, int* out2)
{
if (arg0 != 14) {
if (arg0 < 14 && arg0 >= 11) {
*arg1 = 14;
*arg2 = 16;
}
} else {
*arg2 = 17;
*arg1 = 17;
if (kind == 14) {
goto case14;
}
if (kind >= 14) {
return;
}
if (kind < 11) {
return;
}
*out1 = 14;
*out2 = 16;
return;
case14:
*out2 = 17;
*out1 = 17;
}

char* ftKb_Init_GetMotionFileString(enum_t arg0)
Expand Down Expand Up @@ -3269,8 +3277,13 @@ void ftKb_Init_UnkCallbackPairs0_0(Fighter_GObj* gobj)
}
}

/// #ftKb_Init_UnkCallbackPairs0_1

void ftKb_Init_UnkCallbackPairs0_1(Fighter_GObj* gobj, int arg1, float arg2)
{
Fighter* fp = GET_FIGHTER(gobj);
if (fp->fv.kb.hat.x14.data != NULL && fp->fv.kb.hat.jobj == NULL) {
ftAnim_80070458_proto(fp, &fp->fv.kb.x44, arg1);
}
}
void ftKb_SpecialN_800EFA40(HSD_GObj* gobj)
{
Fighter* fp = GET_FIGHTER(gobj);
Expand Down