From 2fa5706e820b25aa9621c9c4f8c68a856b34c5de Mon Sep 17 00:00:00 2001 From: someone2639 Date: Thu, 17 Nov 2022 12:35:57 -0500 Subject: [PATCH] Port #373 from HackerSM64 --- include/config.h | 2 ++ src/game/mario_actions_moving.c | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/include/config.h b/include/config.h index 1df7a240..a9ff6cbb 100644 --- a/include/config.h +++ b/include/config.h @@ -1,3 +1,5 @@ +#define BETA_TRIPLE_JUMP + #ifndef CONFIG_H #define CONFIG_H // ULTRASM64-EXTBOUNDS CONFIG FLAGS NEAR BOTTOM diff --git a/src/game/mario_actions_moving.c b/src/game/mario_actions_moving.c index e6f5ca37..bb2a83d7 100644 --- a/src/game/mario_actions_moving.c +++ b/src/game/mario_actions_moving.c @@ -152,7 +152,13 @@ s32 set_triple_jump_action(struct MarioState *m, UNUSED u32 action, UNUSED u32 a return set_mario_action(m, ACT_FLYING_TRIPLE_JUMP, 0); } else if (m->forwardVel > 20.0f) { if (m->canTripleJump || m->unlockEverything) { +#ifdef BETA_TRIPLE_JUMP + m->vel[1] = 69.f; + m->forwardVel *= 0.8f; + return set_mario_action(m, ACT_TWIRLING, 0); +#else return set_mario_action(m, ACT_TRIPLE_JUMP, 0); +#endif } else { return set_mario_action(m, ACT_IDLE, 0);