Merge remote-tracking branch 'codemann/OWMain' into overworld_kara

2021-09-21 14:10:23 -07:00
parent fb4068a3e1 a30e459dbb
commit f6f6383913
13 changed files with 80 additions and 179 deletions
--- a/msu.asm
+++ b/msu.asm
@@ -76,7 +76,7 @@
 ;
 ; Additional tracks
 ;
-; 60 - Light World OW (after ped pull)
+; 60 - Light World OW (after aga kill)
 ; 61 - Dark World OW (with all crystals)
 ;
 ;=======================================
@@ -250,7 +250,8 @@ CheckMusicLoadRequest:
            BRA .check_fallback-3
 .lightworld
            PHA
-                LDA $7EF300 : AND.b #$40 : BEQ +
+                ;LDA $7EF300 : AND.b #$40 : BEQ + ; ped pull
+                LDA $7EF3C5 : CMP.b #03 : BNE + ; aga1 killed
                    PLA
                    LDA.b #60 : BRA .check_fallback-3
                +