diff --git a/include/config.h b/include/config.h index 6944b039..eaf066e3 100644 --- a/include/config.h +++ b/include/config.h @@ -65,6 +65,8 @@ #define DISABLE_AA // Fix instant warp offset not working when warping across different areas #define INSTANT_WARP_OFFSET_FIX +// Allows Mario to ledgegrab sloped floors +#define NO_FALSE_LEDGEGRABS // Uncomment this if you want global star IDs (useful for creating an open world hack ala MVC) //#define GLOBAL_STAR_IDS // Uncomment this if you want to skip the title screen (Super Mario 64 logo) diff --git a/src/game/mario_actions_automatic.c b/src/game/mario_actions_automatic.c index bb52034c..769b653b 100644 --- a/src/game/mario_actions_automatic.c +++ b/src/game/mario_actions_automatic.c @@ -550,11 +550,11 @@ s32 act_ledge_grab(struct MarioState *m) { if (m->actionTimer < 10) { m->actionTimer++; } - +#ifndef NO_FALSE_LEDGEGRABS if (m->floor->normal.y < 0.9063078f) { return let_go_of_ledge(m); } - +#endif if (m->input & (INPUT_Z_PRESSED | INPUT_OFF_FLOOR)) { return let_go_of_ledge(m); }