summaryrefslogtreecommitdiff
path: root/soh/src
diff options
context:
space:
mode:
authorMalkierian <malkierian@gmail.com>2025-01-04 00:41:14 -0700
committerGitHub <noreply@github.com>2025-01-04 00:41:14 -0700
commitbbc4cc3305864d6891d98bd739b8ea8fe26afb04 (patch)
treee63fbc79301c525b40c5e24c81d58a1affae7051 /soh/src
parent8648cdeca510d5f419a4c526f7f5e5079a1275bf (diff)
Fix shield invert tooltips and X-axis application (#4802)
* Update Forest and Carpenters CVars in the migrator. * Fix shield invert tooltips and X-axis application.
Diffstat (limited to 'soh/src')
-rw-r--r--soh/src/overlays/actors/ovl_player_actor/z_player.c2
1 files changed, 1 insertions, 1 deletions
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 cda6356f5..8d229178b 100644
--- a/soh/src/overlays/actors/ovl_player_actor/z_player.c
+++ b/soh/src/overlays/actors/ovl_player_actor/z_player.c
@@ -9269,7 +9269,7 @@ void Player_Action_80843188(Player* this, PlayState* play) {
f32 sp40;
sp54 = sControlInput->rel.stick_y * 100 * (CVarGetInteger(CVAR_SETTING("Controls.InvertShieldAimingYAxis"), 1) ? 1 : -1);
- sp50 = sControlInput->rel.stick_x * (CVarGetInteger(CVAR_ENHANCEMENT("MirroredWorld"), 0) ? 120 : -120) * (CVarGetInteger(CVAR_SETTING("Controls.InvertShieldAimingYAxis"), 0) ? -1 : 1);
+ sp50 = sControlInput->rel.stick_x * (CVarGetInteger(CVAR_ENHANCEMENT("MirroredWorld"), 0) ? 120 : -120) * (CVarGetInteger(CVAR_SETTING("Controls.InvertShieldAimingXAxis"), 0) ? -1 : 1);
sp4E = this->actor.shape.rot.y - Camera_GetInputDirYaw(GET_ACTIVE_CAM(play));
sp40 = Math_CosS(sp4E);