From 5be274d69e7bc33e1a91a6c12258af1f76288ff1 Mon Sep 17 00:00:00 2001 From: qwertymodo Date: Wed, 25 Sep 2019 18:35:45 -0700 Subject: [PATCH] Fix some off-by-one loads in MSU fallback --- msu.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/msu.asm b/msu.asm index 81969c9..987ccde 100644 --- a/msu.asm +++ b/msu.asm @@ -231,8 +231,8 @@ CheckMusicLoadRequest: LDA $040C : LSR : !ADD.b #33 : STA !REG_MUSIC_CONTROL_REQUEST .check_fallback - LDX !REG_MUSIC_CONTROL_REQUEST : DEX - LDA MusicShuffleTable,X : DEC : PHA + LDX !REG_MUSIC_CONTROL_REQUEST + LDA MusicShuffleTable-1,X : DEC : PHA AND.b #$07 : TAY PLA : LSR #3 : TAX LDA !REG_MSU_FALLBACK_TABLE,X : BEQ .secondary_fallback : CMP.b #$FF : BEQ .mute @@ -270,7 +270,7 @@ CheckMusicLoadRequest: SEP #$20 LDA ($00) PLY : STY $00 : SEP #$10 : PLB - TAX : LDA MusicShuffleTable,X + TAX : LDA MusicShuffleTable-1,X STA !REG_MUSIC_CONTROL_REQUEST BRL .check_fallback