diff --git a/soh/soh/GameMenuBar.cpp b/soh/soh/GameMenuBar.cpp index f32fd9f33..918efa2a6 100644 --- a/soh/soh/GameMenuBar.cpp +++ b/soh/soh/GameMenuBar.cpp @@ -815,8 +815,10 @@ namespace GameMenuBar { UIWidgets::Tooltip("Instantly return the boomerang to Link by pressing its item button while it's in the air"); UIWidgets::PaddedEnhancementCheckbox("Prevent Dropped Ocarina Inputs", "gDpadNoDropOcarinaInput", true, false); UIWidgets::Tooltip("Prevent dropping inputs when playing the ocarina quickly"); - UIWidgets::PaddedEnhancementCheckbox("MM Bunny Hood", "gMMBunnyHood", true, false); - UIWidgets::Tooltip("Wearing the Bunny Hood grants a speed increase like in Majora's Mask"); + 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::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/overlays/actors/ovl_player_actor/z_player.c b/soh/src/overlays/actors/ovl_player_actor/z_player.c index b53e7a2a1..c68113f75 100644 --- a/soh/src/overlays/actors/ovl_player_actor/z_player.c +++ b/soh/src/overlays/actors/ovl_player_actor/z_player.c @@ -6033,7 +6033,7 @@ void func_8083DFE0(Player* this, f32* arg1, s16* arg2) { } } - if (CVar_GetS32("gMMBunnyHood", 0) && this->currentMask == PLAYER_MASK_BUNNY) { + if (CVar_GetS32("gMMBunnyHood", 0) == 1 && this->currentMask == PLAYER_MASK_BUNNY) { maxSpeed *= 1.5f; }