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

Merge pull request #8 from codemann8/MSUMuteFix

Browse Source 
Msu mute fix
This commit is contained in:
aerinon
2021-05-29 21:51:08 -06:00
committed by GitHub
parent c7a4d817c0 9d64b5edd1
commit 429649bde8
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: SpiralStairsPreCheck:
REP #$20 ; thing we wrote over REP #$20 ; thing we wrote over
LDA.l DRMode : BNE .done ; exit if door rando enabled
LDA $A0 LDA $A0
CMP.w #$000C : BNE + CMP.w #$000C : BNE +
LDA !REG_CURRENT_MSU_TRACK : AND.w #$00FF : CMP.w #59 : BNE .done LDA !REG_CURRENT_MSU_TRACK : AND.w #$00FF : CMP.w #59 : BNE .done
@@ -364,6 +365,7 @@ SpiralStairsPreCheck:
; Change music on stair transition (ToH/GT) ; Change music on stair transition (ToH/GT)
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
SpiralStairsPostCheck: SpiralStairsPostCheck:
LDA.l DRMode : BNE .done ; exit if door rando enabled
LDA $A0 LDA $A0
CMP.w #$000C : BNE + CMP.w #$000C : BNE +
; Ganon's tower entrance ; Ganon's tower entrance