diff --git a/hooks.asm b/hooks.asm
index 3c2558b..636ded4 100644
--- a/hooks.asm
+++ b/hooks.asm
@@ -1950,6 +1950,10 @@ org $0282F4 ; <- Bank02.asm:654 (LDY.b #$58 ...)
 JML.l PreOverworld_LoadProperties_ChooseMusic
 org $028389  ; <- Bank02.asm:763
 PreOverworld_LoadProperties_SetSong:
+;--------------------------------------------------------------------------------
+org $05CC58 ; <- Bank05.asm:1307 (LDA $040A : CMP.b #$18)
+JSL PsychoSolder_MusicCheck
+NOP #1
 ;================================================================================
 
 ;================================================================================
diff --git a/music.asm b/music.asm
index 2f3eeb5..c1d96d0 100644
--- a/music.asm
+++ b/music.asm
@@ -77,3 +77,13 @@ PreOverworld_LoadProperties_ChooseMusic:
 
     JML.l PreOverworld_LoadProperties_SetSong
 ;--------------------------------------------------------------------------------
+
+;--------------------------------------------------------------------------------
+;0 = Is Kakariko Overworld
+;1 = Not Kakariko Overworld
+PsychoSolder_MusicCheck:
+    LDA $040A : CMP.b #$18 : BNE .done ; thing we overwrote - check if overworld location is Kakariko
+        LDA $1B  ; Also check that we are outdoors
+    .done
+RTL
+;--------------------------------------------------------------------------------