From c21aa2d85ffe54d1d043fbc79c9c0d2a11c4144d Mon Sep 17 00:00:00 2001
From: David Joslin <joslin_productions@hotmail.com>
Date: Wed, 8 Nov 2023 12:18:24 -0800
Subject: [PATCH] Fixed crash in warp_credits

---
 src/game/level_update.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/game/level_update.c b/src/game/level_update.c
index 9f50f013..b8d6d6be 100644
--- a/src/game/level_update.c
+++ b/src/game/level_update.c
@@ -630,7 +630,9 @@ void warp_credits(void) {
 
     set_mario_action(gMarioState, marioAction, 0);
 
-    reset_camera(gCurrentArea->camera);
+    if (gCurrentArea) {
+        reset_camera(gCurrentArea->camera);
+    }
 
     sWarpDest.type = WARP_TYPE_NOT_WARPING;
     sDelayedWarpOp = WARP_OP_NONE;
@@ -638,7 +640,9 @@ void warp_credits(void) {
     play_transition(WARP_TRANSITION_FADE_FROM_COLOR, 0x14, 0x00, 0x00, 0x00);
 
     if (gCurrCreditsEntry == NULL || gCurrCreditsEntry == sCreditsSequence) {
-        set_background_music(gCurrentArea->musicParam, gCurrentArea->musicParam2, 0);
+        if (gCurrentArea) {
+            set_background_music(gCurrentArea->musicParam, gCurrentArea->musicParam2, 0);
+        }
     }
 }