Merge pull request #13 from YamaArashi/master

remove address comments

7 files changed, 433 insertions, 433 deletions

diff --git a/audio/headers/musicheaders1.asm b/audio/headers/musicheaders1.asm
index b3e640af..665efceb 100644
--- a/audio/headers/musicheaders1.asm
+++ b/audio/headers/musicheaders1.asm
@@ -1,114 +1,114 @@
-Music_PalletTown:: ; 822e (2:422e)
+Music_PalletTown::
 	dbw ( $80 | CH0 ), Music_PalletTown_Ch1
 	dbw CH1, Music_PalletTown_Ch2
 	dbw CH2, Music_PalletTown_Ch3
 
-Music_Pokecenter:: ; 8237 (2:4237)
+Music_Pokecenter::
 	dbw ( $80 | CH0 ), Music_Pokecenter_Ch1
 	dbw CH1, Music_Pokecenter_Ch2
 	dbw CH2, Music_Pokecenter_Ch3
 
-Music_Gym:: ; 8240 (2:4240)
+Music_Gym::
 	dbw ( $80 | CH0 ), Music_Gym_Ch1
 	dbw CH1, Music_Gym_Ch2
 	dbw CH2, Music_Gym_Ch3
 
 ; Viridian City, Pewter City, Saffron City
-Music_Cities1:: ; 8249 (2:4249)
+Music_Cities1::
 	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:: ; 8255 (2:4255)
+Music_Cities2::
 	dbw ( $80 | CH0 ), Music_Cities2_Ch1
 	dbw CH1, Music_Cities2_Ch2
 	dbw CH2, Music_Cities2_Ch3
 
-Music_Celadon:: ; 825e (2:425e)
+Music_Celadon::
 	dbw ( $80 | CH0 ), Music_Celadon_Ch1
 	dbw CH1, Music_Celadon_Ch2
 	dbw CH2, Music_Celadon_Ch3
 
-Music_Cinnabar:: ; 8267 (2:4267)
+Music_Cinnabar::
 	dbw ( $80 | CH0 ), Music_Cinnabar_Ch1
 	dbw CH1, Music_Cinnabar_Ch2
 	dbw CH2, Music_Cinnabar_Ch3
 
-Music_Vermilion:: ; 8270 (2:4270)
+Music_Vermilion::
 	dbw ( $C0 | CH0 ), Music_Vermilion_Ch1
 	dbw CH1, Music_Vermilion_Ch2
 	dbw CH2, Music_Vermilion_Ch3
 	dbw CH3, Music_Vermilion_Ch4
 
-Music_Lavender:: ; 827c (2:427c)
+Music_Lavender::
 	dbw ( $C0 | CH0 ), Music_Lavender_Ch1
 	dbw CH1, Music_Lavender_Ch2
 	dbw CH2, Music_Lavender_Ch3
 	dbw CH3, Music_Lavender_Ch4
 
-Music_SSAnne:: ; 8288 (2:4288)
+Music_SSAnne::
 	dbw ( $80 | CH0 ), Music_SSAnne_Ch1
 	dbw CH1, Music_SSAnne_Ch2
 	dbw CH2, Music_SSAnne_Ch3
 
-Music_MeetProfOak:: ; 8291 (2:4291)
+Music_MeetProfOak::
 	dbw ( $80 | CH0 ), Music_MeetProfOak_Ch1
 	dbw CH1, Music_MeetProfOak_Ch2
 	dbw CH2, Music_MeetProfOak_Ch3
 
-Music_MeetRival:: ; 829a (2:429a)
+Music_MeetRival::
 	dbw ( $80 | CH0 ), Music_MeetRival_Ch1
 	dbw CH1, Music_MeetRival_Ch2
 	dbw CH2, Music_MeetRival_Ch3
 
-Music_MuseumGuy:: ; 82a3 (2:42a3)
+Music_MuseumGuy::
 	dbw ( $C0 | CH0 ), Music_MuseumGuy_Ch1
 	dbw CH1, Music_MuseumGuy_Ch2
 	dbw CH2, Music_MuseumGuy_Ch3
 	dbw CH3, Music_MuseumGuy_Ch4
 
-Music_SafariZone:: ; 82af (2:42af)
+Music_SafariZone::
 	dbw ( $80 | CH0 ), Music_SafariZone_Ch1
 	dbw CH1, Music_SafariZone_Ch2
 	dbw CH2, Music_SafariZone_Ch3
 
-Music_PkmnHealed:: ; 82b8 (2:42b8)
+Music_PkmnHealed::
 	dbw ( $80 | CH0 ), Music_PkmnHealed_Ch1
 	dbw CH1, Music_PkmnHealed_Ch2
 	dbw CH2, Music_PkmnHealed_Ch3
 
 ; Routes 1 and 2
-Music_Routes1:: ; 82c1 (2:42c1)
+Music_Routes1::
 	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:: ; 82cd (2:42cd)
+Music_Routes2::
 	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:: ; 82d9 (2:42d9)
+Music_Routes3::
 	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:: ; 82d5 (2:42d5)
+Music_Routes4::
 	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:: ; 82f1 (2:42f1)
+Music_IndigoPlateau::
 	dbw ( $C0 | CH0 ), Music_IndigoPlateau_Ch1
 	dbw CH1, Music_IndigoPlateau_Ch2
 	dbw CH2, Music_IndigoPlateau_Ch3
diff --git a/audio/headers/musicheaders2.asm b/audio/headers/musicheaders2.asm
index 1862a040..8c128c0e 100644
--- a/audio/headers/musicheaders2.asm
+++ b/audio/headers/musicheaders2.asm
@@ -1,34 +1,34 @@
-Music_GymLeaderBattle:: ; 202be (8:42be)
+Music_GymLeaderBattle::
 	dbw ( $80 | CH0 ), Music_GymLeaderBattle_Ch1
 	dbw CH1, Music_GymLeaderBattle_Ch2
 	dbw CH2, Music_GymLeaderBattle_Ch3
 
-Music_TrainerBattle:: ; 202c7 (8:42c7)
+Music_TrainerBattle::
 	dbw ( $80 | CH0 ), Music_TrainerBattle_Ch1
 	dbw CH1, Music_TrainerBattle_Ch2
 	dbw CH2, Music_TrainerBattle_Ch3
 
-Music_WildBattle:: ; 202d0 (8:42d0)
+Music_WildBattle::
 	dbw ( $80 | CH0 ), Music_WildBattle_Ch1
 	dbw CH1, Music_WildBattle_Ch2
 	dbw CH2, Music_WildBattle_Ch3
 
-Music_FinalBattle:: ; 202d9 (8:42d9)
+Music_FinalBattle::
 	dbw ( $80 | CH0 ), Music_FinalBattle_Ch1
 	dbw CH1, Music_FinalBattle_Ch2
 	dbw CH2, Music_FinalBattle_Ch3
 
-Music_DefeatedTrainer:: ; 202e2 (8:42e2)
+Music_DefeatedTrainer::
 	dbw ( $80 | CH0 ), Music_DefeatedTrainer_Ch1
 	dbw CH1, Music_DefeatedTrainer_Ch2
 	dbw CH2, Music_DefeatedTrainer_Ch3
 
-Music_DefeatedWildMon:: ; 202eb (8:42eb)
+Music_DefeatedWildMon::
 	dbw ( $80 | CH0 ), Music_DefeatedWildMon_Ch1
 	dbw CH1, Music_DefeatedWildMon_Ch2
 	dbw CH2, Music_DefeatedWildMon_Ch3
 
-Music_DefeatedGymLeader:: ; 202f4 (8:42f4)
+Music_DefeatedGymLeader::
 	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 a1bfaad2..c694be9b 100644
--- a/audio/headers/musicheaders3.asm
+++ b/audio/headers/musicheaders3.asm
@@ -1,97 +1,97 @@
-Music_TitleScreen:: ; 7c249 (1f:4249)
+Music_TitleScreen::
 	dbw ( $C0 | CH0 ), Music_TitleScreen_Ch1
 	dbw CH1, Music_TitleScreen_Ch2
 	dbw CH2, Music_TitleScreen_Ch3
 	dbw CH3, Music_TitleScreen_Ch4
 
-Music_Credits:: ; 7c255 (1f:4255)
+Music_Credits::
 	dbw ( $80 | CH0 ), Music_Credits_Ch1
 	dbw CH1, Music_Credits_Ch2
 	dbw CH2, Music_Credits_Ch3
 
-Music_HallOfFame:: ; 7c25e (1f:425e)
+Music_HallOfFame::
 	dbw ( $80 | CH0 ), Music_HallOfFame_Ch1
 	dbw CH1, Music_HallOfFame_Ch2
 	dbw CH2, Music_HallOfFame_Ch3
 
-Music_OaksLab:: ; 7c267 (1f:4267)
+Music_OaksLab::
 	dbw ( $80 | CH0 ), Music_OaksLab_Ch1
 	dbw CH1, Music_OaksLab_Ch2
 	dbw CH2, Music_OaksLab_Ch3
 
-Music_JigglypuffSong:: ; 7c270 (1f:4270)
+Music_JigglypuffSong::
 	dbw $40, Music_JigglypuffSong_Ch1
 	dbw CH1, Music_JigglypuffSong_Ch2
 
-Music_BikeRiding:: ; 7c276 (1f:4276)
+Music_BikeRiding::
 	dbw ( $C0 | CH0 ), Music_BikeRiding_Ch1
 	dbw CH1, Music_BikeRiding_Ch2
 	dbw CH2, Music_BikeRiding_Ch3
 	dbw CH3, Music_BikeRiding_Ch4
 
-Music_Surfing:: ; 7c282 (1f:4282)
+Music_Surfing::
 	dbw ( $80 | CH0 ), Music_Surfing_Ch1
 	dbw CH1, Music_Surfing_Ch2
 	dbw CH2, Music_Surfing_Ch3
 
-Music_GameCorner:: ; 7c28b (1f:428b)
+Music_GameCorner::
 	dbw ( $80 | CH0 ), Music_GameCorner_Ch1
 	dbw CH1, Music_GameCorner_Ch2
 	dbw CH2, Music_GameCorner_Ch3
 
-Music_IntroBattle:: ; 7c294 (1f:4294)
+Music_IntroBattle::
 	dbw ( $80 | CH0 ), Music_YellowIntro_Ch1
 	dbw CH1, Music_YellowIntro_Ch2
 	dbw CH2, Music_YellowIntro_Ch3
 
 ; Power Plant, Unknown Dungeon, Rocket HQ
-Music_Dungeon1:: ; 7c2a0 (1f:42a0)
+Music_Dungeon1::
 	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:: ; 7c2ac (1f:42ac)
+Music_Dungeon2::
 	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:: ; 7c2b8 (1f:42b8)
+Music_Dungeon3::
 	dbw ( $C0 | CH0 ), Music_Dungeon3_Ch1
 	dbw CH1, Music_Dungeon3_Ch2
 	dbw CH2, Music_Dungeon3_Ch3
 	dbw CH3, Music_Dungeon3_Ch4
 
-Music_CinnabarMansion:: ; 7c2c4 (1f:42c4)
+Music_CinnabarMansion::
 	dbw ( $C0 | CH0 ), Music_CinnabarMansion_Ch1
 	dbw CH1, Music_CinnabarMansion_Ch2
 	dbw CH2, Music_CinnabarMansion_Ch3
 	dbw CH3, Music_CinnabarMansion_Ch4
 
-Music_PokemonTower:: ; 7c2d0 (1f:42d0)
+Music_PokemonTower::
 	dbw ( $80 | CH0 ), Music_PokemonTower_Ch1
 	dbw CH1, Music_PokemonTower_Ch2
 	dbw CH2, Music_PokemonTower_Ch3
 
-Music_SilphCo:: ; 7c2d9 (1f:42d9)
+Music_SilphCo::
 	dbw ( $80 | CH0 ), Music_SilphCo_Ch1
 	dbw CH1, Music_SilphCo_Ch2
 	dbw CH2, Music_SilphCo_Ch3
 
-Music_MeetEvilTrainer:: ; 7c2e2 (1f:42e2)
+Music_MeetEvilTrainer::
 	dbw ( $80 | CH0 ), Music_MeetEvilTrainer_Ch1
 	dbw CH1, Music_MeetEvilTrainer_Ch2
 	dbw CH2, Music_MeetEvilTrainer_Ch3
 
-Music_MeetFemaleTrainer:: ; 7c2eb (1f:42eb)
+Music_MeetFemaleTrainer::
 	dbw ( $80 | CH0 ), Music_MeetFemaleTrainer_Ch1
 	dbw CH1, Music_MeetFemaleTrainer_Ch2
 	dbw CH2, Music_MeetFemaleTrainer_Ch3
 
-Music_MeetMaleTrainer:: ; 7c2f4 (1f:42f4)
+Music_MeetMaleTrainer::
 	dbw ( $80 | CH0 ), Music_MeetMaleTrainer_Ch1
 	dbw CH1, Music_MeetMaleTrainer_Ch2
 	dbw CH2, Music_MeetMaleTrainer_Ch3
diff --git a/audio/headers/sfxheaders1.asm b/audio/headers/sfxheaders1.asm
index 8a24fcb5..fdbcb5f3 100644
--- a/audio/headers/sfxheaders1.asm
+++ b/audio/headers/sfxheaders1.asm
@@ -1,377 +1,377 @@
 SFX_Headers_1::
 	dbw -1, -1 ; padding
 
-SFX_Snare1_1:: ; 8003 (2:4003)
+SFX_Snare1_1::
 	dbw CH7, SFX_Snare1_1_Ch1
 
-SFX_Snare2_1:: ; 8006 (2:4006)
+SFX_Snare2_1::
 	dbw CH7, SFX_Snare2_1_Ch1
 
-SFX_Snare3_1:: ; 8009 (2:4009)
+SFX_Snare3_1::
 	dbw CH7, SFX_Snare3_1_Ch1
 
-SFX_Snare4_1:: ; 800c (2:400c)
+SFX_Snare4_1::
 	dbw CH7, SFX_Snare4_1_Ch1
 
-SFX_Snare5_1:: ; 800f (2:400f)
+SFX_Snare5_1::
 	dbw CH7, SFX_Snare5_1_Ch1
 
-SFX_Triangle1_1:: ; 8012 (2:4012)
+SFX_Triangle1_1::
 	dbw CH7, SFX_Triangle1_1_Ch1
 
-SFX_Triangle2_1:: ; 8015 (2:4015)
+SFX_Triangle2_1::
 	dbw CH7, SFX_Triangle2_1_Ch1
 
-SFX_Snare6_1:: ; 8018 (2:4018)
+SFX_Snare6_1::
 	dbw CH7, SFX_Snare6_1_Ch1
 
-SFX_Snare7_1:: ; 801b (2:401b)
+SFX_Snare7_1::
 	dbw CH7, SFX_Snare7_1_Ch1
 
-SFX_Snare8_1:: ; 801e (2:401e)
+SFX_Snare8_1::
 	dbw CH7, SFX_Snare8_1_Ch1
 
-SFX_Snare9_1:: ; 8021 (2:4021)
+SFX_Snare9_1::
 	dbw CH7, SFX_Snare9_1_Ch1
 
-SFX_Cymbal1_1:: ; 8024 (2:4024)
+SFX_Cymbal1_1::
 	dbw CH7, SFX_Cymbal1_1_Ch1
 
-SFX_Cymbal2_1:: ; 8027 (2:4027)
+SFX_Cymbal2_1::
 	dbw CH7, SFX_Cymbal2_1_Ch1
 
-SFX_Cymbal3_1:: ; 802a (2:402a)
+SFX_Cymbal3_1::
 	dbw CH7, SFX_Cymbal3_1_Ch1
 
-SFX_Muted_Snare1_1:: ; 802d (2:402d)
+SFX_Muted_Snare1_1::
 	dbw CH7, SFX_Muted_Snare1_1_Ch1
 
-SFX_Triangle3_1:: ; 8030 (2:4030)
+SFX_Triangle3_1::
 	dbw CH7, SFX_Triangle3_1_Ch1
 
-SFX_Muted_Snare2_1:: ; 8033 (2:4033)
+SFX_Muted_Snare2_1::
 	dbw CH7, SFX_Muted_Snare2_1_Ch1
 
-SFX_Muted_Snare3_1:: ; 8036 (2:4036)
+SFX_Muted_Snare3_1::
 	dbw CH7, SFX_Muted_Snare3_1_Ch1
 
-SFX_Muted_Snare4_1:: ; 8039 (2:4039)
+SFX_Muted_Snare4_1::
 	dbw CH7, SFX_Muted_Snare4_1_Ch1
 
-SFX_Cry00_1:: ; 803c (2:403c)
+SFX_Cry00_1::
 	dbw ( $80 | CH4 ), SFX_Cry00_1_Ch1
 	dbw CH5, SFX_Cry00_1_Ch2
 	dbw CH7, SFX_Cry00_1_Ch3
 
-SFX_Cry01_1:: ; 8045 (2:4045)
+SFX_Cry01_1::
 	dbw ( $80 | CH4 ), SFX_Cry01_1_Ch1
 	dbw CH5, SFX_Cry01_1_Ch2
 	dbw CH7, SFX_Cry01_1_Ch3
 
-SFX_Cry02_1:: ; 804e (2:404e)
+SFX_Cry02_1::
 	dbw ( $80 | CH4 ), SFX_Cry02_1_Ch1
 	dbw CH5, SFX_Cry02_1_Ch2
 	dbw CH7, SFX_Cry02_1_Ch3
 
-SFX_Cry03_1:: ; 8057 (2:4057)
+SFX_Cry03_1::
 	dbw ( $80 | CH4 ), SFX_Cry03_1_Ch1
 	dbw CH5, SFX_Cry03_1_Ch2
 	dbw CH7, SFX_Cry03_1_Ch3
 
-SFX_Cry04_1:: ; 8060 (2:4060)
+SFX_Cry04_1::
 	dbw ( $80 | CH4 ), SFX_Cry04_1_Ch1
 	dbw CH5, SFX_Cry04_1_Ch2
 	dbw CH7, SFX_Cry04_1_Ch3
 
-SFX_Cry05_1:: ; 8069 (2:4069)
+SFX_Cry05_1::
 	dbw ( $80 | CH4 ), SFX_Cry05_1_Ch1
 	dbw CH5, SFX_Cry05_1_Ch2
 	dbw CH7, SFX_Cry05_1_Ch3
 
-SFX_Cry06_1:: ; 8072 (2:4072)
+SFX_Cry06_1::
 	dbw ( $80 | CH4 ), SFX_Cry06_1_Ch1
 	dbw CH5, SFX_Cry06_1_Ch2
 	dbw CH7, SFX_Cry06_1_Ch3
 
-SFX_Cry07_1:: ; 807b (2:407b)
+SFX_Cry07_1::
 	dbw ( $80 | CH4 ), SFX_Cry07_1_Ch1
 	dbw CH5, SFX_Cry07_1_Ch2
 	dbw CH7, SFX_Cry07_1_Ch3
 
-SFX_Cry08_1:: ; 8084 (2:4084)
+SFX_Cry08_1::
 	dbw ( $80 | CH4 ), SFX_Cry08_1_Ch1
 	dbw CH5, SFX_Cry08_1_Ch2
 	dbw CH7, SFX_Cry08_1_Ch3
 
-SFX_Cry09_1:: ; 808d (2:408d)
+SFX_Cry09_1::
 	dbw ( $80 | CH4 ), SFX_Cry09_1_Ch1
 	dbw CH5, SFX_Cry09_1_Ch2
 	dbw CH7, SFX_Cry09_1_Ch3
 
-SFX_Cry0A_1:: ; 8096 (2:4096)
+SFX_Cry0A_1::
 	dbw ( $80 | CH4 ), SFX_Cry0A_1_Ch1
 	dbw CH5, SFX_Cry0A_1_Ch2
 	dbw CH7, SFX_Cry0A_1_Ch3
 
-SFX_Cry0B_1:: ; 809f (2:409f)
+SFX_Cry0B_1::
 	dbw ( $80 | CH4 ), SFX_Cry0B_1_Ch1
 	dbw CH5, SFX_Cry0B_1_Ch2
 	dbw CH7, SFX_Cry0B_1_Ch3
 
-SFX_Cry0C_1:: ; 80a8 (2:40a8)
+SFX_Cry0C_1::
 	dbw ( $80 | CH4 ), SFX_Cry0C_1_Ch1
 	dbw CH5, SFX_Cry0C_1_Ch2
 	dbw CH7, SFX_Cry0C_1_Ch3
 
-SFX_Cry0D_1:: ; 80b1 (2:40b1)
+SFX_Cry0D_1::
 	dbw ( $80 | CH4 ), SFX_Cry0D_1_Ch1
 	dbw CH5, SFX_Cry0D_1_Ch2
 	dbw CH7, SFX_Cry0D_1_Ch3
 
-SFX_Cry0E_1:: ; 80ba (2:40ba)
+SFX_Cry0E_1::
 	dbw ( $80 | CH4 ), SFX_Cry0E_1_Ch1
 	dbw CH5, SFX_Cry0E_1_Ch2
 	dbw CH7, SFX_Cry0E_1_Ch3
 
-SFX_Cry0F_1:: ; 80c3 (2:40c3)
+SFX_Cry0F_1::
 	dbw ( $80 | CH4 ), SFX_Cry0F_1_Ch1
 	dbw CH5, SFX_Cry0F_1_Ch2
 	dbw CH7, SFX_Cry0F_1_Ch3
 
-SFX_Cry10_1:: ; 80cc (2:40cc)
+SFX_Cry10_1::
 	dbw ( $80 | CH4 ), SFX_Cry10_1_Ch1
 	dbw CH5, SFX_Cry10_1_Ch2
 	dbw CH7, SFX_Cry10_1_Ch3
 
-SFX_Cry11_1:: ; 80d5 (2:40d5)
+SFX_Cry11_1::
 	dbw ( $80 | CH4 ), SFX_Cry11_1_Ch1
 	dbw CH5, SFX_Cry11_1_Ch2
 	dbw CH7, SFX_Cry11_1_Ch3
 
-SFX_Cry12_1:: ; 80de (2:40de)
+SFX_Cry12_1::
 	dbw ( $80 | CH4 ), SFX_Cry12_1_Ch1
 	dbw CH5, SFX_Cry12_1_Ch2
 	dbw CH7, SFX_Cry12_1_Ch3
 
-SFX_Cry13_1:: ; 80e7 (2:40e7)
+SFX_Cry13_1::
 	dbw ( $80 | CH4 ), SFX_Cry13_1_Ch1
 	dbw CH5, SFX_Cry13_1_Ch2
 	dbw CH7, SFX_Cry13_1_Ch3
 
-SFX_Cry14_1:: ; 80f0 (2:40f0)
+SFX_Cry14_1::
 	dbw ( $80 | CH4 ), SFX_Cry14_1_Ch1
 	dbw CH5, SFX_Cry14_1_Ch2
 	dbw CH7, SFX_Cry14_1_Ch3
 
-SFX_Cry15_1:: ; 80f9 (2:40f9)
+SFX_Cry15_1::
 	dbw ( $80 | CH4 ), SFX_Cry15_1_Ch1
 	dbw CH5, SFX_Cry15_1_Ch2
 	dbw CH7, SFX_Cry15_1_Ch3
 
-SFX_Cry16_1:: ; 8102 (2:4102)
+SFX_Cry16_1::
 	dbw ( $80 | CH4 ), SFX_Cry16_1_Ch1
 	dbw CH5, SFX_Cry16_1_Ch2
 	dbw CH7, SFX_Cry16_1_Ch3
 
-SFX_Cry17_1:: ; 810b (2:410b)
+SFX_Cry17_1::
 	dbw ( $80 | CH4 ), SFX_Cry17_1_Ch1
 	dbw CH5, SFX_Cry17_1_Ch2
 	dbw CH7, SFX_Cry17_1_Ch3
 
-SFX_Cry18_1:: ; 8114 (2:4114)
+SFX_Cry18_1::
 	dbw ( $80 | CH4 ), SFX_Cry18_1_Ch1
 	dbw CH5, SFX_Cry18_1_Ch2
 	dbw CH7, SFX_Cry18_1_Ch3
 
-SFX_Cry19_1:: ; 811d (2:411d)
+SFX_Cry19_1::
 	dbw ( $80 | CH4 ), SFX_Cry19_1_Ch1
 	dbw CH5, SFX_Cry19_1_Ch2
 	dbw CH7, SFX_Cry19_1_Ch3
 
-SFX_Cry1A_1:: ; 8126 (2:4126)
+SFX_Cry1A_1::
 	dbw ( $80 | CH4 ), SFX_Cry1A_1_Ch1
 	dbw CH5, SFX_Cry1A_1_Ch2
 	dbw CH7, SFX_Cry1A_1_Ch3
 
-SFX_Cry1B_1:: ; 812f (2:412f)
+SFX_Cry1B_1::
 	dbw ( $80 | CH4 ), SFX_Cry1B_1_Ch1
 	dbw CH5, SFX_Cry1B_1_Ch2
 	dbw CH7, SFX_Cry1B_1_Ch3
 
-SFX_Cry1C_1:: ; 8138 (2:4138)
+SFX_Cry1C_1::
 	dbw ( $80 | CH4 ), SFX_Cry1C_1_Ch1
 	dbw CH5, SFX_Cry1C_1_Ch2
 	dbw CH7, SFX_Cry1C_1_Ch3
 
-SFX_Cry1D_1:: ; 8141 (2:4141)
+SFX_Cry1D_1::
 	dbw ( $80 | CH4 ), SFX_Cry1D_1_Ch1
 	dbw CH5, SFX_Cry1D_1_Ch2
 	dbw CH7, SFX_Cry1D_1_Ch3
 
-SFX_Cry1E_1:: ; 814a (2:414a)
+SFX_Cry1E_1::
 	dbw ( $80 | CH4 ), SFX_Cry1E_1_Ch1
 	dbw CH5, SFX_Cry1E_1_Ch2
 	dbw CH7, SFX_Cry1E_1_Ch3
 
-SFX_Cry1F_1:: ; 8153 (2:4153)
+SFX_Cry1F_1::
 	dbw ( $80 | CH4 ), SFX_Cry1F_1_Ch1
 	dbw CH5, SFX_Cry1F_1_Ch2
 	dbw CH7, SFX_Cry1F_1_Ch3
 
-SFX_Cry20_1:: ; 815c (2:415c)
+SFX_Cry20_1::
 	dbw ( $80 | CH4 ), SFX_Cry20_1_Ch1
 	dbw CH5, SFX_Cry20_1_Ch2
 	dbw CH7, SFX_Cry20_1_Ch3
 
-SFX_Cry21_1:: ; 8165 (2:4165)
+SFX_Cry21_1::
 	dbw ( $80 | CH4 ), SFX_Cry21_1_Ch1
 	dbw CH5, SFX_Cry21_1_Ch2
 	dbw CH7, SFX_Cry21_1_Ch3
 
-SFX_Cry22_1:: ; 816e (2:416e)
+SFX_Cry22_1::
 	dbw ( $80 | CH4 ), SFX_Cry22_1_Ch1
 	dbw CH5, SFX_Cry22_1_Ch2
 	dbw CH7, SFX_Cry22_1_Ch3
 
-SFX_Cry23_1:: ; 8177 (2:4177)
+SFX_Cry23_1::
 	dbw ( $80 | CH4 ), SFX_Cry23_1_Ch1
 	dbw CH5, SFX_Cry23_1_Ch2
 	dbw CH7, SFX_Cry23_1_Ch3
 
-SFX_Cry24_1:: ; 8180 (2:4180)
+SFX_Cry24_1::
 	dbw ( $80 | CH4 ), SFX_Cry24_1_Ch1
 	dbw CH5, SFX_Cry24_1_Ch2
 	dbw CH7, SFX_Cry24_1_Ch3
 
-SFX_Cry25_1:: ; 8189 (2:4189)
+SFX_Cry25_1::
 	dbw ( $80 | CH4 ), SFX_Cry25_1_Ch1
 	dbw CH5, SFX_Cry25_1_Ch2
 	dbw CH7, SFX_Cry25_1_Ch3
 
-SFX_Get_Item1_1:: ; 8192 (2:4192)
+SFX_Get_Item1_1::
 	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:: ; 819b (2:419b)
+SFX_Get_Item2_1::
 	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:: ; 81a4 (2:41a4)
+SFX_Tink_1::
 	dbw CH4, SFX_Tink_1_Ch1
 
-SFX_Heal_HP_1:: ; 81a7 (2:41a7)
+SFX_Heal_HP_1::
 	dbw CH4, SFX_Heal_HP_1_Ch1
 
-SFX_Heal_Ailment_1:: ; 81aa (2:41aa)
+SFX_Heal_Ailment_1::
 	dbw CH4, SFX_Heal_Ailment_1_Ch1
 
-SFX_Start_Menu_1:: ; 81ad (2:41ad)
+SFX_Start_Menu_1::
 	dbw CH7, SFX_Start_Menu_1_Ch1
 
-SFX_Press_AB_1:: ; 81b0 (2:41b0)
+SFX_Press_AB_1::
 	dbw CH4, SFX_Press_AB_1_Ch1
 
-SFX_Pokedex_Rating_1:: ; 81b3 (2:41b3)
+SFX_Pokedex_Rating_1::
 	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:: ; 81bc (2:41bc)
+SFX_Get_Key_Item_1::
 	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:: ; 81c5 (2:41c5)
+SFX_Poisoned_1::
 	dbw CH4, SFX_Poisoned_1_Ch1
 
-SFX_Trade_Machine_1:: ; 81c8 (2:41c8)
+SFX_Trade_Machine_1::
 	dbw CH4, SFX_Trade_Machine_1_Ch1
 
-SFX_Turn_On_PC_1:: ; 81cb (2:41cb)
+SFX_Turn_On_PC_1::
 	dbw CH4, SFX_Turn_On_PC_1_Ch1
 
-SFX_Turn_Off_PC_1:: ; 81ce (2:41ce)
+SFX_Turn_Off_PC_1::
 	dbw CH4, SFX_Turn_Off_PC_1_Ch1
 
-SFX_Enter_PC_1:: ; 81d1 (2:41d1)
+SFX_Enter_PC_1::
 	dbw CH4, SFX_Enter_PC_1_Ch1
 
-SFX_Shrink_1:: ; 81d4 (2:41d4)
+SFX_Shrink_1::
 	dbw CH4, SFX_Shrink_1_Ch1
 
-SFX_Switch_1:: ; 81d7 (2:41d7)
+SFX_Switch_1::
 	dbw CH4, SFX_Switch_1_Ch1
 
-SFX_Healing_Machine_1:: ; 81da (2:41da)
+SFX_Healing_Machine_1::
 	dbw CH4, SFX_Healing_Machine_1_Ch1
 
-SFX_Teleport_Exit1_1:: ; 81dd (2:41dd)
+SFX_Teleport_Exit1_1::
 	dbw CH4, SFX_Teleport_Exit1_1_Ch1
 
-SFX_Teleport_Enter1_1:: ; 81e0 (2:41e0)
+SFX_Teleport_Enter1_1::
 	dbw CH4, SFX_Teleport_Enter1_1_Ch1
 
-SFX_Teleport_Exit2_1:: ; 81e3 (2:41e3)
+SFX_Teleport_Exit2_1::
 	dbw CH4, SFX_Teleport_Exit2_1_Ch1
 
-SFX_Ledge_1:: ; 81e6 (2:41e6)
+SFX_Ledge_1::
 	dbw CH4, SFX_Ledge_1_Ch1
 
-SFX_Teleport_Enter2_1:: ; 81e9 (2:41e9)
+SFX_Teleport_Enter2_1::
 	dbw CH7, SFX_Teleport_Enter2_1_Ch1
 
-SFX_Fly_1:: ; 81ec (2:41ec)
+SFX_Fly_1::
 	dbw CH7, SFX_Fly_1_Ch1
 
-SFX_Denied_1:: ; 81ef (2:41ef)
+SFX_Denied_1::
 	dbw ( $40 | CH4 ), SFX_Denied_1_Ch1
 	dbw CH5, SFX_Denied_1_Ch2
 
-SFX_Arrow_Tiles_1:: ; 81f5 (2:41f5)
+SFX_Arrow_Tiles_1::
 	dbw CH4, SFX_Arrow_Tiles_1_Ch1
 
-SFX_Push_Boulder_1:: ; 81f8 (2:41f8)
+SFX_Push_Boulder_1::
 	dbw CH7, SFX_Push_Boulder_1_Ch1
 
-SFX_SS_Anne_Horn_1:: ; 81fb (2:41fb)
+SFX_SS_Anne_Horn_1::
 	dbw ( $40 | CH4 ), SFX_SS_Anne_Horn_1_Ch1
 	dbw CH5, SFX_SS_Anne_Horn_1_Ch2
 
-SFX_Withdraw_Deposit_1:: ; 8201 (2:4201)
+SFX_Withdraw_Deposit_1::
 	dbw CH4, SFX_Withdraw_Deposit_1_Ch1
 
-SFX_Cut_1:: ; 8204 (2:4204)
+SFX_Cut_1::
 	dbw CH7, SFX_Cut_1_Ch1
 
-SFX_Go_Inside_1:: ; 8207 (2:4207)
+SFX_Go_Inside_1::
 	dbw CH7, SFX_Go_Inside_1_Ch1
 
-SFX_Swap_1:: ; 820a (2:420a)
+SFX_Swap_1::
 	dbw ( $40 | CH4 ), SFX_Swap_1_Ch1
 	dbw CH5, SFX_Swap_1_Ch2
 
-SFX_59_1:: ; 8210 (2:4210)
+SFX_59_1::
 	dbw ( $40 | CH4 ), SFX_59_1_Ch1
 	dbw CH5, SFX_59_1_Ch2
 
-SFX_Purchase_1:: ; 8216 (2:4216)
+SFX_Purchase_1::
 	dbw ( $40 | CH4 ), SFX_Purchase_1_Ch1
 	dbw CH5, SFX_Purchase_1_Ch2
 
-SFX_Collision_1:: ; 821c (2:421c)
+SFX_Collision_1::
 	dbw CH4, SFX_Collision_1_Ch1
 
-SFX_Go_Outside_1:: ; 821f (2:421f)
+SFX_Go_Outside_1::
 	dbw CH7, SFX_Go_Outside_1_Ch1
 
-SFX_Save_1:: ; 8222 (2:4222)
+SFX_Save_1::
 	dbw ( $40 | CH4 ), SFX_Save_1_Ch1
 	dbw CH5, SFX_Save_1_Ch2
 
-SFX_Pokeflute:: ; 8228 (2:4228)
+SFX_Pokeflute::
 	dbw CH2, SFX_Pokeflute_Ch1
 
-SFX_Safari_Zone_PA:: ; 822b (2:422b)
+SFX_Safari_Zone_PA::
 	dbw CH4, SFX_Safari_Zone_PA_Ch1
diff --git a/audio/headers/sfxheaders2.asm b/audio/headers/sfxheaders2.asm
index ca187a51..2f517d10 100644
--- a/audio/headers/sfxheaders2.asm
+++ b/audio/headers/sfxheaders2.asm
@@ -1,473 +1,473 @@
 SFX_Headers_2::
 	dbw -1, -1 ; padding
 
-SFX_Snare1_2:: ; 20003 (8:4003)
+SFX_Snare1_2::
 	dbw CH7, SFX_Snare1_2_Ch1
 
-SFX_Snare2_2:: ; 20006 (8:4006)
+SFX_Snare2_2::
 	dbw CH7, SFX_Snare2_2_Ch1
 
-SFX_Snare3_2:: ; 20009 (8:4009)
+SFX_Snare3_2::
 	dbw CH7, SFX_Snare3_2_Ch1
 
-SFX_Snare4_2:: ; 2000c (8:400c)
+SFX_Snare4_2::
 	dbw CH7, SFX_Snare4_2_Ch1
 
-SFX_Snare5_2:: ; 2000f (8:400f)
+SFX_Snare5_2::
 	dbw CH7, SFX_Snare5_2_Ch1
 
-SFX_Triangle1_2:: ; 20012 (8:4012)
+SFX_Triangle1_2::
 	dbw CH7, SFX_Triangle1_2_Ch1
 
-SFX_Triangle2_2:: ; 20015 (8:4015)
+SFX_Triangle2_2::
 	dbw CH7, SFX_Triangle2_2_Ch1
 
-SFX_Snare6_2:: ; 20018 (8:4018)
+SFX_Snare6_2::
 	dbw CH7, SFX_Snare6_2_Ch1
 
-SFX_Snare7_2:: ; 2001b (8:401b)
+SFX_Snare7_2::
 	dbw CH7, SFX_Snare7_2_Ch1
 
-SFX_Snare8_2:: ; 2001e (8:401e)
+SFX_Snare8_2::
 	dbw CH7, SFX_Snare8_2_Ch1
 
-SFX_Snare9_2:: ; 20021 (8:4021)
+SFX_Snare9_2::
 	dbw CH7, SFX_Snare9_2_Ch1
 
-SFX_Cymbal1_2:: ; 20024 (8:4024)
+SFX_Cymbal1_2::
 	dbw CH7, SFX_Cymbal1_2_Ch1
 
-SFX_Cymbal2_2:: ; 20027 (8:4027)
+SFX_Cymbal2_2::
 	dbw CH7, SFX_Cymbal2_2_Ch1
 
-SFX_Cymbal3_2:: ; 2002a (8:402a)
+SFX_Cymbal3_2::
 	dbw CH7, SFX_Cymbal3_2_Ch1
 
-SFX_Muted_Snare1_2:: ; 2002d (8:402d)
+SFX_Muted_Snare1_2::
 	dbw CH7, SFX_Muted_Snare1_2_Ch1
 
-SFX_Triangle3_2:: ; 20030 (8:4030)
+SFX_Triangle3_2::
 	dbw CH7, SFX_Triangle3_2_Ch1
 
-SFX_Muted_Snare2_2:: ; 20033 (8:4033)
+SFX_Muted_Snare2_2::
 	dbw CH7, SFX_Muted_Snare2_2_Ch1
 
-SFX_Muted_Snare3_2:: ; 20036 (8:4036)
+SFX_Muted_Snare3_2::
 	dbw CH7, SFX_Muted_Snare3_2_Ch1
 
-SFX_Muted_Snare4_2:: ; 20039 (8:4039)
+SFX_Muted_Snare4_2::
 	dbw CH7, SFX_Muted_Snare4_2_Ch1
 
-SFX_Cry00_2:: ; 2003c (8:403c)
+SFX_Cry00_2::
 	dbw ( $80 | CH4 ), SFX_Cry00_2_Ch1
 	dbw CH5, SFX_Cry00_2_Ch2
 	dbw CH7, SFX_Cry00_2_Ch3
 
-SFX_Cry01_2:: ; 20045 (8:4045)
+SFX_Cry01_2::
 	dbw ( $80 | CH4 ), SFX_Cry01_2_Ch1
 	dbw CH5, SFX_Cry01_2_Ch2
 	dbw CH7, SFX_Cry01_2_Ch3
 
-SFX_Cry02_2:: ; 2004e (8:404e)
+SFX_Cry02_2::
 	dbw ( $80 | CH4 ), SFX_Cry02_2_Ch1
 	dbw CH5, SFX_Cry02_2_Ch2
 	dbw CH7, SFX_Cry02_2_Ch3
 
-SFX_Cry03_2:: ; 20057 (8:4057)
+SFX_Cry03_2::
 	dbw ( $80 | CH4 ), SFX_Cry03_2_Ch1
 	dbw CH5, SFX_Cry03_2_Ch2
 	dbw CH7, SFX_Cry03_2_Ch3
 
-SFX_Cry04_2:: ; 20060 (8:4060)
+SFX_Cry04_2::
 	dbw ( $80 | CH4 ), SFX_Cry04_2_Ch1
 	dbw CH5, SFX_Cry04_2_Ch2
 	dbw CH7, SFX_Cry04_2_Ch3
 
-SFX_Cry05_2:: ; 20069 (8:4069)
+SFX_Cry05_2::
 	dbw ( $80 | CH4 ), SFX_Cry05_2_Ch1
 	dbw CH5, SFX_Cry05_2_Ch2
 	dbw CH7, SFX_Cry05_2_Ch3
 
-SFX_Cry06_2:: ; 20072 (8:4072)
+SFX_Cry06_2::
 	dbw ( $80 | CH4 ), SFX_Cry06_2_Ch1
 	dbw CH5, SFX_Cry06_2_Ch2
 	dbw CH7, SFX_Cry06_2_Ch3
 
-SFX_Cry07_2:: ; 2007b (8:407b)
+SFX_Cry07_2::
 	dbw ( $80 | CH4 ), SFX_Cry07_2_Ch1
 	dbw CH5, SFX_Cry07_2_Ch2
 	dbw CH7, SFX_Cry07_2_Ch3
 
-SFX_Cry08_2:: ; 20084 (8:4084)
+SFX_Cry08_2::
 	dbw ( $80 | CH4 ), SFX_Cry08_2_Ch1
 	dbw CH5, SFX_Cry08_2_Ch2
 	dbw CH7, SFX_Cry08_2_Ch3
 
-SFX_Cry09_2:: ; 2008d (8:408d)
+SFX_Cry09_2::
 	dbw ( $80 | CH4 ), SFX_Cry09_2_Ch1
 	dbw CH5, SFX_Cry09_2_Ch2
 	dbw CH7, SFX_Cry09_2_Ch3
 
-SFX_Cry0A_2:: ; 20096 (8:4096)
+SFX_Cry0A_2::
 	dbw ( $80 | CH4 ), SFX_Cry0A_2_Ch1
 	dbw CH5, SFX_Cry0A_2_Ch2
 	dbw CH7, SFX_Cry0A_2_Ch3
 
-SFX_Cry0B_2:: ; 2009f (8:409f)
+SFX_Cry0B_2::
 	dbw ( $80 | CH4 ), SFX_Cry0B_2_Ch1
 	dbw CH5, SFX_Cry0B_2_Ch2
 	dbw CH7, SFX_Cry0B_2_Ch3
 
-SFX_Cry0C_2:: ; 200a8 (8:40a8)
+SFX_Cry0C_2::
 	dbw ( $80 | CH4 ), SFX_Cry0C_2_Ch1
 	dbw CH5, SFX_Cry0C_2_Ch2
 	dbw CH7, SFX_Cry0C_2_Ch3
 
-SFX_Cry0D_2:: ; 200b1 (8:40b1)
+SFX_Cry0D_2::
 	dbw ( $80 | CH4 ), SFX_Cry0D_2_Ch1
 	dbw CH5, SFX_Cry0D_2_Ch2
 	dbw CH7, SFX_Cry0D_2_Ch3
 
-SFX_Cry0E_2:: ; 200ba (8:40ba)
+SFX_Cry0E_2::
 	dbw ( $80 | CH4 ), SFX_Cry0E_2_Ch1
 	dbw CH5, SFX_Cry0E_2_Ch2
 	dbw CH7, SFX_Cry0E_2_Ch3
 
-SFX_Cry0F_2:: ; 200c3 (8:40c3)
+SFX_Cry0F_2::
 	dbw ( $80 | CH4 ), SFX_Cry0F_2_Ch1
 	dbw CH5, SFX_Cry0F_2_Ch2
 	dbw CH7, SFX_Cry0F_2_Ch3
 
-SFX_Cry10_2:: ; 200cc (8:40cc)
+SFX_Cry10_2::
 	dbw ( $80 | CH4 ), SFX_Cry10_2_Ch1
 	dbw CH5, SFX_Cry10_2_Ch2
 	dbw CH7, SFX_Cry10_2_Ch3
 
-SFX_Cry11_2:: ; 200d5 (8:40d5)
+SFX_Cry11_2::
 	dbw ( $80 | CH4 ), SFX_Cry11_2_Ch1
 	dbw CH5, SFX_Cry11_2_Ch2
 	dbw CH7, SFX_Cry11_2_Ch3
 
-SFX_Cry12_2:: ; 200de (8:40de)
+SFX_Cry12_2::
 	dbw ( $80 | CH4 ), SFX_Cry12_2_Ch1
 	dbw CH5, SFX_Cry12_2_Ch2
 	dbw CH7, SFX_Cry12_2_Ch3
 
-SFX_Cry13_2:: ; 200e7 (8:40e7)
+SFX_Cry13_2::
 	dbw ( $80 | CH4 ), SFX_Cry13_2_Ch1
 	dbw CH5, SFX_Cry13_2_Ch2
 	dbw CH7, SFX_Cry13_2_Ch3
 
-SFX_Cry14_2:: ; 200f0 (8:40f0)
+SFX_Cry14_2::
 	dbw ( $80 | CH4 ), SFX_Cry14_2_Ch1
 	dbw CH5, SFX_Cry14_2_Ch2
 	dbw CH7, SFX_Cry14_2_Ch3
 
-SFX_Cry15_2:: ; 200f9 (8:40f9)
+SFX_Cry15_2::
 	dbw ( $80 | CH4 ), SFX_Cry15_2_Ch1
 	dbw CH5, SFX_Cry15_2_Ch2
 	dbw CH7, SFX_Cry15_2_Ch3
 
-SFX_Cry16_2:: ; 20102 (8:4102)
+SFX_Cry16_2::
 	dbw ( $80 | CH4 ), SFX_Cry16_2_Ch1
 	dbw CH5, SFX_Cry16_2_Ch2
 	dbw CH7, SFX_Cry16_2_Ch3
 
-SFX_Cry17_2:: ; 2010b (8:410b)
+SFX_Cry17_2::
 	dbw ( $80 | CH4 ), SFX_Cry17_2_Ch1
 	dbw CH5, SFX_Cry17_2_Ch2
 	dbw CH7, SFX_Cry17_2_Ch3
 
-SFX_Cry18_2:: ; 20114 (8:4114)
+SFX_Cry18_2::
 	dbw ( $80 | CH4 ), SFX_Cry18_2_Ch1
 	dbw CH5, SFX_Cry18_2_Ch2
 	dbw CH7, SFX_Cry18_2_Ch3
 
-SFX_Cry19_2:: ; 2011d (8:411d)
+SFX_Cry19_2::
 	dbw ( $80 | CH4 ), SFX_Cry19_2_Ch1
 	dbw CH5, SFX_Cry19_2_Ch2
 	dbw CH7, SFX_Cry19_2_Ch3
 
-SFX_Cry1A_2:: ; 20126 (8:4126)
+SFX_Cry1A_2::
 	dbw ( $80 | CH4 ), SFX_Cry1A_2_Ch1
 	dbw CH5, SFX_Cry1A_2_Ch2
 	dbw CH7, SFX_Cry1A_2_Ch3
 
-SFX_Cry1B_2:: ; 2012f (8:412f)
+SFX_Cry1B_2::
 	dbw ( $80 | CH4 ), SFX_Cry1B_2_Ch1
 	dbw CH5, SFX_Cry1B_2_Ch2
 	dbw CH7, SFX_Cry1B_2_Ch3
 
-SFX_Cry1C_2:: ; 20138 (8:4138)
+SFX_Cry1C_2::
 	dbw ( $80 | CH4 ), SFX_Cry1C_2_Ch1
 	dbw CH5, SFX_Cry1C_2_Ch2
 	dbw CH7, SFX_Cry1C_2_Ch3
 
-SFX_Cry1D_2:: ; 20141 (8:4141)
+SFX_Cry1D_2::
 	dbw ( $80 | CH4 ), SFX_Cry1D_2_Ch1
 	dbw CH5, SFX_Cry1D_2_Ch2
 	dbw CH7, SFX_Cry1D_2_Ch3
 
-SFX_Cry1E_2:: ; 2014a (8:414a)
+SFX_Cry1E_2::
 	dbw ( $80 | CH4 ), SFX_Cry1E_2_Ch1
 	dbw CH5, SFX_Cry1E_2_Ch2
 	dbw CH7, SFX_Cry1E_2_Ch3
 
-SFX_Cry1F_2:: ; 20153 (8:4153)
+SFX_Cry1F_2::
 	dbw ( $80 | CH4 ), SFX_Cry1F_2_Ch1
 	dbw CH5, SFX_Cry1F_2_Ch2
 	dbw CH7, SFX_Cry1F_2_Ch3
 
-SFX_Cry20_2:: ; 2015c (8:415c)
+SFX_Cry20_2::
 	dbw ( $80 | CH4 ), SFX_Cry20_2_Ch1
 	dbw CH5, SFX_Cry20_2_Ch2
 	dbw CH7, SFX_Cry20_2_Ch3
 
-SFX_Cry21_2:: ; 20165 (8:4165)
+SFX_Cry21_2::
 	dbw ( $80 | CH4 ), SFX_Cry21_2_Ch1
 	dbw CH5, SFX_Cry21_2_Ch2
 	dbw CH7, SFX_Cry21_2_Ch3
 
-SFX_Cry22_2:: ; 2016e (8:416e)
+SFX_Cry22_2::
 	dbw ( $80 | CH4 ), SFX_Cry22_2_Ch1
 	dbw CH5, SFX_Cry22_2_Ch2
 	dbw CH7, SFX_Cry22_2_Ch3
 
-SFX_Cry23_2:: ; 20177 (8:4177)
+SFX_Cry23_2::
 	dbw ( $80 | CH4 ), SFX_Cry23_2_Ch1
 	dbw CH5, SFX_Cry23_2_Ch2
 	dbw CH7, SFX_Cry23_2_Ch3
 
-SFX_Cry24_2:: ; 20180 (8:4180)
+SFX_Cry24_2::
 	dbw ( $80 | CH4 ), SFX_Cry24_2_Ch1
 	dbw CH5, SFX_Cry24_2_Ch2
 	dbw CH7, SFX_Cry24_2_Ch3
 
-SFX_Cry25_2:: ; 20189 (8:4189)
+SFX_Cry25_2::
 	dbw ( $80 | CH4 ), SFX_Cry25_2_Ch1
 	dbw CH5, SFX_Cry25_2_Ch2
 	dbw CH7, SFX_Cry25_2_Ch3
 
-SFX_Level_Up:: ; 20192 (8:4192)
+SFX_Level_Up::
 	dbw ( $80 | CH4 ), SFX_Level_Up_Ch1
 	dbw CH5, SFX_Level_Up_Ch2
 	dbw CH6, SFX_Level_Up_Ch3
 
-SFX_Get_Item2_2:: ; 2019b (8:419b)
+SFX_Get_Item2_2::
 	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:: ; 201a4 (8:41a4)
+SFX_Tink_2::
 	dbw CH4, SFX_Tink_2_Ch1
 
-SFX_Heal_HP_2:: ; 201a7 (8:41a7)
+SFX_Heal_HP_2::
 	dbw CH4, SFX_Heal_HP_2_Ch1
 
-SFX_Heal_Ailment_2:: ; 201aa (8:41aa)
+SFX_Heal_Ailment_2::
 	dbw CH4, SFX_Heal_Ailment_2_Ch1
 
-SFX_Start_Menu_2:: ; 201ad (8:41ad)
+SFX_Start_Menu_2::
 	dbw CH7, SFX_Start_Menu_2_Ch1
 
-SFX_Press_AB_2:: ; 201b0 (8:41b0)
+SFX_Press_AB_2::
 	dbw CH4, SFX_Press_AB_2_Ch1
 
-SFX_Ball_Toss:: ; 201b3 (8:41b3)
+SFX_Ball_Toss::
 	dbw ( $40 | CH4 ), SFX_Ball_Toss_Ch1
 	dbw CH5, SFX_Ball_Toss_Ch2
 
-SFX_Ball_Poof:: ; 201b9 (8:41b9)
+SFX_Ball_Poof::
 	dbw ( $40 | CH4 ), SFX_Ball_Poof_Ch1
 	dbw CH7, SFX_Ball_Poof_Ch2
 
-SFX_Faint_Thud:: ; 201bf (8:41bf)
+SFX_Faint_Thud::
 	dbw ( $40 | CH4 ), SFX_Faint_Thud_Ch1
 	dbw CH7, SFX_Faint_Thud_Ch2
 
-SFX_Run:: ; 201c5 (8:41c5)
+SFX_Run::
 	dbw CH7, SFX_Run_Ch1
 
-SFX_Dex_Page_Added:: ; 201c8 (8:41c8)
+SFX_Dex_Page_Added::
 	dbw ( $40 | CH4 ), SFX_Dex_Page_Added_Ch1
 	dbw CH5, SFX_Dex_Page_Added_Ch2
 
-SFX_Caught_Mon:: ; 201ce (8:41ce)
+SFX_Caught_Mon::
 	dbw ( $80 | CH4 ), SFX_Caught_Mon_Ch1
 	dbw CH5, SFX_Caught_Mon_Ch2
 	dbw CH6, SFX_Caught_Mon_Ch3
 
-SFX_Peck:: ; 201d7 (8:41d7)
+SFX_Peck::
 	dbw CH7, SFX_Peck_Ch1
 
-SFX_Faint_Fall:: ; 201da (8:41da)
+SFX_Faint_Fall::
 	dbw CH4, SFX_Faint_Fall_Ch1
 
-SFX_Battle_09:: ; 201dd (8:41dd)
+SFX_Battle_09::
 	dbw CH4, SFX_Battle_09_Ch1
 
-SFX_Pound:: ; 201e0 (8:41e0)
+SFX_Pound::
 	dbw CH7, SFX_Pound_Ch1
 
-SFX_Battle_0B:: ; 201e3 (8:41e3)
+SFX_Battle_0B::
 	dbw CH7, SFX_Battle_0B_Ch1
 
-SFX_Battle_0C:: ; 201e6 (8:41e6)
+SFX_Battle_0C::
 	dbw CH7, SFX_Battle_0C_Ch1
 
-SFX_Battle_0D:: ; 201e9 (8:41e9)
+SFX_Battle_0D::
 	dbw CH7, SFX_Battle_0D_Ch1
 
-SFX_Battle_0E:: ; 201ec (8:41ec)
+SFX_Battle_0E::
 	dbw CH7, SFX_Battle_0E_Ch1
 
-SFX_Battle_0F:: ; 201ef (8:41ef)
+SFX_Battle_0F::
 	dbw CH7, SFX_Battle_0F_Ch1
 
-SFX_Damage:: ; 201f2 (8:41f2)
+SFX_Damage::
 	dbw CH7, SFX_Damage_Ch1
 
-SFX_Not_Very_Effective:: ; 201f5 (8:41f5)
+SFX_Not_Very_Effective::
 	dbw CH7, SFX_Not_Very_Effective_Ch1
 
-SFX_Battle_12:: ; 201f8 (8:41f8)
+SFX_Battle_12::
 	dbw CH7, SFX_Battle_12_Ch1
 
-SFX_Battle_13:: ; 201fb (8:41fb)
+SFX_Battle_13::
 	dbw CH7, SFX_Battle_13_Ch1
 
-SFX_Battle_14:: ; 201fe (8:41fe)
+SFX_Battle_14::
 	dbw CH7, SFX_Battle_14_Ch1
 
-SFX_Vine_Whip:: ; 20201 (8:4201)
+SFX_Vine_Whip::
 	dbw CH7, SFX_Vine_Whip_Ch1
 
-SFX_Battle_16:: ; 20204 (8:4204)
+SFX_Battle_16::
 	dbw CH7, SFX_Battle_16_Ch1
 
-SFX_Battle_17:: ; 20207 (8:4207)
+SFX_Battle_17::
 	dbw CH7, SFX_Battle_17_Ch1
 
-SFX_Battle_18:: ; 2020a (8:420a)
+SFX_Battle_18::
 	dbw CH7, SFX_Battle_18_Ch1
 
-SFX_Battle_19:: ; 2020d (8:420d)
+SFX_Battle_19::
 	dbw CH7, SFX_Battle_19_Ch1
 
-SFX_Super_Effective:: ; 20210 (8:4210)
+SFX_Super_Effective::
 	dbw CH7, SFX_Super_Effective_Ch1
 
-SFX_Battle_1B:: ; 20213 (8:4213)
+SFX_Battle_1B::
 	dbw CH7, SFX_Battle_1B_Ch1
 
-SFX_Battle_1C:: ; 20216 (8:4216)
+SFX_Battle_1C::
 	dbw CH7, SFX_Battle_1C_Ch1
 
-SFX_Doubleslap:: ; 20219 (8:4219)
+SFX_Doubleslap::
 	dbw CH7, SFX_Doubleslap_Ch1
 
-SFX_Battle_1E:: ; 2021c (8:421c)
+SFX_Battle_1E::
 	dbw ( $40 | CH4 ), SFX_Battle_1E_Ch1
 	dbw CH7, SFX_Battle_1E_Ch2
 
-SFX_Horn_Drill:: ; 20222 (8:4222)
+SFX_Horn_Drill::
 	dbw CH7, SFX_Horn_Drill_Ch1
 
-SFX_Battle_20:: ; 20225 (8:4225)
+SFX_Battle_20::
 	dbw CH7, SFX_Battle_20_Ch1
 
-SFX_Battle_21:: ; 20228 (8:4228)
+SFX_Battle_21::
 	dbw CH7, SFX_Battle_21_Ch1
 
-SFX_Battle_22:: ; 2022b (8:422b)
+SFX_Battle_22::
 	dbw CH7, SFX_Battle_22_Ch1
 
-SFX_Battle_23:: ; 2022e (8:422e)
+SFX_Battle_23::
 	dbw CH7, SFX_Battle_23_Ch1
 
-SFX_Battle_24:: ; 20231 (8:4231)
+SFX_Battle_24::
 	dbw ( $40 | CH4 ), SFX_Battle_24_Ch1
 	dbw CH7, SFX_Battle_24_Ch2
 
-SFX_Battle_25:: ; 20237 (8:4237)
+SFX_Battle_25::
 	dbw CH7, SFX_Battle_25_Ch1
 
-SFX_Battle_26:: ; 2023a (8:423a)
+SFX_Battle_26::
 	dbw CH7, SFX_Battle_26_Ch1
 
-SFX_Battle_27:: ; 2023d (8:423d)
+SFX_Battle_27::
 	dbw ( $80 | CH4 ), SFX_Battle_27_Ch1
 	dbw CH5, SFX_Battle_27_Ch2
 	dbw CH7, SFX_Battle_27_Ch3
 
-SFX_Battle_28:: ; 20246 (8:4246)
+SFX_Battle_28::
 	dbw ( $80 | CH4 ), SFX_Battle_28_Ch1
 	dbw CH5, SFX_Battle_28_Ch2
 	dbw CH7, SFX_Battle_28_Ch3
 
-SFX_Earthquake:: ; 2024f (8:424f)
+SFX_Earthquake::
 	dbw ( $40 | CH4 ), SFX_Earthquake_Ch1
 	dbw CH7, SFX_Earthquake_Ch2
 
-SFX_Battle_2A:: ; 20255 (8:4255)
+SFX_Battle_2A::
 	dbw ( $80 | CH4 ), SFX_Battle_2A_Ch1
 	dbw CH5, SFX_Battle_2A_Ch2
 	dbw CH7, SFX_Battle_2A_Ch3
 
-SFX_Battle_2B:: ; 2025e (8:425e)
+SFX_Battle_2B::
 	dbw ( $40 | CH4 ), SFX_Battle_2B_Ch1
 	dbw CH7, SFX_Battle_2B_Ch2
 
-SFX_Battle_2C:: ; 20264 (8:4264)
+SFX_Battle_2C::
 	dbw ( $80 | CH4 ), SFX_Battle_2C_Ch1
 	dbw CH5, SFX_Battle_2C_Ch2
 	dbw CH7, SFX_Battle_2C_Ch3
 
-SFX_Psybeam:: ; 2026d (8:426d)
+SFX_Psybeam::
 	dbw ( $80 | CH4 ), SFX_Psybeam_Ch1
 	dbw CH5, SFX_Psybeam_Ch2
 	dbw CH7, SFX_Psybeam_Ch3
 
-SFX_Battle_2E:: ; 20276 (8:4276)
+SFX_Battle_2E::
 	dbw ( $80 | CH4 ), SFX_Battle_2E_Ch1
 	dbw CH5, SFX_Battle_2E_Ch2
 	dbw CH7, SFX_Battle_2E_Ch3
 
-SFX_Thunderbolt:: ; 2027f (8:427f)
+SFX_Thunderbolt::
 	dbw ( $80 | CH4 ), SFX_Thunderbolt_Ch1
 	dbw CH5, SFX_Thunderbolt_Ch2
 	dbw CH7, SFX_Thunderbolt_Ch3
 
-SFX_Psychic_M:: ; 20288 (8:4288)
+SFX_Psychic_M::
 	dbw ( $80 | CH4 ), SFX_Psychic_M_Ch1
 	dbw CH5, SFX_Psychic_M_Ch2
 	dbw CH7, SFX_Psychic_M_Ch3
 
-SFX_Battle_31:: ; 20291 (8:4291)
+SFX_Battle_31::
 	dbw ( $40 | CH4 ), SFX_Battle_31_Ch1
 	dbw CH5, SFX_Battle_31_Ch2
 
-SFX_Battle_32:: ; 20297 (8:4297)
+SFX_Battle_32::
 	dbw ( $40 | CH4 ), SFX_Battle_32_Ch1
 	dbw CH5, SFX_Battle_32_Ch2
 
-SFX_Battle_33:: ; 2029d (8:429d)
+SFX_Battle_33::
 	dbw ( $40 | CH4 ), SFX_Battle_33_Ch1
 	dbw CH5, SFX_Battle_33_Ch2
 
-SFX_Battle_34:: ; 202a3 (8:42a3)
+SFX_Battle_34::
 	dbw ( $80 | CH4 ), SFX_Battle_34_Ch1
 	dbw CH5, SFX_Battle_34_Ch2
 	dbw CH7, SFX_Battle_34_Ch3
 
-SFX_Battle_35:: ; 202ac (8:42ac)
+SFX_Battle_35::
 	dbw ( $40 | CH4 ), SFX_Battle_35_Ch1
 	dbw CH5, SFX_Battle_35_Ch2
 
-SFX_Battle_36:: ; 202b2 (8:42b2)
+SFX_Battle_36::
 	dbw ( $80 | CH4 ), SFX_Battle_36_Ch1
 	dbw CH5, SFX_Battle_36_Ch2
 	dbw CH7, SFX_Battle_36_Ch3
 
-SFX_Silph_Scope:: ; 202bb (8:42bb)
+SFX_Silph_Scope::
 	dbw CH4, SFX_Silph_Scope_Ch1
diff --git a/audio/headers/sfxheaders3.asm b/audio/headers/sfxheaders3.asm
index 8328d6c7..cd940357 100644
--- a/audio/headers/sfxheaders3.asm
+++ b/audio/headers/sfxheaders3.asm
@@ -1,402 +1,402 @@
 SFX_Headers_3::
 	dbw -1, -1 ; padding
 
-SFX_Snare1_3:: ; 7c003 (1f:4003)
+SFX_Snare1_3::
 	dbw CH7, SFX_Snare1_3_Ch1
 
-SFX_Snare2_3:: ; 7c006 (1f:4006)
+SFX_Snare2_3::
 	dbw CH7, SFX_Snare2_3_Ch1
 
-SFX_Snare3_3:: ; 7c009 (1f:4009)
+SFX_Snare3_3::
 	dbw CH7, SFX_Snare3_3_Ch1
 
-SFX_Snare4_3:: ; 7c00c (1f:400c)
+SFX_Snare4_3::
 	dbw CH7, SFX_Snare4_3_Ch1
 
-SFX_Snare5_3:: ; 7c00f (1f:400f)
+SFX_Snare5_3::
 	dbw CH7, SFX_Snare5_3_Ch1
 
-SFX_Triangle1_3:: ; 7c012 (1f:4012)
+SFX_Triangle1_3::
 	dbw CH7, SFX_Triangle1_3_Ch1
 
-SFX_Triangle2_3:: ; 7c015 (1f:4015)
+SFX_Triangle2_3::
 	dbw CH7, SFX_Triangle2_3_Ch1
 
-SFX_Snare6_3:: ; 7c018 (1f:4018)
+SFX_Snare6_3::
 	dbw CH7, SFX_Snare6_3_Ch1
 
-SFX_Snare7_3:: ; 7c01b (1f:401b)
+SFX_Snare7_3::
 	dbw CH7, SFX_Snare7_3_Ch1
 
-SFX_Snare8_3:: ; 7c01e (1f:401e)
+SFX_Snare8_3::
 	dbw CH7, SFX_Snare8_3_Ch1
 
-SFX_Snare9_3:: ; 7c021 (1f:4021)
+SFX_Snare9_3::
 	dbw CH7, SFX_Snare9_3_Ch1
 
-SFX_Cymbal1_3:: ; 7c024 (1f:4024)
+SFX_Cymbal1_3::
 	dbw CH7, SFX_Cymbal1_3_Ch1
 
-SFX_Cymbal2_3:: ; 7c027 (1f:4027)
+SFX_Cymbal2_3::
 	dbw CH7, SFX_Cymbal2_3_Ch1
 
-SFX_Cymbal3_3:: ; 7c02a (1f:402a)
+SFX_Cymbal3_3::
 	dbw CH7, SFX_Cymbal3_3_Ch1
 
-SFX_Muted_Snare1_3:: ; 7c02d (1f:402d)
+SFX_Muted_Snare1_3::
 	dbw CH7, SFX_Muted_Snare1_3_Ch1
 
-SFX_Triangle3_3:: ; 7c030 (1f:4030)
+SFX_Triangle3_3::
 	dbw CH7, SFX_Triangle3_3_Ch1
 
-SFX_Muted_Snare2_3:: ; 7c033 (1f:4033)
+SFX_Muted_Snare2_3::
 	dbw CH7, SFX_Muted_Snare2_3_Ch1
 
-SFX_Muted_Snare3_3:: ; 7c036 (1f:4036)
+SFX_Muted_Snare3_3::
 	dbw CH7, SFX_Muted_Snare3_3_Ch1
 
-SFX_Muted_Snare4_3:: ; 7c039 (1f:4039)
+SFX_Muted_Snare4_3::
 	dbw CH7, SFX_Muted_Snare4_3_Ch1
 
-SFX_Cry00_3:: ; 7c03c (1f:403c)
+SFX_Cry00_3::
 	dbw ( $80 | CH4 ), SFX_Cry00_3_Ch1
 	dbw CH5, SFX_Cry00_3_Ch2
 	dbw CH7, SFX_Cry00_3_Ch3
 
-SFX_Cry01_3:: ; 7c045 (1f:4045)
+SFX_Cry01_3::
 	dbw ( $80 | CH4 ), SFX_Cry01_3_Ch1
 	dbw CH5, SFX_Cry01_3_Ch2
 	dbw CH7, SFX_Cry01_3_Ch3
 
-SFX_Cry02_3:: ; 7c04e (1f:404e)
+SFX_Cry02_3::
 	dbw ( $80 | CH4 ), SFX_Cry02_3_Ch1
 	dbw CH5, SFX_Cry02_3_Ch2
 	dbw CH7, SFX_Cry02_3_Ch3
 
-SFX_Cry03_3:: ; 7c057 (1f:4057)
+SFX_Cry03_3::
 	dbw ( $80 | CH4 ), SFX_Cry03_3_Ch1
 	dbw CH5, SFX_Cry03_3_Ch2
 	dbw CH7, SFX_Cry03_3_Ch3
 
-SFX_Cry04_3:: ; 7c060 (1f:4060)
+SFX_Cry04_3::
 	dbw ( $80 | CH4 ), SFX_Cry04_3_Ch1
 	dbw CH5, SFX_Cry04_3_Ch2
 	dbw CH7, SFX_Cry04_3_Ch3
 
-SFX_Cry05_3:: ; 7c069 (1f:4069)
+SFX_Cry05_3::
 	dbw ( $80 | CH4 ), SFX_Cry05_3_Ch1
 	dbw CH5, SFX_Cry05_3_Ch2
 	dbw CH7, SFX_Cry05_3_Ch3
 
-SFX_Cry06_3:: ; 7c072 (1f:4072)
+SFX_Cry06_3::
 	dbw ( $80 | CH4 ), SFX_Cry06_3_Ch1
 	dbw CH5, SFX_Cry06_3_Ch2
 	dbw CH7, SFX_Cry06_3_Ch3
 
-SFX_Cry07_3:: ; 7c07b (1f:407b)
+SFX_Cry07_3::
 	dbw ( $80 | CH4 ), SFX_Cry07_3_Ch1
 	dbw CH5, SFX_Cry07_3_Ch2
 	dbw CH7, SFX_Cry07_3_Ch3
 
-SFX_Cry08_3:: ; 7c084 (1f:4084)
+SFX_Cry08_3::
 	dbw ( $80 | CH4 ), SFX_Cry08_3_Ch1
 	dbw CH5, SFX_Cry08_3_Ch2
 	dbw CH7, SFX_Cry08_3_Ch3
 
-SFX_Cry09_3:: ; 7c08d (1f:408d)
+SFX_Cry09_3::
 	dbw ( $80 | CH4 ), SFX_Cry09_3_Ch1
 	dbw CH5, SFX_Cry09_3_Ch2
 	dbw CH7, SFX_Cry09_3_Ch3
 
-SFX_Cry0A_3:: ; 7c096 (1f:4096)
+SFX_Cry0A_3::
 	dbw ( $80 | CH4 ), SFX_Cry0A_3_Ch1
 	dbw CH5, SFX_Cry0A_3_Ch2
 	dbw CH7, SFX_Cry0A_3_Ch3
 
-SFX_Cry0B_3:: ; 7c09f (1f:409f)
+SFX_Cry0B_3::
 	dbw ( $80 | CH4 ), SFX_Cry0B_3_Ch1
 	dbw CH5, SFX_Cry0B_3_Ch2
 	dbw CH7, SFX_Cry0B_3_Ch3
 
-SFX_Cry0C_3:: ; 7c0a8 (1f:40a8)
+SFX_Cry0C_3::
 	dbw ( $80 | CH4 ), SFX_Cry0C_3_Ch1
 	dbw CH5, SFX_Cry0C_3_Ch2
 	dbw CH7, SFX_Cry0C_3_Ch3
 
-SFX_Cry0D_3:: ; 7c0b1 (1f:40b1)
+SFX_Cry0D_3::
 	dbw ( $80 | CH4 ), SFX_Cry0D_3_Ch1
 	dbw CH5, SFX_Cry0D_3_Ch2
 	dbw CH7, SFX_Cry0D_3_Ch3
 
-SFX_Cry0E_3:: ; 7c0ba (1f:40ba)
+SFX_Cry0E_3::
 	dbw ( $80 | CH4 ), SFX_Cry0E_3_Ch1
 	dbw CH5, SFX_Cry0E_3_Ch2
 	dbw CH7, SFX_Cry0E_3_Ch3
 
-SFX_Cry0F_3:: ; 7c0c3 (1f:40c3)
+SFX_Cry0F_3::
 	dbw ( $80 | CH4 ), SFX_Cry0F_3_Ch1
 	dbw CH5, SFX_Cry0F_3_Ch2
 	dbw CH7, SFX_Cry0F_3_Ch3
 
-SFX_Cry10_3:: ; 7c0cc (1f:40cc)
+SFX_Cry10_3::
 	dbw ( $80 | CH4 ), SFX_Cry10_3_Ch1
 	dbw CH5, SFX_Cry10_3_Ch2
 	dbw CH7, SFX_Cry10_3_Ch3
 
-SFX_Cry11_3:: ; 7c0d5 (1f:40d5)
+SFX_Cry11_3::
 	dbw ( $80 | CH4 ), SFX_Cry11_3_Ch1
 	dbw CH5, SFX_Cry11_3_Ch2
 	dbw CH7, SFX_Cry11_3_Ch3
 
-SFX_Cry12_3:: ; 7c0de (1f:40de)
+SFX_Cry12_3::
 	dbw ( $80 | CH4 ), SFX_Cry12_3_Ch1
 	dbw CH5, SFX_Cry12_3_Ch2
 	dbw CH7, SFX_Cry12_3_Ch3
 
-SFX_Cry13_3:: ; 7c0e7 (1f:40e7)
+SFX_Cry13_3::
 	dbw ( $80 | CH4 ), SFX_Cry13_3_Ch1
 	dbw CH5, SFX_Cry13_3_Ch2
 	dbw CH7, SFX_Cry13_3_Ch3
 
-SFX_Cry14_3:: ; 7c0f0 (1f:40f0)
+SFX_Cry14_3::
 	dbw ( $80 | CH4 ), SFX_Cry14_3_Ch1
 	dbw CH5, SFX_Cry14_3_Ch2
 	dbw CH7, SFX_Cry14_3_Ch3
 
-SFX_Cry15_3:: ; 7c0f9 (1f:40f9)
+SFX_Cry15_3::
 	dbw ( $80 | CH4 ), SFX_Cry15_3_Ch1
 	dbw CH5, SFX_Cry15_3_Ch2
 	dbw CH7, SFX_Cry15_3_Ch3
 
-SFX_Cry16_3:: ; 7c102 (1f:4102)
+SFX_Cry16_3::
 	dbw ( $80 | CH4 ), SFX_Cry16_3_Ch1
 	dbw CH5, SFX_Cry16_3_Ch2
 	dbw CH7, SFX_Cry16_3_Ch3
 
-SFX_Cry17_3:: ; 7c10b (1f:410b)
+SFX_Cry17_3::
 	dbw ( $80 | CH4 ), SFX_Cry17_3_Ch1
 	dbw CH5, SFX_Cry17_3_Ch2
 	dbw CH7, SFX_Cry17_3_Ch3
 
-SFX_Cry18_3:: ; 7c114 (1f:4114)
+SFX_Cry18_3::
 	dbw ( $80 | CH4 ), SFX_Cry18_3_Ch1
 	dbw CH5, SFX_Cry18_3_Ch2
 	dbw CH7, SFX_Cry18_3_Ch3
 
-SFX_Cry19_3:: ; 7c11d (1f:411d)
+SFX_Cry19_3::
 	dbw ( $80 | CH4 ), SFX_Cry19_3_Ch1
 	dbw CH5, SFX_Cry19_3_Ch2
 	dbw CH7, SFX_Cry19_3_Ch3
 
-SFX_Cry1A_3:: ; 7c126 (1f:4126)
+SFX_Cry1A_3::
 	dbw ( $80 | CH4 ), SFX_Cry1A_3_Ch1
 	dbw CH5, SFX_Cry1A_3_Ch2
 	dbw CH7, SFX_Cry1A_3_Ch3
 
-SFX_Cry1B_3:: ; 7c12f (1f:412f)
+SFX_Cry1B_3::
 	dbw ( $80 | CH4 ), SFX_Cry1B_3_Ch1
 	dbw CH5, SFX_Cry1B_3_Ch2
 	dbw CH7, SFX_Cry1B_3_Ch3
 
-SFX_Cry1C_3:: ; 7c138 (1f:4138)
+SFX_Cry1C_3::
 	dbw ( $80 | CH4 ), SFX_Cry1C_3_Ch1
 	dbw CH5, SFX_Cry1C_3_Ch2
 	dbw CH7, SFX_Cry1C_3_Ch3
 
-SFX_Cry1D_3:: ; 7c141 (1f:4141)
+SFX_Cry1D_3::
 	dbw ( $80 | CH4 ), SFX_Cry1D_3_Ch1
 	dbw CH5, SFX_Cry1D_3_Ch2
 	dbw CH7, SFX_Cry1D_3_Ch3
 
-SFX_Cry1E_3:: ; 7c14a (1f:414a)
+SFX_Cry1E_3::
 	dbw ( $80 | CH4 ), SFX_Cry1E_3_Ch1
 	dbw CH5, SFX_Cry1E_3_Ch2
 	dbw CH7, SFX_Cry1E_3_Ch3
 
-SFX_Cry1F_3:: ; 7c153 (1f:4153)
+SFX_Cry1F_3::
 	dbw ( $80 | CH4 ), SFX_Cry1F_3_Ch1
 	dbw CH5, SFX_Cry1F_3_Ch2
 	dbw CH7, SFX_Cry1F_3_Ch3
 
-SFX_Cry20_3:: ; 7c15c (1f:415c)
+SFX_Cry20_3::
 	dbw ( $80 | CH4 ), SFX_Cry20_3_Ch1
 	dbw CH5, SFX_Cry20_3_Ch2
 	dbw CH7, SFX_Cry20_3_Ch3
 
-SFX_Cry21_3:: ; 7c165 (1f:4165)
+SFX_Cry21_3::
 	dbw ( $80 | CH4 ), SFX_Cry21_3_Ch1
 	dbw CH5, SFX_Cry21_3_Ch2
 	dbw CH7, SFX_Cry21_3_Ch3
 
-SFX_Cry22_3:: ; 7c16e (1f:416e)
+SFX_Cry22_3::
 	dbw ( $80 | CH4 ), SFX_Cry22_3_Ch1
 	dbw CH5, SFX_Cry22_3_Ch2
 	dbw CH7, SFX_Cry22_3_Ch3
 
-SFX_Cry23_3:: ; 7c177 (1f:4177)
+SFX_Cry23_3::
 	dbw ( $80 | CH4 ), SFX_Cry23_3_Ch1
 	dbw CH5, SFX_Cry23_3_Ch2
 	dbw CH7, SFX_Cry23_3_Ch3
 
-SFX_Cry24_3:: ; 7c180 (1f:4180)
+SFX_Cry24_3::
 	dbw ( $80 | CH4 ), SFX_Cry24_3_Ch1
 	dbw CH5, SFX_Cry24_3_Ch2
 	dbw CH7, SFX_Cry24_3_Ch3
 
-SFX_Cry25_3:: ; 7c189 (1f:4189)
+SFX_Cry25_3::
 	dbw ( $80 | CH4 ), SFX_Cry25_3_Ch1
 	dbw CH5, SFX_Cry25_3_Ch2
 	dbw CH7, SFX_Cry25_3_Ch3
 
-SFX_Get_Item1_3:: ; 7c192 (1f:4192)
+SFX_Get_Item1_3::
 	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:: ; 7c19b (1f:419b)
+SFX_Get_Item2_3::
 	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:: ; 7c1a4 (1f:41a4)
+SFX_Tink_3::
 	dbw CH4, SFX_Tink_3_Ch1
 
-SFX_Heal_HP_3:: ; 7c1a7 (1f:41a7)
+SFX_Heal_HP_3::
 	dbw CH4, SFX_Heal_HP_3_Ch1
 
-SFX_Heal_Ailment_3:: ; 7c1aa (1f:41aa)
+SFX_Heal_Ailment_3::
 	dbw CH4, SFX_Heal_Ailment_3_Ch1
 
-SFX_Start_Menu_3:: ; 7c1ad (1f:41ad)
+SFX_Start_Menu_3::
 	dbw CH7, SFX_Start_Menu_3_Ch1
 
-SFX_Press_AB_3:: ; 7c1b0 (1f:41b0)
+SFX_Press_AB_3::
 	dbw CH4, SFX_Press_AB_3_Ch1
 
-SFX_Pokedex_Rating_3:: ; 7c1b3 (1f:41b3)
+SFX_Pokedex_Rating_3::
 	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:: ; 7c1bc (1f:41bc)
+SFX_Get_Key_Item_3::
 	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:: ; 7c1c5 (1f:41c5)
+SFX_Poisoned_3::
 	dbw CH4, SFX_Poisoned_3_Ch1
 
-SFX_Trade_Machine_3:: ; 7c1c8 (1f:41c8)
+SFX_Trade_Machine_3::
 	dbw CH4, SFX_Trade_Machine_3_Ch1
 
-SFX_Turn_On_PC_3:: ; 7c1cb (1f:41cb)
+SFX_Turn_On_PC_3::
 	dbw CH4, SFX_Turn_On_PC_3_Ch1
 
-SFX_Turn_Off_PC_3:: ; 7c1ce (1f:41ce)
+SFX_Turn_Off_PC_3::
 	dbw CH4, SFX_Turn_Off_PC_3_Ch1
 
-SFX_Enter_PC_3:: ; 7c1d1 (1f:41d1)
+SFX_Enter_PC_3::
 	dbw CH4, SFX_Enter_PC_3_Ch1
 
-SFX_Shrink_3:: ; 7c1d4 (1f:41d4)
+SFX_Shrink_3::
 	dbw CH4, SFX_Shrink_3_Ch1
 
-SFX_Switch_3:: ; 7c1d7 (1f:41d7)
+SFX_Switch_3::
 	dbw CH4, SFX_Switch_3_Ch1
 
-SFX_Healing_Machine_3:: ; 7c1da (1f:41da)
+SFX_Healing_Machine_3::
 	dbw CH4, SFX_Healing_Machine_3_Ch1
 
-SFX_Teleport_Exit1_3:: ; 7c1dd (1f:41dd)
+SFX_Teleport_Exit1_3::
 	dbw CH4, SFX_Teleport_Exit1_3_Ch1
 
-SFX_Teleport_Enter1_3:: ; 7c1e0 (1f:41e0)
+SFX_Teleport_Enter1_3::
 	dbw CH4, SFX_Teleport_Enter1_3_Ch1
 
-SFX_Teleport_Exit2_3:: ; 7c1e3 (1f:41e3)
+SFX_Teleport_Exit2_3::
 	dbw CH4, SFX_Teleport_Exit2_3_Ch1
 
-SFX_Ledge_3:: ; 7c1e6 (1f:41e6)
+SFX_Ledge_3::
 	dbw CH4, SFX_Ledge_3_Ch1
 
-SFX_Teleport_Enter2_3:: ; 7c1e9 (1f:41e9)
+SFX_Teleport_Enter2_3::
 	dbw CH7, SFX_Teleport_Enter2_3_Ch1
 
-SFX_Fly_3:: ; 7c1ec (1f:41ec)
+SFX_Fly_3::
 	dbw CH7, SFX_Fly_3_Ch1
 
-SFX_Denied_3:: ; 7c1ef (1f:41ef)
+SFX_Denied_3::
 	dbw ( $40 | CH4 ), SFX_Denied_3_Ch1
 	dbw CH5, SFX_Denied_3_Ch2
 
-SFX_Arrow_Tiles_3:: ; 7c1f5 (1f:41f5)
+SFX_Arrow_Tiles_3::
 	dbw CH4, SFX_Arrow_Tiles_3_Ch1
 
-SFX_Push_Boulder_3:: ; 7c1f8 (1f:41f8)
+SFX_Push_Boulder_3::
 	dbw CH7, SFX_Push_Boulder_3_Ch1
 
-SFX_SS_Anne_Horn_3:: ; 7c1fb (1f:41fb)
+SFX_SS_Anne_Horn_3::
 	dbw ( $40 | CH4 ), SFX_SS_Anne_Horn_3_Ch1
 	dbw CH5, SFX_SS_Anne_Horn_3_Ch2
 
-SFX_Withdraw_Deposit_3:: ; 7c201 (1f:4201)
+SFX_Withdraw_Deposit_3::
 	dbw CH4, SFX_Withdraw_Deposit_3_Ch1
 
-SFX_Cut_3:: ; 7c204 (1f:4204)
+SFX_Cut_3::
 	dbw CH7, SFX_Cut_3_Ch1
 
-SFX_Go_Inside_3:: ; 7c207 (1f:4207)
+SFX_Go_Inside_3::
 	dbw CH7, SFX_Go_Inside_3_Ch1
 
-SFX_Swap_3:: ; 7c20a (1f:420a)
+SFX_Swap_3::
 	dbw ( $40 | CH4 ), SFX_Swap_3_Ch1
 	dbw CH5, SFX_Swap_3_Ch2
 
-SFX_59_3:: ; 7c210 (1f:4210)
+SFX_59_3::
 	dbw ( $40 | CH4 ), SFX_59_3_Ch1
 	dbw CH5, SFX_59_3_Ch2
 
-SFX_Purchase_3:: ; 7c216 (1f:4216)
+SFX_Purchase_3::
 	dbw ( $40 | CH4 ), SFX_Purchase_3_Ch1
 	dbw CH5, SFX_Purchase_3_Ch2
 
-SFX_Collision_3:: ; 7c21c (1f:421c)
+SFX_Collision_3::
 	dbw CH4, SFX_Collision_3_Ch1
 
-SFX_Go_Outside_3:: ; 7c21f (1f:421f)
+SFX_Go_Outside_3::
 	dbw CH7, SFX_Go_Outside_3_Ch1
 
-SFX_Save_3:: ; 7c222 (1f:4222)
+SFX_Save_3::
 	dbw ( $40 | CH4 ), SFX_Save_3_Ch1
 	dbw CH5, SFX_Save_3_Ch2
 
-SFX_Intro_Lunge:: ; 7c228 (1f:4228)
+SFX_Intro_Lunge::
 	dbw CH7, SFX_Intro_Lunge_Ch1
 
-SFX_Intro_Hip:: ; 7c22b (1f:422b)
+SFX_Intro_Hip::
 	dbw CH4, SFX_Intro_Hip_Ch1
 
-SFX_Intro_Hop:: ; 7c22e (1f:422e)
+SFX_Intro_Hop::
 	dbw CH4, SFX_Intro_Hop_Ch1
 
-SFX_Intro_Raise:: ; 7c231 (1f:4231)
+SFX_Intro_Raise::
 	dbw CH7, SFX_Intro_Raise_Ch1
 
-SFX_Intro_Crash:: ; 7c234 (1f:4234)
+SFX_Intro_Crash::
 	dbw CH7, SFX_Intro_Crash_Ch1
 
-SFX_Intro_Whoosh:: ; 7c237 (1f:4237)
+SFX_Intro_Whoosh::
 	dbw CH7, SFX_Intro_Whoosh_Ch1
 
-SFX_Slots_Stop_Wheel:: ; 7c23a (1f:423a)
+SFX_Slots_Stop_Wheel::
 	dbw CH4, SFX_Slots_Stop_Wheel_Ch1
 
-SFX_Slots_Reward:: ; 7c23d (1f:423d)
+SFX_Slots_Reward::
 	dbw CH4, SFX_Slots_Reward_Ch1
 
-SFX_Slots_New_Spin:: ; 7c240 (1f:4240)
+SFX_Slots_New_Spin::
 	dbw ( $40 | CH4 ), SFX_Slots_New_Spin_Ch1
 	dbw CH5, SFX_Slots_New_Spin_Ch2
 
-SFX_Shooting_Star:: ; 7c246 (1f:4246)
+SFX_Shooting_Star::
 	dbw CH4, SFX_Shooting_Star_Ch1
diff --git a/audio/headers/sfxheaders4.asm b/audio/headers/sfxheaders4.asm
index bb60c5bd..16e69e1f 100644
--- a/audio/headers/sfxheaders4.asm
+++ b/audio/headers/sfxheaders4.asm
@@ -1,294 +1,294 @@
-SFX_Headers_4:: ; 80000 (20:4000)
+SFX_Headers_4::
 	dbw -1, -1 ; padding
 
-SFX_Snare1_4:: ; 80003 (20:4003)
+SFX_Snare1_4::
 	dbw CH7, SFX_Snare1_4_Ch7
 
-SFX_Snare2_4:: ; 80006 (20:4006)
+SFX_Snare2_4::
 	dbw CH7, SFX_Snare2_4_Ch7
 
-SFX_Snare3_4:: ; 80009 (20:4009)
+SFX_Snare3_4::
 	dbw CH7, SFX_Snare3_4_Ch7
 
-SFX_Snare4_4:: ; 8000c (20:400c)
+SFX_Snare4_4::
 	dbw CH7, SFX_Snare4_4_Ch7
 
-SFX_Snare5_4:: ; 8000f (20:400f)
+SFX_Snare5_4::
 	dbw CH7, SFX_Snare5_4_Ch7
 
-SFX_Triangle1_4:: ; 80012 (20:4012)
+SFX_Triangle1_4::
 	dbw CH7, SFX_Triangle1_4_Ch7
 
-SFX_Triangle2_4:: ; 80015 (20:4015)
+SFX_Triangle2_4::
 	dbw CH7, SFX_Triangle2_4_Ch7
 
-SFX_Snare6_4:: ; 80018 (20:4018)
+SFX_Snare6_4::
 	dbw CH7, SFX_Snare6_4_Ch7
 
-SFX_Snare7_4:: ; 8001b (20:401b)
+SFX_Snare7_4::
 	dbw CH7, SFX_Snare7_4_Ch7
 
-SFX_Snare8_4:: ; 8001e (20:401e)
+SFX_Snare8_4::
 	dbw CH7, SFX_Snare8_4_Ch7
 
-SFX_Snare9_4:: ; 80021 (20:4021)
+SFX_Snare9_4::
 	dbw CH7, SFX_Snare9_4_Ch7
 
-SFX_Cymbal1_4:: ; 80024 (20:4024)
+SFX_Cymbal1_4::
 	dbw CH7, SFX_Cymbal1_4_Ch7
 
-SFX_Cymbal2_4:: ; 80027 (20:4027)
+SFX_Cymbal2_4::
 	dbw CH7, SFX_Cymbal2_4_Ch7
 
-SFX_Cymbal3_4:: ; 8002a (20:402a)
+SFX_Cymbal3_4::
 	dbw CH7, SFX_Cymbal3_4_Ch7
 
-SFX_Muted_Snare1_4:: ; 8002d (20:402d)
+SFX_Muted_Snare1_4::
 	dbw CH7, SFX_Muted_Snare1_4_Ch7
 
-SFX_Triangle3_4:: ; 80030 (20:4030)
+SFX_Triangle3_4::
 	dbw CH7, SFX_Triangle3_4_Ch7
 
-SFX_Muted_Snare2_4:: ; 80033 (20:4033)
+SFX_Muted_Snare2_4::
 	dbw CH7, SFX_Muted_Snare2_4_Ch7
 
-SFX_Muted_Snare3_4:: ; 80036 (20:4036)
+SFX_Muted_Snare3_4::
 	dbw CH7, SFX_Muted_Snare3_4_Ch7
 
-SFX_Muted_Snare4_4:: ; 80039 (20:4039)
+SFX_Muted_Snare4_4::
 	dbw CH7, SFX_Muted_Snare4_4_Ch7
 
-SFX_8003c_4:: ; 8003c (20:403c)
+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:: ; 80045 (20:4045)
+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:: ; 8004e (20:404e)
+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:: ; 80057 (20:4057)
+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:: ; 80060 (20:4060)
+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:: ; 80069 (20:4069)
+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:: ; 80072 (20:4072)
+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:: ; 8007b (20:407b)
+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:: ; 80084 (20:4084)
+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:: ; 8008d (20:408d)
+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:: ; 80096 (20:4096)
+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:: ; 8009f (20:409f)
+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:: ; 800a8 (20:40a8)
+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:: ; 800b1 (20:40b1)
+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:: ; 800ba (20:40ba)
+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:: ; 800c3 (20:40c3)
+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:: ; 800cc (20:40cc)
+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:: ; 800d5 (20:40d5)
+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:: ; 800de (20:40de)
+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:: ; 800e7 (20:40e7)
+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:: ; 800f0 (20:40f0)
+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:: ; 800f9 (20:40f9)
+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:: ; 80102 (20:4102)
+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:: ; 8010b (20:410b)
+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:: ; 80114 (20:4114)
+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:: ; 8011d (20:411d)
+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:: ; 80126 (20:4126)
+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:: ; 8012f (20:412f)
+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:: ; 80138 (20:4138)
+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:: ; 80141 (20:4141)
+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:: ; 8014a (20:414a)
+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:: ; 80153 (20:4153)
+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:: ; 8015c (20:415c)
+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:: ; 80165 (20:4165)
+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:: ; 8016e (20:416e)
+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:: ; 80177 (20:4177)
+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:: ; 80180 (20:4180)
+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:: ; 80189 (20:4189)
+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:: ; 80192 (20:4192)
+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:: ; 8019b (20:419b)
+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:: ; 801a4 (20:41a4)
+SFX_Tink_4::
 	dbw CH4, SFX_8028e_4_Ch4
 
-SFX_Heal_Ailment_4:: ; 801a7 (20:41a7)
+SFX_Heal_Ailment_4::
 	dbw CH4, SFX_8027f_4_Ch4
 
-SFX_Start_Menu_4:: ; 801aa (20:41aa)
+SFX_Start_Menu_4::
 	dbw CH4, SFX_8026a_4_Ch4
 
-SFX_PressAB_4:: ; 801ad (20:41ad)
+SFX_PressAB_4::
 	dbw CH7, SFX_80263_4_Ch7
 
-SFX_801b0_4:: ; 801b0 (20:41b0)
+SFX_801b0_4::
 	dbw CH4, SFX_80250_4_Ch4
 
-SFX_801b3_4:: ; 801b3 (20:41b3)
+SFX_801b3_4::
 	dbw CH7, SFX_8029f_4_Ch7
 
-SFX_801b6_4:: ; 801b6 (20:41b6)
+SFX_801b6_4::
 	dbw CH4, SFX_802b5_4_Ch4
 
-SFX_801b9_4:: ; 801b9 (20:41b9)
+SFX_801b9_4::
 	dbw CH7, SFX_802e1_4_Ch7
 
-SFX_801bc_4:: ; 801bc (20:41bc)
+SFX_801bc_4::
 	dbw CH4, SFX_802cc_4_Ch4
 
-SFX_801bf_4:: ; 801bf (20:41bf)
+SFX_801bf_4::
 	dbw CH7, SFX_802d7_4_Ch7
 
-SFX_Get_Item2_4_2:: ; 801c2 (20:41c2)
+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