diff options
| author | Glought <Glought@users.noreply.github.com> | 2025-11-20 10:31:41 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-11-20 13:31:41 -0500 |
| commit | ddee25d7ece8a1cd87cb33c321dac202a4daa4e3 (patch) | |
| tree | bf6dc9cddabeade3d961770c23f462db7c5fe783 /mm/2s2h/GameInteractor/GameInteractor.h | |
| parent | 02d9170d141c9f9f8e6a14568efc7678f0d87236 (diff) | |
[Audio Editor] Port Audio Options from SoH Audio Editor (#1325)
* Ported Audio Options from SoH Audio Editor
*Moved "Mute Low HP Alarm" to Audio Editor -> Audio Options
Changed Cvar
From: "gEnhancements.Sfx.LowHpAlarm"
To: "gAudioEditor.LowHpAlarm"
*Moved "Mute Carpenter Sounds" to Audio Editor -> Audio Options
Changed Cvar
From: "gEnhancements.Sfx.MuteCarpenterSfx"
To: "gAudioEditor.MuteCarpenterSfx"
*Moved "Mute Crying Goron Child" to Audio Editor -> Audio Options
Changed Cvar
From: "gEnhancements.Sfx.ChildGoronCry"
To: "gAudioEditor.ChildGoronCry"
*Added "Disable Tatle Call Audio"
*Added "Disable Enemy Proximity Music"
*Added "Randomize All Music and Sound Effects on New Scene"
*Added "Randomize All Music and Sound Effects on Randomizer Generation"
*Added "Display Sequence Name on Overlay" and "Overlay Duration" Slider
*Added "Link's Voice Pitch Multiplier" Slider
* *Ported "AddSearchWidget" Functionally
Enabled for Audio Editor -> Audio Options
* Cleaned up some code I missed and ran clang format.
* Renamed "OnScene" Hook to "OnSceneChange"
* Made it so "Link's Voice Pitch Multiplier" slider only effects Link's voice.
* Forgot the "AudioHook.cpp" file its needed for the
"Display Sequence Name on Overlay" option.
* Moved the "Sfx" folder to the "Audio" folder.
* Removed extra line breaks between sections in "RegisterAudioWidgets()".
* Renamed "OnGenerationCompletion" hook to "OnRandoSeedGeneration"
* Changed "gAudioEditor.*" to use "CVAR_AUDIO("*") in "AudioEditor.cpp"
* Added "AddAudioSearchWidget" function
Changed all "BenGui::mBenMenu->AddSearchWidget lines to use
"AddAudioSearchWidget".
* Changed the "OnSeqPlayerInit" hook parameters type to use the "s32" Macro.
* Update BenMenu/BenGui include paths: Replaced "../../" with "2s2h/".
* Ran Clang Format.
* Added "DisableEnemyProximityMusic.cpp"
Added "VB_PLAY_ENEMY_PROXIMITY_MUSIC" enum to "GIVanillaBehavior" in
"GameInteractor.h"
"Audio_UpdateEnemyBgmVolume" is now wrapped in a "GameInteractor_Should"
* Added "DisableTatlCallAudio.cpp"
Added "VB_PLAY_TATL_CALL_AUDIO" enum to "GIVanillaBehavior" in
"GameInteractor.h"
"Audio_PlaySfx(NA_SE_VO_NAVY_CALL)" is now wrapped in a "GameInteractor_Should"
* Added "LinksVoicePitchMultiplier.cpp"
Added "Enable Link's Voice Pitch Multiplier" checkbox to Audio Editor
The "Link's Voice Pitch Multiplier" slider is now disabled when
"Enable Link's Voice Pitch Multiplier" is not enabled.
Added "VB_LINK_VOICE_PITCH_MULTIPLIER" enum to "GIVanillaBehavior" in
"GameInteractor.h"
"AudioSfx_PlaySfx" in the file "z_actor.c" in function "Player_PlaySfx"
is now wrapped in a "GameInteractor_Should".
* Removed "OnSceneChange" Hook.
Removed "GameInteractor_ExecuteOnSceneChange".
Removed "GameInteractor_ExecuteOnSceneChange(play->sceneId);" from
"z_play_2SH.cpp:OTRPlay_SpawnScene" function
Renamed "AudioEditorRegisterOnSceneChangeHook" to
AudioEditorRegisterOnRoomInitHook".
* Made Changes requested by Eblo to "LinksVoicePitchMultiplier.cpp" and
"z_actor.c"
* WIP Randomize On New Scene
Diffstat (limited to 'mm/2s2h/GameInteractor/GameInteractor.h')
| -rw-r--r-- | mm/2s2h/GameInteractor/GameInteractor.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mm/2s2h/GameInteractor/GameInteractor.h b/mm/2s2h/GameInteractor/GameInteractor.h index c0e74180a..42ba0abab 100644 --- a/mm/2s2h/GameInteractor/GameInteractor.h +++ b/mm/2s2h/GameInteractor/GameInteractor.h @@ -239,6 +239,9 @@ typedef enum { VB_BUY_GORMAN_MILK, VB_PLAY_LOW_HP_ALARM, VB_PLAY_GORON_CHILD_CRY, + VB_PLAY_ENEMY_PROXIMITY_MUSIC, + VB_PLAY_TATL_CALL_AUDIO, + VB_LINK_VOICE_PITCH_MULTIPLIER, VB_SNOWBALL_DROP_COLLECTIBLE, VB_SNOWBALL_SET_FLAG, VB_START_JUMPSLASH, @@ -760,6 +763,8 @@ void GameInteractor_ExecuteOnItemGive(u8 item); void GameInteractor_ExecuteOnBottleContentsUpdate(u8 item); +void GameInteractor_ExecuteOnSeqPlayerInit(int32_t playerIdx, int32_t seqId); + bool GameInteractor_Should(GIVanillaBehavior flag, uint32_t result, ...); #define REGISTER_VB_SHOULD(flag, body) \ GameInteractor::Instance->RegisterGameHookForID<GameInteractor::ShouldVanillaBehavior>( \ |
