No more SPC race condition whack-a-mole, just hard sync and be done with it

2019-09-27 14:07:45 -07:00
parent 60c66a6944
commit b5f42c706e
2 changed files with 16 additions and 12 deletions
--- a/msu.asm
+++ b/msu.asm
@@ -279,14 +279,12 @@ CheckMusicLoadRequest:

 .load
        REP #$10
-        STA !REG_CURRENT_COMMAND
+        STZ $4200
        STA !REG_SPC_CONTROL
-        - : CMP !REG_SPC_CONTROL : BNE -
-        LDA.b !VAL_COMMAND_STOP_PLAYBACK
-        STA !REG_CURRENT_COMMAND
-        STA !REG_SPC_CONTROL
-        - : LDA !REG_SPC_CONTROL : BNE -
-        STZ !REG_CURRENT_COMMAND
+        - : 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