From 708d67336d44e02383e9ceb1ee51eac19791bb8d Mon Sep 17 00:00:00 2001
From: djoslin0 <djoslin0@users.noreply.github.com>
Date: Sun, 16 Nov 2025 15:32:56 -0800
Subject: [PATCH] Fix bowser camera oscillations (#1009)

Prevent the boss camera from using the altered 'grab' version
unless the local player is actually grabbing something

Co-authored-by: MysterD <myster@d>
---
 src/game/camera.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/game/camera.c b/src/game/camera.c
index 15de4b863..d806b3e91 100644
--- a/src/game/camera.c
+++ b/src/game/camera.c
@@ -1633,6 +1633,12 @@ s32 update_boss_fight_camera(struct Camera *c, Vec3f focus, Vec3f pos) {
     if ((o = gSecondCameraFocus) != NULL) {
         object_pos_to_vec3f(secondFocus, o);
         heldState = o->oHeldState;
+
+        // for coop: if bowser is being held by someone else, don't alter the camera to prevent camera oscillations
+        if (gMarioStates[0].heldObj == NULL) {
+            heldState = 0;
+        }
+
     } else {
     // If no boss is there, just rotate around the area's center point.
         secondFocus[0] = c->areaCenX;