Use the same music headers as pokecrystal (#382)

1 files changed, 352 insertions, 119 deletions

diff --git a/audio/headers/sfxheaders2.asm b/audio/headers/sfxheaders2.asm
index 912d137e..1ccbf265 100644
--- a/audio/headers/sfxheaders2.asm
+++ b/audio/headers/sfxheaders2.asm
@@ -2,358 +2,591 @@ SFX_Headers_2::
 	db $ff, $ff, $ff ; padding
 
 SFX_Noise_Instrument01_2::
-	audio_header SFX_Noise_Instrument01_2, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument01_2_Ch8
 
 SFX_Noise_Instrument02_2::
-	audio_header SFX_Noise_Instrument02_2, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument02_2_Ch8
 
 SFX_Noise_Instrument03_2::
-	audio_header SFX_Noise_Instrument03_2, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument03_2_Ch8
 
 SFX_Noise_Instrument04_2::
-	audio_header SFX_Noise_Instrument04_2, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument04_2_Ch8
 
 SFX_Noise_Instrument05_2::
-	audio_header SFX_Noise_Instrument05_2, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument05_2_Ch8
 
 SFX_Noise_Instrument06_2::
-	audio_header SFX_Noise_Instrument06_2, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument06_2_Ch8
 
 SFX_Noise_Instrument07_2::
-	audio_header SFX_Noise_Instrument07_2, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument07_2_Ch8
 
 SFX_Noise_Instrument08_2::
-	audio_header SFX_Noise_Instrument08_2, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument08_2_Ch8
 
 SFX_Noise_Instrument09_2::
-	audio_header SFX_Noise_Instrument09_2, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument09_2_Ch8
 
 SFX_Noise_Instrument10_2::
-	audio_header SFX_Noise_Instrument10_2, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument10_2_Ch8
 
 SFX_Noise_Instrument11_2::
-	audio_header SFX_Noise_Instrument11_2, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument11_2_Ch8
 
 SFX_Noise_Instrument12_2::
-	audio_header SFX_Noise_Instrument12_2, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument12_2_Ch8
 
 SFX_Noise_Instrument13_2::
-	audio_header SFX_Noise_Instrument13_2, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument13_2_Ch8
 
 SFX_Noise_Instrument14_2::
-	audio_header SFX_Noise_Instrument14_2, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument14_2_Ch8
 
 SFX_Noise_Instrument15_2::
-	audio_header SFX_Noise_Instrument15_2, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument15_2_Ch8
 
 SFX_Noise_Instrument16_2::
-	audio_header SFX_Noise_Instrument16_2, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument16_2_Ch8
 
 SFX_Noise_Instrument17_2::
-	audio_header SFX_Noise_Instrument17_2, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument17_2_Ch8
 
 SFX_Noise_Instrument18_2::
-	audio_header SFX_Noise_Instrument18_2, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument18_2_Ch8
 
 SFX_Noise_Instrument19_2::
-	audio_header SFX_Noise_Instrument19_2, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument19_2_Ch8
 
 SFX_Cry00_2::
-	audio_header SFX_Cry00_2, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry00_2_Ch5
+	channel 6, SFX_Cry00_2_Ch6
+	channel 8, SFX_Cry00_2_Ch8
 
 SFX_Cry01_2::
-	audio_header SFX_Cry01_2, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry01_2_Ch5
+	channel 6, SFX_Cry01_2_Ch6
+	channel 8, SFX_Cry01_2_Ch8
 
 SFX_Cry02_2::
-	audio_header SFX_Cry02_2, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry02_2_Ch5
+	channel 6, SFX_Cry02_2_Ch6
+	channel 8, SFX_Cry02_2_Ch8
 
 SFX_Cry03_2::
-	audio_header SFX_Cry03_2, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry03_2_Ch5
+	channel 6, SFX_Cry03_2_Ch6
+	channel 8, SFX_Cry03_2_Ch8
 
 SFX_Cry04_2::
-	audio_header SFX_Cry04_2, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry04_2_Ch5
+	channel 6, SFX_Cry04_2_Ch6
+	channel 8, SFX_Cry04_2_Ch8
 
 SFX_Cry05_2::
-	audio_header SFX_Cry05_2, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry05_2_Ch5
+	channel 6, SFX_Cry05_2_Ch6
+	channel 8, SFX_Cry05_2_Ch8
 
 SFX_Cry06_2::
-	audio_header SFX_Cry06_2, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry06_2_Ch5
+	channel 6, SFX_Cry06_2_Ch6
+	channel 8, SFX_Cry06_2_Ch8
 
 SFX_Cry07_2::
-	audio_header SFX_Cry07_2, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry07_2_Ch5
+	channel 6, SFX_Cry07_2_Ch6
+	channel 8, SFX_Cry07_2_Ch8
 
 SFX_Cry08_2::
-	audio_header SFX_Cry08_2, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry08_2_Ch5
+	channel 6, SFX_Cry08_2_Ch6
+	channel 8, SFX_Cry08_2_Ch8
 
 SFX_Cry09_2::
-	audio_header SFX_Cry09_2, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry09_2_Ch5
+	channel 6, SFX_Cry09_2_Ch6
+	channel 8, SFX_Cry09_2_Ch8
 
 SFX_Cry0A_2::
-	audio_header SFX_Cry0A_2, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry0A_2_Ch5
+	channel 6, SFX_Cry0A_2_Ch6
+	channel 8, SFX_Cry0A_2_Ch8
 
 SFX_Cry0B_2::
-	audio_header SFX_Cry0B_2, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry0B_2_Ch5
+	channel 6, SFX_Cry0B_2_Ch6
+	channel 8, SFX_Cry0B_2_Ch8
 
 SFX_Cry0C_2::
-	audio_header SFX_Cry0C_2, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry0C_2_Ch5
+	channel 6, SFX_Cry0C_2_Ch6
+	channel 8, SFX_Cry0C_2_Ch8
 
 SFX_Cry0D_2::
-	audio_header SFX_Cry0D_2, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry0D_2_Ch5
+	channel 6, SFX_Cry0D_2_Ch6
+	channel 8, SFX_Cry0D_2_Ch8
 
 SFX_Cry0E_2::
-	audio_header SFX_Cry0E_2, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry0E_2_Ch5
+	channel 6, SFX_Cry0E_2_Ch6
+	channel 8, SFX_Cry0E_2_Ch8
 
 SFX_Cry0F_2::
-	audio_header SFX_Cry0F_2, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry0F_2_Ch5
+	channel 6, SFX_Cry0F_2_Ch6
+	channel 8, SFX_Cry0F_2_Ch8
 
 SFX_Cry10_2::
-	audio_header SFX_Cry10_2, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry10_2_Ch5
+	channel 6, SFX_Cry10_2_Ch6
+	channel 8, SFX_Cry10_2_Ch8
 
 SFX_Cry11_2::
-	audio_header SFX_Cry11_2, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry11_2_Ch5
+	channel 6, SFX_Cry11_2_Ch6
+	channel 8, SFX_Cry11_2_Ch8
 
 SFX_Cry12_2::
-	audio_header SFX_Cry12_2, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry12_2_Ch5
+	channel 6, SFX_Cry12_2_Ch6
+	channel 8, SFX_Cry12_2_Ch8
 
 SFX_Cry13_2::
-	audio_header SFX_Cry13_2, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry13_2_Ch5
+	channel 6, SFX_Cry13_2_Ch6
+	channel 8, SFX_Cry13_2_Ch8
 
 SFX_Cry14_2::
-	audio_header SFX_Cry14_2, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry14_2_Ch5
+	channel 6, SFX_Cry14_2_Ch6
+	channel 8, SFX_Cry14_2_Ch8
 
 SFX_Cry15_2::
-	audio_header SFX_Cry15_2, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry15_2_Ch5
+	channel 6, SFX_Cry15_2_Ch6
+	channel 8, SFX_Cry15_2_Ch8
 
 SFX_Cry16_2::
-	audio_header SFX_Cry16_2, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry16_2_Ch5
+	channel 6, SFX_Cry16_2_Ch6
+	channel 8, SFX_Cry16_2_Ch8
 
 SFX_Cry17_2::
-	audio_header SFX_Cry17_2, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry17_2_Ch5
+	channel 6, SFX_Cry17_2_Ch6
+	channel 8, SFX_Cry17_2_Ch8
 
 SFX_Cry18_2::
-	audio_header SFX_Cry18_2, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry18_2_Ch5
+	channel 6, SFX_Cry18_2_Ch6
+	channel 8, SFX_Cry18_2_Ch8
 
 SFX_Cry19_2::
-	audio_header SFX_Cry19_2, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry19_2_Ch5
+	channel 6, SFX_Cry19_2_Ch6
+	channel 8, SFX_Cry19_2_Ch8
 
 SFX_Cry1A_2::
-	audio_header SFX_Cry1A_2, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry1A_2_Ch5
+	channel 6, SFX_Cry1A_2_Ch6
+	channel 8, SFX_Cry1A_2_Ch8
 
 SFX_Cry1B_2::
-	audio_header SFX_Cry1B_2, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry1B_2_Ch5
+	channel 6, SFX_Cry1B_2_Ch6
+	channel 8, SFX_Cry1B_2_Ch8
 
 SFX_Cry1C_2::
-	audio_header SFX_Cry1C_2, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry1C_2_Ch5
+	channel 6, SFX_Cry1C_2_Ch6
+	channel 8, SFX_Cry1C_2_Ch8
 
 SFX_Cry1D_2::
-	audio_header SFX_Cry1D_2, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry1D_2_Ch5
+	channel 6, SFX_Cry1D_2_Ch6
+	channel 8, SFX_Cry1D_2_Ch8
 
 SFX_Cry1E_2::
-	audio_header SFX_Cry1E_2, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry1E_2_Ch5
+	channel 6, SFX_Cry1E_2_Ch6
+	channel 8, SFX_Cry1E_2_Ch8
 
 SFX_Cry1F_2::
-	audio_header SFX_Cry1F_2, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry1F_2_Ch5
+	channel 6, SFX_Cry1F_2_Ch6
+	channel 8, SFX_Cry1F_2_Ch8
 
 SFX_Cry20_2::
-	audio_header SFX_Cry20_2, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry20_2_Ch5
+	channel 6, SFX_Cry20_2_Ch6
+	channel 8, SFX_Cry20_2_Ch8
 
 SFX_Cry21_2::
-	audio_header SFX_Cry21_2, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry21_2_Ch5
+	channel 6, SFX_Cry21_2_Ch6
+	channel 8, SFX_Cry21_2_Ch8
 
 SFX_Cry22_2::
-	audio_header SFX_Cry22_2, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry22_2_Ch5
+	channel 6, SFX_Cry22_2_Ch6
+	channel 8, SFX_Cry22_2_Ch8
 
 SFX_Cry23_2::
-	audio_header SFX_Cry23_2, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry23_2_Ch5
+	channel 6, SFX_Cry23_2_Ch6
+	channel 8, SFX_Cry23_2_Ch8
 
 SFX_Cry24_2::
-	audio_header SFX_Cry24_2, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry24_2_Ch5
+	channel 6, SFX_Cry24_2_Ch6
+	channel 8, SFX_Cry24_2_Ch8
 
 SFX_Cry25_2::
-	audio_header SFX_Cry25_2, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry25_2_Ch5
+	channel 6, SFX_Cry25_2_Ch6
+	channel 8, SFX_Cry25_2_Ch8
 
 SFX_Level_Up::
-	audio_header SFX_Level_Up, Ch5, Ch6, Ch7
+	channel_count 3
+	channel 5, SFX_Level_Up_Ch5
+	channel 6, SFX_Level_Up_Ch6
+	channel 7, SFX_Level_Up_Ch7
 
 SFX_Get_Item2_2::
-	audio_header SFX_Get_Item2_2, Ch5, Ch6, Ch7
+	channel_count 3
+	channel 5, SFX_Get_Item2_2_Ch5
+	channel 6, SFX_Get_Item2_2_Ch6
+	channel 7, SFX_Get_Item2_2_Ch7
 
 SFX_Tink_2::
-	audio_header SFX_Tink_2, Ch5
+	channel_count 1
+	channel 5, SFX_Tink_2_Ch5
 
 SFX_Heal_HP_2::
-	audio_header SFX_Heal_HP_2, Ch5
+	channel_count 1
+	channel 5, SFX_Heal_HP_2_Ch5
 
 SFX_Heal_Ailment_2::
-	audio_header SFX_Heal_Ailment_2, Ch5
+	channel_count 1
+	channel 5, SFX_Heal_Ailment_2_Ch5
 
 SFX_Start_Menu_2::
-	audio_header SFX_Start_Menu_2, Ch8
+	channel_count 1
+	channel 8, SFX_Start_Menu_2_Ch8
 
 SFX_Press_AB_2::
-	audio_header SFX_Press_AB_2, Ch5
+	channel_count 1
+	channel 5, SFX_Press_AB_2_Ch5
 
 SFX_Ball_Toss::
-	audio_header SFX_Ball_Toss, Ch5, Ch6
+	channel_count 2
+	channel 5, SFX_Ball_Toss_Ch5
+	channel 6, SFX_Ball_Toss_Ch6
 
 SFX_Ball_Poof::
-	audio_header SFX_Ball_Poof, Ch5, Ch8
+	channel_count 2
+	channel 5, SFX_Ball_Poof_Ch5
+	channel 8, SFX_Ball_Poof_Ch8
 
 SFX_Faint_Thud::
-	audio_header SFX_Faint_Thud, Ch5, Ch8
+	channel_count 2
+	channel 5, SFX_Faint_Thud_Ch5
+	channel 8, SFX_Faint_Thud_Ch8
 
 SFX_Run::
-	audio_header SFX_Run, Ch8
+	channel_count 1
+	channel 8, SFX_Run_Ch8
 
 SFX_Dex_Page_Added::
-	audio_header SFX_Dex_Page_Added, Ch5, Ch6
+	channel_count 2
+	channel 5, SFX_Dex_Page_Added_Ch5
+	channel 6, SFX_Dex_Page_Added_Ch6
 
 SFX_Caught_Mon::
-	audio_header SFX_Caught_Mon, Ch5, Ch6, Ch7
+	channel_count 3
+	channel 5, SFX_Caught_Mon_Ch5
+	channel 6, SFX_Caught_Mon_Ch6
+	channel 7, SFX_Caught_Mon_Ch7
 
 SFX_Peck::
-	audio_header SFX_Peck, Ch8
+	channel_count 1
+	channel 8, SFX_Peck_Ch8
 
 SFX_Faint_Fall::
-	audio_header SFX_Faint_Fall, Ch5
+	channel_count 1
+	channel 5, SFX_Faint_Fall_Ch5
 
 SFX_Battle_09::
-	audio_header SFX_Battle_09, Ch5
+	channel_count 1
+	channel 5, SFX_Battle_09_Ch5
 
 SFX_Pound::
-	audio_header SFX_Pound, Ch8
+	channel_count 1
+	channel 8, SFX_Pound_Ch8
 
 SFX_Battle_0B::
-	audio_header SFX_Battle_0B, Ch8
+	channel_count 1
+	channel 8, SFX_Battle_0B_Ch8
 
 SFX_Battle_0C::
-	audio_header SFX_Battle_0C, Ch8
+	channel_count 1
+	channel 8, SFX_Battle_0C_Ch8
 
 SFX_Battle_0D::
-	audio_header SFX_Battle_0D, Ch8
+	channel_count 1
+	channel 8, SFX_Battle_0D_Ch8
 
 SFX_Battle_0E::
-	audio_header SFX_Battle_0E, Ch8
+	channel_count 1
+	channel 8, SFX_Battle_0E_Ch8
 
 SFX_Battle_0F::
-	audio_header SFX_Battle_0F, Ch8
+	channel_count 1
+	channel 8, SFX_Battle_0F_Ch8
 
 SFX_Damage::
-	audio_header SFX_Damage, Ch8
+	channel_count 1
+	channel 8, SFX_Damage_Ch8
 
 SFX_Not_Very_Effective::
-	audio_header SFX_Not_Very_Effective, Ch8
+	channel_count 1
+	channel 8, SFX_Not_Very_Effective_Ch8
 
 SFX_Battle_12::
-	audio_header SFX_Battle_12, Ch8
+	channel_count 1
+	channel 8, SFX_Battle_12_Ch8
 
 SFX_Battle_13::
-	audio_header SFX_Battle_13, Ch8
+	channel_count 1
+	channel 8, SFX_Battle_13_Ch8
 
 SFX_Battle_14::
-	audio_header SFX_Battle_14, Ch8
+	channel_count 1
+	channel 8, SFX_Battle_14_Ch8
 
 SFX_Vine_Whip::
-	audio_header SFX_Vine_Whip, Ch8
+	channel_count 1
+	channel 8, SFX_Vine_Whip_Ch8
 
 SFX_Battle_16::
-	audio_header SFX_Battle_16, Ch8
+	channel_count 1
+	channel 8, SFX_Battle_16_Ch8
 
 SFX_Battle_17::
-	audio_header SFX_Battle_17, Ch8
+	channel_count 1
+	channel 8, SFX_Battle_17_Ch8
 
 SFX_Battle_18::
-	audio_header SFX_Battle_18, Ch8
+	channel_count 1
+	channel 8, SFX_Battle_18_Ch8
 
 SFX_Battle_19::
-	audio_header SFX_Battle_19, Ch8
+	channel_count 1
+	channel 8, SFX_Battle_19_Ch8
 
 SFX_Super_Effective::
-	audio_header SFX_Super_Effective, Ch8
+	channel_count 1
+	channel 8, SFX_Super_Effective_Ch8
 
 SFX_Battle_1B::
-	audio_header SFX_Battle_1B, Ch8
+	channel_count 1
+	channel 8, SFX_Battle_1B_Ch8
 
 SFX_Battle_1C::
-	audio_header SFX_Battle_1C, Ch8
+	channel_count 1
+	channel 8, SFX_Battle_1C_Ch8
 
 SFX_Doubleslap::
-	audio_header SFX_Doubleslap, Ch8
+	channel_count 1
+	channel 8, SFX_Doubleslap_Ch8
 
 SFX_Battle_1E::
-	audio_header SFX_Battle_1E, Ch5, Ch8
+	channel_count 2
+	channel 5, SFX_Battle_1E_Ch5
+	channel 8, SFX_Battle_1E_Ch8
 
 SFX_Horn_Drill::
-	audio_header SFX_Horn_Drill, Ch8
+	channel_count 1
+	channel 8, SFX_Horn_Drill_Ch8
 
 SFX_Battle_20::
-	audio_header SFX_Battle_20, Ch8
+	channel_count 1
+	channel 8, SFX_Battle_20_Ch8
 
 SFX_Battle_21::
-	audio_header SFX_Battle_21, Ch8
+	channel_count 1
+	channel 8, SFX_Battle_21_Ch8
 
 SFX_Battle_22::
-	audio_header SFX_Battle_22, Ch8
+	channel_count 1
+	channel 8, SFX_Battle_22_Ch8
 
 SFX_Battle_23::
-	audio_header SFX_Battle_23, Ch8
+	channel_count 1
+	channel 8, SFX_Battle_23_Ch8
 
 SFX_Battle_24::
-	audio_header SFX_Battle_24, Ch5, Ch8
+	channel_count 2
+	channel 5, SFX_Battle_24_Ch5
+	channel 8, SFX_Battle_24_Ch8
 
 SFX_Battle_25::
-	audio_header SFX_Battle_25, Ch8
+	channel_count 1
+	channel 8, SFX_Battle_25_Ch8
 
 SFX_Battle_26::
-	audio_header SFX_Battle_26, Ch8
+	channel_count 1
+	channel 8, SFX_Battle_26_Ch8
 
 SFX_Battle_27::
-	audio_header SFX_Battle_27, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Battle_27_Ch5
+	channel 6, SFX_Battle_27_Ch6
+	channel 8, SFX_Battle_27_Ch8
 
 SFX_Battle_28::
-	audio_header SFX_Battle_28, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Battle_28_Ch5
+	channel 6, SFX_Battle_28_Ch6
+	channel 8, SFX_Battle_28_Ch8
 
 SFX_Battle_29::
-	audio_header SFX_Battle_29, Ch5, Ch8
+	channel_count 2
+	channel 5, SFX_Battle_29_Ch5
+	channel 8, SFX_Battle_29_Ch8
 
 SFX_Battle_2A::
-	audio_header SFX_Battle_2A, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Battle_2A_Ch5
+	channel 6, SFX_Battle_2A_Ch6
+	channel 8, SFX_Battle_2A_Ch8
 
 SFX_Battle_2B::
-	audio_header SFX_Battle_2B, Ch5, Ch8
+	channel_count 2
+	channel 5, SFX_Battle_2B_Ch5
+	channel 8, SFX_Battle_2B_Ch8
 
 SFX_Battle_2C::
-	audio_header SFX_Battle_2C, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Battle_2C_Ch5
+	channel 6, SFX_Battle_2C_Ch6
+	channel 8, SFX_Battle_2C_Ch8
 
 SFX_Psybeam::
-	audio_header SFX_Psybeam, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Psybeam_Ch5
+	channel 6, SFX_Psybeam_Ch6
+	channel 8, SFX_Psybeam_Ch8
 
 SFX_Battle_2E::
-	audio_header SFX_Battle_2E, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Battle_2E_Ch5
+	channel 6, SFX_Battle_2E_Ch6
+	channel 8, SFX_Battle_2E_Ch8
 
 SFX_Battle_2F::
-	audio_header SFX_Battle_2F, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Battle_2F_Ch5
+	channel 6, SFX_Battle_2F_Ch6
+	channel 8, SFX_Battle_2F_Ch8
 
 SFX_Psychic_M::
-	audio_header SFX_Psychic_M, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Psychic_M_Ch5
+	channel 6, SFX_Psychic_M_Ch6
+	channel 8, SFX_Psychic_M_Ch8
 
 SFX_Battle_31::
-	audio_header SFX_Battle_31, Ch5, Ch6
+	channel_count 2
+	channel 5, SFX_Battle_31_Ch5
+	channel 6, SFX_Battle_31_Ch6
 
 SFX_Battle_32::
-	audio_header SFX_Battle_32, Ch5, Ch6
+	channel_count 2
+	channel 5, SFX_Battle_32_Ch5
+	channel 6, SFX_Battle_32_Ch6
 
 SFX_Battle_33::
-	audio_header SFX_Battle_33, Ch5, Ch6
+	channel_count 2
+	channel 5, SFX_Battle_33_Ch5
+	channel 6, SFX_Battle_33_Ch6
 
 SFX_Battle_34::
-	audio_header SFX_Battle_34, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Battle_34_Ch5
+	channel 6, SFX_Battle_34_Ch6
+	channel 8, SFX_Battle_34_Ch8
 
 SFX_Battle_35::
-	audio_header SFX_Battle_35, Ch5, Ch6
+	channel_count 2
+	channel 5, SFX_Battle_35_Ch5
+	channel 6, SFX_Battle_35_Ch6
 
 SFX_Battle_36::
-	audio_header SFX_Battle_36, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Battle_36_Ch5
+	channel 6, SFX_Battle_36_Ch6
+	channel 8, SFX_Battle_36_Ch8
 
 SFX_Silph_Scope::
-	audio_header SFX_Silph_Scope, Ch5
+	channel_count 1
+	channel 5, SFX_Silph_Scope_Ch5