From 8c9e2a48ef7578b3942fea6d31d2d6850fe6d06d Mon Sep 17 00:00:00 2001 From: Reonu Date: Thu, 1 Jul 2021 10:28:34 +0100 Subject: [PATCH] Added option to disable BLJs --- README.md | 1 + include/config.h | 2 ++ src/game/mario_actions_moving.c | 4 +++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 9fe8f722..54019a44 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,7 @@ This is a fork of the ultrasm64 repo by CrashOveride which includes the followin - No false ledgegrabs fix * - Jump kick fix * - 46 degree wallkicks * +- Possibility of disabling BLJs * - Instant Input patch by Wiseguy (Removes all input lag caused by good emulators and plugins) - pole fix - Hanging fix (mario can grab hangable ceilings from any state, instead of only jump or double jump) * diff --git a/include/config.h b/include/config.h index 14228403..491a22f3 100644 --- a/include/config.h +++ b/include/config.h @@ -74,6 +74,8 @@ #define HANGING_FIX // 46 degree walkicks //#define WALLKICKS_46_DEGREES +// Disable BLJs and crush SimpleFlips's dreams +//#define DISABLE_BLJ // Disables fall damage #define NO_FALL_DAMAGE // Disables the scream that mario makes when falling off a great height (this is separate from actual fall damage) diff --git a/src/game/mario_actions_moving.c b/src/game/mario_actions_moving.c index 1bde8ce7..8e184d4e 100644 --- a/src/game/mario_actions_moving.c +++ b/src/game/mario_actions_moving.c @@ -13,6 +13,8 @@ #include "behavior_data.h" #include "rumble_init.h" +#include "config.h" + struct LandingAction { s16 numFrames; s16 unk02; @@ -1845,7 +1847,7 @@ s32 act_hold_freefall_land(struct MarioState *m) { } s32 act_long_jump_land(struct MarioState *m) { -#ifdef VERSION_SH +#if defined (VERSION_SH) || defined(DISABLE_BLJ) // BLJ (Backwards Long Jump) speed build up fix, crushing SimpleFlips's dreams since July 1997 if (m->forwardVel < 0.0f) { m->forwardVel = 0.0f;