diff options
| author | Patrick12115 <115201185+Patrick12115@users.noreply.github.com> | 2025-02-23 22:27:06 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-02-23 21:27:06 -0600 |
| commit | 4c80ffeb505fed997811201fa85ef685118fe62e (patch) | |
| tree | f63b6145fcfa8a2fdce4efde551803fdc86f345a /mm/src/code | |
| parent | b86857fe2b986cdb3be4f57d77e65fb2c52587a9 (diff) | |
[SFX] Mute Low HP Alarm, Carpenters Sounds, and Crying Goron Child (#999)
* Mute Low HP Alarm and Carpenters
Adds Sfx options for Low HP Alarm and the carpenter sounds heard in South and East Clocktown from the tower being built
* Change Clocktown to Clock Town
* Adds toggle for crying goron
* Tweaked tooltip
* Use should instead of Actor Kill
Co-authored-by: Archez <Archez@users.noreply.github.com>
---------
Co-authored-by: Archez <Archez@users.noreply.github.com>
Diffstat (limited to 'mm/src/code')
| -rw-r--r-- | mm/src/code/z_lifemeter.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mm/src/code/z_lifemeter.c b/mm/src/code/z_lifemeter.c index d46bc5099..372488f82 100644 --- a/mm/src/code/z_lifemeter.c +++ b/mm/src/code/z_lifemeter.c @@ -6,6 +6,7 @@ #include "BenPort.h" #include "2s2h/BenGui/HudEditor.h" #include "2s2h/BenGui/CosmeticEditor.h" +#include "2s2h/GameInteractor/GameInteractor.h" s16 sHeartsPrimColors[3][3] = { { 255, 70, 50 }, { 255, 190, 0 }, { 100, 100, 255 } }; s16 sHeartsEnvColors[3][3] = { { 50, 40, 60 }, { 255, 0, 0 }, { 0, 0, 255 } }; @@ -478,7 +479,9 @@ void LifeMeter_UpdateSizeAndBeep(PlayState* play) { interfaceCtx->lifeSizeChangeDirection = 0; if (!Player_InCsMode(play) && (play->pauseCtx.state == PAUSE_STATE_OFF) && (play->pauseCtx.debugEditor == DEBUG_EDITOR_NONE) && LifeMeter_IsCritical() && !Play_InCsMode(play)) { - Audio_PlaySfx(NA_SE_SY_HITPOINT_ALARM); + if (GameInteractor_Should(VB_PLAY_LOW_HP_ALARM, true)) { + Audio_PlaySfx(NA_SE_SY_HITPOINT_ALARM); + } } } } else { |