Redo audio header macro

1 files changed, 119 insertions, 119 deletions

diff --git a/audio/headers/sfxheaders2.asm b/audio/headers/sfxheaders2.asm
index 825f9405..b96a764f 100644
--- a/audio/headers/sfxheaders2.asm
+++ b/audio/headers/sfxheaders2.asm
@@ -2,358 +2,358 @@ SFX_Headers_2::
 	db $ff, $ff, $ff ; padding
 
 SFX_Snare1_2::
-	sfx SFX_Snare1_2, CH7_
+	audio SFX_Snare1_2, Ch7
 
 SFX_Snare2_2::
-	sfx SFX_Snare2_2, CH7_
+	audio SFX_Snare2_2, Ch7
 
 SFX_Snare3_2::
-	sfx SFX_Snare3_2, CH7_
+	audio SFX_Snare3_2, Ch7
 
 SFX_Snare4_2::
-	sfx SFX_Snare4_2, CH7_
+	audio SFX_Snare4_2, Ch7
 
 SFX_Snare5_2::
-	sfx SFX_Snare5_2, CH7_
+	audio SFX_Snare5_2, Ch7
 
 SFX_Triangle1_2::
-	sfx SFX_Triangle1_2, CH7_
+	audio SFX_Triangle1_2, Ch7
 
 SFX_Triangle2_2::
-	sfx SFX_Triangle2_2, CH7_
+	audio SFX_Triangle2_2, Ch7
 
 SFX_Snare6_2::
-	sfx SFX_Snare6_2, CH7_
+	audio SFX_Snare6_2, Ch7
 
 SFX_Snare7_2::
-	sfx SFX_Snare7_2, CH7_
+	audio SFX_Snare7_2, Ch7
 
 SFX_Snare8_2::
-	sfx SFX_Snare8_2, CH7_
+	audio SFX_Snare8_2, Ch7
 
 SFX_Snare9_2::
-	sfx SFX_Snare9_2, CH7_
+	audio SFX_Snare9_2, Ch7
 
 SFX_Cymbal1_2::
-	sfx SFX_Cymbal1_2, CH7_
+	audio SFX_Cymbal1_2, Ch7
 
 SFX_Cymbal2_2::
-	sfx SFX_Cymbal2_2, CH7_
+	audio SFX_Cymbal2_2, Ch7
 
 SFX_Cymbal3_2::
-	sfx SFX_Cymbal3_2, CH7_
+	audio SFX_Cymbal3_2, Ch7
 
 SFX_Muted_Snare1_2::
-	sfx SFX_Muted_Snare1_2, CH7_
+	audio SFX_Muted_Snare1_2, Ch7
 
 SFX_Triangle3_2::
-	sfx SFX_Triangle3_2, CH7_
+	audio SFX_Triangle3_2, Ch7
 
 SFX_Muted_Snare2_2::
-	sfx SFX_Muted_Snare2_2, CH7_
+	audio SFX_Muted_Snare2_2, Ch7
 
 SFX_Muted_Snare3_2::
-	sfx SFX_Muted_Snare3_2, CH7_
+	audio SFX_Muted_Snare3_2, Ch7
 
 SFX_Muted_Snare4_2::
-	sfx SFX_Muted_Snare4_2, CH7_
+	audio SFX_Muted_Snare4_2, Ch7
 
 SFX_Cry00_2::
-	sfx SFX_Cry00_2, CH4_ | CH5_ | CH7_
+	audio SFX_Cry00_2, Ch4, Ch5, Ch7
 
 SFX_Cry01_2::
-	sfx SFX_Cry01_2, CH4_ | CH5_ | CH7_
+	audio SFX_Cry01_2, Ch4, Ch5, Ch7
 
 SFX_Cry02_2::
-	sfx SFX_Cry02_2, CH4_ | CH5_ | CH7_
+	audio SFX_Cry02_2, Ch4, Ch5, Ch7
 
 SFX_Cry03_2::
-	sfx SFX_Cry03_2, CH4_ | CH5_ | CH7_
+	audio SFX_Cry03_2, Ch4, Ch5, Ch7
 
 SFX_Cry04_2::
-	sfx SFX_Cry04_2, CH4_ | CH5_ | CH7_
+	audio SFX_Cry04_2, Ch4, Ch5, Ch7
 
 SFX_Cry05_2::
-	sfx SFX_Cry05_2, CH4_ | CH5_ | CH7_
+	audio SFX_Cry05_2, Ch4, Ch5, Ch7
 
 SFX_Cry06_2::
-	sfx SFX_Cry06_2, CH4_ | CH5_ | CH7_
+	audio SFX_Cry06_2, Ch4, Ch5, Ch7
 
 SFX_Cry07_2::
-	sfx SFX_Cry07_2, CH4_ | CH5_ | CH7_
+	audio SFX_Cry07_2, Ch4, Ch5, Ch7
 
 SFX_Cry08_2::
-	sfx SFX_Cry08_2, CH4_ | CH5_ | CH7_
+	audio SFX_Cry08_2, Ch4, Ch5, Ch7
 
 SFX_Cry09_2::
-	sfx SFX_Cry09_2, CH4_ | CH5_ | CH7_
+	audio SFX_Cry09_2, Ch4, Ch5, Ch7
 
 SFX_Cry0A_2::
-	sfx SFX_Cry0A_2, CH4_ | CH5_ | CH7_
+	audio SFX_Cry0A_2, Ch4, Ch5, Ch7
 
 SFX_Cry0B_2::
-	sfx SFX_Cry0B_2, CH4_ | CH5_ | CH7_
+	audio SFX_Cry0B_2, Ch4, Ch5, Ch7
 
 SFX_Cry0C_2::
-	sfx SFX_Cry0C_2, CH4_ | CH5_ | CH7_
+	audio SFX_Cry0C_2, Ch4, Ch5, Ch7
 
 SFX_Cry0D_2::
-	sfx SFX_Cry0D_2, CH4_ | CH5_ | CH7_
+	audio SFX_Cry0D_2, Ch4, Ch5, Ch7
 
 SFX_Cry0E_2::
-	sfx SFX_Cry0E_2, CH4_ | CH5_ | CH7_
+	audio SFX_Cry0E_2, Ch4, Ch5, Ch7
 
 SFX_Cry0F_2::
-	sfx SFX_Cry0F_2, CH4_ | CH5_ | CH7_
+	audio SFX_Cry0F_2, Ch4, Ch5, Ch7
 
 SFX_Cry10_2::
-	sfx SFX_Cry10_2, CH4_ | CH5_ | CH7_
+	audio SFX_Cry10_2, Ch4, Ch5, Ch7
 
 SFX_Cry11_2::
-	sfx SFX_Cry11_2, CH4_ | CH5_ | CH7_
+	audio SFX_Cry11_2, Ch4, Ch5, Ch7
 
 SFX_Cry12_2::
-	sfx SFX_Cry12_2, CH4_ | CH5_ | CH7_
+	audio SFX_Cry12_2, Ch4, Ch5, Ch7
 
 SFX_Cry13_2::
-	sfx SFX_Cry13_2, CH4_ | CH5_ | CH7_
+	audio SFX_Cry13_2, Ch4, Ch5, Ch7
 
 SFX_Cry14_2::
-	sfx SFX_Cry14_2, CH4_ | CH5_ | CH7_
+	audio SFX_Cry14_2, Ch4, Ch5, Ch7
 
 SFX_Cry15_2::
-	sfx SFX_Cry15_2, CH4_ | CH5_ | CH7_
+	audio SFX_Cry15_2, Ch4, Ch5, Ch7
 
 SFX_Cry16_2::
-	sfx SFX_Cry16_2, CH4_ | CH5_ | CH7_
+	audio SFX_Cry16_2, Ch4, Ch5, Ch7
 
 SFX_Cry17_2::
-	sfx SFX_Cry17_2, CH4_ | CH5_ | CH7_
+	audio SFX_Cry17_2, Ch4, Ch5, Ch7
 
 SFX_Cry18_2::
-	sfx SFX_Cry18_2, CH4_ | CH5_ | CH7_
+	audio SFX_Cry18_2, Ch4, Ch5, Ch7
 
 SFX_Cry19_2::
-	sfx SFX_Cry19_2, CH4_ | CH5_ | CH7_
+	audio SFX_Cry19_2, Ch4, Ch5, Ch7
 
 SFX_Cry1A_2::
-	sfx SFX_Cry1A_2, CH4_ | CH5_ | CH7_
+	audio SFX_Cry1A_2, Ch4, Ch5, Ch7
 
 SFX_Cry1B_2::
-	sfx SFX_Cry1B_2, CH4_ | CH5_ | CH7_
+	audio SFX_Cry1B_2, Ch4, Ch5, Ch7
 
 SFX_Cry1C_2::
-	sfx SFX_Cry1C_2, CH4_ | CH5_ | CH7_
+	audio SFX_Cry1C_2, Ch4, Ch5, Ch7
 
 SFX_Cry1D_2::
-	sfx SFX_Cry1D_2, CH4_ | CH5_ | CH7_
+	audio SFX_Cry1D_2, Ch4, Ch5, Ch7
 
 SFX_Cry1E_2::
-	sfx SFX_Cry1E_2, CH4_ | CH5_ | CH7_
+	audio SFX_Cry1E_2, Ch4, Ch5, Ch7
 
 SFX_Cry1F_2::
-	sfx SFX_Cry1F_2, CH4_ | CH5_ | CH7_
+	audio SFX_Cry1F_2, Ch4, Ch5, Ch7
 
 SFX_Cry20_2::
-	sfx SFX_Cry20_2, CH4_ | CH5_ | CH7_
+	audio SFX_Cry20_2, Ch4, Ch5, Ch7
 
 SFX_Cry21_2::
-	sfx SFX_Cry21_2, CH4_ | CH5_ | CH7_
+	audio SFX_Cry21_2, Ch4, Ch5, Ch7
 
 SFX_Cry22_2::
-	sfx SFX_Cry22_2, CH4_ | CH5_ | CH7_
+	audio SFX_Cry22_2, Ch4, Ch5, Ch7
 
 SFX_Cry23_2::
-	sfx SFX_Cry23_2, CH4_ | CH5_ | CH7_
+	audio SFX_Cry23_2, Ch4, Ch5, Ch7
 
 SFX_Cry24_2::
-	sfx SFX_Cry24_2, CH4_ | CH5_ | CH7_
+	audio SFX_Cry24_2, Ch4, Ch5, Ch7
 
 SFX_Cry25_2::
-	sfx SFX_Cry25_2, CH4_ | CH5_ | CH7_
+	audio SFX_Cry25_2, Ch4, Ch5, Ch7
 
 SFX_Level_Up::
-	sfx SFX_Level_Up, CH4_ | CH5_ | CH6_
+	audio SFX_Level_Up, Ch4, Ch5, Ch6
 
 SFX_Get_Item2_2::
-	sfx SFX_Get_Item2_2, CH4_ | CH5_ | CH6_
+	audio SFX_Get_Item2_2, Ch4, Ch5, Ch6
 
 SFX_Tink_2::
-	sfx SFX_Tink_2, CH4_
+	audio SFX_Tink_2, Ch4
 
 SFX_Heal_HP_2::
-	sfx SFX_Heal_HP_2, CH4_
+	audio SFX_Heal_HP_2, Ch4
 
 SFX_Heal_Ailment_2::
-	sfx SFX_Heal_Ailment_2, CH4_
+	audio SFX_Heal_Ailment_2, Ch4
 
 SFX_Start_Menu_2::
-	sfx SFX_Start_Menu_2, CH7_
+	audio SFX_Start_Menu_2, Ch7
 
 SFX_Press_AB_2::
-	sfx SFX_Press_AB_2, CH4_
+	audio SFX_Press_AB_2, Ch4
 
 SFX_Ball_Toss::
-	sfx SFX_Ball_Toss, CH4_ | CH5_
+	audio SFX_Ball_Toss, Ch4, Ch5
 
 SFX_Ball_Poof::
-	sfx SFX_Ball_Poof, CH4_ | CH7_
+	audio SFX_Ball_Poof, Ch4, Ch7
 
 SFX_Faint_Thud::
-	sfx SFX_Faint_Thud, CH4_ | CH7_
+	audio SFX_Faint_Thud, Ch4, Ch7
 
 SFX_Run::
-	sfx SFX_Run, CH7_
+	audio SFX_Run, Ch7
 
 SFX_Dex_Page_Added::
-	sfx SFX_Dex_Page_Added, CH4_ | CH5_
+	audio SFX_Dex_Page_Added, Ch4, Ch5
 
 SFX_Caught_Mon::
-	sfx SFX_Caught_Mon, CH4_ | CH5_ | CH6_
+	audio SFX_Caught_Mon, Ch4, Ch5, Ch6
 
 SFX_Peck::
-	sfx SFX_Peck, CH7_
+	audio SFX_Peck, Ch7
 
 SFX_Faint_Fall::
-	sfx SFX_Faint_Fall, CH4_
+	audio SFX_Faint_Fall, Ch4
 
 SFX_Battle_09::
-	sfx SFX_Battle_09, CH4_
+	audio SFX_Battle_09, Ch4
 
 SFX_Pound::
-	sfx SFX_Pound, CH7_
+	audio SFX_Pound, Ch7
 
 SFX_Battle_0B::
-	sfx SFX_Battle_0B, CH7_
+	audio SFX_Battle_0B, Ch7
 
 SFX_Battle_0C::
-	sfx SFX_Battle_0C, CH7_
+	audio SFX_Battle_0C, Ch7
 
 SFX_Battle_0D::
-	sfx SFX_Battle_0D, CH7_
+	audio SFX_Battle_0D, Ch7
 
 SFX_Battle_0E::
-	sfx SFX_Battle_0E, CH7_
+	audio SFX_Battle_0E, Ch7
 
 SFX_Battle_0F::
-	sfx SFX_Battle_0F, CH7_
+	audio SFX_Battle_0F, Ch7
 
 SFX_Damage::
-	sfx SFX_Damage, CH7_
+	audio SFX_Damage, Ch7
 
 SFX_Not_Very_Effective::
-	sfx SFX_Not_Very_Effective, CH7_
+	audio SFX_Not_Very_Effective, Ch7
 
 SFX_Battle_12::
-	sfx SFX_Battle_12, CH7_
+	audio SFX_Battle_12, Ch7
 
 SFX_Battle_13::
-	sfx SFX_Battle_13, CH7_
+	audio SFX_Battle_13, Ch7
 
 SFX_Battle_14::
-	sfx SFX_Battle_14, CH7_
+	audio SFX_Battle_14, Ch7
 
 SFX_Vine_Whip::
-	sfx SFX_Vine_Whip, CH7_
+	audio SFX_Vine_Whip, Ch7
 
 SFX_Battle_16::
-	sfx SFX_Battle_16, CH7_
+	audio SFX_Battle_16, Ch7
 
 SFX_Battle_17::
-	sfx SFX_Battle_17, CH7_
+	audio SFX_Battle_17, Ch7
 
 SFX_Battle_18::
-	sfx SFX_Battle_18, CH7_
+	audio SFX_Battle_18, Ch7
 
 SFX_Battle_19::
-	sfx SFX_Battle_19, CH7_
+	audio SFX_Battle_19, Ch7
 
 SFX_Super_Effective::
-	sfx SFX_Super_Effective, CH7_
+	audio SFX_Super_Effective, Ch7
 
 SFX_Battle_1B::
-	sfx SFX_Battle_1B, CH7_
+	audio SFX_Battle_1B, Ch7
 
 SFX_Battle_1C::
-	sfx SFX_Battle_1C, CH7_
+	audio SFX_Battle_1C, Ch7
 
 SFX_Doubleslap::
-	sfx SFX_Doubleslap, CH7_
+	audio SFX_Doubleslap, Ch7
 
 SFX_Battle_1E::
-	sfx SFX_Battle_1E, CH4_ | CH7_
+	audio SFX_Battle_1E, Ch4, Ch7
 
 SFX_Horn_Drill::
-	sfx SFX_Horn_Drill, CH7_
+	audio SFX_Horn_Drill, Ch7
 
 SFX_Battle_20::
-	sfx SFX_Battle_20, CH7_
+	audio SFX_Battle_20, Ch7
 
 SFX_Battle_21::
-	sfx SFX_Battle_21, CH7_
+	audio SFX_Battle_21, Ch7
 
 SFX_Battle_22::
-	sfx SFX_Battle_22, CH7_
+	audio SFX_Battle_22, Ch7
 
 SFX_Battle_23::
-	sfx SFX_Battle_23, CH7_
+	audio SFX_Battle_23, Ch7
 
 SFX_Battle_24::
-	sfx SFX_Battle_24, CH4_ | CH7_
+	audio SFX_Battle_24, Ch4, Ch7
 
 SFX_Battle_25::
-	sfx SFX_Battle_25, CH7_
+	audio SFX_Battle_25, Ch7
 
 SFX_Battle_26::
-	sfx SFX_Battle_26, CH7_
+	audio SFX_Battle_26, Ch7
 
 SFX_Battle_27::
-	sfx SFX_Battle_27, CH4_ | CH5_ | CH7_
+	audio SFX_Battle_27, Ch4, Ch5, Ch7
 
 SFX_Battle_28::
-	sfx SFX_Battle_28, CH4_ | CH5_ | CH7_
+	audio SFX_Battle_28, Ch4, Ch5, Ch7
 
 SFX_Battle_29::
-	sfx SFX_Battle_29, CH4_ | CH7_
+	audio SFX_Battle_29, Ch4, Ch7
 
 SFX_Battle_2A::
-	sfx SFX_Battle_2A, CH4_ | CH5_ | CH7_
+	audio SFX_Battle_2A, Ch4, Ch5, Ch7
 
 SFX_Battle_2B::
-	sfx SFX_Battle_2B, CH4_ | CH7_
+	audio SFX_Battle_2B, Ch4, Ch7
 
 SFX_Battle_2C::
-	sfx SFX_Battle_2C, CH4_ | CH5_ | CH7_
+	audio SFX_Battle_2C, Ch4, Ch5, Ch7
 
 SFX_Psybeam::
-	sfx SFX_Psybeam, CH4_ | CH5_ | CH7_
+	audio SFX_Psybeam, Ch4, Ch5, Ch7
 
 SFX_Battle_2E::
-	sfx SFX_Battle_2E, CH4_ | CH5_ | CH7_
+	audio SFX_Battle_2E, Ch4, Ch5, Ch7
 
 SFX_Battle_2F::
-	sfx SFX_Battle_2F, CH4_ | CH5_ | CH7_
+	audio SFX_Battle_2F, Ch4, Ch5, Ch7
 
 SFX_Psychic_M::
-	sfx SFX_Psychic_M, CH4_ | CH5_ | CH7_
+	audio SFX_Psychic_M, Ch4, Ch5, Ch7
 
 SFX_Battle_31::
-	sfx SFX_Battle_31, CH4_ | CH5_
+	audio SFX_Battle_31, Ch4, Ch5
 
 SFX_Battle_32::
-	sfx SFX_Battle_32, CH4_ | CH5_
+	audio SFX_Battle_32, Ch4, Ch5
 
 SFX_Battle_33::
-	sfx SFX_Battle_33, CH4_ | CH5_
+	audio SFX_Battle_33, Ch4, Ch5
 
 SFX_Battle_34::
-	sfx SFX_Battle_34, CH4_ | CH5_ | CH7_
+	audio SFX_Battle_34, Ch4, Ch5, Ch7
 
 SFX_Battle_35::
-	sfx SFX_Battle_35, CH4_ | CH5_
+	audio SFX_Battle_35, Ch4, Ch5
 
 SFX_Battle_36::
-	sfx SFX_Battle_36, CH4_ | CH5_ | CH7_
+	audio SFX_Battle_36, Ch4, Ch5, Ch7
 
 SFX_Silph_Scope::
-	sfx SFX_Silph_Scope, CH4_
+	audio SFX_Silph_Scope, Ch4