Merge branch 'master' of https://github.com/pret/pokered

8 files changed, 1360 insertions, 436 deletions

diff --git a/audio/headers/musicheaders1.asm b/audio/headers/musicheaders1.asm
index ef85eae6..fb387671 100644
--- a/audio/headers/musicheaders1.asm
+++ b/audio/headers/musicheaders1.asm
@@ -1,66 +1,135 @@
 Music_PalletTown::
-	audio_header Music_PalletTown, Ch1, Ch2, Ch3
+	channel_count 3
+	channel 1, Music_PalletTown_Ch1
+	channel 2, Music_PalletTown_Ch2
+	channel 3, Music_PalletTown_Ch3
 
 Music_Pokecenter::
-	audio_header Music_Pokecenter, Ch1, Ch2, Ch3
+	channel_count 3
+	channel 1, Music_Pokecenter_Ch1
+	channel 2, Music_Pokecenter_Ch2
+	channel 3, Music_Pokecenter_Ch3
 
 Music_Gym::
-	audio_header Music_Gym, Ch1, Ch2, Ch3
+	channel_count 3
+	channel 1, Music_Gym_Ch1
+	channel 2, Music_Gym_Ch2
+	channel 3, Music_Gym_Ch3
 
 ; Viridian City, Pewter City, Saffron City
 Music_Cities1::
-	audio_header Music_Cities1, Ch1, Ch2, Ch3, Ch4
+	channel_count 4
+	channel 1, Music_Cities1_Ch1
+	channel 2, Music_Cities1_Ch2
+	channel 3, Music_Cities1_Ch3
+	channel 4, Music_Cities1_Ch4
 
 ; Cerulean City, Fuchsia City
 Music_Cities2::
-	audio_header Music_Cities2, Ch1, Ch2, Ch3
+	channel_count 3
+	channel 1, Music_Cities2_Ch1
+	channel 2, Music_Cities2_Ch2
+	channel 3, Music_Cities2_Ch3
 
 Music_Celadon::
-	audio_header Music_Celadon, Ch1, Ch2, Ch3
+	channel_count 3
+	channel 1, Music_Celadon_Ch1
+	channel 2, Music_Celadon_Ch2
+	channel 3, Music_Celadon_Ch3
 
 Music_Cinnabar::
-	audio_header Music_Cinnabar, Ch1, Ch2, Ch3
+	channel_count 3
+	channel 1, Music_Cinnabar_Ch1
+	channel 2, Music_Cinnabar_Ch2
+	channel 3, Music_Cinnabar_Ch3
 
 Music_Vermilion::
-	audio_header Music_Vermilion, Ch1, Ch2, Ch3, Ch4
+	channel_count 4
+	channel 1, Music_Vermilion_Ch1
+	channel 2, Music_Vermilion_Ch2
+	channel 3, Music_Vermilion_Ch3
+	channel 4, Music_Vermilion_Ch4
 
 Music_Lavender::
-	audio_header Music_Lavender, Ch1, Ch2, Ch3, Ch4
+	channel_count 4
+	channel 1, Music_Lavender_Ch1
+	channel 2, Music_Lavender_Ch2
+	channel 3, Music_Lavender_Ch3
+	channel 4, Music_Lavender_Ch4
 
 Music_SSAnne::
-	audio_header Music_SSAnne, Ch1, Ch2, Ch3
+	channel_count 3
+	channel 1, Music_SSAnne_Ch1
+	channel 2, Music_SSAnne_Ch2
+	channel 3, Music_SSAnne_Ch3
 
 Music_MeetProfOak::
-	audio_header Music_MeetProfOak, Ch1, Ch2, Ch3
+	channel_count 3
+	channel 1, Music_MeetProfOak_Ch1
+	channel 2, Music_MeetProfOak_Ch2
+	channel 3, Music_MeetProfOak_Ch3
 
 Music_MeetRival::
-	audio_header Music_MeetRival, Ch1, Ch2, Ch3
+	channel_count 3
+	channel 1, Music_MeetRival_Ch1
+	channel 2, Music_MeetRival_Ch2
+	channel 3, Music_MeetRival_Ch3
 
 Music_MuseumGuy::
-	audio_header Music_MuseumGuy, Ch1, Ch2, Ch3, Ch4
+	channel_count 4
+	channel 1, Music_MuseumGuy_Ch1
+	channel 2, Music_MuseumGuy_Ch2
+	channel 3, Music_MuseumGuy_Ch3
+	channel 4, Music_MuseumGuy_Ch4
 
 Music_SafariZone::
-	audio_header Music_SafariZone, Ch1, Ch2, Ch3
+	channel_count 3
+	channel 1, Music_SafariZone_Ch1
+	channel 2, Music_SafariZone_Ch2
+	channel 3, Music_SafariZone_Ch3
 
 Music_PkmnHealed::
-	audio_header Music_PkmnHealed, Ch1, Ch2, Ch3
+	channel_count 3
+	channel 1, Music_PkmnHealed_Ch1
+	channel 2, Music_PkmnHealed_Ch2
+	channel 3, Music_PkmnHealed_Ch3
 
 ; Routes 1 and 2
 Music_Routes1::
-	audio_header Music_Routes1, Ch1, Ch2, Ch3, Ch4
+	channel_count 4
+	channel 1, Music_Routes1_Ch1
+	channel 2, Music_Routes1_Ch2
+	channel 3, Music_Routes1_Ch3
+	channel 4, Music_Routes1_Ch4
 
 ; Routes 24 and 25
 Music_Routes2::
-	audio_header Music_Routes2, Ch1, Ch2, Ch3, Ch4
+	channel_count 4
+	channel 1, Music_Routes2_Ch1
+	channel 2, Music_Routes2_Ch2
+	channel 3, Music_Routes2_Ch3
+	channel 4, Music_Routes2_Ch4
 
 ; Routes 3, 4, 5, 6, 7, 8, 9, 10, 16, 17, 18, 19, 20, 21, 22
 Music_Routes3::
-	audio_header Music_Routes3, Ch1, Ch2, Ch3, Ch4
+	channel_count 4
+	channel 1, Music_Routes3_Ch1
+	channel 2, Music_Routes3_Ch2
+	channel 3, Music_Routes3_Ch3
+	channel 4, Music_Routes3_Ch4
 
 ; Routes 11, 12, 13, 14, 15
 Music_Routes4::
-	audio_header Music_Routes4, Ch1, Ch2, Ch3, Ch4
+	channel_count 4
+	channel 1, Music_Routes4_Ch1
+	channel 2, Music_Routes4_Ch2
+	channel 3, Music_Routes4_Ch3
+	channel 4, Music_Routes4_Ch4
 
 ; Route 23, Indigo Plateau
 Music_IndigoPlateau::
-	audio_header Music_IndigoPlateau, Ch1, Ch2, Ch3, Ch4
+	channel_count 4
+	channel 1, Music_IndigoPlateau_Ch1
+	channel 2, Music_IndigoPlateau_Ch2
+	channel 3, Music_IndigoPlateau_Ch3
+	channel 4, Music_IndigoPlateau_Ch4
diff --git a/audio/headers/musicheaders2.asm b/audio/headers/musicheaders2.asm
index d6cca9a9..c24c08d6 100644
--- a/audio/headers/musicheaders2.asm
+++ b/audio/headers/musicheaders2.asm
@@ -1,20 +1,41 @@
 Music_GymLeaderBattle::
-	audio_header Music_GymLeaderBattle, Ch1, Ch2, Ch3
+	channel_count 3
+	channel 1, Music_GymLeaderBattle_Ch1
+	channel 2, Music_GymLeaderBattle_Ch2
+	channel 3, Music_GymLeaderBattle_Ch3
 
 Music_TrainerBattle::
-	audio_header Music_TrainerBattle, Ch1, Ch2, Ch3
+	channel_count 3
+	channel 1, Music_TrainerBattle_Ch1
+	channel 2, Music_TrainerBattle_Ch2
+	channel 3, Music_TrainerBattle_Ch3
 
 Music_WildBattle::
-	audio_header Music_WildBattle, Ch1, Ch2, Ch3
+	channel_count 3
+	channel 1, Music_WildBattle_Ch1
+	channel 2, Music_WildBattle_Ch2
+	channel 3, Music_WildBattle_Ch3
 
 Music_FinalBattle::
-	audio_header Music_FinalBattle, Ch1, Ch2, Ch3
+	channel_count 3
+	channel 1, Music_FinalBattle_Ch1
+	channel 2, Music_FinalBattle_Ch2
+	channel 3, Music_FinalBattle_Ch3
 
 Music_DefeatedTrainer::
-	audio_header Music_DefeatedTrainer, Ch1, Ch2, Ch3
+	channel_count 3
+	channel 1, Music_DefeatedTrainer_Ch1
+	channel 2, Music_DefeatedTrainer_Ch2
+	channel 3, Music_DefeatedTrainer_Ch3
 
 Music_DefeatedWildMon::
-	audio_header Music_DefeatedWildMon, Ch1, Ch2, Ch3
+	channel_count 3
+	channel 1, Music_DefeatedWildMon_Ch1
+	channel 2, Music_DefeatedWildMon_Ch2
+	channel 3, Music_DefeatedWildMon_Ch3
 
 Music_DefeatedGymLeader::
-	audio_header Music_DefeatedGymLeader, Ch1, Ch2, Ch3
+	channel_count 3
+	channel 1, Music_DefeatedGymLeader_Ch1
+	channel 2, Music_DefeatedGymLeader_Ch2
+	channel 3, Music_DefeatedGymLeader_Ch3
diff --git a/audio/headers/musicheaders3.asm b/audio/headers/musicheaders3.asm
index 51c67966..968063ec 100644
--- a/audio/headers/musicheaders3.asm
+++ b/audio/headers/musicheaders3.asm
@@ -1,56 +1,115 @@
 Music_TitleScreen::
-	audio_header Music_TitleScreen, Ch1, Ch2, Ch3, Ch4
+	channel_count 4
+	channel 1, Music_TitleScreen_Ch1
+	channel 2, Music_TitleScreen_Ch2
+	channel 3, Music_TitleScreen_Ch3
+	channel 4, Music_TitleScreen_Ch4
 
 Music_Credits::
-	audio_header Music_Credits, Ch1, Ch2, Ch3
+	channel_count 3
+	channel 1, Music_Credits_Ch1
+	channel 2, Music_Credits_Ch2
+	channel 3, Music_Credits_Ch3
 
 Music_HallOfFame::
-	audio_header Music_HallOfFame, Ch1, Ch2, Ch3
+	channel_count 3
+	channel 1, Music_HallOfFame_Ch1
+	channel 2, Music_HallOfFame_Ch2
+	channel 3, Music_HallOfFame_Ch3
 
 Music_OaksLab::
-	audio_header Music_OaksLab, Ch1, Ch2, Ch3
+	channel_count 3
+	channel 1, Music_OaksLab_Ch1
+	channel 2, Music_OaksLab_Ch2
+	channel 3, Music_OaksLab_Ch3
 
 Music_JigglypuffSong::
-	audio_header Music_JigglypuffSong, Ch1, Ch2
+	channel_count 2
+	channel 1, Music_JigglypuffSong_Ch1
+	channel 2, Music_JigglypuffSong_Ch2
 
 Music_BikeRiding::
-	audio_header Music_BikeRiding, Ch1, Ch2, Ch3, Ch4
+	channel_count 4
+	channel 1, Music_BikeRiding_Ch1
+	channel 2, Music_BikeRiding_Ch2
+	channel 3, Music_BikeRiding_Ch3
+	channel 4, Music_BikeRiding_Ch4
 
 Music_Surfing::
-	audio_header Music_Surfing, Ch1, Ch2, Ch3
+	channel_count 3
+	channel 1, Music_Surfing_Ch1
+	channel 2, Music_Surfing_Ch2
+	channel 3, Music_Surfing_Ch3
 
 Music_GameCorner::
-	audio_header Music_GameCorner, Ch1, Ch2, Ch3
+	channel_count 3
+	channel 1, Music_GameCorner_Ch1
+	channel 2, Music_GameCorner_Ch2
+	channel 3, Music_GameCorner_Ch3
 
 Music_YellowIntro::
-	audio_header Music_YellowIntro, Ch1, Ch2, Ch3
+	channel_count 3
+	channel 1, Music_YellowIntro_Ch1
+	channel 2, Music_YellowIntro_Ch2
+	channel 3, Music_YellowIntro_Ch3
 
 ; Power Plant, Cerulean Cave, Rocket HQ
 Music_Dungeon1::
-	audio_header Music_Dungeon1, Ch1, Ch2, Ch3, Ch4
+	channel_count 4
+	channel 1, Music_Dungeon1_Ch1
+	channel 2, Music_Dungeon1_Ch2
+	channel 3, Music_Dungeon1_Ch3
+	channel 4, Music_Dungeon1_Ch4
 
 ; Viridian Forest, Seafoam Islands
 Music_Dungeon2::
-	audio_header Music_Dungeon2, Ch1, Ch2, Ch3, Ch4
+	channel_count 4
+	channel 1, Music_Dungeon2_Ch1
+	channel 2, Music_Dungeon2_Ch2
+	channel 3, Music_Dungeon2_Ch3
+	channel 4, Music_Dungeon2_Ch4
 
 ; Mt. Moon, Rock Tunnel, Victory Road
 Music_Dungeon3::
-	audio_header Music_Dungeon3, Ch1, Ch2, Ch3, Ch4
+	channel_count 4
+	channel 1, Music_Dungeon3_Ch1
+	channel 2, Music_Dungeon3_Ch2
+	channel 3, Music_Dungeon3_Ch3
+	channel 4, Music_Dungeon3_Ch4
 
 Music_CinnabarMansion::
-	audio_header Music_CinnabarMansion, Ch1, Ch2, Ch3, Ch4
+	channel_count 4
+	channel 1, Music_CinnabarMansion_Ch1
+	channel 2, Music_CinnabarMansion_Ch2
+	channel 3, Music_CinnabarMansion_Ch3
+	channel 4, Music_CinnabarMansion_Ch4
 
 Music_PokemonTower::
-	audio_header Music_PokemonTower, Ch1, Ch2, Ch3
+	channel_count 3
+	channel 1, Music_PokemonTower_Ch1
+	channel 2, Music_PokemonTower_Ch2
+	channel 3, Music_PokemonTower_Ch3
 
 Music_SilphCo::
-	audio_header Music_SilphCo, Ch1, Ch2, Ch3
+	channel_count 3
+	channel 1, Music_SilphCo_Ch1
+	channel 2, Music_SilphCo_Ch2
+	channel 3, Music_SilphCo_Ch3
 
 Music_MeetEvilTrainer::
-	audio_header Music_MeetEvilTrainer, Ch1, Ch2, Ch3
+	channel_count 3
+	channel 1, Music_MeetEvilTrainer_Ch1
+	channel 2, Music_MeetEvilTrainer_Ch2
+	channel 3, Music_MeetEvilTrainer_Ch3
 
 Music_MeetFemaleTrainer::
-	audio_header Music_MeetFemaleTrainer, Ch1, Ch2, Ch3
+	channel_count 3
+	channel 1, Music_MeetFemaleTrainer_Ch1
+	channel 2, Music_MeetFemaleTrainer_Ch2
+	channel 3, Music_MeetFemaleTrainer_Ch3
 
 Music_MeetMaleTrainer::
-	audio_header Music_MeetMaleTrainer, Ch1, Ch2, Ch3
+	channel_count 3
+	channel 1, Music_MeetMaleTrainer_Ch1
+	channel 2, Music_MeetMaleTrainer_Ch2
+	channel 3, Music_MeetMaleTrainer_Ch3
diff --git a/audio/headers/musicheaders4.asm b/audio/headers/musicheaders4.asm
index 8c537ff9..88bda9a6 100644
--- a/audio/headers/musicheaders4.asm
+++ b/audio/headers/musicheaders4.asm
@@ -1,11 +1,22 @@
 Music_SurfingPikachu::
-	audio_header Music_SurfingPikachu, Ch1, Ch2, Ch3
+	channel_count 3
+	channel 1, Music_SurfingPikachu_Ch1
+	channel 2, Music_SurfingPikachu_Ch2
+	channel 3, Music_SurfingPikachu_Ch3
 
 Music_MeetJessieJames::
-	audio_header Music_MeetJessieJames, Ch1, Ch2, Ch3
+	channel_count 3
+	channel 1, Music_MeetJessieJames_Ch1
+	channel 2, Music_MeetJessieJames_Ch2
+	channel 3, Music_MeetJessieJames_Ch3
 
 Music_YellowUnusedSong::
-	audio_header Music_YellowUnusedSong, Ch1, Ch2, Ch3, Ch4
+	channel_count 4
+	channel 1, Music_YellowUnusedSong_Ch1
+	channel 2, Music_YellowUnusedSong_Ch2
+	channel 3, Music_YellowUnusedSong_Ch3
+	channel 4, Music_YellowUnusedSong_Ch4
 
 Music_GBPrinter::
-	audio_header Music_GBPrinter, Ch3
+	channel_count 1
+	channel 3, Music_GBPrinter_Ch3
diff --git a/audio/headers/sfxheaders1.asm b/audio/headers/sfxheaders1.asm
index 2d5eca4a..297b7582 100644
--- a/audio/headers/sfxheaders1.asm
+++ b/audio/headers/sfxheaders1.asm
@@ -2,287 +2,472 @@ SFX_Headers_1::
 	db $ff, $ff, $ff ; padding
 
 SFX_Noise_Instrument01_1::
-	audio_header SFX_Noise_Instrument01_1, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument01_1_Ch8
 
 SFX_Noise_Instrument02_1::
-	audio_header SFX_Noise_Instrument02_1, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument02_1_Ch8
 
 SFX_Noise_Instrument03_1::
-	audio_header SFX_Noise_Instrument03_1, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument03_1_Ch8
 
 SFX_Noise_Instrument04_1::
-	audio_header SFX_Noise_Instrument04_1, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument04_1_Ch8
 
 SFX_Noise_Instrument05_1::
-	audio_header SFX_Noise_Instrument05_1, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument05_1_Ch8
 
 SFX_Noise_Instrument06_1::
-	audio_header SFX_Noise_Instrument06_1, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument06_1_Ch8
 
 SFX_Noise_Instrument07_1::
-	audio_header SFX_Noise_Instrument07_1, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument07_1_Ch8
 
 SFX_Noise_Instrument08_1::
-	audio_header SFX_Noise_Instrument08_1, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument08_1_Ch8
 
 SFX_Noise_Instrument09_1::
-	audio_header SFX_Noise_Instrument09_1, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument09_1_Ch8
 
 SFX_Noise_Instrument10_1::
-	audio_header SFX_Noise_Instrument10_1, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument10_1_Ch8
 
 SFX_Noise_Instrument11_1::
-	audio_header SFX_Noise_Instrument11_1, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument11_1_Ch8
 
 SFX_Noise_Instrument12_1::
-	audio_header SFX_Noise_Instrument12_1, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument12_1_Ch8
 
 SFX_Noise_Instrument13_1::
-	audio_header SFX_Noise_Instrument13_1, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument13_1_Ch8
 
 SFX_Noise_Instrument14_1::
-	audio_header SFX_Noise_Instrument14_1, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument14_1_Ch8
 
 SFX_Noise_Instrument15_1::
-	audio_header SFX_Noise_Instrument15_1, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument15_1_Ch8
 
 SFX_Noise_Instrument16_1::
-	audio_header SFX_Noise_Instrument16_1, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument16_1_Ch8
 
 SFX_Noise_Instrument17_1::
-	audio_header SFX_Noise_Instrument17_1, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument17_1_Ch8
 
 SFX_Noise_Instrument18_1::
-	audio_header SFX_Noise_Instrument18_1, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument18_1_Ch8
 
 SFX_Noise_Instrument19_1::
-	audio_header SFX_Noise_Instrument19_1, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument19_1_Ch8
 
 SFX_Cry00_1::
-	audio_header SFX_Cry00_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry00_1_Ch5
+	channel 6, SFX_Cry00_1_Ch6
+	channel 8, SFX_Cry00_1_Ch8
 
 SFX_Cry01_1::
-	audio_header SFX_Cry01_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry01_1_Ch5
+	channel 6, SFX_Cry01_1_Ch6
+	channel 8, SFX_Cry01_1_Ch8
 
 SFX_Cry02_1::
-	audio_header SFX_Cry02_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry02_1_Ch5
+	channel 6, SFX_Cry02_1_Ch6
+	channel 8, SFX_Cry02_1_Ch8
 
 SFX_Cry03_1::
-	audio_header SFX_Cry03_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry03_1_Ch5
+	channel 6, SFX_Cry03_1_Ch6
+	channel 8, SFX_Cry03_1_Ch8
 
 SFX_Cry04_1::
-	audio_header SFX_Cry04_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry04_1_Ch5
+	channel 6, SFX_Cry04_1_Ch6
+	channel 8, SFX_Cry04_1_Ch8
 
 SFX_Cry05_1::
-	audio_header SFX_Cry05_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry05_1_Ch5
+	channel 6, SFX_Cry05_1_Ch6
+	channel 8, SFX_Cry05_1_Ch8
 
 SFX_Cry06_1::
-	audio_header SFX_Cry06_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry06_1_Ch5
+	channel 6, SFX_Cry06_1_Ch6
+	channel 8, SFX_Cry06_1_Ch8
 
 SFX_Cry07_1::
-	audio_header SFX_Cry07_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry07_1_Ch5
+	channel 6, SFX_Cry07_1_Ch6
+	channel 8, SFX_Cry07_1_Ch8
 
 SFX_Cry08_1::
-	audio_header SFX_Cry08_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry08_1_Ch5
+	channel 6, SFX_Cry08_1_Ch6
+	channel 8, SFX_Cry08_1_Ch8
 
 SFX_Cry09_1::
-	audio_header SFX_Cry09_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry09_1_Ch5
+	channel 6, SFX_Cry09_1_Ch6
+	channel 8, SFX_Cry09_1_Ch8
 
 SFX_Cry0A_1::
-	audio_header SFX_Cry0A_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry0A_1_Ch5
+	channel 6, SFX_Cry0A_1_Ch6
+	channel 8, SFX_Cry0A_1_Ch8
 
 SFX_Cry0B_1::
-	audio_header SFX_Cry0B_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry0B_1_Ch5
+	channel 6, SFX_Cry0B_1_Ch6
+	channel 8, SFX_Cry0B_1_Ch8
 
 SFX_Cry0C_1::
-	audio_header SFX_Cry0C_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry0C_1_Ch5
+	channel 6, SFX_Cry0C_1_Ch6
+	channel 8, SFX_Cry0C_1_Ch8
 
 SFX_Cry0D_1::
-	audio_header SFX_Cry0D_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry0D_1_Ch5
+	channel 6, SFX_Cry0D_1_Ch6
+	channel 8, SFX_Cry0D_1_Ch8
 
 SFX_Cry0E_1::
-	audio_header SFX_Cry0E_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry0E_1_Ch5
+	channel 6, SFX_Cry0E_1_Ch6
+	channel 8, SFX_Cry0E_1_Ch8
 
 SFX_Cry0F_1::
-	audio_header SFX_Cry0F_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry0F_1_Ch5
+	channel 6, SFX_Cry0F_1_Ch6
+	channel 8, SFX_Cry0F_1_Ch8
 
 SFX_Cry10_1::
-	audio_header SFX_Cry10_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry10_1_Ch5
+	channel 6, SFX_Cry10_1_Ch6
+	channel 8, SFX_Cry10_1_Ch8
 
 SFX_Cry11_1::
-	audio_header SFX_Cry11_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry11_1_Ch5
+	channel 6, SFX_Cry11_1_Ch6
+	channel 8, SFX_Cry11_1_Ch8
 
 SFX_Cry12_1::
-	audio_header SFX_Cry12_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry12_1_Ch5
+	channel 6, SFX_Cry12_1_Ch6
+	channel 8, SFX_Cry12_1_Ch8
 
 SFX_Cry13_1::
-	audio_header SFX_Cry13_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry13_1_Ch5
+	channel 6, SFX_Cry13_1_Ch6
+	channel 8, SFX_Cry13_1_Ch8
 
 SFX_Cry14_1::
-	audio_header SFX_Cry14_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry14_1_Ch5
+	channel 6, SFX_Cry14_1_Ch6
+	channel 8, SFX_Cry14_1_Ch8
 
 SFX_Cry15_1::
-	audio_header SFX_Cry15_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry15_1_Ch5
+	channel 6, SFX_Cry15_1_Ch6
+	channel 8, SFX_Cry15_1_Ch8
 
 SFX_Cry16_1::
-	audio_header SFX_Cry16_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry16_1_Ch5
+	channel 6, SFX_Cry16_1_Ch6
+	channel 8, SFX_Cry16_1_Ch8
 
 SFX_Cry17_1::
-	audio_header SFX_Cry17_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry17_1_Ch5
+	channel 6, SFX_Cry17_1_Ch6
+	channel 8, SFX_Cry17_1_Ch8
 
 SFX_Cry18_1::
-	audio_header SFX_Cry18_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry18_1_Ch5
+	channel 6, SFX_Cry18_1_Ch6
+	channel 8, SFX_Cry18_1_Ch8
 
 SFX_Cry19_1::
-	audio_header SFX_Cry19_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry19_1_Ch5
+	channel 6, SFX_Cry19_1_Ch6
+	channel 8, SFX_Cry19_1_Ch8
 
 SFX_Cry1A_1::
-	audio_header SFX_Cry1A_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry1A_1_Ch5
+	channel 6, SFX_Cry1A_1_Ch6
+	channel 8, SFX_Cry1A_1_Ch8
 
 SFX_Cry1B_1::
-	audio_header SFX_Cry1B_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry1B_1_Ch5
+	channel 6, SFX_Cry1B_1_Ch6
+	channel 8, SFX_Cry1B_1_Ch8
 
 SFX_Cry1C_1::
-	audio_header SFX_Cry1C_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry1C_1_Ch5
+	channel 6, SFX_Cry1C_1_Ch6
+	channel 8, SFX_Cry1C_1_Ch8
 
 SFX_Cry1D_1::
-	audio_header SFX_Cry1D_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry1D_1_Ch5
+	channel 6, SFX_Cry1D_1_Ch6
+	channel 8, SFX_Cry1D_1_Ch8
 
 SFX_Cry1E_1::
-	audio_header SFX_Cry1E_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry1E_1_Ch5
+	channel 6, SFX_Cry1E_1_Ch6
+	channel 8, SFX_Cry1E_1_Ch8
 
 SFX_Cry1F_1::
-	audio_header SFX_Cry1F_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry1F_1_Ch5
+	channel 6, SFX_Cry1F_1_Ch6
+	channel 8, SFX_Cry1F_1_Ch8
 
 SFX_Cry20_1::
-	audio_header SFX_Cry20_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry20_1_Ch5
+	channel 6, SFX_Cry20_1_Ch6
+	channel 8, SFX_Cry20_1_Ch8
 
 SFX_Cry21_1::
-	audio_header SFX_Cry21_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry21_1_Ch5
+	channel 6, SFX_Cry21_1_Ch6
+	channel 8, SFX_Cry21_1_Ch8
 
 SFX_Cry22_1::
-	audio_header SFX_Cry22_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry22_1_Ch5
+	channel 6, SFX_Cry22_1_Ch6
+	channel 8, SFX_Cry22_1_Ch8
 
 SFX_Cry23_1::
-	audio_header SFX_Cry23_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry23_1_Ch5
+	channel 6, SFX_Cry23_1_Ch6
+	channel 8, SFX_Cry23_1_Ch8
 
 SFX_Cry24_1::
-	audio_header SFX_Cry24_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry24_1_Ch5
+	channel 6, SFX_Cry24_1_Ch6
+	channel 8, SFX_Cry24_1_Ch8
 
 SFX_Cry25_1::
-	audio_header SFX_Cry25_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry25_1_Ch5
+	channel 6, SFX_Cry25_1_Ch6
+	channel 8, SFX_Cry25_1_Ch8
 
 SFX_Get_Item1_1::
-	audio_header SFX_Get_Item1_1, Ch5, Ch6, Ch7
+	channel_count 3
+	channel 5, SFX_Get_Item1_1_Ch5
+	channel 6, SFX_Get_Item1_1_Ch6
+	channel 7, SFX_Get_Item1_1_Ch7
 
 SFX_Get_Item2_1::
-	audio_header SFX_Get_Item2_1, Ch5, Ch6, Ch7
+	channel_count 3
+	channel 5, SFX_Get_Item2_1_Ch5
+	channel 6, SFX_Get_Item2_1_Ch6
+	channel 7, SFX_Get_Item2_1_Ch7
 
 SFX_Tink_1::
-	audio_header SFX_Tink_1, Ch5
+	channel_count 1
+	channel 5, SFX_Tink_1_Ch5
 
 SFX_Heal_HP_1::
-	audio_header SFX_Heal_HP_1, Ch5
+	channel_count 1
+	channel 5, SFX_Heal_HP_1_Ch5
 
 SFX_Heal_Ailment_1::
-	audio_header SFX_Heal_Ailment_1, Ch5
+	channel_count 1
+	channel 5, SFX_Heal_Ailment_1_Ch5
 
 SFX_Start_Menu_1::
-	audio_header SFX_Start_Menu_1, Ch8
+	channel_count 1
+	channel 8, SFX_Start_Menu_1_Ch8
 
 SFX_Press_AB_1::
-	audio_header SFX_Press_AB_1, Ch5
+	channel_count 1
+	channel 5, SFX_Press_AB_1_Ch5
 
 SFX_Pokedex_Rating_1::
-	audio_header SFX_Pokedex_Rating_1, Ch5, Ch6, Ch7
+	channel_count 3
+	channel 5, SFX_Pokedex_Rating_1_Ch5
+	channel 6, SFX_Pokedex_Rating_1_Ch6
+	channel 7, SFX_Pokedex_Rating_1_Ch7
 
 SFX_Get_Key_Item_1::
-	audio_header SFX_Get_Key_Item_1, Ch5, Ch6, Ch7
+	channel_count 3
+	channel 5, SFX_Get_Key_Item_1_Ch5
+	channel 6, SFX_Get_Key_Item_1_Ch6
+	channel 7, SFX_Get_Key_Item_1_Ch7
 
 SFX_Poisoned_1::
-	audio_header SFX_Poisoned_1, Ch5
+	channel_count 1
+	channel 5, SFX_Poisoned_1_Ch5
 
 SFX_Trade_Machine_1::
-	audio_header SFX_Trade_Machine_1, Ch5
+	channel_count 1
+	channel 5, SFX_Trade_Machine_1_Ch5
 
 SFX_Turn_On_PC_1::
-	audio_header SFX_Turn_On_PC_1, Ch5
+	channel_count 1
+	channel 5, SFX_Turn_On_PC_1_Ch5
 
 SFX_Turn_Off_PC_1::
-	audio_header SFX_Turn_Off_PC_1, Ch5
+	channel_count 1
+	channel 5, SFX_Turn_Off_PC_1_Ch5
 
 SFX_Enter_PC_1::
-	audio_header SFX_Enter_PC_1, Ch5
+	channel_count 1
+	channel 5, SFX_Enter_PC_1_Ch5
 
 SFX_Shrink_1::
-	audio_header SFX_Shrink_1, Ch5
+	channel_count 1
+	channel 5, SFX_Shrink_1_Ch5
 
 SFX_Switch_1::
-	audio_header SFX_Switch_1, Ch5
+	channel_count 1
+	channel 5, SFX_Switch_1_Ch5
 
 SFX_Healing_Machine_1::
-	audio_header SFX_Healing_Machine_1, Ch5
+	channel_count 1
+	channel 5, SFX_Healing_Machine_1_Ch5
 
 SFX_Teleport_Exit1_1::
-	audio_header SFX_Teleport_Exit1_1, Ch5
+	channel_count 1
+	channel 5, SFX_Teleport_Exit1_1_Ch5
 
 SFX_Teleport_Enter1_1::
-	audio_header SFX_Teleport_Enter1_1, Ch5
+	channel_count 1
+	channel 5, SFX_Teleport_Enter1_1_Ch5
 
 SFX_Teleport_Exit2_1::
-	audio_header SFX_Teleport_Exit2_1, Ch5
+	channel_count 1
+	channel 5, SFX_Teleport_Exit2_1_Ch5
 
 SFX_Ledge_1::
-	audio_header SFX_Ledge_1, Ch5
+	channel_count 1
+	channel 5, SFX_Ledge_1_Ch5
 
 SFX_Teleport_Enter2_1::
-	audio_header SFX_Teleport_Enter2_1, Ch8
+	channel_count 1
+	channel 8, SFX_Teleport_Enter2_1_Ch8
 
 SFX_Fly_1::
-	audio_header SFX_Fly_1, Ch8
+	channel_count 1
+	channel 8, SFX_Fly_1_Ch8
 
 SFX_Denied_1::
-	audio_header SFX_Denied_1, Ch5, Ch6
+	channel_count 2
+	channel 5, SFX_Denied_1_Ch5
+	channel 6, SFX_Denied_1_Ch6
 
 SFX_Arrow_Tiles_1::
-	audio_header SFX_Arrow_Tiles_1, Ch5
+	channel_count 1
+	channel 5, SFX_Arrow_Tiles_1_Ch5
 
 SFX_Push_Boulder_1::
-	audio_header SFX_Push_Boulder_1, Ch8
+	channel_count 1
+	channel 8, SFX_Push_Boulder_1_Ch8
 
 SFX_SS_Anne_Horn_1::
-	audio_header SFX_SS_Anne_Horn_1, Ch5, Ch6
+	channel_count 2
+	channel 5, SFX_SS_Anne_Horn_1_Ch5
+	channel 6, SFX_SS_Anne_Horn_1_Ch6
 
 SFX_Withdraw_Deposit_1::
-	audio_header SFX_Withdraw_Deposit_1, Ch5
+	channel_count 1
+	channel 5, SFX_Withdraw_Deposit_1_Ch5
 
 SFX_Cut_1::
-	audio_header SFX_Cut_1, Ch8
+	channel_count 1
+	channel 8, SFX_Cut_1_Ch8
 
 SFX_Go_Inside_1::
-	audio_header SFX_Go_Inside_1, Ch8
+	channel_count 1
+	channel 8, SFX_Go_Inside_1_Ch8
 
 SFX_Swap_1::
-	audio_header SFX_Swap_1, Ch5, Ch6
+	channel_count 2
+	channel 5, SFX_Swap_1_Ch5
+	channel 6, SFX_Swap_1_Ch6
 
 SFX_59_1::
-	audio_header SFX_59_1, Ch5, Ch6
+	channel_count 2
+	channel 5, SFX_59_1_Ch5
+	channel 6, SFX_59_1_Ch6
 
 SFX_Purchase_1::
-	audio_header SFX_Purchase_1, Ch5, Ch6
+	channel_count 2
+	channel 5, SFX_Purchase_1_Ch5
+	channel 6, SFX_Purchase_1_Ch6
 
 SFX_Collision_1::
-	audio_header SFX_Collision_1, Ch5
+	channel_count 1
+	channel 5, SFX_Collision_1_Ch5
 
 SFX_Go_Outside_1::
-	audio_header SFX_Go_Outside_1, Ch8
+	channel_count 1
+	channel 8, SFX_Go_Outside_1_Ch8
 
 SFX_Save_1::
-	audio_header SFX_Save_1, Ch5, Ch6
+	channel_count 2
+	channel 5, SFX_Save_1_Ch5
+	channel 6, SFX_Save_1_Ch6
 
 ; the Pokeflute sound effect directly hijacks channel 3
 SFX_Pokeflute::
-	audio_header SFX_Pokeflute, Ch3
+	channel_count 1
+	channel 3, SFX_Pokeflute_Ch3
 
 SFX_Safari_Zone_PA::
-	audio_header SFX_Safari_Zone_PA, Ch5
+	channel_count 1
+	channel 5, SFX_Safari_Zone_PA_Ch5
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
diff --git a/audio/headers/sfxheaders3.asm b/audio/headers/sfxheaders3.asm
index 2732767f..bc6451a7 100644
--- a/audio/headers/sfxheaders3.asm
+++ b/audio/headers/sfxheaders3.asm
@@ -2,310 +2,504 @@ SFX_Headers_3::
 	db $ff, $ff, $ff ; padding
 
 SFX_Noise_Instrument01_3::
-	audio_header SFX_Noise_Instrument01_3, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument01_3_Ch8
 
 SFX_Noise_Instrument02_3::
-	audio_header SFX_Noise_Instrument02_3, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument02_3_Ch8
 
 SFX_Noise_Instrument03_3::
-	audio_header SFX_Noise_Instrument03_3, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument03_3_Ch8
 
 SFX_Noise_Instrument04_3::
-	audio_header SFX_Noise_Instrument04_3, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument04_3_Ch8
 
 SFX_Noise_Instrument05_3::
-	audio_header SFX_Noise_Instrument05_3, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument05_3_Ch8
 
 SFX_Noise_Instrument06_3::
-	audio_header SFX_Noise_Instrument06_3, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument06_3_Ch8
 
 SFX_Noise_Instrument07_3::
-	audio_header SFX_Noise_Instrument07_3, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument07_3_Ch8
 
 SFX_Noise_Instrument08_3::
-	audio_header SFX_Noise_Instrument08_3, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument08_3_Ch8
 
 SFX_Noise_Instrument09_3::
-	audio_header SFX_Noise_Instrument09_3, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument09_3_Ch8
 
 SFX_Noise_Instrument10_3::
-	audio_header SFX_Noise_Instrument10_3, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument10_3_Ch8
 
 SFX_Noise_Instrument11_3::
-	audio_header SFX_Noise_Instrument11_3, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument11_3_Ch8
 
 SFX_Noise_Instrument12_3::
-	audio_header SFX_Noise_Instrument12_3, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument12_3_Ch8
 
 SFX_Noise_Instrument13_3::
-	audio_header SFX_Noise_Instrument13_3, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument13_3_Ch8
 
 SFX_Noise_Instrument14_3::
-	audio_header SFX_Noise_Instrument14_3, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument14_3_Ch8
 
 SFX_Noise_Instrument15_3::
-	audio_header SFX_Noise_Instrument15_3, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument15_3_Ch8
 
 SFX_Noise_Instrument16_3::
-	audio_header SFX_Noise_Instrument16_3, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument16_3_Ch8
 
 SFX_Noise_Instrument17_3::
-	audio_header SFX_Noise_Instrument17_3, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument17_3_Ch8
 
 SFX_Noise_Instrument18_3::
-	audio_header SFX_Noise_Instrument18_3, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument18_3_Ch8
 
 SFX_Noise_Instrument19_3::
-	audio_header SFX_Noise_Instrument19_3, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument19_3_Ch8
 
 SFX_Cry00_3::
-	audio_header SFX_Cry00_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry00_3_Ch5
+	channel 6, SFX_Cry00_3_Ch6
+	channel 8, SFX_Cry00_3_Ch8
 
 SFX_Cry01_3::
-	audio_header SFX_Cry01_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry01_3_Ch5
+	channel 6, SFX_Cry01_3_Ch6
+	channel 8, SFX_Cry01_3_Ch8
 
 SFX_Cry02_3::
-	audio_header SFX_Cry02_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry02_3_Ch5
+	channel 6, SFX_Cry02_3_Ch6
+	channel 8, SFX_Cry02_3_Ch8
 
 SFX_Cry03_3::
-	audio_header SFX_Cry03_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry03_3_Ch5
+	channel 6, SFX_Cry03_3_Ch6
+	channel 8, SFX_Cry03_3_Ch8
 
 SFX_Cry04_3::
-	audio_header SFX_Cry04_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry04_3_Ch5
+	channel 6, SFX_Cry04_3_Ch6
+	channel 8, SFX_Cry04_3_Ch8
 
 SFX_Cry05_3::
-	audio_header SFX_Cry05_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry05_3_Ch5
+	channel 6, SFX_Cry05_3_Ch6
+	channel 8, SFX_Cry05_3_Ch8
 
 SFX_Cry06_3::
-	audio_header SFX_Cry06_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry06_3_Ch5
+	channel 6, SFX_Cry06_3_Ch6
+	channel 8, SFX_Cry06_3_Ch8
 
 SFX_Cry07_3::
-	audio_header SFX_Cry07_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry07_3_Ch5
+	channel 6, SFX_Cry07_3_Ch6
+	channel 8, SFX_Cry07_3_Ch8
 
 SFX_Cry08_3::
-	audio_header SFX_Cry08_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry08_3_Ch5
+	channel 6, SFX_Cry08_3_Ch6
+	channel 8, SFX_Cry08_3_Ch8
 
 SFX_Cry09_3::
-	audio_header SFX_Cry09_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry09_3_Ch5
+	channel 6, SFX_Cry09_3_Ch6
+	channel 8, SFX_Cry09_3_Ch8
 
 SFX_Cry0A_3::
-	audio_header SFX_Cry0A_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry0A_3_Ch5
+	channel 6, SFX_Cry0A_3_Ch6
+	channel 8, SFX_Cry0A_3_Ch8
 
 SFX_Cry0B_3::
-	audio_header SFX_Cry0B_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry0B_3_Ch5
+	channel 6, SFX_Cry0B_3_Ch6
+	channel 8, SFX_Cry0B_3_Ch8
 
 SFX_Cry0C_3::
-	audio_header SFX_Cry0C_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry0C_3_Ch5
+	channel 6, SFX_Cry0C_3_Ch6
+	channel 8, SFX_Cry0C_3_Ch8
 
 SFX_Cry0D_3::
-	audio_header SFX_Cry0D_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry0D_3_Ch5
+	channel 6, SFX_Cry0D_3_Ch6
+	channel 8, SFX_Cry0D_3_Ch8
 
 SFX_Cry0E_3::
-	audio_header SFX_Cry0E_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry0E_3_Ch5
+	channel 6, SFX_Cry0E_3_Ch6
+	channel 8, SFX_Cry0E_3_Ch8
 
 SFX_Cry0F_3::
-	audio_header SFX_Cry0F_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry0F_3_Ch5
+	channel 6, SFX_Cry0F_3_Ch6
+	channel 8, SFX_Cry0F_3_Ch8
 
 SFX_Cry10_3::
-	audio_header SFX_Cry10_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry10_3_Ch5
+	channel 6, SFX_Cry10_3_Ch6
+	channel 8, SFX_Cry10_3_Ch8
 
 SFX_Cry11_3::
-	audio_header SFX_Cry11_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry11_3_Ch5
+	channel 6, SFX_Cry11_3_Ch6
+	channel 8, SFX_Cry11_3_Ch8
 
 SFX_Cry12_3::
-	audio_header SFX_Cry12_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry12_3_Ch5
+	channel 6, SFX_Cry12_3_Ch6
+	channel 8, SFX_Cry12_3_Ch8
 
 SFX_Cry13_3::
-	audio_header SFX_Cry13_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry13_3_Ch5
+	channel 6, SFX_Cry13_3_Ch6
+	channel 8, SFX_Cry13_3_Ch8
 
 SFX_Cry14_3::
-	audio_header SFX_Cry14_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry14_3_Ch5
+	channel 6, SFX_Cry14_3_Ch6
+	channel 8, SFX_Cry14_3_Ch8
 
 SFX_Cry15_3::
-	audio_header SFX_Cry15_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry15_3_Ch5
+	channel 6, SFX_Cry15_3_Ch6
+	channel 8, SFX_Cry15_3_Ch8
 
 SFX_Cry16_3::
-	audio_header SFX_Cry16_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry16_3_Ch5
+	channel 6, SFX_Cry16_3_Ch6
+	channel 8, SFX_Cry16_3_Ch8
 
 SFX_Cry17_3::
-	audio_header SFX_Cry17_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry17_3_Ch5
+	channel 6, SFX_Cry17_3_Ch6
+	channel 8, SFX_Cry17_3_Ch8
 
 SFX_Cry18_3::
-	audio_header SFX_Cry18_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry18_3_Ch5
+	channel 6, SFX_Cry18_3_Ch6
+	channel 8, SFX_Cry18_3_Ch8
 
 SFX_Cry19_3::
-	audio_header SFX_Cry19_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry19_3_Ch5
+	channel 6, SFX_Cry19_3_Ch6
+	channel 8, SFX_Cry19_3_Ch8
 
 SFX_Cry1A_3::
-	audio_header SFX_Cry1A_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry1A_3_Ch5
+	channel 6, SFX_Cry1A_3_Ch6
+	channel 8, SFX_Cry1A_3_Ch8
 
 SFX_Cry1B_3::
-	audio_header SFX_Cry1B_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry1B_3_Ch5
+	channel 6, SFX_Cry1B_3_Ch6
+	channel 8, SFX_Cry1B_3_Ch8
 
 SFX_Cry1C_3::
-	audio_header SFX_Cry1C_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry1C_3_Ch5
+	channel 6, SFX_Cry1C_3_Ch6
+	channel 8, SFX_Cry1C_3_Ch8
 
 SFX_Cry1D_3::
-	audio_header SFX_Cry1D_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry1D_3_Ch5
+	channel 6, SFX_Cry1D_3_Ch6
+	channel 8, SFX_Cry1D_3_Ch8
 
 SFX_Cry1E_3::
-	audio_header SFX_Cry1E_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry1E_3_Ch5
+	channel 6, SFX_Cry1E_3_Ch6
+	channel 8, SFX_Cry1E_3_Ch8
 
 SFX_Cry1F_3::
-	audio_header SFX_Cry1F_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry1F_3_Ch5
+	channel 6, SFX_Cry1F_3_Ch6
+	channel 8, SFX_Cry1F_3_Ch8
 
 SFX_Cry20_3::
-	audio_header SFX_Cry20_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry20_3_Ch5
+	channel 6, SFX_Cry20_3_Ch6
+	channel 8, SFX_Cry20_3_Ch8
 
 SFX_Cry21_3::
-	audio_header SFX_Cry21_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry21_3_Ch5
+	channel 6, SFX_Cry21_3_Ch6
+	channel 8, SFX_Cry21_3_Ch8
 
 SFX_Cry22_3::
-	audio_header SFX_Cry22_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry22_3_Ch5
+	channel 6, SFX_Cry22_3_Ch6
+	channel 8, SFX_Cry22_3_Ch8
 
 SFX_Cry23_3::
-	audio_header SFX_Cry23_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry23_3_Ch5
+	channel 6, SFX_Cry23_3_Ch6
+	channel 8, SFX_Cry23_3_Ch8
 
 SFX_Cry24_3::
-	audio_header SFX_Cry24_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry24_3_Ch5
+	channel 6, SFX_Cry24_3_Ch6
+	channel 8, SFX_Cry24_3_Ch8
 
 SFX_Cry25_3::
-	audio_header SFX_Cry25_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry25_3_Ch5
+	channel 6, SFX_Cry25_3_Ch6
+	channel 8, SFX_Cry25_3_Ch8
 
 SFX_Get_Item1_3::
-	audio_header SFX_Get_Item1_3, Ch5, Ch6, Ch7
+	channel_count 3
+	channel 5, SFX_Get_Item1_3_Ch5
+	channel 6, SFX_Get_Item1_3_Ch6
+	channel 7, SFX_Get_Item1_3_Ch7
 
 SFX_Get_Item2_3::
-	audio_header SFX_Get_Item2_3, Ch5, Ch6, Ch7
+	channel_count 3
+	channel 5, SFX_Get_Item2_3_Ch5
+	channel 6, SFX_Get_Item2_3_Ch6
+	channel 7, SFX_Get_Item2_3_Ch7
 
 SFX_Tink_3::
-	audio_header SFX_Tink_3, Ch5
+	channel_count 1
+	channel 5, SFX_Tink_3_Ch5
 
 SFX_Heal_HP_3::
-	audio_header SFX_Heal_HP_3, Ch5
+	channel_count 1
+	channel 5, SFX_Heal_HP_3_Ch5
 
 SFX_Heal_Ailment_3::
-	audio_header SFX_Heal_Ailment_3, Ch5
+	channel_count 1
+	channel 5, SFX_Heal_Ailment_3_Ch5
 
 SFX_Start_Menu_3::
-	audio_header SFX_Start_Menu_3, Ch8
+	channel_count 1
+	channel 8, SFX_Start_Menu_3_Ch8
 
 SFX_Press_AB_3::
-	audio_header SFX_Press_AB_3, Ch5
+	channel_count 1
+	channel 5, SFX_Press_AB_3_Ch5
 
 SFX_Pokedex_Rating_3::
-	audio_header SFX_Pokedex_Rating_3, Ch5, Ch6, Ch7
+	channel_count 3
+	channel 5, SFX_Pokedex_Rating_3_Ch5
+	channel 6, SFX_Pokedex_Rating_3_Ch6
+	channel 7, SFX_Pokedex_Rating_3_Ch7
 
 SFX_Get_Key_Item_3::
-	audio_header SFX_Get_Key_Item_3, Ch5, Ch6, Ch7
+	channel_count 3
+	channel 5, SFX_Get_Key_Item_3_Ch5
+	channel 6, SFX_Get_Key_Item_3_Ch6
+	channel 7, SFX_Get_Key_Item_3_Ch7
 
 SFX_Poisoned_3::
-	audio_header SFX_Poisoned_3, Ch5
+	channel_count 1
+	channel 5, SFX_Poisoned_3_Ch5
 
 SFX_Trade_Machine_3::
-	audio_header SFX_Trade_Machine_3, Ch5
+	channel_count 1
+	channel 5, SFX_Trade_Machine_3_Ch5
 
 SFX_Turn_On_PC_3::
-	audio_header SFX_Turn_On_PC_3, Ch5
+	channel_count 1
+	channel 5, SFX_Turn_On_PC_3_Ch5
 
 SFX_Turn_Off_PC_3::
-	audio_header SFX_Turn_Off_PC_3, Ch5
+	channel_count 1
+	channel 5, SFX_Turn_Off_PC_3_Ch5
 
 SFX_Enter_PC_3::
-	audio_header SFX_Enter_PC_3, Ch5
+	channel_count 1
+	channel 5, SFX_Enter_PC_3_Ch5
 
 SFX_Shrink_3::
-	audio_header SFX_Shrink_3, Ch5
+	channel_count 1
+	channel 5, SFX_Shrink_3_Ch5
 
 SFX_Switch_3::
-	audio_header SFX_Switch_3, Ch5
+	channel_count 1
+	channel 5, SFX_Switch_3_Ch5
 
 SFX_Healing_Machine_3::
-	audio_header SFX_Healing_Machine_3, Ch5
+	channel_count 1
+	channel 5, SFX_Healing_Machine_3_Ch5
 
 SFX_Teleport_Exit1_3::
-	audio_header SFX_Teleport_Exit1_3, Ch5
+	channel_count 1
+	channel 5, SFX_Teleport_Exit1_3_Ch5
 
 SFX_Teleport_Enter1_3::
-	audio_header SFX_Teleport_Enter1_3, Ch5
+	channel_count 1
+	channel 5, SFX_Teleport_Enter1_3_Ch5
 
 SFX_Teleport_Exit2_3::
-	audio_header SFX_Teleport_Exit2_3, Ch5
+	channel_count 1
+	channel 5, SFX_Teleport_Exit2_3_Ch5
 
 SFX_Ledge_3::
-	audio_header SFX_Ledge_3, Ch5
+	channel_count 1
+	channel 5, SFX_Ledge_3_Ch5
 
 SFX_Teleport_Enter2_3::
-	audio_header SFX_Teleport_Enter2_3, Ch8
+	channel_count 1
+	channel 8, SFX_Teleport_Enter2_3_Ch8
 
 SFX_Fly_3::
-	audio_header SFX_Fly_3, Ch8
+	channel_count 1
+	channel 8, SFX_Fly_3_Ch8
 
 SFX_Denied_3::
-	audio_header SFX_Denied_3, Ch5, Ch6
+	channel_count 2
+	channel 5, SFX_Denied_3_Ch5
+	channel 6, SFX_Denied_3_Ch6
 
 SFX_Arrow_Tiles_3::
-	audio_header SFX_Arrow_Tiles_3, Ch5
+	channel_count 1
+	channel 5, SFX_Arrow_Tiles_3_Ch5
 
 SFX_Push_Boulder_3::
-	audio_header SFX_Push_Boulder_3, Ch8
+	channel_count 1
+	channel 8, SFX_Push_Boulder_3_Ch8
 
 SFX_SS_Anne_Horn_3::
-	audio_header SFX_SS_Anne_Horn_3, Ch5, Ch6
+	channel_count 2
+	channel 5, SFX_SS_Anne_Horn_3_Ch5
+	channel 6, SFX_SS_Anne_Horn_3_Ch6
 
 SFX_Withdraw_Deposit_3::
-	audio_header SFX_Withdraw_Deposit_3, Ch5
+	channel_count 1
+	channel 5, SFX_Withdraw_Deposit_3_Ch5
 
 SFX_Cut_3::
-	audio_header SFX_Cut_3, Ch8
+	channel_count 1
+	channel 8, SFX_Cut_3_Ch8
 
 SFX_Go_Inside_3::
-	audio_header SFX_Go_Inside_3, Ch8
+	channel_count 1
+	channel 8, SFX_Go_Inside_3_Ch8
 
 SFX_Swap_3::
-	audio_header SFX_Swap_3, Ch5, Ch6
+	channel_count 2
+	channel 5, SFX_Swap_3_Ch5
+	channel 6, SFX_Swap_3_Ch6
 
 SFX_59_3::
-	audio_header SFX_59_3, Ch5, Ch6
+	channel_count 2
+	channel 5, SFX_59_3_Ch5
+	channel 6, SFX_59_3_Ch6
 
 SFX_Purchase_3::
-	audio_header SFX_Purchase_3, Ch5, Ch6
+	channel_count 2
+	channel 5, SFX_Purchase_3_Ch5
+	channel 6, SFX_Purchase_3_Ch6
 
 SFX_Collision_3::
-	audio_header SFX_Collision_3, Ch5
+	channel_count 1
+	channel 5, SFX_Collision_3_Ch5
 
 SFX_Go_Outside_3::
-	audio_header SFX_Go_Outside_3, Ch8
+	channel_count 1
+	channel 8, SFX_Go_Outside_3_Ch8
 
 SFX_Save_3::
-	audio_header SFX_Save_3, Ch5, Ch6
+	channel_count 2
+	channel 5, SFX_Save_3_Ch5
+	channel 6, SFX_Save_3_Ch6
 
 SFX_Intro_Lunge::
-	audio_header SFX_Intro_Lunge, Ch8
+	channel_count 1
+	channel 8, SFX_Intro_Lunge_Ch8
 
 SFX_Intro_Hip::
-	audio_header SFX_Intro_Hip, Ch5
+	channel_count 1
+	channel 5, SFX_Intro_Hip_Ch5
 
 SFX_Intro_Hop::
-	audio_header SFX_Intro_Hop, Ch5
+	channel_count 1
+	channel 5, SFX_Intro_Hop_Ch5
 
 SFX_Intro_Raise::
-	audio_header SFX_Intro_Raise, Ch8
+	channel_count 1
+	channel 8, SFX_Intro_Raise_Ch8
 
 SFX_Intro_Crash::
-	audio_header SFX_Intro_Crash, Ch8
+	channel_count 1
+	channel 8, SFX_Intro_Crash_Ch8
 
 SFX_Intro_Whoosh::
-	audio_header SFX_Intro_Whoosh, Ch8
+	channel_count 1
+	channel 8, SFX_Intro_Whoosh_Ch8
 
 SFX_Slots_Stop_Wheel::
-	audio_header SFX_Slots_Stop_Wheel, Ch5
+	channel_count 1
+	channel 5, SFX_Slots_Stop_Wheel_Ch5
 
 SFX_Slots_Reward::
-	audio_header SFX_Slots_Reward, Ch5
+	channel_count 1
+	channel 5, SFX_Slots_Reward_Ch5
 
 SFX_Slots_New_Spin::
-	audio_header SFX_Slots_New_Spin, Ch5, Ch6
+	channel_count 2
+	channel 5, SFX_Slots_New_Spin_Ch5
+	channel 6, SFX_Slots_New_Spin_Ch6
 
 SFX_Shooting_Star::
-	audio_header SFX_Shooting_Star, Ch5
+	channel_count 1
+	channel 5, SFX_Shooting_Star_Ch5
diff --git a/audio/headers/sfxheaders4.asm b/audio/headers/sfxheaders4.asm
index d371d3f8..fc2c6166 100644
--- a/audio/headers/sfxheaders4.asm
+++ b/audio/headers/sfxheaders4.asm
@@ -2,211 +2,363 @@ SFX_Headers_4::
 	db $ff, $ff, $ff ; padding
 
 SFX_Noise_Instrument01_4::
-	audio_header SFX_Noise_Instrument01_4, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument01_4_Ch8
 
 SFX_Noise_Instrument02_4::
-	audio_header SFX_Noise_Instrument02_4, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument02_4_Ch8
 
 SFX_Noise_Instrument03_4::
-	audio_header SFX_Noise_Instrument03_4, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument03_4_Ch8
 
 SFX_Noise_Instrument04_4::
-	audio_header SFX_Noise_Instrument04_4, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument04_4_Ch8
 
 SFX_Noise_Instrument05_4::
-	audio_header SFX_Noise_Instrument05_4, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument05_4_Ch8
 
 SFX_Noise_Instrument06_4::
-	audio_header SFX_Noise_Instrument06_4, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument06_4_Ch8
 
 SFX_Noise_Instrument07_4::
-	audio_header SFX_Noise_Instrument07_4, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument07_4_Ch8
 
 SFX_Noise_Instrument08_4::
-	audio_header SFX_Noise_Instrument08_4, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument08_4_Ch8
 
 SFX_Noise_Instrument09_4::
-	audio_header SFX_Noise_Instrument09_4, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument09_4_Ch8
 
 SFX_Noise_Instrument10_4::
-	audio_header SFX_Noise_Instrument10_4, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument10_4_Ch8
 
 SFX_Noise_Instrument11_4::
-	audio_header SFX_Noise_Instrument11_4, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument11_4_Ch8
 
 SFX_Noise_Instrument12_4::
-	audio_header SFX_Noise_Instrument12_4, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument12_4_Ch8
 
 SFX_Noise_Instrument13_4::
-	audio_header SFX_Noise_Instrument13_4, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument13_4_Ch8
 
 SFX_Noise_Instrument14_4::
-	audio_header SFX_Noise_Instrument14_4, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument14_4_Ch8
 
 SFX_Noise_Instrument15_4::
-	audio_header SFX_Noise_Instrument15_4, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument15_4_Ch8
 
 SFX_Noise_Instrument16_4::
-	audio_header SFX_Noise_Instrument16_4, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument16_4_Ch8
 
 SFX_Noise_Instrument17_4::
-	audio_header SFX_Noise_Instrument17_4, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument17_4_Ch8
 
 SFX_Noise_Instrument18_4::
-	audio_header SFX_Noise_Instrument18_4, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument18_4_Ch8
 
 SFX_Noise_Instrument19_4::
-	audio_header SFX_Noise_Instrument19_4, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument19_4_Ch8
 
 SFX_Cry00_4::
-	audio_header SFX_Cry00_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry00_4_Ch5
+	channel 6, SFX_Cry00_4_Ch6
+	channel 8, SFX_Cry00_4_Ch8
 
 SFX_Cry01_4::
-	audio_header SFX_Cry01_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry01_4_Ch5
+	channel 6, SFX_Cry01_4_Ch6
+	channel 8, SFX_Cry01_4_Ch8
 
 SFX_Cry02_4::
-	audio_header SFX_Cry02_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry02_4_Ch5
+	channel 6, SFX_Cry02_4_Ch6
+	channel 8, SFX_Cry02_4_Ch8
 
 SFX_Cry03_4::
-	audio_header SFX_Cry03_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry03_4_Ch5
+	channel 6, SFX_Cry03_4_Ch6
+	channel 8, SFX_Cry03_4_Ch8
 
 SFX_Cry04_4::
-	audio_header SFX_Cry04_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry04_4_Ch5
+	channel 6, SFX_Cry04_4_Ch6
+	channel 8, SFX_Cry04_4_Ch8
 
 SFX_Cry05_4::
-	audio_header SFX_Cry05_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry05_4_Ch5
+	channel 6, SFX_Cry05_4_Ch6
+	channel 8, SFX_Cry05_4_Ch8
 
 SFX_Cry06_4::
-	audio_header SFX_Cry06_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry06_4_Ch5
+	channel 6, SFX_Cry06_4_Ch6
+	channel 8, SFX_Cry06_4_Ch8
 
 SFX_Cry07_4::
-	audio_header SFX_Cry07_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry07_4_Ch5
+	channel 6, SFX_Cry07_4_Ch6
+	channel 8, SFX_Cry07_4_Ch8
 
 SFX_Cry08_4::
-	audio_header SFX_Cry08_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry08_4_Ch5
+	channel 6, SFX_Cry08_4_Ch6
+	channel 8, SFX_Cry08_4_Ch8
 
 SFX_Cry09_4::
-	audio_header SFX_Cry09_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry09_4_Ch5
+	channel 6, SFX_Cry09_4_Ch6
+	channel 8, SFX_Cry09_4_Ch8
 
 SFX_Cry0A_4::
-	audio_header SFX_Cry0A_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry0A_4_Ch5
+	channel 6, SFX_Cry0A_4_Ch6
+	channel 8, SFX_Cry0A_4_Ch8
 
 SFX_Cry0B_4::
-	audio_header SFX_Cry0B_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry0B_4_Ch5
+	channel 6, SFX_Cry0B_4_Ch6
+	channel 8, SFX_Cry0B_4_Ch8
 
 SFX_Cry0C_4::
-	audio_header SFX_Cry0C_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry0C_4_Ch5
+	channel 6, SFX_Cry0C_4_Ch6
+	channel 8, SFX_Cry0C_4_Ch8
 
 SFX_Cry0D_4::
-	audio_header SFX_Cry0D_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry0D_4_Ch5
+	channel 6, SFX_Cry0D_4_Ch6
+	channel 8, SFX_Cry0D_4_Ch8
 
 SFX_Cry0E_4::
-	audio_header SFX_Cry0E_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry0E_4_Ch5
+	channel 6, SFX_Cry0E_4_Ch6
+	channel 8, SFX_Cry0E_4_Ch8
 
 SFX_Cry0F_4::
-	audio_header SFX_Cry0F_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry0F_4_Ch5
+	channel 6, SFX_Cry0F_4_Ch6
+	channel 8, SFX_Cry0F_4_Ch8
 
 SFX_Cry10_4::
-	audio_header SFX_Cry10_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry10_4_Ch5
+	channel 6, SFX_Cry10_4_Ch6
+	channel 8, SFX_Cry10_4_Ch8
 
 SFX_Cry11_4::
-	audio_header SFX_Cry11_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry11_4_Ch5
+	channel 6, SFX_Cry11_4_Ch6
+	channel 8, SFX_Cry11_4_Ch8
 
 SFX_Cry12_4::
-	audio_header SFX_Cry12_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry12_4_Ch5
+	channel 6, SFX_Cry12_4_Ch6
+	channel 8, SFX_Cry12_4_Ch8
 
 SFX_Cry13_4::
-	audio_header SFX_Cry13_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry13_4_Ch5
+	channel 6, SFX_Cry13_4_Ch6
+	channel 8, SFX_Cry13_4_Ch8
 
 SFX_Cry14_4::
-	audio_header SFX_Cry14_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry14_4_Ch5
+	channel 6, SFX_Cry14_4_Ch6
+	channel 8, SFX_Cry14_4_Ch8
 
 SFX_Cry15_4::
-	audio_header SFX_Cry15_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry15_4_Ch5
+	channel 6, SFX_Cry15_4_Ch6
+	channel 8, SFX_Cry15_4_Ch8
 
 SFX_Cry16_4::
-	audio_header SFX_Cry16_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry16_4_Ch5
+	channel 6, SFX_Cry16_4_Ch6
+	channel 8, SFX_Cry16_4_Ch8
 
 SFX_Cry17_4::
-	audio_header SFX_Cry17_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry17_4_Ch5
+	channel 6, SFX_Cry17_4_Ch6
+	channel 8, SFX_Cry17_4_Ch8
 
 SFX_Cry18_4::
-	audio_header SFX_Cry18_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry18_4_Ch5
+	channel 6, SFX_Cry18_4_Ch6
+	channel 8, SFX_Cry18_4_Ch8
 
 SFX_Cry19_4::
-	audio_header SFX_Cry19_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry19_4_Ch5
+	channel 6, SFX_Cry19_4_Ch6
+	channel 8, SFX_Cry19_4_Ch8
 
 SFX_Cry1A_4::
-	audio_header SFX_Cry1A_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry1A_4_Ch5
+	channel 6, SFX_Cry1A_4_Ch6
+	channel 8, SFX_Cry1A_4_Ch8
 
 SFX_Cry1B_4::
-	audio_header SFX_Cry1B_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry1B_4_Ch5
+	channel 6, SFX_Cry1B_4_Ch6
+	channel 8, SFX_Cry1B_4_Ch8
 
 SFX_Cry1C_4::
-	audio_header SFX_Cry1C_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry1C_4_Ch5
+	channel 6, SFX_Cry1C_4_Ch6
+	channel 8, SFX_Cry1C_4_Ch8
 
 SFX_Cry1D_4::
-	audio_header SFX_Cry1D_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry1D_4_Ch5
+	channel 6, SFX_Cry1D_4_Ch6
+	channel 8, SFX_Cry1D_4_Ch8
 
 SFX_Cry1E_4::
-	audio_header SFX_Cry1E_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry1E_4_Ch5
+	channel 6, SFX_Cry1E_4_Ch6
+	channel 8, SFX_Cry1E_4_Ch8
 
 SFX_Cry1F_4::
-	audio_header SFX_Cry1F_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry1F_4_Ch5
+	channel 6, SFX_Cry1F_4_Ch6
+	channel 8, SFX_Cry1F_4_Ch8
 
 SFX_Cry20_4::
-	audio_header SFX_Cry20_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry20_4_Ch5
+	channel 6, SFX_Cry20_4_Ch6
+	channel 8, SFX_Cry20_4_Ch8
 
 SFX_Cry21_4::
-	audio_header SFX_Cry21_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry21_4_Ch5
+	channel 6, SFX_Cry21_4_Ch6
+	channel 8, SFX_Cry21_4_Ch8
 
 SFX_Cry22_4::
-	audio_header SFX_Cry22_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry22_4_Ch5
+	channel 6, SFX_Cry22_4_Ch6
+	channel 8, SFX_Cry22_4_Ch8
 
 SFX_Cry23_4::
-	audio_header SFX_Cry23_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry23_4_Ch5
+	channel 6, SFX_Cry23_4_Ch6
+	channel 8, SFX_Cry23_4_Ch8
 
 SFX_Cry24_4::
-	audio_header SFX_Cry24_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry24_4_Ch5
+	channel 6, SFX_Cry24_4_Ch6
+	channel 8, SFX_Cry24_4_Ch8
 
 SFX_Cry25_4::
-	audio_header SFX_Cry25_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry25_4_Ch5
+	channel 6, SFX_Cry25_4_Ch6
+	channel 8, SFX_Cry25_4_Ch8
 
 SFX_Get_Item1_4::
-	audio_header SFX_Get_Item1_4, Ch5, Ch6, Ch7
+	channel_count 3
+	channel 5, SFX_Get_Item1_4_Ch5
+	channel 6, SFX_Get_Item1_4_Ch6
+	channel 7, SFX_Get_Item1_4_Ch7
 
 SFX_Get_Item2_4::
-	audio_header SFX_Get_Item2_4, Ch5, Ch6, Ch7
+	channel_count 3
+	channel 5, SFX_Get_Item2_4_Ch5
+	channel 6, SFX_Get_Item2_4_Ch6
+	channel 7, SFX_Get_Item2_4_Ch7
 
 SFX_Tink_4::
-	audio_header SFX_Tink_4, Ch5
+	channel_count 1
+	channel 5, SFX_Tink_4_Ch5
 
 SFX_Heal_HP_4::
-	audio_header SFX_Heal_HP_4, Ch5
+	channel_count 1
+	channel 5, SFX_Heal_HP_4_Ch5
 
 SFX_Heal_Ailment_4::
-	audio_header SFX_Heal_Ailment_4, Ch5
+	channel_count 1
+	channel 5, SFX_Heal_Ailment_4_Ch5
 
 SFX_Start_Menu_4::
-	audio_header SFX_Start_Menu_4, Ch8
+	channel_count 1
+	channel 8, SFX_Start_Menu_4_Ch8
 
 SFX_Press_AB_4::
-	audio_header SFX_Press_AB_4, Ch5
+	channel_count 1
+	channel 5, SFX_Press_AB_4_Ch5
 
 SFX_Surfing_Jump::
-	audio_header SFX_Surfing_Jump, Ch8
+	channel_count 1
+	channel 8, SFX_Surfing_Jump_Ch8
 
 SFX_Surfing_Flip::
-	audio_header SFX_Surfing_Flip, Ch5
+	channel_count 1
+	channel 5, SFX_Surfing_Flip_Ch5
 
 SFX_Surfing_Crash::
-	audio_header SFX_Surfing_Crash, Ch8
+	channel_count 1
+	channel 8, SFX_Surfing_Crash_Ch8
 
 SFX_Unknown_802cc::
-	audio_header SFX_Unknown_802cc, Ch5
+	channel_count 1
+	channel 5, SFX_Unknown_802cc_Ch5
 
 SFX_Surfing_Land::
-	audio_header SFX_Surfing_Land, Ch8
+	channel_count 1
+	channel 8, SFX_Surfing_Land_Ch8
 
 SFX_Get_Item2_4_2::
-	audio_header SFX_Get_Item2_4_2, Ch5, Ch6, Ch7
+	channel_count 3
+	channel 5, SFX_Get_Item2_4_2_Ch5
+	channel 6, SFX_Get_Item2_4_2_Ch6
+	channel 7, SFX_Get_Item2_4_2_Ch7