From 37d3ba4b39645e545b2025151dabf91d99e47f92 Mon Sep 17 00:00:00 2001
From: dannye <33dannye@gmail.com>
Date: Mon, 29 Mar 2021 22:30:01 -0500
Subject: [PATCH] Fix alternate starts/tempos

---
 audio/alternate_tempo.asm         | 61 ++++++++++++++-----------------
 crysaudio/music/RBY/meetrival.asm |  6 ---
 2 files changed, 28 insertions(+), 39 deletions(-)

diff --git a/audio/alternate_tempo.asm b/audio/alternate_tempo.asm
index d6b70ad6..301eb969 100644
--- a/audio/alternate_tempo.asm
+++ b/audio/alternate_tempo.asm
@@ -2,53 +2,48 @@
 Music_RivalAlternateStart::
 	ld c, 0 ; BANK(Music_MeetRival)
 	ld a, MUSIC_MEET_RIVAL
-	jp PlayMusic
-;	call PlayMusic
-;	ld hl, wChannelCommandPointers
-;	ld de, Music_MeetRival_branch_b1a2
-;	call Audio1_OverwriteChannelPointer
-;	ld de, Music_MeetRival_branch_b21d
-;	call Audio1_OverwriteChannelPointer
-;	ld de, Music_MeetRival_branch_b2b5
+	call PlayMusic
+	ld hl, wChannel1MusicAddress
+	ld de, Music_MeetRival_branch_b1a2
+	call Audio1_OverwriteChannelPointer
+	ld hl, wChannel2MusicAddress
+	ld de, Music_MeetRival_branch_b21d
+	call Audio1_OverwriteChannelPointer
+	ld hl, wChannel3MusicAddress
+	ld de, Music_MeetRival_branch_b2b5
 
-;Audio1_OverwriteChannelPointer:
-;	ld a, e
-;	ld [hli], a
-;	ld a, d
-;	ld [hli], a
-;	ret
+Audio1_OverwriteChannelPointer:
+	ld a, e
+	ld [hli], a
+	ld a, d
+	ld [hli], a
+	ret
 
 ; an alternate tempo for MeetRival which is slightly slower
 Music_RivalAlternateTempo::
 	ld c, 0 ; BANK(Music_MeetRival)
 	ld a, MUSIC_MEET_RIVAL
-	jp PlayMusic
-;	call PlayMusic
-;	ld hl, wChannelCommandPointers
-;	ld de, Music_MeetRival_branch_b119
-;	jp Audio1_OverwriteChannelPointer
+	call PlayMusic
+	ld hl, wChannel1MusicAddress
+	ld de, Music_MeetRival_branch_b119
+	jp Audio1_OverwriteChannelPointer
 
 ; applies both the alternate start and alternate tempo
 Music_RivalAlternateStartAndTempo::
-	jp Music_RivalAlternateStart
-;	call Music_RivalAlternateStart
-;	ld hl, wChannelCommandPointers
-;	ld de, Music_MeetRival_branch_b19b
-;	jp Audio1_OverwriteChannelPointer
+	call Music_RivalAlternateStart
+	ld hl, wChannel1MusicAddress
+	ld de, Music_MeetRival_branch_b19b
+	jp Audio1_OverwriteChannelPointer
 
 ; an alternate tempo for Cities1 which is used for the Hall of Fame room
 Music_Cities1AlternateTempo::
 	ld a, 10
-	ld [wAudioFadeOutCounterReloadValue], a
-	ld [wAudioFadeOutCounter], a
-	ld a, $ff ; stop playing music after the fade-out is finished
-	ld [wAudioFadeOutControl], a
+	call StopMusic
 	ld c, 100
 	call DelayFrames ; wait for the fade-out to finish
 	ld c, 0 ; BANK(Music_Cities1)
 	ld a, MUSIC_CITIES1
-	jp PlayMusic
-;	call PlayMusic
-;	ld hl, wChannelCommandPointers
-;	ld de, Music_Cities1_branch_aa6f
-;	jp Audio1_OverwriteChannelPointer
+	call PlayMusic
+	ld hl, wChannel1MusicAddress
+	ld de, Music_Cities1_branch_aa6f
+	jp Audio1_OverwriteChannelPointer
diff --git a/crysaudio/music/RBY/meetrival.asm b/crysaudio/music/RBY/meetrival.asm
index a0d7dd0f..f88d593b 100644
--- a/crysaudio/music/RBY/meetrival.asm
+++ b/crysaudio/music/RBY/meetrival.asm
@@ -4,12 +4,6 @@ Music_MeetRival::
 	channel 2, Music_MeetRival_Ch2
 	channel 3, Music_MeetRival_Ch3
 
-Music_FarewellRival:
-	channel_count 3
-	channel 1, Music_MeetRival_branch_b1a2
-	channel 2, Music_MeetRival_branch_b21d
-	channel 3, Music_MeetRival_branch_b2b5
-
 Music_MeetRival_branch_b119::
 	tempo 100
 	sound_loop 0, Music_MeetRival_branch_b123