From 34db74660ce95b200715ced578fb424af77c5fae Mon Sep 17 00:00:00 2001 From: MysterD Date: Sun, 7 May 2023 16:02:46 -0700 Subject: [PATCH] Fixed crash in cutscene_bowser_arena_end() --- src/game/camera.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/game/camera.c b/src/game/camera.c index 2b3c37b53..41ba7ed0f 100644 --- a/src/game/camera.c +++ b/src/game/camera.c @@ -8338,12 +8338,17 @@ BAD_RETURN(s32) cutscene_bowser_arena_dialog(struct Camera *c) { * End the bowser arena cutscene. */ BAD_RETURN(s32) cutscene_bowser_arena_end(struct Camera *c) { + if (!c) { return; } cutscene_stop_dialog(c); c->cutscene = 0; transition_next_state(c, 20); sStatusFlags |= CAM_FLAG_UNUSED_CUTSCENE_ACTIVE; - sModeOffsetYaw = sMarioCamState->faceAngle[1] + DEGREES(90); - gSecondCameraFocus->oBowserUnk88 = 2; + if (sMarioCamState) { + sModeOffsetYaw = sMarioCamState->faceAngle[1] + DEGREES(90); + } + if (gSecondCameraFocus) { + gSecondCameraFocus->oBowserUnk88 = 2; + } } /**