Skip to content

Label Mario action returns #849

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
someone2639 wants to merge 7 commits into
base: develop/3.0.0
Choose a base branch
from
Open

Label Mario action returns #849

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9bcba6a
# This is a combination of 2 commits.
gheskett Apr 30, 2024
810b4c6
Update to newest UNF (d5f2ad100b76e372036453f8d25f9b6fbbbd2d1a) (Nove…
Jan 30, 2025
3a021e0
oops i added one incorrect commit to rebase
Jan 30, 2025
dc71d06
more reverts
Jan 30, 2025
8ac2d56
finalize unrebase
Jan 30, 2025
4beede4
move defines to a more suitable file
Jan 30, 2025
8c140d8
oopsies! :P
Feb 16, 2025
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
4 changes: 4 additions & 0 deletions include/sm64.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,10 @@ enum MarioActionFlags {
ACT_FLAG_THROWING = /* 0x80000000 */ (1 << 31),
};

/* State Machine Results */
#define ACTION_CONTINUE TRUE // Continues running action logic, e.g. after Mario's action changes
#define ACTION_FINISH FALSE // Finishes running action logic for the current frame

#define ACT_UNINITIALIZED 0x00000000 // (0x000)

// group 0x000: stationary actions
Expand Down
10 changes: 5 additions & 5 deletions src/game/mario.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -966,7 +966,7 @@ u32 set_mario_action(struct MarioState *m, u32 action, u32 actionArg) {
m->actionState = 0;
m->actionTimer = 0;

return TRUE;
return ACTION_CONTINUE;
}

/**
Expand Down Expand Up @@ -1021,7 +1021,7 @@ s32 set_jump_from_landing(struct MarioState *m) {

m->doubleJumpTimer = 0;

return TRUE;
return ACTION_CONTINUE;
}

/**
Expand All @@ -1044,7 +1044,7 @@ s32 set_jumping_action(struct MarioState *m, u32 action, u32 actionArg) {
set_mario_action(m, action, actionArg);
}

return TRUE;
return ACTION_CONTINUE;
}

/**
Expand Down Expand Up @@ -1083,7 +1083,7 @@ s32 check_common_action_exits(struct MarioState *m) {
return set_mario_action(m, ACT_BEGIN_SLIDING, 0);
}

return FALSE;
return ACTION_FINISH;
}

/**
Expand All @@ -1095,7 +1095,7 @@ s32 check_common_hold_action_exits(struct MarioState *m) {
if (m->input & INPUT_OFF_FLOOR ) return set_mario_action(m, ACT_HOLD_FREEFALL, 0);
if (m->input & INPUT_NONZERO_ANALOG) return set_mario_action(m, ACT_HOLD_WALKING, 0);
if (m->input & INPUT_ABOVE_SLIDE ) return set_mario_action(m, ACT_HOLD_BEGIN_SLIDING, 0);
return FALSE;
return ACTION_FINISH;
}

/**
Expand Down
Loading