alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Pull Requests 1 Releases Activity

Merge pull request #59 from qwertymodo/master

Browse Source 
Handle MSU-1 delayed track loading in fanfare waits
This commit is contained in:
Salvatore
2018-09-30 08:09:47 -04:00
committed by GitHub
parent be6073872c 4244208e3c
commit 6c81d12589
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
msu.asm
View File

@@ -170,12 +170,13 @@ load_track:
JML spc_continue JML spc_continue
pendant_fanfare: pendant_fanfare:
REP #$20
LDA TournamentSeed : BNE .spc LDA TournamentSeed : BNE .spc
REP #$20
LDA !REG_MSU_ID_01 : CMP !VAL_MSU_ID_01 : BNE .spc 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_23 : CMP !VAL_MSU_ID_23 : BNE .spc
LDA !REG_MSU_ID_45 : CMP !VAL_MSU_ID_45 : BNE .spc LDA !REG_MSU_ID_45 : CMP !VAL_MSU_ID_45 : BNE .spc
SEP #$20 SEP #$20
LDA !REG_MSU_LOAD_FLAG : BNE .continue
LDA !REG_MSU_STATUS : BIT !FLAG_MSU_STATUS_AUDIO_PLAYING : BEQ .done LDA !REG_MSU_STATUS : BIT !FLAG_MSU_STATUS_AUDIO_PLAYING : BEQ .done
.continue .continue
jml pendant_continue jml pendant_continue
@@ -187,12 +188,13 @@ pendant_fanfare:
crystal_fanfare: crystal_fanfare:
REP #$20
LDA TournamentSeed : BNE .spc LDA TournamentSeed : BNE .spc
REP #$20
LDA !REG_MSU_ID_01 : CMP !VAL_MSU_ID_01 : BNE .spc 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_23 : CMP !VAL_MSU_ID_23 : BNE .spc
LDA !REG_MSU_ID_45 : CMP !VAL_MSU_ID_45 : BNE .spc LDA !REG_MSU_ID_45 : CMP !VAL_MSU_ID_45 : BNE .spc
SEP #$20 SEP #$20
LDA !REG_MSU_LOAD_FLAG : BNE .continue
LDA !REG_MSU_STATUS : BIT !FLAG_MSU_STATUS_AUDIO_PLAYING : BEQ .done LDA !REG_MSU_STATUS : BIT !FLAG_MSU_STATUS_AUDIO_PLAYING : BEQ .done
.continue .continue
jml crystal_continue jml crystal_continue