Fix sound effect channel numbering

mostly so that sound effects that only use the noise channel are
labelled 'Ch7' instead of 'Ch1'

1 files changed, 233 insertions, 233 deletions

diff --git a/audio/headers/sfxheaders2.asm b/audio/headers/sfxheaders2.asm
index 1b6f8a5c..f54f37f8 100644
--- a/audio/headers/sfxheaders2.asm
+++ b/audio/headers/sfxheaders2.asm
@@ -3,704 +3,704 @@ SFX_Headers_2::
 
 SFX_Snare1_2::
 	db CH7
-	dw SFX_Snare1_2_Ch1
+	dw SFX_Snare1_2_Ch7
 
 SFX_Snare2_2::
 	db CH7
-	dw SFX_Snare2_2_Ch1
+	dw SFX_Snare2_2_Ch7
 
 SFX_Snare3_2::
 	db CH7
-	dw SFX_Snare3_2_Ch1
+	dw SFX_Snare3_2_Ch7
 
 SFX_Snare4_2::
 	db CH7
-	dw SFX_Snare4_2_Ch1
+	dw SFX_Snare4_2_Ch7
 
 SFX_Snare5_2::
 	db CH7
-	dw SFX_Snare5_2_Ch1
+	dw SFX_Snare5_2_Ch7
 
 SFX_Triangle1_2::
 	db CH7
-	dw SFX_Triangle1_2_Ch1
+	dw SFX_Triangle1_2_Ch7
 
 SFX_Triangle2_2::
 	db CH7
-	dw SFX_Triangle2_2_Ch1
+	dw SFX_Triangle2_2_Ch7
 
 SFX_Snare6_2::
 	db CH7
-	dw SFX_Snare6_2_Ch1
+	dw SFX_Snare6_2_Ch7
 
 SFX_Snare7_2::
 	db CH7
-	dw SFX_Snare7_2_Ch1
+	dw SFX_Snare7_2_Ch7
 
 SFX_Snare8_2::
 	db CH7
-	dw SFX_Snare8_2_Ch1
+	dw SFX_Snare8_2_Ch7
 
 SFX_Snare9_2::
 	db CH7
-	dw SFX_Snare9_2_Ch1
+	dw SFX_Snare9_2_Ch7
 
 SFX_Cymbal1_2::
 	db CH7
-	dw SFX_Cymbal1_2_Ch1
+	dw SFX_Cymbal1_2_Ch7
 
 SFX_Cymbal2_2::
 	db CH7
-	dw SFX_Cymbal2_2_Ch1
+	dw SFX_Cymbal2_2_Ch7
 
 SFX_Cymbal3_2::
 	db CH7
-	dw SFX_Cymbal3_2_Ch1
+	dw SFX_Cymbal3_2_Ch7
 
 SFX_Muted_Snare1_2::
 	db CH7
-	dw SFX_Muted_Snare1_2_Ch1
+	dw SFX_Muted_Snare1_2_Ch7
 
 SFX_Triangle3_2::
 	db CH7
-	dw SFX_Triangle3_2_Ch1
+	dw SFX_Triangle3_2_Ch7
 
 SFX_Muted_Snare2_2::
 	db CH7
-	dw SFX_Muted_Snare2_2_Ch1
+	dw SFX_Muted_Snare2_2_Ch7
 
 SFX_Muted_Snare3_2::
 	db CH7
-	dw SFX_Muted_Snare3_2_Ch1
+	dw SFX_Muted_Snare3_2_Ch7
 
 SFX_Muted_Snare4_2::
 	db CH7
-	dw SFX_Muted_Snare4_2_Ch1
+	dw SFX_Muted_Snare4_2_Ch7
 
 SFX_Cry00_2::
 	db ( $80 | CH4 )
-	dw SFX_Cry00_2_Ch1
+	dw SFX_Cry00_2_Ch4
 	db CH5
-	dw SFX_Cry00_2_Ch2
+	dw SFX_Cry00_2_Ch5
 	db CH7
-	dw SFX_Cry00_2_Ch3
+	dw SFX_Cry00_2_Ch7
 
 SFX_Cry01_2::
 	db ( $80 | CH4 )
-	dw SFX_Cry01_2_Ch1
+	dw SFX_Cry01_2_Ch4
 	db CH5
-	dw SFX_Cry01_2_Ch2
+	dw SFX_Cry01_2_Ch5
 	db CH7
-	dw SFX_Cry01_2_Ch3
+	dw SFX_Cry01_2_Ch7
 
 SFX_Cry02_2::
 	db ( $80 | CH4 )
-	dw SFX_Cry02_2_Ch1
+	dw SFX_Cry02_2_Ch4
 	db CH5
-	dw SFX_Cry02_2_Ch2
+	dw SFX_Cry02_2_Ch5
 	db CH7
-	dw SFX_Cry02_2_Ch3
+	dw SFX_Cry02_2_Ch7
 
 SFX_Cry03_2::
 	db ( $80 | CH4 )
-	dw SFX_Cry03_2_Ch1
+	dw SFX_Cry03_2_Ch4
 	db CH5
-	dw SFX_Cry03_2_Ch2
+	dw SFX_Cry03_2_Ch5
 	db CH7
-	dw SFX_Cry03_2_Ch3
+	dw SFX_Cry03_2_Ch7
 
 SFX_Cry04_2::
 	db ( $80 | CH4 )
-	dw SFX_Cry04_2_Ch1
+	dw SFX_Cry04_2_Ch4
 	db CH5
-	dw SFX_Cry04_2_Ch2
+	dw SFX_Cry04_2_Ch5
 	db CH7
-	dw SFX_Cry04_2_Ch3
+	dw SFX_Cry04_2_Ch7
 
 SFX_Cry05_2::
 	db ( $80 | CH4 )
-	dw SFX_Cry05_2_Ch1
+	dw SFX_Cry05_2_Ch4
 	db CH5
-	dw SFX_Cry05_2_Ch2
+	dw SFX_Cry05_2_Ch5
 	db CH7
-	dw SFX_Cry05_2_Ch3
+	dw SFX_Cry05_2_Ch7
 
 SFX_Cry06_2::
 	db ( $80 | CH4 )
-	dw SFX_Cry06_2_Ch1
+	dw SFX_Cry06_2_Ch4
 	db CH5
-	dw SFX_Cry06_2_Ch2
+	dw SFX_Cry06_2_Ch5
 	db CH7
-	dw SFX_Cry06_2_Ch3
+	dw SFX_Cry06_2_Ch7
 
 SFX_Cry07_2::
 	db ( $80 | CH4 )
-	dw SFX_Cry07_2_Ch1
+	dw SFX_Cry07_2_Ch4
 	db CH5
-	dw SFX_Cry07_2_Ch2
+	dw SFX_Cry07_2_Ch5
 	db CH7
-	dw SFX_Cry07_2_Ch3
+	dw SFX_Cry07_2_Ch7
 
 SFX_Cry08_2::
 	db ( $80 | CH4 )
-	dw SFX_Cry08_2_Ch1
+	dw SFX_Cry08_2_Ch4
 	db CH5
-	dw SFX_Cry08_2_Ch2
+	dw SFX_Cry08_2_Ch5
 	db CH7
-	dw SFX_Cry08_2_Ch3
+	dw SFX_Cry08_2_Ch7
 
 SFX_Cry09_2::
 	db ( $80 | CH4 )
-	dw SFX_Cry09_2_Ch1
+	dw SFX_Cry09_2_Ch4
 	db CH5
-	dw SFX_Cry09_2_Ch2
+	dw SFX_Cry09_2_Ch5
 	db CH7
-	dw SFX_Cry09_2_Ch3
+	dw SFX_Cry09_2_Ch7
 
 SFX_Cry0A_2::
 	db ( $80 | CH4 )
-	dw SFX_Cry0A_2_Ch1
+	dw SFX_Cry0A_2_Ch4
 	db CH5
-	dw SFX_Cry0A_2_Ch2
+	dw SFX_Cry0A_2_Ch5
 	db CH7
-	dw SFX_Cry0A_2_Ch3
+	dw SFX_Cry0A_2_Ch7
 
 SFX_Cry0B_2::
 	db ( $80 | CH4 )
-	dw SFX_Cry0B_2_Ch1
+	dw SFX_Cry0B_2_Ch4
 	db CH5
-	dw SFX_Cry0B_2_Ch2
+	dw SFX_Cry0B_2_Ch5
 	db CH7
-	dw SFX_Cry0B_2_Ch3
+	dw SFX_Cry0B_2_Ch7
 
 SFX_Cry0C_2::
 	db ( $80 | CH4 )
-	dw SFX_Cry0C_2_Ch1
+	dw SFX_Cry0C_2_Ch4
 	db CH5
-	dw SFX_Cry0C_2_Ch2
+	dw SFX_Cry0C_2_Ch5
 	db CH7
-	dw SFX_Cry0C_2_Ch3
+	dw SFX_Cry0C_2_Ch7
 
 SFX_Cry0D_2::
 	db ( $80 | CH4 )
-	dw SFX_Cry0D_2_Ch1
+	dw SFX_Cry0D_2_Ch4
 	db CH5
-	dw SFX_Cry0D_2_Ch2
+	dw SFX_Cry0D_2_Ch5
 	db CH7
-	dw SFX_Cry0D_2_Ch3
+	dw SFX_Cry0D_2_Ch7
 
 SFX_Cry0E_2::
 	db ( $80 | CH4 )
-	dw SFX_Cry0E_2_Ch1
+	dw SFX_Cry0E_2_Ch4
 	db CH5
-	dw SFX_Cry0E_2_Ch2
+	dw SFX_Cry0E_2_Ch5
 	db CH7
-	dw SFX_Cry0E_2_Ch3
+	dw SFX_Cry0E_2_Ch7
 
 SFX_Cry0F_2::
 	db ( $80 | CH4 )
-	dw SFX_Cry0F_2_Ch1
+	dw SFX_Cry0F_2_Ch4
 	db CH5
-	dw SFX_Cry0F_2_Ch2
+	dw SFX_Cry0F_2_Ch5
 	db CH7
-	dw SFX_Cry0F_2_Ch3
+	dw SFX_Cry0F_2_Ch7
 
 SFX_Cry10_2::
 	db ( $80 | CH4 )
-	dw SFX_Cry10_2_Ch1
+	dw SFX_Cry10_2_Ch4
 	db CH5
-	dw SFX_Cry10_2_Ch2
+	dw SFX_Cry10_2_Ch5
 	db CH7
-	dw SFX_Cry10_2_Ch3
+	dw SFX_Cry10_2_Ch7
 
 SFX_Cry11_2::
 	db ( $80 | CH4 )
-	dw SFX_Cry11_2_Ch1
+	dw SFX_Cry11_2_Ch4
 	db CH5
-	dw SFX_Cry11_2_Ch2
+	dw SFX_Cry11_2_Ch5
 	db CH7
-	dw SFX_Cry11_2_Ch3
+	dw SFX_Cry11_2_Ch7
 
 SFX_Cry12_2::
 	db ( $80 | CH4 )
-	dw SFX_Cry12_2_Ch1
+	dw SFX_Cry12_2_Ch4
 	db CH5
-	dw SFX_Cry12_2_Ch2
+	dw SFX_Cry12_2_Ch5
 	db CH7
-	dw SFX_Cry12_2_Ch3
+	dw SFX_Cry12_2_Ch7
 
 SFX_Cry13_2::
 	db ( $80 | CH4 )
-	dw SFX_Cry13_2_Ch1
+	dw SFX_Cry13_2_Ch4
 	db CH5
-	dw SFX_Cry13_2_Ch2
+	dw SFX_Cry13_2_Ch5
 	db CH7
-	dw SFX_Cry13_2_Ch3
+	dw SFX_Cry13_2_Ch7
 
 SFX_Cry14_2::
 	db ( $80 | CH4 )
-	dw SFX_Cry14_2_Ch1
+	dw SFX_Cry14_2_Ch4
 	db CH5
-	dw SFX_Cry14_2_Ch2
+	dw SFX_Cry14_2_Ch5
 	db CH7
-	dw SFX_Cry14_2_Ch3
+	dw SFX_Cry14_2_Ch7
 
 SFX_Cry15_2::
 	db ( $80 | CH4 )
-	dw SFX_Cry15_2_Ch1
+	dw SFX_Cry15_2_Ch4
 	db CH5
-	dw SFX_Cry15_2_Ch2
+	dw SFX_Cry15_2_Ch5
 	db CH7
-	dw SFX_Cry15_2_Ch3
+	dw SFX_Cry15_2_Ch7
 
 SFX_Cry16_2::
 	db ( $80 | CH4 )
-	dw SFX_Cry16_2_Ch1
+	dw SFX_Cry16_2_Ch4
 	db CH5
-	dw SFX_Cry16_2_Ch2
+	dw SFX_Cry16_2_Ch5
 	db CH7
-	dw SFX_Cry16_2_Ch3
+	dw SFX_Cry16_2_Ch7
 
 SFX_Cry17_2::
 	db ( $80 | CH4 )
-	dw SFX_Cry17_2_Ch1
+	dw SFX_Cry17_2_Ch4
 	db CH5
-	dw SFX_Cry17_2_Ch2
+	dw SFX_Cry17_2_Ch5
 	db CH7
-	dw SFX_Cry17_2_Ch3
+	dw SFX_Cry17_2_Ch7
 
 SFX_Cry18_2::
 	db ( $80 | CH4 )
-	dw SFX_Cry18_2_Ch1
+	dw SFX_Cry18_2_Ch4
 	db CH5
-	dw SFX_Cry18_2_Ch2
+	dw SFX_Cry18_2_Ch5
 	db CH7
-	dw SFX_Cry18_2_Ch3
+	dw SFX_Cry18_2_Ch7
 
 SFX_Cry19_2::
 	db ( $80 | CH4 )
-	dw SFX_Cry19_2_Ch1
+	dw SFX_Cry19_2_Ch4
 	db CH5
-	dw SFX_Cry19_2_Ch2
+	dw SFX_Cry19_2_Ch5
 	db CH7
-	dw SFX_Cry19_2_Ch3
+	dw SFX_Cry19_2_Ch7
 
 SFX_Cry1A_2::
 	db ( $80 | CH4 )
-	dw SFX_Cry1A_2_Ch1
+	dw SFX_Cry1A_2_Ch4
 	db CH5
-	dw SFX_Cry1A_2_Ch2
+	dw SFX_Cry1A_2_Ch5
 	db CH7
-	dw SFX_Cry1A_2_Ch3
+	dw SFX_Cry1A_2_Ch7
 
 SFX_Cry1B_2::
 	db ( $80 | CH4 )
-	dw SFX_Cry1B_2_Ch1
+	dw SFX_Cry1B_2_Ch4
 	db CH5
-	dw SFX_Cry1B_2_Ch2
+	dw SFX_Cry1B_2_Ch5
 	db CH7
-	dw SFX_Cry1B_2_Ch3
+	dw SFX_Cry1B_2_Ch7
 
 SFX_Cry1C_2::
 	db ( $80 | CH4 )
-	dw SFX_Cry1C_2_Ch1
+	dw SFX_Cry1C_2_Ch4
 	db CH5
-	dw SFX_Cry1C_2_Ch2
+	dw SFX_Cry1C_2_Ch5
 	db CH7
-	dw SFX_Cry1C_2_Ch3
+	dw SFX_Cry1C_2_Ch7
 
 SFX_Cry1D_2::
 	db ( $80 | CH4 )
-	dw SFX_Cry1D_2_Ch1
+	dw SFX_Cry1D_2_Ch4
 	db CH5
-	dw SFX_Cry1D_2_Ch2
+	dw SFX_Cry1D_2_Ch5
 	db CH7
-	dw SFX_Cry1D_2_Ch3
+	dw SFX_Cry1D_2_Ch7
 
 SFX_Cry1E_2::
 	db ( $80 | CH4 )
-	dw SFX_Cry1E_2_Ch1
+	dw SFX_Cry1E_2_Ch4
 	db CH5
-	dw SFX_Cry1E_2_Ch2
+	dw SFX_Cry1E_2_Ch5
 	db CH7
-	dw SFX_Cry1E_2_Ch3
+	dw SFX_Cry1E_2_Ch7
 
 SFX_Cry1F_2::
 	db ( $80 | CH4 )
-	dw SFX_Cry1F_2_Ch1
+	dw SFX_Cry1F_2_Ch4
 	db CH5
-	dw SFX_Cry1F_2_Ch2
+	dw SFX_Cry1F_2_Ch5
 	db CH7
-	dw SFX_Cry1F_2_Ch3
+	dw SFX_Cry1F_2_Ch7
 
 SFX_Cry20_2::
 	db ( $80 | CH4 )
-	dw SFX_Cry20_2_Ch1
+	dw SFX_Cry20_2_Ch4
 	db CH5
-	dw SFX_Cry20_2_Ch2
+	dw SFX_Cry20_2_Ch5
 	db CH7
-	dw SFX_Cry20_2_Ch3
+	dw SFX_Cry20_2_Ch7
 
 SFX_Cry21_2::
 	db ( $80 | CH4 )
-	dw SFX_Cry21_2_Ch1
+	dw SFX_Cry21_2_Ch4
 	db CH5
-	dw SFX_Cry21_2_Ch2
+	dw SFX_Cry21_2_Ch5
 	db CH7
-	dw SFX_Cry21_2_Ch3
+	dw SFX_Cry21_2_Ch7
 
 SFX_Cry22_2::
 	db ( $80 | CH4 )
-	dw SFX_Cry22_2_Ch1
+	dw SFX_Cry22_2_Ch4
 	db CH5
-	dw SFX_Cry22_2_Ch2
+	dw SFX_Cry22_2_Ch5
 	db CH7
-	dw SFX_Cry22_2_Ch3
+	dw SFX_Cry22_2_Ch7
 
 SFX_Cry23_2::
 	db ( $80 | CH4 )
-	dw SFX_Cry23_2_Ch1
+	dw SFX_Cry23_2_Ch4
 	db CH5
-	dw SFX_Cry23_2_Ch2
+	dw SFX_Cry23_2_Ch5
 	db CH7
-	dw SFX_Cry23_2_Ch3
+	dw SFX_Cry23_2_Ch7
 
 SFX_Cry24_2::
 	db ( $80 | CH4 )
-	dw SFX_Cry24_2_Ch1
+	dw SFX_Cry24_2_Ch4
 	db CH5
-	dw SFX_Cry24_2_Ch2
+	dw SFX_Cry24_2_Ch5
 	db CH7
-	dw SFX_Cry24_2_Ch3
+	dw SFX_Cry24_2_Ch7
 
 SFX_Cry25_2::
 	db ( $80 | CH4 )
-	dw SFX_Cry25_2_Ch1
+	dw SFX_Cry25_2_Ch4
 	db CH5
-	dw SFX_Cry25_2_Ch2
+	dw SFX_Cry25_2_Ch5
 	db CH7
-	dw SFX_Cry25_2_Ch3
+	dw SFX_Cry25_2_Ch7
 
 SFX_Level_Up::
 	db ( $80 | CH4 )
-	dw SFX_Level_Up_Ch1
+	dw SFX_Level_Up_Ch4
 	db CH5
-	dw SFX_Level_Up_Ch2
+	dw SFX_Level_Up_Ch5
 	db CH6
-	dw SFX_Level_Up_Ch3
+	dw SFX_Level_Up_Ch6
 
 SFX_Get_Item2_2::
 	db ( $80 | CH4 )
-	dw SFX_Get_Item2_2_Ch1
+	dw SFX_Get_Item2_2_Ch4
 	db CH5
-	dw SFX_Get_Item2_2_Ch2
+	dw SFX_Get_Item2_2_Ch5
 	db CH6
-	dw SFX_Get_Item2_2_Ch3
+	dw SFX_Get_Item2_2_Ch6
 
 SFX_Tink_2::
 	db CH4
-	dw SFX_Tink_2_Ch1
+	dw SFX_Tink_2_Ch4
 
 SFX_Heal_HP_2::
 	db CH4
-	dw SFX_Heal_HP_2_Ch1
+	dw SFX_Heal_HP_2_Ch4
 
 SFX_Heal_Ailment_2::
 	db CH4
-	dw SFX_Heal_Ailment_2_Ch1
+	dw SFX_Heal_Ailment_2_Ch4
 
 SFX_Start_Menu_2::
 	db CH7
-	dw SFX_Start_Menu_2_Ch1
+	dw SFX_Start_Menu_2_Ch7
 
 SFX_Press_AB_2::
 	db CH4
-	dw SFX_Press_AB_2_Ch1
+	dw SFX_Press_AB_2_Ch4
 
 SFX_Ball_Toss::
 	db ( $40 | CH4 )
-	dw SFX_Ball_Toss_Ch1
+	dw SFX_Ball_Toss_Ch4
 	db CH5
-	dw SFX_Ball_Toss_Ch2
+	dw SFX_Ball_Toss_Ch5
 
 SFX_Ball_Poof::
 	db ( $40 | CH4 )
-	dw SFX_Ball_Poof_Ch1
+	dw SFX_Ball_Poof_Ch4
 	db CH7
-	dw SFX_Ball_Poof_Ch2
+	dw SFX_Ball_Poof_Ch7
 
 SFX_Faint_Thud::
 	db ( $40 | CH4 )
-	dw SFX_Faint_Thud_Ch1
+	dw SFX_Faint_Thud_Ch4
 	db CH7
-	dw SFX_Faint_Thud_Ch2
+	dw SFX_Faint_Thud_Ch7
 
 SFX_Run::
 	db CH7
-	dw SFX_Run_Ch1
+	dw SFX_Run_Ch7
 
 SFX_Dex_Page_Added::
 	db ( $40 | CH4 )
-	dw SFX_Dex_Page_Added_Ch1
+	dw SFX_Dex_Page_Added_Ch4
 	db CH5
-	dw SFX_Dex_Page_Added_Ch2
+	dw SFX_Dex_Page_Added_Ch5
 
 SFX_Caught_Mon::
 	db ( $80 | CH4 )
-	dw SFX_Caught_Mon_Ch1
+	dw SFX_Caught_Mon_Ch4
 	db CH5
-	dw SFX_Caught_Mon_Ch2
+	dw SFX_Caught_Mon_Ch5
 	db CH6
-	dw SFX_Caught_Mon_Ch3
+	dw SFX_Caught_Mon_Ch6
 
 SFX_Peck::
 	db CH7
-	dw SFX_Peck_Ch1
+	dw SFX_Peck_Ch7
 
 SFX_Faint_Fall::
 	db CH4
-	dw SFX_Faint_Fall_Ch1
+	dw SFX_Faint_Fall_Ch4
 
 SFX_Battle_09::
 	db CH4
-	dw SFX_Battle_09_Ch1
+	dw SFX_Battle_09_Ch4
 
 SFX_Pound::
 	db CH7
-	dw SFX_Pound_Ch1
+	dw SFX_Pound_Ch7
 
 SFX_Battle_0B::
 	db CH7
-	dw SFX_Battle_0B_Ch1
+	dw SFX_Battle_0B_Ch7
 
 SFX_Battle_0C::
 	db CH7
-	dw SFX_Battle_0C_Ch1
+	dw SFX_Battle_0C_Ch7
 
 SFX_Battle_0D::
 	db CH7
-	dw SFX_Battle_0D_Ch1
+	dw SFX_Battle_0D_Ch7
 
 SFX_Battle_0E::
 	db CH7
-	dw SFX_Battle_0E_Ch1
+	dw SFX_Battle_0E_Ch7
 
 SFX_Battle_0F::
 	db CH7
-	dw SFX_Battle_0F_Ch1
+	dw SFX_Battle_0F_Ch7
 
 SFX_Damage::
 	db CH7
-	dw SFX_Damage_Ch1
+	dw SFX_Damage_Ch7
 
 SFX_Not_Very_Effective::
 	db CH7
-	dw SFX_Not_Very_Effective_Ch1
+	dw SFX_Not_Very_Effective_Ch7
 
 SFX_Battle_12::
 	db CH7
-	dw SFX_Battle_12_Ch1
+	dw SFX_Battle_12_Ch7
 
 SFX_Battle_13::
 	db CH7
-	dw SFX_Battle_13_Ch1
+	dw SFX_Battle_13_Ch7
 
 SFX_Battle_14::
 	db CH7
-	dw SFX_Battle_14_Ch1
+	dw SFX_Battle_14_Ch7
 
 SFX_Vine_Whip::
 	db CH7
-	dw SFX_Vine_Whip_Ch1
+	dw SFX_Vine_Whip_Ch7
 
 SFX_Battle_16::
 	db CH7
-	dw SFX_Battle_16_Ch1
+	dw SFX_Battle_16_Ch7
 
 SFX_Battle_17::
 	db CH7
-	dw SFX_Battle_17_Ch1
+	dw SFX_Battle_17_Ch7
 
 SFX_Battle_18::
 	db CH7
-	dw SFX_Battle_18_Ch1
+	dw SFX_Battle_18_Ch7
 
 SFX_Battle_19::
 	db CH7
-	dw SFX_Battle_19_Ch1
+	dw SFX_Battle_19_Ch7
 
 SFX_Super_Effective::
 	db CH7
-	dw SFX_Super_Effective_Ch1
+	dw SFX_Super_Effective_Ch7
 
 SFX_Battle_1B::
 	db CH7
-	dw SFX_Battle_1B_Ch1
+	dw SFX_Battle_1B_Ch7
 
 SFX_Battle_1C::
 	db CH7
-	dw SFX_Battle_1C_Ch1
+	dw SFX_Battle_1C_Ch7
 
 SFX_Doubleslap::
 	db CH7
-	dw SFX_Doubleslap_Ch1
+	dw SFX_Doubleslap_Ch7
 
 SFX_Battle_1E::
 	db ( $40 | CH4 )
-	dw SFX_Battle_1E_Ch1
+	dw SFX_Battle_1E_Ch4
 	db CH7
-	dw SFX_Battle_1E_Ch2
+	dw SFX_Battle_1E_Ch7
 
 SFX_Horn_Drill::
 	db CH7
-	dw SFX_Horn_Drill_Ch1
+	dw SFX_Horn_Drill_Ch7
 
 SFX_Battle_20::
 	db CH7
-	dw SFX_Battle_20_Ch1
+	dw SFX_Battle_20_Ch7
 
 SFX_Battle_21::
 	db CH7
-	dw SFX_Battle_21_Ch1
+	dw SFX_Battle_21_Ch7
 
 SFX_Battle_22::
 	db CH7
-	dw SFX_Battle_22_Ch1
+	dw SFX_Battle_22_Ch7
 
 SFX_Battle_23::
 	db CH7
-	dw SFX_Battle_23_Ch1
+	dw SFX_Battle_23_Ch7
 
 SFX_Battle_24::
 	db ( $40 | CH4 )
-	dw SFX_Battle_24_Ch1
+	dw SFX_Battle_24_Ch4
 	db CH7
-	dw SFX_Battle_24_Ch2
+	dw SFX_Battle_24_Ch7
 
 SFX_Battle_25::
 	db CH7
-	dw SFX_Battle_25_Ch1
+	dw SFX_Battle_25_Ch7
 
 SFX_Battle_26::
 	db CH7
-	dw SFX_Battle_26_Ch1
+	dw SFX_Battle_26_Ch7
 
 SFX_Battle_27::
 	db ( $80 | CH4 )
-	dw SFX_Battle_27_Ch1
+	dw SFX_Battle_27_Ch4
 	db CH5
-	dw SFX_Battle_27_Ch2
+	dw SFX_Battle_27_Ch5
 	db CH7
-	dw SFX_Battle_27_Ch3
+	dw SFX_Battle_27_Ch7
 
 SFX_Battle_28::
 	db ( $80 | CH4 )
-	dw SFX_Battle_28_Ch1
+	dw SFX_Battle_28_Ch4
 	db CH5
-	dw SFX_Battle_28_Ch2
+	dw SFX_Battle_28_Ch5
 	db CH7
-	dw SFX_Battle_28_Ch3
+	dw SFX_Battle_28_Ch7
 
 SFX_Battle_29::
 	db ( $40 | CH4 )
-	dw SFX_Battle_29_Ch1
+	dw SFX_Battle_29_Ch4
 	db CH7
-	dw SFX_Battle_29_Ch2
+	dw SFX_Battle_29_Ch7
 
 SFX_Battle_2A::
 	db ( $80 | CH4 )
-	dw SFX_Battle_2A_Ch1
+	dw SFX_Battle_2A_Ch4
 	db CH5
-	dw SFX_Battle_2A_Ch2
+	dw SFX_Battle_2A_Ch5
 	db CH7
-	dw SFX_Battle_2A_Ch3
+	dw SFX_Battle_2A_Ch7
 
 SFX_Battle_2B::
 	db ( $40 | CH4 )
-	dw SFX_Battle_2B_Ch1
+	dw SFX_Battle_2B_Ch4
 	db CH7
-	dw SFX_Battle_2B_Ch2
+	dw SFX_Battle_2B_Ch7
 
 SFX_Battle_2C::
 	db ( $80 | CH4 )
-	dw SFX_Battle_2C_Ch1
+	dw SFX_Battle_2C_Ch4
 	db CH5
-	dw SFX_Battle_2C_Ch2
+	dw SFX_Battle_2C_Ch5
 	db CH7
-	dw SFX_Battle_2C_Ch3
+	dw SFX_Battle_2C_Ch7
 
 SFX_Psybeam::
 	db ( $80 | CH4 )
-	dw SFX_Psybeam_Ch1
+	dw SFX_Psybeam_Ch4
 	db CH5
-	dw SFX_Psybeam_Ch2
+	dw SFX_Psybeam_Ch5
 	db CH7
-	dw SFX_Psybeam_Ch3
+	dw SFX_Psybeam_Ch7
 
 SFX_Battle_2E::
 	db ( $80 | CH4 )
-	dw SFX_Battle_2E_Ch1
+	dw SFX_Battle_2E_Ch4
 	db CH5
-	dw SFX_Battle_2E_Ch2
+	dw SFX_Battle_2E_Ch5
 	db CH7
-	dw SFX_Battle_2E_Ch3
+	dw SFX_Battle_2E_Ch7
 
 SFX_Battle_2F::
 	db ( $80 | CH4 )
-	dw SFX_Battle_2F_Ch1
+	dw SFX_Battle_2F_Ch4
 	db CH5
-	dw SFX_Battle_2F_Ch2
+	dw SFX_Battle_2F_Ch5
 	db CH7
-	dw SFX_Battle_2F_Ch3
+	dw SFX_Battle_2F_Ch7
 
 SFX_Psychic_M::
 	db ( $80 | CH4 )
-	dw SFX_Psychic_M_Ch1
+	dw SFX_Psychic_M_Ch4
 	db CH5
-	dw SFX_Psychic_M_Ch2
+	dw SFX_Psychic_M_Ch5
 	db CH7
-	dw SFX_Psychic_M_Ch3
+	dw SFX_Psychic_M_Ch7
 
 SFX_Battle_31::
 	db ( $40 | CH4 )
-	dw SFX_Battle_31_Ch1
+	dw SFX_Battle_31_Ch4
 	db CH5
-	dw SFX_Battle_31_Ch2
+	dw SFX_Battle_31_Ch5
 
 SFX_Battle_32::
 	db ( $40 | CH4 )
-	dw SFX_Battle_32_Ch1
+	dw SFX_Battle_32_Ch4
 	db CH5
-	dw SFX_Battle_32_Ch2
+	dw SFX_Battle_32_Ch5
 
 SFX_Battle_33::
 	db ( $40 | CH4 )
-	dw SFX_Battle_33_Ch1
+	dw SFX_Battle_33_Ch4
 	db CH5
-	dw SFX_Battle_33_Ch2
+	dw SFX_Battle_33_Ch5
 
 SFX_Battle_34::
 	db ( $80 | CH4 )
-	dw SFX_Battle_34_Ch1
+	dw SFX_Battle_34_Ch4
 	db CH5
-	dw SFX_Battle_34_Ch2
+	dw SFX_Battle_34_Ch5
 	db CH7
-	dw SFX_Battle_34_Ch3
+	dw SFX_Battle_34_Ch7
 
 SFX_Battle_35::
 	db ( $40 | CH4 )
-	dw SFX_Battle_35_Ch1
+	dw SFX_Battle_35_Ch4
 	db CH5
-	dw SFX_Battle_35_Ch2
+	dw SFX_Battle_35_Ch5
 
 SFX_Battle_36::
 	db ( $80 | CH4 )
-	dw SFX_Battle_36_Ch1
+	dw SFX_Battle_36_Ch4
 	db CH5
-	dw SFX_Battle_36_Ch2
+	dw SFX_Battle_36_Ch5
 	db CH7
-	dw SFX_Battle_36_Ch3
+	dw SFX_Battle_36_Ch7
 
 SFX_Silph_Scope::
 	db CH4
-	dw SFX_Silph_Scope_Ch1
+	dw SFX_Silph_Scope_Ch4