Haunter and Gengar graveyard themes are not actually interleaved

4 files changed, 273 insertions, 273 deletions

diff --git a/audio/music/gastlyinthegraveyard.asm b/audio/music/gastlyinthegraveyard.asm
index 01a6b6e..40d69af 100644
--- a/audio/music/gastlyinthegraveyard.asm
+++ b/audio/music/gastlyinthegraveyard.asm
@@ -5,7 +5,6 @@ Music_GastlyInTheGraveyard:
 	channel 3, Music_GastlyInTheGraveyard_Ch3
 
 Music_GastlyInTheGraveyard_Ch1:
-Music_HaunterInTheGraveyard_branch_3ddf3:
 	tempo 272
 	volume 7, 7
 Music_GastlyInTheGraveyard_branch_3ddf8:
@@ -61,7 +60,6 @@ Music_GastlyInTheGraveyard_branch_3ddf8:
 	sound_loop 0, Music_GastlyInTheGraveyard_branch_3ddf8
 
 Music_GastlyInTheGraveyard_Ch2:
-Music_HaunterInTheGraveyard_branch_3de4c:
 	pitch_offset 1
 Music_GastlyInTheGraveyard_branch_3de4f:
 	duty_cycle 3
@@ -204,7 +202,6 @@ Music_GastlyInTheGraveyard_branch_3dee0:
 	sound_ret
 
 Music_GastlyInTheGraveyard_Ch3:
-Music_HaunterInTheGraveyard_branch_3df1f:
 	note_type 6, 2, 2
 	octave 1
 	note B_, 2
diff --git a/audio/music/gengarinthegraveyard.asm b/audio/music/gengarinthegraveyard.asm
index 687c301..b499ff7 100644
--- a/audio/music/gengarinthegraveyard.asm
+++ b/audio/music/gengarinthegraveyard.asm
@@ -1,3 +1,269 @@
+Music_GengarInTheGraveyard:
+	channel_count 4
+	channel 1, Music_GengarInTheGraveyard_Ch1
+	channel 2, Music_GengarInTheGraveyard_Ch2
+	channel 3, Music_GengarInTheGraveyard_Ch3
+	channel 4, Music_GengarInTheGraveyard_Ch4
+
+Music_GengarInTheGraveyard_Ch1:
+	tempo 124
+	volume 7, 7
+	note_type 12, 11, 3
+	duty_cycle 3
+	note_type 6, 2, 1
+	rest 16
+	octave 4
+	note E_, 1
+	note A_, 1
+	volume_envelope 4, 8
+	note E_, 1
+	note A_, 1
+	volume_envelope 6, 8
+	note E_, 1
+	note A_, 1
+	volume_envelope 8, 8
+	note E_, 1
+	note A_, 1
+	volume_envelope 10, 8
+	note E_, 1
+	note A_, 1
+	volume_envelope 8, 8
+	note E_, 1
+	note A_, 1
+	volume_envelope 6, 8
+	note E_, 1
+	note A_, 1
+	volume_envelope 4, 8
+	note E_, 1
+	note A_, 1
+	volume_envelope 2, 8
+	note F_, 1
+	note G#, 1
+	note F_, 1
+	note G#, 1
+	note F_, 1
+	note G#, 1
+	note F_, 1
+	note G#, 1
+	note F_, 1
+	volume_envelope 3, 8
+	note G#, 1
+	note F_, 1
+	note G#, 1
+	note F_, 1
+	volume_envelope 4, 8
+	note G#, 1
+	note F_, 1
+	note G#, 1
+	note F_, 1
+	note G#, 1
+	volume_envelope 5, 8
+	note F_, 1
+	note G#, 1
+	volume_envelope 6, 8
+	note F_, 1
+	note G#, 1
+	volume_envelope 7, 8
+	note F_, 1
+	note G#, 1
+	volume_envelope 8, 8
+	note F_, 1
+	note G#, 1
+	volume_envelope 9, 8
+	note F_, 1
+	note G#, 1
+	volume_envelope 10, 8
+	note F_, 1
+	note G#, 1
+	volume_envelope 11, 8
+	note F_, 1
+	note G#, 1
+Music_GengarInTheGraveyard_branch_3e081:
+	vibrato 8, 3, 3
+	volume_envelope 8, 1
+	octave 2
+	note F_, 2
+	note F_, 1
+	rest 1
+	note F_, 2
+	note F_, 1
+	rest 1
+	note F_, 2
+	note F_, 1
+	rest 1
+	note F_, 2
+	note F_, 1
+	rest 1
+	volume_envelope 8, 8
+	octave 3
+	note D_, 6
+	octave 2
+	note B_, 6
+	note G#, 2
+	rest 2
+	volume_envelope 8, 1
+	note C_, 2
+	note C_, 1
+	rest 1
+	note C_, 2
+	note C_, 1
+	rest 1
+	note C_, 2
+	note C_, 1
+	rest 1
+	note C_, 2
+	note C_, 1
+	rest 1
+	volume_envelope 8, 8
+	note A_, 6
+	note F#, 6
+	note D#, 2
+	rest 2
+	sound_loop 2, Music_GengarInTheGraveyard_branch_3e081
+	sound_call Music_GengarInTheGraveyard_branch_3e12f
+	transpose 0, 3
+	sound_call Music_GengarInTheGraveyard_branch_3e12f
+	transpose 0, 8
+	sound_call Music_GengarInTheGraveyard_branch_3e12f
+	transpose 0, 0
+	volume_envelope 8, 8
+	octave 4
+	note C#, 4
+	volume_envelope 8, 1
+	octave 3
+	note D#, 1
+	rest 1
+	volume_envelope 8, 8
+	octave 4
+	note C_, 4
+	volume_envelope 8, 1
+	octave 3
+	note D_, 1
+	rest 1
+	volume_envelope 8, 8
+	note B_, 4
+	volume_envelope 8, 1
+	note C#, 1
+	rest 1
+	volume_envelope 8, 8
+	note A#, 4
+	volume_envelope 8, 1
+	note C_, 1
+	rest 1
+	volume_envelope 8, 8
+	note A_, 2
+	note G#, 2
+	note G_, 2
+	note F#, 2
+	sound_call Music_GengarInTheGraveyard_branch_3e14e
+	volume_envelope 8, 1
+	octave 2
+	note C_, 2
+	note C_, 1
+	rest 1
+	octave 3
+	note C_, 2
+	octave 2
+	note C_, 1
+	rest 1
+	octave 3
+	note C_, 2
+	octave 2
+	note C_, 1
+	rest 1
+	note C_, 1
+	rest 1
+	octave 3
+	note C_, 2
+	octave 2
+	note C_, 1
+	rest 1
+	note C#, 2
+	note D_, 1
+	rest 1
+	note D#, 2
+	note E_, 1
+	rest 1
+	note F_, 2
+	note F#, 1
+	rest 1
+	note G_, 2
+	sound_call Music_GengarInTheGraveyard_branch_3e14e
+	volume_envelope 8, 8
+	octave 2
+	note B_, 2
+	octave 1
+	note B_, 1
+	rest 1
+	note B_, 1
+	rest 1
+	octave 2
+	note B_, 2
+	octave 1
+	note B_, 1
+	rest 1
+	note B_, 1
+	rest 1
+	vibrato 6, 5, 3
+	volume_envelope 8, 8
+	octave 2
+	note A#, 1
+	note B_, 11
+	note A#, 2
+	note A_, 2
+	note G#, 2
+	note G_, 2
+	sound_loop 0, Music_GengarInTheGraveyard_branch_3e081
+
+Music_GengarInTheGraveyard_branch_3e12f:
+	volume_envelope 8, 8
+	octave 3
+	note C_, 4
+	volume_envelope 8, 1
+	octave 2
+	note C_, 2
+	note C_, 1
+	rest 1
+	note C_, 2
+	note C_, 1
+	rest 1
+	note C_, 2
+	note C_, 1
+	rest 1
+	volume_envelope 8, 8
+	octave 3
+	note C_, 4
+	volume_envelope 8, 1
+	octave 2
+	note C_, 2
+	octave 3
+	note C_, 2
+	rest 2
+	volume_envelope 8, 8
+	note F#, 6
+	sound_ret
+
+Music_GengarInTheGraveyard_branch_3e14e:
+	volume_envelope 8, 1
+	octave 2
+	note F_, 2
+	rest 2
+	note F_, 2
+	note F_, 2
+	note G#, 2
+	volume_envelope 8, 8
+	note B_, 6
+	volume_envelope 8, 1
+	note F_, 2
+	rest 2
+	note F_, 2
+	note F_, 2
+	note B_, 2
+	volume_envelope 8, 8
+	octave 3
+	note D_, 6
+	sound_ret
+
 Music_GengarInTheGraveyard_Ch2:
 	duty_cycle 1
 	vibrato 18, 3, 4
diff --git a/audio/music/haunterinthegraveyard.asm b/audio/music/haunterinthegraveyard.asm
index 767d9e6..87503ce 100644
--- a/audio/music/haunterinthegraveyard.asm
+++ b/audio/music/haunterinthegraveyard.asm
@@ -6,278 +6,12 @@ Music_HaunterInTheGraveyard:
 
 Music_HaunterInTheGraveyard_Ch1:
 	transpose 0, 2
-	sound_call Music_HaunterInTheGraveyard_branch_3ddf3
+	sound_call Music_GastlyInTheGraveyard_Ch1
 
 Music_HaunterInTheGraveyard_Ch2:
 	transpose 0, 2
-	sound_call Music_HaunterInTheGraveyard_branch_3de4c
+	sound_call Music_GastlyInTheGraveyard_Ch2
 
 Music_HaunterInTheGraveyard_Ch3:
 	transpose 0, 2
-	sound_call Music_HaunterInTheGraveyard_branch_3df1f
-
-Music_GengarInTheGraveyard:
-	channel_count 4
-	channel 1, Music_GengarInTheGraveyard_Ch1
-	channel 2, Music_GengarInTheGraveyard_Ch2
-	channel 3, Music_GengarInTheGraveyard_Ch3
-	channel 4, Music_GengarInTheGraveyard_Ch4
-
-Music_GengarInTheGraveyard_Ch1:
-	tempo 124
-	volume 7, 7
-	note_type 12, 11, 3
-	duty_cycle 3
-	note_type 6, 2, 1
-	rest 16
-	octave 4
-	note E_, 1
-	note A_, 1
-	volume_envelope 4, 8
-	note E_, 1
-	note A_, 1
-	volume_envelope 6, 8
-	note E_, 1
-	note A_, 1
-	volume_envelope 8, 8
-	note E_, 1
-	note A_, 1
-	volume_envelope 10, 8
-	note E_, 1
-	note A_, 1
-	volume_envelope 8, 8
-	note E_, 1
-	note A_, 1
-	volume_envelope 6, 8
-	note E_, 1
-	note A_, 1
-	volume_envelope 4, 8
-	note E_, 1
-	note A_, 1
-	volume_envelope 2, 8
-	note F_, 1
-	note G#, 1
-	note F_, 1
-	note G#, 1
-	note F_, 1
-	note G#, 1
-	note F_, 1
-	note G#, 1
-	note F_, 1
-	volume_envelope 3, 8
-	note G#, 1
-	note F_, 1
-	note G#, 1
-	note F_, 1
-	volume_envelope 4, 8
-	note G#, 1
-	note F_, 1
-	note G#, 1
-	note F_, 1
-	note G#, 1
-	volume_envelope 5, 8
-	note F_, 1
-	note G#, 1
-	volume_envelope 6, 8
-	note F_, 1
-	note G#, 1
-	volume_envelope 7, 8
-	note F_, 1
-	note G#, 1
-	volume_envelope 8, 8
-	note F_, 1
-	note G#, 1
-	volume_envelope 9, 8
-	note F_, 1
-	note G#, 1
-	volume_envelope 10, 8
-	note F_, 1
-	note G#, 1
-	volume_envelope 11, 8
-	note F_, 1
-	note G#, 1
-Music_HaunterInTheGraveyard_branch_3e081:
-	vibrato 8, 3, 3
-	volume_envelope 8, 1
-	octave 2
-	note F_, 2
-	note F_, 1
-	rest 1
-	note F_, 2
-	note F_, 1
-	rest 1
-	note F_, 2
-	note F_, 1
-	rest 1
-	note F_, 2
-	note F_, 1
-	rest 1
-	volume_envelope 8, 8
-	octave 3
-	note D_, 6
-	octave 2
-	note B_, 6
-	note G#, 2
-	rest 2
-	volume_envelope 8, 1
-	note C_, 2
-	note C_, 1
-	rest 1
-	note C_, 2
-	note C_, 1
-	rest 1
-	note C_, 2
-	note C_, 1
-	rest 1
-	note C_, 2
-	note C_, 1
-	rest 1
-	volume_envelope 8, 8
-	note A_, 6
-	note F#, 6
-	note D#, 2
-	rest 2
-	sound_loop 2, Music_HaunterInTheGraveyard_branch_3e081
-	sound_call Music_HaunterInTheGraveyard_branch_3e12f
-	transpose 0, 3
-	sound_call Music_HaunterInTheGraveyard_branch_3e12f
-	transpose 0, 8
-	sound_call Music_HaunterInTheGraveyard_branch_3e12f
-	transpose 0, 0
-	volume_envelope 8, 8
-	octave 4
-	note C#, 4
-	volume_envelope 8, 1
-	octave 3
-	note D#, 1
-	rest 1
-	volume_envelope 8, 8
-	octave 4
-	note C_, 4
-	volume_envelope 8, 1
-	octave 3
-	note D_, 1
-	rest 1
-	volume_envelope 8, 8
-	note B_, 4
-	volume_envelope 8, 1
-	note C#, 1
-	rest 1
-	volume_envelope 8, 8
-	note A#, 4
-	volume_envelope 8, 1
-	note C_, 1
-	rest 1
-	volume_envelope 8, 8
-	note A_, 2
-	note G#, 2
-	note G_, 2
-	note F#, 2
-	sound_call Music_HaunterInTheGraveyard_branch_3e14e
-	volume_envelope 8, 1
-	octave 2
-	note C_, 2
-	note C_, 1
-	rest 1
-	octave 3
-	note C_, 2
-	octave 2
-	note C_, 1
-	rest 1
-	octave 3
-	note C_, 2
-	octave 2
-	note C_, 1
-	rest 1
-	note C_, 1
-	rest 1
-	octave 3
-	note C_, 2
-	octave 2
-	note C_, 1
-	rest 1
-	note C#, 2
-	note D_, 1
-	rest 1
-	note D#, 2
-	note E_, 1
-	rest 1
-	note F_, 2
-	note F#, 1
-	rest 1
-	note G_, 2
-	sound_call Music_HaunterInTheGraveyard_branch_3e14e
-	volume_envelope 8, 8
-	octave 2
-	note B_, 2
-	octave 1
-	note B_, 1
-	rest 1
-	note B_, 1
-	rest 1
-	octave 2
-	note B_, 2
-	octave 1
-	note B_, 1
-	rest 1
-	note B_, 1
-	rest 1
-	vibrato 6, 5, 3
-	volume_envelope 8, 8
-	octave 2
-	note A#, 1
-	note B_, 11
-	note A#, 2
-	note A_, 2
-	note G#, 2
-	note G_, 2
-	sound_loop 0, Music_HaunterInTheGraveyard_branch_3e081
-
-Music_HaunterInTheGraveyard_branch_3e12f:
-	volume_envelope 8, 8
-	octave 3
-	note C_, 4
-	volume_envelope 8, 1
-	octave 2
-	note C_, 2
-	note C_, 1
-	rest 1
-	note C_, 2
-	note C_, 1
-	rest 1
-	note C_, 2
-	note C_, 1
-	rest 1
-	volume_envelope 8, 8
-	octave 3
-	note C_, 4
-	volume_envelope 8, 1
-	octave 2
-	note C_, 2
-	octave 3
-	note C_, 2
-	rest 2
-	volume_envelope 8, 8
-	note F#, 6
-	sound_ret
-
-Music_HaunterInTheGraveyard_branch_3e14e:
-	volume_envelope 8, 1
-	octave 2
-	note F_, 2
-	rest 2
-	note F_, 2
-	note F_, 2
-	note G#, 2
-	volume_envelope 8, 8
-	note B_, 6
-	volume_envelope 8, 1
-	note F_, 2
-	rest 2
-	note F_, 2
-	note F_, 2
-	note B_, 2
-	volume_envelope 8, 8
-	octave 3
-	note D_, 6
-	sound_ret
+	sound_call Music_GastlyInTheGraveyard_Ch3
diff --git a/tools/dump_audio.py b/tools/dump_audio.py
index 2a7dba7..2f210bb 100755
--- a/tools/dump_audio.py
+++ b/tools/dump_audio.py
@@ -1092,6 +1092,8 @@ def dump_channel(start_address, sound_name, channel, prefix="", is_sfx=True, add
 				output += " {:x}".format(param)
 				if param == start_address:
 					label = "{}{}_Ch{}".format(prefix, sound_name, channel)
+				elif sound_name == "HaunterInTheGraveyard":
+					label = "{}{}_Ch{}".format(prefix, "GastlyInTheGraveyard", channel)
 				else:
 					label = "{}{}_branch_{:x}".format(prefix, sound_name, param)
 					if command_id == 0xfe and param >= start_address:
@@ -1104,7 +1106,8 @@ def dump_channel(start_address, sound_name, channel, prefix="", is_sfx=True, add
 		output += "\n"
 		blobs.append(make_blob(command_address, output, address, label))
 		if (command_id == 0xff or (is_infinite_loop(command_address) and
-			not (is_infinite_loop(address) or rom[address] == 0xff))):
+			not (is_infinite_loop(address) or rom[address] == 0xff)) or
+			(command_id == 0xfe and sound_name == "HaunterInTheGraveyard")):
 			blobs.append(make_blob(address, "\n"))
 			break
 	for branch in branches: