From 9adb8c6de855990e763012e3e5169e06ae793f0d Mon Sep 17 00:00:00 2001 From: Gregory Heskett Date: Mon, 1 Jul 2024 21:47:15 -0400 Subject: [PATCH] EASIER_LONG_JUMPS: only long jump with A+Z while running (#801) Co-authored-by: thecozies <79979276+thecozies@users.noreply.github.com> --- src/game/mario_actions_airborne.c | 9 --------- src/game/mario_actions_moving.c | 5 +++++ 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/game/mario_actions_airborne.c b/src/game/mario_actions_airborne.c index 26051395..c6e15267 100644 --- a/src/game/mario_actions_airborne.c +++ b/src/game/mario_actions_airborne.c @@ -429,15 +429,6 @@ u32 common_air_action_step(struct MarioState *m, u32 landAction, s32 animation, } s32 act_jump(struct MarioState *m) { -#ifdef EASIER_LONG_JUMPS - if (m->actionTimer < 1) { - m->actionTimer++; - if (m->input & INPUT_Z_PRESSED && m->forwardVel > 10.0f) { - return set_jumping_action(m, ACT_LONG_JUMP, 0); - } - } -#endif - if (check_kick_or_dive_in_air(m)) { return TRUE; } diff --git a/src/game/mario_actions_moving.c b/src/game/mario_actions_moving.c index 5f6fb46e..67cd50fa 100644 --- a/src/game/mario_actions_moving.c +++ b/src/game/mario_actions_moving.c @@ -766,6 +766,11 @@ s32 act_walking(struct MarioState *m) { } if (m->input & INPUT_A_PRESSED) { +#ifdef EASIER_LONG_JUMPS + if (m->input & INPUT_Z_PRESSED && m->forwardVel > 10.0f) { + return set_mario_action(m, ACT_CROUCH_SLIDE, 0); + } +#endif return set_jump_from_landing(m); }