Changed MSU-1 in Inverted to flip the triggers for the secondary OW tracks

This commit is contained in:
codemann8
2022-07-31 21:11:40 -05:00
parent c209abd2a5
commit 25761a1aa6

32
msu.asm
View File

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