From 4244208e3c7019b5031704e23046c994b8bfc6f8 Mon Sep 17 00:00:00 2001 From: qwertymodo Date: Sat, 29 Sep 2018 13:51:47 -0700 Subject: [PATCH] Check for delayed MSU-1 track load (SD2SNES) before waiting for track end in non-tournament ROMs --- msu.asm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/msu.asm b/msu.asm index a8cd223..5d512a7 100644 --- a/msu.asm +++ b/msu.asm @@ -170,12 +170,13 @@ load_track: JML spc_continue pendant_fanfare: - REP #$20 LDA TournamentSeed : BNE .spc + REP #$20 LDA !REG_MSU_ID_01 : CMP !VAL_MSU_ID_01 : BNE .spc LDA !REG_MSU_ID_23 : CMP !VAL_MSU_ID_23 : BNE .spc LDA !REG_MSU_ID_45 : CMP !VAL_MSU_ID_45 : BNE .spc SEP #$20 + LDA !REG_MSU_LOAD_FLAG : BNE .continue LDA !REG_MSU_STATUS : BIT !FLAG_MSU_STATUS_AUDIO_PLAYING : BEQ .done .continue jml pendant_continue @@ -187,12 +188,13 @@ pendant_fanfare: crystal_fanfare: - REP #$20 LDA TournamentSeed : BNE .spc + REP #$20 LDA !REG_MSU_ID_01 : CMP !VAL_MSU_ID_01 : BNE .spc LDA !REG_MSU_ID_23 : CMP !VAL_MSU_ID_23 : BNE .spc LDA !REG_MSU_ID_45 : CMP !VAL_MSU_ID_45 : BNE .spc SEP #$20 + LDA !REG_MSU_LOAD_FLAG : BNE .continue LDA !REG_MSU_STATUS : BIT !FLAG_MSU_STATUS_AUDIO_PLAYING : BEQ .done .continue jml crystal_continue