Sync music2 labels with music1

and remove audio address comments
2026-10-02 13:57:11 -05:00 · 2022-05-19 20:13:20 -05:00
parent f62bd2dbfa
commit 26d057db59
127 changed files with 679 additions and 679 deletions
--- a/src/audio/music/boosterpack.asm
+++ b/src/audio/music/boosterpack.asm
@@ -1,4 +1,4 @@
-Music_BoosterPack_Ch1: ; f7d60 (3d:7d60)
+Music_BoosterPack_Ch1:
 	stereo_panning 1, 1
 	vibrato_type 1
 	vibrato_delay 20
@@ -43,7 +43,7 @@ Music_BoosterPack_Ch1: ; f7d60 (3d:7d60)
 	music_end


-Music_BoosterPack_Ch2: ; f7d9e (3d:7d9e)
+Music_BoosterPack_Ch2:
 	stereo_panning 1, 1
 	vibrato_type 1
 	vibrato_delay 20
@@ -87,7 +87,7 @@ Music_BoosterPack_Ch2: ; f7d9e (3d:7d9e)
 	music_end


-Music_BoosterPack_Ch3: ; f7ddb (3d:7ddb)
+Music_BoosterPack_Ch3:
 	stereo_panning 1, 1
 	wave 1
 	volume 32
--- a/src/audio/music/cardpop.asm
+++ b/src/audio/music/cardpop.asm
@@ -1,4 +1,4 @@
-Music_CardPop_Ch1: ; f703a (3d:703a)
+Music_CardPop_Ch1:
 	speed 4
 	stereo_panning 1, 1
 	cutoff 8
@@ -119,7 +119,7 @@ Music_CardPop_Ch1: ; f703a (3d:703a)
 	EndMainLoop


-Music_CardPop_Ch2: ; f70df (3d:70df)
+Music_CardPop_Ch2:
 	speed 4
 	stereo_panning 1, 1
 	cutoff 8
@@ -205,7 +205,7 @@ Music_CardPop_Ch2: ; f70df (3d:70df)
 	EndMainLoop


-Music_CardPop_Ch3: ; f713a (3d:713a)
+Music_CardPop_Ch3:
 	speed 4
 	wave 1
 	stereo_panning 1, 1
@@ -265,7 +265,7 @@ Branch_f716c:
 	music_ret


-Music_CardPop_Ch4: ; f717d (3d:717d)
+Music_CardPop_Ch4:
 	speed 4
 	octave 1
 	Loop 11
--- a/src/audio/music/challengehall.asm
+++ b/src/audio/music/challengehall.asm
@@ -1,4 +1,4 @@
-Music_ChallengeHall_Ch1: ; f9646 (3e:5646)
+Music_ChallengeHall_Ch1:
 	stereo_panning 1, 1
 	vibrato_type 8
 	vibrato_delay 15
@@ -400,7 +400,7 @@ Branch_f9848:
 	music_ret


-Music_ChallengeHall_Ch2: ; f9883 (3e:5883)
+Music_ChallengeHall_Ch2:
 	stereo_panning 1, 1
 	vibrato_type 8
 	vibrato_delay 15
@@ -771,7 +771,7 @@ Branch_f9a28:
 	music_ret


-Music_ChallengeHall_Ch3: ; f9a92 (3e:5a92)
+Music_ChallengeHall_Ch3:
 	stereo_panning 1, 1
 	volume 32
 	wave 1
@@ -1030,7 +1030,7 @@ Branch_f9b92:
 	music_ret


-Music_ChallengeHall_Ch4: ; f9ba9 (3e:5ba9)
+Music_ChallengeHall_Ch4:
 	speed 1
 	speed 10
 	Loop 2
--- a/src/audio/music/club1.asm
+++ b/src/audio/music/club1.asm
@@ -1,4 +1,4 @@
-Music_Club1_Ch1: ; f9be5 (3e:5be5)
+Music_Club1_Ch1:
 	speed 5
 	stereo_panning 1, 1
 	vibrato_type 8
@@ -289,7 +289,7 @@ Music_Club1_Ch1: ; f9be5 (3e:5be5)
 	EndMainLoop


-Music_Club1_Ch2: ; f9d5f (3e:5d5f)
+Music_Club1_Ch2:
 	speed 5
 	stereo_panning 1, 1
 	vibrato_type 8
@@ -571,7 +571,7 @@ Music_Club1_Ch2: ; f9d5f (3e:5d5f)
 	EndMainLoop


-Music_Club1_Ch3: ; f9ec4 (3e:5ec4)
+Music_Club1_Ch3:
 	speed 5
 	stereo_panning 1, 1
 	volume 32
@@ -870,7 +870,7 @@ Branch_fa01a:
 	music_ret


-Music_Club1_Ch4: ; fa044 (3e:6044)
+Music_Club1_Ch4:
 	speed 5
 	octave 1
 	bass 2
--- a/src/audio/music/club2.asm
+++ b/src/audio/music/club2.asm
@@ -1,4 +1,4 @@
-Music_Club2_Ch1: ; fa077 (3e:6077)
+Music_Club2_Ch1:
 	speed 6
 	duty 2
 	stereo_panning 1, 1
@@ -92,7 +92,7 @@ Music_Club2_Ch1: ; fa077 (3e:6077)
 	EndMainLoop


-Music_Club2_Ch2: ; fa0e3 (3e:60e3)
+Music_Club2_Ch2:
 	speed 6
 	duty 2
 	stereo_panning 1, 1
@@ -206,7 +206,7 @@ Music_Club2_Ch2: ; fa0e3 (3e:60e3)
 	EndMainLoop


-Music_Club2_Ch3: ; fa164 (3e:6164)
+Music_Club2_Ch3:
 	speed 6
 	volume 32
 	stereo_panning 1, 1
--- a/src/audio/music/club3.asm
+++ b/src/audio/music/club3.asm
@@ -1,4 +1,4 @@
-Music_Club3_Ch1: ; fa210 (3e:6210)
+Music_Club3_Ch1:
 	speed 9
 	stereo_panning 1, 1
 	vibrato_type 5
@@ -432,7 +432,7 @@ Branch_fa403:
 	music_ret


-Music_Club3_Ch2: ; fa423 (3e:6423)
+Music_Club3_Ch2:
 	speed 9
 	stereo_panning 1, 1
 	vibrato_type 5
@@ -798,7 +798,7 @@ Branch_fa5a6:
 	music_ret


-Music_Club3_Ch3: ; fa63e (3e:663e)
+Music_Club3_Ch3:
 	speed 9
 	stereo_panning 1, 1
 	volume 32
@@ -1062,7 +1062,7 @@ Music_Club3_Ch3: ; fa63e (3e:663e)
 	EndMainLoop


-Music_Club3_Ch4: ; fa772 (3e:6772)
+Music_Club3_Ch4:
 	speed 9
 	octave 1
 	MainLoop
--- a/src/audio/music/credits.asm
+++ b/src/audio/music/credits.asm
@@ -1,4 +1,4 @@
-Music_Credits_Ch1: ; fb1fe (3e:71fe)
+Music_Credits_Ch1:
 	speed 13
 	stereo_panning 1, 1
 	vibrato_type 1
@@ -849,7 +849,7 @@ Branch_fb651:
 	music_ret


-Music_Credits_Ch2: ; fb68a (3e:768a)
+Music_Credits_Ch2:
 	stereo_panning 1, 1
 	vibrato_type 1
 	vibrato_delay 20
@@ -1790,7 +1790,7 @@ Branch_fbb10:
 	music_ret


-Music_Credits_Ch3: ; fbb9d (3e:7b9d)
+Music_Credits_Ch3:
 	speed 1
 	stereo_panning 1, 1
 	volume 32
@@ -2301,7 +2301,7 @@ Branch_fbe3d:
 	music_ret


-Music_Credits_Ch4: ; fbe51 (3e:7e51)
+Music_Credits_Ch4:
 	speed 1
 	octave 1
 	Loop 8
--- a/src/audio/music/deckmachine.asm
+++ b/src/audio/music/deckmachine.asm
@@ -1,4 +1,4 @@
-Music_DeckMachine_Ch1: ; f6ef1 (3d:6ef1)
+Music_DeckMachine_Ch1:
 	stereo_panning 1, 1
 	cutoff 8
 	duty 3
@@ -53,7 +53,7 @@ Music_DeckMachine_Ch1: ; f6ef1 (3d:6ef1)
 	EndMainLoop


-Music_DeckMachine_Ch2: ; f6f41 (3d:6f41)
+Music_DeckMachine_Ch2:
 	stereo_panning 1, 1
 	cutoff 8
 	duty 1
@@ -97,7 +97,7 @@ Music_DeckMachine_Ch2: ; f6f41 (3d:6f41)
 	EndMainLoop


-Music_DeckMachine_Ch3: ; f6f7b (3d:6f7b)
+Music_DeckMachine_Ch3:
 	stereo_panning 1, 1
 	volume 32
 	wave 1
@@ -224,7 +224,7 @@ Music_DeckMachine_Ch3: ; f6f7b (3d:6f7b)
 	EndMainLoop


-Music_DeckMachine_Ch4: ; f7018 (3d:7018)
+Music_DeckMachine_Ch4:
 	speed 1
 	octave 1
 	MainLoop
--- a/src/audio/music/dueltheme1.asm
+++ b/src/audio/music/dueltheme1.asm
@@ -1,4 +1,4 @@
-Music_DuelTheme1_Ch1: ; f532a (3d:532a)
+Music_DuelTheme1_Ch1:
 	speed 7
 	stereo_panning 1, 1
 	vibrato_type 8
@@ -509,7 +509,7 @@ Branch_f5580:
 	music_ret


-Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7)
+Music_DuelTheme1_Ch2:
 	speed 7
 	stereo_panning 1, 1
 	vibrato_type 8
@@ -1319,7 +1319,7 @@ Branch_f5a17:
 	music_ret


-Music_DuelTheme1_Ch3: ; f5a32 (3d:5a32)
+Music_DuelTheme1_Ch3:
 	speed 7
 	stereo_panning 1, 1
 	volume 32
@@ -1832,7 +1832,7 @@ Branch_f5c7e:
 	music_ret


-Music_DuelTheme1_Ch4: ; f5c9a (3d:5c9a)
+Music_DuelTheme1_Ch4:
 	speed 7
 	octave 1
 	MainLoop
--- a/src/audio/music/dueltheme2.asm
+++ b/src/audio/music/dueltheme2.asm
@@ -1,4 +1,4 @@
-Music_DuelTheme2_Ch1: ; f5d68 (3d:5d68)
+Music_DuelTheme2_Ch1:
 	speed 9
 	stereo_panning 1, 1
 	vibrato_type 8
@@ -429,7 +429,7 @@ Branch_f5f90:
 	music_ret


-Music_DuelTheme2_Ch2: ; f5fad (3d:5fad)
+Music_DuelTheme2_Ch2:
 	speed 9
 	stereo_panning 1, 1
 	vibrato_type 8
@@ -841,7 +841,7 @@ Branch_f618f:
 	music_ret


-Music_DuelTheme2_Ch3: ; f61ac (3d:61ac)
+Music_DuelTheme2_Ch3:
 	speed 9
 	stereo_panning 1, 1
 	volume 32
@@ -1099,7 +1099,7 @@ Branch_f62e5:
 	music_ret


-Music_DuelTheme2_Ch4: ; f62f3 (3d:62f3)
+Music_DuelTheme2_Ch4:
 	speed 9
 	Loop 2
 	rest 12
--- a/src/audio/music/dueltheme3.asm
+++ b/src/audio/music/dueltheme3.asm
@@ -1,4 +1,4 @@
-Music_DuelTheme3_Ch1: ; f63a1 (3d:63a1)
+Music_DuelTheme3_Ch1:
 	speed 11
 	stereo_panning 1, 1
 	vibrato_type 8
@@ -473,7 +473,7 @@ Branch_f661d:
 	music_ret


-Music_DuelTheme3_Ch2: ; f6649 (3d:6649)
+Music_DuelTheme3_Ch2:
 	speed 11
 	stereo_panning 1, 1
 	vibrato_type 8
@@ -907,7 +907,7 @@ Branch_f6866:
 	music_ret


-Music_DuelTheme3_Ch3: ; f68c2 (3d:68c2)
+Music_DuelTheme3_Ch3:
 	speed 11
 	stereo_panning 1, 1
 	volume 32
@@ -1218,7 +1218,7 @@ Branch_f69f0:
 	music_ret


-Music_DuelTheme3_Ch4: ; f6a3f (3d:6a3f)
+Music_DuelTheme3_Ch4:
 	speed 11
 	MainLoop
 	Loop 2
--- a/src/audio/music/hallofhonor.asm
+++ b/src/audio/music/hallofhonor.asm
@@ -1,4 +1,4 @@
-Music_HallOfHonor_Ch1: ; fafea (3e:6fea)
+Music_HallOfHonor_Ch1:
 	speed 7
 	stereo_panning 1, 1
 	cutoff 8
@@ -92,7 +92,7 @@ Branch_fb044:
 	music_ret


-Music_HallOfHonor_Ch2: ; fb06e (3e:706e)
+Music_HallOfHonor_Ch2:
 	speed 7
 	stereo_panning 1, 1
 	cutoff 8
@@ -170,7 +170,7 @@ Branch_fb0bb:
 	music_ret


-Music_HallOfHonor_Ch3: ; fb0d5 (3e:70d5)
+Music_HallOfHonor_Ch3:
 	speed 7
 	volume 64
 	stereo_panning 1, 1
--- a/src/audio/music/imakuni.asm
+++ b/src/audio/music/imakuni.asm
@@ -1,4 +1,4 @@
-Music_Imakuni_Ch1: ; fad55 (3e:6d55)
+Music_Imakuni_Ch1:
 	speed 3
 	stereo_panning 1, 1
 	vibrato_type 5
@@ -185,7 +185,7 @@ Branch_fae1d:
 	music_ret


-Music_Imakuni_Ch2: ; fae32 (3e:6e32)
+Music_Imakuni_Ch2:
 	stereo_panning 1, 1
 	vibrato_type 0
 	vibrato_delay 0
@@ -291,7 +291,7 @@ Branch_faea5:
 	music_ret


-Music_Imakuni_Ch3: ; faebc (3e:6ebc)
+Music_Imakuni_Ch3:
 	stereo_panning 1, 1
 	volume 32
 	wave 1
@@ -472,7 +472,7 @@ Branch_faf7d:
 	music_ret


-Music_Imakuni_Ch4: ; fafa4 (3e:6fa4)
+Music_Imakuni_Ch4:
 	speed 1
 	octave 1
 	Loop 10
--- a/src/audio/music/matchdraw.asm
+++ b/src/audio/music/matchdraw.asm
@@ -1,4 +1,4 @@
-Music_MatchDraw_Ch1: ; f7cdf (3d:7cdf)
+Music_MatchDraw_Ch1:
 	speed 3
 	stereo_panning 1, 1
 	cutoff 8
@@ -45,7 +45,7 @@ Music_MatchDraw_Ch1: ; f7cdf (3d:7cdf)
 	music_end


-Music_MatchDraw_Ch2: ; f7d17 (3d:7d17)
+Music_MatchDraw_Ch2:
 	speed 3
 	stereo_panning 1, 1
 	cutoff 8
@@ -84,7 +84,7 @@ Music_MatchDraw_Ch2: ; f7d17 (3d:7d17)
 	music_end


-Music_MatchDraw_Ch3: ; f7d47 (3d:7d47)
+Music_MatchDraw_Ch3:
 	speed 6
 	stereo_panning 1, 1
 	wave 1
--- a/src/audio/music/matchloss.asm
+++ b/src/audio/music/matchloss.asm
@@ -1,4 +1,4 @@
-Music_MatchLoss_Ch1: ; f7c2e (3d:7c2e)
+Music_MatchLoss_Ch1:
 	stereo_panning 1, 1
 	vibrato_type 1
 	vibrato_delay 20
@@ -64,7 +64,7 @@ Music_MatchLoss_Ch1: ; f7c2e (3d:7c2e)
 	music_end


-Music_MatchLoss_Ch2: ; f7c87 (3d:7c87)
+Music_MatchLoss_Ch2:
 	stereo_panning 1, 1
 	vibrato_type 5
 	vibrato_delay 20
@@ -88,7 +88,7 @@ Music_MatchLoss_Ch2: ; f7c87 (3d:7c87)
 	music_end


-Music_MatchLoss_Ch3: ; f7ca7 (3d:7ca7)
+Music_MatchLoss_Ch3:
 	stereo_panning 1, 1
 	wave 1
 	volume 32
--- a/src/audio/music/matchstart1.asm
+++ b/src/audio/music/matchstart1.asm
@@ -1,4 +1,4 @@
-Music_MatchStart1_Ch1: ; f7919 (3d:7919)
+Music_MatchStart1_Ch1:
 	speed 1
 	stereo_panning 1, 1
 	cutoff 8
--- a/src/audio/music/matchstart2.asm
+++ b/src/audio/music/matchstart2.asm
@@ -1,4 +1,4 @@
-Music_MatchStart2_Ch1: ; f7956 (3d:7956)
+Music_MatchStart2_Ch1:
 	speed 1
 	stereo_panning 1, 1
 	cutoff 8
@@ -88,7 +88,7 @@ Music_MatchStart2_Ch1: ; f7956 (3d:7956)
 	music_end


-Music_MatchStart2_Ch2: ; f79b4 (3d:79b4)
+Music_MatchStart2_Ch2:
 	speed 1
 	stereo_panning 1, 1
 	cutoff 8
--- a/src/audio/music/matchstart3.asm
+++ b/src/audio/music/matchstart3.asm
@@ -1,4 +1,4 @@
-Music_MatchStart3_Ch1: ; f7a0f (3d:7a0f)
+Music_MatchStart3_Ch1:
 	speed 1
 	stereo_panning 1, 1
 	cutoff 8
@@ -163,7 +163,7 @@ Music_MatchStart3_Ch1: ; f7a0f (3d:7a0f)
 	music_end


-Music_MatchStart3_Ch2: ; f7aba (3d:7aba)
+Music_MatchStart3_Ch2:
 	speed 1
 	stereo_panning 1, 1
 	cutoff 8
--- a/src/audio/music/matchvictory.asm
+++ b/src/audio/music/matchvictory.asm
@@ -1,4 +1,4 @@
-Music_MatchVictory_Ch1: ; f7b61 (3d:7b61)
+Music_MatchVictory_Ch1:
 	stereo_panning 1, 1
 	vibrato_type 1
 	vibrato_delay 20
@@ -53,7 +53,7 @@ Music_MatchVictory_Ch1: ; f7b61 (3d:7b61)
 	music_end


-Music_MatchVictory_Ch2: ; f7bb0 (3d:7bb0)
+Music_MatchVictory_Ch2:
 	stereo_panning 1, 1
 	vibrato_type 1
 	vibrato_delay 20
@@ -116,7 +116,7 @@ Music_MatchVictory_Ch2: ; f7bb0 (3d:7bb0)
 	music_end


-Music_MatchVictory_Ch3: ; f7c09 (3d:7c09)
+Music_MatchVictory_Ch3:
 	stereo_panning 1, 1
 	wave 1
 	volume 32
--- a/src/audio/music/medal.asm
+++ b/src/audio/music/medal.asm
@@ -1,4 +1,4 @@
-Music_Medal_Ch1: ; f7df8 (3d:7df8)
+Music_Medal_Ch1:
 	stereo_panning 1, 1
 	vibrato_type 1
 	vibrato_delay 20
@@ -62,7 +62,7 @@ Music_Medal_Ch1: ; f7df8 (3d:7df8)
 	music_end


-Music_Medal_Ch2: ; f7e4b (3d:7e4b)
+Music_Medal_Ch2:
 	stereo_panning 1, 1
 	vibrato_type 1
 	vibrato_delay 20
@@ -125,7 +125,7 @@ Music_Medal_Ch2: ; f7e4b (3d:7e4b)
 	music_end


-Music_Medal_Ch3: ; f7e9d (3d:7e9d)
+Music_Medal_Ch3:
 	stereo_panning 1, 1
 	wave 1
 	volume 32
--- a/src/audio/music/overworld.asm
+++ b/src/audio/music/overworld.asm
@@ -1,4 +1,4 @@
-Music_Overworld_Ch1: ; f71a0 (3d:71a0)
+Music_Overworld_Ch1:
 	speed 7
 	duty 0
 	stereo_panning 1, 1
@@ -285,7 +285,7 @@ Branch_f72fb:
 	music_ret


-Music_Overworld_Ch2: ; f7334 (3d:7334)
+Music_Overworld_Ch2:
 	speed 7
 	duty 0
 	stereo_panning 1, 1
@@ -750,7 +750,7 @@ Branch_f7535:
 	music_ret


-Music_Overworld_Ch3: ; f75a1 (3d:75a1)
+Music_Overworld_Ch3:
 	speed 7
 	stereo_panning 1, 1
 	volume 32
@@ -1386,7 +1386,7 @@ Branch_f7826:
 	music_ret


-Music_Overworld_Ch4: ; f78af (3d:78af)
+Music_Overworld_Ch4:
 	speed 7
 	octave 1
 	music_call Branch_f78ee
--- a/src/audio/music/pausemenu.asm
+++ b/src/audio/music/pausemenu.asm
@@ -1,4 +1,4 @@
-Music_PauseMenu_Ch2: ; f6bb7 (3d:6bb7)
+Music_PauseMenu_Ch2:
 	speed 7
 	stereo_panning 1, 1
 	cutoff 8
@@ -278,7 +278,7 @@ Branch_f6ce9:
 	music_ret


-Music_PauseMenu_Ch1: ; f6d4e (3d:6d4e)
+Music_PauseMenu_Ch1:
 	speed 7
 	stereo_panning 1, 1
 	cutoff 8
@@ -432,7 +432,7 @@ Music_PauseMenu_Ch1: ; f6d4e (3d:6d4e)
 	EndMainLoop


-Music_PauseMenu_Ch3: ; f6e2d (3d:6e2d)
+Music_PauseMenu_Ch3:
 	speed 1
 	wave 3
 	stereo_panning 1, 1
@@ -544,7 +544,7 @@ Music_PauseMenu_Ch3: ; f6e2d (3d:6e2d)
 	EndMainLoop


-Music_PauseMenu_Ch4: ; f6ec8 (3d:6ec8)
+Music_PauseMenu_Ch4:
 	speed 7
 	octave 1
 	MainLoop
--- a/src/audio/music/pcmainmenu.asm
+++ b/src/audio/music/pcmainmenu.asm
@@ -1,4 +1,4 @@
-Music_PCMainMenu_Ch1: ; f9052 (3e:5052)
+Music_PCMainMenu_Ch1:
 	speed 7
 	stereo_panning 1, 1
 	cutoff 8
@@ -104,7 +104,7 @@ Branch_f90c2:
 	music_ret


-Music_PCMainMenu_Ch2: ; f90ed (3e:50ed)
+Music_PCMainMenu_Ch2:
 	speed 7
 	stereo_panning 1, 1
 	cutoff 8
@@ -211,7 +211,7 @@ Branch_f915e:
 	music_ret


-Music_PCMainMenu_Ch3: ; f9189 (3e:5189)
+Music_PCMainMenu_Ch3:
 	speed 7
 	volume 32
 	stereo_panning 1, 1
@@ -341,7 +341,7 @@ Music_PCMainMenu_Ch3: ; f9189 (3e:5189)
 	EndMainLoop


-Music_PCMainMenu_Ch4: ; f922b (3e:522b)
+Music_PCMainMenu_Ch4:
 	speed 7
 	octave 1
 	MainLoop
--- a/src/audio/music/pokemondome.asm
+++ b/src/audio/music/pokemondome.asm
@@ -1,4 +1,4 @@
-Music_PokemonDome_Ch1: ; f9251 (3e:5251)
+Music_PokemonDome_Ch1:
 	speed 7
 	stereo_panning 1, 1
 	vibrato_type 9
@@ -309,7 +309,7 @@ Music_PokemonDome_Ch1: ; f9251 (3e:5251)
 	EndMainLoop


-Music_PokemonDome_Ch2: ; f93f8 (3e:53f8)
+Music_PokemonDome_Ch2:
 	speed 7
 	stereo_panning 1, 1
 	vibrato_type 9
@@ -618,7 +618,7 @@ Branch_f9554:
 	music_ret


-Music_PokemonDome_Ch3: ; f9579 (3e:5579)
+Music_PokemonDome_Ch3:
 	speed 7
 	stereo_panning 1, 1
 	volume 32
@@ -772,7 +772,7 @@ Branch_f9613:
 	music_ret


-Music_PokemonDome_Ch4: ; f9629 (3e:5629)
+Music_PokemonDome_Ch4:
 	speed 7
 	octave 1
 	snare5 8
--- a/src/audio/music/ronald.asm
+++ b/src/audio/music/ronald.asm
@@ -1,4 +1,4 @@
-Music_Ronald_Ch1: ; fa7a0 (3e:67a0)
+Music_Ronald_Ch1:
 	stereo_panning 1, 1
 	vibrato_type 8
 	vibrato_delay 12
@@ -507,7 +507,7 @@ Branch_fa9ec:
 	music_ret


-Music_Ronald_Ch2: ; faa0e (3e:6a0e)
+Music_Ronald_Ch2:
 	stereo_panning 1, 1
 	vibrato_type 8
 	vibrato_delay 12
@@ -849,7 +849,7 @@ Branch_fabb1:
 	music_ret


-Music_Ronald_Ch3: ; fabc0 (3e:6bc0)
+Music_Ronald_Ch3:
 	speed 1
 	stereo_panning 1, 1
 	volume 32
@@ -1124,7 +1124,7 @@ Branch_facc5:
 	music_ret


-Music_Ronald_Ch4: ; face0 (3e:6ce0)
+Music_Ronald_Ch4:
 	speed 1
 	octave 1
 	MainLoop
--- a/src/audio/music/titlescreen.asm
+++ b/src/audio/music/titlescreen.asm
@@ -1,4 +1,4 @@
-Music_TitleScreen_Ch1: ; f5052 (3d:5052)
+Music_TitleScreen_Ch1:
 	speed 7
 	duty 0
 	stereo_panning 1, 1
@@ -220,7 +220,7 @@ Music_TitleScreen_Ch1: ; f5052 (3d:5052)
 	music_end


-Music_TitleScreen_Ch2: ; f5193 (3d:5193)
+Music_TitleScreen_Ch2:
 	speed 7
 	duty 0
 	stereo_panning 1, 1
@@ -408,7 +408,7 @@ Music_TitleScreen_Ch2: ; f5193 (3d:5193)
 	music_end


-Music_TitleScreen_Ch3: ; f5286 (3d:5286)
+Music_TitleScreen_Ch3:
 	speed 7
 	wave 4
 	volume 32
@@ -506,7 +506,7 @@ Branch_f52f0:
 	music_ret


-Music_TitleScreen_Ch4: ; f52fa (3d:52fa)
+Music_TitleScreen_Ch4:
 	speed 7
 	octave 1
 	rest 4
--- a/src/audio/music1.asm
+++ b/src/audio/music1.asm
@@ -1,37 +1,37 @@
-_SetupSound:: ; f4000 (3d:4000)
+_SetupSound::
 	jp Music1_Init

-SoundTimerHandler:: ; f4003 (3d:4003)
+SoundTimerHandler::
 	jp Music1_Update

-_PlaySong:: ; f4006 (3d:4006)
+_PlaySong::
 	jp Music1_PlaySong

-_PlaySFX:: ; f4009 (3d:4009)
+_PlaySFX::
 	jp Music1_PlaySFX

-Func_f400c:: ; f400c (3d:400c)
-	jp Func_f404e
+Music1_f400c::
+	jp Music1_f404e

-_AssertSongFinished:: ; f400f (3d:400f)
+_AssertSongFinished::
 	jp Music1_AssertSongFinished

-_AssertSFXFinished:: ; f4012 (3d:4012)
+_AssertSFXFinished::
 	jp Music1_AssertSFXFinished

-Func_f4015:: ; f4015 (3d:4015)
-	jp Func_f4066
+Music1_f4015::
+	jp Music1_f4066

-Func_f4018:: ; f4018 (3d:4018)
-	jp Func_f406f
+Music1_f4018::
+	jp Music1_f406f

-_PauseSong:: ; f401b (3d:401b)
+_PauseSong::
 	jp Music1_PauseSong

-_ResumeSong:: ; f401e (3d:401e)
+_ResumeSong::
 	jp Music1_ResumeSong

-Music1_PlaySong: ; f4021 (3d:4021)
+Music1_PlaySong:
 	push hl
 	ld hl, NumberOfSongs1
 	cp [hl]
@@ -41,7 +41,7 @@ Music1_PlaySong: ; f4021 (3d:4021)
 	pop hl
 	ret

-Music1_PlaySFX: ; f402d (3d:402d)
+Music1_PlaySFX:
 	push bc
 	push hl
 	ld b, $0
@@ -66,11 +66,11 @@ Music1_PlaySFX: ; f402d (3d:402d)
 	pop bc
 	ret

-Func_f404e: ; f404e (3d:404e)
+Music1_f404e:
 	ld [wddf0], a
 	ret

-Music1_AssertSongFinished: ; f4052 (3d:4052)
+Music1_AssertSongFinished:
 	ld a, [wCurSongID]
 	cp $80
 	ld a, $1
@@ -78,7 +78,7 @@ Music1_AssertSongFinished: ; f4052 (3d:4052)
 	xor a
 	ret

-Music1_AssertSFXFinished: ; f405c (3d:405c)
+Music1_AssertSFXFinished:
 	ld a, [wCurSfxID]
 	cp $80
 	ld a, $1
@@ -86,13 +86,13 @@ Music1_AssertSFXFinished: ; f405c (3d:405c)
 	xor a
 	ret

-Func_f4066: ; f4066 (3d:4066)
+Music1_f4066:
 	ld a, [wddf2]
 	xor $1
 	ld [wddf2], a
 	ret

-Func_f406f: ; f406f (3d:406f)
+Music1_f406f:
 	push bc
 	push af
 	and $7
@@ -104,7 +104,7 @@ Func_f406f: ; f406f (3d:406f)
 	pop bc
 	ret

-Music1_Init: ; f407d (3d:407d)
+Music1_Init:
 	xor a
 	ldh [rNR52], a
 	ld a, $80
@@ -162,7 +162,7 @@ Music1_Init: ; f407d (3d:407d)
 	jr nz, .zero_loop2
 	ret

-Music1_Update: ; f40e9 (3d:40e9)
+Music1_Update:
 	call Music1_EmptyFunc
 	call Music1_CheckForNewSound
 	ld hl, SFX_UpdateSFX
@@ -173,7 +173,7 @@ Music1_Update: ; f40e9 (3d:40e9)
 	ld a, [wddf2]
 	cp $0
 	jr z, .update_channels
-	call Func_f4980
+	call Music1_f4980
 	jr .skip_channel_Updates
 .update_channels
 	call Music1_UpdateChannel1
@@ -181,11 +181,11 @@ Music1_Update: ; f40e9 (3d:40e9)
 	call Music1_UpdateChannel3
 	call Music1_UpdateChannel4
 .skip_channel_Updates
-	call Func_f4866
+	call Music1_f4866
 	call Music1_CheckForEndOfSong
 	ret

-Music1_CheckForNewSound: ; f411c (3d:411c)
+Music1_CheckForNewSound:
 	ld a, [wCurSongID]
 	rla
 	jr c, .check_for_new_sfx
@@ -208,7 +208,7 @@ Music1_CheckForNewSound: ; f411c (3d:411c)
 .no_new_sound
 	ret

-Music1_StopAllChannels: ; f414b (3d:414b)
+Music1_StopAllChannels:
 	ld a, [wdd8c]
 	ld d, a
 	xor a
@@ -248,7 +248,7 @@ Music1_StopAllChannels: ; f414b (3d:414b)
 	ret

 ; plays the song given by the id in a
-Music1_BeginSong: ; f418c (3d:418c)
+Music1_BeginSong:
 	push af
 	ld c, a
 	ld b, $0
@@ -379,10 +379,10 @@ Music1_BeginSong: ; f418c (3d:418c)
 	ld [wddf2], a
 	ret

-Music1_EmptyFunc: ; f42a4 (3d:42a4)
+Music1_EmptyFunc:
 	ret

-Music1_UpdateChannel1: ; f42a5 (3d:42a5)
+Music1_UpdateChannel1:
 	ld a, [wMusicIsPlaying]
 	or a
 	jr z, .asm_f42fa
@@ -419,10 +419,10 @@ Music1_UpdateChannel1: ; f42a5 (3d:42a5)
 	ld a, [wMusicIsPlaying]
 	or a
 	jr z, .asm_f42fa
-	call Func_f4714
+	call Music1_f4714
 .asm_f42f4
 	ld a, $0
-	call Func_f485a
+	call Music1_f485a
 	ret
 .asm_f42fa
 	ld a, [wdd8c]
@@ -435,7 +435,7 @@ Music1_UpdateChannel1: ; f42a5 (3d:42a5)
 .asm_f4309
 	ret

-Music1_UpdateChannel2: ; f430a (3d:430a)
+Music1_UpdateChannel2:
 	ld a, [wMusicIsPlaying + 1]
 	or a
 	jr z, .asm_f435f
@@ -472,10 +472,10 @@ Music1_UpdateChannel2: ; f430a (3d:430a)
 	ld a, [wMusicIsPlaying + 1]
 	or a
 	jr z, .asm_f435f
-	call Func_f475a
+	call Music1_f475a
 .asm_f4359
 	ld a, $1
-	call Func_f485a
+	call Music1_f485a
 	ret
 .asm_f435f
 	ld a, [wdd8c]
@@ -488,7 +488,7 @@ Music1_UpdateChannel2: ; f430a (3d:430a)
 .asm_f436e
 	ret

-Music1_UpdateChannel3: ; f436f (3d:436f)
+Music1_UpdateChannel3:
 	ld a, [wMusicIsPlaying + 2]
 	or a
 	jr z, .asm_f43be
@@ -521,10 +521,10 @@ Music1_UpdateChannel3: ; f436f (3d:436f)
 	ld a, [wMusicIsPlaying + 2]
 	or a
 	jr z, .asm_f43be
-	call Func_f479c
+	call Music1_f479c
 .asm_f43b8
 	ld a, $2
-	call Func_f485a
+	call Music1_f485a
 	ret
 .asm_f43be
 	ld a, [wdd8c]
@@ -537,7 +537,7 @@ Music1_UpdateChannel3: ; f436f (3d:436f)
 .asm_f43cd
 	ret

-Music1_UpdateChannel4: ; f43ce (3d:43ce)
+Music1_UpdateChannel4:
 	ld a, [wMusicIsPlaying + 3]
 	or a
 	jr z, .asm_f4400
@@ -554,13 +554,13 @@ Music1_UpdateChannel4: ; f43ce (3d:43ce)
 	ld a, [wMusicIsPlaying + 3]
 	or a
 	jr z, .asm_f4400
-	call Func_f480a
+	call Music1_f480a
 	jr .asm_f4413
 .asm_f43f6
 	ld a, [wddef]
 	or a
 	jr z, .asm_f4413
-	call Func_f4839
+	call Music1_f4839
 	ret
 .asm_f4400
 	ld a, [wdd8c]
@@ -575,7 +575,7 @@ Music1_UpdateChannel4: ; f43ce (3d:43ce)
 .asm_f4413
 	ret

-Music1_PlayNextNote: ; f4414 (3d:4414)
+Music1_PlayNextNote:
 	ld a, [hli]
 	push hl
 	push af
@@ -595,7 +595,7 @@ Music1_PlayNextNote: ; f4414 (3d:4414)
 	pop af
 	jp hl

-Music1_CommandTable: ; f442c (3d:442c)
+Music1_CommandTable:
 	dw Music1_speed
 	dw Music1_octave
 	dw Music1_octave
@@ -645,7 +645,7 @@ Music1_CommandTable: ; f442c (3d:442c)
 	dw Music1_end
 	dw Music1_end

-Music1_note: ; f448c (3d:448c)
+Music1_note:
 	push af
 	ld a, [hl]
 	ld e, a
@@ -824,7 +824,7 @@ Music1_note: ; f448c (3d:448c)
 	ld a, [hli]
 	ld e, a
 	ld d, [hl]
-	call Func_f4967
+	call Music1_f4967
 	pop hl
 	ld a, e
 	ld [hli], a
@@ -839,7 +839,7 @@ Music1_note: ; f448c (3d:448c)
 	ld [hl], d
 	ret

-Music1_speed: ; f4598 (3d:4598)
+Music1_speed:
 	pop hl
 	ld a, [hli]
 	push hl
@@ -848,7 +848,7 @@ Music1_speed: ; f4598 (3d:4598)
 	ld [hl], a
 	jp Music1_PlayNextNote_pop

-Music1_octave: ; f45a3 (3d:45a3)
+Music1_octave:
 	and $7
 	dec a
 	ld hl, wMusicOctave
@@ -866,25 +866,25 @@ Music1_octave: ; f45a3 (3d:45a3)
 	ld [hl], a
 	jp Music1_PlayNextNote_pop

-Music1_inc_octave: ; f45bb (3d:45bb)
+Music1_inc_octave:
 	ld hl, wMusicOctave
 	add hl, bc
 	inc [hl]
 	jp Music1_PlayNextNote_pop

-Music1_dec_octave: ; f45c3 (3d:45c3)
+Music1_dec_octave:
 	ld hl, wMusicOctave
 	add hl, bc
 	dec [hl]
 	jp Music1_PlayNextNote_pop

-Music1_tie: ; f45cb (3d:45cb)
+Music1_tie:
 	ld hl, wMusicTie
 	add hl, bc
 	ld [hl], $80
 	jp Music1_PlayNextNote_pop

-Music1_stereo_panning: ; f45d4 (3d:45d4)
+Music1_stereo_panning:
 	pop hl
 	ld a, [hli]
 	push hl
@@ -907,7 +907,7 @@ Music1_stereo_panning: ; f45d4 (3d:45d4)
 	pop bc
 	jp Music1_PlayNextNote_pop

-Music1_MainLoop: ; f45ef (3d:45ef)
+Music1_MainLoop:
 	pop de
 	push de
 	dec de
@@ -919,7 +919,7 @@ Music1_MainLoop: ; f45ef (3d:45ef)
 	ld [hl], d
 	jp Music1_PlayNextNote_pop

-Music1_EndMainLoop: ; f45fd (3d:45fd)
+Music1_EndMainLoop:
 	pop hl
 	ld hl, wMusicMainLoopStart
 	add hl, bc
@@ -929,7 +929,7 @@ Music1_EndMainLoop: ; f45fd (3d:45fd)
 	ld l, a
 	jp Music1_PlayNextNote

-Music1_Loop: ; f4609 (3d:4609)
+Music1_Loop:
 	pop de
 	ld a, [de] ; get loop count
 	inc de
@@ -946,7 +946,7 @@ Music1_Loop: ; f4609 (3d:4609)
 	call Music1_SetChannelStackPointer
 	jp Music1_PlayNextNote_pop

-Music1_EndLoop: ; f461e (3d:461e)
+Music1_EndLoop:
 	call Music1_GetChannelStackPointer
 	dec hl
 	ld a, [hl] ; get remaining loop count
@@ -966,14 +966,14 @@ Music1_EndLoop: ; f461e (3d:461e)
 	call Music1_SetChannelStackPointer
 	jp Music1_PlayNextNote_pop

-Music1_jp: ; f4638 (3d:4638)
+Music1_jp:
 	pop hl
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
 	jp Music1_PlayNextNote

-Music1_call: ; f463f (3d:463f)
+Music1_call:
 	call Music1_GetChannelStackPointer
 	pop de
 	ld a, e
@@ -991,7 +991,7 @@ Music1_call: ; f463f (3d:463f)
 	call Music1_SetChannelStackPointer
 	jp Music1_PlayNextNote_pop

-Music1_ret: ; f4656 (3d:4656)
+Music1_ret:
 	pop de
 	call Music1_GetChannelStackPointer
 	dec hl
@@ -1004,7 +1004,7 @@ Music1_ret: ; f4656 (3d:4656)
 	call Music1_SetChannelStackPointer
 	jp Music1_PlayNextNote_pop

-Music1_frequency_offset: ; f4667 (3d:4667)
+Music1_frequency_offset:
 	pop de
 	ld a, [de]
 	inc de
@@ -1015,7 +1015,7 @@ Music1_frequency_offset: ; f4667 (3d:4667)
 	ld l, e
 	jp Music1_PlayNextNote

-Music1_duty: ; f4674 (3d:4674)
+Music1_duty:
 	pop de
 	ld a, [de]
 	and $c0
@@ -1027,7 +1027,7 @@ Music1_duty: ; f4674 (3d:4674)
 	ld l, e
 	jp Music1_PlayNextNote

-Music1_volume: ; f4683 (3d:4683)
+Music1_volume:
 	pop de
 	ld a, [de]
 	inc de
@@ -1038,7 +1038,7 @@ Music1_volume: ; f4683 (3d:4683)
 	ld l, e
 	jp Music1_PlayNextNote

-Music1_wave: ; f4690 (3d:4690)
+Music1_wave:
 	pop de
 	ld a, [de]
 	inc de
@@ -1049,7 +1049,7 @@ Music1_wave: ; f4690 (3d:4690)
 	ld l, e
 	jp Music1_PlayNextNote

-Music1_cutoff: ; f46a0 (3d:46a0)
+Music1_cutoff:
 	pop de
 	ld a, [de]
 	inc de
@@ -1060,7 +1060,7 @@ Music1_cutoff: ; f46a0 (3d:46a0)
 	ld l, e
 	jp Music1_PlayNextNote

-Music1_echo: ; f46ad (3d:46ad)
+Music1_echo:
 	pop de
 	ld a, [de]
 	inc de
@@ -1071,7 +1071,7 @@ Music1_echo: ; f46ad (3d:46ad)
 	ld l, e
 	jp Music1_PlayNextNote

-Music1_vibrato_type: ; f46ba (3d:46ba)
+Music1_vibrato_type:
 	pop de
 	ld a, [de]
 	inc de
@@ -1085,7 +1085,7 @@ Music1_vibrato_type: ; f46ba (3d:46ba)
 	ld l, e
 	jp Music1_PlayNextNote

-Music1_vibrato_delay: ; f46cc (3d:46cc)
+Music1_vibrato_delay:
 	pop de
 	ld a, [de]
 	inc de
@@ -1096,7 +1096,7 @@ Music1_vibrato_delay: ; f46cc (3d:46cc)
 	ld l, e
 	jp Music1_PlayNextNote

-Music1_pitch_offset: ; f46d9 (3d:46d9)
+Music1_pitch_offset:
 	pop de
 	ld a, [de]
 	inc de
@@ -1107,7 +1107,7 @@ Music1_pitch_offset: ; f46d9 (3d:46d9)
 	ld l, e
 	jp Music1_PlayNextNote

-Music1_adjust_pitch_offset: ; f46e6 (3d:46e6)
+Music1_adjust_pitch_offset:
 	pop de
 	ld a, [de]
 	inc de
@@ -1119,7 +1119,7 @@ Music1_adjust_pitch_offset: ; f46e6 (3d:46e6)
 	ld l, e
 	jp Music1_PlayNextNote

-Music1_end: ; f46f4 (3d:46f4)
+Music1_end:
 	ld hl, wMusicIsPlaying
 	add hl, bc
 	ld [hl], $0
@@ -1129,7 +1129,7 @@ Music1_end: ; f46f4 (3d:46f4)
 ; returns the address of the top of the stack
 ; for the current channel
 ; used for loops and calls
-Music1_GetChannelStackPointer: ; f46fc (3d:46fc)
+Music1_GetChannelStackPointer:
 	ld hl, wMusicChannelStackPointers
 	add hl, bc
 	add hl, bc
@@ -1139,7 +1139,7 @@ Music1_GetChannelStackPointer: ; f46fc (3d:46fc)
 	ret

 ; sets the current channel's stack pointer to hl
-Music1_SetChannelStackPointer: ; f4705 (3d:4705)
+Music1_SetChannelStackPointer:
 	ld d, h
 	ld e, l
 	ld hl, wMusicChannelStackPointers
@@ -1150,11 +1150,11 @@ Music1_SetChannelStackPointer: ; f4705 (3d:4705)
 	ld [hl], d
 	ret

-Music1_PlayNextNote_pop: ; f4710 (3d:4710)
+Music1_PlayNextNote_pop:
 	pop hl
 	jp Music1_PlayNextNote

-Func_f4714: ; f4714 (3d:4714)
+Music1_f4714:
 	ld a, [wdd8c]
 	bit 0, a
 	jr nz, .asm_f4749
@@ -1193,7 +1193,7 @@ Func_f4714: ; f4714 (3d:4714)
 	ld [hl], a
 	ret

-Func_f475a: ; f475a (3d:475a)
+Music1_f475a:
 	ld a, [wdd8c]
 	bit 1, a
 	jr nz, .asm_f478b
@@ -1230,7 +1230,7 @@ Func_f475a: ; f475a (3d:475a)
 	ld [hl], a
 	ret

-Func_f479c: ; f479c (3d:479c)
+Music1_f479c:
 	ld a, [wdd8c]
 	bit 2, a
 	jr nz, .asm_f47e0
@@ -1275,7 +1275,7 @@ Func_f479c: ; f479c (3d:479c)
 	ldh [rNR30], a
 	ret

-Music1_LoadWaveInstrument: ; f479c (3d:47ea)
+Music1_LoadWaveInstrument:
 	ld a, [wMusicWave]
 	add a
 	ld d, $0
@@ -1299,13 +1299,13 @@ Music1_LoadWaveInstrument: ; f479c (3d:47ea)
 	ld [wMusicWaveChange], a
 	ret

-Func_f480a: ; f480a (3d:480a)
+Music1_f480a:
 	ld a, [wdd8c]
 	bit 3, a
 	jr nz, .asm_f4829
 	ld a, [wddba]
 	cp $0
-	jr z, asm_f482a
+	jr z, .asm_f482a
 	ld de, rNR41
 	ld hl, wddab
 	ld a, [hli]
@@ -1321,7 +1321,7 @@ Func_f480a: ; f480a (3d:480a)
 	ld [de], a
 .asm_f4829
 	ret
-asm_f482a:
+.asm_f482a
 	xor a
 	ld [wddef], a
 	ld hl, rNR42
@@ -1332,7 +1332,7 @@ asm_f482a:
 	ld [hl], a
 	ret

-Func_f4839: ; f4839 (3d:4839)
+Music1_f4839:
 	ld a, [wdd8c]
 	bit 3, a
 	jr z, .asm_f4846
@@ -1347,7 +1347,7 @@ Func_f4839: ; f4839 (3d:4839)
 	ld a, [de]
 	cp $ff
 	jr nz, .asm_f4853
-	jr asm_f482a
+	jr Music1_f480a.asm_f482a
 .asm_f4853
 	ldh [rNR43], a
 	inc de
@@ -1357,16 +1357,16 @@ Func_f4839: ; f4839 (3d:4839)
 .asm_f4859
 	ret

-Func_f485a: ; f485a (3d:485a)
+Music1_f485a:
 	push af
 	ld b, $0
 	ld c, a
 	call Music1_UpdateVibrato
 	pop af
-	call Func_f490b
+	call Music1_f490b
 	ret

-Func_f4866: ; f4866 (3d:4866)
+Music1_f4866:
 	ld a, [wMusicPanning]
 	ldh [rNR50], a
 	ld a, [wdd8c]
@@ -1400,7 +1400,7 @@ Func_f4866: ; f4866 (3d:4866)
 	ldh [rNR51], a
 	ret

-Music1_UpdateVibrato: ; f4898 (3d:4898)
+Music1_UpdateVibrato:
 	ld hl, wMusicVibratoDelay
 	add hl, bc
 	ld a, [hl]
@@ -1485,7 +1485,7 @@ Music1_UpdateVibrato: ; f4898 (3d:4898)
 	ld d, [hl]
 	ret

-Func_f490b: ; f490b (3d:490b)
+Music1_f490b:
 	cp $0
 	jr nz, .not_channel_1
 	ld a, [wMusicVibratoDelay]
@@ -1538,7 +1538,7 @@ Func_f490b: ; f490b (3d:490b)
 .done
 	ret

-Func_f4967: ; f4967 (3d:4967)
+Music1_f4967:
 	ld hl, wMusicFrequencyOffset
 	add hl, bc
 	ld a, [hl]
@@ -1561,7 +1561,7 @@ Func_f4967: ; f4967 (3d:4967)
 	ld d, a
 	ret

-Func_f4980: ; f4980 (3d:4980)
+Music1_f4980:
 	ld a, [wdd8c]
 	ld d, a
 	bit 0, d
@@ -1592,7 +1592,7 @@ Func_f4980: ; f4980 (3d:4980)
 .asm_f49b0
 	ret

-Music1_CheckForEndOfSong: ; f49b1 (3d:49b1)
+Music1_CheckForEndOfSong:
 	ld hl, wMusicIsPlaying
 	xor a
 	add [hl]
@@ -1608,23 +1608,23 @@ Music1_CheckForEndOfSong: ; f49b1 (3d:49b1)
 	ld [wCurSongID], a
 	ret

-Music1_PauseSong: ; f49c4 (3d:49c4)
+Music1_PauseSong:
 	di
-	call Func_f4980
+	call Music1_f4980
 	call Music1_BackupSong
 	call Music1_StopAllChannels
 	ei
 	ret

-Music1_ResumeSong: ; f49d0 (3d:49d0)
+Music1_ResumeSong:
 	di
-	call Func_f4980
+	call Music1_f4980
 	call Music1_StopAllChannels
 	call Music1_LoadBackup
 	ei
 	ret

-Music1_BackupSong: ; f49dc (3d:49dc)
+Music1_BackupSong:
 	ld a, [wCurSongID]
 	ld [wCurSongIDBackup], a
 	ld a, [wCurSongBank]
@@ -1732,7 +1732,7 @@ Music1_BackupSong: ; f49dc (3d:49dc)
 	call Music1_CopyData
 	ret

-Music1_LoadBackup: ; f4b01 (3d:4b01)
+Music1_LoadBackup:
 	ld a, [wCurSongIDBackup]
 	ld [wCurSongID], a
 	ld a, [wCurSongBankBackup]
@@ -1836,7 +1836,7 @@ Music1_LoadBackup: ; f4b01 (3d:4b01)
 	ret

 ; copies a bytes from hl to de
-Music1_CopyData: ; f4c18 (3d:4c18)
+Music1_CopyData:
 	ld c, a
 .loop
 	ld a, [hli]
@@ -1846,7 +1846,7 @@ Music1_CopyData: ; f4c18 (3d:4c18)
 	jr nz, .loop
 	ret

-Music1_ChannelLoopStacks: ; f4c20 (3d:4c20)
+Music1_ChannelLoopStacks:
 	dw wMusicCh1Stack
 	dw wMusicCh2Stack
 	dw wMusicCh3Stack
@@ -1854,7 +1854,7 @@ Music1_ChannelLoopStacks: ; f4c20 (3d:4c20)

 ; these are address offsets into the pitches table below
 ; offset = (12 notes per octave * 2 bytes per pitch) * octave
-Music1_OctaveOffsets: ; f4c28 (3d:4c28)
+Music1_OctaveOffsets:
 	db (12 * 2) * 0
 	db (12 * 2) * 1
 	db (12 * 2) * 2
@@ -1864,7 +1864,7 @@ Music1_OctaveOffsets: ; f4c28 (3d:4c28)
 	db (12 * 2) * 6
 	db (12 * 2) * 7

-Music1_Pitches: ; f4c30 (3d:4c30)
+Music1_Pitches:
 	dw $002c ; C_ 0
 	dw $009c ; C# 0
 	dw $0106 ; D_ 0
@@ -1951,17 +1951,17 @@ Music1_Pitches: ; f4c30 (3d:4c30)
 	dw $07ef ; B_ 6
 	dw $07f0 ; C_ 7

-Music1_WaveInstruments: ; f4cda (3d:4cda)
+Music1_WaveInstruments:
 INCLUDE "audio/wave_instruments.asm"

-Music1_NoiseInstruments: ; f4d34 (3d:4d34)
+Music1_NoiseInstruments:
 INCLUDE "audio/noise_instruments.asm"

-Music1_VibratoTypes: ; f4dde (3d:4dde)
+Music1_VibratoTypes:
 INCLUDE "audio/vibrato_types.asm"

 ; all real SFX have the same priority (SFX_STOP does not use this table)
-Music1_SFXPriorities: ; f4e85 (3d:4e85)
+Music1_SFXPriorities:
 	db $00, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a
 	db $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a
 	db $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a
--- a/src/audio/music1_headers.asm
+++ b/src/audio/music1_headers.asm
@@ -1,7 +1,7 @@
-NumberOfSongs1: ; f4ee5 (3d:4ee5)
+NumberOfSongs1:
 	db $1f

-SongBanks1: ; f4ee6 (3d:4ee6)
+SongBanks1:
 	db BANK(Music_Stop)
 	db BANK(Music_TitleScreen)
 	db BANK(Music_DuelTheme1)
@@ -34,7 +34,7 @@ SongBanks1: ; f4ee6 (3d:4ee6)
 	db BANK(Music_Medal)
 	db BANK(Music_Unused1e)

-SongHeaderPointers1: ; f4f05 (3d:4f05)
+SongHeaderPointers1:
 	dw Music_Stop
 	dw Music_TitleScreen
 	dw Music_DuelTheme1
@@ -67,38 +67,38 @@ SongHeaderPointers1: ; f4f05 (3d:4f05)
 	dw Music_Medal
 	dw Music_Unused1e

-Music_Stop: ; f4f43 (3d:4f43)
+Music_Stop:
 	db %0000

-Music_TitleScreen: ; f4f44 (3d:4f44)
+Music_TitleScreen:
 	db %1111
 	dw Music_TitleScreen_Ch1
 	dw Music_TitleScreen_Ch2
 	dw Music_TitleScreen_Ch3
 	dw Music_TitleScreen_Ch4

-Music_DuelTheme1: ; f4f4d (3d:4f4d)
+Music_DuelTheme1:
 	db %1111
 	dw Music_DuelTheme1_Ch1
 	dw Music_DuelTheme1_Ch2
 	dw Music_DuelTheme1_Ch3
 	dw Music_DuelTheme1_Ch4

-Music_DuelTheme2: ; f4f56 (3d:4f56)
+Music_DuelTheme2:
 	db %1111
 	dw Music_DuelTheme2_Ch1
 	dw Music_DuelTheme2_Ch2
 	dw Music_DuelTheme2_Ch3
 	dw Music_DuelTheme2_Ch4

-Music_DuelTheme3: ; f4f5f (3d:4f5f)
+Music_DuelTheme3:
 	db %1111
 	dw Music_DuelTheme3_Ch1
 	dw Music_DuelTheme3_Ch2
 	dw Music_DuelTheme3_Ch3
 	dw Music_DuelTheme3_Ch4

-Music_PauseMenu: ; f4f68 (3d:4f68)
+Music_PauseMenu:
 	db %1111
 	dw Music_PauseMenu_Ch1
 	dw Music_PauseMenu_Ch2
@@ -112,21 +112,21 @@ Music_PauseMenu: ; f4f68 (3d:4f68)
 	dw NULL
 	dw NULL

-Music_DeckMachine: ; f4f7a (3d:4f7a)
+Music_DeckMachine:
 	db %1111
 	dw Music_DeckMachine_Ch1
 	dw Music_DeckMachine_Ch2
 	dw Music_DeckMachine_Ch3
 	dw Music_DeckMachine_Ch4

-Music_CardPop: ; f4f83 (3d:4f83)
+Music_CardPop:
 	db %1111
 	dw Music_CardPop_Ch1
 	dw Music_CardPop_Ch2
 	dw Music_CardPop_Ch3
 	dw Music_CardPop_Ch4

-Music_Overworld: ; f4f8c (3d:4f8c)
+Music_Overworld:
 	db %1111
 	dw Music_Overworld_Ch1
 	dw Music_Overworld_Ch2
@@ -196,84 +196,84 @@ Music_Overworld: ; f4f8c (3d:4f8c)
 	dw NULL
 	dw NULL

-Music_Unused13: ; f4fe6 (3d:4fe6)
+Music_Unused13:
 	db %0000
 	dw NULL
 	dw NULL
 	dw NULL
 	dw NULL

-Music_Unused14: ; f4fef (3d:4fef)
+Music_Unused14:
 	db %0000
 	dw NULL
 	dw NULL
 	dw NULL
 	dw NULL

-Music_MatchStart1: ; f4ff8 (3d:4ff8)
+Music_MatchStart1:
 	db %0001
 	dw Music_MatchStart1_Ch1
 	dw NULL
 	dw NULL
 	dw NULL

-Music_MatchStart2: ; f5001 (3d:5001)
+Music_MatchStart2:
 	db %0011
 	dw Music_MatchStart2_Ch1
 	dw Music_MatchStart2_Ch2
 	dw NULL
 	dw NULL

-Music_MatchStart3: ; f500a (3d:500a)
+Music_MatchStart3:
 	db %0011
 	dw Music_MatchStart3_Ch1
 	dw Music_MatchStart3_Ch2
 	dw NULL
 	dw NULL

-Music_MatchVictory: ; f5013 (3d:5013)
+Music_MatchVictory:
 	db %0111
 	dw Music_MatchVictory_Ch1
 	dw Music_MatchVictory_Ch2
 	dw Music_MatchVictory_Ch3
 	dw NULL

-Music_MatchLoss: ; f501c (3d:501c)
+Music_MatchLoss:
 	db %0111
 	dw Music_MatchLoss_Ch1
 	dw Music_MatchLoss_Ch2
 	dw Music_MatchLoss_Ch3
 	dw NULL

-Music_MatchDraw: ; f5025 (3d:5025)
+Music_MatchDraw:
 	db %0111
 	dw Music_MatchDraw_Ch1
 	dw Music_MatchDraw_Ch2
 	dw Music_MatchDraw_Ch3
 	dw NULL

-Music_Unused1b: ; f502e (3d:502e)
+Music_Unused1b:
 	db %0000
 	dw NULL
 	dw NULL
 	dw NULL
 	dw NULL

-Music_BoosterPack: ; f5037 (3d:5037)
+Music_BoosterPack:
 	db %0111
 	dw Music_BoosterPack_Ch1
 	dw Music_BoosterPack_Ch2
 	dw Music_BoosterPack_Ch3
 	dw NULL

-Music_Medal: ; f5040 (3d:5040)
+Music_Medal:
 	db %0111
 	dw Music_Medal_Ch1
 	dw Music_Medal_Ch2
 	dw Music_Medal_Ch3
 	dw NULL

-Music_Unused1e: ; f5049 (3d:5049)
+Music_Unused1e:
 	db %0000
 	dw NULL
 	dw NULL
--- a/src/audio/music2.asm
+++ b/src/audio/music2.asm
--- a/src/audio/music2_headers.asm
+++ b/src/audio/music2_headers.asm
@@ -1,7 +1,7 @@
-NumberOfSongs2: ; f8ee5 (3e:4ee5)
+NumberOfSongs2:
 	db $1f

-SongBanks2: ; f8ee6 (3e:4ee6)
+SongBanks2:
 	db BANK(Music_Stop)
 	db BANK(Music_TitleScreen)
 	db BANK(Music_DuelTheme1)
@@ -34,7 +34,7 @@ SongBanks2: ; f8ee6 (3e:4ee6)
 	db BANK(Music_Medal)
 	db BANK(Music_Unused1e)

-SongHeaderPointers2: ; f8f05 (3e:4f05)
+SongHeaderPointers2:
 	dw Music_Stop
 	dw NULL
 	dw NULL
@@ -105,7 +105,7 @@ SongHeaderPointers2: ; f8f05 (3e:4f05)
 	dw NULL
 	dw NULL

-Music_PCMainMenu: ; f8f71 (3e:4f71)
+Music_PCMainMenu:
 	db %1111
 	dw Music_PCMainMenu_Ch1
 	dw Music_PCMainMenu_Ch2
@@ -133,63 +133,63 @@ Music_PCMainMenu: ; f8f71 (3e:4f71)
 	dw NULL
 	dw NULL

-Music_PokemonDome: ; f8f95 (3e:4f95)
+Music_PokemonDome:
 	db %1111
 	dw Music_PokemonDome_Ch1
 	dw Music_PokemonDome_Ch2
 	dw Music_PokemonDome_Ch3
 	dw Music_PokemonDome_Ch4

-Music_ChallengeHall: ; f8f9e (3e:4f9e)
+Music_ChallengeHall:
 	db %1111
 	dw Music_ChallengeHall_Ch1
 	dw Music_ChallengeHall_Ch2
 	dw Music_ChallengeHall_Ch3
 	dw Music_ChallengeHall_Ch4

-Music_Club1: ; f8fa7 (3e:4fa7)
+Music_Club1:
 	db %1111
 	dw Music_Club1_Ch1
 	dw Music_Club1_Ch2
 	dw Music_Club1_Ch3
 	dw Music_Club1_Ch4

-Music_Club2: ; f8fb0 (3e:4fb0)
+Music_Club2:
 	db %0111
 	dw Music_Club2_Ch1
 	dw Music_Club2_Ch2
 	dw Music_Club2_Ch3
 	dw NULL

-Music_Club3: ; f8fb9 (3e:4fb9)
+Music_Club3:
 	db %1111
 	dw Music_Club3_Ch1
 	dw Music_Club3_Ch2
 	dw Music_Club3_Ch3
 	dw Music_Club3_Ch4

-Music_Ronald: ; f8fc2 (3e:4fc2)
+Music_Ronald:
 	db %1111
 	dw Music_Ronald_Ch1
 	dw Music_Ronald_Ch2
 	dw Music_Ronald_Ch3
 	dw Music_Ronald_Ch4

-Music_Imakuni: ; f8fcb (3e:4fcb)
+Music_Imakuni:
 	db %1111
 	dw Music_Imakuni_Ch1
 	dw Music_Imakuni_Ch2
 	dw Music_Imakuni_Ch3
 	dw Music_Imakuni_Ch4

-Music_HallOfHonor: ; f8fd4 (3e:4fd4)
+Music_HallOfHonor:
 	db %0111
 	dw Music_HallOfHonor_Ch1
 	dw Music_HallOfHonor_Ch2
 	dw Music_HallOfHonor_Ch3
 	dw NULL

-Music_Credits: ; f8fdd (3e:4fdd)
+Music_Credits:
 	db %1111
 	dw Music_Credits_Ch1
 	dw Music_Credits_Ch2
--- a/src/audio/sfx.asm
+++ b/src/audio/sfx.asm
@@ -1,10 +1,10 @@
-SFX_PlaySFX: ; fc000 (3f:4000)
+SFX_PlaySFX:
 	jp SFX_Play

-SFX_UpdateSFX: ; fc003 (3f:4003)
+SFX_UpdateSFX:
 	jp SFX_Update

-SFX_Play: ; fc006 (3f:4006)
+SFX_Play:
 	ld hl, NumberOfSFX
 	cp [hl]
 	jr nc, .invalidID
@@ -59,7 +59,7 @@ SFX_Play: ; fc006 (3f:4006)
 .invalidID
 	ret

-SFX_Update: ; fc059 (3f:4059)
+SFX_Update:
 	ld a, [wdd8c]
 	or a
 	jr nz, .asm_fc063
@@ -100,7 +100,7 @@ SFX_Update: ; fc059 (3f:4059)
 	jr nz, .asm_fc06c
 	ret

-Func_fc094: ; fc094 (3f:4094)
+Func_fc094:
 	ld a, [hl]
 	and $f0
 	swap a
@@ -119,7 +119,7 @@ Func_fc094: ; fc094 (3f:4094)
 	ld l, e
 	jp hl

-SFX_CommandTable: ; fc0ab (3f:40ab)
+SFX_CommandTable:
 	dw SFX_0
 	dw SFX_1
 	dw SFX_2
@@ -137,10 +137,10 @@ SFX_CommandTable: ; fc0ab (3f:40ab)
 	dw SFX_unused
 	dw SFX_end

-SFX_unused: ; fc0cb (3f:40cb)
+SFX_unused:
 	jp Func_fc094

-SFX_0: ; fc0ce (3f:40ce)
+SFX_0:
 	ld d, a
 	pop hl
 	ld a, [hli]
@@ -185,7 +185,7 @@ SFX_0: ; fc0ce (3f:40ce)
 	ld [hli], a
 	ld [hl], d
 	pop de
-Func_fc105: ; fc105 (3f:4105)
+Func_fc105:
 	ld hl, wde4b
 	add hl, bc
 	add hl, bc
@@ -194,7 +194,7 @@ Func_fc105: ; fc105 (3f:4105)
 	ld [hl], d
 	ret

-SFX_1: ; fc10e (3f:410e)
+SFX_1:
 	ld hl, wde2b
 	add hl, bc
 	ld a, $80
@@ -214,7 +214,7 @@ SFX_1: ; fc10e (3f:410e)
 	pop hl
 	jp Func_fc094

-SFX_2: ; fc127 (3f:4127)
+SFX_2:
 	swap a
 	ld e, a
 	ld hl, rNR11
@@ -228,7 +228,7 @@ SFX_2: ; fc127 (3f:4127)
 	pop hl
 	jp Func_fc094

-SFX_loop: ; fc138 (3f:4138)
+SFX_loop:
 	ld hl, wde43
 	add hl, bc
 	add hl, bc
@@ -245,7 +245,7 @@ SFX_loop: ; fc138 (3f:4138)
 	ld h, d
 	jp Func_fc094

-SFX_endloop: ; fc14d (3f:414d)
+SFX_endloop:
 	ld hl, wde3f
 	add hl, bc
 	ld a, [hl]
@@ -264,7 +264,7 @@ SFX_endloop: ; fc14d (3f:414d)
 	pop hl
 	jp Func_fc094

-SFX_5: ; fc166 (3f:4166)
+SFX_5:
 	ld hl, wde2f
 	add hl, bc
 	ld e, l
@@ -274,7 +274,7 @@ SFX_5: ; fc166 (3f:4166)
 	ld [de], a
 	jp Func_fc094

-SFX_6: ; fc172 (3f:4172)
+SFX_6:
 	ld a, c
 	cp $3
 	jr nz, .asm_fc17c
@@ -294,7 +294,7 @@ SFX_6: ; fc172 (3f:4172)
 	ld d, h
 	jp Func_fc105

-Func_fc18d: ; fc18d (3f:418d)
+Func_fc18d:
 	ld hl, wde2f
 	add hl, bc
 	ld a, [hl]
@@ -348,7 +348,7 @@ Func_fc18d: ; fc18d (3f:418d)
 .asm_fc1cc
 	ret

-Func_fc1cd: ; fc1cd (3f:41cd)
+Func_fc1cd:
 	ld hl, wde32
 	ld a, [hl]
 	or a
@@ -390,7 +390,7 @@ Func_fc1cd: ; fc1cd (3f:41cd)
 .asm_fc201
 	ret

-SFX_7: ; fc202 (3f:4202)
+SFX_7:
 	add a
 	ld d, $0
 	ld e, a
@@ -419,7 +419,7 @@ SFX_7: ; fc202 (3f:4202)
 	pop hl
 	jp Func_fc094

-SFX_8: ; fc22d (3f:422d)
+SFX_8:
 	pop hl
 	ld a, [hli]
 	push hl
@@ -443,7 +443,7 @@ SFX_8: ; fc22d (3f:422d)
 	pop hl
 	jp Func_fc094

-SFX_end: ; fc249 (3f:4249)
+SFX_end:
 	ld e, c
 	inc e
 	ld a, $7f
@@ -471,7 +471,7 @@ SFX_end: ; fc249 (3f:4249)
 	pop hl
 	ret

-Func_fc26c: ; fc26c (3f:426c)
+Func_fc26c:
 	xor a
 	ld [wde53], a
 	ld [wSfxPriority], a
@@ -479,7 +479,7 @@ Func_fc26c: ; fc26c (3f:426c)
 	ld [wCurSfxID], a
 	ret

-Func_fc279: ; fc279 (3f:4279)
+Func_fc279:
 	ld a, $8
 	ldh a, [rNR12]
 	ldh a, [rNR22]
@@ -495,7 +495,7 @@ Func_fc279: ; fc279 (3f:4279)

 INCLUDE "audio/sfx_headers.asm"

-SFX_WaveInstruments: ; fc485 (3f:4485)
+SFX_WaveInstruments:
 INCLUDE "audio/wave_instruments.asm"

 INCLUDE "audio/sfx/sfx_01.asm"
--- a/src/audio/sfx/sfx_01.asm
+++ b/src/audio/sfx/sfx_01.asm
@@ -1,4 +1,4 @@
-Sfx01_Ch1: ; fc4df (3f:44df)
+Sfx01_Ch1:
 	sfx_1 196
 	sfx_8 17
 	sfx_2 0
--- a/src/audio/sfx/sfx_02.asm
+++ b/src/audio/sfx/sfx_02.asm
@@ -1,4 +1,4 @@
-Sfx02_Ch1: ; fc4f7 (3f:44f7)
+Sfx02_Ch1:
 	sfx_1 194
 	sfx_8 17
 	sfx_2 8
--- a/src/audio/sfx/sfx_03.asm
+++ b/src/audio/sfx/sfx_03.asm
@@ -1,4 +1,4 @@
-Sfx03_Ch1: ; fc539 (3f:4539)
+Sfx03_Ch1:
 	sfx_1 212
 	sfx_8 17
 	sfx_2 0
--- a/src/audio/sfx/sfx_04.asm
+++ b/src/audio/sfx/sfx_04.asm
@@ -1,4 +1,4 @@
-Sfx04_Ch1: ; fc573 (3f:4573)
+Sfx04_Ch1:
 	sfx_1 240
 	sfx_8 17
 	sfx_2 0
--- a/src/audio/sfx/sfx_05.asm
+++ b/src/audio/sfx/sfx_05.asm
@@ -1,4 +1,4 @@
-Sfx05_Ch1: ; fc59d (3f:459d)
+Sfx05_Ch1:
 	sfx_1 241
 	sfx_8 17
 	sfx_2 8
--- a/src/audio/sfx/sfx_06.asm
+++ b/src/audio/sfx/sfx_06.asm
@@ -1,4 +1,4 @@
-Sfx06_Ch1: ; fc625 (3f:4625)
+Sfx06_Ch1:
 	sfx_1 241
 	sfx_8 17
 	sfx_2 8
--- a/src/audio/sfx/sfx_07.asm
+++ b/src/audio/sfx/sfx_07.asm
@@ -1,4 +1,4 @@
-Sfx07_Ch1: ; fc6c2 (3f:46c2)
+Sfx07_Ch1:
 	sfx_8 17
 	sfx_loop 2
 	sfx_1 240
--- a/src/audio/sfx/sfx_08.asm
+++ b/src/audio/sfx/sfx_08.asm
@@ -1,4 +1,4 @@
-Sfx08_Ch1: ; fc6f6 (3f:46f6)
+Sfx08_Ch1:
 	sfx_8 17
 	sfx_1 224
 	sfx_0 0, 64
--- a/src/audio/sfx/sfx_09.asm
+++ b/src/audio/sfx/sfx_09.asm
@@ -1,4 +1,4 @@
-Sfx09_Ch1: ; fc725 (3f:4725)
+Sfx09_Ch1:
 	sfx_8 17
 	sfx_1 224
 	sfx_0 0, 65
--- a/src/audio/sfx/sfx_0a.asm
+++ b/src/audio/sfx/sfx_0a.asm
@@ -1,4 +1,4 @@
-Sfx0a_Ch1: ; fc78a (3f:478a)
+Sfx0a_Ch1:
 	sfx_8 17
 	sfx_1 228
 	sfx_2 0
--- a/src/audio/sfx/sfx_0b.asm
+++ b/src/audio/sfx/sfx_0b.asm
@@ -1,4 +1,4 @@
-Sfx0b_Ch1: ; fc813 (3f:4813)
+Sfx0b_Ch1:
 	sfx_8 17
 	sfx_1 239
 	sfx_2 0
--- a/src/audio/sfx/sfx_0c.asm
+++ b/src/audio/sfx/sfx_0c.asm
@@ -1,4 +1,4 @@
-Sfx0c_Ch1: ; fc8bd (3f:48bd)
+Sfx0c_Ch1:
 	sfx_8 17
 	sfx_loop 2
 	sfx_1 225
--- a/src/audio/sfx/sfx_0d.asm
+++ b/src/audio/sfx/sfx_0d.asm
@@ -1,4 +1,4 @@
-Sfx0d_Ch1: ; fc8f3 (3f:48f3)
+Sfx0d_Ch1:
 	sfx_loop 5
 	sfx_8 17
 	sfx_1 159
--- a/src/audio/sfx/sfx_0e.asm
+++ b/src/audio/sfx/sfx_0e.asm
@@ -1,4 +1,4 @@
-Sfx0e_Ch1: ; fc953 (3f:4953)
+Sfx0e_Ch1:
 	sfx_8 17
 	sfx_1 207
 	sfx_2 0
--- a/src/audio/sfx/sfx_0f.asm
+++ b/src/audio/sfx/sfx_0f.asm
@@ -1,4 +1,4 @@
-Sfx0f_Ch1: ; fc9b4 (3f:49b4)
+Sfx0f_Ch1:
 	sfx_8 17
 	sfx_1 225
 	sfx_0 0, 82
--- a/src/audio/sfx/sfx_10.asm
+++ b/src/audio/sfx/sfx_10.asm
@@ -1,4 +1,4 @@
-Sfx10_Ch1: ; fc9fb (3f:49fb)
+Sfx10_Ch1:
 	sfx_loop 5
 	sfx_8 17
 	sfx_1 55
--- a/src/audio/sfx/sfx_11.asm
+++ b/src/audio/sfx/sfx_11.asm
@@ -1,4 +1,4 @@
-Sfx11_Ch1: ; fca82 (3f:4a82)
+Sfx11_Ch1:
 	sfx_8 17
 	sfx_1 241
 	sfx_2 0
--- a/src/audio/sfx/sfx_12.asm
+++ b/src/audio/sfx/sfx_12.asm
@@ -1,4 +1,4 @@
-Sfx12_Ch1: ; fcb2d (3f:4b2d)
+Sfx12_Ch1:
 	sfx_1 228
 	sfx_8 17
 	sfx_2 0
--- a/src/audio/sfx/sfx_13.asm
+++ b/src/audio/sfx/sfx_13.asm
@@ -1,4 +1,4 @@
-Sfx13_Ch1: ; fcb72 (3f:4b72)
+Sfx13_Ch1:
 	sfx_1 228
 	sfx_8 17
 	sfx_2 0
--- a/src/audio/sfx/sfx_14.asm
+++ b/src/audio/sfx/sfx_14.asm
@@ -1,4 +1,4 @@
-Sfx14_Ch1: ; fcc80 (3f:4c80)
+Sfx14_Ch1:
 	sfx_1 228
 	sfx_8 17
 	sfx_2 0
--- a/src/audio/sfx/sfx_15.asm
+++ b/src/audio/sfx/sfx_15.asm
@@ -1,4 +1,4 @@
-Sfx15_Ch1: ; fcd2f (3f:4d2f)
+Sfx15_Ch1:
 	sfx_1 239
 	sfx_8 17
 	sfx_2 0
--- a/src/audio/sfx/sfx_16.asm
+++ b/src/audio/sfx/sfx_16.asm
@@ -1,4 +1,4 @@
-Sfx16_Ch1: ; fcd71 (3f:4d71)
+Sfx16_Ch1:
 	sfx_8 17
 	sfx_1 241
 	sfx_0 0, 45
--- a/src/audio/sfx/sfx_17.asm
+++ b/src/audio/sfx/sfx_17.asm
@@ -1,4 +1,4 @@
-Sfx17_Ch1: ; fcdb0 (3f:4db0)
+Sfx17_Ch1:
 	sfx_8 17
 	sfx_1 241
 	sfx_0 0, 45
--- a/src/audio/sfx/sfx_18.asm
+++ b/src/audio/sfx/sfx_18.asm
@@ -1,4 +1,4 @@
-Sfx18_Ch1: ; fce31 (3f:4e31)
+Sfx18_Ch1:
 	sfx_8 17
 	sfx_1 192
 	sfx_0 0, 81
--- a/src/audio/sfx/sfx_19.asm
+++ b/src/audio/sfx/sfx_19.asm
@@ -1,4 +1,4 @@
-Sfx19_Ch1: ; fce98 (3f:4e98)
+Sfx19_Ch1:
 	sfx_8 17
 	sfx_1 240
 	sfx_0 0, 98
--- a/src/audio/sfx/sfx_1a.asm
+++ b/src/audio/sfx/sfx_1a.asm
@@ -1,4 +1,4 @@
-Sfx1a_Ch1: ; fcf1d (3f:4f1d)
+Sfx1a_Ch1:
 	sfx_8 17
 	sfx_1 97
 	sfx_loop 2
--- a/src/audio/sfx/sfx_1b.asm
+++ b/src/audio/sfx/sfx_1b.asm
@@ -1,4 +1,4 @@
-Sfx1b_Ch1: ; fcf5d (3f:4f5d)
+Sfx1b_Ch1:
 	sfx_8 17
 	sfx_1 240
 	sfx_0 0, 80
--- a/src/audio/sfx/sfx_1c.asm
+++ b/src/audio/sfx/sfx_1c.asm
@@ -1,4 +1,4 @@
-Sfx1c_Ch1: ; fd001 (3f:5001)
+Sfx1c_Ch1:
 	sfx_8 17
 	sfx_1 111
 	sfx_0 0, 84
--- a/src/audio/sfx/sfx_1d.asm
+++ b/src/audio/sfx/sfx_1d.asm
@@ -1,4 +1,4 @@
-Sfx1d_Ch1: ; fd0c0 (3f:50c0)
+Sfx1d_Ch1:
 	sfx_8 17
 	sfx_1 111
 	sfx_0 0, 84
--- a/src/audio/sfx/sfx_1e.asm
+++ b/src/audio/sfx/sfx_1e.asm
@@ -1,4 +1,4 @@
-Sfx1e_Ch1: ; fd185 (3f:5185)
+Sfx1e_Ch1:
 	sfx_8 17
 	sfx_1 111
 	sfx_0 0, 84
--- a/src/audio/sfx/sfx_1f.asm
+++ b/src/audio/sfx/sfx_1f.asm
@@ -1,4 +1,4 @@
-Sfx1f_Ch1: ; fd28a (3f:528a)
+Sfx1f_Ch1:
 	sfx_8 17
 	sfx_1 111
 	sfx_0 0, 84
--- a/src/audio/sfx/sfx_20.asm
+++ b/src/audio/sfx/sfx_20.asm
@@ -1,4 +1,4 @@
-Sfx20_Ch1: ; fd33b (3f:533b)
+Sfx20_Ch1:
 	sfx_8 17
 	sfx_loop 2
 	sfx_1 111
--- a/src/audio/sfx/sfx_21.asm
+++ b/src/audio/sfx/sfx_21.asm
@@ -1,4 +1,4 @@
-Sfx21_Ch1: ; fd3bd (3f:53bd)
+Sfx21_Ch1:
 	sfx_8 17
 	sfx_1 111
 	sfx_0 0, 81
--- a/src/audio/sfx/sfx_22.asm
+++ b/src/audio/sfx/sfx_22.asm
@@ -1,4 +1,4 @@
-Sfx22_Ch1: ; fd44e (3f:544e)
+Sfx22_Ch1:
 	sfx_8 17
 	sfx_loop 2
 	sfx_1 111
--- a/src/audio/sfx/sfx_23.asm
+++ b/src/audio/sfx/sfx_23.asm
@@ -1,4 +1,4 @@
-Sfx23_Ch1: ; fd4ca (3f:54ca)
+Sfx23_Ch1:
 	sfx_8 17
 	sfx_1 246
 	sfx_0 0, 132
--- a/src/audio/sfx/sfx_24.asm
+++ b/src/audio/sfx/sfx_24.asm
@@ -1,4 +1,4 @@
-Sfx24_Ch1: ; fd5bd (3f:55bd)
+Sfx24_Ch1:
 	sfx_8 17
 	sfx_1 111
 	sfx_loop 80
--- a/src/audio/sfx/sfx_25.asm
+++ b/src/audio/sfx/sfx_25.asm
@@ -1,4 +1,4 @@
-Sfx25_Ch1: ; fd617 (3f:5617)
+Sfx25_Ch1:
 	sfx_1 207
 	sfx_8 17
 	sfx_2 8
--- a/src/audio/sfx/sfx_26.asm
+++ b/src/audio/sfx/sfx_26.asm
@@ -1,4 +1,4 @@
-Sfx26_Ch1: ; fd6f2 (3f:56f2)
+Sfx26_Ch1:
 	sfx_1 255
 	sfx_8 17
 	sfx_2 0
--- a/src/audio/sfx/sfx_27.asm
+++ b/src/audio/sfx/sfx_27.asm
@@ -1,4 +1,4 @@
-Sfx27_Ch1: ; fd769 (3f:5769)
+Sfx27_Ch1:
 	sfx_1 84
 	sfx_8 17
 	sfx_2 0
--- a/src/audio/sfx/sfx_28.asm
+++ b/src/audio/sfx/sfx_28.asm
@@ -1,4 +1,4 @@
-Sfx28_Ch1: ; fd799 (3f:5799)
+Sfx28_Ch1:
 	sfx_1 100
 	sfx_8 17
 	sfx_2 4
@@ -22,7 +22,7 @@ Sfx28_Ch1: ; fd799 (3f:5799)
 	sfx_0 7, 131
 	sfx_end

-Sfx28_Ch2: ; fd7bf (3f:57bf)
+Sfx28_Ch2:
 	sfx_8 17
 	sfx_1 255
 	sfx_1 0
--- a/src/audio/sfx/sfx_29.asm
+++ b/src/audio/sfx/sfx_29.asm
@@ -1,4 +1,4 @@
-Sfx29_Ch1: ; fd834 (3f:5834)
+Sfx29_Ch1:
 	sfx_8 17
 	sfx_1 223
 	sfx_loop 40
--- a/src/audio/sfx/sfx_2a.asm
+++ b/src/audio/sfx/sfx_2a.asm
@@ -1,4 +1,4 @@
-Sfx2a_Ch1: ; fd866 (3f:5866)
+Sfx2a_Ch1:
 	sfx_8 17
 	sfx_1 223
 	sfx_loop 4
--- a/src/audio/sfx/sfx_2b.asm
+++ b/src/audio/sfx/sfx_2b.asm
@@ -1,4 +1,4 @@
-Sfx2b_Ch1: ; fd8c4 (3f:58c4)
+Sfx2b_Ch1:
 	sfx_1 255
 	sfx_8 17
 	sfx_2 8
--- a/src/audio/sfx/sfx_2c.asm
+++ b/src/audio/sfx/sfx_2c.asm
@@ -1,4 +1,4 @@
-Sfx2c_Ch1: ; fd96f (3f:596f)
+Sfx2c_Ch1:
 	sfx_1 255
 	sfx_8 17
 	sfx_2 8
--- a/src/audio/sfx/sfx_2d.asm
+++ b/src/audio/sfx/sfx_2d.asm
@@ -1,4 +1,4 @@
-Sfx2d_Ch1: ; fd9ab (3f:59ab)
+Sfx2d_Ch1:
 	sfx_8 17
 	sfx_1 223
 	sfx_0 0, 36
--- a/src/audio/sfx/sfx_2e.asm
+++ b/src/audio/sfx/sfx_2e.asm
@@ -1,4 +1,4 @@
-Sfx2e_Ch1: ; fd9f4 (3f:59f4)
+Sfx2e_Ch1:
 	sfx_8 17
 	sfx_1 223
 	sfx_0 0, 36
--- a/src/audio/sfx/sfx_2f.asm
+++ b/src/audio/sfx/sfx_2f.asm
@@ -1,4 +1,4 @@
-Sfx2f_Ch1: ; fda5c (3f:5a5c)
+Sfx2f_Ch1:
 	sfx_8 17
 	sfx_1 214
 	sfx_0 0, 36
--- a/src/audio/sfx/sfx_30.asm
+++ b/src/audio/sfx/sfx_30.asm
@@ -1,4 +1,4 @@
-Sfx30_Ch1: ; fdb03 (3f:5b03)
+Sfx30_Ch1:
 	sfx_8 17
 	sfx_loop 8
 	sfx_1 129
--- a/src/audio/sfx/sfx_31.asm
+++ b/src/audio/sfx/sfx_31.asm
@@ -1,4 +1,4 @@
-Sfx31_Ch1: ; fdb1e (3f:5b1e)
+Sfx31_Ch1:
 	sfx_8 17
 	sfx_1 111
 	sfx_2 0
--- a/src/audio/sfx/sfx_32.asm
+++ b/src/audio/sfx/sfx_32.asm
@@ -1,4 +1,4 @@
-Sfx32_Ch1: ; fdbdb (3f:5bdb)
+Sfx32_Ch1:
 	sfx_1 143
 	sfx_8 17
 	sfx_2 8
@@ -193,7 +193,7 @@ Sfx32_Ch1: ; fdbdb (3f:5bdb)
 	sfx_0 7, 157
 	sfx_end

-Sfx32_Ch2: ; fdd3e (3f:5d3e)
+Sfx32_Ch2:
 	sfx_8 17
 	sfx_1 223
 	sfx_1 0
--- a/src/audio/sfx/sfx_33.asm
+++ b/src/audio/sfx/sfx_33.asm
@@ -1,4 +1,4 @@
-Sfx33_Ch1: ; fdddd (3f:5ddd)
+Sfx33_Ch1:
 	sfx_1 255
 	sfx_8 17
 	sfx_2 0
@@ -76,7 +76,7 @@ Sfx33_Ch1: ; fdddd (3f:5ddd)
 	sfx_1 255
 	sfx_end

-Sfx33_Ch2: ; fde73 (3f:5e73)
+Sfx33_Ch2:
 	sfx_8 17
 	sfx_1 223
 	sfx_1 0
--- a/src/audio/sfx/sfx_34.asm
+++ b/src/audio/sfx/sfx_34.asm
@@ -1,4 +1,4 @@
-Sfx34_Ch1: ; fdec8 (3f:5ec8)
+Sfx34_Ch1:
 	sfx_8 17
 	sfx_2 8
 	sfx_loop 3
--- a/src/audio/sfx/sfx_35.asm
+++ b/src/audio/sfx/sfx_35.asm
@@ -1,4 +1,4 @@
-Sfx35_Ch1: ; fdefd (3f:5efd)
+Sfx35_Ch1:
 	sfx_8 17
 	sfx_1 47
 	sfx_0 0, 8
--- a/src/audio/sfx/sfx_36.asm
+++ b/src/audio/sfx/sfx_36.asm
@@ -1,4 +1,4 @@
-Sfx36_Ch1: ; fdf5d (3f:5f5d)
+Sfx36_Ch1:
 	sfx_8 17
 	sfx_1 255
 	sfx_2 0
--- a/src/audio/sfx/sfx_37.asm
+++ b/src/audio/sfx/sfx_37.asm
@@ -1,4 +1,4 @@
-Sfx37_Ch1: ; fe04e (3f:604e)
+Sfx37_Ch1:
 	sfx_1 255
 	sfx_8 17
 	sfx_2 0
@@ -76,7 +76,7 @@ Sfx37_Ch1: ; fe04e (3f:604e)
 	sfx_1 255
 	sfx_end

-Sfx37_Ch2: ; fe0e4 (3f:60e4)
+Sfx37_Ch2:
 	sfx_8 17
 	sfx_1 223
 	sfx_1 0
--- a/src/audio/sfx/sfx_38.asm
+++ b/src/audio/sfx/sfx_38.asm
@@ -1,4 +1,4 @@
-Sfx38_Ch1: ; fe13b (3f:613b)
+Sfx38_Ch1:
 	sfx_1 228
 	sfx_8 17
 	sfx_2 4
--- a/src/audio/sfx/sfx_39.asm
+++ b/src/audio/sfx/sfx_39.asm
@@ -1,4 +1,4 @@
-Sfx39_Ch1: ; fe42a (3f:642a)
+Sfx39_Ch1:
 	sfx_8 17
 	sfx_1 159
 	sfx_2 0
@@ -98,7 +98,7 @@ Sfx39_Ch1: ; fe42a (3f:642a)
 	sfx_0 7, 157
 	sfx_end

-Sfx39_Ch2: ; fe4eb (3f:64eb)
+Sfx39_Ch2:
 	sfx_8 17
 	sfx_loop 2
 	sfx_1 207
--- a/src/audio/sfx/sfx_3a.asm
+++ b/src/audio/sfx/sfx_3a.asm
@@ -1,4 +1,4 @@
-Sfx3a_Ch1: ; fe533 (3f:6533)
+Sfx3a_Ch1:
 	sfx_8 17
 	sfx_1 87
 	sfx_2 0
--- a/src/audio/sfx/sfx_3b.asm
+++ b/src/audio/sfx/sfx_3b.asm
@@ -1,4 +1,4 @@
-Sfx3b_Ch1: ; fe638 (3f:6638)
+Sfx3b_Ch1:
 	sfx_8 17
 	sfx_1 255
 	sfx_2 0
--- a/src/audio/sfx/sfx_3c.asm
+++ b/src/audio/sfx/sfx_3c.asm
@@ -1,4 +1,4 @@
-Sfx3c_Ch1: ; fe685 (3f:6685)
+Sfx3c_Ch1:
 	sfx_loop 4
 	sfx_1 244
 	sfx_8 17
--- a/src/audio/sfx/sfx_3d.asm
+++ b/src/audio/sfx/sfx_3d.asm
@@ -1,4 +1,4 @@
-Sfx3d_Ch1: ; fe6fc (3f:66fc)
+Sfx3d_Ch1:
 	sfx_8 17
 	sfx_1 255
 	sfx_2 0
--- a/src/audio/sfx/sfx_3e.asm
+++ b/src/audio/sfx/sfx_3e.asm
@@ -1,4 +1,4 @@
-Sfx3e_Ch1: ; fe7c0 (3f:67c0)
+Sfx3e_Ch1:
 	sfx_1 207
 	sfx_8 17
 	sfx_2 8
--- a/src/audio/sfx/sfx_3f.asm
+++ b/src/audio/sfx/sfx_3f.asm
@@ -1,4 +1,4 @@
-Sfx3f_Ch1: ; fe7f3 (3f:67f3)
+Sfx3f_Ch1:
 	sfx_8 17
 	sfx_loop 20
 	sfx_1 193
--- a/src/audio/sfx/sfx_40.asm
+++ b/src/audio/sfx/sfx_40.asm
@@ -1,4 +1,4 @@
-Sfx40_Ch1: ; fe807 (3f:6807)
+Sfx40_Ch1:
 	sfx_8 17
 	sfx_1 255
 	sfx_2 0
--- a/src/audio/sfx/sfx_41.asm
+++ b/src/audio/sfx/sfx_41.asm
@@ -1,4 +1,4 @@
-Sfx41_Ch1: ; fe8f8 (3f:68f8)
+Sfx41_Ch1:
 	sfx_1 239
 	sfx_8 17
 	sfx_2 0
--- a/src/audio/sfx/sfx_42.asm
+++ b/src/audio/sfx/sfx_42.asm
@@ -1,4 +1,4 @@
-Sfx42_Ch1: ; fe9cf (3f:69cf)
+Sfx42_Ch1:
 	sfx_1 239
 	sfx_8 17
 	sfx_2 0
--- a/src/audio/sfx/sfx_43.asm
+++ b/src/audio/sfx/sfx_43.asm
@@ -1,4 +1,4 @@
-Sfx43_Ch1: ; fea4d (3f:6a4d)
+Sfx43_Ch1:
 	sfx_8 17
 	sfx_loop 2
 	sfx_1 31
--- a/src/audio/sfx/sfx_44.asm
+++ b/src/audio/sfx/sfx_44.asm
@@ -1,4 +1,4 @@
-Sfx44_Ch1: ; feaa5 (3f:6aa5)
+Sfx44_Ch1:
 	sfx_8 17
 	sfx_loop 2
 	sfx_1 31
--- a/src/audio/sfx/sfx_45.asm
+++ b/src/audio/sfx/sfx_45.asm
@@ -1,4 +1,4 @@
-Sfx45_Ch1: ; feb5e (3f:6b5e)
+Sfx45_Ch1:
 	sfx_loop 17
 	sfx_1 135
 	sfx_8 17
--- a/Show More
+++ b/Show More