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

Merge remote-tracking branch 'baserom/master' into DRMain

Browse Source 
# Conflicts:
#	hooks.asm
#	newhud.asm
#	utilities.asm
This commit is contained in:
aerinon
2021-10-21 14:15:54 -06:00
parent 319aba5e4d 1ef55470d5
commit 27654b9ac9
12 changed files with 123 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
msu.asm
View File

@@ -323,10 +323,8 @@ CheckMusicLoadRequest:
.load
REP #$10
STZ $4200
STA !REG_SPC_CONTROL
- : CMP !REG_SPC_CONTROL : BNE - ; Wait until mute/unmute command is ACK'ed
STZ !REG_SPC_CONTROL
- : LDA !REG_SPC_CONTROL : BNE - ; Wait until mute/unmute command is completed
- : STA !REG_SPC_CONTROL : CMP !REG_SPC_CONTROL : BNE - ; Wait until mute/unmute command is ACK'ed
- : STZ !REG_SPC_CONTROL : LDA !REG_SPC_CONTROL : BNE - ; Wait until mute/unmute command is completed
LDA.b #$81 : STA $4200
LDA !REG_MUSIC_CONTROL_REQUEST : CMP.b #08 : BEQ .done+3 ; No SFX during warp track