From a9a929c6f4fb99e99d2cd635dfb71e5d7c5c5926 Mon Sep 17 00:00:00 2001 From: Bonta <40473493+Bonta0@users.noreply.github.com> Date: Sat, 12 Jun 2021 22:35:07 +0200 Subject: [PATCH] MSU1: Dont resume track from Link's house --- msu.asm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/msu.asm b/msu.asm index f7fc19c..51e05cb 100644 --- a/msu.asm +++ b/msu.asm @@ -686,7 +686,15 @@ MSUMain: .done_resume: LDA #$00 : STA !MSU_RESUME_TRACK + - TXA : STA !MSU_LOADED_TRACK + CPX #07 : BNE + ; Kakariko Village + LDA $10 : CMP #$07 : BNE + + ; we're in link's house -> ignore + LDA #$00 + BRA ++ + + + TXA + ++ + STA !MSU_LOADED_TRACK STX !REG_CURRENT_MSU_TRACK LDA !REG_MSU_PACK_CURRENT : CMP #$FE : !BLT + LDA #$00 : BRA ++