12 files changed, 1100 insertions, 2273 deletions

diff --git a/audio/headers/musicheaders02.asm b/audio/headers/musicheaders02.asm
deleted file mode 100644
index dd5b4b5b..00000000
--- a/audio/headers/musicheaders02.asm
+++ /dev/null
@@ -1,186 +0,0 @@
-Music_PalletTown:: ; 822e (2:422e)
-	db ( $80 | CH0 )
-	dw Music_PalletTown_Ch1
-	db CH1
-	dw Music_PalletTown_Ch2
-	db CH2
-	dw Music_PalletTown_Ch3
-
-Music_Pokecenter:: ; 8237 (2:4237)
-	db ( $80 | CH0 )
-	dw Music_Pokecenter_Ch1
-	db CH1
-	dw Music_Pokecenter_Ch2
-	db CH2
-	dw Music_Pokecenter_Ch3
-
-Music_Gym:: ; 8240 (2:4240)
-	db ( $80 | CH0 )
-	dw Music_Gym_Ch1
-	db CH1
-	dw Music_Gym_Ch2
-	db CH2
-	dw Music_Gym_Ch3
-
-; Viridian City, Pewter City, Saffron City
-Music_Cities1:: ; 8249 (2:4249)
-	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
-
-; Cerulean City, Fuchsia City
-Music_Cities2:: ; 8255 (2:4255)
-	db ( $80 | CH0 )
-	dw Music_Cities2_Ch1
-	db CH1
-	dw Music_Cities2_Ch2
-	db CH2
-	dw Music_Cities2_Ch3
-
-Music_Celadon:: ; 825e (2:425e)
-	db ( $80 | CH0 )
-	dw Music_Celadon_Ch1
-	db CH1
-	dw Music_Celadon_Ch2
-	db CH2
-	dw Music_Celadon_Ch3
-
-Music_Cinnabar:: ; 8267 (2:4267)
-	db ( $80 | CH0 )
-	dw Music_Cinnabar_Ch1
-	db CH1
-	dw Music_Cinnabar_Ch2
-	db CH2
-	dw Music_Cinnabar_Ch3
-
-Music_Vermilion:: ; 8270 (2:4270)
-	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
-
-Music_Lavender:: ; 827c (2:427c)
-	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
-
-Music_SSAnne:: ; 8288 (2:4288)
-	db ( $80 | CH0 )
-	dw Music_SSAnne_Ch1
-	db CH1
-	dw Music_SSAnne_Ch2
-	db CH2
-	dw Music_SSAnne_Ch3
-
-Music_MeetProfOak:: ; 8291 (2:4291)
-	db ( $80 | CH0 )
-	dw Music_MeetProfOak_Ch1
-	db CH1
-	dw Music_MeetProfOak_Ch2
-	db CH2
-	dw Music_MeetProfOak_Ch3
-
-Music_MeetRival:: ; 829a (2:429a)
-	db ( $80 | CH0 )
-	dw Music_MeetRival_Ch1
-	db CH1
-	dw Music_MeetRival_Ch2
-	db CH2
-	dw Music_MeetRival_Ch3
-
-Music_MuseumGuy:: ; 82a3 (2:42a3)
-	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
-
-Music_SafariZone:: ; 82af (2:42af)
-	db ( $80 | CH0 )
-	dw Music_SafariZone_Ch1
-	db CH1
-	dw Music_SafariZone_Ch2
-	db CH2
-	dw Music_SafariZone_Ch3
-
-Music_PkmnHealed:: ; 82b8 (2:42b8)
-	db ( $80 | CH0 )
-	dw Music_PkmnHealed_Ch1
-	db CH1
-	dw Music_PkmnHealed_Ch2
-	db CH2
-	dw Music_PkmnHealed_Ch3
-
-; Routes 1 and 2
-Music_Routes1:: ; 82c1 (2:42c1)
-	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
-
-; Routes 24 and 25
-Music_Routes2:: ; 82cd (2:42cd)
-	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
-
-; Routes 3, 4, 5, 6, 7, 8, 9, 10, 16, 17, 18, 19, 20, 21, 22
-Music_Routes3:: ; 82d9 (2:42d9)
-	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
-
-; Routes 11, 12, 13, 14, 15
-Music_Routes4:: ; 82d5 (2:42d5)
-	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
-
-; Route 23, Indigo Plateau
-Music_IndigoPlateau:: ; 82f1 (2:42f1)
-	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
-
-; 0x82fd
\ No newline at end of file
diff --git a/audio/headers/musicheaders08.asm b/audio/headers/musicheaders08.asm
deleted file mode 100644
index b4ef7375..00000000
--- a/audio/headers/musicheaders08.asm
+++ /dev/null
@@ -1,57 +0,0 @@
-Music_GymLeaderBattle:: ; 202be (8:42be)
-	db ( $80 | CH0 )
-	dw Music_GymLeaderBattle_Ch1
-	db CH1
-	dw Music_GymLeaderBattle_Ch2
-	db CH2
-	dw Music_GymLeaderBattle_Ch3
-
-Music_TrainerBattle:: ; 202c7 (8:42c7)
-	db ( $80 | CH0 )
-	dw Music_TrainerBattle_Ch1
-	db CH1
-	dw Music_TrainerBattle_Ch2
-	db CH2
-	dw Music_TrainerBattle_Ch3
-
-Music_WildBattle:: ; 202d0 (8:42d0)
-	db ( $80 | CH0 )
-	dw Music_WildBattle_Ch1
-	db CH1
-	dw Music_WildBattle_Ch2
-	db CH2
-	dw Music_WildBattle_Ch3
-
-Music_FinalBattle:: ; 202d9 (8:42d9)
-	db ( $80 | CH0 )
-	dw Music_FinalBattle_Ch1
-	db CH1
-	dw Music_FinalBattle_Ch2
-	db CH2
-	dw Music_FinalBattle_Ch3
-
-Music_DefeatedTrainer:: ; 202e2 (8:42e2)
-	db ( $80 | CH0 )
-	dw Music_DefeatedTrainer_Ch1
-	db CH1
-	dw Music_DefeatedTrainer_Ch2
-	db CH2
-	dw Music_DefeatedTrainer_Ch3
-
-Music_DefeatedWildMon:: ; 202eb (8:42eb)
-	db ( $80 | CH0 )
-	dw Music_DefeatedWildMon_Ch1
-	db CH1
-	dw Music_DefeatedWildMon_Ch2
-	db CH2
-	dw Music_DefeatedWildMon_Ch3
-
-Music_DefeatedGymLeader:: ; 202f4 (8:42f4)
-	db ( $80 | CH0 )
-	dw Music_DefeatedGymLeader_Ch1
-	db CH1
-	dw Music_DefeatedGymLeader_Ch2
-	db CH2
-	dw Music_DefeatedGymLeader_Ch3
-
-; 202fd
\ No newline at end of file
diff --git a/audio/headers/musicheaders1.asm b/audio/headers/musicheaders1.asm
new file mode 100755
index 00000000..38594d41
--- /dev/null
+++ b/audio/headers/musicheaders1.asm
@@ -0,0 +1,66 @@
+Music_PalletTown::
+	audio Music_PalletTown, Ch0, Ch1, Ch2
+
+Music_Pokecenter::
+	audio Music_Pokecenter, Ch0, Ch1, Ch2
+
+Music_Gym::
+	audio Music_Gym, Ch0, Ch1, Ch2
+
+; Viridian City, Pewter City, Saffron City
+Music_Cities1::
+	audio Music_Cities1, Ch0, Ch1, Ch2, Ch3
+
+; Cerulean City, Fuchsia City
+Music_Cities2::
+	audio Music_Cities2, Ch0, Ch1, Ch2
+
+Music_Celadon::
+	audio Music_Celadon, Ch0, Ch1, Ch2
+
+Music_Cinnabar::
+	audio Music_Cinnabar, Ch0, Ch1, Ch2
+
+Music_Vermilion::
+	audio Music_Vermilion, Ch0, Ch1, Ch2, Ch3
+
+Music_Lavender::
+	audio Music_Lavender, Ch0, Ch1, Ch2, Ch3
+
+Music_SSAnne::
+	audio Music_SSAnne, Ch0, Ch1, Ch2
+
+Music_MeetProfOak::
+	audio Music_MeetProfOak, Ch0, Ch1, Ch2
+
+Music_MeetRival::
+	audio Music_MeetRival, Ch0, Ch1, Ch2
+
+Music_MuseumGuy::
+	audio Music_MuseumGuy, Ch0, Ch1, Ch2, Ch3
+
+Music_SafariZone::
+	audio Music_SafariZone, Ch0, Ch1, Ch2
+
+Music_PkmnHealed::
+	audio Music_PkmnHealed, Ch0, Ch1, Ch2
+
+; Routes 1 and 2
+Music_Routes1::
+	audio Music_Routes1, Ch0, Ch1, Ch2, Ch3
+
+; Routes 24 and 25
+Music_Routes2::
+	audio Music_Routes2, Ch0, Ch1, Ch2, Ch3
+
+; Routes 3, 4, 5, 6, 7, 8, 9, 10, 16, 17, 18, 19, 20, 21, 22
+Music_Routes3::
+	audio Music_Routes3, Ch0, Ch1, Ch2, Ch3
+
+; Routes 11, 12, 13, 14, 15
+Music_Routes4::
+	audio Music_Routes4, Ch0, Ch1, Ch2, Ch3
+
+; Route 23, Indigo Plateau
+Music_IndigoPlateau::
+	audio Music_IndigoPlateau, Ch0, Ch1, Ch2, Ch3
diff --git a/audio/headers/musicheaders1f.asm b/audio/headers/musicheaders1f.asm
deleted file mode 100644
index beb70cf4..00000000
--- a/audio/headers/musicheaders1f.asm
+++ /dev/null
@@ -1,160 +0,0 @@
-Music_TitleScreen:: ; 7c249 (1f:4249)
-	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
-
-Music_Credits:: ; 7c255 (1f:4255)
-	db ( $80 | CH0 )
-	dw Music_Credits_Ch1
-	db CH1
-	dw Music_Credits_Ch2
-	db CH2
-	dw Music_Credits_Ch3
-
-Music_HallOfFame:: ; 7c25e (1f:425e)
-	db ( $80 | CH0 )
-	dw Music_HallOfFame_Ch1
-	db CH1
-	dw Music_HallOfFame_Ch2
-	db CH2
-	dw Music_HallOfFame_Ch3
-
-Music_OaksLab:: ; 7c267 (1f:4267)
-	db ( $80 | CH0 )
-	dw Music_OaksLab_Ch1
-	db CH1
-	dw Music_OaksLab_Ch2
-	db CH2
-	dw Music_OaksLab_Ch3
-
-Music_JigglypuffSong:: ; 7c270 (1f:4270)
-	db $40
-	dw Music_JigglypuffSong_Ch1
-	db CH1
-	dw Music_JigglypuffSong_Ch2
-
-Music_BikeRiding:: ; 7c276 (1f:4276)
-	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
-
-Music_Surfing:: ; 7c282 (1f:4282)
-	db ( $80 | CH0 )
-	dw Music_Surfing_Ch1
-	db CH1
-	dw Music_Surfing_Ch2
-	db CH2
-	dw Music_Surfing_Ch3
-
-Music_GameCorner:: ; 7c28b (1f:428b)
-	db ( $80 | CH0 )
-	dw Music_GameCorner_Ch1
-	db CH1
-	dw Music_GameCorner_Ch2
-	db CH2
-	dw Music_GameCorner_Ch3
-
-Music_IntroBattle:: ; 7c294 (1f:4294)
-	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
-
-; Power Plant, Unknown Dungeon, Rocket HQ
-Music_Dungeon1:: ; 7c2a0 (1f:42a0)
-	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
-
-; Viridian Forest, Seafoam Islands
-Music_Dungeon2:: ; 7c2ac (1f:42ac)
-	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
-
-; Mt. Moon, Rock Tunnel, Victory Road
-Music_Dungeon3:: ; 7c2b8 (1f:42b8)
-	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
-
-Music_CinnabarMansion:: ; 7c2c4 (1f:42c4)
-	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
-
-Music_PokemonTower:: ; 7c2d0 (1f:42d0)
-	db ( $80 | CH0 )
-	dw Music_PokemonTower_Ch1
-	db CH1
-	dw Music_PokemonTower_Ch2
-	db CH2
-	dw Music_PokemonTower_Ch3
-
-Music_SilphCo:: ; 7c2d9 (1f:42d9)
-	db ( $80 | CH0 )
-	dw Music_SilphCo_Ch1
-	db CH1
-	dw Music_SilphCo_Ch2
-	db CH2
-	dw Music_SilphCo_Ch3
-
-Music_MeetEvilTrainer:: ; 7c2e2 (1f:42e2)
-	db ( $80 | CH0 )
-	dw Music_MeetEvilTrainer_Ch1
-	db CH1
-	dw Music_MeetEvilTrainer_Ch2
-	db CH2
-	dw Music_MeetEvilTrainer_Ch3
-
-Music_MeetFemaleTrainer:: ; 7c2eb (1f:42eb)
-	db ( $80 | CH0 )
-	dw Music_MeetFemaleTrainer_Ch1
-	db CH1
-	dw Music_MeetFemaleTrainer_Ch2
-	db CH2
-	dw Music_MeetFemaleTrainer_Ch3
-
-Music_MeetMaleTrainer:: ; 7c2f4 (1f:42f4)
-	db ( $80 | CH0 )
-	dw Music_MeetMaleTrainer_Ch1
-	db CH1
-	dw Music_MeetMaleTrainer_Ch2
-	db CH2
-	dw Music_MeetMaleTrainer_Ch3
-
-; 0x7c2fd
\ No newline at end of file
diff --git a/audio/headers/musicheaders2.asm b/audio/headers/musicheaders2.asm
new file mode 100755
index 00000000..45557420
--- /dev/null
+++ b/audio/headers/musicheaders2.asm
@@ -0,0 +1,20 @@
+Music_GymLeaderBattle::
+	audio Music_GymLeaderBattle, Ch0, Ch1, Ch2
+
+Music_TrainerBattle::
+	audio Music_TrainerBattle, Ch0, Ch1, Ch2
+
+Music_WildBattle::
+	audio Music_WildBattle, Ch0, Ch1, Ch2
+
+Music_FinalBattle::
+	audio Music_FinalBattle, Ch0, Ch1, Ch2
+
+Music_DefeatedTrainer::
+	audio Music_DefeatedTrainer, Ch0, Ch1, Ch2
+
+Music_DefeatedWildMon::
+	audio Music_DefeatedWildMon, Ch0, Ch1, Ch2
+
+Music_DefeatedGymLeader::
+	audio Music_DefeatedGymLeader, Ch0, Ch1, Ch2
diff --git a/audio/headers/musicheaders3.asm b/audio/headers/musicheaders3.asm
new file mode 100755
index 00000000..90798882
--- /dev/null
+++ b/audio/headers/musicheaders3.asm
@@ -0,0 +1,56 @@
+Music_TitleScreen::
+	audio Music_TitleScreen, Ch0, Ch1, Ch2, Ch3
+
+Music_Credits::
+	audio Music_Credits, Ch0, Ch1, Ch2
+
+Music_HallOfFame::
+	audio Music_HallOfFame, Ch0, Ch1, Ch2
+
+Music_OaksLab::
+	audio Music_OaksLab, Ch0, Ch1, Ch2
+
+Music_JigglypuffSong::
+	audio Music_JigglypuffSong, Ch0, Ch1
+
+Music_BikeRiding::
+	audio Music_BikeRiding, Ch0, Ch1, Ch2, Ch3
+
+Music_Surfing::
+	audio Music_Surfing, Ch0, Ch1, Ch2
+
+Music_GameCorner::
+	audio Music_GameCorner, Ch0, Ch1, Ch2
+
+Music_IntroBattle::
+	audio Music_IntroBattle, Ch0, Ch1, Ch2, Ch3
+
+; Power Plant, Unknown Dungeon, Rocket HQ
+Music_Dungeon1::
+	audio Music_Dungeon1, Ch0, Ch1, Ch2, Ch3
+
+; Viridian Forest, Seafoam Islands
+Music_Dungeon2::
+	audio Music_Dungeon2, Ch0, Ch1, Ch2, Ch3
+
+; Mt. Moon, Rock Tunnel, Victory Road
+Music_Dungeon3::
+	audio Music_Dungeon3, Ch0, Ch1, Ch2, Ch3
+
+Music_CinnabarMansion::
+	audio Music_CinnabarMansion, Ch0, Ch1, Ch2, Ch3
+
+Music_PokemonTower::
+	audio Music_PokemonTower, Ch0, Ch1, Ch2
+
+Music_SilphCo::
+	audio Music_SilphCo, Ch0, Ch1, Ch2
+
+Music_MeetEvilTrainer::
+	audio Music_MeetEvilTrainer, Ch0, Ch1, Ch2
+
+Music_MeetFemaleTrainer::
+	audio Music_MeetFemaleTrainer, Ch0, Ch1, Ch2
+
+Music_MeetMaleTrainer::
+	audio Music_MeetMaleTrainer, Ch0, Ch1, Ch2
diff --git a/audio/headers/sfxheaders02.asm b/audio/headers/sfxheaders02.asm
deleted file mode 100644
index d1c185c0..00000000
--- a/audio/headers/sfxheaders02.asm
+++ /dev/null
@@ -1,564 +0,0 @@
-SFX_Headers_02::
-	db $ff, $ff, $ff ; padding
-
-SFX_02_01:: ; 8003 (2:4003)
-	db CH7
-	dw SFX_02_01_Ch1
-
-SFX_02_02:: ; 8006 (2:4006)
-	db CH7
-	dw SFX_02_02_Ch1
-
-SFX_02_03:: ; 8009 (2:4009)
-	db CH7
-	dw SFX_02_03_Ch1
-
-SFX_02_04:: ; 800c (2:400c)
-	db CH7
-	dw SFX_02_04_Ch1
-
-SFX_02_05:: ; 800f (2:400f)
-	db CH7
-	dw SFX_02_05_Ch1
-
-SFX_02_06:: ; 8012 (2:4012)
-	db CH7
-	dw SFX_02_06_Ch1
-
-SFX_02_07:: ; 8015 (2:4015)
-	db CH7
-	dw SFX_02_07_Ch1
-
-SFX_02_08:: ; 8018 (2:4018)
-	db CH7
-	dw SFX_02_08_Ch1
-
-SFX_02_09:: ; 801b (2:401b)
-	db CH7
-	dw SFX_02_09_Ch1
-
-SFX_02_0a:: ; 801e (2:401e)
-	db CH7
-	dw SFX_02_0a_Ch1
-
-SFX_02_0b:: ; 8021 (2:4021)
-	db CH7
-	dw SFX_02_0b_Ch1
-
-SFX_02_0c:: ; 8024 (2:4024)
-	db CH7
-	dw SFX_02_0c_Ch1
-
-SFX_02_0d:: ; 8027 (2:4027)
-	db CH7
-	dw SFX_02_0d_Ch1
-
-SFX_02_0e:: ; 802a (2:402a)
-	db CH7
-	dw SFX_02_0e_Ch1
-
-SFX_02_0f:: ; 802d (2:402d)
-	db CH7
-	dw SFX_02_0f_Ch1
-
-SFX_02_10:: ; 8030 (2:4030)
-	db CH7
-	dw SFX_02_10_Ch1
-
-SFX_02_11:: ; 8033 (2:4033)
-	db CH7
-	dw SFX_02_11_Ch1
-
-SFX_02_12:: ; 8036 (2:4036)
-	db CH7
-	dw SFX_02_12_Ch1
-
-SFX_02_13:: ; 8039 (2:4039)
-	db CH7
-	dw SFX_02_13_Ch1
-
-SFX_02_14:: ; 803c (2:403c)
-	db ( $80 | CH4 )
-	dw SFX_02_14_Ch1
-	db CH5
-	dw SFX_02_14_Ch2
-	db CH7
-	dw SFX_02_14_Ch3
-
-SFX_02_15:: ; 8045 (2:4045)
-	db ( $80 | CH4 )
-	dw SFX_02_15_Ch1
-	db CH5
-	dw SFX_02_15_Ch2
-	db CH7
-	dw SFX_02_15_Ch3
-
-SFX_02_16:: ; 804e (2:404e)
-	db ( $80 | CH4 )
-	dw SFX_02_16_Ch1
-	db CH5
-	dw SFX_02_16_Ch2
-	db CH7
-	dw SFX_02_16_Ch3
-
-SFX_02_17:: ; 8057 (2:4057)
-	db ( $80 | CH4 )
-	dw SFX_02_17_Ch1
-	db CH5
-	dw SFX_02_17_Ch2
-	db CH7
-	dw SFX_02_17_Ch3
-
-SFX_02_18:: ; 8060 (2:4060)
-	db ( $80 | CH4 )
-	dw SFX_02_18_Ch1
-	db CH5
-	dw SFX_02_18_Ch2
-	db CH7
-	dw SFX_02_18_Ch3
-
-SFX_02_19:: ; 8069 (2:4069)
-	db ( $80 | CH4 )
-	dw SFX_02_19_Ch1
-	db CH5
-	dw SFX_02_19_Ch2
-	db CH7
-	dw SFX_02_19_Ch3
-
-SFX_02_1a:: ; 8072 (2:4072)
-	db ( $80 | CH4 )
-	dw SFX_02_1a_Ch1
-	db CH5
-	dw SFX_02_1a_Ch2
-	db CH7
-	dw SFX_02_1a_Ch3
-
-SFX_02_1b:: ; 807b (2:407b)
-	db ( $80 | CH4 )
-	dw SFX_02_1b_Ch1
-	db CH5
-	dw SFX_02_1b_Ch2
-	db CH7
-	dw SFX_02_1b_Ch3
-
-SFX_02_1c:: ; 8084 (2:4084)
-	db ( $80 | CH4 )
-	dw SFX_02_1c_Ch1
-	db CH5
-	dw SFX_02_1c_Ch2
-	db CH7
-	dw SFX_02_1c_Ch3
-
-SFX_02_1d:: ; 808d (2:408d)
-	db ( $80 | CH4 )
-	dw SFX_02_1d_Ch1
-	db CH5
-	dw SFX_02_1d_Ch2
-	db CH7
-	dw SFX_02_1d_Ch3
-
-SFX_02_1e:: ; 8096 (2:4096)
-	db ( $80 | CH4 )
-	dw SFX_02_1e_Ch1
-	db CH5
-	dw SFX_02_1e_Ch2
-	db CH7
-	dw SFX_02_1e_Ch3
-
-SFX_02_1f:: ; 809f (2:409f)
-	db ( $80 | CH4 )
-	dw SFX_02_1f_Ch1
-	db CH5
-	dw SFX_02_1f_Ch2
-	db CH7
-	dw SFX_02_1f_Ch3
-
-SFX_02_20:: ; 80a8 (2:40a8)
-	db ( $80 | CH4 )
-	dw SFX_02_20_Ch1
-	db CH5
-	dw SFX_02_20_Ch2
-	db CH7
-	dw SFX_02_20_Ch3
-
-SFX_02_21:: ; 80b1 (2:40b1)
-	db ( $80 | CH4 )
-	dw SFX_02_21_Ch1
-	db CH5
-	dw SFX_02_21_Ch2
-	db CH7
-	dw SFX_02_21_Ch3
-
-SFX_02_22:: ; 80ba (2:40ba)
-	db ( $80 | CH4 )
-	dw SFX_02_22_Ch1
-	db CH5
-	dw SFX_02_22_Ch2
-	db CH7
-	dw SFX_02_22_Ch3
-
-SFX_02_23:: ; 80c3 (2:40c3)
-	db ( $80 | CH4 )
-	dw SFX_02_23_Ch1
-	db CH5
-	dw SFX_02_23_Ch2
-	db CH7
-	dw SFX_02_23_Ch3
-
-SFX_02_24:: ; 80cc (2:40cc)
-	db ( $80 | CH4 )
-	dw SFX_02_24_Ch1
-	db CH5
-	dw SFX_02_24_Ch2
-	db CH7
-	dw SFX_02_24_Ch3
-
-SFX_02_25:: ; 80d5 (2:40d5)
-	db ( $80 | CH4 )
-	dw SFX_02_25_Ch1
-	db CH5
-	dw SFX_02_25_Ch2
-	db CH7
-	dw SFX_02_25_Ch3
-
-SFX_02_26:: ; 80de (2:40de)
-	db ( $80 | CH4 )
-	dw SFX_02_26_Ch1
-	db CH5
-	dw SFX_02_26_Ch2
-	db CH7
-	dw SFX_02_26_Ch3
-
-SFX_02_27:: ; 80e7 (2:40e7)
-	db ( $80 | CH4 )
-	dw SFX_02_27_Ch1
-	db CH5
-	dw SFX_02_27_Ch2
-	db CH7
-	dw SFX_02_27_Ch3
-
-SFX_02_28:: ; 80f0 (2:40f0)
-	db ( $80 | CH4 )
-	dw SFX_02_28_Ch1
-	db CH5
-	dw SFX_02_28_Ch2
-	db CH7
-	dw SFX_02_28_Ch3
-
-SFX_02_29:: ; 80f9 (2:40f9)
-	db ( $80 | CH4 )
-	dw SFX_02_29_Ch1
-	db CH5
-	dw SFX_02_29_Ch2
-	db CH7
-	dw SFX_02_29_Ch3
-
-SFX_02_2a:: ; 8102 (2:4102)
-	db ( $80 | CH4 )
-	dw SFX_02_2a_Ch1
-	db CH5
-	dw SFX_02_2a_Ch2
-	db CH7
-	dw SFX_02_2a_Ch3
-
-SFX_02_2b:: ; 810b (2:410b)
-	db ( $80 | CH4 )
-	dw SFX_02_2b_Ch1
-	db CH5
-	dw SFX_02_2b_Ch2
-	db CH7
-	dw SFX_02_2b_Ch3
-
-SFX_02_2c:: ; 8114 (2:4114)
-	db ( $80 | CH4 )
-	dw SFX_02_2c_Ch1
-	db CH5
-	dw SFX_02_2c_Ch2
-	db CH7
-	dw SFX_02_2c_Ch3
-
-SFX_02_2d:: ; 811d (2:411d)
-	db ( $80 | CH4 )
-	dw SFX_02_2d_Ch1
-	db CH5
-	dw SFX_02_2d_Ch2
-	db CH7
-	dw SFX_02_2d_Ch3
-
-SFX_02_2e:: ; 8126 (2:4126)
-	db ( $80 | CH4 )
-	dw SFX_02_2e_Ch1
-	db CH5
-	dw SFX_02_2e_Ch2
-	db CH7
-	dw SFX_02_2e_Ch3
-
-SFX_02_2f:: ; 812f (2:412f)
-	db ( $80 | CH4 )
-	dw SFX_02_2f_Ch1
-	db CH5
-	dw SFX_02_2f_Ch2
-	db CH7
-	dw SFX_02_2f_Ch3
-
-SFX_02_30:: ; 8138 (2:4138)
-	db ( $80 | CH4 )
-	dw SFX_02_30_Ch1
-	db CH5
-	dw SFX_02_30_Ch2
-	db CH7
-	dw SFX_02_30_Ch3
-
-SFX_02_31:: ; 8141 (2:4141)
-	db ( $80 | CH4 )
-	dw SFX_02_31_Ch1
-	db CH5
-	dw SFX_02_31_Ch2
-	db CH7
-	dw SFX_02_31_Ch3
-
-SFX_02_32:: ; 814a (2:414a)
-	db ( $80 | CH4 )
-	dw SFX_02_32_Ch1
-	db CH5
-	dw SFX_02_32_Ch2
-	db CH7
-	dw SFX_02_32_Ch3
-
-SFX_02_33:: ; 8153 (2:4153)
-	db ( $80 | CH4 )
-	dw SFX_02_33_Ch1
-	db CH5
-	dw SFX_02_33_Ch2
-	db CH7
-	dw SFX_02_33_Ch3
-
-SFX_02_34:: ; 815c (2:415c)
-	db ( $80 | CH4 )
-	dw SFX_02_34_Ch1
-	db CH5
-	dw SFX_02_34_Ch2
-	db CH7
-	dw SFX_02_34_Ch3
-
-SFX_02_35:: ; 8165 (2:4165)
-	db ( $80 | CH4 )
-	dw SFX_02_35_Ch1
-	db CH5
-	dw SFX_02_35_Ch2
-	db CH7
-	dw SFX_02_35_Ch3
-
-SFX_02_36:: ; 816e (2:416e)
-	db ( $80 | CH4 )
-	dw SFX_02_36_Ch1
-	db CH5
-	dw SFX_02_36_Ch2
-	db CH7
-	dw SFX_02_36_Ch3
-
-SFX_02_37:: ; 8177 (2:4177)
-	db ( $80 | CH4 )
-	dw SFX_02_37_Ch1
-	db CH5
-	dw SFX_02_37_Ch2
-	db CH7
-	dw SFX_02_37_Ch3
-
-SFX_02_38:: ; 8180 (2:4180)
-	db ( $80 | CH4 )
-	dw SFX_02_38_Ch1
-	db CH5
-	dw SFX_02_38_Ch2
-	db CH7
-	dw SFX_02_38_Ch3
-
-SFX_02_39:: ; 8189 (2:4189)
-	db ( $80 | CH4 )
-	dw SFX_02_39_Ch1
-	db CH5
-	dw SFX_02_39_Ch2
-	db CH7
-	dw SFX_02_39_Ch3
-
-SFX_02_3a:: ; 8192 (2:4192)
-	db ( $80 | CH4 )
-	dw SFX_02_3a_Ch1
-	db CH5
-	dw SFX_02_3a_Ch2
-	db CH6
-	dw SFX_02_3a_Ch3
-
-SFX_02_3b:: ; 819b (2:419b)
-	db ( $80 | CH4 )
-	dw SFX_02_3b_Ch1
-	db CH5
-	dw SFX_02_3b_Ch2
-	db CH6
-	dw SFX_02_3b_Ch3
-
-SFX_02_3c:: ; 81a4 (2:41a4)
-	db CH4
-	dw SFX_02_3c_Ch1
-
-SFX_02_3d:: ; 81a7 (2:41a7)
-	db CH4
-	dw SFX_02_3d_Ch1
-
-SFX_02_3e:: ; 81aa (2:41aa)
-	db CH4
-	dw SFX_02_3e_Ch1
-
-SFX_02_3f:: ; 81ad (2:41ad)
-	db CH7
-	dw SFX_02_3f_Ch1
-
-SFX_02_40:: ; 81b0 (2:41b0)
-	db CH4
-	dw SFX_02_40_Ch1
-
-SFX_02_41:: ; 81b3 (2:41b3)
-	db ( $80 | CH4 )
-	dw SFX_02_41_Ch1
-	db CH5
-	dw SFX_02_41_Ch2
-	db CH6
-	dw SFX_02_41_Ch3
-
-SFX_02_42:: ; 81bc (2:41bc)
-	db ( $80 | CH4 )
-	dw SFX_02_42_Ch1
-	db CH5
-	dw SFX_02_42_Ch2
-	db CH6
-	dw SFX_02_42_Ch3
-
-SFX_02_43:: ; 81c5 (2:41c5)
-	db CH4
-	dw SFX_02_43_Ch1
-
-SFX_02_44:: ; 81c8 (2:41c8)
-	db CH4
-	dw SFX_02_44_Ch1
-
-SFX_02_45:: ; 81cb (2:41cb)
-	db CH4
-	dw SFX_02_45_Ch1
-
-SFX_02_46:: ; 81ce (2:41ce)
-	db CH4
-	dw SFX_02_46_Ch1
-
-SFX_02_47:: ; 81d1 (2:41d1)
-	db CH4
-	dw SFX_02_47_Ch1
-
-SFX_02_48:: ; 81d4 (2:41d4)
-	db CH4
-	dw SFX_02_48_Ch1
-
-SFX_02_49:: ; 81d7 (2:41d7)
-	db CH4
-	dw SFX_02_49_Ch1
-
-SFX_02_4a:: ; 81da (2:41da)
-	db CH4
-	dw SFX_02_4a_Ch1
-
-SFX_02_4b:: ; 81dd (2:41dd)
-	db CH4
-	dw SFX_02_4b_Ch1
-
-SFX_02_4c:: ; 81e0 (2:41e0)
-	db CH4
-	dw SFX_02_4c_Ch1
-
-SFX_02_4d:: ; 81e3 (2:41e3)
-	db CH4
-	dw SFX_02_4d_Ch1
-
-SFX_02_4e:: ; 81e6 (2:41e6)
-	db CH4
-	dw SFX_02_4e_Ch1
-
-SFX_02_4f:: ; 81e9 (2:41e9)
-	db CH7
-	dw SFX_02_4f_Ch1
-
-SFX_02_50:: ; 81ec (2:41ec)
-	db CH7
-	dw SFX_02_50_Ch1
-
-SFX_02_51:: ; 81ef (2:41ef)
-	db ( $40 | CH4 )
-	dw SFX_02_51_Ch1
-	db CH5
-	dw SFX_02_51_Ch2
-
-SFX_02_52:: ; 81f5 (2:41f5)
-	db CH4
-	dw SFX_02_52_Ch1
-
-SFX_02_53:: ; 81f8 (2:41f8)
-	db CH7
-	dw SFX_02_53_Ch1
-
-SFX_02_54:: ; 81fb (2:41fb)
-	db ( $40 | CH4 )
-	dw SFX_02_54_Ch1
-	db CH5
-	dw SFX_02_54_Ch2
-
-SFX_02_55:: ; 8201 (2:4201)
-	db CH4
-	dw SFX_02_55_Ch1
-
-SFX_02_56:: ; 8204 (2:4204)
-	db CH7
-	dw SFX_02_56_Ch1
-
-SFX_02_57:: ; 8207 (2:4207)
-	db CH7
-	dw SFX_02_57_Ch1
-
-SFX_02_58:: ; 820a (2:420a)
-	db ( $40 | CH4 )
-	dw SFX_02_58_Ch1
-	db CH5
-	dw SFX_02_58_Ch2
-
-SFX_02_59:: ; 8210 (2:4210)
-	db ( $40 | CH4 )
-	dw SFX_02_59_Ch1
-	db CH5
-	dw SFX_02_59_Ch2
-
-SFX_02_5a:: ; 8216 (2:4216)
-	db ( $40 | CH4 )
-	dw SFX_02_5a_Ch1
-	db CH5
-	dw SFX_02_5a_Ch2
-
-SFX_02_5b:: ; 821c (2:421c)
-	db CH4
-	dw SFX_02_5b_Ch1
-
-SFX_02_5c:: ; 821f (2:421f)
-	db CH7
-	dw SFX_02_5c_Ch1
-
-SFX_02_5d:: ; 8222 (2:4222)
-	db ( $40 | CH4 )
-	dw SFX_02_5d_Ch1
-	db CH5
-	dw SFX_02_5d_Ch2
-
-SFX_02_5e:: ; 8228 (2:4228)
-	db CH2
-	dw SFX_02_5e_Ch1
-
-SFX_02_5f:: ; 822b (2:422b)
-	db CH4
-	dw SFX_02_5f_Ch1
-
-; 0x822e
\ No newline at end of file
diff --git a/audio/headers/sfxheaders08.asm b/audio/headers/sfxheaders08.asm
deleted file mode 100644
index 547c8d4a..00000000
--- a/audio/headers/sfxheaders08.asm
+++ /dev/null
@@ -1,708 +0,0 @@
-SFX_Headers_08::
-	db $ff, $ff, $ff ; padding
-
-SFX_08_01:: ; 20003 (8:4003)
-	db CH7
-	dw SFX_08_01_Ch1
-
-SFX_08_02:: ; 20006 (8:4006)
-	db CH7
-	dw SFX_08_02_Ch1
-
-SFX_08_03:: ; 20009 (8:4009)
-	db CH7
-	dw SFX_08_03_Ch1
-
-SFX_08_04:: ; 2000c (8:400c)
-	db CH7
-	dw SFX_08_04_Ch1
-
-SFX_08_05:: ; 2000f (8:400f)
-	db CH7
-	dw SFX_08_05_Ch1
-
-SFX_08_06:: ; 20012 (8:4012)
-	db CH7
-	dw SFX_08_06_Ch1
-
-SFX_08_07:: ; 20015 (8:4015)
-	db CH7
-	dw SFX_08_07_Ch1
-
-SFX_08_08:: ; 20018 (8:4018)
-	db CH7
-	dw SFX_08_08_Ch1
-
-SFX_08_09:: ; 2001b (8:401b)
-	db CH7
-	dw SFX_08_09_Ch1
-
-SFX_08_0a:: ; 2001e (8:401e)
-	db CH7
-	dw SFX_08_0a_Ch1
-
-SFX_08_0b:: ; 20021 (8:4021)
-	db CH7
-	dw SFX_08_0b_Ch1
-
-SFX_08_0c:: ; 20024 (8:4024)
-	db CH7
-	dw SFX_08_0c_Ch1
-
-SFX_08_0d:: ; 20027 (8:4027)
-	db CH7
-	dw SFX_08_0d_Ch1
-
-SFX_08_0e:: ; 2002a (8:402a)
-	db CH7
-	dw SFX_08_0e_Ch1
-
-SFX_08_0f:: ; 2002d (8:402d)
-	db CH7
-	dw SFX_08_0f_Ch1
-
-SFX_08_10:: ; 20030 (8:4030)
-	db CH7
-	dw SFX_08_10_Ch1
-
-SFX_08_11:: ; 20033 (8:4033)
-	db CH7
-	dw SFX_08_11_Ch1
-
-SFX_08_12:: ; 20036 (8:4036)
-	db CH7
-	dw SFX_08_12_Ch1
-
-SFX_08_13:: ; 20039 (8:4039)
-	db CH7
-	dw SFX_08_13_Ch1
-
-SFX_08_14:: ; 2003c (8:403c)
-	db ( $80 | CH4 )
-	dw SFX_08_14_Ch1
-	db CH5
-	dw SFX_08_14_Ch2
-	db CH7
-	dw SFX_08_14_Ch3
-
-SFX_08_15:: ; 20045 (8:4045)
-	db ( $80 | CH4 )
-	dw SFX_08_15_Ch1
-	db CH5
-	dw SFX_08_15_Ch2
-	db CH7
-	dw SFX_08_15_Ch3
-
-SFX_08_16:: ; 2004e (8:404e)
-	db ( $80 | CH4 )
-	dw SFX_08_16_Ch1
-	db CH5
-	dw SFX_08_16_Ch2
-	db CH7
-	dw SFX_08_16_Ch3
-
-SFX_08_17:: ; 20057 (8:4057)
-	db ( $80 | CH4 )
-	dw SFX_08_17_Ch1
-	db CH5
-	dw SFX_08_17_Ch2
-	db CH7
-	dw SFX_08_17_Ch3
-
-SFX_08_18:: ; 20060 (8:4060)
-	db ( $80 | CH4 )
-	dw SFX_08_18_Ch1
-	db CH5
-	dw SFX_08_18_Ch2
-	db CH7
-	dw SFX_08_18_Ch3
-
-SFX_08_19:: ; 20069 (8:4069)
-	db ( $80 | CH4 )
-	dw SFX_08_19_Ch1
-	db CH5
-	dw SFX_08_19_Ch2
-	db CH7
-	dw SFX_08_19_Ch3
-
-SFX_08_1a:: ; 20072 (8:4072)
-	db ( $80 | CH4 )
-	dw SFX_08_1a_Ch1
-	db CH5
-	dw SFX_08_1a_Ch2
-	db CH7
-	dw SFX_08_1a_Ch3
-
-SFX_08_1b:: ; 2007b (8:407b)
-	db ( $80 | CH4 )
-	dw SFX_08_1b_Ch1
-	db CH5
-	dw SFX_08_1b_Ch2
-	db CH7
-	dw SFX_08_1b_Ch3
-
-SFX_08_1c:: ; 20084 (8:4084)
-	db ( $80 | CH4 )
-	dw SFX_08_1c_Ch1
-	db CH5
-	dw SFX_08_1c_Ch2
-	db CH7
-	dw SFX_08_1c_Ch3
-
-SFX_08_1d:: ; 2008d (8:408d)
-	db ( $80 | CH4 )
-	dw SFX_08_1d_Ch1
-	db CH5
-	dw SFX_08_1d_Ch2
-	db CH7
-	dw SFX_08_1d_Ch3
-
-SFX_08_1e:: ; 20096 (8:4096)
-	db ( $80 | CH4 )
-	dw SFX_08_1e_Ch1
-	db CH5
-	dw SFX_08_1e_Ch2
-	db CH7
-	dw SFX_08_1e_Ch3
-
-SFX_08_1f:: ; 2009f (8:409f)
-	db ( $80 | CH4 )
-	dw SFX_08_1f_Ch1
-	db CH5
-	dw SFX_08_1f_Ch2
-	db CH7
-	dw SFX_08_1f_Ch3
-
-SFX_08_20:: ; 200a8 (8:40a8)
-	db ( $80 | CH4 )
-	dw SFX_08_20_Ch1
-	db CH5
-	dw SFX_08_20_Ch2
-	db CH7
-	dw SFX_08_20_Ch3
-
-SFX_08_21:: ; 200b1 (8:40b1)
-	db ( $80 | CH4 )
-	dw SFX_08_21_Ch1
-	db CH5
-	dw SFX_08_21_Ch2
-	db CH7
-	dw SFX_08_21_Ch3
-
-SFX_08_22:: ; 200ba (8:40ba)
-	db ( $80 | CH4 )
-	dw SFX_08_22_Ch1
-	db CH5
-	dw SFX_08_22_Ch2
-	db CH7
-	dw SFX_08_22_Ch3
-
-SFX_08_23:: ; 200c3 (8:40c3)
-	db ( $80 | CH4 )
-	dw SFX_08_23_Ch1
-	db CH5
-	dw SFX_08_23_Ch2
-	db CH7
-	dw SFX_08_23_Ch3
-
-SFX_08_24:: ; 200cc (8:40cc)
-	db ( $80 | CH4 )
-	dw SFX_08_24_Ch1
-	db CH5
-	dw SFX_08_24_Ch2
-	db CH7
-	dw SFX_08_24_Ch3
-
-SFX_08_25:: ; 200d5 (8:40d5)
-	db ( $80 | CH4 )
-	dw SFX_08_25_Ch1
-	db CH5
-	dw SFX_08_25_Ch2
-	db CH7
-	dw SFX_08_25_Ch3
-
-SFX_08_26:: ; 200de (8:40de)
-	db ( $80 | CH4 )
-	dw SFX_08_26_Ch1
-	db CH5
-	dw SFX_08_26_Ch2
-	db CH7
-	dw SFX_08_26_Ch3
-
-SFX_08_27:: ; 200e7 (8:40e7)
-	db ( $80 | CH4 )
-	dw SFX_08_27_Ch1
-	db CH5
-	dw SFX_08_27_Ch2
-	db CH7
-	dw SFX_08_27_Ch3
-
-SFX_08_28:: ; 200f0 (8:40f0)
-	db ( $80 | CH4 )
-	dw SFX_08_28_Ch1
-	db CH5
-	dw SFX_08_28_Ch2
-	db CH7
-	dw SFX_08_28_Ch3
-
-SFX_08_29:: ; 200f9 (8:40f9)
-	db ( $80 | CH4 )
-	dw SFX_08_29_Ch1
-	db CH5
-	dw SFX_08_29_Ch2
-	db CH7
-	dw SFX_08_29_Ch3
-
-SFX_08_2a:: ; 20102 (8:4102)
-	db ( $80 | CH4 )
-	dw SFX_08_2a_Ch1
-	db CH5
-	dw SFX_08_2a_Ch2
-	db CH7
-	dw SFX_08_2a_Ch3
-
-SFX_08_2b:: ; 2010b (8:410b)
-	db ( $80 | CH4 )
-	dw SFX_08_2b_Ch1
-	db CH5
-	dw SFX_08_2b_Ch2
-	db CH7
-	dw SFX_08_2b_Ch3
-
-SFX_08_2c:: ; 20114 (8:4114)
-	db ( $80 | CH4 )
-	dw SFX_08_2c_Ch1
-	db CH5
-	dw SFX_08_2c_Ch2
-	db CH7
-	dw SFX_08_2c_Ch3
-
-SFX_08_2d:: ; 2011d (8:411d)
-	db ( $80 | CH4 )
-	dw SFX_08_2d_Ch1
-	db CH5
-	dw SFX_08_2d_Ch2
-	db CH7
-	dw SFX_08_2d_Ch3
-
-SFX_08_2e:: ; 20126 (8:4126)
-	db ( $80 | CH4 )
-	dw SFX_08_2e_Ch1
-	db CH5
-	dw SFX_08_2e_Ch2
-	db CH7
-	dw SFX_08_2e_Ch3
-
-SFX_08_2f:: ; 2012f (8:412f)
-	db ( $80 | CH4 )
-	dw SFX_08_2f_Ch1
-	db CH5
-	dw SFX_08_2f_Ch2
-	db CH7
-	dw SFX_08_2f_Ch3
-
-SFX_08_30:: ; 20138 (8:4138)
-	db ( $80 | CH4 )
-	dw SFX_08_30_Ch1
-	db CH5
-	dw SFX_08_30_Ch2
-	db CH7
-	dw SFX_08_30_Ch3
-
-SFX_08_31:: ; 20141 (8:4141)
-	db ( $80 | CH4 )
-	dw SFX_08_31_Ch1
-	db CH5
-	dw SFX_08_31_Ch2
-	db CH7
-	dw SFX_08_31_Ch3
-
-SFX_08_32:: ; 2014a (8:414a)
-	db ( $80 | CH4 )
-	dw SFX_08_32_Ch1
-	db CH5
-	dw SFX_08_32_Ch2
-	db CH7
-	dw SFX_08_32_Ch3
-
-SFX_08_33:: ; 20153 (8:4153)
-	db ( $80 | CH4 )
-	dw SFX_08_33_Ch1
-	db CH5
-	dw SFX_08_33_Ch2
-	db CH7
-	dw SFX_08_33_Ch3
-
-SFX_08_34:: ; 2015c (8:415c)
-	db ( $80 | CH4 )
-	dw SFX_08_34_Ch1
-	db CH5
-	dw SFX_08_34_Ch2
-	db CH7
-	dw SFX_08_34_Ch3
-
-SFX_08_35:: ; 20165 (8:4165)
-	db ( $80 | CH4 )
-	dw SFX_08_35_Ch1
-	db CH5
-	dw SFX_08_35_Ch2
-	db CH7
-	dw SFX_08_35_Ch3
-
-SFX_08_36:: ; 2016e (8:416e)
-	db ( $80 | CH4 )
-	dw SFX_08_36_Ch1
-	db CH5
-	dw SFX_08_36_Ch2
-	db CH7
-	dw SFX_08_36_Ch3
-
-SFX_08_37:: ; 20177 (8:4177)
-	db ( $80 | CH4 )
-	dw SFX_08_37_Ch1
-	db CH5
-	dw SFX_08_37_Ch2
-	db CH7
-	dw SFX_08_37_Ch3
-
-SFX_08_38:: ; 20180 (8:4180)
-	db ( $80 | CH4 )
-	dw SFX_08_38_Ch1
-	db CH5
-	dw SFX_08_38_Ch2
-	db CH7
-	dw SFX_08_38_Ch3
-
-SFX_08_39:: ; 20189 (8:4189)
-	db ( $80 | CH4 )
-	dw SFX_08_39_Ch1
-	db CH5
-	dw SFX_08_39_Ch2
-	db CH7
-	dw SFX_08_39_Ch3
-
-SFX_08_3a:: ; 20192 (8:4192)
-	db ( $80 | CH4 )
-	dw SFX_08_3a_Ch1
-	db CH5
-	dw SFX_08_3a_Ch2
-	db CH6
-	dw SFX_08_3a_Ch3
-
-SFX_08_3b:: ; 2019b (8:419b)
-	db ( $80 | CH4 )
-	dw SFX_08_3b_Ch1
-	db CH5
-	dw SFX_08_3b_Ch2
-	db CH6
-	dw SFX_08_3b_Ch3
-
-SFX_08_3c:: ; 201a4 (8:41a4)
-	db CH4
-	dw SFX_08_3c_Ch1
-
-SFX_08_3d:: ; 201a7 (8:41a7)
-	db CH4
-	dw SFX_08_3d_Ch1
-
-SFX_08_3e:: ; 201aa (8:41aa)
-	db CH4
-	dw SFX_08_3e_Ch1
-
-SFX_08_3f:: ; 201ad (8:41ad)
-	db CH7
-	dw SFX_08_3f_Ch1
-
-SFX_08_40:: ; 201b0 (8:41b0)
-	db CH4
-	dw SFX_08_40_Ch1
-
-SFX_08_41:: ; 201b3 (8:41b3)
-	db ( $40 | CH4 )
-	dw SFX_08_41_Ch1
-	db CH5
-	dw SFX_08_41_Ch2
-
-SFX_08_42:: ; 201b9 (8:41b9)
-	db ( $40 | CH4 )
-	dw SFX_08_42_Ch1
-	db CH7
-	dw SFX_08_42_Ch2
-
-SFX_08_43:: ; 201bf (8:41bf)
-	db ( $40 | CH4 )
-	dw SFX_08_43_Ch1
-	db CH7
-	dw SFX_08_43_Ch2
-
-SFX_08_44:: ; 201c5 (8:41c5)
-	db CH7
-	dw SFX_08_44_Ch1
-
-SFX_08_45:: ; 201c8 (8:41c8)
-	db ( $40 | CH4 )
-	dw SFX_08_45_Ch1
-	db CH5
-	dw SFX_08_45_Ch2
-
-SFX_08_46:: ; 201ce (8:41ce)
-	db ( $80 | CH4 )
-	dw SFX_08_46_Ch1
-	db CH5
-	dw SFX_08_46_Ch2
-	db CH6
-	dw SFX_08_46_Ch3
-
-SFX_08_47:: ; 201d7 (8:41d7)
-	db CH7
-	dw SFX_08_47_Ch1
-
-SFX_08_48:: ; 201da (8:41da)
-	db CH4
-	dw SFX_08_48_Ch1
-
-SFX_08_49:: ; 201dd (8:41dd)
-	db CH4
-	dw SFX_08_49_Ch1
-
-SFX_08_4a:: ; 201e0 (8:41e0)
-	db CH7
-	dw SFX_08_4a_Ch1
-
-SFX_08_4b:: ; 201e3 (8:41e3)
-	db CH7
-	dw SFX_08_4b_Ch1
-
-SFX_08_4c:: ; 201e6 (8:41e6)
-	db CH7
-	dw SFX_08_4c_Ch1
-
-SFX_08_4d:: ; 201e9 (8:41e9)
-	db CH7
-	dw SFX_08_4d_Ch1
-
-SFX_08_4e:: ; 201ec (8:41ec)
-	db CH7
-	dw SFX_08_4e_Ch1
-
-SFX_08_4f:: ; 201ef (8:41ef)
-	db CH7
-	dw SFX_08_4f_Ch1
-
-SFX_08_50:: ; 201f2 (8:41f2)
-	db CH7
-	dw SFX_08_50_Ch1
-
-SFX_08_51:: ; 201f5 (8:41f5)
-	db CH7
-	dw SFX_08_51_Ch1
-
-SFX_08_52:: ; 201f8 (8:41f8)
-	db CH7
-	dw SFX_08_52_Ch1
-
-SFX_08_53:: ; 201fb (8:41fb)
-	db CH7
-	dw SFX_08_53_Ch1
-
-SFX_08_54:: ; 201fe (8:41fe)
-	db CH7
-	dw SFX_08_54_Ch1
-
-SFX_08_55:: ; 20201 (8:4201)
-	db CH7
-	dw SFX_08_55_Ch1
-
-SFX_08_56:: ; 20204 (8:4204)
-	db CH7
-	dw SFX_08_56_Ch1
-
-SFX_08_57:: ; 20207 (8:4207)
-	db CH7
-	dw SFX_08_57_Ch1
-
-SFX_08_58:: ; 2020a (8:420a)
-	db CH7
-	dw SFX_08_58_Ch1
-
-SFX_08_59:: ; 2020d (8:420d)
-	db CH7
-	dw SFX_08_59_Ch1
-
-SFX_08_5a:: ; 20210 (8:4210)
-	db CH7
-	dw SFX_08_5a_Ch1
-
-SFX_08_5b:: ; 20213 (8:4213)
-	db CH7
-	dw SFX_08_5b_Ch1
-
-SFX_08_5c:: ; 20216 (8:4216)
-	db CH7
-	dw SFX_08_5c_Ch1
-
-SFX_08_5d:: ; 20219 (8:4219)
-	db CH7
-	dw SFX_08_5d_Ch1
-
-SFX_08_5e:: ; 2021c (8:421c)
-	db ( $40 | CH4 )
-	dw SFX_08_5e_Ch1
-	db CH7
-	dw SFX_08_5e_Ch2
-
-SFX_08_5f:: ; 20222 (8:4222)
-	db CH7
-	dw SFX_08_5f_Ch1
-
-SFX_08_60:: ; 20225 (8:4225)
-	db CH7
-	dw SFX_08_60_Ch1
-
-SFX_08_61:: ; 20228 (8:4228)
-	db CH7
-	dw SFX_08_61_Ch1
-
-SFX_08_62:: ; 2022b (8:422b)
-	db CH7
-	dw SFX_08_62_Ch1
-
-SFX_08_63:: ; 2022e (8:422e)
-	db CH7
-	dw SFX_08_63_Ch1
-
-SFX_08_64:: ; 20231 (8:4231)
-	db ( $40 | CH4 )
-	dw SFX_08_64_Ch1
-	db CH7
-	dw SFX_08_64_Ch2
-
-SFX_08_65:: ; 20237 (8:4237)
-	db CH7
-	dw SFX_08_65_Ch1
-
-SFX_08_66:: ; 2023a (8:423a)
-	db CH7
-	dw SFX_08_66_Ch1
-
-SFX_08_67:: ; 2023d (8:423d)
-	db ( $80 | CH4 )
-	dw SFX_08_67_Ch1
-	db CH5
-	dw SFX_08_67_Ch2
-	db CH7
-	dw SFX_08_67_Ch3
-
-SFX_08_68:: ; 20246 (8:4246)
-	db ( $80 | CH4 )
-	dw SFX_08_68_Ch1
-	db CH5
-	dw SFX_08_68_Ch2
-	db CH7
-	dw SFX_08_68_Ch3
-
-SFX_08_69:: ; 2024f (8:424f)
-	db ( $40 | CH4 )
-	dw SFX_08_69_Ch1
-	db CH7
-	dw SFX_08_69_Ch2
-
-SFX_08_6a:: ; 20255 (8:4255)
-	db ( $80 | CH4 )
-	dw SFX_08_6a_Ch1
-	db CH5
-	dw SFX_08_6a_Ch2
-	db CH7
-	dw SFX_08_6a_Ch3
-
-SFX_08_6b:: ; 2025e (8:425e)
-	db ( $40 | CH4 )
-	dw SFX_08_6b_Ch1
-	db CH7
-	dw SFX_08_6b_Ch2
-
-SFX_08_6c:: ; 20264 (8:4264)
-	db ( $80 | CH4 )
-	dw SFX_08_6c_Ch1
-	db CH5
-	dw SFX_08_6c_Ch2
-	db CH7
-	dw SFX_08_6c_Ch3
-
-SFX_08_6d:: ; 2026d (8:426d)
-	db ( $80 | CH4 )
-	dw SFX_08_6d_Ch1
-	db CH5
-	dw SFX_08_6d_Ch2
-	db CH7
-	dw SFX_08_6d_Ch3
-
-SFX_08_6e:: ; 20276 (8:4276)
-	db ( $80 | CH4 )
-	dw SFX_08_6e_Ch1
-	db CH5
-	dw SFX_08_6e_Ch2
-	db CH7
-	dw SFX_08_6e_Ch3
-
-SFX_08_6f:: ; 2027f (8:427f)
-	db ( $80 | CH4 )
-	dw SFX_08_6f_Ch1
-	db CH5
-	dw SFX_08_6f_Ch2
-	db CH7
-	dw SFX_08_6f_Ch3
-
-SFX_08_70:: ; 20288 (8:4288)
-	db ( $80 | CH4 )
-	dw SFX_08_70_Ch1
-	db CH5
-	dw SFX_08_70_Ch2
-	db CH7
-	dw SFX_08_70_Ch3
-
-SFX_08_71:: ; 20291 (8:4291)
-	db ( $40 | CH4 )
-	dw SFX_08_71_Ch1
-	db CH5
-	dw SFX_08_71_Ch2
-
-SFX_08_72:: ; 20297 (8:4297)
-	db ( $40 | CH4 )
-	dw SFX_08_72_Ch1
-	db CH5
-	dw SFX_08_72_Ch2
-
-SFX_08_73:: ; 2029d (8:429d)
-	db ( $40 | CH4 )
-	dw SFX_08_73_Ch1
-	db CH5
-	dw SFX_08_73_Ch2
-
-SFX_08_74:: ; 202a3 (8:42a3)
-	db ( $80 | CH4 )
-	dw SFX_08_74_Ch1
-	db CH5
-	dw SFX_08_74_Ch2
-	db CH7
-	dw SFX_08_74_Ch3
-
-SFX_08_75:: ; 202ac (8:42ac)
-	db ( $40 | CH4 )
-	dw SFX_08_75_Ch1
-	db CH5
-	dw SFX_08_75_Ch2
-
-SFX_08_76:: ; 202b2 (8:42b2)
-	db ( $80 | CH4 )
-	dw SFX_08_76_Ch1
-	db CH5
-	dw SFX_08_76_Ch2
-	db CH7
-	dw SFX_08_76_Ch3
-
-SFX_08_77:: ; 202bb (8:42bb)
-	db CH4
-	dw SFX_08_77_Ch1
-
-; 0x202be
\ No newline at end of file
diff --git a/audio/headers/sfxheaders1.asm b/audio/headers/sfxheaders1.asm
new file mode 100644
index 00000000..72a69646
--- /dev/null
+++ b/audio/headers/sfxheaders1.asm
@@ -0,0 +1,288 @@
+SFX_Headers_1::
+	db $ff, $ff, $ff ; padding
+
+SFX_Snare1_1::
+	audio SFX_Snare1_1, Ch7
+
+SFX_Snare2_1::
+	audio SFX_Snare2_1, Ch7
+
+SFX_Snare3_1::
+	audio SFX_Snare3_1, Ch7
+
+SFX_Snare4_1::
+	audio SFX_Snare4_1, Ch7
+
+SFX_Snare5_1::
+	audio SFX_Snare5_1, Ch7
+
+SFX_Triangle1_1::
+	audio SFX_Triangle1_1, Ch7
+
+SFX_Triangle2_1::
+	audio SFX_Triangle2_1, Ch7
+
+SFX_Snare6_1::
+	audio SFX_Snare6_1, Ch7
+
+SFX_Snare7_1::
+	audio SFX_Snare7_1, Ch7
+
+SFX_Snare8_1::
+	audio SFX_Snare8_1, Ch7
+
+SFX_Snare9_1::
+	audio SFX_Snare9_1, Ch7
+
+SFX_Cymbal1_1::
+	audio SFX_Cymbal1_1, Ch7
+
+SFX_Cymbal2_1::
+	audio SFX_Cymbal2_1, Ch7
+
+SFX_Cymbal3_1::
+	audio SFX_Cymbal3_1, Ch7
+
+SFX_Muted_Snare1_1::
+	audio SFX_Muted_Snare1_1, Ch7
+
+SFX_Triangle3_1::
+	audio SFX_Triangle3_1, Ch7
+
+SFX_Muted_Snare2_1::
+	audio SFX_Muted_Snare2_1, Ch7
+
+SFX_Muted_Snare3_1::
+	audio SFX_Muted_Snare3_1, Ch7
+
+SFX_Muted_Snare4_1::
+	audio SFX_Muted_Snare4_1, Ch7
+
+SFX_Cry00_1::
+	audio SFX_Cry00_1, Ch4, Ch5, Ch7
+
+SFX_Cry01_1::
+	audio SFX_Cry01_1, Ch4, Ch5, Ch7
+
+SFX_Cry02_1::
+	audio SFX_Cry02_1, Ch4, Ch5, Ch7
+
+SFX_Cry03_1::
+	audio SFX_Cry03_1, Ch4, Ch5, Ch7
+
+SFX_Cry04_1::
+	audio SFX_Cry04_1, Ch4, Ch5, Ch7
+
+SFX_Cry05_1::
+	audio SFX_Cry05_1, Ch4, Ch5, Ch7
+
+SFX_Cry06_1::
+	audio SFX_Cry06_1, Ch4, Ch5, Ch7
+
+SFX_Cry07_1::
+	audio SFX_Cry07_1, Ch4, Ch5, Ch7
+
+SFX_Cry08_1::
+	audio SFX_Cry08_1, Ch4, Ch5, Ch7
+
+SFX_Cry09_1::
+	audio SFX_Cry09_1, Ch4, Ch5, Ch7
+
+SFX_Cry0A_1::
+	audio SFX_Cry0A_1, Ch4, Ch5, Ch7
+
+SFX_Cry0B_1::
+	audio SFX_Cry0B_1, Ch4, Ch5, Ch7
+
+SFX_Cry0C_1::
+	audio SFX_Cry0C_1, Ch4, Ch5, Ch7
+
+SFX_Cry0D_1::
+	audio SFX_Cry0D_1, Ch4, Ch5, Ch7
+
+SFX_Cry0E_1::
+	audio SFX_Cry0E_1, Ch4, Ch5, Ch7
+
+SFX_Cry0F_1::
+	audio SFX_Cry0F_1, Ch4, Ch5, Ch7
+
+SFX_Cry10_1::
+	audio SFX_Cry10_1, Ch4, Ch5, Ch7
+
+SFX_Cry11_1::
+	audio SFX_Cry11_1, Ch4, Ch5, Ch7
+
+SFX_Cry12_1::
+	audio SFX_Cry12_1, Ch4, Ch5, Ch7
+
+SFX_Cry13_1::
+	audio SFX_Cry13_1, Ch4, Ch5, Ch7
+
+SFX_Cry14_1::
+	audio SFX_Cry14_1, Ch4, Ch5, Ch7
+
+SFX_Cry15_1::
+	audio SFX_Cry15_1, Ch4, Ch5, Ch7
+
+SFX_Cry16_1::
+	audio SFX_Cry16_1, Ch4, Ch5, Ch7
+
+SFX_Cry17_1::
+	audio SFX_Cry17_1, Ch4, Ch5, Ch7
+
+SFX_Cry18_1::
+	audio SFX_Cry18_1, Ch4, Ch5, Ch7
+
+SFX_Cry19_1::
+	audio SFX_Cry19_1, Ch4, Ch5, Ch7
+
+SFX_Cry1A_1::
+	audio SFX_Cry1A_1, Ch4, Ch5, Ch7
+
+SFX_Cry1B_1::
+	audio SFX_Cry1B_1, Ch4, Ch5, Ch7
+
+SFX_Cry1C_1::
+	audio SFX_Cry1C_1, Ch4, Ch5, Ch7
+
+SFX_Cry1D_1::
+	audio SFX_Cry1D_1, Ch4, Ch5, Ch7
+
+SFX_Cry1E_1::
+	audio SFX_Cry1E_1, Ch4, Ch5, Ch7
+
+SFX_Cry1F_1::
+	audio SFX_Cry1F_1, Ch4, Ch5, Ch7
+
+SFX_Cry20_1::
+	audio SFX_Cry20_1, Ch4, Ch5, Ch7
+
+SFX_Cry21_1::
+	audio SFX_Cry21_1, Ch4, Ch5, Ch7
+
+SFX_Cry22_1::
+	audio SFX_Cry22_1, Ch4, Ch5, Ch7
+
+SFX_Cry23_1::
+	audio SFX_Cry23_1, Ch4, Ch5, Ch7
+
+SFX_Cry24_1::
+	audio SFX_Cry24_1, Ch4, Ch5, Ch7
+
+SFX_Cry25_1::
+	audio SFX_Cry25_1, Ch4, Ch5, Ch7
+
+SFX_Get_Item1_1::
+	audio SFX_Get_Item1_1, Ch4, Ch5, Ch6
+
+SFX_Get_Item2_1::
+	audio SFX_Get_Item2_1, Ch4, Ch5, Ch6
+
+SFX_Tink_1::
+	audio SFX_Tink_1, Ch4
+
+SFX_Heal_HP_1::
+	audio SFX_Heal_HP_1, Ch4
+
+SFX_Heal_Ailment_1::
+	audio SFX_Heal_Ailment_1, Ch4
+
+SFX_Start_Menu_1::
+	audio SFX_Start_Menu_1, Ch7
+
+SFX_Press_AB_1::
+	audio SFX_Press_AB_1, Ch4
+
+SFX_Pokedex_Rating_1::
+	audio SFX_Pokedex_Rating_1, Ch4, Ch5, Ch6
+
+SFX_Get_Key_Item_1::
+	audio SFX_Get_Key_Item_1, Ch4, Ch5, Ch6
+
+SFX_Poisoned_1::
+	audio SFX_Poisoned_1, Ch4
+
+SFX_Trade_Machine_1::
+	audio SFX_Trade_Machine_1, Ch4
+
+SFX_Turn_On_PC_1::
+	audio SFX_Turn_On_PC_1, Ch4
+
+SFX_Turn_Off_PC_1::
+	audio SFX_Turn_Off_PC_1, Ch4
+
+SFX_Enter_PC_1::
+	audio SFX_Enter_PC_1, Ch4
+
+SFX_Shrink_1::
+	audio SFX_Shrink_1, Ch4
+
+SFX_Switch_1::
+	audio SFX_Switch_1, Ch4
+
+SFX_Healing_Machine_1::
+	audio SFX_Healing_Machine_1, Ch4
+
+SFX_Teleport_Exit1_1::
+	audio SFX_Teleport_Exit1_1, Ch4
+
+SFX_Teleport_Enter1_1::
+	audio SFX_Teleport_Enter1_1, Ch4
+
+SFX_Teleport_Exit2_1::
+	audio SFX_Teleport_Exit2_1, Ch4
+
+SFX_Ledge_1::
+	audio SFX_Ledge_1, Ch4
+
+SFX_Teleport_Enter2_1::
+	audio SFX_Teleport_Enter2_1, Ch7
+
+SFX_Fly_1::
+	audio SFX_Fly_1, Ch7
+
+SFX_Denied_1::
+	audio SFX_Denied_1, Ch4, Ch5
+
+SFX_Arrow_Tiles_1::
+	audio SFX_Arrow_Tiles_1, Ch4
+
+SFX_Push_Boulder_1::
+	audio SFX_Push_Boulder_1, Ch7
+
+SFX_SS_Anne_Horn_1::
+	audio SFX_SS_Anne_Horn_1, Ch4, Ch5
+
+SFX_Withdraw_Deposit_1::
+	audio SFX_Withdraw_Deposit_1, Ch4
+
+SFX_Cut_1::
+	audio SFX_Cut_1, Ch7
+
+SFX_Go_Inside_1::
+	audio SFX_Go_Inside_1, Ch7
+
+SFX_Swap_1::
+	audio SFX_Swap_1, Ch4, Ch5
+
+SFX_59_1::
+	audio SFX_59_1, Ch4, Ch5
+
+SFX_Purchase_1::
+	audio SFX_Purchase_1, Ch4, Ch5
+
+SFX_Collision_1::
+	audio SFX_Collision_1, Ch4
+
+SFX_Go_Outside_1::
+	audio SFX_Go_Outside_1, Ch7
+
+SFX_Save_1::
+	audio SFX_Save_1, Ch4, Ch5
+
+; the Pokeflute sound effect directly hijacks channel 2
+SFX_Pokeflute::
+	audio SFX_Pokeflute, Ch2
+
+SFX_Safari_Zone_PA::
+	audio SFX_Safari_Zone_PA, Ch4
diff --git a/audio/headers/sfxheaders1f.asm b/audio/headers/sfxheaders1f.asm
deleted file mode 100644
index 4db63a59..00000000
--- a/audio/headers/sfxheaders1f.asm
+++ /dev/null
@@ -1,598 +0,0 @@
-SFX_Headers_1f::
-	db $ff, $ff, $ff ; padding
-
-SFX_1f_01:: ; 7c003 (1f:4003)
-	db CH7
-	dw SFX_1f_01_Ch1
-
-SFX_1f_02:: ; 7c006 (1f:4006)
-	db CH7
-	dw SFX_1f_02_Ch1
-
-SFX_1f_03:: ; 7c009 (1f:4009)
-	db CH7
-	dw SFX_1f_03_Ch1
-
-SFX_1f_04:: ; 7c00c (1f:400c)
-	db CH7
-	dw SFX_1f_04_Ch1
-
-SFX_1f_05:: ; 7c00f (1f:400f)
-	db CH7
-	dw SFX_1f_05_Ch1
-
-SFX_1f_06:: ; 7c012 (1f:4012)
-	db CH7
-	dw SFX_1f_06_Ch1
-
-SFX_1f_07:: ; 7c015 (1f:4015)
-	db CH7
-	dw SFX_1f_07_Ch1
-
-SFX_1f_08:: ; 7c018 (1f:4018)
-	db CH7
-	dw SFX_1f_08_Ch1
-
-SFX_1f_09:: ; 7c01b (1f:401b)
-	db CH7
-	dw SFX_1f_09_Ch1
-
-SFX_1f_0a:: ; 7c01e (1f:401e)
-	db CH7
-	dw SFX_1f_0a_Ch1
-
-SFX_1f_0b:: ; 7c021 (1f:4021)
-	db CH7
-	dw SFX_1f_0b_Ch1
-
-SFX_1f_0c:: ; 7c024 (1f:4024)
-	db CH7
-	dw SFX_1f_0c_Ch1
-
-SFX_1f_0d:: ; 7c027 (1f:4027)
-	db CH7
-	dw SFX_1f_0d_Ch1
-
-SFX_1f_0e:: ; 7c02a (1f:402a)
-	db CH7
-	dw SFX_1f_0e_Ch1
-
-SFX_1f_0f:: ; 7c02d (1f:402d)
-	db CH7
-	dw SFX_1f_0f_Ch1
-
-SFX_1f_10:: ; 7c030 (1f:4030)
-	db CH7
-	dw SFX_1f_10_Ch1
-
-SFX_1f_11:: ; 7c033 (1f:4033)
-	db CH7
-	dw SFX_1f_11_Ch1
-
-SFX_1f_12:: ; 7c036 (1f:4036)
-	db CH7
-	dw SFX_1f_12_Ch1
-
-SFX_1f_13:: ; 7c039 (1f:4039)
-	db CH7
-	dw SFX_1f_13_Ch1
-
-SFX_1f_14:: ; 7c03c (1f:403c)
-	db ( $80 | CH4 )
-	dw SFX_1f_14_Ch1
-	db CH5
-	dw SFX_1f_14_Ch2
-	db CH7
-	dw SFX_1f_14_Ch3
-
-SFX_1f_15:: ; 7c045 (1f:4045)
-	db ( $80 | CH4 )
-	dw SFX_1f_15_Ch1
-	db CH5
-	dw SFX_1f_15_Ch2
-	db CH7
-	dw SFX_1f_15_Ch3
-
-SFX_1f_16:: ; 7c04e (1f:404e)
-	db ( $80 | CH4 )
-	dw SFX_1f_16_Ch1
-	db CH5
-	dw SFX_1f_16_Ch2
-	db CH7
-	dw SFX_1f_16_Ch3
-
-SFX_1f_17:: ; 7c057 (1f:4057)
-	db ( $80 | CH4 )
-	dw SFX_1f_17_Ch1
-	db CH5
-	dw SFX_1f_17_Ch2
-	db CH7
-	dw SFX_1f_17_Ch3
-
-SFX_1f_18:: ; 7c060 (1f:4060)
-	db ( $80 | CH4 )
-	dw SFX_1f_18_Ch1
-	db CH5
-	dw SFX_1f_18_Ch2
-	db CH7
-	dw SFX_1f_18_Ch3
-
-SFX_1f_19:: ; 7c069 (1f:4069)
-	db ( $80 | CH4 )
-	dw SFX_1f_19_Ch1
-	db CH5
-	dw SFX_1f_19_Ch2
-	db CH7
-	dw SFX_1f_19_Ch3
-
-SFX_1f_1a:: ; 7c072 (1f:4072)
-	db ( $80 | CH4 )
-	dw SFX_1f_1a_Ch1
-	db CH5
-	dw SFX_1f_1a_Ch2
-	db CH7
-	dw SFX_1f_1a_Ch3
-
-SFX_1f_1b:: ; 7c07b (1f:407b)
-	db ( $80 | CH4 )
-	dw SFX_1f_1b_Ch1
-	db CH5
-	dw SFX_1f_1b_Ch2
-	db CH7
-	dw SFX_1f_1b_Ch3
-
-SFX_1f_1c:: ; 7c084 (1f:4084)
-	db ( $80 | CH4 )
-	dw SFX_1f_1c_Ch1
-	db CH5
-	dw SFX_1f_1c_Ch2
-	db CH7
-	dw SFX_1f_1c_Ch3
-
-SFX_1f_1d:: ; 7c08d (1f:408d)
-	db ( $80 | CH4 )
-	dw SFX_1f_1d_Ch1
-	db CH5
-	dw SFX_1f_1d_Ch2
-	db CH7
-	dw SFX_1f_1d_Ch3
-
-SFX_1f_1e:: ; 7c096 (1f:4096)
-	db ( $80 | CH4 )
-	dw SFX_1f_1e_Ch1
-	db CH5
-	dw SFX_1f_1e_Ch2
-	db CH7
-	dw SFX_1f_1e_Ch3
-
-SFX_1f_1f:: ; 7c09f (1f:409f)
-	db ( $80 | CH4 )
-	dw SFX_1f_1f_Ch1
-	db CH5
-	dw SFX_1f_1f_Ch2
-	db CH7
-	dw SFX_1f_1f_Ch3
-
-SFX_1f_20:: ; 7c0a8 (1f:40a8)
-	db ( $80 | CH4 )
-	dw SFX_1f_20_Ch1
-	db CH5
-	dw SFX_1f_20_Ch2
-	db CH7
-	dw SFX_1f_20_Ch3
-
-SFX_1f_21:: ; 7c0b1 (1f:40b1)
-	db ( $80 | CH4 )
-	dw SFX_1f_21_Ch1
-	db CH5
-	dw SFX_1f_21_Ch2
-	db CH7
-	dw SFX_1f_21_Ch3
-
-SFX_1f_22:: ; 7c0ba (1f:40ba)
-	db ( $80 | CH4 )
-	dw SFX_1f_22_Ch1
-	db CH5
-	dw SFX_1f_22_Ch2
-	db CH7
-	dw SFX_1f_22_Ch3
-
-SFX_1f_23:: ; 7c0c3 (1f:40c3)
-	db ( $80 | CH4 )
-	dw SFX_1f_23_Ch1
-	db CH5
-	dw SFX_1f_23_Ch2
-	db CH7
-	dw SFX_1f_23_Ch3
-
-SFX_1f_24:: ; 7c0cc (1f:40cc)
-	db ( $80 | CH4 )
-	dw SFX_1f_24_Ch1
-	db CH5
-	dw SFX_1f_24_Ch2
-	db CH7
-	dw SFX_1f_24_Ch3
-
-SFX_1f_25:: ; 7c0d5 (1f:40d5)
-	db ( $80 | CH4 )
-	dw SFX_1f_25_Ch1
-	db CH5
-	dw SFX_1f_25_Ch2
-	db CH7
-	dw SFX_1f_25_Ch3
-
-SFX_1f_26:: ; 7c0de (1f:40de)
-	db ( $80 | CH4 )
-	dw SFX_1f_26_Ch1
-	db CH5
-	dw SFX_1f_26_Ch2
-	db CH7
-	dw SFX_1f_26_Ch3
-
-SFX_1f_27:: ; 7c0e7 (1f:40e7)
-	db ( $80 | CH4 )
-	dw SFX_1f_27_Ch1
-	db CH5
-	dw SFX_1f_27_Ch2
-	db CH7
-	dw SFX_1f_27_Ch3
-
-SFX_1f_28:: ; 7c0f0 (1f:40f0)
-	db ( $80 | CH4 )
-	dw SFX_1f_28_Ch1
-	db CH5
-	dw SFX_1f_28_Ch2
-	db CH7
-	dw SFX_1f_28_Ch3
-
-SFX_1f_29:: ; 7c0f9 (1f:40f9)
-	db ( $80 | CH4 )
-	dw SFX_1f_29_Ch1
-	db CH5
-	dw SFX_1f_29_Ch2
-	db CH7
-	dw SFX_1f_29_Ch3
-
-SFX_1f_2a:: ; 7c102 (1f:4102)
-	db ( $80 | CH4 )
-	dw SFX_1f_2a_Ch1
-	db CH5
-	dw SFX_1f_2a_Ch2
-	db CH7
-	dw SFX_1f_2a_Ch3
-
-SFX_1f_2b:: ; 7c10b (1f:410b)
-	db ( $80 | CH4 )
-	dw SFX_1f_2b_Ch1
-	db CH5
-	dw SFX_1f_2b_Ch2
-	db CH7
-	dw SFX_1f_2b_Ch3
-
-SFX_1f_2c:: ; 7c114 (1f:4114)
-	db ( $80 | CH4 )
-	dw SFX_1f_2c_Ch1
-	db CH5
-	dw SFX_1f_2c_Ch2
-	db CH7
-	dw SFX_1f_2c_Ch3
-
-SFX_1f_2d:: ; 7c11d (1f:411d)
-	db ( $80 | CH4 )
-	dw SFX_1f_2d_Ch1
-	db CH5
-	dw SFX_1f_2d_Ch2
-	db CH7
-	dw SFX_1f_2d_Ch3
-
-SFX_1f_2e:: ; 7c126 (1f:4126)
-	db ( $80 | CH4 )
-	dw SFX_1f_2e_Ch1
-	db CH5
-	dw SFX_1f_2e_Ch2
-	db CH7
-	dw SFX_1f_2e_Ch3
-
-SFX_1f_2f:: ; 7c12f (1f:412f)
-	db ( $80 | CH4 )
-	dw SFX_1f_2f_Ch1
-	db CH5
-	dw SFX_1f_2f_Ch2
-	db CH7
-	dw SFX_1f_2f_Ch3
-
-SFX_1f_30:: ; 7c138 (1f:4138)
-	db ( $80 | CH4 )
-	dw SFX_1f_30_Ch1
-	db CH5
-	dw SFX_1f_30_Ch2
-	db CH7
-	dw SFX_1f_30_Ch3
-
-SFX_1f_31:: ; 7c141 (1f:4141)
-	db ( $80 | CH4 )
-	dw SFX_1f_31_Ch1
-	db CH5
-	dw SFX_1f_31_Ch2
-	db CH7
-	dw SFX_1f_31_Ch3
-
-SFX_1f_32:: ; 7c14a (1f:414a)
-	db ( $80 | CH4 )
-	dw SFX_1f_32_Ch1
-	db CH5
-	dw SFX_1f_32_Ch2
-	db CH7
-	dw SFX_1f_32_Ch3
-
-SFX_1f_33:: ; 7c153 (1f:4153)
-	db ( $80 | CH4 )
-	dw SFX_1f_33_Ch1
-	db CH5
-	dw SFX_1f_33_Ch2
-	db CH7
-	dw SFX_1f_33_Ch3
-
-SFX_1f_34:: ; 7c15c (1f:415c)
-	db ( $80 | CH4 )
-	dw SFX_1f_34_Ch1
-	db CH5
-	dw SFX_1f_34_Ch2
-	db CH7
-	dw SFX_1f_34_Ch3
-
-SFX_1f_35:: ; 7c165 (1f:4165)
-	db ( $80 | CH4 )
-	dw SFX_1f_35_Ch1
-	db CH5
-	dw SFX_1f_35_Ch2
-	db CH7
-	dw SFX_1f_35_Ch3
-
-SFX_1f_36:: ; 7c16e (1f:416e)
-	db ( $80 | CH4 )
-	dw SFX_1f_36_Ch1
-	db CH5
-	dw SFX_1f_36_Ch2
-	db CH7
-	dw SFX_1f_36_Ch3
-
-SFX_1f_37:: ; 7c177 (1f:4177)
-	db ( $80 | CH4 )
-	dw SFX_1f_37_Ch1
-	db CH5
-	dw SFX_1f_37_Ch2
-	db CH7
-	dw SFX_1f_37_Ch3
-
-SFX_1f_38:: ; 7c180 (1f:4180)
-	db ( $80 | CH4 )
-	dw SFX_1f_38_Ch1
-	db CH5
-	dw SFX_1f_38_Ch2
-	db CH7
-	dw SFX_1f_38_Ch3
-
-SFX_1f_39:: ; 7c189 (1f:4189)
-	db ( $80 | CH4 )
-	dw SFX_1f_39_Ch1
-	db CH5
-	dw SFX_1f_39_Ch2
-	db CH7
-	dw SFX_1f_39_Ch3
-
-SFX_1f_3a:: ; 7c192 (1f:4192)
-	db ( $80 | CH4 )
-	dw SFX_1f_3a_Ch1
-	db CH5
-	dw SFX_1f_3a_Ch2
-	db CH6
-	dw SFX_1f_3a_Ch3
-
-SFX_1f_3b:: ; 7c19b (1f:419b)
-	db ( $80 | CH4 )
-	dw SFX_1f_3b_Ch1
-	db CH5
-	dw SFX_1f_3b_Ch2
-	db CH6
-	dw SFX_1f_3b_Ch3
-
-SFX_1f_3c:: ; 7c1a4 (1f:41a4)
-	db CH4
-	dw SFX_1f_3c_Ch1
-
-SFX_1f_3d:: ; 7c1a7 (1f:41a7)
-	db CH4
-	dw SFX_1f_3d_Ch1
-
-SFX_1f_3e:: ; 7c1aa (1f:41aa)
-	db CH4
-	dw SFX_1f_3e_Ch1
-
-SFX_1f_3f:: ; 7c1ad (1f:41ad)
-	db CH7
-	dw SFX_1f_3f_Ch1
-
-SFX_1f_40:: ; 7c1b0 (1f:41b0)
-	db CH4
-	dw SFX_1f_40_Ch1
-
-SFX_1f_41:: ; 7c1b3 (1f:41b3)
-	db ( $80 | CH4 )
-	dw SFX_1f_41_Ch1
-	db CH5
-	dw SFX_1f_41_Ch2
-	db CH6
-	dw SFX_1f_41_Ch3
-
-SFX_1f_42:: ; 7c1bc (1f:41bc)
-	db ( $80 | CH4 )
-	dw SFX_1f_42_Ch1
-	db CH5
-	dw SFX_1f_42_Ch2
-	db CH6
-	dw SFX_1f_42_Ch3
-
-SFX_1f_43:: ; 7c1c5 (1f:41c5)
-	db CH4
-	dw SFX_1f_43_Ch1
-
-SFX_1f_44:: ; 7c1c8 (1f:41c8)
-	db CH4
-	dw SFX_1f_44_Ch1
-
-SFX_1f_45:: ; 7c1cb (1f:41cb)
-	db CH4
-	dw SFX_1f_45_Ch1
-
-SFX_1f_46:: ; 7c1ce (1f:41ce)
-	db CH4
-	dw SFX_1f_46_Ch1
-
-SFX_1f_47:: ; 7c1d1 (1f:41d1)
-	db CH4
-	dw SFX_1f_47_Ch1
-
-SFX_1f_48:: ; 7c1d4 (1f:41d4)
-	db CH4
-	dw SFX_1f_48_Ch1
-
-SFX_1f_49:: ; 7c1d7 (1f:41d7)
-	db CH4
-	dw SFX_1f_49_Ch1
-
-SFX_1f_4a:: ; 7c1da (1f:41da)
-	db CH4
-	dw SFX_1f_4a_Ch1
-
-SFX_1f_4b:: ; 7c1dd (1f:41dd)
-	db CH4
-	dw SFX_1f_4b_Ch1
-
-SFX_1f_4c:: ; 7c1e0 (1f:41e0)
-	db CH4
-	dw SFX_1f_4c_Ch1
-
-SFX_1f_4d:: ; 7c1e3 (1f:41e3)
-	db CH4
-	dw SFX_1f_4d_Ch1
-
-SFX_1f_4e:: ; 7c1e6 (1f:41e6)
-	db CH4
-	dw SFX_1f_4e_Ch1
-
-SFX_1f_4f:: ; 7c1e9 (1f:41e9)
-	db CH7
-	dw SFX_1f_4f_Ch1
-
-SFX_1f_50:: ; 7c1ec (1f:41ec)
-	db CH7
-	dw SFX_1f_50_Ch1
-
-SFX_1f_51:: ; 7c1ef (1f:41ef)
-	db ( $40 | CH4 )
-	dw SFX_1f_51_Ch1
-	db CH5
-	dw SFX_1f_51_Ch2
-
-SFX_1f_52:: ; 7c1f5 (1f:41f5)
-	db CH4
-	dw SFX_1f_52_Ch1
-
-SFX_1f_53:: ; 7c1f8 (1f:41f8)
-	db CH7
-	dw SFX_1f_53_Ch1
-
-SFX_1f_54:: ; 7c1fb (1f:41fb)
-	db ( $40 | CH4 )
-	dw SFX_1f_54_Ch1
-	db CH5
-	dw SFX_1f_54_Ch2
-
-SFX_1f_55:: ; 7c201 (1f:4201)
-	db CH4
-	dw SFX_1f_55_Ch1
-
-SFX_1f_56:: ; 7c204 (1f:4204)
-	db CH7
-	dw SFX_1f_56_Ch1
-
-SFX_1f_57:: ; 7c207 (1f:4207)
-	db CH7
-	dw SFX_1f_57_Ch1
-
-SFX_1f_58:: ; 7c20a (1f:420a)
-	db ( $40 | CH4 )
-	dw SFX_1f_58_Ch1
-	db CH5
-	dw SFX_1f_58_Ch2
-
-SFX_1f_59:: ; 7c210 (1f:4210)
-	db ( $40 | CH4 )
-	dw SFX_1f_59_Ch1
-	db CH5
-	dw SFX_1f_59_Ch2
-
-SFX_1f_5a:: ; 7c216 (1f:4216)
-	db ( $40 | CH4 )
-	dw SFX_1f_5a_Ch1
-	db CH5
-	dw SFX_1f_5a_Ch2
-
-SFX_1f_5b:: ; 7c21c (1f:421c)
-	db CH4
-	dw SFX_1f_5b_Ch1
-
-SFX_1f_5c:: ; 7c21f (1f:421f)
-	db CH7
-	dw SFX_1f_5c_Ch1
-
-SFX_1f_5d:: ; 7c222 (1f:4222)
-	db ( $40 | CH4 )
-	dw SFX_1f_5d_Ch1
-	db CH5
-	dw SFX_1f_5d_Ch2
-
-SFX_1f_5e:: ; 7c228 (1f:4228)
-	db CH7
-	dw SFX_1f_5e_Ch1
-
-SFX_1f_5f:: ; 7c22b (1f:422b)
-	db CH4
-	dw SFX_1f_5f_Ch1
-
-SFX_1f_60:: ; 7c22e (1f:422e)
-	db CH4
-	dw SFX_1f_60_Ch1
-
-SFX_1f_61:: ; 7c231 (1f:4231)
-	db CH7
-	dw SFX_1f_61_Ch1
-
-SFX_1f_62:: ; 7c234 (1f:4234)
-	db CH7
-	dw SFX_1f_62_Ch1
-
-SFX_1f_63:: ; 7c237 (1f:4237)
-	db CH7
-	dw SFX_1f_63_Ch1
-
-SFX_1f_64:: ; 7c23a (1f:423a)
-	db CH4
-	dw SFX_1f_64_Ch1
-
-SFX_1f_65:: ; 7c23d (1f:423d)
-	db CH4
-	dw SFX_1f_65_Ch1
-
-SFX_1f_66:: ; 7c240 (1f:4240)
-	db ( $40 | CH4 )
-	dw SFX_1f_66_Ch1
-	db CH5
-	dw SFX_1f_66_Ch2
-
-SFX_1f_67:: ; 7c246 (1f:4246)
-	db CH4
-	dw SFX_1f_67_Ch1
-
-; 0x7c249
\ No newline at end of file
diff --git a/audio/headers/sfxheaders2.asm b/audio/headers/sfxheaders2.asm
new file mode 100644
index 00000000..b96a764f
--- /dev/null
+++ b/audio/headers/sfxheaders2.asm
@@ -0,0 +1,359 @@
+SFX_Headers_2::
+	db $ff, $ff, $ff ; padding
+
+SFX_Snare1_2::
+	audio SFX_Snare1_2, Ch7
+
+SFX_Snare2_2::
+	audio SFX_Snare2_2, Ch7
+
+SFX_Snare3_2::
+	audio SFX_Snare3_2, Ch7
+
+SFX_Snare4_2::
+	audio SFX_Snare4_2, Ch7
+
+SFX_Snare5_2::
+	audio SFX_Snare5_2, Ch7
+
+SFX_Triangle1_2::
+	audio SFX_Triangle1_2, Ch7
+
+SFX_Triangle2_2::
+	audio SFX_Triangle2_2, Ch7
+
+SFX_Snare6_2::
+	audio SFX_Snare6_2, Ch7
+
+SFX_Snare7_2::
+	audio SFX_Snare7_2, Ch7
+
+SFX_Snare8_2::
+	audio SFX_Snare8_2, Ch7
+
+SFX_Snare9_2::
+	audio SFX_Snare9_2, Ch7
+
+SFX_Cymbal1_2::
+	audio SFX_Cymbal1_2, Ch7
+
+SFX_Cymbal2_2::
+	audio SFX_Cymbal2_2, Ch7
+
+SFX_Cymbal3_2::
+	audio SFX_Cymbal3_2, Ch7
+
+SFX_Muted_Snare1_2::
+	audio SFX_Muted_Snare1_2, Ch7
+
+SFX_Triangle3_2::
+	audio SFX_Triangle3_2, Ch7
+
+SFX_Muted_Snare2_2::
+	audio SFX_Muted_Snare2_2, Ch7
+
+SFX_Muted_Snare3_2::
+	audio SFX_Muted_Snare3_2, Ch7
+
+SFX_Muted_Snare4_2::
+	audio SFX_Muted_Snare4_2, Ch7
+
+SFX_Cry00_2::
+	audio SFX_Cry00_2, Ch4, Ch5, Ch7
+
+SFX_Cry01_2::
+	audio SFX_Cry01_2, Ch4, Ch5, Ch7
+
+SFX_Cry02_2::
+	audio SFX_Cry02_2, Ch4, Ch5, Ch7
+
+SFX_Cry03_2::
+	audio SFX_Cry03_2, Ch4, Ch5, Ch7
+
+SFX_Cry04_2::
+	audio SFX_Cry04_2, Ch4, Ch5, Ch7
+
+SFX_Cry05_2::
+	audio SFX_Cry05_2, Ch4, Ch5, Ch7
+
+SFX_Cry06_2::
+	audio SFX_Cry06_2, Ch4, Ch5, Ch7
+
+SFX_Cry07_2::
+	audio SFX_Cry07_2, Ch4, Ch5, Ch7
+
+SFX_Cry08_2::
+	audio SFX_Cry08_2, Ch4, Ch5, Ch7
+
+SFX_Cry09_2::
+	audio SFX_Cry09_2, Ch4, Ch5, Ch7
+
+SFX_Cry0A_2::
+	audio SFX_Cry0A_2, Ch4, Ch5, Ch7
+
+SFX_Cry0B_2::
+	audio SFX_Cry0B_2, Ch4, Ch5, Ch7
+
+SFX_Cry0C_2::
+	audio SFX_Cry0C_2, Ch4, Ch5, Ch7
+
+SFX_Cry0D_2::
+	audio SFX_Cry0D_2, Ch4, Ch5, Ch7
+
+SFX_Cry0E_2::
+	audio SFX_Cry0E_2, Ch4, Ch5, Ch7
+
+SFX_Cry0F_2::
+	audio SFX_Cry0F_2, Ch4, Ch5, Ch7
+
+SFX_Cry10_2::
+	audio SFX_Cry10_2, Ch4, Ch5, Ch7
+
+SFX_Cry11_2::
+	audio SFX_Cry11_2, Ch4, Ch5, Ch7
+
+SFX_Cry12_2::
+	audio SFX_Cry12_2, Ch4, Ch5, Ch7
+
+SFX_Cry13_2::
+	audio SFX_Cry13_2, Ch4, Ch5, Ch7
+
+SFX_Cry14_2::
+	audio SFX_Cry14_2, Ch4, Ch5, Ch7
+
+SFX_Cry15_2::
+	audio SFX_Cry15_2, Ch4, Ch5, Ch7
+
+SFX_Cry16_2::
+	audio SFX_Cry16_2, Ch4, Ch5, Ch7
+
+SFX_Cry17_2::
+	audio SFX_Cry17_2, Ch4, Ch5, Ch7
+
+SFX_Cry18_2::
+	audio SFX_Cry18_2, Ch4, Ch5, Ch7
+
+SFX_Cry19_2::
+	audio SFX_Cry19_2, Ch4, Ch5, Ch7
+
+SFX_Cry1A_2::
+	audio SFX_Cry1A_2, Ch4, Ch5, Ch7
+
+SFX_Cry1B_2::
+	audio SFX_Cry1B_2, Ch4, Ch5, Ch7
+
+SFX_Cry1C_2::
+	audio SFX_Cry1C_2, Ch4, Ch5, Ch7
+
+SFX_Cry1D_2::
+	audio SFX_Cry1D_2, Ch4, Ch5, Ch7
+
+SFX_Cry1E_2::
+	audio SFX_Cry1E_2, Ch4, Ch5, Ch7
+
+SFX_Cry1F_2::
+	audio SFX_Cry1F_2, Ch4, Ch5, Ch7
+
+SFX_Cry20_2::
+	audio SFX_Cry20_2, Ch4, Ch5, Ch7
+
+SFX_Cry21_2::
+	audio SFX_Cry21_2, Ch4, Ch5, Ch7
+
+SFX_Cry22_2::
+	audio SFX_Cry22_2, Ch4, Ch5, Ch7
+
+SFX_Cry23_2::
+	audio SFX_Cry23_2, Ch4, Ch5, Ch7
+
+SFX_Cry24_2::
+	audio SFX_Cry24_2, Ch4, Ch5, Ch7
+
+SFX_Cry25_2::
+	audio SFX_Cry25_2, Ch4, Ch5, Ch7
+
+SFX_Level_Up::
+	audio SFX_Level_Up, Ch4, Ch5, Ch6
+
+SFX_Get_Item2_2::
+	audio SFX_Get_Item2_2, Ch4, Ch5, Ch6
+
+SFX_Tink_2::
+	audio SFX_Tink_2, Ch4
+
+SFX_Heal_HP_2::
+	audio SFX_Heal_HP_2, Ch4
+
+SFX_Heal_Ailment_2::
+	audio SFX_Heal_Ailment_2, Ch4
+
+SFX_Start_Menu_2::
+	audio SFX_Start_Menu_2, Ch7
+
+SFX_Press_AB_2::
+	audio SFX_Press_AB_2, Ch4
+
+SFX_Ball_Toss::
+	audio SFX_Ball_Toss, Ch4, Ch5
+
+SFX_Ball_Poof::
+	audio SFX_Ball_Poof, Ch4, Ch7
+
+SFX_Faint_Thud::
+	audio SFX_Faint_Thud, Ch4, Ch7
+
+SFX_Run::
+	audio SFX_Run, Ch7
+
+SFX_Dex_Page_Added::
+	audio SFX_Dex_Page_Added, Ch4, Ch5
+
+SFX_Caught_Mon::
+	audio SFX_Caught_Mon, Ch4, Ch5, Ch6
+
+SFX_Peck::
+	audio SFX_Peck, Ch7
+
+SFX_Faint_Fall::
+	audio SFX_Faint_Fall, Ch4
+
+SFX_Battle_09::
+	audio SFX_Battle_09, Ch4
+
+SFX_Pound::
+	audio SFX_Pound, Ch7
+
+SFX_Battle_0B::
+	audio SFX_Battle_0B, Ch7
+
+SFX_Battle_0C::
+	audio SFX_Battle_0C, Ch7
+
+SFX_Battle_0D::
+	audio SFX_Battle_0D, Ch7
+
+SFX_Battle_0E::
+	audio SFX_Battle_0E, Ch7
+
+SFX_Battle_0F::
+	audio SFX_Battle_0F, Ch7
+
+SFX_Damage::
+	audio SFX_Damage, Ch7
+
+SFX_Not_Very_Effective::
+	audio SFX_Not_Very_Effective, Ch7
+
+SFX_Battle_12::
+	audio SFX_Battle_12, Ch7
+
+SFX_Battle_13::
+	audio SFX_Battle_13, Ch7
+
+SFX_Battle_14::
+	audio SFX_Battle_14, Ch7
+
+SFX_Vine_Whip::
+	audio SFX_Vine_Whip, Ch7
+
+SFX_Battle_16::
+	audio SFX_Battle_16, Ch7
+
+SFX_Battle_17::
+	audio SFX_Battle_17, Ch7
+
+SFX_Battle_18::
+	audio SFX_Battle_18, Ch7
+
+SFX_Battle_19::
+	audio SFX_Battle_19, Ch7
+
+SFX_Super_Effective::
+	audio SFX_Super_Effective, Ch7
+
+SFX_Battle_1B::
+	audio SFX_Battle_1B, Ch7
+
+SFX_Battle_1C::
+	audio SFX_Battle_1C, Ch7
+
+SFX_Doubleslap::
+	audio SFX_Doubleslap, Ch7
+
+SFX_Battle_1E::
+	audio SFX_Battle_1E, Ch4, Ch7
+
+SFX_Horn_Drill::
+	audio SFX_Horn_Drill, Ch7
+
+SFX_Battle_20::
+	audio SFX_Battle_20, Ch7
+
+SFX_Battle_21::
+	audio SFX_Battle_21, Ch7
+
+SFX_Battle_22::
+	audio SFX_Battle_22, Ch7
+
+SFX_Battle_23::
+	audio SFX_Battle_23, Ch7
+
+SFX_Battle_24::
+	audio SFX_Battle_24, Ch4, Ch7
+
+SFX_Battle_25::
+	audio SFX_Battle_25, Ch7
+
+SFX_Battle_26::
+	audio SFX_Battle_26, Ch7
+
+SFX_Battle_27::
+	audio SFX_Battle_27, Ch4, Ch5, Ch7
+
+SFX_Battle_28::
+	audio SFX_Battle_28, Ch4, Ch5, Ch7
+
+SFX_Battle_29::
+	audio SFX_Battle_29, Ch4, Ch7
+
+SFX_Battle_2A::
+	audio SFX_Battle_2A, Ch4, Ch5, Ch7
+
+SFX_Battle_2B::
+	audio SFX_Battle_2B, Ch4, Ch7
+
+SFX_Battle_2C::
+	audio SFX_Battle_2C, Ch4, Ch5, Ch7
+
+SFX_Psybeam::
+	audio SFX_Psybeam, Ch4, Ch5, Ch7
+
+SFX_Battle_2E::
+	audio SFX_Battle_2E, Ch4, Ch5, Ch7
+
+SFX_Battle_2F::
+	audio SFX_Battle_2F, Ch4, Ch5, Ch7
+
+SFX_Psychic_M::
+	audio SFX_Psychic_M, Ch4, Ch5, Ch7
+
+SFX_Battle_31::
+	audio SFX_Battle_31, Ch4, Ch5
+
+SFX_Battle_32::
+	audio SFX_Battle_32, Ch4, Ch5
+
+SFX_Battle_33::
+	audio SFX_Battle_33, Ch4, Ch5
+
+SFX_Battle_34::
+	audio SFX_Battle_34, Ch4, Ch5, Ch7
+
+SFX_Battle_35::
+	audio SFX_Battle_35, Ch4, Ch5
+
+SFX_Battle_36::
+	audio SFX_Battle_36, Ch4, Ch5, Ch7
+
+SFX_Silph_Scope::
+	audio SFX_Silph_Scope, Ch4
diff --git a/audio/headers/sfxheaders3.asm b/audio/headers/sfxheaders3.asm
new file mode 100644
index 00000000..19a19272
--- /dev/null
+++ b/audio/headers/sfxheaders3.asm
@@ -0,0 +1,311 @@
+SFX_Headers_3::
+	db $ff, $ff, $ff ; padding
+
+SFX_Snare1_3::
+	audio SFX_Snare1_3, Ch7
+
+SFX_Snare2_3::
+	audio SFX_Snare2_3, Ch7
+
+SFX_Snare3_3::
+	audio SFX_Snare3_3, Ch7
+
+SFX_Snare4_3::
+	audio SFX_Snare4_3, Ch7
+
+SFX_Snare5_3::
+	audio SFX_Snare5_3, Ch7
+
+SFX_Triangle1_3::
+	audio SFX_Triangle1_3, Ch7
+
+SFX_Triangle2_3::
+	audio SFX_Triangle2_3, Ch7
+
+SFX_Snare6_3::
+	audio SFX_Snare6_3, Ch7
+
+SFX_Snare7_3::
+	audio SFX_Snare7_3, Ch7
+
+SFX_Snare8_3::
+	audio SFX_Snare8_3, Ch7
+
+SFX_Snare9_3::
+	audio SFX_Snare9_3, Ch7
+
+SFX_Cymbal1_3::
+	audio SFX_Cymbal1_3, Ch7
+
+SFX_Cymbal2_3::
+	audio SFX_Cymbal2_3, Ch7
+
+SFX_Cymbal3_3::
+	audio SFX_Cymbal3_3, Ch7
+
+SFX_Muted_Snare1_3::
+	audio SFX_Muted_Snare1_3, Ch7
+
+SFX_Triangle3_3::
+	audio SFX_Triangle3_3, Ch7
+
+SFX_Muted_Snare2_3::
+	audio SFX_Muted_Snare2_3, Ch7
+
+SFX_Muted_Snare3_3::
+	audio SFX_Muted_Snare3_3, Ch7
+
+SFX_Muted_Snare4_3::
+	audio SFX_Muted_Snare4_3, Ch7
+
+SFX_Cry00_3::
+	audio SFX_Cry00_3, Ch4, Ch5, Ch7
+
+SFX_Cry01_3::
+	audio SFX_Cry01_3, Ch4, Ch5, Ch7
+
+SFX_Cry02_3::
+	audio SFX_Cry02_3, Ch4, Ch5, Ch7
+
+SFX_Cry03_3::
+	audio SFX_Cry03_3, Ch4, Ch5, Ch7
+
+SFX_Cry04_3::
+	audio SFX_Cry04_3, Ch4, Ch5, Ch7
+
+SFX_Cry05_3::
+	audio SFX_Cry05_3, Ch4, Ch5, Ch7
+
+SFX_Cry06_3::
+	audio SFX_Cry06_3, Ch4, Ch5, Ch7
+
+SFX_Cry07_3::
+	audio SFX_Cry07_3, Ch4, Ch5, Ch7
+
+SFX_Cry08_3::
+	audio SFX_Cry08_3, Ch4, Ch5, Ch7
+
+SFX_Cry09_3::
+	audio SFX_Cry09_3, Ch4, Ch5, Ch7
+
+SFX_Cry0A_3::
+	audio SFX_Cry0A_3, Ch4, Ch5, Ch7
+
+SFX_Cry0B_3::
+	audio SFX_Cry0B_3, Ch4, Ch5, Ch7
+
+SFX_Cry0C_3::
+	audio SFX_Cry0C_3, Ch4, Ch5, Ch7
+
+SFX_Cry0D_3::
+	audio SFX_Cry0D_3, Ch4, Ch5, Ch7
+
+SFX_Cry0E_3::
+	audio SFX_Cry0E_3, Ch4, Ch5, Ch7
+
+SFX_Cry0F_3::
+	audio SFX_Cry0F_3, Ch4, Ch5, Ch7
+
+SFX_Cry10_3::
+	audio SFX_Cry10_3, Ch4, Ch5, Ch7
+
+SFX_Cry11_3::
+	audio SFX_Cry11_3, Ch4, Ch5, Ch7
+
+SFX_Cry12_3::
+	audio SFX_Cry12_3, Ch4, Ch5, Ch7
+
+SFX_Cry13_3::
+	audio SFX_Cry13_3, Ch4, Ch5, Ch7
+
+SFX_Cry14_3::
+	audio SFX_Cry14_3, Ch4, Ch5, Ch7
+
+SFX_Cry15_3::
+	audio SFX_Cry15_3, Ch4, Ch5, Ch7
+
+SFX_Cry16_3::
+	audio SFX_Cry16_3, Ch4, Ch5, Ch7
+
+SFX_Cry17_3::
+	audio SFX_Cry17_3, Ch4, Ch5, Ch7
+
+SFX_Cry18_3::
+	audio SFX_Cry18_3, Ch4, Ch5, Ch7
+
+SFX_Cry19_3::
+	audio SFX_Cry19_3, Ch4, Ch5, Ch7
+
+SFX_Cry1A_3::
+	audio SFX_Cry1A_3, Ch4, Ch5, Ch7
+
+SFX_Cry1B_3::
+	audio SFX_Cry1B_3, Ch4, Ch5, Ch7
+
+SFX_Cry1C_3::
+	audio SFX_Cry1C_3, Ch4, Ch5, Ch7
+
+SFX_Cry1D_3::
+	audio SFX_Cry1D_3, Ch4, Ch5, Ch7
+
+SFX_Cry1E_3::
+	audio SFX_Cry1E_3, Ch4, Ch5, Ch7
+
+SFX_Cry1F_3::
+	audio SFX_Cry1F_3, Ch4, Ch5, Ch7
+
+SFX_Cry20_3::
+	audio SFX_Cry20_3, Ch4, Ch5, Ch7
+
+SFX_Cry21_3::
+	audio SFX_Cry21_3, Ch4, Ch5, Ch7
+
+SFX_Cry22_3::
+	audio SFX_Cry22_3, Ch4, Ch5, Ch7
+
+SFX_Cry23_3::
+	audio SFX_Cry23_3, Ch4, Ch5, Ch7
+
+SFX_Cry24_3::
+	audio SFX_Cry24_3, Ch4, Ch5, Ch7
+
+SFX_Cry25_3::
+	audio SFX_Cry25_3, Ch4, Ch5, Ch7
+
+SFX_Get_Item1_3::
+	audio SFX_Get_Item1_3, Ch4, Ch5, Ch6
+
+SFX_Get_Item2_3::
+	audio SFX_Get_Item2_3, Ch4, Ch5, Ch6
+
+SFX_Tink_3::
+	audio SFX_Tink_3, Ch4
+
+SFX_Heal_HP_3::
+	audio SFX_Heal_HP_3, Ch4
+
+SFX_Heal_Ailment_3::
+	audio SFX_Heal_Ailment_3, Ch4
+
+SFX_Start_Menu_3::
+	audio SFX_Start_Menu_3, Ch7
+
+SFX_Press_AB_3::
+	audio SFX_Press_AB_3, Ch4
+
+SFX_Pokedex_Rating_3::
+	audio SFX_Pokedex_Rating_3, Ch4, Ch5, Ch6
+
+SFX_Get_Key_Item_3::
+	audio SFX_Get_Key_Item_3, Ch4, Ch5, Ch6
+
+SFX_Poisoned_3::
+	audio SFX_Poisoned_3, Ch4
+
+SFX_Trade_Machine_3::
+	audio SFX_Trade_Machine_3, Ch4
+
+SFX_Turn_On_PC_3::
+	audio SFX_Turn_On_PC_3, Ch4
+
+SFX_Turn_Off_PC_3::
+	audio SFX_Turn_Off_PC_3, Ch4
+
+SFX_Enter_PC_3::
+	audio SFX_Enter_PC_3, Ch4
+
+SFX_Shrink_3::
+	audio SFX_Shrink_3, Ch4
+
+SFX_Switch_3::
+	audio SFX_Switch_3, Ch4
+
+SFX_Healing_Machine_3::
+	audio SFX_Healing_Machine_3, Ch4
+
+SFX_Teleport_Exit1_3::
+	audio SFX_Teleport_Exit1_3, Ch4
+
+SFX_Teleport_Enter1_3::
+	audio SFX_Teleport_Enter1_3, Ch4
+
+SFX_Teleport_Exit2_3::
+	audio SFX_Teleport_Exit2_3, Ch4
+
+SFX_Ledge_3::
+	audio SFX_Ledge_3, Ch4
+
+SFX_Teleport_Enter2_3::
+	audio SFX_Teleport_Enter2_3, Ch7
+
+SFX_Fly_3::
+	audio SFX_Fly_3, Ch7
+
+SFX_Denied_3::
+	audio SFX_Denied_3, Ch4, Ch5
+
+SFX_Arrow_Tiles_3::
+	audio SFX_Arrow_Tiles_3, Ch4
+
+SFX_Push_Boulder_3::
+	audio SFX_Push_Boulder_3, Ch7
+
+SFX_SS_Anne_Horn_3::
+	audio SFX_SS_Anne_Horn_3, Ch4, Ch5
+
+SFX_Withdraw_Deposit_3::
+	audio SFX_Withdraw_Deposit_3, Ch4
+
+SFX_Cut_3::
+	audio SFX_Cut_3, Ch7
+
+SFX_Go_Inside_3::
+	audio SFX_Go_Inside_3, Ch7
+
+SFX_Swap_3::
+	audio SFX_Swap_3, Ch4, Ch5
+
+SFX_59_3::
+	audio SFX_59_3, Ch4, Ch5
+
+SFX_Purchase_3::
+	audio SFX_Purchase_3, Ch4, Ch5
+
+SFX_Collision_3::
+	audio SFX_Collision_3, Ch4
+
+SFX_Go_Outside_3::
+	audio SFX_Go_Outside_3, Ch7
+
+SFX_Save_3::
+	audio SFX_Save_3, Ch4, Ch5
+
+SFX_Intro_Lunge::
+	audio SFX_Intro_Lunge, Ch7
+
+SFX_Intro_Hip::
+	audio SFX_Intro_Hip, Ch4
+
+SFX_Intro_Hop::
+	audio SFX_Intro_Hop, Ch4
+
+SFX_Intro_Raise::
+	audio SFX_Intro_Raise, Ch7
+
+SFX_Intro_Crash::
+	audio SFX_Intro_Crash, Ch7
+
+SFX_Intro_Whoosh::
+	audio SFX_Intro_Whoosh, Ch7
+
+SFX_Slots_Stop_Wheel::
+	audio SFX_Slots_Stop_Wheel, Ch4
+
+SFX_Slots_Reward::
+	audio SFX_Slots_Reward, Ch4
+
+SFX_Slots_New_Spin::
+	audio SFX_Slots_New_Spin, Ch4, Ch5
+
+SFX_Shooting_Star::
+	audio SFX_Shooting_Star, Ch4