remove address comments

1 files changed, 119 insertions, 119 deletions

diff --git a/audio/headers/sfxheaders2.asm b/audio/headers/sfxheaders2.asm
index 1b30f5cc..1b6f8a5c 100644
--- a/audio/headers/sfxheaders2.asm
+++ b/audio/headers/sfxheaders2.asm
@@ -1,83 +1,83 @@
 SFX_Headers_2::
 	db $ff, $ff, $ff ; padding
 
-SFX_Snare1_2:: ; 20003 (8:4003)
+SFX_Snare1_2::
 	db CH7
 	dw SFX_Snare1_2_Ch1
 
-SFX_Snare2_2:: ; 20006 (8:4006)
+SFX_Snare2_2::
 	db CH7
 	dw SFX_Snare2_2_Ch1
 
-SFX_Snare3_2:: ; 20009 (8:4009)
+SFX_Snare3_2::
 	db CH7
 	dw SFX_Snare3_2_Ch1
 
-SFX_Snare4_2:: ; 2000c (8:400c)
+SFX_Snare4_2::
 	db CH7
 	dw SFX_Snare4_2_Ch1
 
-SFX_Snare5_2:: ; 2000f (8:400f)
+SFX_Snare5_2::
 	db CH7
 	dw SFX_Snare5_2_Ch1
 
-SFX_Triangle1_2:: ; 20012 (8:4012)
+SFX_Triangle1_2::
 	db CH7
 	dw SFX_Triangle1_2_Ch1
 
-SFX_Triangle2_2:: ; 20015 (8:4015)
+SFX_Triangle2_2::
 	db CH7
 	dw SFX_Triangle2_2_Ch1
 
-SFX_Snare6_2:: ; 20018 (8:4018)
+SFX_Snare6_2::
 	db CH7
 	dw SFX_Snare6_2_Ch1
 
-SFX_Snare7_2:: ; 2001b (8:401b)
+SFX_Snare7_2::
 	db CH7
 	dw SFX_Snare7_2_Ch1
 
-SFX_Snare8_2:: ; 2001e (8:401e)
+SFX_Snare8_2::
 	db CH7
 	dw SFX_Snare8_2_Ch1
 
-SFX_Snare9_2:: ; 20021 (8:4021)
+SFX_Snare9_2::
 	db CH7
 	dw SFX_Snare9_2_Ch1
 
-SFX_Cymbal1_2:: ; 20024 (8:4024)
+SFX_Cymbal1_2::
 	db CH7
 	dw SFX_Cymbal1_2_Ch1
 
-SFX_Cymbal2_2:: ; 20027 (8:4027)
+SFX_Cymbal2_2::
 	db CH7
 	dw SFX_Cymbal2_2_Ch1
 
-SFX_Cymbal3_2:: ; 2002a (8:402a)
+SFX_Cymbal3_2::
 	db CH7
 	dw SFX_Cymbal3_2_Ch1
 
-SFX_Muted_Snare1_2:: ; 2002d (8:402d)
+SFX_Muted_Snare1_2::
 	db CH7
 	dw SFX_Muted_Snare1_2_Ch1
 
-SFX_Triangle3_2:: ; 20030 (8:4030)
+SFX_Triangle3_2::
 	db CH7
 	dw SFX_Triangle3_2_Ch1
 
-SFX_Muted_Snare2_2:: ; 20033 (8:4033)
+SFX_Muted_Snare2_2::
 	db CH7
 	dw SFX_Muted_Snare2_2_Ch1
 
-SFX_Muted_Snare3_2:: ; 20036 (8:4036)
+SFX_Muted_Snare3_2::
 	db CH7
 	dw SFX_Muted_Snare3_2_Ch1
 
-SFX_Muted_Snare4_2:: ; 20039 (8:4039)
+SFX_Muted_Snare4_2::
 	db CH7
 	dw SFX_Muted_Snare4_2_Ch1
 
-SFX_Cry00_2:: ; 2003c (8:403c)
+SFX_Cry00_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry00_2_Ch1
 	db CH5
@@ -85,7 +85,7 @@ SFX_Cry00_2:: ; 2003c (8:403c)
 	db CH7
 	dw SFX_Cry00_2_Ch3
 
-SFX_Cry01_2:: ; 20045 (8:4045)
+SFX_Cry01_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry01_2_Ch1
 	db CH5
@@ -93,7 +93,7 @@ SFX_Cry01_2:: ; 20045 (8:4045)
 	db CH7
 	dw SFX_Cry01_2_Ch3
 
-SFX_Cry02_2:: ; 2004e (8:404e)
+SFX_Cry02_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry02_2_Ch1
 	db CH5
@@ -101,7 +101,7 @@ SFX_Cry02_2:: ; 2004e (8:404e)
 	db CH7
 	dw SFX_Cry02_2_Ch3
 
-SFX_Cry03_2:: ; 20057 (8:4057)
+SFX_Cry03_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry03_2_Ch1
 	db CH5
@@ -109,7 +109,7 @@ SFX_Cry03_2:: ; 20057 (8:4057)
 	db CH7
 	dw SFX_Cry03_2_Ch3
 
-SFX_Cry04_2:: ; 20060 (8:4060)
+SFX_Cry04_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry04_2_Ch1
 	db CH5
@@ -117,7 +117,7 @@ SFX_Cry04_2:: ; 20060 (8:4060)
 	db CH7
 	dw SFX_Cry04_2_Ch3
 
-SFX_Cry05_2:: ; 20069 (8:4069)
+SFX_Cry05_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry05_2_Ch1
 	db CH5
@@ -125,7 +125,7 @@ SFX_Cry05_2:: ; 20069 (8:4069)
 	db CH7
 	dw SFX_Cry05_2_Ch3
 
-SFX_Cry06_2:: ; 20072 (8:4072)
+SFX_Cry06_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry06_2_Ch1
 	db CH5
@@ -133,7 +133,7 @@ SFX_Cry06_2:: ; 20072 (8:4072)
 	db CH7
 	dw SFX_Cry06_2_Ch3
 
-SFX_Cry07_2:: ; 2007b (8:407b)
+SFX_Cry07_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry07_2_Ch1
 	db CH5
@@ -141,7 +141,7 @@ SFX_Cry07_2:: ; 2007b (8:407b)
 	db CH7
 	dw SFX_Cry07_2_Ch3
 
-SFX_Cry08_2:: ; 20084 (8:4084)
+SFX_Cry08_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry08_2_Ch1
 	db CH5
@@ -149,7 +149,7 @@ SFX_Cry08_2:: ; 20084 (8:4084)
 	db CH7
 	dw SFX_Cry08_2_Ch3
 
-SFX_Cry09_2:: ; 2008d (8:408d)
+SFX_Cry09_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry09_2_Ch1
 	db CH5
@@ -157,7 +157,7 @@ SFX_Cry09_2:: ; 2008d (8:408d)
 	db CH7
 	dw SFX_Cry09_2_Ch3
 
-SFX_Cry0A_2:: ; 20096 (8:4096)
+SFX_Cry0A_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry0A_2_Ch1
 	db CH5
@@ -165,7 +165,7 @@ SFX_Cry0A_2:: ; 20096 (8:4096)
 	db CH7
 	dw SFX_Cry0A_2_Ch3
 
-SFX_Cry0B_2:: ; 2009f (8:409f)
+SFX_Cry0B_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry0B_2_Ch1
 	db CH5
@@ -173,7 +173,7 @@ SFX_Cry0B_2:: ; 2009f (8:409f)
 	db CH7
 	dw SFX_Cry0B_2_Ch3
 
-SFX_Cry0C_2:: ; 200a8 (8:40a8)
+SFX_Cry0C_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry0C_2_Ch1
 	db CH5
@@ -181,7 +181,7 @@ SFX_Cry0C_2:: ; 200a8 (8:40a8)
 	db CH7
 	dw SFX_Cry0C_2_Ch3
 
-SFX_Cry0D_2:: ; 200b1 (8:40b1)
+SFX_Cry0D_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry0D_2_Ch1
 	db CH5
@@ -189,7 +189,7 @@ SFX_Cry0D_2:: ; 200b1 (8:40b1)
 	db CH7
 	dw SFX_Cry0D_2_Ch3
 
-SFX_Cry0E_2:: ; 200ba (8:40ba)
+SFX_Cry0E_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry0E_2_Ch1
 	db CH5
@@ -197,7 +197,7 @@ SFX_Cry0E_2:: ; 200ba (8:40ba)
 	db CH7
 	dw SFX_Cry0E_2_Ch3
 
-SFX_Cry0F_2:: ; 200c3 (8:40c3)
+SFX_Cry0F_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry0F_2_Ch1
 	db CH5
@@ -205,7 +205,7 @@ SFX_Cry0F_2:: ; 200c3 (8:40c3)
 	db CH7
 	dw SFX_Cry0F_2_Ch3
 
-SFX_Cry10_2:: ; 200cc (8:40cc)
+SFX_Cry10_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry10_2_Ch1
 	db CH5
@@ -213,7 +213,7 @@ SFX_Cry10_2:: ; 200cc (8:40cc)
 	db CH7
 	dw SFX_Cry10_2_Ch3
 
-SFX_Cry11_2:: ; 200d5 (8:40d5)
+SFX_Cry11_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry11_2_Ch1
 	db CH5
@@ -221,7 +221,7 @@ SFX_Cry11_2:: ; 200d5 (8:40d5)
 	db CH7
 	dw SFX_Cry11_2_Ch3
 
-SFX_Cry12_2:: ; 200de (8:40de)
+SFX_Cry12_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry12_2_Ch1
 	db CH5
@@ -229,7 +229,7 @@ SFX_Cry12_2:: ; 200de (8:40de)
 	db CH7
 	dw SFX_Cry12_2_Ch3
 
-SFX_Cry13_2:: ; 200e7 (8:40e7)
+SFX_Cry13_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry13_2_Ch1
 	db CH5
@@ -237,7 +237,7 @@ SFX_Cry13_2:: ; 200e7 (8:40e7)
 	db CH7
 	dw SFX_Cry13_2_Ch3
 
-SFX_Cry14_2:: ; 200f0 (8:40f0)
+SFX_Cry14_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry14_2_Ch1
 	db CH5
@@ -245,7 +245,7 @@ SFX_Cry14_2:: ; 200f0 (8:40f0)
 	db CH7
 	dw SFX_Cry14_2_Ch3
 
-SFX_Cry15_2:: ; 200f9 (8:40f9)
+SFX_Cry15_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry15_2_Ch1
 	db CH5
@@ -253,7 +253,7 @@ SFX_Cry15_2:: ; 200f9 (8:40f9)
 	db CH7
 	dw SFX_Cry15_2_Ch3
 
-SFX_Cry16_2:: ; 20102 (8:4102)
+SFX_Cry16_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry16_2_Ch1
 	db CH5
@@ -261,7 +261,7 @@ SFX_Cry16_2:: ; 20102 (8:4102)
 	db CH7
 	dw SFX_Cry16_2_Ch3
 
-SFX_Cry17_2:: ; 2010b (8:410b)
+SFX_Cry17_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry17_2_Ch1
 	db CH5
@@ -269,7 +269,7 @@ SFX_Cry17_2:: ; 2010b (8:410b)
 	db CH7
 	dw SFX_Cry17_2_Ch3
 
-SFX_Cry18_2:: ; 20114 (8:4114)
+SFX_Cry18_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry18_2_Ch1
 	db CH5
@@ -277,7 +277,7 @@ SFX_Cry18_2:: ; 20114 (8:4114)
 	db CH7
 	dw SFX_Cry18_2_Ch3
 
-SFX_Cry19_2:: ; 2011d (8:411d)
+SFX_Cry19_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry19_2_Ch1
 	db CH5
@@ -285,7 +285,7 @@ SFX_Cry19_2:: ; 2011d (8:411d)
 	db CH7
 	dw SFX_Cry19_2_Ch3
 
-SFX_Cry1A_2:: ; 20126 (8:4126)
+SFX_Cry1A_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry1A_2_Ch1
 	db CH5
@@ -293,7 +293,7 @@ SFX_Cry1A_2:: ; 20126 (8:4126)
 	db CH7
 	dw SFX_Cry1A_2_Ch3
 
-SFX_Cry1B_2:: ; 2012f (8:412f)
+SFX_Cry1B_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry1B_2_Ch1
 	db CH5
@@ -301,7 +301,7 @@ SFX_Cry1B_2:: ; 2012f (8:412f)
 	db CH7
 	dw SFX_Cry1B_2_Ch3
 
-SFX_Cry1C_2:: ; 20138 (8:4138)
+SFX_Cry1C_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry1C_2_Ch1
 	db CH5
@@ -309,7 +309,7 @@ SFX_Cry1C_2:: ; 20138 (8:4138)
 	db CH7
 	dw SFX_Cry1C_2_Ch3
 
-SFX_Cry1D_2:: ; 20141 (8:4141)
+SFX_Cry1D_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry1D_2_Ch1
 	db CH5
@@ -317,7 +317,7 @@ SFX_Cry1D_2:: ; 20141 (8:4141)
 	db CH7
 	dw SFX_Cry1D_2_Ch3
 
-SFX_Cry1E_2:: ; 2014a (8:414a)
+SFX_Cry1E_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry1E_2_Ch1
 	db CH5
@@ -325,7 +325,7 @@ SFX_Cry1E_2:: ; 2014a (8:414a)
 	db CH7
 	dw SFX_Cry1E_2_Ch3
 
-SFX_Cry1F_2:: ; 20153 (8:4153)
+SFX_Cry1F_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry1F_2_Ch1
 	db CH5
@@ -333,7 +333,7 @@ SFX_Cry1F_2:: ; 20153 (8:4153)
 	db CH7
 	dw SFX_Cry1F_2_Ch3
 
-SFX_Cry20_2:: ; 2015c (8:415c)
+SFX_Cry20_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry20_2_Ch1
 	db CH5
@@ -341,7 +341,7 @@ SFX_Cry20_2:: ; 2015c (8:415c)
 	db CH7
 	dw SFX_Cry20_2_Ch3
 
-SFX_Cry21_2:: ; 20165 (8:4165)
+SFX_Cry21_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry21_2_Ch1
 	db CH5
@@ -349,7 +349,7 @@ SFX_Cry21_2:: ; 20165 (8:4165)
 	db CH7
 	dw SFX_Cry21_2_Ch3
 
-SFX_Cry22_2:: ; 2016e (8:416e)
+SFX_Cry22_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry22_2_Ch1
 	db CH5
@@ -357,7 +357,7 @@ SFX_Cry22_2:: ; 2016e (8:416e)
 	db CH7
 	dw SFX_Cry22_2_Ch3
 
-SFX_Cry23_2:: ; 20177 (8:4177)
+SFX_Cry23_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry23_2_Ch1
 	db CH5
@@ -365,7 +365,7 @@ SFX_Cry23_2:: ; 20177 (8:4177)
 	db CH7
 	dw SFX_Cry23_2_Ch3
 
-SFX_Cry24_2:: ; 20180 (8:4180)
+SFX_Cry24_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry24_2_Ch1
 	db CH5
@@ -373,7 +373,7 @@ SFX_Cry24_2:: ; 20180 (8:4180)
 	db CH7
 	dw SFX_Cry24_2_Ch3
 
-SFX_Cry25_2:: ; 20189 (8:4189)
+SFX_Cry25_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry25_2_Ch1
 	db CH5
@@ -381,7 +381,7 @@ SFX_Cry25_2:: ; 20189 (8:4189)
 	db CH7
 	dw SFX_Cry25_2_Ch3
 
-SFX_Level_Up:: ; 20192 (8:4192)
+SFX_Level_Up::
 	db ( $80 | CH4 )
 	dw SFX_Level_Up_Ch1
 	db CH5
@@ -389,7 +389,7 @@ SFX_Level_Up:: ; 20192 (8:4192)
 	db CH6
 	dw SFX_Level_Up_Ch3
 
-SFX_Get_Item2_2:: ; 2019b (8:419b)
+SFX_Get_Item2_2::
 	db ( $80 | CH4 )
 	dw SFX_Get_Item2_2_Ch1
 	db CH5
@@ -397,55 +397,55 @@ SFX_Get_Item2_2:: ; 2019b (8:419b)
 	db CH6
 	dw SFX_Get_Item2_2_Ch3
 
-SFX_Tink_2:: ; 201a4 (8:41a4)
+SFX_Tink_2::
 	db CH4
 	dw SFX_Tink_2_Ch1
 
-SFX_Heal_HP_2:: ; 201a7 (8:41a7)
+SFX_Heal_HP_2::
 	db CH4
 	dw SFX_Heal_HP_2_Ch1
 
-SFX_Heal_Ailment_2:: ; 201aa (8:41aa)
+SFX_Heal_Ailment_2::
 	db CH4
 	dw SFX_Heal_Ailment_2_Ch1
 
-SFX_Start_Menu_2:: ; 201ad (8:41ad)
+SFX_Start_Menu_2::
 	db CH7
 	dw SFX_Start_Menu_2_Ch1
 
-SFX_Press_AB_2:: ; 201b0 (8:41b0)
+SFX_Press_AB_2::
 	db CH4
 	dw SFX_Press_AB_2_Ch1
 
-SFX_Ball_Toss:: ; 201b3 (8:41b3)
+SFX_Ball_Toss::
 	db ( $40 | CH4 )
 	dw SFX_Ball_Toss_Ch1
 	db CH5
 	dw SFX_Ball_Toss_Ch2
 
-SFX_Ball_Poof:: ; 201b9 (8:41b9)
+SFX_Ball_Poof::
 	db ( $40 | CH4 )
 	dw SFX_Ball_Poof_Ch1
 	db CH7
 	dw SFX_Ball_Poof_Ch2
 
-SFX_Faint_Thud:: ; 201bf (8:41bf)
+SFX_Faint_Thud::
 	db ( $40 | CH4 )
 	dw SFX_Faint_Thud_Ch1
 	db CH7
 	dw SFX_Faint_Thud_Ch2
 
-SFX_Run:: ; 201c5 (8:41c5)
+SFX_Run::
 	db CH7
 	dw SFX_Run_Ch1
 
-SFX_Dex_Page_Added:: ; 201c8 (8:41c8)
+SFX_Dex_Page_Added::
 	db ( $40 | CH4 )
 	dw SFX_Dex_Page_Added_Ch1
 	db CH5
 	dw SFX_Dex_Page_Added_Ch2
 
-SFX_Caught_Mon:: ; 201ce (8:41ce)
+SFX_Caught_Mon::
 	db ( $80 | CH4 )
 	dw SFX_Caught_Mon_Ch1
 	db CH5
@@ -453,139 +453,139 @@ SFX_Caught_Mon:: ; 201ce (8:41ce)
 	db CH6
 	dw SFX_Caught_Mon_Ch3
 
-SFX_Peck:: ; 201d7 (8:41d7)
+SFX_Peck::
 	db CH7
 	dw SFX_Peck_Ch1
 
-SFX_Faint_Fall:: ; 201da (8:41da)
+SFX_Faint_Fall::
 	db CH4
 	dw SFX_Faint_Fall_Ch1
 
-SFX_Battle_09:: ; 201dd (8:41dd)
+SFX_Battle_09::
 	db CH4
 	dw SFX_Battle_09_Ch1
 
-SFX_Pound:: ; 201e0 (8:41e0)
+SFX_Pound::
 	db CH7
 	dw SFX_Pound_Ch1
 
-SFX_Battle_0B:: ; 201e3 (8:41e3)
+SFX_Battle_0B::
 	db CH7
 	dw SFX_Battle_0B_Ch1
 
-SFX_Battle_0C:: ; 201e6 (8:41e6)
+SFX_Battle_0C::
 	db CH7
 	dw SFX_Battle_0C_Ch1
 
-SFX_Battle_0D:: ; 201e9 (8:41e9)
+SFX_Battle_0D::
 	db CH7
 	dw SFX_Battle_0D_Ch1
 
-SFX_Battle_0E:: ; 201ec (8:41ec)
+SFX_Battle_0E::
 	db CH7
 	dw SFX_Battle_0E_Ch1
 
-SFX_Battle_0F:: ; 201ef (8:41ef)
+SFX_Battle_0F::
 	db CH7
 	dw SFX_Battle_0F_Ch1
 
-SFX_Damage:: ; 201f2 (8:41f2)
+SFX_Damage::
 	db CH7
 	dw SFX_Damage_Ch1
 
-SFX_Not_Very_Effective:: ; 201f5 (8:41f5)
+SFX_Not_Very_Effective::
 	db CH7
 	dw SFX_Not_Very_Effective_Ch1
 
-SFX_Battle_12:: ; 201f8 (8:41f8)
+SFX_Battle_12::
 	db CH7
 	dw SFX_Battle_12_Ch1
 
-SFX_Battle_13:: ; 201fb (8:41fb)
+SFX_Battle_13::
 	db CH7
 	dw SFX_Battle_13_Ch1
 
-SFX_Battle_14:: ; 201fe (8:41fe)
+SFX_Battle_14::
 	db CH7
 	dw SFX_Battle_14_Ch1
 
-SFX_Vine_Whip:: ; 20201 (8:4201)
+SFX_Vine_Whip::
 	db CH7
 	dw SFX_Vine_Whip_Ch1
 
-SFX_Battle_16:: ; 20204 (8:4204)
+SFX_Battle_16::
 	db CH7
 	dw SFX_Battle_16_Ch1
 
-SFX_Battle_17:: ; 20207 (8:4207)
+SFX_Battle_17::
 	db CH7
 	dw SFX_Battle_17_Ch1
 
-SFX_Battle_18:: ; 2020a (8:420a)
+SFX_Battle_18::
 	db CH7
 	dw SFX_Battle_18_Ch1
 
-SFX_Battle_19:: ; 2020d (8:420d)
+SFX_Battle_19::
 	db CH7
 	dw SFX_Battle_19_Ch1
 
-SFX_Super_Effective:: ; 20210 (8:4210)
+SFX_Super_Effective::
 	db CH7
 	dw SFX_Super_Effective_Ch1
 
-SFX_Battle_1B:: ; 20213 (8:4213)
+SFX_Battle_1B::
 	db CH7
 	dw SFX_Battle_1B_Ch1
 
-SFX_Battle_1C:: ; 20216 (8:4216)
+SFX_Battle_1C::
 	db CH7
 	dw SFX_Battle_1C_Ch1
 
-SFX_Doubleslap:: ; 20219 (8:4219)
+SFX_Doubleslap::
 	db CH7
 	dw SFX_Doubleslap_Ch1
 
-SFX_Battle_1E:: ; 2021c (8:421c)
+SFX_Battle_1E::
 	db ( $40 | CH4 )
 	dw SFX_Battle_1E_Ch1
 	db CH7
 	dw SFX_Battle_1E_Ch2
 
-SFX_Horn_Drill:: ; 20222 (8:4222)
+SFX_Horn_Drill::
 	db CH7
 	dw SFX_Horn_Drill_Ch1
 
-SFX_Battle_20:: ; 20225 (8:4225)
+SFX_Battle_20::
 	db CH7
 	dw SFX_Battle_20_Ch1
 
-SFX_Battle_21:: ; 20228 (8:4228)
+SFX_Battle_21::
 	db CH7
 	dw SFX_Battle_21_Ch1
 
-SFX_Battle_22:: ; 2022b (8:422b)
+SFX_Battle_22::
 	db CH7
 	dw SFX_Battle_22_Ch1
 
-SFX_Battle_23:: ; 2022e (8:422e)
+SFX_Battle_23::
 	db CH7
 	dw SFX_Battle_23_Ch1
 
-SFX_Battle_24:: ; 20231 (8:4231)
+SFX_Battle_24::
 	db ( $40 | CH4 )
 	dw SFX_Battle_24_Ch1
 	db CH7
 	dw SFX_Battle_24_Ch2
 
-SFX_Battle_25:: ; 20237 (8:4237)
+SFX_Battle_25::
 	db CH7
 	dw SFX_Battle_25_Ch1
 
-SFX_Battle_26:: ; 2023a (8:423a)
+SFX_Battle_26::
 	db CH7
 	dw SFX_Battle_26_Ch1
 
-SFX_Battle_27:: ; 2023d (8:423d)
+SFX_Battle_27::
 	db ( $80 | CH4 )
 	dw SFX_Battle_27_Ch1
 	db CH5
@@ -593,7 +593,7 @@ SFX_Battle_27:: ; 2023d (8:423d)
 	db CH7
 	dw SFX_Battle_27_Ch3
 
-SFX_Battle_28:: ; 20246 (8:4246)
+SFX_Battle_28::
 	db ( $80 | CH4 )
 	dw SFX_Battle_28_Ch1
 	db CH5
@@ -601,13 +601,13 @@ SFX_Battle_28:: ; 20246 (8:4246)
 	db CH7
 	dw SFX_Battle_28_Ch3
 
-SFX_Battle_29:: ; 2024f (8:424f)
+SFX_Battle_29::
 	db ( $40 | CH4 )
 	dw SFX_Battle_29_Ch1
 	db CH7
 	dw SFX_Battle_29_Ch2
 
-SFX_Battle_2A:: ; 20255 (8:4255)
+SFX_Battle_2A::
 	db ( $80 | CH4 )
 	dw SFX_Battle_2A_Ch1
 	db CH5
@@ -615,13 +615,13 @@ SFX_Battle_2A:: ; 20255 (8:4255)
 	db CH7
 	dw SFX_Battle_2A_Ch3
 
-SFX_Battle_2B:: ; 2025e (8:425e)
+SFX_Battle_2B::
 	db ( $40 | CH4 )
 	dw SFX_Battle_2B_Ch1
 	db CH7
 	dw SFX_Battle_2B_Ch2
 
-SFX_Battle_2C:: ; 20264 (8:4264)
+SFX_Battle_2C::
 	db ( $80 | CH4 )
 	dw SFX_Battle_2C_Ch1
 	db CH5
@@ -629,7 +629,7 @@ SFX_Battle_2C:: ; 20264 (8:4264)
 	db CH7
 	dw SFX_Battle_2C_Ch3
 
-SFX_Psybeam:: ; 2026d (8:426d)
+SFX_Psybeam::
 	db ( $80 | CH4 )
 	dw SFX_Psybeam_Ch1
 	db CH5
@@ -637,7 +637,7 @@ SFX_Psybeam:: ; 2026d (8:426d)
 	db CH7
 	dw SFX_Psybeam_Ch3
 
-SFX_Battle_2E:: ; 20276 (8:4276)
+SFX_Battle_2E::
 	db ( $80 | CH4 )
 	dw SFX_Battle_2E_Ch1
 	db CH5
@@ -645,7 +645,7 @@ SFX_Battle_2E:: ; 20276 (8:4276)
 	db CH7
 	dw SFX_Battle_2E_Ch3
 
-SFX_Battle_2F:: ; 2027f (8:427f)
+SFX_Battle_2F::
 	db ( $80 | CH4 )
 	dw SFX_Battle_2F_Ch1
 	db CH5
@@ -653,7 +653,7 @@ SFX_Battle_2F:: ; 2027f (8:427f)
 	db CH7
 	dw SFX_Battle_2F_Ch3
 
-SFX_Psychic_M:: ; 20288 (8:4288)
+SFX_Psychic_M::
 	db ( $80 | CH4 )
 	dw SFX_Psychic_M_Ch1
 	db CH5
@@ -661,25 +661,25 @@ SFX_Psychic_M:: ; 20288 (8:4288)
 	db CH7
 	dw SFX_Psychic_M_Ch3
 
-SFX_Battle_31:: ; 20291 (8:4291)
+SFX_Battle_31::
 	db ( $40 | CH4 )
 	dw SFX_Battle_31_Ch1
 	db CH5
 	dw SFX_Battle_31_Ch2
 
-SFX_Battle_32:: ; 20297 (8:4297)
+SFX_Battle_32::
 	db ( $40 | CH4 )
 	dw SFX_Battle_32_Ch1
 	db CH5
 	dw SFX_Battle_32_Ch2
 
-SFX_Battle_33:: ; 2029d (8:429d)
+SFX_Battle_33::
 	db ( $40 | CH4 )
 	dw SFX_Battle_33_Ch1
 	db CH5
 	dw SFX_Battle_33_Ch2
 
-SFX_Battle_34:: ; 202a3 (8:42a3)
+SFX_Battle_34::
 	db ( $80 | CH4 )
 	dw SFX_Battle_34_Ch1
 	db CH5
@@ -687,13 +687,13 @@ SFX_Battle_34:: ; 202a3 (8:42a3)
 	db CH7
 	dw SFX_Battle_34_Ch3
 
-SFX_Battle_35:: ; 202ac (8:42ac)
+SFX_Battle_35::
 	db ( $40 | CH4 )
 	dw SFX_Battle_35_Ch1
 	db CH5
 	dw SFX_Battle_35_Ch2
 
-SFX_Battle_36:: ; 202b2 (8:42b2)
+SFX_Battle_36::
 	db ( $80 | CH4 )
 	dw SFX_Battle_36_Ch1
 	db CH5
@@ -701,6 +701,6 @@ SFX_Battle_36:: ; 202b2 (8:42b2)
 	db CH7
 	dw SFX_Battle_36_Ch3
 
-SFX_Silph_Scope:: ; 202bb (8:42bb)
+SFX_Silph_Scope::
 	db CH4
 	dw SFX_Silph_Scope_Ch1