Update audio macro names

change audio channel numbers from 0-7 back to 1-8
change all note macros back to single note macro
todo: fix comments with old macro names, update noise macros/instrument names

6 files changed, 363 insertions, 363 deletions

diff --git a/audio/headers/musicheaders1.asm b/audio/headers/musicheaders1.asm
index 38594d41..ef85eae6 100755
--- a/audio/headers/musicheaders1.asm
+++ b/audio/headers/musicheaders1.asm
@@ -1,66 +1,66 @@
 Music_PalletTown::
-	audio Music_PalletTown, Ch0, Ch1, Ch2
+	audio_header Music_PalletTown, Ch1, Ch2, Ch3
 
 Music_Pokecenter::
-	audio Music_Pokecenter, Ch0, Ch1, Ch2
+	audio_header Music_Pokecenter, Ch1, Ch2, Ch3
 
 Music_Gym::
-	audio Music_Gym, Ch0, Ch1, Ch2
+	audio_header Music_Gym, Ch1, Ch2, Ch3
 
 ; Viridian City, Pewter City, Saffron City
 Music_Cities1::
-	audio Music_Cities1, Ch0, Ch1, Ch2, Ch3
+	audio_header Music_Cities1, Ch1, Ch2, Ch3, Ch4
 
 ; Cerulean City, Fuchsia City
 Music_Cities2::
-	audio Music_Cities2, Ch0, Ch1, Ch2
+	audio_header Music_Cities2, Ch1, Ch2, Ch3
 
 Music_Celadon::
-	audio Music_Celadon, Ch0, Ch1, Ch2
+	audio_header Music_Celadon, Ch1, Ch2, Ch3
 
 Music_Cinnabar::
-	audio Music_Cinnabar, Ch0, Ch1, Ch2
+	audio_header Music_Cinnabar, Ch1, Ch2, Ch3
 
 Music_Vermilion::
-	audio Music_Vermilion, Ch0, Ch1, Ch2, Ch3
+	audio_header Music_Vermilion, Ch1, Ch2, Ch3, Ch4
 
 Music_Lavender::
-	audio Music_Lavender, Ch0, Ch1, Ch2, Ch3
+	audio_header Music_Lavender, Ch1, Ch2, Ch3, Ch4
 
 Music_SSAnne::
-	audio Music_SSAnne, Ch0, Ch1, Ch2
+	audio_header Music_SSAnne, Ch1, Ch2, Ch3
 
 Music_MeetProfOak::
-	audio Music_MeetProfOak, Ch0, Ch1, Ch2
+	audio_header Music_MeetProfOak, Ch1, Ch2, Ch3
 
 Music_MeetRival::
-	audio Music_MeetRival, Ch0, Ch1, Ch2
+	audio_header Music_MeetRival, Ch1, Ch2, Ch3
 
 Music_MuseumGuy::
-	audio Music_MuseumGuy, Ch0, Ch1, Ch2, Ch3
+	audio_header Music_MuseumGuy, Ch1, Ch2, Ch3, Ch4
 
 Music_SafariZone::
-	audio Music_SafariZone, Ch0, Ch1, Ch2
+	audio_header Music_SafariZone, Ch1, Ch2, Ch3
 
 Music_PkmnHealed::
-	audio Music_PkmnHealed, Ch0, Ch1, Ch2
+	audio_header Music_PkmnHealed, Ch1, Ch2, Ch3
 
 ; Routes 1 and 2
 Music_Routes1::
-	audio Music_Routes1, Ch0, Ch1, Ch2, Ch3
+	audio_header Music_Routes1, Ch1, Ch2, Ch3, Ch4
 
 ; Routes 24 and 25
 Music_Routes2::
-	audio Music_Routes2, Ch0, Ch1, Ch2, Ch3
+	audio_header Music_Routes2, Ch1, Ch2, Ch3, Ch4
 
 ; Routes 3, 4, 5, 6, 7, 8, 9, 10, 16, 17, 18, 19, 20, 21, 22
 Music_Routes3::
-	audio Music_Routes3, Ch0, Ch1, Ch2, Ch3
+	audio_header Music_Routes3, Ch1, Ch2, Ch3, Ch4
 
 ; Routes 11, 12, 13, 14, 15
 Music_Routes4::
-	audio Music_Routes4, Ch0, Ch1, Ch2, Ch3
+	audio_header Music_Routes4, Ch1, Ch2, Ch3, Ch4
 
 ; Route 23, Indigo Plateau
 Music_IndigoPlateau::
-	audio Music_IndigoPlateau, Ch0, Ch1, Ch2, Ch3
+	audio_header Music_IndigoPlateau, Ch1, Ch2, Ch3, Ch4
diff --git a/audio/headers/musicheaders2.asm b/audio/headers/musicheaders2.asm
index 45557420..d6cca9a9 100755
--- a/audio/headers/musicheaders2.asm
+++ b/audio/headers/musicheaders2.asm
@@ -1,20 +1,20 @@
 Music_GymLeaderBattle::
-	audio Music_GymLeaderBattle, Ch0, Ch1, Ch2
+	audio_header Music_GymLeaderBattle, Ch1, Ch2, Ch3
 
 Music_TrainerBattle::
-	audio Music_TrainerBattle, Ch0, Ch1, Ch2
+	audio_header Music_TrainerBattle, Ch1, Ch2, Ch3
 
 Music_WildBattle::
-	audio Music_WildBattle, Ch0, Ch1, Ch2
+	audio_header Music_WildBattle, Ch1, Ch2, Ch3
 
 Music_FinalBattle::
-	audio Music_FinalBattle, Ch0, Ch1, Ch2
+	audio_header Music_FinalBattle, Ch1, Ch2, Ch3
 
 Music_DefeatedTrainer::
-	audio Music_DefeatedTrainer, Ch0, Ch1, Ch2
+	audio_header Music_DefeatedTrainer, Ch1, Ch2, Ch3
 
 Music_DefeatedWildMon::
-	audio Music_DefeatedWildMon, Ch0, Ch1, Ch2
+	audio_header Music_DefeatedWildMon, Ch1, Ch2, Ch3
 
 Music_DefeatedGymLeader::
-	audio Music_DefeatedGymLeader, Ch0, Ch1, Ch2
+	audio_header Music_DefeatedGymLeader, Ch1, Ch2, Ch3
diff --git a/audio/headers/musicheaders3.asm b/audio/headers/musicheaders3.asm
index 03dd7777..ca21b419 100755
--- a/audio/headers/musicheaders3.asm
+++ b/audio/headers/musicheaders3.asm
@@ -1,56 +1,56 @@
 Music_TitleScreen::
-	audio Music_TitleScreen, Ch0, Ch1, Ch2, Ch3
+	audio_header Music_TitleScreen, Ch1, Ch2, Ch3, Ch4
 
 Music_Credits::
-	audio Music_Credits, Ch0, Ch1, Ch2
+	audio_header Music_Credits, Ch1, Ch2, Ch3
 
 Music_HallOfFame::
-	audio Music_HallOfFame, Ch0, Ch1, Ch2
+	audio_header Music_HallOfFame, Ch1, Ch2, Ch3
 
 Music_OaksLab::
-	audio Music_OaksLab, Ch0, Ch1, Ch2
+	audio_header Music_OaksLab, Ch1, Ch2, Ch3
 
 Music_JigglypuffSong::
-	audio Music_JigglypuffSong, Ch0, Ch1
+	audio_header Music_JigglypuffSong, Ch1, Ch2
 
 Music_BikeRiding::
-	audio Music_BikeRiding, Ch0, Ch1, Ch2, Ch3
+	audio_header Music_BikeRiding, Ch1, Ch2, Ch3, Ch4
 
 Music_Surfing::
-	audio Music_Surfing, Ch0, Ch1, Ch2
+	audio_header Music_Surfing, Ch1, Ch2, Ch3
 
 Music_GameCorner::
-	audio Music_GameCorner, Ch0, Ch1, Ch2
+	audio_header Music_GameCorner, Ch1, Ch2, Ch3
 
 Music_IntroBattle::
-	audio Music_IntroBattle, Ch0, Ch1, Ch2, Ch3
+	audio_header Music_IntroBattle, Ch1, Ch2, Ch3, Ch4
 
 ; Power Plant, Cerulean Cave, Rocket HQ
 Music_Dungeon1::
-	audio Music_Dungeon1, Ch0, Ch1, Ch2, Ch3
+	audio_header Music_Dungeon1, Ch1, Ch2, Ch3, Ch4
 
 ; Viridian Forest, Seafoam Islands
 Music_Dungeon2::
-	audio Music_Dungeon2, Ch0, Ch1, Ch2, Ch3
+	audio_header Music_Dungeon2, Ch1, Ch2, Ch3, Ch4
 
 ; Mt. Moon, Rock Tunnel, Victory Road
 Music_Dungeon3::
-	audio Music_Dungeon3, Ch0, Ch1, Ch2, Ch3
+	audio_header Music_Dungeon3, Ch1, Ch2, Ch3, Ch4
 
 Music_CinnabarMansion::
-	audio Music_CinnabarMansion, Ch0, Ch1, Ch2, Ch3
+	audio_header Music_CinnabarMansion, Ch1, Ch2, Ch3, Ch4
 
 Music_PokemonTower::
-	audio Music_PokemonTower, Ch0, Ch1, Ch2
+	audio_header Music_PokemonTower, Ch1, Ch2, Ch3
 
 Music_SilphCo::
-	audio Music_SilphCo, Ch0, Ch1, Ch2
+	audio_header Music_SilphCo, Ch1, Ch2, Ch3
 
 Music_MeetEvilTrainer::
-	audio Music_MeetEvilTrainer, Ch0, Ch1, Ch2
+	audio_header Music_MeetEvilTrainer, Ch1, Ch2, Ch3
 
 Music_MeetFemaleTrainer::
-	audio Music_MeetFemaleTrainer, Ch0, Ch1, Ch2
+	audio_header Music_MeetFemaleTrainer, Ch1, Ch2, Ch3
 
 Music_MeetMaleTrainer::
-	audio Music_MeetMaleTrainer, Ch0, Ch1, Ch2
+	audio_header Music_MeetMaleTrainer, Ch1, Ch2, Ch3
diff --git a/audio/headers/sfxheaders1.asm b/audio/headers/sfxheaders1.asm
index 72a69646..cc50dddd 100644
--- a/audio/headers/sfxheaders1.asm
+++ b/audio/headers/sfxheaders1.asm
@@ -2,287 +2,287 @@ SFX_Headers_1::
 	db $ff, $ff, $ff ; padding
 
 SFX_Snare1_1::
-	audio SFX_Snare1_1, Ch7
+	audio_header SFX_Snare1_1, Ch8
 
 SFX_Snare2_1::
-	audio SFX_Snare2_1, Ch7
+	audio_header SFX_Snare2_1, Ch8
 
 SFX_Snare3_1::
-	audio SFX_Snare3_1, Ch7
+	audio_header SFX_Snare3_1, Ch8
 
 SFX_Snare4_1::
-	audio SFX_Snare4_1, Ch7
+	audio_header SFX_Snare4_1, Ch8
 
 SFX_Snare5_1::
-	audio SFX_Snare5_1, Ch7
+	audio_header SFX_Snare5_1, Ch8
 
 SFX_Triangle1_1::
-	audio SFX_Triangle1_1, Ch7
+	audio_header SFX_Triangle1_1, Ch8
 
 SFX_Triangle2_1::
-	audio SFX_Triangle2_1, Ch7
+	audio_header SFX_Triangle2_1, Ch8
 
 SFX_Snare6_1::
-	audio SFX_Snare6_1, Ch7
+	audio_header SFX_Snare6_1, Ch8
 
 SFX_Snare7_1::
-	audio SFX_Snare7_1, Ch7
+	audio_header SFX_Snare7_1, Ch8
 
 SFX_Snare8_1::
-	audio SFX_Snare8_1, Ch7
+	audio_header SFX_Snare8_1, Ch8
 
 SFX_Snare9_1::
-	audio SFX_Snare9_1, Ch7
+	audio_header SFX_Snare9_1, Ch8
 
 SFX_Cymbal1_1::
-	audio SFX_Cymbal1_1, Ch7
+	audio_header SFX_Cymbal1_1, Ch8
 
 SFX_Cymbal2_1::
-	audio SFX_Cymbal2_1, Ch7
+	audio_header SFX_Cymbal2_1, Ch8
 
 SFX_Cymbal3_1::
-	audio SFX_Cymbal3_1, Ch7
+	audio_header SFX_Cymbal3_1, Ch8
 
 SFX_Muted_Snare1_1::
-	audio SFX_Muted_Snare1_1, Ch7
+	audio_header SFX_Muted_Snare1_1, Ch8
 
 SFX_Triangle3_1::
-	audio SFX_Triangle3_1, Ch7
+	audio_header SFX_Triangle3_1, Ch8
 
 SFX_Muted_Snare2_1::
-	audio SFX_Muted_Snare2_1, Ch7
+	audio_header SFX_Muted_Snare2_1, Ch8
 
 SFX_Muted_Snare3_1::
-	audio SFX_Muted_Snare3_1, Ch7
+	audio_header SFX_Muted_Snare3_1, Ch8
 
 SFX_Muted_Snare4_1::
-	audio SFX_Muted_Snare4_1, Ch7
+	audio_header SFX_Muted_Snare4_1, Ch8
 
 SFX_Cry00_1::
-	audio SFX_Cry00_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry00_1, Ch5, Ch6, Ch8
 
 SFX_Cry01_1::
-	audio SFX_Cry01_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry01_1, Ch5, Ch6, Ch8
 
 SFX_Cry02_1::
-	audio SFX_Cry02_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry02_1, Ch5, Ch6, Ch8
 
 SFX_Cry03_1::
-	audio SFX_Cry03_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry03_1, Ch5, Ch6, Ch8
 
 SFX_Cry04_1::
-	audio SFX_Cry04_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry04_1, Ch5, Ch6, Ch8
 
 SFX_Cry05_1::
-	audio SFX_Cry05_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry05_1, Ch5, Ch6, Ch8
 
 SFX_Cry06_1::
-	audio SFX_Cry06_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry06_1, Ch5, Ch6, Ch8
 
 SFX_Cry07_1::
-	audio SFX_Cry07_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry07_1, Ch5, Ch6, Ch8
 
 SFX_Cry08_1::
-	audio SFX_Cry08_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry08_1, Ch5, Ch6, Ch8
 
 SFX_Cry09_1::
-	audio SFX_Cry09_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry09_1, Ch5, Ch6, Ch8
 
 SFX_Cry0A_1::
-	audio SFX_Cry0A_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry0A_1, Ch5, Ch6, Ch8
 
 SFX_Cry0B_1::
-	audio SFX_Cry0B_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry0B_1, Ch5, Ch6, Ch8
 
 SFX_Cry0C_1::
-	audio SFX_Cry0C_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry0C_1, Ch5, Ch6, Ch8
 
 SFX_Cry0D_1::
-	audio SFX_Cry0D_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry0D_1, Ch5, Ch6, Ch8
 
 SFX_Cry0E_1::
-	audio SFX_Cry0E_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry0E_1, Ch5, Ch6, Ch8
 
 SFX_Cry0F_1::
-	audio SFX_Cry0F_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry0F_1, Ch5, Ch6, Ch8
 
 SFX_Cry10_1::
-	audio SFX_Cry10_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry10_1, Ch5, Ch6, Ch8
 
 SFX_Cry11_1::
-	audio SFX_Cry11_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry11_1, Ch5, Ch6, Ch8
 
 SFX_Cry12_1::
-	audio SFX_Cry12_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry12_1, Ch5, Ch6, Ch8
 
 SFX_Cry13_1::
-	audio SFX_Cry13_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry13_1, Ch5, Ch6, Ch8
 
 SFX_Cry14_1::
-	audio SFX_Cry14_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry14_1, Ch5, Ch6, Ch8
 
 SFX_Cry15_1::
-	audio SFX_Cry15_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry15_1, Ch5, Ch6, Ch8
 
 SFX_Cry16_1::
-	audio SFX_Cry16_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry16_1, Ch5, Ch6, Ch8
 
 SFX_Cry17_1::
-	audio SFX_Cry17_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry17_1, Ch5, Ch6, Ch8
 
 SFX_Cry18_1::
-	audio SFX_Cry18_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry18_1, Ch5, Ch6, Ch8
 
 SFX_Cry19_1::
-	audio SFX_Cry19_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry19_1, Ch5, Ch6, Ch8
 
 SFX_Cry1A_1::
-	audio SFX_Cry1A_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry1A_1, Ch5, Ch6, Ch8
 
 SFX_Cry1B_1::
-	audio SFX_Cry1B_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry1B_1, Ch5, Ch6, Ch8
 
 SFX_Cry1C_1::
-	audio SFX_Cry1C_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry1C_1, Ch5, Ch6, Ch8
 
 SFX_Cry1D_1::
-	audio SFX_Cry1D_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry1D_1, Ch5, Ch6, Ch8
 
 SFX_Cry1E_1::
-	audio SFX_Cry1E_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry1E_1, Ch5, Ch6, Ch8
 
 SFX_Cry1F_1::
-	audio SFX_Cry1F_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry1F_1, Ch5, Ch6, Ch8
 
 SFX_Cry20_1::
-	audio SFX_Cry20_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry20_1, Ch5, Ch6, Ch8
 
 SFX_Cry21_1::
-	audio SFX_Cry21_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry21_1, Ch5, Ch6, Ch8
 
 SFX_Cry22_1::
-	audio SFX_Cry22_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry22_1, Ch5, Ch6, Ch8
 
 SFX_Cry23_1::
-	audio SFX_Cry23_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry23_1, Ch5, Ch6, Ch8
 
 SFX_Cry24_1::
-	audio SFX_Cry24_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry24_1, Ch5, Ch6, Ch8
 
 SFX_Cry25_1::
-	audio SFX_Cry25_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry25_1, Ch5, Ch6, Ch8
 
 SFX_Get_Item1_1::
-	audio SFX_Get_Item1_1, Ch4, Ch5, Ch6
+	audio_header SFX_Get_Item1_1, Ch5, Ch6, Ch7
 
 SFX_Get_Item2_1::
-	audio SFX_Get_Item2_1, Ch4, Ch5, Ch6
+	audio_header SFX_Get_Item2_1, Ch5, Ch6, Ch7
 
 SFX_Tink_1::
-	audio SFX_Tink_1, Ch4
+	audio_header SFX_Tink_1, Ch5
 
 SFX_Heal_HP_1::
-	audio SFX_Heal_HP_1, Ch4
+	audio_header SFX_Heal_HP_1, Ch5
 
 SFX_Heal_Ailment_1::
-	audio SFX_Heal_Ailment_1, Ch4
+	audio_header SFX_Heal_Ailment_1, Ch5
 
 SFX_Start_Menu_1::
-	audio SFX_Start_Menu_1, Ch7
+	audio_header SFX_Start_Menu_1, Ch8
 
 SFX_Press_AB_1::
-	audio SFX_Press_AB_1, Ch4
+	audio_header SFX_Press_AB_1, Ch5
 
 SFX_Pokedex_Rating_1::
-	audio SFX_Pokedex_Rating_1, Ch4, Ch5, Ch6
+	audio_header SFX_Pokedex_Rating_1, Ch5, Ch6, Ch7
 
 SFX_Get_Key_Item_1::
-	audio SFX_Get_Key_Item_1, Ch4, Ch5, Ch6
+	audio_header SFX_Get_Key_Item_1, Ch5, Ch6, Ch7
 
 SFX_Poisoned_1::
-	audio SFX_Poisoned_1, Ch4
+	audio_header SFX_Poisoned_1, Ch5
 
 SFX_Trade_Machine_1::
-	audio SFX_Trade_Machine_1, Ch4
+	audio_header SFX_Trade_Machine_1, Ch5
 
 SFX_Turn_On_PC_1::
-	audio SFX_Turn_On_PC_1, Ch4
+	audio_header SFX_Turn_On_PC_1, Ch5
 
 SFX_Turn_Off_PC_1::
-	audio SFX_Turn_Off_PC_1, Ch4
+	audio_header SFX_Turn_Off_PC_1, Ch5
 
 SFX_Enter_PC_1::
-	audio SFX_Enter_PC_1, Ch4
+	audio_header SFX_Enter_PC_1, Ch5
 
 SFX_Shrink_1::
-	audio SFX_Shrink_1, Ch4
+	audio_header SFX_Shrink_1, Ch5
 
 SFX_Switch_1::
-	audio SFX_Switch_1, Ch4
+	audio_header SFX_Switch_1, Ch5
 
 SFX_Healing_Machine_1::
-	audio SFX_Healing_Machine_1, Ch4
+	audio_header SFX_Healing_Machine_1, Ch5
 
 SFX_Teleport_Exit1_1::
-	audio SFX_Teleport_Exit1_1, Ch4
+	audio_header SFX_Teleport_Exit1_1, Ch5
 
 SFX_Teleport_Enter1_1::
-	audio SFX_Teleport_Enter1_1, Ch4
+	audio_header SFX_Teleport_Enter1_1, Ch5
 
 SFX_Teleport_Exit2_1::
-	audio SFX_Teleport_Exit2_1, Ch4
+	audio_header SFX_Teleport_Exit2_1, Ch5
 
 SFX_Ledge_1::
-	audio SFX_Ledge_1, Ch4
+	audio_header SFX_Ledge_1, Ch5
 
 SFX_Teleport_Enter2_1::
-	audio SFX_Teleport_Enter2_1, Ch7
+	audio_header SFX_Teleport_Enter2_1, Ch8
 
 SFX_Fly_1::
-	audio SFX_Fly_1, Ch7
+	audio_header SFX_Fly_1, Ch8
 
 SFX_Denied_1::
-	audio SFX_Denied_1, Ch4, Ch5
+	audio_header SFX_Denied_1, Ch5, Ch6
 
 SFX_Arrow_Tiles_1::
-	audio SFX_Arrow_Tiles_1, Ch4
+	audio_header SFX_Arrow_Tiles_1, Ch5
 
 SFX_Push_Boulder_1::
-	audio SFX_Push_Boulder_1, Ch7
+	audio_header SFX_Push_Boulder_1, Ch8
 
 SFX_SS_Anne_Horn_1::
-	audio SFX_SS_Anne_Horn_1, Ch4, Ch5
+	audio_header SFX_SS_Anne_Horn_1, Ch5, Ch6
 
 SFX_Withdraw_Deposit_1::
-	audio SFX_Withdraw_Deposit_1, Ch4
+	audio_header SFX_Withdraw_Deposit_1, Ch5
 
 SFX_Cut_1::
-	audio SFX_Cut_1, Ch7
+	audio_header SFX_Cut_1, Ch8
 
 SFX_Go_Inside_1::
-	audio SFX_Go_Inside_1, Ch7
+	audio_header SFX_Go_Inside_1, Ch8
 
 SFX_Swap_1::
-	audio SFX_Swap_1, Ch4, Ch5
+	audio_header SFX_Swap_1, Ch5, Ch6
 
 SFX_59_1::
-	audio SFX_59_1, Ch4, Ch5
+	audio_header SFX_59_1, Ch5, Ch6
 
 SFX_Purchase_1::
-	audio SFX_Purchase_1, Ch4, Ch5
+	audio_header SFX_Purchase_1, Ch5, Ch6
 
 SFX_Collision_1::
-	audio SFX_Collision_1, Ch4
+	audio_header SFX_Collision_1, Ch5
 
 SFX_Go_Outside_1::
-	audio SFX_Go_Outside_1, Ch7
+	audio_header SFX_Go_Outside_1, Ch8
 
 SFX_Save_1::
-	audio SFX_Save_1, Ch4, Ch5
+	audio_header SFX_Save_1, Ch5, Ch6
 
-; the Pokeflute sound effect directly hijacks channel 2
+; the Pokeflute sound effect directly hijacks channel 3
 SFX_Pokeflute::
-	audio SFX_Pokeflute, Ch2
+	audio_header SFX_Pokeflute, Ch3
 
 SFX_Safari_Zone_PA::
-	audio SFX_Safari_Zone_PA, Ch4
+	audio_header SFX_Safari_Zone_PA, Ch5
diff --git a/audio/headers/sfxheaders2.asm b/audio/headers/sfxheaders2.asm
index b96a764f..7e76325d 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::
-	audio SFX_Snare1_2, Ch7
+	audio_header SFX_Snare1_2, Ch8
 
 SFX_Snare2_2::
-	audio SFX_Snare2_2, Ch7
+	audio_header SFX_Snare2_2, Ch8
 
 SFX_Snare3_2::
-	audio SFX_Snare3_2, Ch7
+	audio_header SFX_Snare3_2, Ch8
 
 SFX_Snare4_2::
-	audio SFX_Snare4_2, Ch7
+	audio_header SFX_Snare4_2, Ch8
 
 SFX_Snare5_2::
-	audio SFX_Snare5_2, Ch7
+	audio_header SFX_Snare5_2, Ch8
 
 SFX_Triangle1_2::
-	audio SFX_Triangle1_2, Ch7
+	audio_header SFX_Triangle1_2, Ch8
 
 SFX_Triangle2_2::
-	audio SFX_Triangle2_2, Ch7
+	audio_header SFX_Triangle2_2, Ch8
 
 SFX_Snare6_2::
-	audio SFX_Snare6_2, Ch7
+	audio_header SFX_Snare6_2, Ch8
 
 SFX_Snare7_2::
-	audio SFX_Snare7_2, Ch7
+	audio_header SFX_Snare7_2, Ch8
 
 SFX_Snare8_2::
-	audio SFX_Snare8_2, Ch7
+	audio_header SFX_Snare8_2, Ch8
 
 SFX_Snare9_2::
-	audio SFX_Snare9_2, Ch7
+	audio_header SFX_Snare9_2, Ch8
 
 SFX_Cymbal1_2::
-	audio SFX_Cymbal1_2, Ch7
+	audio_header SFX_Cymbal1_2, Ch8
 
 SFX_Cymbal2_2::
-	audio SFX_Cymbal2_2, Ch7
+	audio_header SFX_Cymbal2_2, Ch8
 
 SFX_Cymbal3_2::
-	audio SFX_Cymbal3_2, Ch7
+	audio_header SFX_Cymbal3_2, Ch8
 
 SFX_Muted_Snare1_2::
-	audio SFX_Muted_Snare1_2, Ch7
+	audio_header SFX_Muted_Snare1_2, Ch8
 
 SFX_Triangle3_2::
-	audio SFX_Triangle3_2, Ch7
+	audio_header SFX_Triangle3_2, Ch8
 
 SFX_Muted_Snare2_2::
-	audio SFX_Muted_Snare2_2, Ch7
+	audio_header SFX_Muted_Snare2_2, Ch8
 
 SFX_Muted_Snare3_2::
-	audio SFX_Muted_Snare3_2, Ch7
+	audio_header SFX_Muted_Snare3_2, Ch8
 
 SFX_Muted_Snare4_2::
-	audio SFX_Muted_Snare4_2, Ch7
+	audio_header SFX_Muted_Snare4_2, Ch8
 
 SFX_Cry00_2::
-	audio SFX_Cry00_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry00_2, Ch5, Ch6, Ch8
 
 SFX_Cry01_2::
-	audio SFX_Cry01_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry01_2, Ch5, Ch6, Ch8
 
 SFX_Cry02_2::
-	audio SFX_Cry02_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry02_2, Ch5, Ch6, Ch8
 
 SFX_Cry03_2::
-	audio SFX_Cry03_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry03_2, Ch5, Ch6, Ch8
 
 SFX_Cry04_2::
-	audio SFX_Cry04_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry04_2, Ch5, Ch6, Ch8
 
 SFX_Cry05_2::
-	audio SFX_Cry05_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry05_2, Ch5, Ch6, Ch8
 
 SFX_Cry06_2::
-	audio SFX_Cry06_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry06_2, Ch5, Ch6, Ch8
 
 SFX_Cry07_2::
-	audio SFX_Cry07_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry07_2, Ch5, Ch6, Ch8
 
 SFX_Cry08_2::
-	audio SFX_Cry08_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry08_2, Ch5, Ch6, Ch8
 
 SFX_Cry09_2::
-	audio SFX_Cry09_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry09_2, Ch5, Ch6, Ch8
 
 SFX_Cry0A_2::
-	audio SFX_Cry0A_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry0A_2, Ch5, Ch6, Ch8
 
 SFX_Cry0B_2::
-	audio SFX_Cry0B_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry0B_2, Ch5, Ch6, Ch8
 
 SFX_Cry0C_2::
-	audio SFX_Cry0C_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry0C_2, Ch5, Ch6, Ch8
 
 SFX_Cry0D_2::
-	audio SFX_Cry0D_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry0D_2, Ch5, Ch6, Ch8
 
 SFX_Cry0E_2::
-	audio SFX_Cry0E_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry0E_2, Ch5, Ch6, Ch8
 
 SFX_Cry0F_2::
-	audio SFX_Cry0F_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry0F_2, Ch5, Ch6, Ch8
 
 SFX_Cry10_2::
-	audio SFX_Cry10_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry10_2, Ch5, Ch6, Ch8
 
 SFX_Cry11_2::
-	audio SFX_Cry11_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry11_2, Ch5, Ch6, Ch8
 
 SFX_Cry12_2::
-	audio SFX_Cry12_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry12_2, Ch5, Ch6, Ch8
 
 SFX_Cry13_2::
-	audio SFX_Cry13_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry13_2, Ch5, Ch6, Ch8
 
 SFX_Cry14_2::
-	audio SFX_Cry14_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry14_2, Ch5, Ch6, Ch8
 
 SFX_Cry15_2::
-	audio SFX_Cry15_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry15_2, Ch5, Ch6, Ch8
 
 SFX_Cry16_2::
-	audio SFX_Cry16_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry16_2, Ch5, Ch6, Ch8
 
 SFX_Cry17_2::
-	audio SFX_Cry17_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry17_2, Ch5, Ch6, Ch8
 
 SFX_Cry18_2::
-	audio SFX_Cry18_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry18_2, Ch5, Ch6, Ch8
 
 SFX_Cry19_2::
-	audio SFX_Cry19_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry19_2, Ch5, Ch6, Ch8
 
 SFX_Cry1A_2::
-	audio SFX_Cry1A_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry1A_2, Ch5, Ch6, Ch8
 
 SFX_Cry1B_2::
-	audio SFX_Cry1B_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry1B_2, Ch5, Ch6, Ch8
 
 SFX_Cry1C_2::
-	audio SFX_Cry1C_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry1C_2, Ch5, Ch6, Ch8
 
 SFX_Cry1D_2::
-	audio SFX_Cry1D_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry1D_2, Ch5, Ch6, Ch8
 
 SFX_Cry1E_2::
-	audio SFX_Cry1E_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry1E_2, Ch5, Ch6, Ch8
 
 SFX_Cry1F_2::
-	audio SFX_Cry1F_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry1F_2, Ch5, Ch6, Ch8
 
 SFX_Cry20_2::
-	audio SFX_Cry20_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry20_2, Ch5, Ch6, Ch8
 
 SFX_Cry21_2::
-	audio SFX_Cry21_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry21_2, Ch5, Ch6, Ch8
 
 SFX_Cry22_2::
-	audio SFX_Cry22_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry22_2, Ch5, Ch6, Ch8
 
 SFX_Cry23_2::
-	audio SFX_Cry23_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry23_2, Ch5, Ch6, Ch8
 
 SFX_Cry24_2::
-	audio SFX_Cry24_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry24_2, Ch5, Ch6, Ch8
 
 SFX_Cry25_2::
-	audio SFX_Cry25_2, Ch4, Ch5, Ch7
+	audio_header SFX_Cry25_2, Ch5, Ch6, Ch8
 
 SFX_Level_Up::
-	audio SFX_Level_Up, Ch4, Ch5, Ch6
+	audio_header SFX_Level_Up, Ch5, Ch6, Ch7
 
 SFX_Get_Item2_2::
-	audio SFX_Get_Item2_2, Ch4, Ch5, Ch6
+	audio_header SFX_Get_Item2_2, Ch5, Ch6, Ch7
 
 SFX_Tink_2::
-	audio SFX_Tink_2, Ch4
+	audio_header SFX_Tink_2, Ch5
 
 SFX_Heal_HP_2::
-	audio SFX_Heal_HP_2, Ch4
+	audio_header SFX_Heal_HP_2, Ch5
 
 SFX_Heal_Ailment_2::
-	audio SFX_Heal_Ailment_2, Ch4
+	audio_header SFX_Heal_Ailment_2, Ch5
 
 SFX_Start_Menu_2::
-	audio SFX_Start_Menu_2, Ch7
+	audio_header SFX_Start_Menu_2, Ch8
 
 SFX_Press_AB_2::
-	audio SFX_Press_AB_2, Ch4
+	audio_header SFX_Press_AB_2, Ch5
 
 SFX_Ball_Toss::
-	audio SFX_Ball_Toss, Ch4, Ch5
+	audio_header SFX_Ball_Toss, Ch5, Ch6
 
 SFX_Ball_Poof::
-	audio SFX_Ball_Poof, Ch4, Ch7
+	audio_header SFX_Ball_Poof, Ch5, Ch8
 
 SFX_Faint_Thud::
-	audio SFX_Faint_Thud, Ch4, Ch7
+	audio_header SFX_Faint_Thud, Ch5, Ch8
 
 SFX_Run::
-	audio SFX_Run, Ch7
+	audio_header SFX_Run, Ch8
 
 SFX_Dex_Page_Added::
-	audio SFX_Dex_Page_Added, Ch4, Ch5
+	audio_header SFX_Dex_Page_Added, Ch5, Ch6
 
 SFX_Caught_Mon::
-	audio SFX_Caught_Mon, Ch4, Ch5, Ch6
+	audio_header SFX_Caught_Mon, Ch5, Ch6, Ch7
 
 SFX_Peck::
-	audio SFX_Peck, Ch7
+	audio_header SFX_Peck, Ch8
 
 SFX_Faint_Fall::
-	audio SFX_Faint_Fall, Ch4
+	audio_header SFX_Faint_Fall, Ch5
 
 SFX_Battle_09::
-	audio SFX_Battle_09, Ch4
+	audio_header SFX_Battle_09, Ch5
 
 SFX_Pound::
-	audio SFX_Pound, Ch7
+	audio_header SFX_Pound, Ch8
 
 SFX_Battle_0B::
-	audio SFX_Battle_0B, Ch7
+	audio_header SFX_Battle_0B, Ch8
 
 SFX_Battle_0C::
-	audio SFX_Battle_0C, Ch7
+	audio_header SFX_Battle_0C, Ch8
 
 SFX_Battle_0D::
-	audio SFX_Battle_0D, Ch7
+	audio_header SFX_Battle_0D, Ch8
 
 SFX_Battle_0E::
-	audio SFX_Battle_0E, Ch7
+	audio_header SFX_Battle_0E, Ch8
 
 SFX_Battle_0F::
-	audio SFX_Battle_0F, Ch7
+	audio_header SFX_Battle_0F, Ch8
 
 SFX_Damage::
-	audio SFX_Damage, Ch7
+	audio_header SFX_Damage, Ch8
 
 SFX_Not_Very_Effective::
-	audio SFX_Not_Very_Effective, Ch7
+	audio_header SFX_Not_Very_Effective, Ch8
 
 SFX_Battle_12::
-	audio SFX_Battle_12, Ch7
+	audio_header SFX_Battle_12, Ch8
 
 SFX_Battle_13::
-	audio SFX_Battle_13, Ch7
+	audio_header SFX_Battle_13, Ch8
 
 SFX_Battle_14::
-	audio SFX_Battle_14, Ch7
+	audio_header SFX_Battle_14, Ch8
 
 SFX_Vine_Whip::
-	audio SFX_Vine_Whip, Ch7
+	audio_header SFX_Vine_Whip, Ch8
 
 SFX_Battle_16::
-	audio SFX_Battle_16, Ch7
+	audio_header SFX_Battle_16, Ch8
 
 SFX_Battle_17::
-	audio SFX_Battle_17, Ch7
+	audio_header SFX_Battle_17, Ch8
 
 SFX_Battle_18::
-	audio SFX_Battle_18, Ch7
+	audio_header SFX_Battle_18, Ch8
 
 SFX_Battle_19::
-	audio SFX_Battle_19, Ch7
+	audio_header SFX_Battle_19, Ch8
 
 SFX_Super_Effective::
-	audio SFX_Super_Effective, Ch7
+	audio_header SFX_Super_Effective, Ch8
 
 SFX_Battle_1B::
-	audio SFX_Battle_1B, Ch7
+	audio_header SFX_Battle_1B, Ch8
 
 SFX_Battle_1C::
-	audio SFX_Battle_1C, Ch7
+	audio_header SFX_Battle_1C, Ch8
 
 SFX_Doubleslap::
-	audio SFX_Doubleslap, Ch7
+	audio_header SFX_Doubleslap, Ch8
 
 SFX_Battle_1E::
-	audio SFX_Battle_1E, Ch4, Ch7
+	audio_header SFX_Battle_1E, Ch5, Ch8
 
 SFX_Horn_Drill::
-	audio SFX_Horn_Drill, Ch7
+	audio_header SFX_Horn_Drill, Ch8
 
 SFX_Battle_20::
-	audio SFX_Battle_20, Ch7
+	audio_header SFX_Battle_20, Ch8
 
 SFX_Battle_21::
-	audio SFX_Battle_21, Ch7
+	audio_header SFX_Battle_21, Ch8
 
 SFX_Battle_22::
-	audio SFX_Battle_22, Ch7
+	audio_header SFX_Battle_22, Ch8
 
 SFX_Battle_23::
-	audio SFX_Battle_23, Ch7
+	audio_header SFX_Battle_23, Ch8
 
 SFX_Battle_24::
-	audio SFX_Battle_24, Ch4, Ch7
+	audio_header SFX_Battle_24, Ch5, Ch8
 
 SFX_Battle_25::
-	audio SFX_Battle_25, Ch7
+	audio_header SFX_Battle_25, Ch8
 
 SFX_Battle_26::
-	audio SFX_Battle_26, Ch7
+	audio_header SFX_Battle_26, Ch8
 
 SFX_Battle_27::
-	audio SFX_Battle_27, Ch4, Ch5, Ch7
+	audio_header SFX_Battle_27, Ch5, Ch6, Ch8
 
 SFX_Battle_28::
-	audio SFX_Battle_28, Ch4, Ch5, Ch7
+	audio_header SFX_Battle_28, Ch5, Ch6, Ch8
 
 SFX_Battle_29::
-	audio SFX_Battle_29, Ch4, Ch7
+	audio_header SFX_Battle_29, Ch5, Ch8
 
 SFX_Battle_2A::
-	audio SFX_Battle_2A, Ch4, Ch5, Ch7
+	audio_header SFX_Battle_2A, Ch5, Ch6, Ch8
 
 SFX_Battle_2B::
-	audio SFX_Battle_2B, Ch4, Ch7
+	audio_header SFX_Battle_2B, Ch5, Ch8
 
 SFX_Battle_2C::
-	audio SFX_Battle_2C, Ch4, Ch5, Ch7
+	audio_header SFX_Battle_2C, Ch5, Ch6, Ch8
 
 SFX_Psybeam::
-	audio SFX_Psybeam, Ch4, Ch5, Ch7
+	audio_header SFX_Psybeam, Ch5, Ch6, Ch8
 
 SFX_Battle_2E::
-	audio SFX_Battle_2E, Ch4, Ch5, Ch7
+	audio_header SFX_Battle_2E, Ch5, Ch6, Ch8
 
 SFX_Battle_2F::
-	audio SFX_Battle_2F, Ch4, Ch5, Ch7
+	audio_header SFX_Battle_2F, Ch5, Ch6, Ch8
 
 SFX_Psychic_M::
-	audio SFX_Psychic_M, Ch4, Ch5, Ch7
+	audio_header SFX_Psychic_M, Ch5, Ch6, Ch8
 
 SFX_Battle_31::
-	audio SFX_Battle_31, Ch4, Ch5
+	audio_header SFX_Battle_31, Ch5, Ch6
 
 SFX_Battle_32::
-	audio SFX_Battle_32, Ch4, Ch5
+	audio_header SFX_Battle_32, Ch5, Ch6
 
 SFX_Battle_33::
-	audio SFX_Battle_33, Ch4, Ch5
+	audio_header SFX_Battle_33, Ch5, Ch6
 
 SFX_Battle_34::
-	audio SFX_Battle_34, Ch4, Ch5, Ch7
+	audio_header SFX_Battle_34, Ch5, Ch6, Ch8
 
 SFX_Battle_35::
-	audio SFX_Battle_35, Ch4, Ch5
+	audio_header SFX_Battle_35, Ch5, Ch6
 
 SFX_Battle_36::
-	audio SFX_Battle_36, Ch4, Ch5, Ch7
+	audio_header SFX_Battle_36, Ch5, Ch6, Ch8
 
 SFX_Silph_Scope::
-	audio SFX_Silph_Scope, Ch4
+	audio_header SFX_Silph_Scope, Ch5
diff --git a/audio/headers/sfxheaders3.asm b/audio/headers/sfxheaders3.asm
index 19a19272..6fb67546 100644
--- a/audio/headers/sfxheaders3.asm
+++ b/audio/headers/sfxheaders3.asm
@@ -2,310 +2,310 @@ SFX_Headers_3::
 	db $ff, $ff, $ff ; padding
 
 SFX_Snare1_3::
-	audio SFX_Snare1_3, Ch7
+	audio_header SFX_Snare1_3, Ch8
 
 SFX_Snare2_3::
-	audio SFX_Snare2_3, Ch7
+	audio_header SFX_Snare2_3, Ch8
 
 SFX_Snare3_3::
-	audio SFX_Snare3_3, Ch7
+	audio_header SFX_Snare3_3, Ch8
 
 SFX_Snare4_3::
-	audio SFX_Snare4_3, Ch7
+	audio_header SFX_Snare4_3, Ch8
 
 SFX_Snare5_3::
-	audio SFX_Snare5_3, Ch7
+	audio_header SFX_Snare5_3, Ch8
 
 SFX_Triangle1_3::
-	audio SFX_Triangle1_3, Ch7
+	audio_header SFX_Triangle1_3, Ch8
 
 SFX_Triangle2_3::
-	audio SFX_Triangle2_3, Ch7
+	audio_header SFX_Triangle2_3, Ch8
 
 SFX_Snare6_3::
-	audio SFX_Snare6_3, Ch7
+	audio_header SFX_Snare6_3, Ch8
 
 SFX_Snare7_3::
-	audio SFX_Snare7_3, Ch7
+	audio_header SFX_Snare7_3, Ch8
 
 SFX_Snare8_3::
-	audio SFX_Snare8_3, Ch7
+	audio_header SFX_Snare8_3, Ch8
 
 SFX_Snare9_3::
-	audio SFX_Snare9_3, Ch7
+	audio_header SFX_Snare9_3, Ch8
 
 SFX_Cymbal1_3::
-	audio SFX_Cymbal1_3, Ch7
+	audio_header SFX_Cymbal1_3, Ch8
 
 SFX_Cymbal2_3::
-	audio SFX_Cymbal2_3, Ch7
+	audio_header SFX_Cymbal2_3, Ch8
 
 SFX_Cymbal3_3::
-	audio SFX_Cymbal3_3, Ch7
+	audio_header SFX_Cymbal3_3, Ch8
 
 SFX_Muted_Snare1_3::
-	audio SFX_Muted_Snare1_3, Ch7
+	audio_header SFX_Muted_Snare1_3, Ch8
 
 SFX_Triangle3_3::
-	audio SFX_Triangle3_3, Ch7
+	audio_header SFX_Triangle3_3, Ch8
 
 SFX_Muted_Snare2_3::
-	audio SFX_Muted_Snare2_3, Ch7
+	audio_header SFX_Muted_Snare2_3, Ch8
 
 SFX_Muted_Snare3_3::
-	audio SFX_Muted_Snare3_3, Ch7
+	audio_header SFX_Muted_Snare3_3, Ch8
 
 SFX_Muted_Snare4_3::
-	audio SFX_Muted_Snare4_3, Ch7
+	audio_header SFX_Muted_Snare4_3, Ch8
 
 SFX_Cry00_3::
-	audio SFX_Cry00_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry00_3, Ch5, Ch6, Ch8
 
 SFX_Cry01_3::
-	audio SFX_Cry01_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry01_3, Ch5, Ch6, Ch8
 
 SFX_Cry02_3::
-	audio SFX_Cry02_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry02_3, Ch5, Ch6, Ch8
 
 SFX_Cry03_3::
-	audio SFX_Cry03_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry03_3, Ch5, Ch6, Ch8
 
 SFX_Cry04_3::
-	audio SFX_Cry04_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry04_3, Ch5, Ch6, Ch8
 
 SFX_Cry05_3::
-	audio SFX_Cry05_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry05_3, Ch5, Ch6, Ch8
 
 SFX_Cry06_3::
-	audio SFX_Cry06_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry06_3, Ch5, Ch6, Ch8
 
 SFX_Cry07_3::
-	audio SFX_Cry07_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry07_3, Ch5, Ch6, Ch8
 
 SFX_Cry08_3::
-	audio SFX_Cry08_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry08_3, Ch5, Ch6, Ch8
 
 SFX_Cry09_3::
-	audio SFX_Cry09_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry09_3, Ch5, Ch6, Ch8
 
 SFX_Cry0A_3::
-	audio SFX_Cry0A_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry0A_3, Ch5, Ch6, Ch8
 
 SFX_Cry0B_3::
-	audio SFX_Cry0B_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry0B_3, Ch5, Ch6, Ch8
 
 SFX_Cry0C_3::
-	audio SFX_Cry0C_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry0C_3, Ch5, Ch6, Ch8
 
 SFX_Cry0D_3::
-	audio SFX_Cry0D_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry0D_3, Ch5, Ch6, Ch8
 
 SFX_Cry0E_3::
-	audio SFX_Cry0E_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry0E_3, Ch5, Ch6, Ch8
 
 SFX_Cry0F_3::
-	audio SFX_Cry0F_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry0F_3, Ch5, Ch6, Ch8
 
 SFX_Cry10_3::
-	audio SFX_Cry10_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry10_3, Ch5, Ch6, Ch8
 
 SFX_Cry11_3::
-	audio SFX_Cry11_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry11_3, Ch5, Ch6, Ch8
 
 SFX_Cry12_3::
-	audio SFX_Cry12_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry12_3, Ch5, Ch6, Ch8
 
 SFX_Cry13_3::
-	audio SFX_Cry13_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry13_3, Ch5, Ch6, Ch8
 
 SFX_Cry14_3::
-	audio SFX_Cry14_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry14_3, Ch5, Ch6, Ch8
 
 SFX_Cry15_3::
-	audio SFX_Cry15_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry15_3, Ch5, Ch6, Ch8
 
 SFX_Cry16_3::
-	audio SFX_Cry16_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry16_3, Ch5, Ch6, Ch8
 
 SFX_Cry17_3::
-	audio SFX_Cry17_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry17_3, Ch5, Ch6, Ch8
 
 SFX_Cry18_3::
-	audio SFX_Cry18_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry18_3, Ch5, Ch6, Ch8
 
 SFX_Cry19_3::
-	audio SFX_Cry19_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry19_3, Ch5, Ch6, Ch8
 
 SFX_Cry1A_3::
-	audio SFX_Cry1A_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry1A_3, Ch5, Ch6, Ch8
 
 SFX_Cry1B_3::
-	audio SFX_Cry1B_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry1B_3, Ch5, Ch6, Ch8
 
 SFX_Cry1C_3::
-	audio SFX_Cry1C_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry1C_3, Ch5, Ch6, Ch8
 
 SFX_Cry1D_3::
-	audio SFX_Cry1D_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry1D_3, Ch5, Ch6, Ch8
 
 SFX_Cry1E_3::
-	audio SFX_Cry1E_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry1E_3, Ch5, Ch6, Ch8
 
 SFX_Cry1F_3::
-	audio SFX_Cry1F_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry1F_3, Ch5, Ch6, Ch8
 
 SFX_Cry20_3::
-	audio SFX_Cry20_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry20_3, Ch5, Ch6, Ch8
 
 SFX_Cry21_3::
-	audio SFX_Cry21_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry21_3, Ch5, Ch6, Ch8
 
 SFX_Cry22_3::
-	audio SFX_Cry22_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry22_3, Ch5, Ch6, Ch8
 
 SFX_Cry23_3::
-	audio SFX_Cry23_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry23_3, Ch5, Ch6, Ch8
 
 SFX_Cry24_3::
-	audio SFX_Cry24_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry24_3, Ch5, Ch6, Ch8
 
 SFX_Cry25_3::
-	audio SFX_Cry25_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry25_3, Ch5, Ch6, Ch8
 
 SFX_Get_Item1_3::
-	audio SFX_Get_Item1_3, Ch4, Ch5, Ch6
+	audio_header SFX_Get_Item1_3, Ch5, Ch6, Ch7
 
 SFX_Get_Item2_3::
-	audio SFX_Get_Item2_3, Ch4, Ch5, Ch6
+	audio_header SFX_Get_Item2_3, Ch5, Ch6, Ch7
 
 SFX_Tink_3::
-	audio SFX_Tink_3, Ch4
+	audio_header SFX_Tink_3, Ch5
 
 SFX_Heal_HP_3::
-	audio SFX_Heal_HP_3, Ch4
+	audio_header SFX_Heal_HP_3, Ch5
 
 SFX_Heal_Ailment_3::
-	audio SFX_Heal_Ailment_3, Ch4
+	audio_header SFX_Heal_Ailment_3, Ch5
 
 SFX_Start_Menu_3::
-	audio SFX_Start_Menu_3, Ch7
+	audio_header SFX_Start_Menu_3, Ch8
 
 SFX_Press_AB_3::
-	audio SFX_Press_AB_3, Ch4
+	audio_header SFX_Press_AB_3, Ch5
 
 SFX_Pokedex_Rating_3::
-	audio SFX_Pokedex_Rating_3, Ch4, Ch5, Ch6
+	audio_header SFX_Pokedex_Rating_3, Ch5, Ch6, Ch7
 
 SFX_Get_Key_Item_3::
-	audio SFX_Get_Key_Item_3, Ch4, Ch5, Ch6
+	audio_header SFX_Get_Key_Item_3, Ch5, Ch6, Ch7
 
 SFX_Poisoned_3::
-	audio SFX_Poisoned_3, Ch4
+	audio_header SFX_Poisoned_3, Ch5
 
 SFX_Trade_Machine_3::
-	audio SFX_Trade_Machine_3, Ch4
+	audio_header SFX_Trade_Machine_3, Ch5
 
 SFX_Turn_On_PC_3::
-	audio SFX_Turn_On_PC_3, Ch4
+	audio_header SFX_Turn_On_PC_3, Ch5
 
 SFX_Turn_Off_PC_3::
-	audio SFX_Turn_Off_PC_3, Ch4
+	audio_header SFX_Turn_Off_PC_3, Ch5
 
 SFX_Enter_PC_3::
-	audio SFX_Enter_PC_3, Ch4
+	audio_header SFX_Enter_PC_3, Ch5
 
 SFX_Shrink_3::
-	audio SFX_Shrink_3, Ch4
+	audio_header SFX_Shrink_3, Ch5
 
 SFX_Switch_3::
-	audio SFX_Switch_3, Ch4
+	audio_header SFX_Switch_3, Ch5
 
 SFX_Healing_Machine_3::
-	audio SFX_Healing_Machine_3, Ch4
+	audio_header SFX_Healing_Machine_3, Ch5
 
 SFX_Teleport_Exit1_3::
-	audio SFX_Teleport_Exit1_3, Ch4
+	audio_header SFX_Teleport_Exit1_3, Ch5
 
 SFX_Teleport_Enter1_3::
-	audio SFX_Teleport_Enter1_3, Ch4
+	audio_header SFX_Teleport_Enter1_3, Ch5
 
 SFX_Teleport_Exit2_3::
-	audio SFX_Teleport_Exit2_3, Ch4
+	audio_header SFX_Teleport_Exit2_3, Ch5
 
 SFX_Ledge_3::
-	audio SFX_Ledge_3, Ch4
+	audio_header SFX_Ledge_3, Ch5
 
 SFX_Teleport_Enter2_3::
-	audio SFX_Teleport_Enter2_3, Ch7
+	audio_header SFX_Teleport_Enter2_3, Ch8
 
 SFX_Fly_3::
-	audio SFX_Fly_3, Ch7
+	audio_header SFX_Fly_3, Ch8
 
 SFX_Denied_3::
-	audio SFX_Denied_3, Ch4, Ch5
+	audio_header SFX_Denied_3, Ch5, Ch6
 
 SFX_Arrow_Tiles_3::
-	audio SFX_Arrow_Tiles_3, Ch4
+	audio_header SFX_Arrow_Tiles_3, Ch5
 
 SFX_Push_Boulder_3::
-	audio SFX_Push_Boulder_3, Ch7
+	audio_header SFX_Push_Boulder_3, Ch8
 
 SFX_SS_Anne_Horn_3::
-	audio SFX_SS_Anne_Horn_3, Ch4, Ch5
+	audio_header SFX_SS_Anne_Horn_3, Ch5, Ch6
 
 SFX_Withdraw_Deposit_3::
-	audio SFX_Withdraw_Deposit_3, Ch4
+	audio_header SFX_Withdraw_Deposit_3, Ch5
 
 SFX_Cut_3::
-	audio SFX_Cut_3, Ch7
+	audio_header SFX_Cut_3, Ch8
 
 SFX_Go_Inside_3::
-	audio SFX_Go_Inside_3, Ch7
+	audio_header SFX_Go_Inside_3, Ch8
 
 SFX_Swap_3::
-	audio SFX_Swap_3, Ch4, Ch5
+	audio_header SFX_Swap_3, Ch5, Ch6
 
 SFX_59_3::
-	audio SFX_59_3, Ch4, Ch5
+	audio_header SFX_59_3, Ch5, Ch6
 
 SFX_Purchase_3::
-	audio SFX_Purchase_3, Ch4, Ch5
+	audio_header SFX_Purchase_3, Ch5, Ch6
 
 SFX_Collision_3::
-	audio SFX_Collision_3, Ch4
+	audio_header SFX_Collision_3, Ch5
 
 SFX_Go_Outside_3::
-	audio SFX_Go_Outside_3, Ch7
+	audio_header SFX_Go_Outside_3, Ch8
 
 SFX_Save_3::
-	audio SFX_Save_3, Ch4, Ch5
+	audio_header SFX_Save_3, Ch5, Ch6
 
 SFX_Intro_Lunge::
-	audio SFX_Intro_Lunge, Ch7
+	audio_header SFX_Intro_Lunge, Ch8
 
 SFX_Intro_Hip::
-	audio SFX_Intro_Hip, Ch4
+	audio_header SFX_Intro_Hip, Ch5
 
 SFX_Intro_Hop::
-	audio SFX_Intro_Hop, Ch4
+	audio_header SFX_Intro_Hop, Ch5
 
 SFX_Intro_Raise::
-	audio SFX_Intro_Raise, Ch7
+	audio_header SFX_Intro_Raise, Ch8
 
 SFX_Intro_Crash::
-	audio SFX_Intro_Crash, Ch7
+	audio_header SFX_Intro_Crash, Ch8
 
 SFX_Intro_Whoosh::
-	audio SFX_Intro_Whoosh, Ch7
+	audio_header SFX_Intro_Whoosh, Ch8
 
 SFX_Slots_Stop_Wheel::
-	audio SFX_Slots_Stop_Wheel, Ch4
+	audio_header SFX_Slots_Stop_Wheel, Ch5
 
 SFX_Slots_Reward::
-	audio SFX_Slots_Reward, Ch4
+	audio_header SFX_Slots_Reward, Ch5
 
 SFX_Slots_New_Spin::
-	audio SFX_Slots_New_Spin, Ch4, Ch5
+	audio_header SFX_Slots_New_Spin, Ch5, Ch6
 
 SFX_Shooting_Star::
-	audio SFX_Shooting_Star, Ch4
+	audio_header SFX_Shooting_Star, Ch5