From 76605397afafd96aabca07d03dfc25fb4a6b8e89 Mon Sep 17 00:00:00 2001
From: MysterD <myster@d>
Date: Tue, 29 Sep 2020 23:18:17 -0700
Subject: [PATCH] Prevent vanilla camera from being in a bad state after
 collecting star

---
 src/game/mario_actions_cutscene.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/game/mario_actions_cutscene.c b/src/game/mario_actions_cutscene.c
index 4240a6610..7e0c7e97b 100644
--- a/src/game/mario_actions_cutscene.c
+++ b/src/game/mario_actions_cutscene.c
@@ -710,8 +710,7 @@ void general_star_dance_handler(struct MarioState *m, s32 isInWater) {
             set_mario_action(m, isInWater ? ACT_WATER_IDLE : ACT_IDLE, 0);
         }
         if (gServerSettings.stayInLevelAfterStar) {
-            set_camera_mode(m->area->camera, m->area->camera->defMode, 1);
-            m->area->camera->cutscene = 0;
+            reset_camera(m->area->camera);
         }
     }
 }