From b19c72070dad120ca50b7d3053e521265b15b591 Mon Sep 17 00:00:00 2001 From: Bigs <125335924+PunishedBigs@users.noreply.github.com> Date: Wed, 15 Feb 2023 17:17:38 +1030 Subject: [PATCH] Enhancement Toggle - Disable Automatic First Person Mode for Bombchus (#2471) * Update z_camera.c * Revert "Update z_camera.c" * Update GameMenuBar.cpp Added tickbox for NoFPChus * Update z_player.c Added check for Disable First Person Bomchus enhancement * Update z_player.c Removed comment as statement is clear on its own * Update GameMenuBar.cpp --- soh/soh/GameMenuBar.cpp | 2 ++ soh/src/overlays/actors/ovl_player_actor/z_player.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/soh/soh/GameMenuBar.cpp b/soh/soh/GameMenuBar.cpp index 7e190a5c7..c79c2d85b 100644 --- a/soh/soh/GameMenuBar.cpp +++ b/soh/soh/GameMenuBar.cpp @@ -411,6 +411,8 @@ namespace GameMenuBar { UIWidgets::Tooltip("Helps FW persist between ages, gives child and adult separate FW points, and can be used in more places."); UIWidgets::PaddedEnhancementCheckbox("Static Explosion Radius", "gStaticExplosionRadius", true, false); UIWidgets::Tooltip("Explosions are now a static size, like in Majora's Mask and OoT3D. Makes bombchu hovering much easier."); + UIWidgets::PaddedEnhancementCheckbox("Prevent Bombchus Forcing First-Person", "gDisableFirstPersonChus", true, false); + UIWidgets::Tooltip("Prevent bombchus from forcing the camera into first-person mode when released."); ImGui::EndMenu(); } 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 830cc6013..9de3a0393 100644 --- a/soh/src/overlays/actors/ovl_player_actor/z_player.c +++ b/soh/src/overlays/actors/ovl_player_actor/z_player.c @@ -9374,7 +9374,7 @@ void func_808464B0(Player* this, PlayState* play) { heldActor->velocity.y = 0.0f; heldActor->speedXZ = 0.0f; func_80834644(play, this); - if (heldActor->id == ACTOR_EN_BOM_CHU) { + if (heldActor->id == ACTOR_EN_BOM_CHU && !CVarGetInteger("gDisableFirstPersonChus", 0)) { func_8083B8F4(this, play); } }