From 89cb118667f4e4b9ca71e5b277994ffecdc243c7 Mon Sep 17 00:00:00 2001 From: Reonu Date: Sun, 27 Jun 2021 13:06:18 +0100 Subject: [PATCH] added fall damage sound toggle --- include/config.h | 2 ++ src/game/mario_actions_airborne.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/include/config.h b/include/config.h index 2e436be6..16eb0bd5 100644 --- a/include/config.h +++ b/include/config.h @@ -71,6 +71,8 @@ #define JUMP_KICK_FIX // 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) +//#define NO_FALL_DAMAGE_SOUND // Number of coins to spawn the "100 coin" star. If you remove the define altogether, then there won't be a 100 coin star at all. #define X_COIN_STAR 100 // Stars don't kick you out of the level diff --git a/src/game/mario_actions_airborne.c b/src/game/mario_actions_airborne.c index fda9e4c8..fb693460 100644 --- a/src/game/mario_actions_airborne.c +++ b/src/game/mario_actions_airborne.c @@ -2063,8 +2063,9 @@ s32 mario_execute_airborne_action(struct MarioState *m) { if (check_common_airborne_cancels(m)) { return TRUE; } - +#ifndef NO_FALL_DAMAGE_SOUND play_far_fall_sound(m); +#endif /* clang-format off */ switch (m->action) {