diff --git a/soh/soh/GameMenuBar.cpp b/soh/soh/GameMenuBar.cpp index b3e3553be..768cee249 100644 --- a/soh/soh/GameMenuBar.cpp +++ b/soh/soh/GameMenuBar.cpp @@ -382,7 +382,10 @@ namespace GameMenuBar { UIWidgets::PaddedText("Bunny Hood Effect", true, false); const char* bunnyHoodOptions[3] = { "Disabled", "Faster Run & Longer Jump", "Faster Run"}; UIWidgets::EnhancementCombobox("gMMBunnyHood", bunnyHoodOptions, 3, 0); - UIWidgets::Tooltip("Wearing the Bunny Hood grants a speed increase like in Majora's Mask. The longer jump option is not accounted for in randomizer logic."); + UIWidgets::Tooltip( + "Wearing the Bunny Hood grants a speed increase like in Majora's Mask. The longer jump option is not accounted for in randomizer logic.\n\n" + "Also disables NPC's reactions to wearing the Bunny Hood." + ); UIWidgets::PaddedEnhancementCheckbox("Mask Select in Inventory", "gMaskSelect", true, false); UIWidgets::Tooltip("After completing the mask trading sub-quest, press A and any direction on the mask slot to change masks"); UIWidgets::PaddedEnhancementCheckbox("Nuts explode bombs", "gNutsExplodeBombs", true, false); diff --git a/soh/src/code/z_face_reaction.c b/soh/src/code/z_face_reaction.c index 2dbd56df2..b4dfa50db 100644 --- a/soh/src/code/z_face_reaction.c +++ b/soh/src/code/z_face_reaction.c @@ -66,5 +66,10 @@ u16 sReactionTextIds[][PLAYER_MASK_MAX] = { u16 Text_GetFaceReaction(PlayState* play, u32 reactionSet) { u8 currentMask = Player_GetMask(play); - return sReactionTextIds[reactionSet][currentMask]; + if (CVar_GetS32("gMMBunnyHood", 0) && currentMask == PLAYER_MASK_BUNNY) { + return 0; + } else { + return sReactionTextIds[reactionSet][currentMask]; + } + }