From b45e8e7e58553f0ddba624f4e70437121ee52b56 Mon Sep 17 00:00:00 2001
From: Isaac <62234577+Isaac0-dev@users.noreply.github.com>
Date: Thu, 28 Apr 2022 11:34:31 +1000
Subject: [PATCH] Check if in water before changing camera. (#71)

---
 src/game/mario_actions_automatic.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/game/mario_actions_automatic.c b/src/game/mario_actions_automatic.c
index 9617e2ba..418f8e87 100644
--- a/src/game/mario_actions_automatic.c
+++ b/src/game/mario_actions_automatic.c
@@ -929,7 +929,7 @@ static void bubbled_offset_visual(struct MarioState* m) {
 }
 
 s32 act_bubbled(struct MarioState* m) {
-    if (m->playerIndex == 0) {
+    if (m->playerIndex == 0 && m->area->camera->mode == CAMERA_MODE_WATER_SURFACE) {
         set_camera_mode(m->area->camera, CAMERA_MODE_FREE_ROAM, 1);
     }
     struct MarioState* targetMarioState = nearest_mario_state_to_object(m->marioObj);