From 218993bd194fffa44ca806a71124d96afe5a8c25 Mon Sep 17 00:00:00 2001
From: dannye <33dannye@gmail.com>
Date: Sun, 11 Apr 2021 12:14:22 -0500
Subject: [PATCH] Fix sound reset in PlayBattleMusic the id check bandaid in
 _PlayMusic is no longer necessary

---
 audio/play_battle_music.asm | 2 +-
 crysaudio/engine.asm        | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/audio/play_battle_music.asm b/audio/play_battle_music.asm
index f3ef8dd3..e802f37b 100644
--- a/audio/play_battle_music.asm
+++ b/audio/play_battle_music.asm
@@ -4,7 +4,7 @@ PlayBattleMusic::
 	ld [wLowHealthAlarm], a
 	dec a ; SFX_STOP_ALL_MUSIC
 ;	ld [wNewSoundID], a
-	call PlayMusic
+	call PlaySound
 	call DelayFrame
 	ld c, 0 ; BANK(Music_GymLeaderBattle)
 	ld a, [wGymLeaderNo]
diff --git a/crysaudio/engine.asm b/crysaudio/engine.asm
index e274e1b1..a1306def 100644
--- a/crysaudio/engine.asm
+++ b/crysaudio/engine.asm
@@ -2442,8 +2442,6 @@ SetLRTracks:
 	ret
 
 _PlayMusic::
-	cp NUM_SONGS
-	ret nc ; sfx
 ; load music
 	call MusicOff
 	ld hl, wMusicID