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

Fix some off-by-one loads in MSU fallback

Browse Source
This commit is contained in:
qwertymodo
2019-09-25 18:35:45 -07:00
parent aa1a07f85b
commit 5be274d69e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
msu.asm
View File

@@ -231,8 +231,8 @@ CheckMusicLoadRequest:
LDA $040C : LSR : !ADD.b #33 : STA !REG_MUSIC_CONTROL_REQUEST LDA $040C : LSR : !ADD.b #33 : STA !REG_MUSIC_CONTROL_REQUEST
.check_fallback .check_fallback
LDX !REG_MUSIC_CONTROL_REQUEST : DEX LDX !REG_MUSIC_CONTROL_REQUEST
LDA MusicShuffleTable,X : DEC : PHA LDA MusicShuffleTable-1,X : DEC : PHA
AND.b #$07 : TAY AND.b #$07 : TAY
PLA : LSR #3 : TAX PLA : LSR #3 : TAX
LDA !REG_MSU_FALLBACK_TABLE,X : BEQ .secondary_fallback : CMP.b #$FF : BEQ .mute LDA !REG_MSU_FALLBACK_TABLE,X : BEQ .secondary_fallback : CMP.b #$FF : BEQ .mute
@@ -270,7 +270,7 @@ CheckMusicLoadRequest:
SEP #$20 SEP #$20
LDA ($00) LDA ($00)
PLY : STY $00 : SEP #$10 : PLB PLY : STY $00 : SEP #$10 : PLB
TAX : LDA MusicShuffleTable,X TAX : LDA MusicShuffleTable-1,X
STA !REG_MUSIC_CONTROL_REQUEST STA !REG_MUSIC_CONTROL_REQUEST
BRL .check_fallback BRL .check_fallback