From 5b7b0ab8d6086c61d7bdb4ccf3ce29f80d6e59c1 Mon Sep 17 00:00:00 2001
From: Reonu <danileon95@gmail.com>
Date: Tue, 19 Jul 2022 14:34:00 +0100
Subject: [PATCH] moved CASTLE_MUSIC_FIX into level specific checks (#437)

---
 include/config/config_audio.h | 3 ---
 src/game/level_update.c       | 6 +++---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/include/config/config_audio.h b/include/config/config_audio.h
index a419451c..d81a8603 100644
--- a/include/config/config_audio.h
+++ b/include/config/config_audio.h
@@ -4,9 +4,6 @@
  * AUDIO SETTINGS *
  ******************/
 
-// Fixes the castle music sometimes triggering after getting a dialog.
-#define CASTLE_MUSIC_FIX
-
 // Do not restart the music on cap grabs.
 #define PERSISTENT_CAP_MUSIC
 
diff --git a/src/game/level_update.c b/src/game/level_update.c
index 6b2d27c0..e0b17652 100644
--- a/src/game/level_update.c
+++ b/src/game/level_update.c
@@ -1287,10 +1287,10 @@ s32 lvl_init_from_save_file(UNUSED s16 initOrUpdate, s32 levelNum) {
 #endif
     sWarpDest.type = WARP_TYPE_NOT_WARPING;
     sDelayedWarpOp = WARP_OP_NONE;
-#ifdef CASTLE_MUSIC_FIX
-    gNeverEnteredCastle = 0;
-#else
+#ifdef ENABLE_VANILLA_LEVEL_SPECIFIC_CHECKS
     gNeverEnteredCastle = !save_file_exists(gCurrSaveFileNum - 1);
+#else
+    gNeverEnteredCastle = 0;
 #endif
     gCurrLevelNum = levelNum;
     gCurrCourseNum = COURSE_NONE;