alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MSUMuteFix' into OWMain

Browse Source
This commit is contained in:
codemann8
2021-05-19 04:30:05 -05:00
parent 89881f3bee 6e86c5c9b8
commit 2e91981a1e
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
msu.asm
View File

@@ -335,6 +335,7 @@ CheckMusicLoadRequest:
;--------------------------------------------------------------------------------
SpiralStairsPreCheck:
REP #$20 ; thing we wrote over
LDA.l DRMode : BNE .done ; exit if door rando enabled
LDA $A0
CMP.w #$000C : BNE +
LDA !REG_CURRENT_MSU_TRACK : AND.w #$00FF : CMP.w #59 : BNE .done
@@ -365,6 +366,7 @@ SpiralStairsPreCheck:
;--------------------------------------------------------------------------------
SpiralStairsPostCheck:
LDA $A0
LDA.l DRMode : BNE .done ; exit if door rando enabled
CMP.w #$000C : BNE +
; Ganon's tower entrance
LDX $0130 : CPX.b #$F1 : BNE .done ; Check that we were fading out