From 8abae8d26bbf66a8ac2ebf139802146518f6ebd0 Mon Sep 17 00:00:00 2001
From: MysterD <myster@d>
Date: Mon, 14 Feb 2022 18:30:02 -0800
Subject: [PATCH] Fix crash in peach cutscene

---
 src/game/camera.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/game/camera.c b/src/game/camera.c
index 002660f21..8556772f0 100644
--- a/src/game/camera.c
+++ b/src/game/camera.c
@@ -7382,6 +7382,10 @@ BAD_RETURN(s32) cutscene_ending_mario_land(struct Camera *c) {
  * Move the camera closer to peach appearing.
  */
 BAD_RETURN(s32) cutscene_ending_peach_appear_closeup(struct Camera *c) {
+    // hacky fix to make sure cutscene focus is valid
+    if (gCutsceneFocus == NULL) {
+        gCutsceneFocus = gMarioStates[0].marioObj;
+    }
     vec3f_set(c->pos, 179.f, 2463.f, -1216.f);
     c->pos[1] = gCutsceneFocus->oPosY + 35.f;
     vec3f_set(c->focus, gCutsceneFocus->oPosX, gCutsceneFocus->oPosY + 125.f, gCutsceneFocus->oPosZ);