From 7de7fbeb882418b384b8d6d5a3137d81e764a046 Mon Sep 17 00:00:00 2001
From: Eric Anderson <ejona86@gmail.com>
Date: Mon, 9 Nov 2020 22:01:40 -0800
Subject: [PATCH] twoplayer: Avoid starting music when players die together

---
 twoplayer.s | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/twoplayer.s b/twoplayer.s
index df9efc2..fef3548 100644
--- a/twoplayer.s
+++ b/twoplayer.s
@@ -951,7 +951,7 @@ playState_updateGameOverCurtain_curtainFinished_mod:
         beq     @bothPlayersDead
         lda     player2_playState
         beq     @bothPlayersDead
-        jmp     updateMusicSpeed_playerDied
+        jmp     @updateMusicSpeed_playerDied
 
 @bothPlayersDead:
         ; Wait for a player to press start
@@ -968,7 +968,10 @@ playState_updateGameOverCurtain_curtainFinished_mod:
         sta     newlyPressedButtons_player2
         rts
 
-updateMusicSpeed_playerDied:
+@updateMusicSpeed_playerDied:
+        lda     player1_playState
+        cmp     player2_playState
+        beq     @curtainStillFalling
         lda     allegro
         and     activePlayer
         eor     allegro
@@ -978,6 +981,7 @@ updateMusicSpeed_playerDied:
         ldx     musicType
         lda     musicSelectionTable,x
         jsr     setMusicTrack
+@curtainStillFalling:
         rts
 
 @fast: