Skip to content

Fix Walk Speed Input Polling #765

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

Closed
YoshiMilkman wants to merge 9 commits into from
Closed

Fix Walk Speed Input Polling #765

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f607654
Added a define to fix walk speed polling causing inconsistent acceler…
YoshiMilkman Feb 5, 2024
3cb8cbd
Made this not a define
YoshiMilkman Feb 5, 2024
209998a
Clean up config_movement.h
YoshiMilkman Feb 5, 2024
a3b6e74
Use actionarg for proper polling fix
YoshiMilkman Feb 24, 2024
d035293
Use dedicated u8 for detecting first frame instead of m->actionArg
YoshiMilkman Feb 24, 2024
0cfb47a
Go back to using m->actionArg lol
YoshiMilkman Feb 26, 2024
54be705
Make boost smaller when holding an object to matchvanilla acceleratio…
YoshiMilkman Feb 26, 2024
c3641ce
Make boost smaller when holding an object to matchvanilla acceleratio…
YoshiMilkman Feb 26, 2024
637185a
Remove funny blank space
YoshiMilkman Feb 26, 2024
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
7 changes: 7 additions & 0 deletions include/config/config_movement.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,3 +142,10 @@
*/
#define MARIO_INERTIA_UPWARD
// #define MARIO_INERTIA_LATERAL


/**
* Fixes Mario's walk speed on frame 1 being inconsistent due to controllers inputting low magnitude.
* This define makes accelerating from idle more consistent.
*/
#define FIX_WALK_SPEED_POLLING
13 changes: 13 additions & 0 deletions src/game/mario_actions_moving.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,6 +415,11 @@ s32 update_decelerating_speed(struct MarioState *m) {
return stopped;
}

#ifdef FIX_WALK_SPEED_POLLING
// Velocity Mario gets when starting a walk frame 1.
#define START_WALK_VELOCITY 8.f
#endif

void update_walking_speed(struct MarioState *m) {
f32 maxTargetSpeed;
f32 targetSpeed;
Expand All @@ -435,6 +440,14 @@ void update_walking_speed(struct MarioState *m) {
// Slow down if moving backwards
m->forwardVel += 1.1f;
} else if (m->forwardVel <= targetSpeed) {
#ifdef FIX_WALK_SPEED_POLLING
// When starting a walk, make a few checks and set Mario's speed to 8 on the first frame.
// This ensures Mario's speed is set consistently.
if (m->forwardVel <= START_WALK_VELOCITY && m->prevAction == ACT_IDLE
&& !mario_floor_is_steep(m)) {
m->forwardVel = MIN(m->intendedMag, START_WALK_VELOCITY); // same fix as melee dashback
}
#endif
// If accelerating
m->forwardVel += 1.1f - m->forwardVel / 43.0f;
} else if (m->floor->normal.y >= 0.95f) {
Expand Down