From 2b098781b81b336ec25d6c1e0461035ceffe0e10 Mon Sep 17 00:00:00 2001
From: IvanDSM <snesivan1@gmail.com>
Date: Fri, 15 May 2020 17:09:02 -0300
Subject: [PATCH] skip_intro now skips Lakitu and Bowser intros

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

diff --git a/src/game/level_update.c b/src/game/level_update.c
index 13246ad5..3fa795f9 100644
--- a/src/game/level_update.c
+++ b/src/game/level_update.c
@@ -1287,7 +1287,7 @@ s32 lvl_init_from_save_file(UNUSED s16 arg0, s32 levelNum) {
 #endif
     sWarpDest.type = WARP_TYPE_NOT_WARPING;
     sDelayedWarpOp = WARP_OP_NONE;
-    gShouldNotPlayCastleMusic = !save_file_exists(gCurrSaveFileNum - 1);
+    gShouldNotPlayCastleMusic = !save_file_exists(gCurrSaveFileNum - 1) && gCLIOpts.SkipIntro == 0 && configSkipIntro == 0;
 
     gCurrLevelNum = levelNum;
     gCurrCourseNum = COURSE_NONE;