Corrected some music fade-outs during mosaic transitions

hooks.asm

@@ -2234,8 +2234,6 @@ org $82A9B0 ; (BCS $A9B7)
 NOP #2
 org $82C1C8 ; (BCS $C1CC)
 NOP #2
-org $82ADA0 ; (LDA.b #$F1 : STA $012C)
-JSL Overworld_MosaicDarkWorldChecks : NOP
 ;--------------------------------------------------------------------------------
 org $85CC58 ; <- Bank05.asm:1307 (LDA $040A : CMP.b #$18)
 JSL PsychoSolder_MusicCheck : NOP #1

music.asm

@@ -173,24 +173,21 @@ RTL
 ;--------------------------------------------------------------------------------
 
 ;--------------------------------------------------------------------------------
-; Additional dark world checks to determine whether or not to fade out music
-; on mosaic transitions
-; 
-; On entry, A = $8A (overworld area being loaded)
-Overworld_MosaicDarkWorldChecks:
-    CMP.b #$40 : BEQ .checkCrystals
-    CMP.b #$42 : BEQ .checkCrystals
-    CMP.b #$50 : BEQ .checkCrystals
-    CMP.b #$51 : BNE .doFade
+pushpc
+org $82AD6C
+; Determine whether or not to fade out music on mosaic transitions
+OverworldMosaicTransition_HandleSong:
+    LDA.b GameSubMode : CMP.b #$0D : BNE .dont_fade
+    LDA.w CurrentControlRequest : CMP.b #$04 : BEQ .dont_fade
+    BRA .fade_song
 
-.checkCrystals
-    LDA.l CrystalsField : CMP.b #$7F : BEQ .done
+warnpc $82ADA0
+org $82ADA0
+.fade_song
+org $82ADA5
+.dont_fade
 
-.doFade
-    LDA.b #$F1 : STA.w MusicControlRequest  ; thing we wrote over, fade out music
-
-.done
-    RTL
+pullpc
 ;--------------------------------------------------------------------------------
 
 ;--------------------------------------------------------------------------------