From 25761a1aa68c896c6342331c37cf2ec60c7ba81b Mon Sep 17 00:00:00 2001
From: codemann8 <codemann8@gmail.com>
Date: Sun, 31 Jul 2022 21:11:40 -0500
Subject: [PATCH] Changed MSU-1 in Inverted to flip the triggers for the
 secondary OW tracks

---
 msu.asm | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/msu.asm b/msu.asm
index 423cd18..dd603ae 100644
--- a/msu.asm
+++ b/msu.asm
@@ -248,26 +248,30 @@ CheckMusicLoadRequest:
 ;.boss
             LDA $040C : LSR : !ADD.b #45
             BRA .check_fallback-3
+.no_change
+            PLA : BRA .check_fallback-3
 .lightworld
             PHA
-                ;LDA OverworldEventDataWRAM+$80 : AND.b #$40 : BEQ + ; ped pull
-                LDA ProgressIndicator : CMP.b #03 : BNE + ; aga1 killed
-                    PLA
-                    LDA.b #60 : BRA .check_fallback-3
+                LDA InvertedMode : BNE +
+                    ;LDA OverworldEventDataWRAM+$80 : AND.b #$40 : BEQ + ; ped pull
+                    LDA ProgressIndicator : CMP.b #03 : BNE .no_change ; aga1 killed
+                        - PLA : LDA.b #60 : BRA .check_fallback-3
                 +
-            -- : PLA : BRA .check_fallback-3
+                    LDA CrystalsField : CMP.b #$7F : BNE .no_change
+                        BRA -
 .darkworld
             PHA
-                LDA CrystalsField : CMP.b #$7F : BNE --
-            - : PLA
-            LDA.b #61 : BRA .check_fallback-3 
+                LDA InvertedMode : BNE +
+                    LDA CrystalsField : CMP.b #$7F : BNE .no_change
+                        - PLA : LDA.b #61 : BRA .check_fallback-3
+                +
+                    LDA ProgressIndicator : CMP.b #03 : BNE .no_change ; aga1 killed
+                        BRA -
 .darkwoods
-            PHA
-                LDA CrystalsField : CMP.b #$7F : BEQ -
-                ;LDA CurrentWorld : BEQ --
-                LDA $8A : CMP #$40 : BNE --
-            PLA
-            LDA.b #15 : BRA .check_fallback-3
+            LDA.b #15 : PHA
+                LDX $8A : LDA.l OWTileWorldAssoc,X : BEQ +
+                    PLA : BRA .darkworld
+                + PLA : BRA .lightworld
 .castle
             LDA $040C
             CMP.b #$08 : BNE .check_fallback  ; Hyrule Castle 2