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

MSU1: Dont resume track from Link's house

Browse Source
This commit is contained in:
Bonta
2021-06-12 22:35:07 +02:00
parent 3f86caf083
commit a9a929c6f4
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
msu.asm
View File

@@ -686,7 +686,15 @@ MSUMain:
.done_resume: .done_resume:
LDA #$00 : STA !MSU_RESUME_TRACK 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 STX !REG_CURRENT_MSU_TRACK
LDA !REG_MSU_PACK_CURRENT : CMP #$FE : !BLT + LDA !REG_MSU_PACK_CURRENT : CMP #$FE : !BLT +
LDA #$00 : BRA ++ LDA #$00 : BRA ++