From f5c0ecf7e6b85de6d41a326fb52fd5ecfdc0368b Mon Sep 17 00:00:00 2001 From: Hyper <34012267+hyperbx@users.noreply.github.com> Date: Tue, 11 Feb 2025 00:23:10 +0000 Subject: [PATCH] Fixed Werehog battle theme returning after defeating bosses when disabled --- UnleashedRecomp/locale/config_locale.cpp | 2 +- UnleashedRecompLib/config/SWA.toml | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/UnleashedRecomp/locale/config_locale.cpp b/UnleashedRecomp/locale/config_locale.cpp index 55c67c1d..9cb95ce5 100644 --- a/UnleashedRecomp/locale/config_locale.cpp +++ b/UnleashedRecomp/locale/config_locale.cpp @@ -244,7 +244,7 @@ CONFIG_DEFINE_LOCALE(Subtitles) CONFIG_DEFINE_LOCALE(BattleTheme) { - { ELanguage::English, { "Battle Theme", "Play the Werehog battle theme during combat.\n\nThis option will apply the next time you're in combat." } } + { ELanguage::English, { "Battle Theme", "Play the Werehog battle theme during combat.\n\nThis option will apply the next time you're in combat.\n\nRescue missions and boss themes will be unaffected." } } }; CONFIG_DEFINE_LOCALE(WindowSize) diff --git a/UnleashedRecompLib/config/SWA.toml b/UnleashedRecompLib/config/SWA.toml index 8feccb01..f84d688a 100644 --- a/UnleashedRecompLib/config/SWA.toml +++ b/UnleashedRecompLib/config/SWA.toml @@ -355,6 +355,11 @@ name = "WerehogBattleMusicMidAsmHook" address = 0x82B47728 registers = ["r11"] +[[midasm_hook]] +name = "WerehogBattleMusicMidAsmHook" +address = 0x82B47C58 +registers = ["r11"] + [[midasm_hook]] name = "MotionBlurMidAsmHook" address = 0x82BA99D0