8 files changed, 1080 insertions, 1531 deletions

diff --git a/audio/headers/musicheaders1.asm b/audio/headers/musicheaders1.asm
index 5a762b30..665efceb 100755..100644
--- a/audio/headers/musicheaders1.asm
+++ b/audio/headers/musicheaders1.asm
@@ -1,184 +1,115 @@
 Music_PalletTown::
-	db ( $80 | CH0 )
-	dw Music_PalletTown_Ch1
-	db CH1
-	dw Music_PalletTown_Ch2
-	db CH2
-	dw Music_PalletTown_Ch3
+	dbw ( $80 | CH0 ), Music_PalletTown_Ch1
+	dbw CH1, Music_PalletTown_Ch2
+	dbw CH2, Music_PalletTown_Ch3
 
 Music_Pokecenter::
-	db ( $80 | CH0 )
-	dw Music_Pokecenter_Ch1
-	db CH1
-	dw Music_Pokecenter_Ch2
-	db CH2
-	dw Music_Pokecenter_Ch3
+	dbw ( $80 | CH0 ), Music_Pokecenter_Ch1
+	dbw CH1, Music_Pokecenter_Ch2
+	dbw CH2, Music_Pokecenter_Ch3
 
 Music_Gym::
-	db ( $80 | CH0 )
-	dw Music_Gym_Ch1
-	db CH1
-	dw Music_Gym_Ch2
-	db CH2
-	dw Music_Gym_Ch3
+	dbw ( $80 | CH0 ), Music_Gym_Ch1
+	dbw CH1, Music_Gym_Ch2
+	dbw CH2, Music_Gym_Ch3
 
 ; Viridian City, Pewter City, Saffron City
 Music_Cities1::
-	db ( $C0 | CH0 )
-	dw Music_Cities1_Ch1
-	db CH1
-	dw Music_Cities1_Ch2
-	db CH2
-	dw Music_Cities1_Ch3
-	db CH3
-	dw Music_Cities1_Ch4
+	dbw ( $C0 | CH0 ), Music_Cities1_Ch1
+	dbw CH1, Music_Cities1_Ch2
+	dbw CH2, Music_Cities1_Ch3
+	dbw CH3, Music_Cities1_Ch4
 
 ; Cerulean City, Fuchsia City
 Music_Cities2::
-	db ( $80 | CH0 )
-	dw Music_Cities2_Ch1
-	db CH1
-	dw Music_Cities2_Ch2
-	db CH2
-	dw Music_Cities2_Ch3
+	dbw ( $80 | CH0 ), Music_Cities2_Ch1
+	dbw CH1, Music_Cities2_Ch2
+	dbw CH2, Music_Cities2_Ch3
 
 Music_Celadon::
-	db ( $80 | CH0 )
-	dw Music_Celadon_Ch1
-	db CH1
-	dw Music_Celadon_Ch2
-	db CH2
-	dw Music_Celadon_Ch3
+	dbw ( $80 | CH0 ), Music_Celadon_Ch1
+	dbw CH1, Music_Celadon_Ch2
+	dbw CH2, Music_Celadon_Ch3
 
 Music_Cinnabar::
-	db ( $80 | CH0 )
-	dw Music_Cinnabar_Ch1
-	db CH1
-	dw Music_Cinnabar_Ch2
-	db CH2
-	dw Music_Cinnabar_Ch3
+	dbw ( $80 | CH0 ), Music_Cinnabar_Ch1
+	dbw CH1, Music_Cinnabar_Ch2
+	dbw CH2, Music_Cinnabar_Ch3
 
 Music_Vermilion::
-	db ( $C0 | CH0 )
-	dw Music_Vermilion_Ch1
-	db CH1
-	dw Music_Vermilion_Ch2
-	db CH2
-	dw Music_Vermilion_Ch3
-	db CH3
-	dw Music_Vermilion_Ch4
+	dbw ( $C0 | CH0 ), Music_Vermilion_Ch1
+	dbw CH1, Music_Vermilion_Ch2
+	dbw CH2, Music_Vermilion_Ch3
+	dbw CH3, Music_Vermilion_Ch4
 
 Music_Lavender::
-	db ( $C0 | CH0 )
-	dw Music_Lavender_Ch1
-	db CH1
-	dw Music_Lavender_Ch2
-	db CH2
-	dw Music_Lavender_Ch3
-	db CH3
-	dw Music_Lavender_Ch4
+	dbw ( $C0 | CH0 ), Music_Lavender_Ch1
+	dbw CH1, Music_Lavender_Ch2
+	dbw CH2, Music_Lavender_Ch3
+	dbw CH3, Music_Lavender_Ch4
 
 Music_SSAnne::
-	db ( $80 | CH0 )
-	dw Music_SSAnne_Ch1
-	db CH1
-	dw Music_SSAnne_Ch2
-	db CH2
-	dw Music_SSAnne_Ch3
+	dbw ( $80 | CH0 ), Music_SSAnne_Ch1
+	dbw CH1, Music_SSAnne_Ch2
+	dbw CH2, Music_SSAnne_Ch3
 
 Music_MeetProfOak::
-	db ( $80 | CH0 )
-	dw Music_MeetProfOak_Ch1
-	db CH1
-	dw Music_MeetProfOak_Ch2
-	db CH2
-	dw Music_MeetProfOak_Ch3
+	dbw ( $80 | CH0 ), Music_MeetProfOak_Ch1
+	dbw CH1, Music_MeetProfOak_Ch2
+	dbw CH2, Music_MeetProfOak_Ch3
 
 Music_MeetRival::
-	db ( $80 | CH0 )
-	dw Music_MeetRival_Ch1
-	db CH1
-	dw Music_MeetRival_Ch2
-	db CH2
-	dw Music_MeetRival_Ch3
+	dbw ( $80 | CH0 ), Music_MeetRival_Ch1
+	dbw CH1, Music_MeetRival_Ch2
+	dbw CH2, Music_MeetRival_Ch3
 
 Music_MuseumGuy::
-	db ( $C0 | CH0 )
-	dw Music_MuseumGuy_Ch1
-	db CH1
-	dw Music_MuseumGuy_Ch2
-	db CH2
-	dw Music_MuseumGuy_Ch3
-	db CH3
-	dw Music_MuseumGuy_Ch4
+	dbw ( $C0 | CH0 ), Music_MuseumGuy_Ch1
+	dbw CH1, Music_MuseumGuy_Ch2
+	dbw CH2, Music_MuseumGuy_Ch3
+	dbw CH3, Music_MuseumGuy_Ch4
 
 Music_SafariZone::
-	db ( $80 | CH0 )
-	dw Music_SafariZone_Ch1
-	db CH1
-	dw Music_SafariZone_Ch2
-	db CH2
-	dw Music_SafariZone_Ch3
+	dbw ( $80 | CH0 ), Music_SafariZone_Ch1
+	dbw CH1, Music_SafariZone_Ch2
+	dbw CH2, Music_SafariZone_Ch3
 
 Music_PkmnHealed::
-	db ( $80 | CH0 )
-	dw Music_PkmnHealed_Ch1
-	db CH1
-	dw Music_PkmnHealed_Ch2
-	db CH2
-	dw Music_PkmnHealed_Ch3
+	dbw ( $80 | CH0 ), Music_PkmnHealed_Ch1
+	dbw CH1, Music_PkmnHealed_Ch2
+	dbw CH2, Music_PkmnHealed_Ch3
 
 ; Routes 1 and 2
 Music_Routes1::
-	db ( $C0 | CH0 )
-	dw Music_Routes1_Ch1
-	db CH1
-	dw Music_Routes1_Ch2
-	db CH2
-	dw Music_Routes1_Ch3
-	db CH3
-	dw Music_Routes1_Ch4
+	dbw ( $C0 | CH0 ), Music_Routes1_Ch1
+	dbw CH1, Music_Routes1_Ch2
+	dbw CH2, Music_Routes1_Ch3
+	dbw CH3, Music_Routes1_Ch4
 
 ; Routes 24 and 25
 Music_Routes2::
-	db ( $C0 | CH0 )
-	dw Music_Routes2_Ch1
-	db CH1
-	dw Music_Routes2_Ch2
-	db CH2
-	dw Music_Routes2_Ch3
-	db CH3
-	dw Music_Routes2_Ch4
+	dbw ( $C0 | CH0 ), Music_Routes2_Ch1
+	dbw CH1, Music_Routes2_Ch2
+	dbw CH2, Music_Routes2_Ch3
+	dbw CH3, Music_Routes2_Ch4
 
 ; Routes 3, 4, 5, 6, 7, 8, 9, 10, 16, 17, 18, 19, 20, 21, 22
 Music_Routes3::
-	db ( $C0 | CH0 )
-	dw Music_Routes3_Ch1
-	db CH1
-	dw Music_Routes3_Ch2
-	db CH2
-	dw Music_Routes3_Ch3
-	db CH3
-	dw Music_Routes3_Ch4
+	dbw ( $C0 | CH0 ), Music_Routes3_Ch1
+	dbw CH1, Music_Routes3_Ch2
+	dbw CH2, Music_Routes3_Ch3
+	dbw CH3, Music_Routes3_Ch4
 
 ; Routes 11, 12, 13, 14, 15
 Music_Routes4::
-	db ( $C0 | CH0 )
-	dw Music_Routes4_Ch1
-	db CH1
-	dw Music_Routes4_Ch2
-	db CH2
-	dw Music_Routes4_Ch3
-	db CH3
-	dw Music_Routes4_Ch4
+	dbw ( $C0 | CH0 ), Music_Routes4_Ch1
+	dbw CH1, Music_Routes4_Ch2
+	dbw CH2, Music_Routes4_Ch3
+	dbw CH3, Music_Routes4_Ch4
 
 ; Route 23, Indigo Plateau
 Music_IndigoPlateau::
-	db ( $C0 | CH0 )
-	dw Music_IndigoPlateau_Ch1
-	db CH1
-	dw Music_IndigoPlateau_Ch2
-	db CH2
-	dw Music_IndigoPlateau_Ch3
-	db CH3
-	dw Music_IndigoPlateau_Ch4
+	dbw ( $C0 | CH0 ), Music_IndigoPlateau_Ch1
+	dbw CH1, Music_IndigoPlateau_Ch2
+	dbw CH2, Music_IndigoPlateau_Ch3
+	dbw CH3, Music_IndigoPlateau_Ch4
diff --git a/audio/headers/musicheaders2.asm b/audio/headers/musicheaders2.asm
index 8adc039a..7df3f8bf 100755..100644
--- a/audio/headers/musicheaders2.asm
+++ b/audio/headers/musicheaders2.asm
@@ -1,55 +1,34 @@
 Music_GymLeaderBattle::
-	db ( $80 | CH0 )
-	dw Music_GymLeaderBattle_Ch1
-	db CH1
-	dw Music_GymLeaderBattle_Ch2
-	db CH2
-	dw Music_GymLeaderBattle_Ch3
+	dbw ( $80 | CH0 ), Music_GymLeaderBattle_Ch1
+	dbw CH1, Music_GymLeaderBattle_Ch2
+	dbw CH2, Music_GymLeaderBattle_Ch3
 
 Music_TrainerBattle::
-	db ( $80 | CH0 )
-	dw Music_TrainerBattle_Ch1
-	db CH1
-	dw Music_TrainerBattle_Ch2
-	db CH2
-	dw Music_TrainerBattle_Ch3
+	dbw ( $80 | CH0 ), Music_TrainerBattle_Ch1
+	dbw CH1, Music_TrainerBattle_Ch2
+	dbw CH2, Music_TrainerBattle_Ch3
 
 Music_WildBattle::
-	db ( $80 | CH0 )
-	dw Music_WildBattle_Ch1
-	db CH1
-	dw Music_WildBattle_Ch2
-	db CH2
-	dw Music_WildBattle_Ch3
+	dbw ( $80 | CH0 ), Music_WildBattle_Ch1
+	dbw CH1, Music_WildBattle_Ch2
+	dbw CH2, Music_WildBattle_Ch3
 
 Music_FinalBattle::
-	db ( $80 | CH0 )
-	dw Music_FinalBattle_Ch1
-	db CH1
-	dw Music_FinalBattle_Ch2
-	db CH2
-	dw Music_FinalBattle_Ch3
+	dbw ( $80 | CH0 ), Music_FinalBattle_Ch1
+	dbw CH1, Music_FinalBattle_Ch2
+	dbw CH2, Music_FinalBattle_Ch3
 
 Music_DefeatedTrainer::
-	db ( $80 | CH0 )
-	dw Music_DefeatedTrainer_Ch1
-	db CH1
-	dw Music_DefeatedTrainer_Ch2
-	db CH2
-	dw Music_DefeatedTrainer_Ch3
+	dbw ( $80 | CH0 ), Music_DefeatedTrainer_Ch1
+	dbw CH1, Music_DefeatedTrainer_Ch2
+	dbw CH2, Music_DefeatedTrainer_Ch3
 
 Music_DefeatedWildMon::
-	db ( $80 | CH0 )
-	dw Music_DefeatedWildMon_Ch1
-	db CH1
-	dw Music_DefeatedWildMon_Ch2
-	db CH2
-	dw Music_DefeatedWildMon_Ch3
+	dbw ( $80 | CH0 ), Music_DefeatedWildMon_Ch1
+	dbw CH1, Music_DefeatedWildMon_Ch2
+	dbw CH2, Music_DefeatedWildMon_Ch3
 
 Music_DefeatedGymLeader::
-	db ( $80 | CH0 )
-	dw Music_DefeatedGymLeader_Ch1
-	db CH1
-	dw Music_DefeatedGymLeader_Ch2
-	db CH2
-	dw Music_DefeatedGymLeader_Ch3
+	dbw ( $80 | CH0 ), Music_DefeatedGymLeader_Ch1
+	dbw CH1, Music_DefeatedGymLeader_Ch2
+	dbw CH2, Music_DefeatedGymLeader_Ch3
diff --git a/audio/headers/musicheaders3.asm b/audio/headers/musicheaders3.asm
index 1c54b266..c694be9b 100755..100644
--- a/audio/headers/musicheaders3.asm
+++ b/audio/headers/musicheaders3.asm
@@ -1,158 +1,97 @@
 Music_TitleScreen::
-	db ( $C0 | CH0 )
-	dw Music_TitleScreen_Ch1
-	db CH1
-	dw Music_TitleScreen_Ch2
-	db CH2
-	dw Music_TitleScreen_Ch3
-	db CH3
-	dw Music_TitleScreen_Ch4
+	dbw ( $C0 | CH0 ), Music_TitleScreen_Ch1
+	dbw CH1, Music_TitleScreen_Ch2
+	dbw CH2, Music_TitleScreen_Ch3
+	dbw CH3, Music_TitleScreen_Ch4
 
 Music_Credits::
-	db ( $80 | CH0 )
-	dw Music_Credits_Ch1
-	db CH1
-	dw Music_Credits_Ch2
-	db CH2
-	dw Music_Credits_Ch3
+	dbw ( $80 | CH0 ), Music_Credits_Ch1
+	dbw CH1, Music_Credits_Ch2
+	dbw CH2, Music_Credits_Ch3
 
 Music_HallOfFame::
-	db ( $80 | CH0 )
-	dw Music_HallOfFame_Ch1
-	db CH1
-	dw Music_HallOfFame_Ch2
-	db CH2
-	dw Music_HallOfFame_Ch3
+	dbw ( $80 | CH0 ), Music_HallOfFame_Ch1
+	dbw CH1, Music_HallOfFame_Ch2
+	dbw CH2, Music_HallOfFame_Ch3
 
 Music_OaksLab::
-	db ( $80 | CH0 )
-	dw Music_OaksLab_Ch1
-	db CH1
-	dw Music_OaksLab_Ch2
-	db CH2
-	dw Music_OaksLab_Ch3
+	dbw ( $80 | CH0 ), Music_OaksLab_Ch1
+	dbw CH1, Music_OaksLab_Ch2
+	dbw CH2, Music_OaksLab_Ch3
 
 Music_JigglypuffSong::
-	db $40
-	dw Music_JigglypuffSong_Ch1
-	db CH1
-	dw Music_JigglypuffSong_Ch2
+	dbw $40, Music_JigglypuffSong_Ch1
+	dbw CH1, Music_JigglypuffSong_Ch2
 
 Music_BikeRiding::
-	db ( $C0 | CH0 )
-	dw Music_BikeRiding_Ch1
-	db CH1
-	dw Music_BikeRiding_Ch2
-	db CH2
-	dw Music_BikeRiding_Ch3
-	db CH3
-	dw Music_BikeRiding_Ch4
+	dbw ( $C0 | CH0 ), Music_BikeRiding_Ch1
+	dbw CH1, Music_BikeRiding_Ch2
+	dbw CH2, Music_BikeRiding_Ch3
+	dbw CH3, Music_BikeRiding_Ch4
 
 Music_Surfing::
-	db ( $80 | CH0 )
-	dw Music_Surfing_Ch1
-	db CH1
-	dw Music_Surfing_Ch2
-	db CH2
-	dw Music_Surfing_Ch3
+	dbw ( $80 | CH0 ), Music_Surfing_Ch1
+	dbw CH1, Music_Surfing_Ch2
+	dbw CH2, Music_Surfing_Ch3
 
 Music_GameCorner::
-	db ( $80 | CH0 )
-	dw Music_GameCorner_Ch1
-	db CH1
-	dw Music_GameCorner_Ch2
-	db CH2
-	dw Music_GameCorner_Ch3
+	dbw ( $80 | CH0 ), Music_GameCorner_Ch1
+	dbw CH1, Music_GameCorner_Ch2
+	dbw CH2, Music_GameCorner_Ch3
 
 Music_IntroBattle::
-	db ( $C0 | CH0 )
-	dw Music_IntroBattle_Ch1
-	db CH1
-	dw Music_IntroBattle_Ch2
-	db CH2
-	dw Music_IntroBattle_Ch3
-	db CH3
-	dw Music_IntroBattle_Ch4
+	dbw ( $80 | CH0 ), Music_YellowIntro_Ch1
+	dbw CH1, Music_YellowIntro_Ch2
+	dbw CH2, Music_YellowIntro_Ch3
 
 ; Power Plant, Unknown Dungeon, Rocket HQ
 Music_Dungeon1::
-	db ( $C0 | CH0 )
-	dw Music_Dungeon1_Ch1
-	db CH1
-	dw Music_Dungeon1_Ch2
-	db CH2
-	dw Music_Dungeon1_Ch3
-	db CH3
-	dw Music_Dungeon1_Ch4
+	dbw ( $C0 | CH0 ), Music_Dungeon1_Ch1
+	dbw CH1, Music_Dungeon1_Ch2
+	dbw CH2, Music_Dungeon1_Ch3
+	dbw CH3, Music_Dungeon1_Ch4
 
 ; Viridian Forest, Seafoam Islands
 Music_Dungeon2::
-	db ( $C0 | CH0 )
-	dw Music_Dungeon2_Ch1
-	db CH1
-	dw Music_Dungeon2_Ch2
-	db CH2
-	dw Music_Dungeon2_Ch3
-	db CH3
-	dw Music_Dungeon2_Ch4
+	dbw ( $C0 | CH0 ), Music_Dungeon2_Ch1
+	dbw CH1, Music_Dungeon2_Ch2
+	dbw CH2, Music_Dungeon2_Ch3
+	dbw CH3, Music_Dungeon2_Ch4
 
 ; Mt. Moon, Rock Tunnel, Victory Road
 Music_Dungeon3::
-	db ( $C0 | CH0 )
-	dw Music_Dungeon3_Ch1
-	db CH1
-	dw Music_Dungeon3_Ch2
-	db CH2
-	dw Music_Dungeon3_Ch3
-	db CH3
-	dw Music_Dungeon3_Ch4
+	dbw ( $C0 | CH0 ), Music_Dungeon3_Ch1
+	dbw CH1, Music_Dungeon3_Ch2
+	dbw CH2, Music_Dungeon3_Ch3
+	dbw CH3, Music_Dungeon3_Ch4
 
 Music_CinnabarMansion::
-	db ( $C0 | CH0 )
-	dw Music_CinnabarMansion_Ch1
-	db CH1
-	dw Music_CinnabarMansion_Ch2
-	db CH2
-	dw Music_CinnabarMansion_Ch3
-	db CH3
-	dw Music_CinnabarMansion_Ch4
+	dbw ( $C0 | CH0 ), Music_CinnabarMansion_Ch1
+	dbw CH1, Music_CinnabarMansion_Ch2
+	dbw CH2, Music_CinnabarMansion_Ch3
+	dbw CH3, Music_CinnabarMansion_Ch4
 
 Music_PokemonTower::
-	db ( $80 | CH0 )
-	dw Music_PokemonTower_Ch1
-	db CH1
-	dw Music_PokemonTower_Ch2
-	db CH2
-	dw Music_PokemonTower_Ch3
+	dbw ( $80 | CH0 ), Music_PokemonTower_Ch1
+	dbw CH1, Music_PokemonTower_Ch2
+	dbw CH2, Music_PokemonTower_Ch3
 
 Music_SilphCo::
-	db ( $80 | CH0 )
-	dw Music_SilphCo_Ch1
-	db CH1
-	dw Music_SilphCo_Ch2
-	db CH2
-	dw Music_SilphCo_Ch3
+	dbw ( $80 | CH0 ), Music_SilphCo_Ch1
+	dbw CH1, Music_SilphCo_Ch2
+	dbw CH2, Music_SilphCo_Ch3
 
 Music_MeetEvilTrainer::
-	db ( $80 | CH0 )
-	dw Music_MeetEvilTrainer_Ch1
-	db CH1
-	dw Music_MeetEvilTrainer_Ch2
-	db CH2
-	dw Music_MeetEvilTrainer_Ch3
+	dbw ( $80 | CH0 ), Music_MeetEvilTrainer_Ch1
+	dbw CH1, Music_MeetEvilTrainer_Ch2
+	dbw CH2, Music_MeetEvilTrainer_Ch3
 
 Music_MeetFemaleTrainer::
-	db ( $80 | CH0 )
-	dw Music_MeetFemaleTrainer_Ch1
-	db CH1
-	dw Music_MeetFemaleTrainer_Ch2
-	db CH2
-	dw Music_MeetFemaleTrainer_Ch3
+	dbw ( $80 | CH0 ), Music_MeetFemaleTrainer_Ch1
+	dbw CH1, Music_MeetFemaleTrainer_Ch2
+	dbw CH2, Music_MeetFemaleTrainer_Ch3
 
 Music_MeetMaleTrainer::
-	db ( $80 | CH0 )
-	dw Music_MeetMaleTrainer_Ch1
-	db CH1
-	dw Music_MeetMaleTrainer_Ch2
-	db CH2
-	dw Music_MeetMaleTrainer_Ch3
+	dbw ( $80 | CH0 ), Music_MeetMaleTrainer_Ch1
+	dbw CH1, Music_MeetMaleTrainer_Ch2
+	dbw CH2, Music_MeetMaleTrainer_Ch3
diff --git a/audio/headers/musicheaders4.asm b/audio/headers/musicheaders4.asm
new file mode 100644
index 00000000..be5d822a
--- /dev/null
+++ b/audio/headers/musicheaders4.asm
@@ -0,0 +1,18 @@
+Music_SurfingPikachu::
+	dbw ((3 - 1) << 6) | CH0, Music_SurfingPikachu_Ch1
+	dbw CH1, Music_SurfingPikachu_Ch2
+	dbw CH2, Music_SurfingPikachu_Ch3
+
+Music_MeetJessieJames::
+	dbw ((3 - 1) << 6) | CH0, Music_MeetJessieJames_Ch1
+	dbw CH1, Music_MeetJessieJames_Ch2
+	dbw CH2, Music_MeetJessieJames_Ch3
+
+Music_YellowUnusedSong::
+	dbw ((4 - 1) << 6) | CH0, Music_YellowUnusedSong_Ch1
+	dbw CH1, Music_YellowUnusedSong_Ch2
+	dbw CH2, Music_YellowUnusedSong_Ch3
+	dbw CH3, Music_YellowUnusedSong_Ch4
+
+Music_GBPrinter::
+	dbw ((1 - 1) << 6) | CH2, Music_GBPrinter_Ch3
diff --git a/audio/headers/sfxheaders1.asm b/audio/headers/sfxheaders1.asm
index 57c62e1c..fdbcb5f3 100644
--- a/audio/headers/sfxheaders1.asm
+++ b/audio/headers/sfxheaders1.asm
@@ -1,562 +1,377 @@
 SFX_Headers_1::
-	db $ff, $ff, $ff ; padding
+	dbw -1, -1 ; padding
 
 SFX_Snare1_1::
-	db CH7
-	dw SFX_Snare1_1_Ch1
+	dbw CH7, SFX_Snare1_1_Ch1
 
 SFX_Snare2_1::
-	db CH7
-	dw SFX_Snare2_1_Ch1
+	dbw CH7, SFX_Snare2_1_Ch1
 
 SFX_Snare3_1::
-	db CH7
-	dw SFX_Snare3_1_Ch1
+	dbw CH7, SFX_Snare3_1_Ch1
 
 SFX_Snare4_1::
-	db CH7
-	dw SFX_Snare4_1_Ch1
+	dbw CH7, SFX_Snare4_1_Ch1
 
 SFX_Snare5_1::
-	db CH7
-	dw SFX_Snare5_1_Ch1
+	dbw CH7, SFX_Snare5_1_Ch1
 
 SFX_Triangle1_1::
-	db CH7
-	dw SFX_Triangle1_1_Ch1
+	dbw CH7, SFX_Triangle1_1_Ch1
 
 SFX_Triangle2_1::
-	db CH7
-	dw SFX_Triangle2_1_Ch1
+	dbw CH7, SFX_Triangle2_1_Ch1
 
 SFX_Snare6_1::
-	db CH7
-	dw SFX_Snare6_1_Ch1
+	dbw CH7, SFX_Snare6_1_Ch1
 
 SFX_Snare7_1::
-	db CH7
-	dw SFX_Snare7_1_Ch1
+	dbw CH7, SFX_Snare7_1_Ch1
 
 SFX_Snare8_1::
-	db CH7
-	dw SFX_Snare8_1_Ch1
+	dbw CH7, SFX_Snare8_1_Ch1
 
 SFX_Snare9_1::
-	db CH7
-	dw SFX_Snare9_1_Ch1
+	dbw CH7, SFX_Snare9_1_Ch1
 
 SFX_Cymbal1_1::
-	db CH7
-	dw SFX_Cymbal1_1_Ch1
+	dbw CH7, SFX_Cymbal1_1_Ch1
 
 SFX_Cymbal2_1::
-	db CH7
-	dw SFX_Cymbal2_1_Ch1
+	dbw CH7, SFX_Cymbal2_1_Ch1
 
 SFX_Cymbal3_1::
-	db CH7
-	dw SFX_Cymbal3_1_Ch1
+	dbw CH7, SFX_Cymbal3_1_Ch1
 
 SFX_Muted_Snare1_1::
-	db CH7
-	dw SFX_Muted_Snare1_1_Ch1
+	dbw CH7, SFX_Muted_Snare1_1_Ch1
 
 SFX_Triangle3_1::
-	db CH7
-	dw SFX_Triangle3_1_Ch1
+	dbw CH7, SFX_Triangle3_1_Ch1
 
 SFX_Muted_Snare2_1::
-	db CH7
-	dw SFX_Muted_Snare2_1_Ch1
+	dbw CH7, SFX_Muted_Snare2_1_Ch1
 
 SFX_Muted_Snare3_1::
-	db CH7
-	dw SFX_Muted_Snare3_1_Ch1
+	dbw CH7, SFX_Muted_Snare3_1_Ch1
 
 SFX_Muted_Snare4_1::
-	db CH7
-	dw SFX_Muted_Snare4_1_Ch1
+	dbw CH7, SFX_Muted_Snare4_1_Ch1
 
 SFX_Cry00_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry00_1_Ch1
-	db CH5
-	dw SFX_Cry00_1_Ch2
-	db CH7
-	dw SFX_Cry00_1_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry00_1_Ch1
+	dbw CH5, SFX_Cry00_1_Ch2
+	dbw CH7, SFX_Cry00_1_Ch3
 
 SFX_Cry01_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry01_1_Ch1
-	db CH5
-	dw SFX_Cry01_1_Ch2
-	db CH7
-	dw SFX_Cry01_1_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry01_1_Ch1
+	dbw CH5, SFX_Cry01_1_Ch2
+	dbw CH7, SFX_Cry01_1_Ch3
 
 SFX_Cry02_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry02_1_Ch1
-	db CH5
-	dw SFX_Cry02_1_Ch2
-	db CH7
-	dw SFX_Cry02_1_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry02_1_Ch1
+	dbw CH5, SFX_Cry02_1_Ch2
+	dbw CH7, SFX_Cry02_1_Ch3
 
 SFX_Cry03_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry03_1_Ch1
-	db CH5
-	dw SFX_Cry03_1_Ch2
-	db CH7
-	dw SFX_Cry03_1_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry03_1_Ch1
+	dbw CH5, SFX_Cry03_1_Ch2
+	dbw CH7, SFX_Cry03_1_Ch3
 
 SFX_Cry04_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry04_1_Ch1
-	db CH5
-	dw SFX_Cry04_1_Ch2
-	db CH7
-	dw SFX_Cry04_1_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry04_1_Ch1
+	dbw CH5, SFX_Cry04_1_Ch2
+	dbw CH7, SFX_Cry04_1_Ch3
 
 SFX_Cry05_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry05_1_Ch1
-	db CH5
-	dw SFX_Cry05_1_Ch2
-	db CH7
-	dw SFX_Cry05_1_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry05_1_Ch1
+	dbw CH5, SFX_Cry05_1_Ch2
+	dbw CH7, SFX_Cry05_1_Ch3
 
 SFX_Cry06_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry06_1_Ch1
-	db CH5
-	dw SFX_Cry06_1_Ch2
-	db CH7
-	dw SFX_Cry06_1_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry06_1_Ch1
+	dbw CH5, SFX_Cry06_1_Ch2
+	dbw CH7, SFX_Cry06_1_Ch3
 
 SFX_Cry07_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry07_1_Ch1
-	db CH5
-	dw SFX_Cry07_1_Ch2
-	db CH7
-	dw SFX_Cry07_1_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry07_1_Ch1
+	dbw CH5, SFX_Cry07_1_Ch2
+	dbw CH7, SFX_Cry07_1_Ch3
 
 SFX_Cry08_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry08_1_Ch1
-	db CH5
-	dw SFX_Cry08_1_Ch2
-	db CH7
-	dw SFX_Cry08_1_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry08_1_Ch1
+	dbw CH5, SFX_Cry08_1_Ch2
+	dbw CH7, SFX_Cry08_1_Ch3
 
 SFX_Cry09_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry09_1_Ch1
-	db CH5
-	dw SFX_Cry09_1_Ch2
-	db CH7
-	dw SFX_Cry09_1_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry09_1_Ch1
+	dbw CH5, SFX_Cry09_1_Ch2
+	dbw CH7, SFX_Cry09_1_Ch3
 
 SFX_Cry0A_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry0A_1_Ch1
-	db CH5
-	dw SFX_Cry0A_1_Ch2
-	db CH7
-	dw SFX_Cry0A_1_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry0A_1_Ch1
+	dbw CH5, SFX_Cry0A_1_Ch2
+	dbw CH7, SFX_Cry0A_1_Ch3
 
 SFX_Cry0B_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry0B_1_Ch1
-	db CH5
-	dw SFX_Cry0B_1_Ch2
-	db CH7
-	dw SFX_Cry0B_1_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry0B_1_Ch1
+	dbw CH5, SFX_Cry0B_1_Ch2
+	dbw CH7, SFX_Cry0B_1_Ch3
 
 SFX_Cry0C_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry0C_1_Ch1
-	db CH5
-	dw SFX_Cry0C_1_Ch2
-	db CH7
-	dw SFX_Cry0C_1_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry0C_1_Ch1
+	dbw CH5, SFX_Cry0C_1_Ch2
+	dbw CH7, SFX_Cry0C_1_Ch3
 
 SFX_Cry0D_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry0D_1_Ch1
-	db CH5
-	dw SFX_Cry0D_1_Ch2
-	db CH7
-	dw SFX_Cry0D_1_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry0D_1_Ch1
+	dbw CH5, SFX_Cry0D_1_Ch2
+	dbw CH7, SFX_Cry0D_1_Ch3
 
 SFX_Cry0E_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry0E_1_Ch1
-	db CH5
-	dw SFX_Cry0E_1_Ch2
-	db CH7
-	dw SFX_Cry0E_1_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry0E_1_Ch1
+	dbw CH5, SFX_Cry0E_1_Ch2
+	dbw CH7, SFX_Cry0E_1_Ch3
 
 SFX_Cry0F_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry0F_1_Ch1
-	db CH5
-	dw SFX_Cry0F_1_Ch2
-	db CH7
-	dw SFX_Cry0F_1_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry0F_1_Ch1
+	dbw CH5, SFX_Cry0F_1_Ch2
+	dbw CH7, SFX_Cry0F_1_Ch3
 
 SFX_Cry10_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry10_1_Ch1
-	db CH5
-	dw SFX_Cry10_1_Ch2
-	db CH7
-	dw SFX_Cry10_1_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry10_1_Ch1
+	dbw CH5, SFX_Cry10_1_Ch2
+	dbw CH7, SFX_Cry10_1_Ch3
 
 SFX_Cry11_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry11_1_Ch1
-	db CH5
-	dw SFX_Cry11_1_Ch2
-	db CH7
-	dw SFX_Cry11_1_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry11_1_Ch1
+	dbw CH5, SFX_Cry11_1_Ch2
+	dbw CH7, SFX_Cry11_1_Ch3
 
 SFX_Cry12_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry12_1_Ch1
-	db CH5
-	dw SFX_Cry12_1_Ch2
-	db CH7
-	dw SFX_Cry12_1_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry12_1_Ch1
+	dbw CH5, SFX_Cry12_1_Ch2
+	dbw CH7, SFX_Cry12_1_Ch3
 
 SFX_Cry13_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry13_1_Ch1
-	db CH5
-	dw SFX_Cry13_1_Ch2
-	db CH7
-	dw SFX_Cry13_1_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry13_1_Ch1
+	dbw CH5, SFX_Cry13_1_Ch2
+	dbw CH7, SFX_Cry13_1_Ch3
 
 SFX_Cry14_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry14_1_Ch1
-	db CH5
-	dw SFX_Cry14_1_Ch2
-	db CH7
-	dw SFX_Cry14_1_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry14_1_Ch1
+	dbw CH5, SFX_Cry14_1_Ch2
+	dbw CH7, SFX_Cry14_1_Ch3
 
 SFX_Cry15_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry15_1_Ch1
-	db CH5
-	dw SFX_Cry15_1_Ch2
-	db CH7
-	dw SFX_Cry15_1_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry15_1_Ch1
+	dbw CH5, SFX_Cry15_1_Ch2
+	dbw CH7, SFX_Cry15_1_Ch3
 
 SFX_Cry16_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry16_1_Ch1
-	db CH5
-	dw SFX_Cry16_1_Ch2
-	db CH7
-	dw SFX_Cry16_1_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry16_1_Ch1
+	dbw CH5, SFX_Cry16_1_Ch2
+	dbw CH7, SFX_Cry16_1_Ch3
 
 SFX_Cry17_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry17_1_Ch1
-	db CH5
-	dw SFX_Cry17_1_Ch2
-	db CH7
-	dw SFX_Cry17_1_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry17_1_Ch1
+	dbw CH5, SFX_Cry17_1_Ch2
+	dbw CH7, SFX_Cry17_1_Ch3
 
 SFX_Cry18_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry18_1_Ch1
-	db CH5
-	dw SFX_Cry18_1_Ch2
-	db CH7
-	dw SFX_Cry18_1_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry18_1_Ch1
+	dbw CH5, SFX_Cry18_1_Ch2
+	dbw CH7, SFX_Cry18_1_Ch3
 
 SFX_Cry19_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry19_1_Ch1
-	db CH5
-	dw SFX_Cry19_1_Ch2
-	db CH7
-	dw SFX_Cry19_1_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry19_1_Ch1
+	dbw CH5, SFX_Cry19_1_Ch2
+	dbw CH7, SFX_Cry19_1_Ch3
 
 SFX_Cry1A_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry1A_1_Ch1
-	db CH5
-	dw SFX_Cry1A_1_Ch2
-	db CH7
-	dw SFX_Cry1A_1_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry1A_1_Ch1
+	dbw CH5, SFX_Cry1A_1_Ch2
+	dbw CH7, SFX_Cry1A_1_Ch3
 
 SFX_Cry1B_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry1B_1_Ch1
-	db CH5
-	dw SFX_Cry1B_1_Ch2
-	db CH7
-	dw SFX_Cry1B_1_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry1B_1_Ch1
+	dbw CH5, SFX_Cry1B_1_Ch2
+	dbw CH7, SFX_Cry1B_1_Ch3
 
 SFX_Cry1C_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry1C_1_Ch1
-	db CH5
-	dw SFX_Cry1C_1_Ch2
-	db CH7
-	dw SFX_Cry1C_1_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry1C_1_Ch1
+	dbw CH5, SFX_Cry1C_1_Ch2
+	dbw CH7, SFX_Cry1C_1_Ch3
 
 SFX_Cry1D_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry1D_1_Ch1
-	db CH5
-	dw SFX_Cry1D_1_Ch2
-	db CH7
-	dw SFX_Cry1D_1_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry1D_1_Ch1
+	dbw CH5, SFX_Cry1D_1_Ch2
+	dbw CH7, SFX_Cry1D_1_Ch3
 
 SFX_Cry1E_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry1E_1_Ch1
-	db CH5
-	dw SFX_Cry1E_1_Ch2
-	db CH7
-	dw SFX_Cry1E_1_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry1E_1_Ch1
+	dbw CH5, SFX_Cry1E_1_Ch2
+	dbw CH7, SFX_Cry1E_1_Ch3
 
 SFX_Cry1F_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry1F_1_Ch1
-	db CH5
-	dw SFX_Cry1F_1_Ch2
-	db CH7
-	dw SFX_Cry1F_1_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry1F_1_Ch1
+	dbw CH5, SFX_Cry1F_1_Ch2
+	dbw CH7, SFX_Cry1F_1_Ch3
 
 SFX_Cry20_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry20_1_Ch1
-	db CH5
-	dw SFX_Cry20_1_Ch2
-	db CH7
-	dw SFX_Cry20_1_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry20_1_Ch1
+	dbw CH5, SFX_Cry20_1_Ch2
+	dbw CH7, SFX_Cry20_1_Ch3
 
 SFX_Cry21_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry21_1_Ch1
-	db CH5
-	dw SFX_Cry21_1_Ch2
-	db CH7
-	dw SFX_Cry21_1_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry21_1_Ch1
+	dbw CH5, SFX_Cry21_1_Ch2
+	dbw CH7, SFX_Cry21_1_Ch3
 
 SFX_Cry22_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry22_1_Ch1
-	db CH5
-	dw SFX_Cry22_1_Ch2
-	db CH7
-	dw SFX_Cry22_1_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry22_1_Ch1
+	dbw CH5, SFX_Cry22_1_Ch2
+	dbw CH7, SFX_Cry22_1_Ch3
 
 SFX_Cry23_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry23_1_Ch1
-	db CH5
-	dw SFX_Cry23_1_Ch2
-	db CH7
-	dw SFX_Cry23_1_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry23_1_Ch1
+	dbw CH5, SFX_Cry23_1_Ch2
+	dbw CH7, SFX_Cry23_1_Ch3
 
 SFX_Cry24_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry24_1_Ch1
-	db CH5
-	dw SFX_Cry24_1_Ch2
-	db CH7
-	dw SFX_Cry24_1_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry24_1_Ch1
+	dbw CH5, SFX_Cry24_1_Ch2
+	dbw CH7, SFX_Cry24_1_Ch3
 
 SFX_Cry25_1::
-	db ( $80 | CH4 )
-	dw SFX_Cry25_1_Ch1
-	db CH5
-	dw SFX_Cry25_1_Ch2
-	db CH7
-	dw SFX_Cry25_1_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry25_1_Ch1
+	dbw CH5, SFX_Cry25_1_Ch2
+	dbw CH7, SFX_Cry25_1_Ch3
 
 SFX_Get_Item1_1::
-	db ( $80 | CH4 )
-	dw SFX_Get_Item1_1_Ch1
-	db CH5
-	dw SFX_Get_Item1_1_Ch2
-	db CH6
-	dw SFX_Get_Item1_1_Ch3
+	dbw ( $80 | CH4 ), SFX_Get_Item1_1_Ch1
+	dbw CH5, SFX_Get_Item1_1_Ch2
+	dbw CH6, SFX_Get_Item1_1_Ch3
 
 SFX_Get_Item2_1::
-	db ( $80 | CH4 )
-	dw SFX_Get_Item2_1_Ch1
-	db CH5
-	dw SFX_Get_Item2_1_Ch2
-	db CH6
-	dw SFX_Get_Item2_1_Ch3
+	dbw ( $80 | CH4 ), SFX_Get_Item2_1_Ch1
+	dbw CH5, SFX_Get_Item2_1_Ch2
+	dbw CH6, SFX_Get_Item2_1_Ch3
 
 SFX_Tink_1::
-	db CH4
-	dw SFX_Tink_1_Ch1
+	dbw CH4, SFX_Tink_1_Ch1
 
 SFX_Heal_HP_1::
-	db CH4
-	dw SFX_Heal_HP_1_Ch1
+	dbw CH4, SFX_Heal_HP_1_Ch1
 
 SFX_Heal_Ailment_1::
-	db CH4
-	dw SFX_Heal_Ailment_1_Ch1
+	dbw CH4, SFX_Heal_Ailment_1_Ch1
 
 SFX_Start_Menu_1::
-	db CH7
-	dw SFX_Start_Menu_1_Ch1
+	dbw CH7, SFX_Start_Menu_1_Ch1
 
 SFX_Press_AB_1::
-	db CH4
-	dw SFX_Press_AB_1_Ch1
+	dbw CH4, SFX_Press_AB_1_Ch1
 
 SFX_Pokedex_Rating_1::
-	db ( $80 | CH4 )
-	dw SFX_Pokedex_Rating_1_Ch1
-	db CH5
-	dw SFX_Pokedex_Rating_1_Ch2
-	db CH6
-	dw SFX_Pokedex_Rating_1_Ch3
+	dbw ( $80 | CH4 ), SFX_Pokedex_Rating_1_Ch1
+	dbw CH5, SFX_Pokedex_Rating_1_Ch2
+	dbw CH6, SFX_Pokedex_Rating_1_Ch3
 
 SFX_Get_Key_Item_1::
-	db ( $80 | CH4 )
-	dw SFX_Get_Key_Item_1_Ch1
-	db CH5
-	dw SFX_Get_Key_Item_1_Ch2
-	db CH6
-	dw SFX_Get_Key_Item_1_Ch3
+	dbw ( $80 | CH4 ), SFX_Get_Key_Item_1_Ch1
+	dbw CH5, SFX_Get_Key_Item_1_Ch2
+	dbw CH6, SFX_Get_Key_Item_1_Ch3
 
 SFX_Poisoned_1::
-	db CH4
-	dw SFX_Poisoned_1_Ch1
+	dbw CH4, SFX_Poisoned_1_Ch1
 
 SFX_Trade_Machine_1::
-	db CH4
-	dw SFX_Trade_Machine_1_Ch1
+	dbw CH4, SFX_Trade_Machine_1_Ch1
 
 SFX_Turn_On_PC_1::
-	db CH4
-	dw SFX_Turn_On_PC_1_Ch1
+	dbw CH4, SFX_Turn_On_PC_1_Ch1
 
 SFX_Turn_Off_PC_1::
-	db CH4
-	dw SFX_Turn_Off_PC_1_Ch1
+	dbw CH4, SFX_Turn_Off_PC_1_Ch1
 
 SFX_Enter_PC_1::
-	db CH4
-	dw SFX_Enter_PC_1_Ch1
+	dbw CH4, SFX_Enter_PC_1_Ch1
 
 SFX_Shrink_1::
-	db CH4
-	dw SFX_Shrink_1_Ch1
+	dbw CH4, SFX_Shrink_1_Ch1
 
 SFX_Switch_1::
-	db CH4
-	dw SFX_Switch_1_Ch1
+	dbw CH4, SFX_Switch_1_Ch1
 
 SFX_Healing_Machine_1::
-	db CH4
-	dw SFX_Healing_Machine_1_Ch1
+	dbw CH4, SFX_Healing_Machine_1_Ch1
 
 SFX_Teleport_Exit1_1::
-	db CH4
-	dw SFX_Teleport_Exit1_1_Ch1
+	dbw CH4, SFX_Teleport_Exit1_1_Ch1
 
 SFX_Teleport_Enter1_1::
-	db CH4
-	dw SFX_Teleport_Enter1_1_Ch1
+	dbw CH4, SFX_Teleport_Enter1_1_Ch1
 
 SFX_Teleport_Exit2_1::
-	db CH4
-	dw SFX_Teleport_Exit2_1_Ch1
+	dbw CH4, SFX_Teleport_Exit2_1_Ch1
 
 SFX_Ledge_1::
-	db CH4
-	dw SFX_Ledge_1_Ch1
+	dbw CH4, SFX_Ledge_1_Ch1
 
 SFX_Teleport_Enter2_1::
-	db CH7
-	dw SFX_Teleport_Enter2_1_Ch1
+	dbw CH7, SFX_Teleport_Enter2_1_Ch1
 
 SFX_Fly_1::
-	db CH7
-	dw SFX_Fly_1_Ch1
+	dbw CH7, SFX_Fly_1_Ch1
 
 SFX_Denied_1::
-	db ( $40 | CH4 )
-	dw SFX_Denied_1_Ch1
-	db CH5
-	dw SFX_Denied_1_Ch2
+	dbw ( $40 | CH4 ), SFX_Denied_1_Ch1
+	dbw CH5, SFX_Denied_1_Ch2
 
 SFX_Arrow_Tiles_1::
-	db CH4
-	dw SFX_Arrow_Tiles_1_Ch1
+	dbw CH4, SFX_Arrow_Tiles_1_Ch1
 
 SFX_Push_Boulder_1::
-	db CH7
-	dw SFX_Push_Boulder_1_Ch1
+	dbw CH7, SFX_Push_Boulder_1_Ch1
 
 SFX_SS_Anne_Horn_1::
-	db ( $40 | CH4 )
-	dw SFX_SS_Anne_Horn_1_Ch1
-	db CH5
-	dw SFX_SS_Anne_Horn_1_Ch2
+	dbw ( $40 | CH4 ), SFX_SS_Anne_Horn_1_Ch1
+	dbw CH5, SFX_SS_Anne_Horn_1_Ch2
 
 SFX_Withdraw_Deposit_1::
-	db CH4
-	dw SFX_Withdraw_Deposit_1_Ch1
+	dbw CH4, SFX_Withdraw_Deposit_1_Ch1
 
 SFX_Cut_1::
-	db CH7
-	dw SFX_Cut_1_Ch1
+	dbw CH7, SFX_Cut_1_Ch1
 
 SFX_Go_Inside_1::
-	db CH7
-	dw SFX_Go_Inside_1_Ch1
+	dbw CH7, SFX_Go_Inside_1_Ch1
 
 SFX_Swap_1::
-	db ( $40 | CH4 )
-	dw SFX_Swap_1_Ch1
-	db CH5
-	dw SFX_Swap_1_Ch2
+	dbw ( $40 | CH4 ), SFX_Swap_1_Ch1
+	dbw CH5, SFX_Swap_1_Ch2
 
 SFX_59_1::
-	db ( $40 | CH4 )
-	dw SFX_59_1_Ch1
-	db CH5
-	dw SFX_59_1_Ch2
+	dbw ( $40 | CH4 ), SFX_59_1_Ch1
+	dbw CH5, SFX_59_1_Ch2
 
 SFX_Purchase_1::
-	db ( $40 | CH4 )
-	dw SFX_Purchase_1_Ch1
-	db CH5
-	dw SFX_Purchase_1_Ch2
+	dbw ( $40 | CH4 ), SFX_Purchase_1_Ch1
+	dbw CH5, SFX_Purchase_1_Ch2
 
 SFX_Collision_1::
-	db CH4
-	dw SFX_Collision_1_Ch1
+	dbw CH4, SFX_Collision_1_Ch1
 
 SFX_Go_Outside_1::
-	db CH7
-	dw SFX_Go_Outside_1_Ch1
+	dbw CH7, SFX_Go_Outside_1_Ch1
 
 SFX_Save_1::
-	db ( $40 | CH4 )
-	dw SFX_Save_1_Ch1
-	db CH5
-	dw SFX_Save_1_Ch2
+	dbw ( $40 | CH4 ), SFX_Save_1_Ch1
+	dbw CH5, SFX_Save_1_Ch2
 
 SFX_Pokeflute::
-	db CH2
-	dw SFX_Pokeflute_Ch1
+	dbw CH2, SFX_Pokeflute_Ch1
 
 SFX_Safari_Zone_PA::
-	db CH4
-	dw SFX_Safari_Zone_PA_Ch1
+	dbw CH4, SFX_Safari_Zone_PA_Ch1
diff --git a/audio/headers/sfxheaders2.asm b/audio/headers/sfxheaders2.asm
index 1b6f8a5c..2f517d10 100644
--- a/audio/headers/sfxheaders2.asm
+++ b/audio/headers/sfxheaders2.asm
@@ -1,706 +1,473 @@
 SFX_Headers_2::
-	db $ff, $ff, $ff ; padding
+	dbw -1, -1 ; padding
 
 SFX_Snare1_2::
-	db CH7
-	dw SFX_Snare1_2_Ch1
+	dbw CH7, SFX_Snare1_2_Ch1
 
 SFX_Snare2_2::
-	db CH7
-	dw SFX_Snare2_2_Ch1
+	dbw CH7, SFX_Snare2_2_Ch1
 
 SFX_Snare3_2::
-	db CH7
-	dw SFX_Snare3_2_Ch1
+	dbw CH7, SFX_Snare3_2_Ch1
 
 SFX_Snare4_2::
-	db CH7
-	dw SFX_Snare4_2_Ch1
+	dbw CH7, SFX_Snare4_2_Ch1
 
 SFX_Snare5_2::
-	db CH7
-	dw SFX_Snare5_2_Ch1
+	dbw CH7, SFX_Snare5_2_Ch1
 
 SFX_Triangle1_2::
-	db CH7
-	dw SFX_Triangle1_2_Ch1
+	dbw CH7, SFX_Triangle1_2_Ch1
 
 SFX_Triangle2_2::
-	db CH7
-	dw SFX_Triangle2_2_Ch1
+	dbw CH7, SFX_Triangle2_2_Ch1
 
 SFX_Snare6_2::
-	db CH7
-	dw SFX_Snare6_2_Ch1
+	dbw CH7, SFX_Snare6_2_Ch1
 
 SFX_Snare7_2::
-	db CH7
-	dw SFX_Snare7_2_Ch1
+	dbw CH7, SFX_Snare7_2_Ch1
 
 SFX_Snare8_2::
-	db CH7
-	dw SFX_Snare8_2_Ch1
+	dbw CH7, SFX_Snare8_2_Ch1
 
 SFX_Snare9_2::
-	db CH7
-	dw SFX_Snare9_2_Ch1
+	dbw CH7, SFX_Snare9_2_Ch1
 
 SFX_Cymbal1_2::
-	db CH7
-	dw SFX_Cymbal1_2_Ch1
+	dbw CH7, SFX_Cymbal1_2_Ch1
 
 SFX_Cymbal2_2::
-	db CH7
-	dw SFX_Cymbal2_2_Ch1
+	dbw CH7, SFX_Cymbal2_2_Ch1
 
 SFX_Cymbal3_2::
-	db CH7
-	dw SFX_Cymbal3_2_Ch1
+	dbw CH7, SFX_Cymbal3_2_Ch1
 
 SFX_Muted_Snare1_2::
-	db CH7
-	dw SFX_Muted_Snare1_2_Ch1
+	dbw CH7, SFX_Muted_Snare1_2_Ch1
 
 SFX_Triangle3_2::
-	db CH7
-	dw SFX_Triangle3_2_Ch1
+	dbw CH7, SFX_Triangle3_2_Ch1
 
 SFX_Muted_Snare2_2::
-	db CH7
-	dw SFX_Muted_Snare2_2_Ch1
+	dbw CH7, SFX_Muted_Snare2_2_Ch1
 
 SFX_Muted_Snare3_2::
-	db CH7
-	dw SFX_Muted_Snare3_2_Ch1
+	dbw CH7, SFX_Muted_Snare3_2_Ch1
 
 SFX_Muted_Snare4_2::
-	db CH7
-	dw SFX_Muted_Snare4_2_Ch1
+	dbw CH7, SFX_Muted_Snare4_2_Ch1
 
 SFX_Cry00_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry00_2_Ch1
-	db CH5
-	dw SFX_Cry00_2_Ch2
-	db CH7
-	dw SFX_Cry00_2_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry00_2_Ch1
+	dbw CH5, SFX_Cry00_2_Ch2
+	dbw CH7, SFX_Cry00_2_Ch3
 
 SFX_Cry01_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry01_2_Ch1
-	db CH5
-	dw SFX_Cry01_2_Ch2
-	db CH7
-	dw SFX_Cry01_2_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry01_2_Ch1
+	dbw CH5, SFX_Cry01_2_Ch2
+	dbw CH7, SFX_Cry01_2_Ch3
 
 SFX_Cry02_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry02_2_Ch1
-	db CH5
-	dw SFX_Cry02_2_Ch2
-	db CH7
-	dw SFX_Cry02_2_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry02_2_Ch1
+	dbw CH5, SFX_Cry02_2_Ch2
+	dbw CH7, SFX_Cry02_2_Ch3
 
 SFX_Cry03_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry03_2_Ch1
-	db CH5
-	dw SFX_Cry03_2_Ch2
-	db CH7
-	dw SFX_Cry03_2_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry03_2_Ch1
+	dbw CH5, SFX_Cry03_2_Ch2
+	dbw CH7, SFX_Cry03_2_Ch3
 
 SFX_Cry04_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry04_2_Ch1
-	db CH5
-	dw SFX_Cry04_2_Ch2
-	db CH7
-	dw SFX_Cry04_2_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry04_2_Ch1
+	dbw CH5, SFX_Cry04_2_Ch2
+	dbw CH7, SFX_Cry04_2_Ch3
 
 SFX_Cry05_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry05_2_Ch1
-	db CH5
-	dw SFX_Cry05_2_Ch2
-	db CH7
-	dw SFX_Cry05_2_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry05_2_Ch1
+	dbw CH5, SFX_Cry05_2_Ch2
+	dbw CH7, SFX_Cry05_2_Ch3
 
 SFX_Cry06_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry06_2_Ch1
-	db CH5
-	dw SFX_Cry06_2_Ch2
-	db CH7
-	dw SFX_Cry06_2_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry06_2_Ch1
+	dbw CH5, SFX_Cry06_2_Ch2
+	dbw CH7, SFX_Cry06_2_Ch3
 
 SFX_Cry07_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry07_2_Ch1
-	db CH5
-	dw SFX_Cry07_2_Ch2
-	db CH7
-	dw SFX_Cry07_2_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry07_2_Ch1
+	dbw CH5, SFX_Cry07_2_Ch2
+	dbw CH7, SFX_Cry07_2_Ch3
 
 SFX_Cry08_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry08_2_Ch1
-	db CH5
-	dw SFX_Cry08_2_Ch2
-	db CH7
-	dw SFX_Cry08_2_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry08_2_Ch1
+	dbw CH5, SFX_Cry08_2_Ch2
+	dbw CH7, SFX_Cry08_2_Ch3
 
 SFX_Cry09_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry09_2_Ch1
-	db CH5
-	dw SFX_Cry09_2_Ch2
-	db CH7
-	dw SFX_Cry09_2_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry09_2_Ch1
+	dbw CH5, SFX_Cry09_2_Ch2
+	dbw CH7, SFX_Cry09_2_Ch3
 
 SFX_Cry0A_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry0A_2_Ch1
-	db CH5
-	dw SFX_Cry0A_2_Ch2
-	db CH7
-	dw SFX_Cry0A_2_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry0A_2_Ch1
+	dbw CH5, SFX_Cry0A_2_Ch2
+	dbw CH7, SFX_Cry0A_2_Ch3
 
 SFX_Cry0B_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry0B_2_Ch1
-	db CH5
-	dw SFX_Cry0B_2_Ch2
-	db CH7
-	dw SFX_Cry0B_2_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry0B_2_Ch1
+	dbw CH5, SFX_Cry0B_2_Ch2
+	dbw CH7, SFX_Cry0B_2_Ch3
 
 SFX_Cry0C_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry0C_2_Ch1
-	db CH5
-	dw SFX_Cry0C_2_Ch2
-	db CH7
-	dw SFX_Cry0C_2_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry0C_2_Ch1
+	dbw CH5, SFX_Cry0C_2_Ch2
+	dbw CH7, SFX_Cry0C_2_Ch3
 
 SFX_Cry0D_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry0D_2_Ch1
-	db CH5
-	dw SFX_Cry0D_2_Ch2
-	db CH7
-	dw SFX_Cry0D_2_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry0D_2_Ch1
+	dbw CH5, SFX_Cry0D_2_Ch2
+	dbw CH7, SFX_Cry0D_2_Ch3
 
 SFX_Cry0E_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry0E_2_Ch1
-	db CH5
-	dw SFX_Cry0E_2_Ch2
-	db CH7
-	dw SFX_Cry0E_2_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry0E_2_Ch1
+	dbw CH5, SFX_Cry0E_2_Ch2
+	dbw CH7, SFX_Cry0E_2_Ch3
 
 SFX_Cry0F_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry0F_2_Ch1
-	db CH5
-	dw SFX_Cry0F_2_Ch2
-	db CH7
-	dw SFX_Cry0F_2_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry0F_2_Ch1
+	dbw CH5, SFX_Cry0F_2_Ch2
+	dbw CH7, SFX_Cry0F_2_Ch3
 
 SFX_Cry10_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry10_2_Ch1
-	db CH5
-	dw SFX_Cry10_2_Ch2
-	db CH7
-	dw SFX_Cry10_2_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry10_2_Ch1
+	dbw CH5, SFX_Cry10_2_Ch2
+	dbw CH7, SFX_Cry10_2_Ch3
 
 SFX_Cry11_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry11_2_Ch1
-	db CH5
-	dw SFX_Cry11_2_Ch2
-	db CH7
-	dw SFX_Cry11_2_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry11_2_Ch1
+	dbw CH5, SFX_Cry11_2_Ch2
+	dbw CH7, SFX_Cry11_2_Ch3
 
 SFX_Cry12_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry12_2_Ch1
-	db CH5
-	dw SFX_Cry12_2_Ch2
-	db CH7
-	dw SFX_Cry12_2_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry12_2_Ch1
+	dbw CH5, SFX_Cry12_2_Ch2
+	dbw CH7, SFX_Cry12_2_Ch3
 
 SFX_Cry13_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry13_2_Ch1
-	db CH5
-	dw SFX_Cry13_2_Ch2
-	db CH7
-	dw SFX_Cry13_2_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry13_2_Ch1
+	dbw CH5, SFX_Cry13_2_Ch2
+	dbw CH7, SFX_Cry13_2_Ch3
 
 SFX_Cry14_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry14_2_Ch1
-	db CH5
-	dw SFX_Cry14_2_Ch2
-	db CH7
-	dw SFX_Cry14_2_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry14_2_Ch1
+	dbw CH5, SFX_Cry14_2_Ch2
+	dbw CH7, SFX_Cry14_2_Ch3
 
 SFX_Cry15_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry15_2_Ch1
-	db CH5
-	dw SFX_Cry15_2_Ch2
-	db CH7
-	dw SFX_Cry15_2_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry15_2_Ch1
+	dbw CH5, SFX_Cry15_2_Ch2
+	dbw CH7, SFX_Cry15_2_Ch3
 
 SFX_Cry16_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry16_2_Ch1
-	db CH5
-	dw SFX_Cry16_2_Ch2
-	db CH7
-	dw SFX_Cry16_2_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry16_2_Ch1
+	dbw CH5, SFX_Cry16_2_Ch2
+	dbw CH7, SFX_Cry16_2_Ch3
 
 SFX_Cry17_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry17_2_Ch1
-	db CH5
-	dw SFX_Cry17_2_Ch2
-	db CH7
-	dw SFX_Cry17_2_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry17_2_Ch1
+	dbw CH5, SFX_Cry17_2_Ch2
+	dbw CH7, SFX_Cry17_2_Ch3
 
 SFX_Cry18_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry18_2_Ch1
-	db CH5
-	dw SFX_Cry18_2_Ch2
-	db CH7
-	dw SFX_Cry18_2_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry18_2_Ch1
+	dbw CH5, SFX_Cry18_2_Ch2
+	dbw CH7, SFX_Cry18_2_Ch3
 
 SFX_Cry19_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry19_2_Ch1
-	db CH5
-	dw SFX_Cry19_2_Ch2
-	db CH7
-	dw SFX_Cry19_2_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry19_2_Ch1
+	dbw CH5, SFX_Cry19_2_Ch2
+	dbw CH7, SFX_Cry19_2_Ch3
 
 SFX_Cry1A_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry1A_2_Ch1
-	db CH5
-	dw SFX_Cry1A_2_Ch2
-	db CH7
-	dw SFX_Cry1A_2_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry1A_2_Ch1
+	dbw CH5, SFX_Cry1A_2_Ch2
+	dbw CH7, SFX_Cry1A_2_Ch3
 
 SFX_Cry1B_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry1B_2_Ch1
-	db CH5
-	dw SFX_Cry1B_2_Ch2
-	db CH7
-	dw SFX_Cry1B_2_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry1B_2_Ch1
+	dbw CH5, SFX_Cry1B_2_Ch2
+	dbw CH7, SFX_Cry1B_2_Ch3
 
 SFX_Cry1C_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry1C_2_Ch1
-	db CH5
-	dw SFX_Cry1C_2_Ch2
-	db CH7
-	dw SFX_Cry1C_2_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry1C_2_Ch1
+	dbw CH5, SFX_Cry1C_2_Ch2
+	dbw CH7, SFX_Cry1C_2_Ch3
 
 SFX_Cry1D_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry1D_2_Ch1
-	db CH5
-	dw SFX_Cry1D_2_Ch2
-	db CH7
-	dw SFX_Cry1D_2_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry1D_2_Ch1
+	dbw CH5, SFX_Cry1D_2_Ch2
+	dbw CH7, SFX_Cry1D_2_Ch3
 
 SFX_Cry1E_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry1E_2_Ch1
-	db CH5
-	dw SFX_Cry1E_2_Ch2
-	db CH7
-	dw SFX_Cry1E_2_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry1E_2_Ch1
+	dbw CH5, SFX_Cry1E_2_Ch2
+	dbw CH7, SFX_Cry1E_2_Ch3
 
 SFX_Cry1F_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry1F_2_Ch1
-	db CH5
-	dw SFX_Cry1F_2_Ch2
-	db CH7
-	dw SFX_Cry1F_2_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry1F_2_Ch1
+	dbw CH5, SFX_Cry1F_2_Ch2
+	dbw CH7, SFX_Cry1F_2_Ch3
 
 SFX_Cry20_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry20_2_Ch1
-	db CH5
-	dw SFX_Cry20_2_Ch2
-	db CH7
-	dw SFX_Cry20_2_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry20_2_Ch1
+	dbw CH5, SFX_Cry20_2_Ch2
+	dbw CH7, SFX_Cry20_2_Ch3
 
 SFX_Cry21_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry21_2_Ch1
-	db CH5
-	dw SFX_Cry21_2_Ch2
-	db CH7
-	dw SFX_Cry21_2_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry21_2_Ch1
+	dbw CH5, SFX_Cry21_2_Ch2
+	dbw CH7, SFX_Cry21_2_Ch3
 
 SFX_Cry22_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry22_2_Ch1
-	db CH5
-	dw SFX_Cry22_2_Ch2
-	db CH7
-	dw SFX_Cry22_2_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry22_2_Ch1
+	dbw CH5, SFX_Cry22_2_Ch2
+	dbw CH7, SFX_Cry22_2_Ch3
 
 SFX_Cry23_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry23_2_Ch1
-	db CH5
-	dw SFX_Cry23_2_Ch2
-	db CH7
-	dw SFX_Cry23_2_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry23_2_Ch1
+	dbw CH5, SFX_Cry23_2_Ch2
+	dbw CH7, SFX_Cry23_2_Ch3
 
 SFX_Cry24_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry24_2_Ch1
-	db CH5
-	dw SFX_Cry24_2_Ch2
-	db CH7
-	dw SFX_Cry24_2_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry24_2_Ch1
+	dbw CH5, SFX_Cry24_2_Ch2
+	dbw CH7, SFX_Cry24_2_Ch3
 
 SFX_Cry25_2::
-	db ( $80 | CH4 )
-	dw SFX_Cry25_2_Ch1
-	db CH5
-	dw SFX_Cry25_2_Ch2
-	db CH7
-	dw SFX_Cry25_2_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry25_2_Ch1
+	dbw CH5, SFX_Cry25_2_Ch2
+	dbw CH7, SFX_Cry25_2_Ch3
 
 SFX_Level_Up::
-	db ( $80 | CH4 )
-	dw SFX_Level_Up_Ch1
-	db CH5
-	dw SFX_Level_Up_Ch2
-	db CH6
-	dw SFX_Level_Up_Ch3
+	dbw ( $80 | CH4 ), SFX_Level_Up_Ch1
+	dbw CH5, SFX_Level_Up_Ch2
+	dbw CH6, SFX_Level_Up_Ch3
 
 SFX_Get_Item2_2::
-	db ( $80 | CH4 )
-	dw SFX_Get_Item2_2_Ch1
-	db CH5
-	dw SFX_Get_Item2_2_Ch2
-	db CH6
-	dw SFX_Get_Item2_2_Ch3
+	dbw ( $80 | CH4 ), SFX_Get_Item2_2_Ch1
+	dbw CH5, SFX_Get_Item2_2_Ch2
+	dbw CH6, SFX_Get_Item2_2_Ch3
 
 SFX_Tink_2::
-	db CH4
-	dw SFX_Tink_2_Ch1
+	dbw CH4, SFX_Tink_2_Ch1
 
 SFX_Heal_HP_2::
-	db CH4
-	dw SFX_Heal_HP_2_Ch1
+	dbw CH4, SFX_Heal_HP_2_Ch1
 
 SFX_Heal_Ailment_2::
-	db CH4
-	dw SFX_Heal_Ailment_2_Ch1
+	dbw CH4, SFX_Heal_Ailment_2_Ch1
 
 SFX_Start_Menu_2::
-	db CH7
-	dw SFX_Start_Menu_2_Ch1
+	dbw CH7, SFX_Start_Menu_2_Ch1
 
 SFX_Press_AB_2::
-	db CH4
-	dw SFX_Press_AB_2_Ch1
+	dbw CH4, SFX_Press_AB_2_Ch1
 
 SFX_Ball_Toss::
-	db ( $40 | CH4 )
-	dw SFX_Ball_Toss_Ch1
-	db CH5
-	dw SFX_Ball_Toss_Ch2
+	dbw ( $40 | CH4 ), SFX_Ball_Toss_Ch1
+	dbw CH5, SFX_Ball_Toss_Ch2
 
 SFX_Ball_Poof::
-	db ( $40 | CH4 )
-	dw SFX_Ball_Poof_Ch1
-	db CH7
-	dw SFX_Ball_Poof_Ch2
+	dbw ( $40 | CH4 ), SFX_Ball_Poof_Ch1
+	dbw CH7, SFX_Ball_Poof_Ch2
 
 SFX_Faint_Thud::
-	db ( $40 | CH4 )
-	dw SFX_Faint_Thud_Ch1
-	db CH7
-	dw SFX_Faint_Thud_Ch2
+	dbw ( $40 | CH4 ), SFX_Faint_Thud_Ch1
+	dbw CH7, SFX_Faint_Thud_Ch2
 
 SFX_Run::
-	db CH7
-	dw SFX_Run_Ch1
+	dbw CH7, SFX_Run_Ch1
 
 SFX_Dex_Page_Added::
-	db ( $40 | CH4 )
-	dw SFX_Dex_Page_Added_Ch1
-	db CH5
-	dw SFX_Dex_Page_Added_Ch2
+	dbw ( $40 | CH4 ), SFX_Dex_Page_Added_Ch1
+	dbw CH5, SFX_Dex_Page_Added_Ch2
 
 SFX_Caught_Mon::
-	db ( $80 | CH4 )
-	dw SFX_Caught_Mon_Ch1
-	db CH5
-	dw SFX_Caught_Mon_Ch2
-	db CH6
-	dw SFX_Caught_Mon_Ch3
+	dbw ( $80 | CH4 ), SFX_Caught_Mon_Ch1
+	dbw CH5, SFX_Caught_Mon_Ch2
+	dbw CH6, SFX_Caught_Mon_Ch3
 
 SFX_Peck::
-	db CH7
-	dw SFX_Peck_Ch1
+	dbw CH7, SFX_Peck_Ch1
 
 SFX_Faint_Fall::
-	db CH4
-	dw SFX_Faint_Fall_Ch1
+	dbw CH4, SFX_Faint_Fall_Ch1
 
 SFX_Battle_09::
-	db CH4
-	dw SFX_Battle_09_Ch1
+	dbw CH4, SFX_Battle_09_Ch1
 
 SFX_Pound::
-	db CH7
-	dw SFX_Pound_Ch1
+	dbw CH7, SFX_Pound_Ch1
 
 SFX_Battle_0B::
-	db CH7
-	dw SFX_Battle_0B_Ch1
+	dbw CH7, SFX_Battle_0B_Ch1
 
 SFX_Battle_0C::
-	db CH7
-	dw SFX_Battle_0C_Ch1
+	dbw CH7, SFX_Battle_0C_Ch1
 
 SFX_Battle_0D::
-	db CH7
-	dw SFX_Battle_0D_Ch1
+	dbw CH7, SFX_Battle_0D_Ch1
 
 SFX_Battle_0E::
-	db CH7
-	dw SFX_Battle_0E_Ch1
+	dbw CH7, SFX_Battle_0E_Ch1
 
 SFX_Battle_0F::
-	db CH7
-	dw SFX_Battle_0F_Ch1
+	dbw CH7, SFX_Battle_0F_Ch1
 
 SFX_Damage::
-	db CH7
-	dw SFX_Damage_Ch1
+	dbw CH7, SFX_Damage_Ch1
 
 SFX_Not_Very_Effective::
-	db CH7
-	dw SFX_Not_Very_Effective_Ch1
+	dbw CH7, SFX_Not_Very_Effective_Ch1
 
 SFX_Battle_12::
-	db CH7
-	dw SFX_Battle_12_Ch1
+	dbw CH7, SFX_Battle_12_Ch1
 
 SFX_Battle_13::
-	db CH7
-	dw SFX_Battle_13_Ch1
+	dbw CH7, SFX_Battle_13_Ch1
 
 SFX_Battle_14::
-	db CH7
-	dw SFX_Battle_14_Ch1
+	dbw CH7, SFX_Battle_14_Ch1
 
 SFX_Vine_Whip::
-	db CH7
-	dw SFX_Vine_Whip_Ch1
+	dbw CH7, SFX_Vine_Whip_Ch1
 
 SFX_Battle_16::
-	db CH7
-	dw SFX_Battle_16_Ch1
+	dbw CH7, SFX_Battle_16_Ch1
 
 SFX_Battle_17::
-	db CH7
-	dw SFX_Battle_17_Ch1
+	dbw CH7, SFX_Battle_17_Ch1
 
 SFX_Battle_18::
-	db CH7
-	dw SFX_Battle_18_Ch1
+	dbw CH7, SFX_Battle_18_Ch1
 
 SFX_Battle_19::
-	db CH7
-	dw SFX_Battle_19_Ch1
+	dbw CH7, SFX_Battle_19_Ch1
 
 SFX_Super_Effective::
-	db CH7
-	dw SFX_Super_Effective_Ch1
+	dbw CH7, SFX_Super_Effective_Ch1
 
 SFX_Battle_1B::
-	db CH7
-	dw SFX_Battle_1B_Ch1
+	dbw CH7, SFX_Battle_1B_Ch1
 
 SFX_Battle_1C::
-	db CH7
-	dw SFX_Battle_1C_Ch1
+	dbw CH7, SFX_Battle_1C_Ch1
 
 SFX_Doubleslap::
-	db CH7
-	dw SFX_Doubleslap_Ch1
+	dbw CH7, SFX_Doubleslap_Ch1
 
 SFX_Battle_1E::
-	db ( $40 | CH4 )
-	dw SFX_Battle_1E_Ch1
-	db CH7
-	dw SFX_Battle_1E_Ch2
+	dbw ( $40 | CH4 ), SFX_Battle_1E_Ch1
+	dbw CH7, SFX_Battle_1E_Ch2
 
 SFX_Horn_Drill::
-	db CH7
-	dw SFX_Horn_Drill_Ch1
+	dbw CH7, SFX_Horn_Drill_Ch1
 
 SFX_Battle_20::
-	db CH7
-	dw SFX_Battle_20_Ch1
+	dbw CH7, SFX_Battle_20_Ch1
 
 SFX_Battle_21::
-	db CH7
-	dw SFX_Battle_21_Ch1
+	dbw CH7, SFX_Battle_21_Ch1
 
 SFX_Battle_22::
-	db CH7
-	dw SFX_Battle_22_Ch1
+	dbw CH7, SFX_Battle_22_Ch1
 
 SFX_Battle_23::
-	db CH7
-	dw SFX_Battle_23_Ch1
+	dbw CH7, SFX_Battle_23_Ch1
 
 SFX_Battle_24::
-	db ( $40 | CH4 )
-	dw SFX_Battle_24_Ch1
-	db CH7
-	dw SFX_Battle_24_Ch2
+	dbw ( $40 | CH4 ), SFX_Battle_24_Ch1
+	dbw CH7, SFX_Battle_24_Ch2
 
 SFX_Battle_25::
-	db CH7
-	dw SFX_Battle_25_Ch1
+	dbw CH7, SFX_Battle_25_Ch1
 
 SFX_Battle_26::
-	db CH7
-	dw SFX_Battle_26_Ch1
+	dbw CH7, SFX_Battle_26_Ch1
 
 SFX_Battle_27::
-	db ( $80 | CH4 )
-	dw SFX_Battle_27_Ch1
-	db CH5
-	dw SFX_Battle_27_Ch2
-	db CH7
-	dw SFX_Battle_27_Ch3
+	dbw ( $80 | CH4 ), SFX_Battle_27_Ch1
+	dbw CH5, SFX_Battle_27_Ch2
+	dbw CH7, SFX_Battle_27_Ch3
 
 SFX_Battle_28::
-	db ( $80 | CH4 )
-	dw SFX_Battle_28_Ch1
-	db CH5
-	dw SFX_Battle_28_Ch2
-	db CH7
-	dw SFX_Battle_28_Ch3
-
-SFX_Battle_29::
-	db ( $40 | CH4 )
-	dw SFX_Battle_29_Ch1
-	db CH7
-	dw SFX_Battle_29_Ch2
+	dbw ( $80 | CH4 ), SFX_Battle_28_Ch1
+	dbw CH5, SFX_Battle_28_Ch2
+	dbw CH7, SFX_Battle_28_Ch3
+
+SFX_Earthquake::
+	dbw ( $40 | CH4 ), SFX_Earthquake_Ch1
+	dbw CH7, SFX_Earthquake_Ch2
 
 SFX_Battle_2A::
-	db ( $80 | CH4 )
-	dw SFX_Battle_2A_Ch1
-	db CH5
-	dw SFX_Battle_2A_Ch2
-	db CH7
-	dw SFX_Battle_2A_Ch3
+	dbw ( $80 | CH4 ), SFX_Battle_2A_Ch1
+	dbw CH5, SFX_Battle_2A_Ch2
+	dbw CH7, SFX_Battle_2A_Ch3
 
 SFX_Battle_2B::
-	db ( $40 | CH4 )
-	dw SFX_Battle_2B_Ch1
-	db CH7
-	dw SFX_Battle_2B_Ch2
+	dbw ( $40 | CH4 ), SFX_Battle_2B_Ch1
+	dbw CH7, SFX_Battle_2B_Ch2
 
 SFX_Battle_2C::
-	db ( $80 | CH4 )
-	dw SFX_Battle_2C_Ch1
-	db CH5
-	dw SFX_Battle_2C_Ch2
-	db CH7
-	dw SFX_Battle_2C_Ch3
+	dbw ( $80 | CH4 ), SFX_Battle_2C_Ch1
+	dbw CH5, SFX_Battle_2C_Ch2
+	dbw CH7, SFX_Battle_2C_Ch3
 
 SFX_Psybeam::
-	db ( $80 | CH4 )
-	dw SFX_Psybeam_Ch1
-	db CH5
-	dw SFX_Psybeam_Ch2
-	db CH7
-	dw SFX_Psybeam_Ch3
+	dbw ( $80 | CH4 ), SFX_Psybeam_Ch1
+	dbw CH5, SFX_Psybeam_Ch2
+	dbw CH7, SFX_Psybeam_Ch3
 
 SFX_Battle_2E::
-	db ( $80 | CH4 )
-	dw SFX_Battle_2E_Ch1
-	db CH5
-	dw SFX_Battle_2E_Ch2
-	db CH7
-	dw SFX_Battle_2E_Ch3
-
-SFX_Battle_2F::
-	db ( $80 | CH4 )
-	dw SFX_Battle_2F_Ch1
-	db CH5
-	dw SFX_Battle_2F_Ch2
-	db CH7
-	dw SFX_Battle_2F_Ch3
+	dbw ( $80 | CH4 ), SFX_Battle_2E_Ch1
+	dbw CH5, SFX_Battle_2E_Ch2
+	dbw CH7, SFX_Battle_2E_Ch3
+
+SFX_Thunderbolt::
+	dbw ( $80 | CH4 ), SFX_Thunderbolt_Ch1
+	dbw CH5, SFX_Thunderbolt_Ch2
+	dbw CH7, SFX_Thunderbolt_Ch3
 
 SFX_Psychic_M::
-	db ( $80 | CH4 )
-	dw SFX_Psychic_M_Ch1
-	db CH5
-	dw SFX_Psychic_M_Ch2
-	db CH7
-	dw SFX_Psychic_M_Ch3
+	dbw ( $80 | CH4 ), SFX_Psychic_M_Ch1
+	dbw CH5, SFX_Psychic_M_Ch2
+	dbw CH7, SFX_Psychic_M_Ch3
 
 SFX_Battle_31::
-	db ( $40 | CH4 )
-	dw SFX_Battle_31_Ch1
-	db CH5
-	dw SFX_Battle_31_Ch2
+	dbw ( $40 | CH4 ), SFX_Battle_31_Ch1
+	dbw CH5, SFX_Battle_31_Ch2
 
 SFX_Battle_32::
-	db ( $40 | CH4 )
-	dw SFX_Battle_32_Ch1
-	db CH5
-	dw SFX_Battle_32_Ch2
+	dbw ( $40 | CH4 ), SFX_Battle_32_Ch1
+	dbw CH5, SFX_Battle_32_Ch2
 
 SFX_Battle_33::
-	db ( $40 | CH4 )
-	dw SFX_Battle_33_Ch1
-	db CH5
-	dw SFX_Battle_33_Ch2
+	dbw ( $40 | CH4 ), SFX_Battle_33_Ch1
+	dbw CH5, SFX_Battle_33_Ch2
 
 SFX_Battle_34::
-	db ( $80 | CH4 )
-	dw SFX_Battle_34_Ch1
-	db CH5
-	dw SFX_Battle_34_Ch2
-	db CH7
-	dw SFX_Battle_34_Ch3
+	dbw ( $80 | CH4 ), SFX_Battle_34_Ch1
+	dbw CH5, SFX_Battle_34_Ch2
+	dbw CH7, SFX_Battle_34_Ch3
 
 SFX_Battle_35::
-	db ( $40 | CH4 )
-	dw SFX_Battle_35_Ch1
-	db CH5
-	dw SFX_Battle_35_Ch2
+	dbw ( $40 | CH4 ), SFX_Battle_35_Ch1
+	dbw CH5, SFX_Battle_35_Ch2
 
 SFX_Battle_36::
-	db ( $80 | CH4 )
-	dw SFX_Battle_36_Ch1
-	db CH5
-	dw SFX_Battle_36_Ch2
-	db CH7
-	dw SFX_Battle_36_Ch3
+	dbw ( $80 | CH4 ), SFX_Battle_36_Ch1
+	dbw CH5, SFX_Battle_36_Ch2
+	dbw CH7, SFX_Battle_36_Ch3
 
 SFX_Silph_Scope::
-	db CH4
-	dw SFX_Silph_Scope_Ch1
+	dbw CH4, SFX_Silph_Scope_Ch1
diff --git a/audio/headers/sfxheaders3.asm b/audio/headers/sfxheaders3.asm
index 0472afa6..cd940357 100644
--- a/audio/headers/sfxheaders3.asm
+++ b/audio/headers/sfxheaders3.asm
@@ -1,596 +1,402 @@
 SFX_Headers_3::
-	db $ff, $ff, $ff ; padding
+	dbw -1, -1 ; padding
 
 SFX_Snare1_3::
-	db CH7
-	dw SFX_Snare1_3_Ch1
+	dbw CH7, SFX_Snare1_3_Ch1
 
 SFX_Snare2_3::
-	db CH7
-	dw SFX_Snare2_3_Ch1
+	dbw CH7, SFX_Snare2_3_Ch1
 
 SFX_Snare3_3::
-	db CH7
-	dw SFX_Snare3_3_Ch1
+	dbw CH7, SFX_Snare3_3_Ch1
 
 SFX_Snare4_3::
-	db CH7
-	dw SFX_Snare4_3_Ch1
+	dbw CH7, SFX_Snare4_3_Ch1
 
 SFX_Snare5_3::
-	db CH7
-	dw SFX_Snare5_3_Ch1
+	dbw CH7, SFX_Snare5_3_Ch1
 
 SFX_Triangle1_3::
-	db CH7
-	dw SFX_Triangle1_3_Ch1
+	dbw CH7, SFX_Triangle1_3_Ch1
 
 SFX_Triangle2_3::
-	db CH7
-	dw SFX_Triangle2_3_Ch1
+	dbw CH7, SFX_Triangle2_3_Ch1
 
 SFX_Snare6_3::
-	db CH7
-	dw SFX_Snare6_3_Ch1
+	dbw CH7, SFX_Snare6_3_Ch1
 
 SFX_Snare7_3::
-	db CH7
-	dw SFX_Snare7_3_Ch1
+	dbw CH7, SFX_Snare7_3_Ch1
 
 SFX_Snare8_3::
-	db CH7
-	dw SFX_Snare8_3_Ch1
+	dbw CH7, SFX_Snare8_3_Ch1
 
 SFX_Snare9_3::
-	db CH7
-	dw SFX_Snare9_3_Ch1
+	dbw CH7, SFX_Snare9_3_Ch1
 
 SFX_Cymbal1_3::
-	db CH7
-	dw SFX_Cymbal1_3_Ch1
+	dbw CH7, SFX_Cymbal1_3_Ch1
 
 SFX_Cymbal2_3::
-	db CH7
-	dw SFX_Cymbal2_3_Ch1
+	dbw CH7, SFX_Cymbal2_3_Ch1
 
 SFX_Cymbal3_3::
-	db CH7
-	dw SFX_Cymbal3_3_Ch1
+	dbw CH7, SFX_Cymbal3_3_Ch1
 
 SFX_Muted_Snare1_3::
-	db CH7
-	dw SFX_Muted_Snare1_3_Ch1
+	dbw CH7, SFX_Muted_Snare1_3_Ch1
 
 SFX_Triangle3_3::
-	db CH7
-	dw SFX_Triangle3_3_Ch1
+	dbw CH7, SFX_Triangle3_3_Ch1
 
 SFX_Muted_Snare2_3::
-	db CH7
-	dw SFX_Muted_Snare2_3_Ch1
+	dbw CH7, SFX_Muted_Snare2_3_Ch1
 
 SFX_Muted_Snare3_3::
-	db CH7
-	dw SFX_Muted_Snare3_3_Ch1
+	dbw CH7, SFX_Muted_Snare3_3_Ch1
 
 SFX_Muted_Snare4_3::
-	db CH7
-	dw SFX_Muted_Snare4_3_Ch1
+	dbw CH7, SFX_Muted_Snare4_3_Ch1
 
 SFX_Cry00_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry00_3_Ch1
-	db CH5
-	dw SFX_Cry00_3_Ch2
-	db CH7
-	dw SFX_Cry00_3_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry00_3_Ch1
+	dbw CH5, SFX_Cry00_3_Ch2
+	dbw CH7, SFX_Cry00_3_Ch3
 
 SFX_Cry01_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry01_3_Ch1
-	db CH5
-	dw SFX_Cry01_3_Ch2
-	db CH7
-	dw SFX_Cry01_3_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry01_3_Ch1
+	dbw CH5, SFX_Cry01_3_Ch2
+	dbw CH7, SFX_Cry01_3_Ch3
 
 SFX_Cry02_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry02_3_Ch1
-	db CH5
-	dw SFX_Cry02_3_Ch2
-	db CH7
-	dw SFX_Cry02_3_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry02_3_Ch1
+	dbw CH5, SFX_Cry02_3_Ch2
+	dbw CH7, SFX_Cry02_3_Ch3
 
 SFX_Cry03_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry03_3_Ch1
-	db CH5
-	dw SFX_Cry03_3_Ch2
-	db CH7
-	dw SFX_Cry03_3_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry03_3_Ch1
+	dbw CH5, SFX_Cry03_3_Ch2
+	dbw CH7, SFX_Cry03_3_Ch3
 
 SFX_Cry04_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry04_3_Ch1
-	db CH5
-	dw SFX_Cry04_3_Ch2
-	db CH7
-	dw SFX_Cry04_3_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry04_3_Ch1
+	dbw CH5, SFX_Cry04_3_Ch2
+	dbw CH7, SFX_Cry04_3_Ch3
 
 SFX_Cry05_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry05_3_Ch1
-	db CH5
-	dw SFX_Cry05_3_Ch2
-	db CH7
-	dw SFX_Cry05_3_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry05_3_Ch1
+	dbw CH5, SFX_Cry05_3_Ch2
+	dbw CH7, SFX_Cry05_3_Ch3
 
 SFX_Cry06_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry06_3_Ch1
-	db CH5
-	dw SFX_Cry06_3_Ch2
-	db CH7
-	dw SFX_Cry06_3_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry06_3_Ch1
+	dbw CH5, SFX_Cry06_3_Ch2
+	dbw CH7, SFX_Cry06_3_Ch3
 
 SFX_Cry07_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry07_3_Ch1
-	db CH5
-	dw SFX_Cry07_3_Ch2
-	db CH7
-	dw SFX_Cry07_3_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry07_3_Ch1
+	dbw CH5, SFX_Cry07_3_Ch2
+	dbw CH7, SFX_Cry07_3_Ch3
 
 SFX_Cry08_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry08_3_Ch1
-	db CH5
-	dw SFX_Cry08_3_Ch2
-	db CH7
-	dw SFX_Cry08_3_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry08_3_Ch1
+	dbw CH5, SFX_Cry08_3_Ch2
+	dbw CH7, SFX_Cry08_3_Ch3
 
 SFX_Cry09_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry09_3_Ch1
-	db CH5
-	dw SFX_Cry09_3_Ch2
-	db CH7
-	dw SFX_Cry09_3_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry09_3_Ch1
+	dbw CH5, SFX_Cry09_3_Ch2
+	dbw CH7, SFX_Cry09_3_Ch3
 
 SFX_Cry0A_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry0A_3_Ch1
-	db CH5
-	dw SFX_Cry0A_3_Ch2
-	db CH7
-	dw SFX_Cry0A_3_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry0A_3_Ch1
+	dbw CH5, SFX_Cry0A_3_Ch2
+	dbw CH7, SFX_Cry0A_3_Ch3
 
 SFX_Cry0B_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry0B_3_Ch1
-	db CH5
-	dw SFX_Cry0B_3_Ch2
-	db CH7
-	dw SFX_Cry0B_3_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry0B_3_Ch1
+	dbw CH5, SFX_Cry0B_3_Ch2
+	dbw CH7, SFX_Cry0B_3_Ch3
 
 SFX_Cry0C_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry0C_3_Ch1
-	db CH5
-	dw SFX_Cry0C_3_Ch2
-	db CH7
-	dw SFX_Cry0C_3_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry0C_3_Ch1
+	dbw CH5, SFX_Cry0C_3_Ch2
+	dbw CH7, SFX_Cry0C_3_Ch3
 
 SFX_Cry0D_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry0D_3_Ch1
-	db CH5
-	dw SFX_Cry0D_3_Ch2
-	db CH7
-	dw SFX_Cry0D_3_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry0D_3_Ch1
+	dbw CH5, SFX_Cry0D_3_Ch2
+	dbw CH7, SFX_Cry0D_3_Ch3
 
 SFX_Cry0E_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry0E_3_Ch1
-	db CH5
-	dw SFX_Cry0E_3_Ch2
-	db CH7
-	dw SFX_Cry0E_3_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry0E_3_Ch1
+	dbw CH5, SFX_Cry0E_3_Ch2
+	dbw CH7, SFX_Cry0E_3_Ch3
 
 SFX_Cry0F_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry0F_3_Ch1
-	db CH5
-	dw SFX_Cry0F_3_Ch2
-	db CH7
-	dw SFX_Cry0F_3_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry0F_3_Ch1
+	dbw CH5, SFX_Cry0F_3_Ch2
+	dbw CH7, SFX_Cry0F_3_Ch3
 
 SFX_Cry10_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry10_3_Ch1
-	db CH5
-	dw SFX_Cry10_3_Ch2
-	db CH7
-	dw SFX_Cry10_3_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry10_3_Ch1
+	dbw CH5, SFX_Cry10_3_Ch2
+	dbw CH7, SFX_Cry10_3_Ch3
 
 SFX_Cry11_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry11_3_Ch1
-	db CH5
-	dw SFX_Cry11_3_Ch2
-	db CH7
-	dw SFX_Cry11_3_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry11_3_Ch1
+	dbw CH5, SFX_Cry11_3_Ch2
+	dbw CH7, SFX_Cry11_3_Ch3
 
 SFX_Cry12_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry12_3_Ch1
-	db CH5
-	dw SFX_Cry12_3_Ch2
-	db CH7
-	dw SFX_Cry12_3_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry12_3_Ch1
+	dbw CH5, SFX_Cry12_3_Ch2
+	dbw CH7, SFX_Cry12_3_Ch3
 
 SFX_Cry13_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry13_3_Ch1
-	db CH5
-	dw SFX_Cry13_3_Ch2
-	db CH7
-	dw SFX_Cry13_3_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry13_3_Ch1
+	dbw CH5, SFX_Cry13_3_Ch2
+	dbw CH7, SFX_Cry13_3_Ch3
 
 SFX_Cry14_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry14_3_Ch1
-	db CH5
-	dw SFX_Cry14_3_Ch2
-	db CH7
-	dw SFX_Cry14_3_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry14_3_Ch1
+	dbw CH5, SFX_Cry14_3_Ch2
+	dbw CH7, SFX_Cry14_3_Ch3
 
 SFX_Cry15_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry15_3_Ch1
-	db CH5
-	dw SFX_Cry15_3_Ch2
-	db CH7
-	dw SFX_Cry15_3_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry15_3_Ch1
+	dbw CH5, SFX_Cry15_3_Ch2
+	dbw CH7, SFX_Cry15_3_Ch3
 
 SFX_Cry16_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry16_3_Ch1
-	db CH5
-	dw SFX_Cry16_3_Ch2
-	db CH7
-	dw SFX_Cry16_3_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry16_3_Ch1
+	dbw CH5, SFX_Cry16_3_Ch2
+	dbw CH7, SFX_Cry16_3_Ch3
 
 SFX_Cry17_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry17_3_Ch1
-	db CH5
-	dw SFX_Cry17_3_Ch2
-	db CH7
-	dw SFX_Cry17_3_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry17_3_Ch1
+	dbw CH5, SFX_Cry17_3_Ch2
+	dbw CH7, SFX_Cry17_3_Ch3
 
 SFX_Cry18_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry18_3_Ch1
-	db CH5
-	dw SFX_Cry18_3_Ch2
-	db CH7
-	dw SFX_Cry18_3_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry18_3_Ch1
+	dbw CH5, SFX_Cry18_3_Ch2
+	dbw CH7, SFX_Cry18_3_Ch3
 
 SFX_Cry19_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry19_3_Ch1
-	db CH5
-	dw SFX_Cry19_3_Ch2
-	db CH7
-	dw SFX_Cry19_3_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry19_3_Ch1
+	dbw CH5, SFX_Cry19_3_Ch2
+	dbw CH7, SFX_Cry19_3_Ch3
 
 SFX_Cry1A_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry1A_3_Ch1
-	db CH5
-	dw SFX_Cry1A_3_Ch2
-	db CH7
-	dw SFX_Cry1A_3_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry1A_3_Ch1
+	dbw CH5, SFX_Cry1A_3_Ch2
+	dbw CH7, SFX_Cry1A_3_Ch3
 
 SFX_Cry1B_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry1B_3_Ch1
-	db CH5
-	dw SFX_Cry1B_3_Ch2
-	db CH7
-	dw SFX_Cry1B_3_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry1B_3_Ch1
+	dbw CH5, SFX_Cry1B_3_Ch2
+	dbw CH7, SFX_Cry1B_3_Ch3
 
 SFX_Cry1C_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry1C_3_Ch1
-	db CH5
-	dw SFX_Cry1C_3_Ch2
-	db CH7
-	dw SFX_Cry1C_3_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry1C_3_Ch1
+	dbw CH5, SFX_Cry1C_3_Ch2
+	dbw CH7, SFX_Cry1C_3_Ch3
 
 SFX_Cry1D_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry1D_3_Ch1
-	db CH5
-	dw SFX_Cry1D_3_Ch2
-	db CH7
-	dw SFX_Cry1D_3_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry1D_3_Ch1
+	dbw CH5, SFX_Cry1D_3_Ch2
+	dbw CH7, SFX_Cry1D_3_Ch3
 
 SFX_Cry1E_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry1E_3_Ch1
-	db CH5
-	dw SFX_Cry1E_3_Ch2
-	db CH7
-	dw SFX_Cry1E_3_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry1E_3_Ch1
+	dbw CH5, SFX_Cry1E_3_Ch2
+	dbw CH7, SFX_Cry1E_3_Ch3
 
 SFX_Cry1F_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry1F_3_Ch1
-	db CH5
-	dw SFX_Cry1F_3_Ch2
-	db CH7
-	dw SFX_Cry1F_3_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry1F_3_Ch1
+	dbw CH5, SFX_Cry1F_3_Ch2
+	dbw CH7, SFX_Cry1F_3_Ch3
 
 SFX_Cry20_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry20_3_Ch1
-	db CH5
-	dw SFX_Cry20_3_Ch2
-	db CH7
-	dw SFX_Cry20_3_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry20_3_Ch1
+	dbw CH5, SFX_Cry20_3_Ch2
+	dbw CH7, SFX_Cry20_3_Ch3
 
 SFX_Cry21_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry21_3_Ch1
-	db CH5
-	dw SFX_Cry21_3_Ch2
-	db CH7
-	dw SFX_Cry21_3_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry21_3_Ch1
+	dbw CH5, SFX_Cry21_3_Ch2
+	dbw CH7, SFX_Cry21_3_Ch3
 
 SFX_Cry22_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry22_3_Ch1
-	db CH5
-	dw SFX_Cry22_3_Ch2
-	db CH7
-	dw SFX_Cry22_3_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry22_3_Ch1
+	dbw CH5, SFX_Cry22_3_Ch2
+	dbw CH7, SFX_Cry22_3_Ch3
 
 SFX_Cry23_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry23_3_Ch1
-	db CH5
-	dw SFX_Cry23_3_Ch2
-	db CH7
-	dw SFX_Cry23_3_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry23_3_Ch1
+	dbw CH5, SFX_Cry23_3_Ch2
+	dbw CH7, SFX_Cry23_3_Ch3
 
 SFX_Cry24_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry24_3_Ch1
-	db CH5
-	dw SFX_Cry24_3_Ch2
-	db CH7
-	dw SFX_Cry24_3_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry24_3_Ch1
+	dbw CH5, SFX_Cry24_3_Ch2
+	dbw CH7, SFX_Cry24_3_Ch3
 
 SFX_Cry25_3::
-	db ( $80 | CH4 )
-	dw SFX_Cry25_3_Ch1
-	db CH5
-	dw SFX_Cry25_3_Ch2
-	db CH7
-	dw SFX_Cry25_3_Ch3
+	dbw ( $80 | CH4 ), SFX_Cry25_3_Ch1
+	dbw CH5, SFX_Cry25_3_Ch2
+	dbw CH7, SFX_Cry25_3_Ch3
 
 SFX_Get_Item1_3::
-	db ( $80 | CH4 )
-	dw SFX_Get_Item1_3_Ch1
-	db CH5
-	dw SFX_Get_Item1_3_Ch2
-	db CH6
-	dw SFX_Get_Item1_3_Ch3
+	dbw ( $80 | CH4 ), SFX_Get_Item1_3_Ch1
+	dbw CH5, SFX_Get_Item1_3_Ch2
+	dbw CH6, SFX_Get_Item1_3_Ch3
 
 SFX_Get_Item2_3::
-	db ( $80 | CH4 )
-	dw SFX_Get_Item2_3_Ch1
-	db CH5
-	dw SFX_Get_Item2_3_Ch2
-	db CH6
-	dw SFX_Get_Item2_3_Ch3
+	dbw ( $80 | CH4 ), SFX_Get_Item2_3_Ch1
+	dbw CH5, SFX_Get_Item2_3_Ch2
+	dbw CH6, SFX_Get_Item2_3_Ch3
 
 SFX_Tink_3::
-	db CH4
-	dw SFX_Tink_3_Ch1
+	dbw CH4, SFX_Tink_3_Ch1
 
 SFX_Heal_HP_3::
-	db CH4
-	dw SFX_Heal_HP_3_Ch1
+	dbw CH4, SFX_Heal_HP_3_Ch1
 
 SFX_Heal_Ailment_3::
-	db CH4
-	dw SFX_Heal_Ailment_3_Ch1
+	dbw CH4, SFX_Heal_Ailment_3_Ch1
 
 SFX_Start_Menu_3::
-	db CH7
-	dw SFX_Start_Menu_3_Ch1
+	dbw CH7, SFX_Start_Menu_3_Ch1
 
 SFX_Press_AB_3::
-	db CH4
-	dw SFX_Press_AB_3_Ch1
+	dbw CH4, SFX_Press_AB_3_Ch1
 
 SFX_Pokedex_Rating_3::
-	db ( $80 | CH4 )
-	dw SFX_Pokedex_Rating_3_Ch1
-	db CH5
-	dw SFX_Pokedex_Rating_3_Ch2
-	db CH6
-	dw SFX_Pokedex_Rating_3_Ch3
+	dbw ( $80 | CH4 ), SFX_Pokedex_Rating_3_Ch1
+	dbw CH5, SFX_Pokedex_Rating_3_Ch2
+	dbw CH6, SFX_Pokedex_Rating_3_Ch3
 
 SFX_Get_Key_Item_3::
-	db ( $80 | CH4 )
-	dw SFX_Get_Key_Item_3_Ch1
-	db CH5
-	dw SFX_Get_Key_Item_3_Ch2
-	db CH6
-	dw SFX_Get_Key_Item_3_Ch3
+	dbw ( $80 | CH4 ), SFX_Get_Key_Item_3_Ch1
+	dbw CH5, SFX_Get_Key_Item_3_Ch2
+	dbw CH6, SFX_Get_Key_Item_3_Ch3
 
 SFX_Poisoned_3::
-	db CH4
-	dw SFX_Poisoned_3_Ch1
+	dbw CH4, SFX_Poisoned_3_Ch1
 
 SFX_Trade_Machine_3::
-	db CH4
-	dw SFX_Trade_Machine_3_Ch1
+	dbw CH4, SFX_Trade_Machine_3_Ch1
 
 SFX_Turn_On_PC_3::
-	db CH4
-	dw SFX_Turn_On_PC_3_Ch1
+	dbw CH4, SFX_Turn_On_PC_3_Ch1
 
 SFX_Turn_Off_PC_3::
-	db CH4
-	dw SFX_Turn_Off_PC_3_Ch1
+	dbw CH4, SFX_Turn_Off_PC_3_Ch1
 
 SFX_Enter_PC_3::
-	db CH4
-	dw SFX_Enter_PC_3_Ch1
+	dbw CH4, SFX_Enter_PC_3_Ch1
 
 SFX_Shrink_3::
-	db CH4
-	dw SFX_Shrink_3_Ch1
+	dbw CH4, SFX_Shrink_3_Ch1
 
 SFX_Switch_3::
-	db CH4
-	dw SFX_Switch_3_Ch1
+	dbw CH4, SFX_Switch_3_Ch1
 
 SFX_Healing_Machine_3::
-	db CH4
-	dw SFX_Healing_Machine_3_Ch1
+	dbw CH4, SFX_Healing_Machine_3_Ch1
 
 SFX_Teleport_Exit1_3::
-	db CH4
-	dw SFX_Teleport_Exit1_3_Ch1
+	dbw CH4, SFX_Teleport_Exit1_3_Ch1
 
 SFX_Teleport_Enter1_3::
-	db CH4
-	dw SFX_Teleport_Enter1_3_Ch1
+	dbw CH4, SFX_Teleport_Enter1_3_Ch1
 
 SFX_Teleport_Exit2_3::
-	db CH4
-	dw SFX_Teleport_Exit2_3_Ch1
+	dbw CH4, SFX_Teleport_Exit2_3_Ch1
 
 SFX_Ledge_3::
-	db CH4
-	dw SFX_Ledge_3_Ch1
+	dbw CH4, SFX_Ledge_3_Ch1
 
 SFX_Teleport_Enter2_3::
-	db CH7
-	dw SFX_Teleport_Enter2_3_Ch1
+	dbw CH7, SFX_Teleport_Enter2_3_Ch1
 
 SFX_Fly_3::
-	db CH7
-	dw SFX_Fly_3_Ch1
+	dbw CH7, SFX_Fly_3_Ch1
 
 SFX_Denied_3::
-	db ( $40 | CH4 )
-	dw SFX_Denied_3_Ch1
-	db CH5
-	dw SFX_Denied_3_Ch2
+	dbw ( $40 | CH4 ), SFX_Denied_3_Ch1
+	dbw CH5, SFX_Denied_3_Ch2
 
 SFX_Arrow_Tiles_3::
-	db CH4
-	dw SFX_Arrow_Tiles_3_Ch1
+	dbw CH4, SFX_Arrow_Tiles_3_Ch1
 
 SFX_Push_Boulder_3::
-	db CH7
-	dw SFX_Push_Boulder_3_Ch1
+	dbw CH7, SFX_Push_Boulder_3_Ch1
 
 SFX_SS_Anne_Horn_3::
-	db ( $40 | CH4 )
-	dw SFX_SS_Anne_Horn_3_Ch1
-	db CH5
-	dw SFX_SS_Anne_Horn_3_Ch2
+	dbw ( $40 | CH4 ), SFX_SS_Anne_Horn_3_Ch1
+	dbw CH5, SFX_SS_Anne_Horn_3_Ch2
 
 SFX_Withdraw_Deposit_3::
-	db CH4
-	dw SFX_Withdraw_Deposit_3_Ch1
+	dbw CH4, SFX_Withdraw_Deposit_3_Ch1
 
 SFX_Cut_3::
-	db CH7
-	dw SFX_Cut_3_Ch1
+	dbw CH7, SFX_Cut_3_Ch1
 
 SFX_Go_Inside_3::
-	db CH7
-	dw SFX_Go_Inside_3_Ch1
+	dbw CH7, SFX_Go_Inside_3_Ch1
 
 SFX_Swap_3::
-	db ( $40 | CH4 )
-	dw SFX_Swap_3_Ch1
-	db CH5
-	dw SFX_Swap_3_Ch2
+	dbw ( $40 | CH4 ), SFX_Swap_3_Ch1
+	dbw CH5, SFX_Swap_3_Ch2
 
 SFX_59_3::
-	db ( $40 | CH4 )
-	dw SFX_59_3_Ch1
-	db CH5
-	dw SFX_59_3_Ch2
+	dbw ( $40 | CH4 ), SFX_59_3_Ch1
+	dbw CH5, SFX_59_3_Ch2
 
 SFX_Purchase_3::
-	db ( $40 | CH4 )
-	dw SFX_Purchase_3_Ch1
-	db CH5
-	dw SFX_Purchase_3_Ch2
+	dbw ( $40 | CH4 ), SFX_Purchase_3_Ch1
+	dbw CH5, SFX_Purchase_3_Ch2
 
 SFX_Collision_3::
-	db CH4
-	dw SFX_Collision_3_Ch1
+	dbw CH4, SFX_Collision_3_Ch1
 
 SFX_Go_Outside_3::
-	db CH7
-	dw SFX_Go_Outside_3_Ch1
+	dbw CH7, SFX_Go_Outside_3_Ch1
 
 SFX_Save_3::
-	db ( $40 | CH4 )
-	dw SFX_Save_3_Ch1
-	db CH5
-	dw SFX_Save_3_Ch2
+	dbw ( $40 | CH4 ), SFX_Save_3_Ch1
+	dbw CH5, SFX_Save_3_Ch2
 
 SFX_Intro_Lunge::
-	db CH7
-	dw SFX_Intro_Lunge_Ch1
+	dbw CH7, SFX_Intro_Lunge_Ch1
 
 SFX_Intro_Hip::
-	db CH4
-	dw SFX_Intro_Hip_Ch1
+	dbw CH4, SFX_Intro_Hip_Ch1
 
 SFX_Intro_Hop::
-	db CH4
-	dw SFX_Intro_Hop_Ch1
+	dbw CH4, SFX_Intro_Hop_Ch1
 
 SFX_Intro_Raise::
-	db CH7
-	dw SFX_Intro_Raise_Ch1
+	dbw CH7, SFX_Intro_Raise_Ch1
 
 SFX_Intro_Crash::
-	db CH7
-	dw SFX_Intro_Crash_Ch1
+	dbw CH7, SFX_Intro_Crash_Ch1
 
 SFX_Intro_Whoosh::
-	db CH7
-	dw SFX_Intro_Whoosh_Ch1
+	dbw CH7, SFX_Intro_Whoosh_Ch1
 
 SFX_Slots_Stop_Wheel::
-	db CH4
-	dw SFX_Slots_Stop_Wheel_Ch1
+	dbw CH4, SFX_Slots_Stop_Wheel_Ch1
 
 SFX_Slots_Reward::
-	db CH4
-	dw SFX_Slots_Reward_Ch1
+	dbw CH4, SFX_Slots_Reward_Ch1
 
 SFX_Slots_New_Spin::
-	db ( $40 | CH4 )
-	dw SFX_Slots_New_Spin_Ch1
-	db CH5
-	dw SFX_Slots_New_Spin_Ch2
+	dbw ( $40 | CH4 ), SFX_Slots_New_Spin_Ch1
+	dbw CH5, SFX_Slots_New_Spin_Ch2
 
 SFX_Shooting_Star::
-	db CH4
-	dw SFX_Shooting_Star_Ch1
+	dbw CH4, SFX_Shooting_Star_Ch1
diff --git a/audio/headers/sfxheaders4.asm b/audio/headers/sfxheaders4.asm
new file mode 100644
index 00000000..16e69e1f
--- /dev/null
+++ b/audio/headers/sfxheaders4.asm
@@ -0,0 +1,294 @@
+SFX_Headers_4::
+	dbw -1, -1 ; padding
+
+SFX_Snare1_4::
+	dbw CH7, SFX_Snare1_4_Ch7
+
+SFX_Snare2_4::
+	dbw CH7, SFX_Snare2_4_Ch7
+
+SFX_Snare3_4::
+	dbw CH7, SFX_Snare3_4_Ch7
+
+SFX_Snare4_4::
+	dbw CH7, SFX_Snare4_4_Ch7
+
+SFX_Snare5_4::
+	dbw CH7, SFX_Snare5_4_Ch7
+
+SFX_Triangle1_4::
+	dbw CH7, SFX_Triangle1_4_Ch7
+
+SFX_Triangle2_4::
+	dbw CH7, SFX_Triangle2_4_Ch7
+
+SFX_Snare6_4::
+	dbw CH7, SFX_Snare6_4_Ch7
+
+SFX_Snare7_4::
+	dbw CH7, SFX_Snare7_4_Ch7
+
+SFX_Snare8_4::
+	dbw CH7, SFX_Snare8_4_Ch7
+
+SFX_Snare9_4::
+	dbw CH7, SFX_Snare9_4_Ch7
+
+SFX_Cymbal1_4::
+	dbw CH7, SFX_Cymbal1_4_Ch7
+
+SFX_Cymbal2_4::
+	dbw CH7, SFX_Cymbal2_4_Ch7
+
+SFX_Cymbal3_4::
+	dbw CH7, SFX_Cymbal3_4_Ch7
+
+SFX_Muted_Snare1_4::
+	dbw CH7, SFX_Muted_Snare1_4_Ch7
+
+SFX_Triangle3_4::
+	dbw CH7, SFX_Triangle3_4_Ch7
+
+SFX_Muted_Snare2_4::
+	dbw CH7, SFX_Muted_Snare2_4_Ch7
+
+SFX_Muted_Snare3_4::
+	dbw CH7, SFX_Muted_Snare3_4_Ch7
+
+SFX_Muted_Snare4_4::
+	dbw CH7, SFX_Muted_Snare4_4_Ch7
+
+SFX_8003c_4::
+	dbw ( $80 | CH4 ), SFX_805db_4_Ch4
+	dbw CH5, SFX_805ea_4_Ch5
+	dbw CH7, SFX_805f9_4_Ch7
+
+SFX_80045_4::
+	dbw ( $80 | CH4 ), SFX_807eb_4_Ch4
+	dbw CH5, SFX_807fe_4_Ch5
+	dbw CH7, SFX_80811_4_Ch7
+
+SFX_8004e_4::
+	dbw ( $80 | CH4 ), SFX_80760_4_Ch4
+	dbw CH5, SFX_8076f_4_Ch5
+	dbw CH7, SFX_8077d_4_Ch7
+
+SFX_80057_4::
+	dbw ( $80 | CH4 ), SFX_804fa_4_Ch4
+	dbw CH5, SFX_80519_4_Ch5
+	dbw CH7, SFX_80538_4_Ch7
+
+SFX_80060_4::
+	dbw ( $80 | CH4 ), SFX_808a9_4_Ch4
+	dbw CH5, SFX_808c8_4_Ch5
+	dbw CH7, SFX_808e7_4_Ch7
+
+SFX_80069_4::
+	dbw ( $80 | CH4 ), SFX_80689_4_Ch4
+	dbw CH5, SFX_8069c_4_Ch5
+	dbw CH7, SFX_806ae_4_Ch7
+
+SFX_80072_4::
+	dbw ( $80 | CH4 ), SFX_80633_4_Ch4
+	dbw CH5, SFX_8064d_4_Ch5
+	dbw CH7, SFX_8064e_4_Ch7
+
+SFX_8007b_4::
+	dbw ( $80 | CH4 ), SFX_80661_4_Ch4
+	dbw CH5, SFX_80670_4_Ch5
+	dbw CH7, SFX_8067f_4_Ch7
+
+SFX_80084_4::
+	dbw ( $80 | CH4 ), SFX_80879_4_Ch4
+	dbw CH5, SFX_8088c_4_Ch5
+	dbw CH7, SFX_8089f_4_Ch7
+
+SFX_8008d_4::
+	dbw ( $80 | CH4 ), SFX_80383_4_Ch4
+	dbw CH5, SFX_803a0_4_Ch5
+	dbw CH7, SFX_803c1_4_Ch7
+
+SFX_80096_4::
+	dbw ( $80 | CH4 ), SFX_8081e_4_Ch4
+	dbw CH5, SFX_8083d_4_Ch5
+	dbw CH7, SFX_80860_4_Ch7
+
+SFX_8009f_4::
+	dbw ( $80 | CH4 ), SFX_806af_4_Ch4
+	dbw CH5, SFX_806da_4_Ch5
+	dbw CH7, SFX_806f9_4_Ch7
+
+SFX_800a8_4::
+	dbw ( $80 | CH4 ), SFX_80712_4_Ch4
+	dbw CH5, SFX_80739_4_Ch5
+	dbw CH7, SFX_8075f_4_Ch7
+
+SFX_800b1_4::
+	dbw ( $80 | CH4 ), SFX_8077e_4_Ch4
+	dbw CH5, SFX_8079d_4_Ch5
+	dbw CH7, SFX_807cc_4_Ch7
+
+SFX_800ba_4::
+	dbw ( $80 | CH4 ), SFX_80603_4_Ch4
+	dbw CH5, SFX_80616_4_Ch5
+	dbw CH7, SFX_80629_4_Ch7
+
+SFX_800c3_4::
+	dbw ( $80 | CH4 ), SFX_80545_4_Ch4
+	dbw CH5, SFX_80560_4_Ch5
+	dbw CH7, SFX_8057b_4_Ch7
+
+SFX_800cc_4::
+	dbw ( $80 | CH4 ), SFX_8058b_4_Ch4
+	dbw CH5, SFX_805ae_4_Ch5
+	dbw CH7, SFX_805d1_4_Ch7
+
+SFX_800d5_4::
+	dbw ( $80 | CH4 ), SFX_80467_4_Ch4
+	dbw CH5, SFX_80486_4_Ch5
+	dbw CH7, SFX_804a9_4_Ch7
+
+SFX_800de_4::
+	dbw ( $80 | CH4 ), SFX_8097f_4_Ch4
+	dbw CH5, SFX_80992_4_Ch5
+	dbw CH7, SFX_809a5_4_Ch7
+
+SFX_800e7_4::
+	dbw ( $80 | CH4 ), SFX_809b2_4_Ch4
+	dbw CH5, SFX_809cd_4_Ch5
+	dbw CH7, SFX_809e8_4_Ch7
+
+SFX_800f0_4::
+	dbw ( $80 | CH4 ), SFX_809fb_4_Ch4
+	dbw CH5, SFX_80a0a_4_Ch5
+	dbw CH7, SFX_80a19_4_Ch7
+
+SFX_800f9_4::
+	dbw ( $80 | CH4 ), SFX_80a89_4_Ch4
+	dbw CH5, SFX_80aa4_4_Ch5
+	dbw CH7, SFX_80abf_4_Ch7
+
+SFX_80102_4::
+	dbw ( $80 | CH4 ), SFX_8091c_4_Ch4
+	dbw CH5, SFX_8092b_4_Ch5
+	dbw CH7, SFX_8093a_4_Ch7
+
+SFX_8010b_4::
+	dbw ( $80 | CH4 ), SFX_80ad2_4_Ch4
+	dbw CH5, SFX_80ae5_4_Ch5
+	dbw CH7, SFX_80af8_4_Ch7
+
+SFX_80114_4::
+	dbw ( $80 | CH4 ), SFX_80be2_4_Ch4
+	dbw CH5, SFX_80c05_4_Ch5
+	dbw CH7, SFX_80c28_4_Ch7
+
+SFX_8011d_4::
+	dbw ( $80 | CH4 ), SFX_808fa_4_Ch4
+	dbw CH5, SFX_80909_4_Ch5
+	dbw CH7, SFX_8091b_4_Ch7
+
+SFX_80126_4::
+	dbw ( $80 | CH4 ), SFX_80b53_4_Ch4
+	dbw CH5, SFX_80b6e_4_Ch5
+	dbw CH7, SFX_80b89_4_Ch7
+
+SFX_8012f_4::
+	dbw ( $80 | CH4 ), SFX_80944_4_Ch4
+	dbw CH5, SFX_8095b_4_Ch5
+	dbw CH7, SFX_80972_4_Ch7
+
+SFX_80138_4::
+	dbw ( $80 | CH4 ), SFX_80b05_4_Ch4
+	dbw CH5, SFX_80b28_4_Ch5
+	dbw CH7, SFX_80b43_4_Ch7
+
+SFX_80141_4::
+	dbw ( $80 | CH4 ), SFX_80b9c_4_Ch4
+	dbw CH5, SFX_80bb7_4_Ch5
+	dbw CH7, SFX_80bd2_4_Ch7
+
+SFX_8014a_4::
+	dbw ( $80 | CH4 ), SFX_80a23_4_Ch4
+	dbw CH5, SFX_80a46_4_Ch5
+	dbw CH7, SFX_80a6d_4_Ch7
+
+SFX_80153_4::
+	dbw ( $80 | CH4 ), SFX_80c3b_4_Ch4
+	dbw CH5, SFX_80c4e_4_Ch5
+	dbw CH7, SFX_80c61_4_Ch7
+
+SFX_8015c_4::
+	dbw ( $80 | CH4 ), SFX_80c6e_4_Ch4
+	dbw CH5, SFX_80c81_4_Ch5
+	dbw CH7, SFX_80c94_4_Ch7
+
+SFX_80165_4::
+	dbw ( $80 | CH4 ), SFX_80ca1_4_Ch4
+	dbw CH5, SFX_80cc4_4_Ch5
+	dbw CH7, SFX_80ce6_4_Ch7
+
+SFX_8016e_4::
+	dbw ( $80 | CH4 ), SFX_80ce7_4_Ch4
+	dbw CH5, SFX_80cfa_4_Ch5
+	dbw CH7, SFX_80d0d_4_Ch7
+
+SFX_80177_4::
+	dbw ( $80 | CH4 ), SFX_803da_4_Ch4
+	dbw CH5, SFX_803f1_4_Ch5
+	dbw CH7, SFX_80404_4_Ch7
+
+SFX_80180_4::
+	dbw ( $80 | CH4 ), SFX_80411_4_Ch4
+	dbw CH5, SFX_80434_4_Ch5
+	dbw CH7, SFX_80457_4_Ch7
+
+SFX_80189_4::
+	dbw ( $80 | CH4 ), SFX_804bf_4_Ch4
+	dbw CH5, SFX_804d6_4_Ch5
+	dbw CH7, SFX_804ed_4_Ch7
+
+SFX_Get_Item1_4::
+	dbw ( $80 | CH4 ), SFX_80e5a_4_Ch4
+	dbw CH5, SFX_80e71_4_Ch5
+	dbw CH6, SFX_80e81_4_Ch6
+
+SFX_Get_Item2_4::
+	dbw ( $80 | CH4 ), SFX_80ec8_4_Ch4
+	dbw CH5, SFX_80ee7_4_Ch5
+	dbw CH6, SFX_80eff_4_Ch6
+
+SFX_Tink_4::
+	dbw CH4, SFX_8028e_4_Ch4
+
+SFX_Heal_Ailment_4::
+	dbw CH4, SFX_8027f_4_Ch4
+
+SFX_Start_Menu_4::
+	dbw CH4, SFX_8026a_4_Ch4
+
+SFX_PressAB_4::
+	dbw CH7, SFX_80263_4_Ch7
+
+SFX_801b0_4::
+	dbw CH4, SFX_80250_4_Ch4
+
+SFX_801b3_4::
+	dbw CH7, SFX_8029f_4_Ch7
+
+SFX_801b6_4::
+	dbw CH4, SFX_802b5_4_Ch4
+
+SFX_801b9_4::
+	dbw CH7, SFX_802e1_4_Ch7
+
+SFX_801bc_4::
+	dbw CH4, SFX_802cc_4_Ch4
+
+SFX_801bf_4::
+	dbw CH7, SFX_802d7_4_Ch7
+
+SFX_Get_Item2_4_2::
+	dbw ( $80 | CH4 ), SFX_Get_Item2_4_2_Ch1
+	dbw CH5, SFX_Get_Item2_4_2_Ch2
+	dbw CH6, SFX_Get_Item2_4_2_Ch3