From 6e86c5c9b8c29ed2c53027043378a220fbd53aa5 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Tue, 18 May 2021 00:21:32 -0500 Subject: [PATCH 1/2] Fixed GT/ToH MSU muting when playing Door Shuffle --- msu.asm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/msu.asm b/msu.asm index 3118f01..42f7860 100644 --- a/msu.asm +++ b/msu.asm @@ -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 From 9d64b5edd101cd6caf291965da1fb9d3c8da4436 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Wed, 19 May 2021 04:31:55 -0500 Subject: [PATCH 2/2] Whoops, lines got swapped --- msu.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/msu.asm b/msu.asm index 42f7860..cec1a19 100644 --- a/msu.asm +++ b/msu.asm @@ -365,8 +365,8 @@ SpiralStairsPreCheck: ; Change music on stair transition (ToH/GT) ;-------------------------------------------------------------------------------- SpiralStairsPostCheck: - LDA $A0 LDA.l DRMode : BNE .done ; exit if door rando enabled + LDA $A0 CMP.w #$000C : BNE + ; Ganon's tower entrance LDX $0130 : CPX.b #$F1 : BNE .done ; Check that we were fading out