Rename/organize part 4 of 4

rename functions, clean up address/wram comments, other misc
only broken up so that all changes are viewable on github

227 files changed, 0 insertions, 227 deletions

diff --git a/audio/sfx/sfx_08_01.asm b/audio/sfx/sfx_08_01.asm
index ddfb484c..7d86e4ad 100755
--- a/audio/sfx/sfx_08_01.asm
+++ b/audio/sfx/sfx_08_01.asm
@@ -1,4 +1,3 @@
 SFX_08_01_Ch1: ; 202fd (8:42fd)
 	unknownnoise0x20 0, 193, 51
 	endchannel
-; 0x20301
diff --git a/audio/sfx/sfx_08_02.asm b/audio/sfx/sfx_08_02.asm
index 38464468..1fe0d185 100755
--- a/audio/sfx/sfx_08_02.asm
+++ b/audio/sfx/sfx_08_02.asm
@@ -1,4 +1,3 @@
 SFX_08_02_Ch1: ; 20301 (8:4301)
 	unknownnoise0x20 0, 177, 51
 	endchannel
-; 0x20305
diff --git a/audio/sfx/sfx_08_03.asm b/audio/sfx/sfx_08_03.asm
index 1e20c0ce..141c4e5b 100755
--- a/audio/sfx/sfx_08_03.asm
+++ b/audio/sfx/sfx_08_03.asm
@@ -1,4 +1,3 @@
 SFX_08_03_Ch1: ; 20305 (8:4305)
 	unknownnoise0x20 0, 161, 51
 	endchannel
-; 0x20309
diff --git a/audio/sfx/sfx_08_04.asm b/audio/sfx/sfx_08_04.asm
index 01a30723..923fd349 100755
--- a/audio/sfx/sfx_08_04.asm
+++ b/audio/sfx/sfx_08_04.asm
@@ -1,4 +1,3 @@
 SFX_08_04_Ch1: ; 20309 (8:4309)
 	unknownnoise0x20 0, 129, 51
 	endchannel
-; 0x2030d
diff --git a/audio/sfx/sfx_08_05.asm b/audio/sfx/sfx_08_05.asm
index 1568969c..54745d1f 100755
--- a/audio/sfx/sfx_08_05.asm
+++ b/audio/sfx/sfx_08_05.asm
@@ -6,4 +6,3 @@ SFX_08_05_Ch1: ; 2030d (8:430d)
 	unknownnoise0x20 3, 130, 51
 	unknownnoise0x20 2, 129, 50
 	endchannel
-; 0x20320
diff --git a/audio/sfx/sfx_08_06.asm b/audio/sfx/sfx_08_06.asm
index 6d2d8366..ecd2b191 100755
--- a/audio/sfx/sfx_08_06.asm
+++ b/audio/sfx/sfx_08_06.asm
@@ -1,4 +1,3 @@
 SFX_08_06_Ch1: ; 20320 (8:4320)
 	unknownnoise0x20 0, 81, 42
 	endchannel
-; 0x20324
diff --git a/audio/sfx/sfx_08_07.asm b/audio/sfx/sfx_08_07.asm
index 7392a1d8..a520de0d 100755
--- a/audio/sfx/sfx_08_07.asm
+++ b/audio/sfx/sfx_08_07.asm
@@ -2,4 +2,3 @@ SFX_08_07_Ch1: ; 20324 (8:4324)
 	unknownnoise0x20 1, 65, 43
 	unknownnoise0x20 0, 97, 42
 	endchannel
-; 0x2032b
diff --git a/audio/sfx/sfx_08_08.asm b/audio/sfx/sfx_08_08.asm
index d4ab06c1..6def0c55 100755
--- a/audio/sfx/sfx_08_08.asm
+++ b/audio/sfx/sfx_08_08.asm
@@ -1,4 +1,3 @@
 SFX_08_08_Ch1: ; 2032b (8:432b)
 	unknownnoise0x20 0, 129, 16
 	endchannel
-; 0x2032f
diff --git a/audio/sfx/sfx_08_09.asm b/audio/sfx/sfx_08_09.asm
index 9e801da7..c49c5cb7 100755
--- a/audio/sfx/sfx_08_09.asm
+++ b/audio/sfx/sfx_08_09.asm
@@ -1,4 +1,3 @@
 SFX_08_09_Ch1: ; 2032f (8:432f)
 	unknownnoise0x20 0, 130, 35
 	endchannel
-; 0x20333
diff --git a/audio/sfx/sfx_08_0a.asm b/audio/sfx/sfx_08_0a.asm
index 6da585ac..f5f2ab3c 100755
--- a/audio/sfx/sfx_08_0a.asm
+++ b/audio/sfx/sfx_08_0a.asm
@@ -1,4 +1,3 @@
 SFX_08_0a_Ch1: ; 20333 (8:4333)
 	unknownnoise0x20 0, 130, 37
 	endchannel
-; 0x20337
diff --git a/audio/sfx/sfx_08_0b.asm b/audio/sfx/sfx_08_0b.asm
index c2d0c079..2d45ef7e 100755
--- a/audio/sfx/sfx_08_0b.asm
+++ b/audio/sfx/sfx_08_0b.asm
@@ -1,4 +1,3 @@
 SFX_08_0b_Ch1: ; 20337 (8:4337)
 	unknownnoise0x20 0, 130, 38
 	endchannel
-; 0x2033b
diff --git a/audio/sfx/sfx_08_0c.asm b/audio/sfx/sfx_08_0c.asm
index 9f872678..782ecf90 100755
--- a/audio/sfx/sfx_08_0c.asm
+++ b/audio/sfx/sfx_08_0c.asm
@@ -1,4 +1,3 @@
 SFX_08_0c_Ch1: ; 2033b (8:433b)
 	unknownnoise0x20 0, 161, 16
 	endchannel
-; 0x2033f
diff --git a/audio/sfx/sfx_08_0d.asm b/audio/sfx/sfx_08_0d.asm
index 245add5b..d9ef41d0 100755
--- a/audio/sfx/sfx_08_0d.asm
+++ b/audio/sfx/sfx_08_0d.asm
@@ -1,4 +1,3 @@
 SFX_08_0d_Ch1: ; 2033f (8:433f)
 	unknownnoise0x20 0, 162, 17
 	endchannel
-; 0x20343
diff --git a/audio/sfx/sfx_08_0e.asm b/audio/sfx/sfx_08_0e.asm
index 096e0a33..885225ea 100755
--- a/audio/sfx/sfx_08_0e.asm
+++ b/audio/sfx/sfx_08_0e.asm
@@ -1,4 +1,3 @@
 SFX_08_0e_Ch1: ; 20343 (8:4343)
 	unknownnoise0x20 0, 162, 80
 	endchannel
-; 0x20347
diff --git a/audio/sfx/sfx_08_0f.asm b/audio/sfx/sfx_08_0f.asm
index b7bbfb7f..64f1cbe4 100755
--- a/audio/sfx/sfx_08_0f.asm
+++ b/audio/sfx/sfx_08_0f.asm
@@ -2,4 +2,3 @@ SFX_08_0f_Ch1: ; 20347 (8:4347)
 	unknownnoise0x20 0, 161, 24
 	unknownnoise0x20 0, 49, 51
 	endchannel
-; 0x2034e
diff --git a/audio/sfx/sfx_08_10.asm b/audio/sfx/sfx_08_10.asm
index 6399a966..3643a769 100755
--- a/audio/sfx/sfx_08_10.asm
+++ b/audio/sfx/sfx_08_10.asm
@@ -2,4 +2,3 @@ SFX_08_10_Ch1: ; 2034e (8:434e)
 	unknownnoise0x20 2, 145, 40
 	unknownnoise0x20 0, 113, 24
 	endchannel
-; 0x20355
diff --git a/audio/sfx/sfx_08_11.asm b/audio/sfx/sfx_08_11.asm
index ae617471..bec0220f 100755
--- a/audio/sfx/sfx_08_11.asm
+++ b/audio/sfx/sfx_08_11.asm
@@ -1,4 +1,3 @@
 SFX_08_11_Ch1: ; 20355 (8:4355)
 	unknownnoise0x20 0, 145, 34
 	endchannel
-; 0x20359
diff --git a/audio/sfx/sfx_08_12.asm b/audio/sfx/sfx_08_12.asm
index e391b0a9..7e93326b 100755
--- a/audio/sfx/sfx_08_12.asm
+++ b/audio/sfx/sfx_08_12.asm
@@ -1,4 +1,3 @@
 SFX_08_12_Ch1: ; 20359 (8:4359)
 	unknownnoise0x20 0, 113, 34
 	endchannel
-; 0x2035d
diff --git a/audio/sfx/sfx_08_13.asm b/audio/sfx/sfx_08_13.asm
index 4c478514..7feb8deb 100755
--- a/audio/sfx/sfx_08_13.asm
+++ b/audio/sfx/sfx_08_13.asm
@@ -1,4 +1,3 @@
 SFX_08_13_Ch1: ; 2035d (8:435d)
 	unknownnoise0x20 0, 97, 34
 	endchannel
-; 0x20361
diff --git a/audio/sfx/sfx_08_14.asm b/audio/sfx/sfx_08_14.asm
index c0a7d813..83837768 100755
--- a/audio/sfx/sfx_08_14.asm
+++ b/audio/sfx/sfx_08_14.asm
@@ -19,4 +19,3 @@ SFX_08_14_Ch3: ; 20c4d (8:4c4d)
 	unknownnoise0x20 14, 148, 44
 	unknownnoise0x20 8, 129, 28
 	endchannel
-; 0x20c57
diff --git a/audio/sfx/sfx_08_15.asm b/audio/sfx/sfx_08_15.asm
index ae20351d..94705f71 100755
--- a/audio/sfx/sfx_08_15.asm
+++ b/audio/sfx/sfx_08_15.asm
@@ -22,4 +22,3 @@ SFX_08_15_Ch3: ; 20e65 (8:4e65)
 	unknownnoise0x20 3, 130, 28
 	unknownnoise0x20 8, 113, 44
 	endchannel
-; 0x20e72
diff --git a/audio/sfx/sfx_08_16.asm b/audio/sfx/sfx_08_16.asm
index d8a126ed..e2109f2b 100755
--- a/audio/sfx/sfx_08_16.asm
+++ b/audio/sfx/sfx_08_16.asm
@@ -15,4 +15,3 @@ SFX_08_16_Ch2: ; 20dc3 (8:4dc3)
 
 SFX_08_16_Ch3: ; 20dd1 (8:4dd1)
 	endchannel
-; 0x20dd2
diff --git a/audio/sfx/sfx_08_17.asm b/audio/sfx/sfx_08_17.asm
index 10143636..c8efc25f 100755
--- a/audio/sfx/sfx_08_17.asm
+++ b/audio/sfx/sfx_08_17.asm
@@ -28,4 +28,3 @@ SFX_08_17_Ch3: ; 20b8c (8:4b8c)
 	unknownnoise0x20 12, 182, 76
 	unknownnoise0x20 15, 162, 92
 	endchannel
-; 0x20b99
diff --git a/audio/sfx/sfx_08_18.asm b/audio/sfx/sfx_08_18.asm
index 742edcd0..fce2f3e8 100755
--- a/audio/sfx/sfx_08_18.asm
+++ b/audio/sfx/sfx_08_18.asm
@@ -30,4 +30,3 @@ SFX_08_18_Ch3: ; 20f3b (8:4f3b)
 	unknownnoise0x20 7, 195, 76
 	unknownnoise0x20 8, 161, 92
 	endchannel
-; 0x20f4e
diff --git a/audio/sfx/sfx_08_19.asm b/audio/sfx/sfx_08_19.asm
index af2cab57..ad3a22ad 100755
--- a/audio/sfx/sfx_08_19.asm
+++ b/audio/sfx/sfx_08_19.asm
@@ -17,4 +17,3 @@ SFX_08_19_Ch2: ; 20cf0 (8:4cf0)
 
 SFX_08_19_Ch3: ; 20d02 (8:4d02)
 	endchannel
-; 0x20d03
diff --git a/audio/sfx/sfx_08_1a.asm b/audio/sfx/sfx_08_1a.asm
index 9bd8f231..96df0f42 100755
--- a/audio/sfx/sfx_08_1a.asm
+++ b/audio/sfx/sfx_08_1a.asm
@@ -20,4 +20,3 @@ SFX_08_1a_Ch3: ; 20ca2 (8:4ca2)
 	unknownnoise0x20 15, 215, 156
 	unknownnoise0x20 15, 242, 172
 	endchannel
-; 0x20cb5
diff --git a/audio/sfx/sfx_08_1b.asm b/audio/sfx/sfx_08_1b.asm
index 3ccfdd05..bd7e288f 100755
--- a/audio/sfx/sfx_08_1b.asm
+++ b/audio/sfx/sfx_08_1b.asm
@@ -19,4 +19,3 @@ SFX_08_1b_Ch3: ; 20cd3 (8:4cd3)
 	unknownnoise0x20 15, 230, 76
 	unknownnoise0x20 8, 177, 92
 	endchannel
-; 0x20cdd
diff --git a/audio/sfx/sfx_08_1c.asm b/audio/sfx/sfx_08_1c.asm
index 75f74f3e..e3b904b0 100755
--- a/audio/sfx/sfx_08_1c.asm
+++ b/audio/sfx/sfx_08_1c.asm
@@ -21,4 +21,3 @@ SFX_08_1c_Ch3: ; 20ef3 (8:4ef3)
 	unknownnoise0x20 11, 215, 92
 	unknownnoise0x20 15, 194, 76
 	endchannel
-; 0x20efd
diff --git a/audio/sfx/sfx_08_1d.asm b/audio/sfx/sfx_08_1d.asm
index 44f9a64f..a6f82cf2 100755
--- a/audio/sfx/sfx_08_1d.asm
+++ b/audio/sfx/sfx_08_1d.asm
@@ -33,4 +33,3 @@ SFX_08_1d_Ch3: ; 20a15 (8:4a15)
 	unknownnoise0x20 6, 212, 61
 	unknownnoise0x20 8, 193, 59
 	endchannel
-; 0x20a2e
diff --git a/audio/sfx/sfx_08_1e.asm b/audio/sfx/sfx_08_1e.asm
index 372ecd89..1312f6f2 100755
--- a/audio/sfx/sfx_08_1e.asm
+++ b/audio/sfx/sfx_08_1e.asm
@@ -33,4 +33,3 @@ SFX_08_1e_Ch3: ; 20eb4 (8:4eb4)
 	unknownnoise0x20 3, 164, 44
 	unknownnoise0x20 8, 145, 60
 	endchannel
-; 0x20ecd
diff --git a/audio/sfx/sfx_08_1f.asm b/audio/sfx/sfx_08_1f.asm
index 6ff114ea..ab708929 100755
--- a/audio/sfx/sfx_08_1f.asm
+++ b/audio/sfx/sfx_08_1f.asm
@@ -35,4 +35,3 @@ SFX_08_1f_Ch3: ; 20d4d (8:4d4d)
 	unknownnoise0x20 4, 193, 44
 	unknownnoise0x20 8, 161, 76
 	endchannel
-; 0x20d66
diff --git a/audio/sfx/sfx_08_20.asm b/audio/sfx/sfx_08_20.asm
index 35cd9acc..633276a8 100755
--- a/audio/sfx/sfx_08_20.asm
+++ b/audio/sfx/sfx_08_20.asm
@@ -27,4 +27,3 @@ SFX_08_20_Ch2: ; 20d8d (8:4d8d)
 
 SFX_08_20_Ch3: ; 20db3 (8:4db3)
 	endchannel
-; 0x20db4
diff --git a/audio/sfx/sfx_08_21.asm b/audio/sfx/sfx_08_21.asm
index 50c0106a..5279435a 100755
--- a/audio/sfx/sfx_08_21.asm
+++ b/audio/sfx/sfx_08_21.asm
@@ -38,4 +38,3 @@ SFX_08_21_Ch3: ; 20e20 (8:4e20)
 	unknownnoise0x20 9, 194, 44
 	unknownnoise0x20 4, 161, 60
 	endchannel
-; 0x20e3f
diff --git a/audio/sfx/sfx_08_22.asm b/audio/sfx/sfx_08_22.asm
index a08f0a89..6a54311f 100755
--- a/audio/sfx/sfx_08_22.asm
+++ b/audio/sfx/sfx_08_22.asm
@@ -21,4 +21,3 @@ SFX_08_22_Ch3: ; 20c7d (8:4c7d)
 	unknownnoise0x20 2, 97, 33
 	unknownnoise0x20 8, 97, 17
 	endchannel
-; 0x20c87
diff --git a/audio/sfx/sfx_08_23.asm b/audio/sfx/sfx_08_23.asm
index 8552ddc7..03b63546 100755
--- a/audio/sfx/sfx_08_23.asm
+++ b/audio/sfx/sfx_08_23.asm
@@ -27,4 +27,3 @@ SFX_08_23_Ch3: ; 20bcf (8:4bcf)
 	unknownnoise0x20 8, 183, 92
 	unknownnoise0x20 15, 194, 93
 	endchannel
-; 0x20bdf
diff --git a/audio/sfx/sfx_08_24.asm b/audio/sfx/sfx_08_24.asm
index 9b4def61..f94e2535 100755
--- a/audio/sfx/sfx_08_24.asm
+++ b/audio/sfx/sfx_08_24.asm
@@ -29,4 +29,3 @@ SFX_08_24_Ch3: ; 20c25 (8:4c25)
 	unknownnoise0x20 4, 116, 16
 	unknownnoise0x20 4, 113, 32
 	endchannel
-; 0x20c2f
diff --git a/audio/sfx/sfx_08_25.asm b/audio/sfx/sfx_08_25.asm
index b305664b..55954029 100755
--- a/audio/sfx/sfx_08_25.asm
+++ b/audio/sfx/sfx_08_25.asm
@@ -32,4 +32,3 @@ SFX_08_25_Ch3: ; 20afd (8:4afd)
 	unknownnoise0x20 12, 210, 61
 	unknownnoise0x20 8, 209, 44
 	endchannel
-; 0x20b13
diff --git a/audio/sfx/sfx_08_26.asm b/audio/sfx/sfx_08_26.asm
index dd5f7897..c166605b 100755
--- a/audio/sfx/sfx_08_26.asm
+++ b/audio/sfx/sfx_08_26.asm
@@ -22,4 +22,3 @@ SFX_08_26_Ch3: ; 20ff9 (8:4ff9)
 	unknownnoise0x20 3, 194, 108
 	unknownnoise0x20 8, 209, 92
 	endchannel
-; 0x21006
diff --git a/audio/sfx/sfx_08_27.asm b/audio/sfx/sfx_08_27.asm
index 044e1d6f..9443379c 100755
--- a/audio/sfx/sfx_08_27.asm
+++ b/audio/sfx/sfx_08_27.asm
@@ -28,4 +28,3 @@ SFX_08_27_Ch3: ; 2103c (8:503c)
 	unknownnoise0x20 8, 179, 76
 	unknownnoise0x20 8, 161, 92
 	endchannel
-; 0x2104f
diff --git a/audio/sfx/sfx_08_28.asm b/audio/sfx/sfx_08_28.asm
index c7f7e3a7..178ce5de 100755
--- a/audio/sfx/sfx_08_28.asm
+++ b/audio/sfx/sfx_08_28.asm
@@ -19,4 +19,3 @@ SFX_08_28_Ch3: ; 2106d (8:506d)
 	unknownnoise0x20 14, 196, 60
 	unknownnoise0x20 8, 209, 44
 	endchannel
-; 0x21077
diff --git a/audio/sfx/sfx_08_29.asm b/audio/sfx/sfx_08_29.asm
index 7149e4e1..ff22501f 100755
--- a/audio/sfx/sfx_08_29.asm
+++ b/audio/sfx/sfx_08_29.asm
@@ -28,4 +28,3 @@ SFX_08_29_Ch3: ; 21113 (8:5113)
 	unknownnoise0x20 3, 162, 92
 	unknownnoise0x20 8, 177, 108
 	endchannel
-; 0x21126
diff --git a/audio/sfx/sfx_08_2a.asm b/audio/sfx/sfx_08_2a.asm
index a2b247ef..8b9aeeaf 100755
--- a/audio/sfx/sfx_08_2a.asm
+++ b/audio/sfx/sfx_08_2a.asm
@@ -19,4 +19,3 @@ SFX_08_2a_Ch3: ; 20f8e (8:4f8e)
 	unknownnoise0x20 4, 230, 60
 	unknownnoise0x20 15, 242, 76
 	endchannel
-; 0x20f98
diff --git a/audio/sfx/sfx_08_2b.asm b/audio/sfx/sfx_08_2b.asm
index 36411656..b35755a4 100755
--- a/audio/sfx/sfx_08_2b.asm
+++ b/audio/sfx/sfx_08_2b.asm
@@ -22,4 +22,3 @@ SFX_08_2b_Ch3: ; 2114c (8:514c)
 	unknownnoise0x20 9, 228, 124
 	unknownnoise0x20 15, 226, 108
 	endchannel
-; 0x21159
diff --git a/audio/sfx/sfx_08_2c.asm b/audio/sfx/sfx_08_2c.asm
index 5c7d9541..b2dbc764 100755
--- a/audio/sfx/sfx_08_2c.asm
+++ b/audio/sfx/sfx_08_2c.asm
@@ -32,4 +32,3 @@ SFX_08_2c_Ch3: ; 2127c (8:527c)
 	unknownnoise0x20 6, 180, 60
 	unknownnoise0x20 8, 193, 44
 	endchannel
-; 0x2128f
diff --git a/audio/sfx/sfx_08_2d.asm b/audio/sfx/sfx_08_2d.asm
index 44033318..4f7f5422 100755
--- a/audio/sfx/sfx_08_2d.asm
+++ b/audio/sfx/sfx_08_2d.asm
@@ -16,4 +16,3 @@ SFX_08_2d_Ch2: ; 20f5d (8:4f5d)
 
 SFX_08_2d_Ch3: ; 20f6f (8:4f6f)
 	endchannel
-; 0x20f70
diff --git a/audio/sfx/sfx_08_2e.asm b/audio/sfx/sfx_08_2e.asm
index 617d3b8b..7a6e9257 100755
--- a/audio/sfx/sfx_08_2e.asm
+++ b/audio/sfx/sfx_08_2e.asm
@@ -28,4 +28,3 @@ SFX_08_2e_Ch3: ; 211dd (8:51dd)
 	unknownnoise0x20 2, 226, 60
 	unknownnoise0x20 8, 209, 44
 	endchannel
-; 0x211f0
diff --git a/audio/sfx/sfx_08_2f.asm b/audio/sfx/sfx_08_2f.asm
index 5d786f9c..d26e86c0 100755
--- a/audio/sfx/sfx_08_2f.asm
+++ b/audio/sfx/sfx_08_2f.asm
@@ -24,4 +24,3 @@ SFX_08_2f_Ch3: ; 20fc6 (8:4fc6)
 	unknownnoise0x20 5, 163, 60
 	unknownnoise0x20 8, 145, 44
 	endchannel
-; 0x20fd3
diff --git a/audio/sfx/sfx_08_30.asm b/audio/sfx/sfx_08_30.asm
index 8877a00f..08e7da69 100755
--- a/audio/sfx/sfx_08_30.asm
+++ b/audio/sfx/sfx_08_30.asm
@@ -29,4 +29,3 @@ SFX_08_30_Ch3: ; 21197 (8:5197)
 	unknownnoise0x20 8, 196, 108
 	unknownnoise0x20 15, 179, 92
 	endchannel
-; 0x211a7
diff --git a/audio/sfx/sfx_08_31.asm b/audio/sfx/sfx_08_31.asm
index 5afe29c7..4c06c624 100755
--- a/audio/sfx/sfx_08_31.asm
+++ b/audio/sfx/sfx_08_31.asm
@@ -27,4 +27,3 @@ SFX_08_31_Ch3: ; 21226 (8:5226)
 	unknownnoise0x20 1, 178, 91
 	unknownnoise0x20 15, 194, 76
 	endchannel
-; 0x21236
diff --git a/audio/sfx/sfx_08_32.asm b/audio/sfx/sfx_08_32.asm
index cda5f116..255d24c7 100755
--- a/audio/sfx/sfx_08_32.asm
+++ b/audio/sfx/sfx_08_32.asm
@@ -36,4 +36,3 @@ SFX_08_32_Ch3: ; 210c1 (8:50c1)
 	unknownnoise0x20 5, 146, 26
 	unknownnoise0x20 8, 129, 24
 	endchannel
-; 0x210dd
diff --git a/audio/sfx/sfx_08_33.asm b/audio/sfx/sfx_08_33.asm
index 21c1fd1e..55b09fb1 100755
--- a/audio/sfx/sfx_08_33.asm
+++ b/audio/sfx/sfx_08_33.asm
@@ -22,4 +22,3 @@ SFX_08_33_Ch3: ; 212b5 (8:52b5)
 	unknownnoise0x20 8, 196, 69
 	unknownnoise0x20 8, 177, 68
 	endchannel
-; 0x212c2
diff --git a/audio/sfx/sfx_08_34.asm b/audio/sfx/sfx_08_34.asm
index 4c892016..cabd1ebe 100755
--- a/audio/sfx/sfx_08_34.asm
+++ b/audio/sfx/sfx_08_34.asm
@@ -22,4 +22,3 @@ SFX_08_34_Ch3: ; 212e8 (8:52e8)
 	unknownnoise0x20 14, 210, 86
 	unknownnoise0x20 8, 209, 102
 	endchannel
-; 0x212f5
diff --git a/audio/sfx/sfx_08_35.asm b/audio/sfx/sfx_08_35.asm
index 463f3597..732f7a1e 100755
--- a/audio/sfx/sfx_08_35.asm
+++ b/audio/sfx/sfx_08_35.asm
@@ -25,4 +25,3 @@ SFX_08_35_Ch2: ; 21318 (8:5318)
 
 SFX_08_35_Ch3: ; 2133a (8:533a)
 	endchannel
-; 0x2133b
diff --git a/audio/sfx/sfx_08_36.asm b/audio/sfx/sfx_08_36.asm
index 843fa8e5..47d08af1 100755
--- a/audio/sfx/sfx_08_36.asm
+++ b/audio/sfx/sfx_08_36.asm
@@ -22,4 +22,3 @@ SFX_08_36_Ch3: ; 21361 (8:5361)
 	unknownnoise0x20 1, 162, 57
 	unknownnoise0x20 8, 145, 73
 	endchannel
-; 0x2136e
diff --git a/audio/sfx/sfx_08_37.asm b/audio/sfx/sfx_08_37.asm
index 32a44e59..8df47703 100755
--- a/audio/sfx/sfx_08_37.asm
+++ b/audio/sfx/sfx_08_37.asm
@@ -23,4 +23,3 @@ SFX_08_37_Ch3: ; 20a58 (8:4a58)
 	unknownnoise0x20 15, 215, 60
 	unknownnoise0x20 8, 193, 44
 	endchannel
-; 0x20a65
diff --git a/audio/sfx/sfx_08_38.asm b/audio/sfx/sfx_08_38.asm
index 7db5b654..77df04e1 100755
--- a/audio/sfx/sfx_08_38.asm
+++ b/audio/sfx/sfx_08_38.asm
@@ -31,4 +31,3 @@ SFX_08_38_Ch3: ; 20aab (8:4aab)
 	unknownnoise0x20 12, 183, 76
 	unknownnoise0x20 15, 162, 92
 	endchannel
-; 0x20abb
diff --git a/audio/sfx/sfx_08_39.asm b/audio/sfx/sfx_08_39.asm
index 1b9b0dae..a4d0e0a4 100755
--- a/audio/sfx/sfx_08_39.asm
+++ b/audio/sfx/sfx_08_39.asm
@@ -24,4 +24,3 @@ SFX_08_39_Ch3: ; 20b41 (8:4b41)
 	unknownnoise0x20 10, 182, 44
 	unknownnoise0x20 8, 145, 28
 	endchannel
-; 0x20b4e
diff --git a/audio/sfx/sfx_08_3a.asm b/audio/sfx/sfx_08_3a.asm
index cc992756..afbc50d4 100755
--- a/audio/sfx/sfx_08_3a.asm
+++ b/audio/sfx/sfx_08_3a.asm
@@ -61,4 +61,3 @@ SFX_08_3a_Ch3: ; 239b0 (8:79b0)
 	rest 1
 	A_ 8
 	endchannel
-; 0x239c7
diff --git a/audio/sfx/sfx_08_3b.asm b/audio/sfx/sfx_08_3b.asm
index 6a178f4c..cb7c9a52 100755
--- a/audio/sfx/sfx_08_3b.asm
+++ b/audio/sfx/sfx_08_3b.asm
@@ -67,4 +67,3 @@ SFX_08_3b_Ch3: ; 239fe (8:79fe)
 	rest 1
 	A_ 8
 	endchannel
-; 0x23a13
diff --git a/audio/sfx/sfx_08_3c.asm b/audio/sfx/sfx_08_3c.asm
index 2bbc9caf..0ac2343c 100755
--- a/audio/sfx/sfx_08_3c.asm
+++ b/audio/sfx/sfx_08_3c.asm
@@ -6,4 +6,3 @@ SFX_08_3c_Ch1: ; 203dd (8:43dd)
 	unknownsfx0x20 8, 226, 0, 2
 	unknownsfx0x10 8
 	endchannel
-; 0x203ee
diff --git a/audio/sfx/sfx_08_3d.asm b/audio/sfx/sfx_08_3d.asm
index c263a999..aa9867a1 100755
--- a/audio/sfx/sfx_08_3d.asm
+++ b/audio/sfx/sfx_08_3d.asm
@@ -5,4 +5,3 @@ SFX_08_3d_Ch1: ; 203ee (8:43ee)
 	unknownsfx0x20 15, 242, 80, 6
 	unknownsfx0x10 8
 	endchannel
-; 0x203fd
diff --git a/audio/sfx/sfx_08_3e.asm b/audio/sfx/sfx_08_3e.asm
index 0808979b..30aefce4 100755
--- a/audio/sfx/sfx_08_3e.asm
+++ b/audio/sfx/sfx_08_3e.asm
@@ -7,4 +7,3 @@ SFX_08_3e_Ch1: ; 203fd (8:43fd)
 	unknownsfx0x20 15, 242, 0, 6
 	unknownsfx0x10 8
 	endchannel
-; 0x20412
diff --git a/audio/sfx/sfx_08_3f.asm b/audio/sfx/sfx_08_3f.asm
index 6351f53c..800684d3 100755
--- a/audio/sfx/sfx_08_3f.asm
+++ b/audio/sfx/sfx_08_3f.asm
@@ -2,4 +2,3 @@ SFX_08_3f_Ch1: ; 203d6 (8:43d6)
 	unknownnoise0x20 1, 226, 51
 	unknownnoise0x20 8, 225, 34
 	endchannel
-; 0x203dd
diff --git a/audio/sfx/sfx_08_40.asm b/audio/sfx/sfx_08_40.asm
index f62eb148..7dfae9a7 100755
--- a/audio/sfx/sfx_08_40.asm
+++ b/audio/sfx/sfx_08_40.asm
@@ -5,4 +5,3 @@ SFX_08_40_Ch1: ; 203c3 (8:43c3)
 	unknownsfx0x20 0, 145, 192, 7
 	unknownsfx0x20 12, 161, 208, 7
 	endchannel
-; 0x203d6
diff --git a/audio/sfx/sfx_08_41.asm b/audio/sfx/sfx_08_41.asm
index a4788ad6..ef5998cd 100755
--- a/audio/sfx/sfx_08_41.asm
+++ b/audio/sfx/sfx_08_41.asm
@@ -9,4 +9,3 @@ SFX_08_41_Ch2: ; 20436 (8:4436)
 	duty 2
 	unknownsfx0x20 15, 194, 130, 7
 	endchannel
-; 0x2043d
diff --git a/audio/sfx/sfx_08_42.asm b/audio/sfx/sfx_08_42.asm
index fadf0c42..247a68f3 100755
--- a/audio/sfx/sfx_08_42.asm
+++ b/audio/sfx/sfx_08_42.asm
@@ -9,4 +9,3 @@ SFX_08_42_Ch1: ; 2043d (8:443d)
 SFX_08_42_Ch2: ; 20448 (8:4448)
 	unknownnoise0x20 15, 162, 34
 	endchannel
-; 0x2044c
diff --git a/audio/sfx/sfx_08_43.asm b/audio/sfx/sfx_08_43.asm
index 27bd52fb..23e3b5f0 100755
--- a/audio/sfx/sfx_08_43.asm
+++ b/audio/sfx/sfx_08_43.asm
@@ -9,4 +9,3 @@ SFX_08_43_Ch2: ; 20453 (8:4453)
 	unknownnoise0x20 8, 244, 34
 	unknownnoise0x20 15, 242, 33
 	endchannel
-; 0x2045d
diff --git a/audio/sfx/sfx_08_44.asm b/audio/sfx/sfx_08_44.asm
index 57f8901a..d626f3a1 100755
--- a/audio/sfx/sfx_08_44.asm
+++ b/audio/sfx/sfx_08_44.asm
@@ -11,4 +11,3 @@ SFX_08_44_Ch1: ; 2045d (8:445d)
 	unknownnoise0x20 2, 49, 17
 	unknownnoise0x20 8, 65, 51
 	endchannel
-; 0x2047f
diff --git a/audio/sfx/sfx_08_45.asm b/audio/sfx/sfx_08_45.asm
index 77a1065f..00e5a659 100755
--- a/audio/sfx/sfx_08_45.asm
+++ b/audio/sfx/sfx_08_45.asm
@@ -13,4 +13,3 @@ SFX_08_45_Ch2: ; 20490 (8:4490)
 	unknownsfx0x20 15, 146, 0, 6
 	unknownsfx0x20 15, 146, 130, 7
 	endchannel
-; 0x2049b
diff --git a/audio/sfx/sfx_08_46.asm b/audio/sfx/sfx_08_46.asm
index 4e4732c5..de64873a 100755
--- a/audio/sfx/sfx_08_46.asm
+++ b/audio/sfx/sfx_08_46.asm
@@ -59,4 +59,3 @@ SFX_08_46_Ch3: ; 23a44 (8:7a44)
 	G_ 2
 	G# 4
 	endchannel
-; 0x23a53
diff --git a/audio/sfx/sfx_08_47.asm b/audio/sfx/sfx_08_47.asm
index 47f8b645..6ca2e38c 100755
--- a/audio/sfx/sfx_08_47.asm
+++ b/audio/sfx/sfx_08_47.asm
@@ -1,4 +1,3 @@
 SFX_08_47_Ch1: ; 204aa (8:44aa)
 	unknownnoise0x20 2, 161, 18
 	endchannel
-; 0x204ae
diff --git a/audio/sfx/sfx_08_48.asm b/audio/sfx/sfx_08_48.asm
index 0792ae25..f974a6f9 100755
--- a/audio/sfx/sfx_08_48.asm
+++ b/audio/sfx/sfx_08_48.asm
@@ -4,4 +4,3 @@ SFX_08_48_Ch1: ; 204ae (8:44ae)
 	unknownsfx0x20 15, 242, 128, 7
 	unknownsfx0x10 8
 	endchannel
-; 0x204b9
diff --git a/audio/sfx/sfx_08_49.asm b/audio/sfx/sfx_08_49.asm
index 9d145c09..0d4ef5e7 100755
--- a/audio/sfx/sfx_08_49.asm
+++ b/audio/sfx/sfx_08_49.asm
@@ -4,4 +4,3 @@ SFX_08_49_Ch1: ; 204b9 (8:44b9)
 	unknownsfx0x20 15, 242, 0, 5
 	unknownsfx0x10 8
 	endchannel
-; 0x204c4
diff --git a/audio/sfx/sfx_08_4a.asm b/audio/sfx/sfx_08_4a.asm
index f566332b..d79cef4e 100755
--- a/audio/sfx/sfx_08_4a.asm
+++ b/audio/sfx/sfx_08_4a.asm
@@ -1,4 +1,3 @@
 SFX_08_4a_Ch1: ; 204c4 (8:44c4)
 	unknownnoise0x20 2, 161, 34
 	endchannel
-; 0x204c8
diff --git a/audio/sfx/sfx_08_4b.asm b/audio/sfx/sfx_08_4b.asm
index 24e6bfc3..5b654931 100755
--- a/audio/sfx/sfx_08_4b.asm
+++ b/audio/sfx/sfx_08_4b.asm
@@ -1,4 +1,3 @@
 SFX_08_4b_Ch1: ; 204c8 (8:44c8)
 	unknownnoise0x20 8, 241, 84
 	endchannel
-; 0x204cc
diff --git a/audio/sfx/sfx_08_4c.asm b/audio/sfx/sfx_08_4c.asm
index 3b4d0350..b80af081 100755
--- a/audio/sfx/sfx_08_4c.asm
+++ b/audio/sfx/sfx_08_4c.asm
@@ -3,4 +3,3 @@ SFX_08_4c_Ch1: ; 204cc (8:44cc)
 	unknownnoise0x20 4, 255, 18
 	unknownnoise0x20 10, 241, 85
 	endchannel
-; 0x204d6
diff --git a/audio/sfx/sfx_08_4d.asm b/audio/sfx/sfx_08_4d.asm
index 90c2fe6c..3dc43ae0 100755
--- a/audio/sfx/sfx_08_4d.asm
+++ b/audio/sfx/sfx_08_4d.asm
@@ -3,4 +3,3 @@ SFX_08_4d_Ch1: ; 204d6 (8:44d6)
 	unknownnoise0x20 8, 242, 53
 	unknownnoise0x20 10, 241, 85
 	endchannel
-; 0x204e0
diff --git a/audio/sfx/sfx_08_4e.asm b/audio/sfx/sfx_08_4e.asm
index 172d245c..db621af9 100755
--- a/audio/sfx/sfx_08_4e.asm
+++ b/audio/sfx/sfx_08_4e.asm
@@ -2,4 +2,3 @@ SFX_08_4e_Ch1: ; 204e0 (8:44e0)
 	unknownnoise0x20 15, 159, 35
 	unknownnoise0x20 8, 241, 33
 	endchannel
-; 0x204e7
diff --git a/audio/sfx/sfx_08_4f.asm b/audio/sfx/sfx_08_4f.asm
index d8f45c20..74337020 100755
--- a/audio/sfx/sfx_08_4f.asm
+++ b/audio/sfx/sfx_08_4f.asm
@@ -4,4 +4,3 @@ SFX_08_4f_Ch1: ; 204e7 (8:44e7)
 	unknownnoise0x20 2, 225, 58
 	unknownnoise0x20 6, 241, 52
 	endchannel
-; 0x204f4
diff --git a/audio/sfx/sfx_08_50.asm b/audio/sfx/sfx_08_50.asm
index 23b6d22c..ae3f9974 100755
--- a/audio/sfx/sfx_08_50.asm
+++ b/audio/sfx/sfx_08_50.asm
@@ -3,4 +3,3 @@ SFX_08_50_Ch1: ; 204f4 (8:44f4)
 	unknownnoise0x20 2, 244, 20
 	unknownnoise0x20 15, 241, 50
 	endchannel
-; 0x204fe
diff --git a/audio/sfx/sfx_08_51.asm b/audio/sfx/sfx_08_51.asm
index d34a0d2b..bd4f3b24 100755
--- a/audio/sfx/sfx_08_51.asm
+++ b/audio/sfx/sfx_08_51.asm
@@ -4,4 +4,3 @@ SFX_08_51_Ch1: ; 204fe (8:44fe)
 	unknownnoise0x20 8, 244, 34
 	unknownnoise0x20 15, 242, 33
 	endchannel
-; 0x2050b
diff --git a/audio/sfx/sfx_08_52.asm b/audio/sfx/sfx_08_52.asm
index 1ffbbd25..9bf7c91d 100755
--- a/audio/sfx/sfx_08_52.asm
+++ b/audio/sfx/sfx_08_52.asm
@@ -4,4 +4,3 @@ SFX_08_52_Ch1: ; 2050b (8:450b)
 	unknownnoise0x20 6, 242, 35
 	loopchannel 4, SFX_08_52_Ch1
 	endchannel
-; 0x20519
diff --git a/audio/sfx/sfx_08_53.asm b/audio/sfx/sfx_08_53.asm
index aae94ed9..c61465e9 100755
--- a/audio/sfx/sfx_08_53.asm
+++ b/audio/sfx/sfx_08_53.asm
@@ -4,4 +4,3 @@ SFX_08_53_Ch1: ; 20519 (8:4519)
 	unknownnoise0x20 6, 242, 35
 	unknownnoise0x20 15, 242, 34
 	endchannel
-; 0x20526
diff --git a/audio/sfx/sfx_08_54.asm b/audio/sfx/sfx_08_54.asm
index 92f84454..25a2c4fd 100755
--- a/audio/sfx/sfx_08_54.asm
+++ b/audio/sfx/sfx_08_54.asm
@@ -4,4 +4,3 @@ SFX_08_54_Ch1: ; 20526 (8:4526)
 	unknownnoise0x20 8, 242, 84
 	unknownnoise0x20 8, 241, 101
 	endchannel
-; 0x20533
diff --git a/audio/sfx/sfx_08_55.asm b/audio/sfx/sfx_08_55.asm
index 50b73f0d..caecb7ce 100755
--- a/audio/sfx/sfx_08_55.asm
+++ b/audio/sfx/sfx_08_55.asm
@@ -8,4 +8,3 @@ SFX_08_55_Ch1: ; 20533 (8:4533)
 	unknownnoise0x20 12, 145, 16
 	unknownnoise0x20 8, 242, 65
 	endchannel
-; 0x2054c
diff --git a/audio/sfx/sfx_08_56.asm b/audio/sfx/sfx_08_56.asm
index db106420..d5653379 100755
--- a/audio/sfx/sfx_08_56.asm
+++ b/audio/sfx/sfx_08_56.asm
@@ -3,4 +3,3 @@ SFX_08_56_Ch1: ; 2054c (8:454c)
 	unknownnoise0x20 1, 180, 34
 	unknownnoise0x20 8, 241, 68
 	endchannel
-; 0x20556
diff --git a/audio/sfx/sfx_08_57.asm b/audio/sfx/sfx_08_57.asm
index d69c0e11..40e0ea8f 100755
--- a/audio/sfx/sfx_08_57.asm
+++ b/audio/sfx/sfx_08_57.asm
@@ -4,4 +4,3 @@ SFX_08_57_Ch1: ; 20556 (8:4556)
 	unknownnoise0x20 4, 241, 68
 	unknownnoise0x20 8, 241, 85
 	endchannel
-; 0x20563
diff --git a/audio/sfx/sfx_08_58.asm b/audio/sfx/sfx_08_58.asm
index 92a51d59..3cb23fb0 100755
--- a/audio/sfx/sfx_08_58.asm
+++ b/audio/sfx/sfx_08_58.asm
@@ -2,4 +2,3 @@ SFX_08_58_Ch1: ; 20563 (8:4563)
 	unknownnoise0x20 4, 255, 85
 	unknownnoise0x20 8, 241, 101
 	endchannel
-; 0x2056a
diff --git a/audio/sfx/sfx_08_59.asm b/audio/sfx/sfx_08_59.asm
index c8f67cc0..c42f6127 100755
--- a/audio/sfx/sfx_08_59.asm
+++ b/audio/sfx/sfx_08_59.asm
@@ -3,4 +3,3 @@ SFX_08_59_Ch1: ; 2056a (8:456a)
 	unknownnoise0x20 2, 196, 34
 	unknownnoise0x20 8, 242, 52
 	endchannel
-; 0x20574
diff --git a/audio/sfx/sfx_08_5a.asm b/audio/sfx/sfx_08_5a.asm
index 788ac25e..282fea80 100755
--- a/audio/sfx/sfx_08_5a.asm
+++ b/audio/sfx/sfx_08_5a.asm
@@ -2,4 +2,3 @@ SFX_08_5a_Ch1: ; 20574 (8:4574)
 	unknownnoise0x20 4, 241, 52
 	unknownnoise0x20 15, 242, 100
 	endchannel
-; 0x2057b
diff --git a/audio/sfx/sfx_08_5b.asm b/audio/sfx/sfx_08_5b.asm
index 31a58537..7bf3e2c8 100755
--- a/audio/sfx/sfx_08_5b.asm
+++ b/audio/sfx/sfx_08_5b.asm
@@ -2,4 +2,3 @@ SFX_08_5b_Ch1: ; 2057b (8:457b)
 	unknownnoise0x20 2, 241, 34
 	unknownnoise0x20 15, 242, 18
 	endchannel
-; 0x20582
diff --git a/audio/sfx/sfx_08_5c.asm b/audio/sfx/sfx_08_5c.asm
index f14c9aab..25618291 100755
--- a/audio/sfx/sfx_08_5c.asm
+++ b/audio/sfx/sfx_08_5c.asm
@@ -3,4 +3,3 @@ SFX_08_5c_Ch1: ; 20582 (8:4582)
 	unknownnoise0x20 15, 244, 1
 	unknownnoise0x20 15, 242, 1
 	endchannel
-; 0x2058c
diff --git a/audio/sfx/sfx_08_5d.asm b/audio/sfx/sfx_08_5d.asm
index c973dcf6..9bd39269 100755
--- a/audio/sfx/sfx_08_5d.asm
+++ b/audio/sfx/sfx_08_5d.asm
@@ -2,4 +2,3 @@ SFX_08_5d_Ch1: ; 2058c (8:458c)
 	unknownnoise0x20 8, 241, 50
 	unknownnoise0x20 8, 241, 51
 	endchannel
-; 0x20593
diff --git a/audio/sfx/sfx_08_5e.asm b/audio/sfx/sfx_08_5e.asm
index 366a6410..a765d263 100755
--- a/audio/sfx/sfx_08_5e.asm
+++ b/audio/sfx/sfx_08_5e.asm
@@ -14,4 +14,3 @@ SFX_08_5e_Ch2: ; 205a4 (8:45a4)
 	unknownnoise0x20 0, 209, 34
 	unknownnoise0x20 6, 161, 50
 	endchannel
-; 0x205b1
diff --git a/audio/sfx/sfx_08_5f.asm b/audio/sfx/sfx_08_5f.asm
index cd5da5a0..0cb02ba3 100755
--- a/audio/sfx/sfx_08_5f.asm
+++ b/audio/sfx/sfx_08_5f.asm
@@ -4,4 +4,3 @@ SFX_08_5f_Ch1: ; 205b1 (8:45b1)
 	unknownnoise0x20 3, 194, 51
 	unknownnoise0x20 8, 241, 84
 	endchannel
-; 0x205be
diff --git a/audio/sfx/sfx_08_60.asm b/audio/sfx/sfx_08_60.asm
index a1ae9cdb..7aa37833 100755
--- a/audio/sfx/sfx_08_60.asm
+++ b/audio/sfx/sfx_08_60.asm
@@ -2,4 +2,3 @@ SFX_08_60_Ch1: ; 205be (8:45be)
 	unknownnoise0x20 12, 241, 84
 	unknownnoise0x20 8, 241, 100
 	endchannel
-; 0x205c5
diff --git a/audio/sfx/sfx_08_61.asm b/audio/sfx/sfx_08_61.asm
index c930fed6..343a5c0c 100755
--- a/audio/sfx/sfx_08_61.asm
+++ b/audio/sfx/sfx_08_61.asm
@@ -5,4 +5,3 @@ SFX_08_61_Ch1: ; 205c5 (8:45c5)
 	unknownnoise0x20 15, 130, 50
 	unknownnoise0x20 8, 241, 52
 	endchannel
-; 0x205d5
diff --git a/audio/sfx/sfx_08_62.asm b/audio/sfx/sfx_08_62.asm
index 62f178fb..a7cfed2d 100755
--- a/audio/sfx/sfx_08_62.asm
+++ b/audio/sfx/sfx_08_62.asm
@@ -2,4 +2,3 @@ SFX_08_62_Ch1: ; 205d5 (8:45d5)
 	unknownnoise0x20 2, 210, 50
 	unknownnoise0x20 15, 242, 67
 	endchannel
-; 0x205dc
diff --git a/audio/sfx/sfx_08_63.asm b/audio/sfx/sfx_08_63.asm
index a69c6976..432d088c 100755
--- a/audio/sfx/sfx_08_63.asm
+++ b/audio/sfx/sfx_08_63.asm
@@ -5,4 +5,3 @@ SFX_08_63_Ch1: ; 205dc (8:45dc)
 	unknownnoise0x20 7, 100, 0
 	unknownnoise0x20 15, 242, 85
 	endchannel
-; 0x205ec
diff --git a/audio/sfx/sfx_08_64.asm b/audio/sfx/sfx_08_64.asm
index ad463435..c34d64ce 100755
--- a/audio/sfx/sfx_08_64.asm
+++ b/audio/sfx/sfx_08_64.asm
@@ -10,4 +10,3 @@ SFX_08_64_Ch2: ; 205f7 (8:45f7)
 	unknownnoise0x20 15, 63, 34
 	unknownnoise0x20 15, 242, 33
 	endchannel
-; 0x205fe
diff --git a/audio/sfx/sfx_08_65.asm b/audio/sfx/sfx_08_65.asm
index 2e2faa15..a92539c3 100755
--- a/audio/sfx/sfx_08_65.asm
+++ b/audio/sfx/sfx_08_65.asm
@@ -5,4 +5,3 @@ SFX_08_65_Ch1: ; 205fe (8:45fe)
 	unknownnoise0x20 8, 242, 66
 	unknownnoise0x20 15, 242, 65
 	endchannel
-; 0x2060e
diff --git a/audio/sfx/sfx_08_66.asm b/audio/sfx/sfx_08_66.asm
index 03e351e7..d72b0349 100755
--- a/audio/sfx/sfx_08_66.asm
+++ b/audio/sfx/sfx_08_66.asm
@@ -7,4 +7,3 @@ SFX_08_66_Ch1: ; 2060e (8:460e)
 	unknownnoise0x20 8, 255, 84
 	unknownnoise0x20 15, 242, 84
 	endchannel
-; 0x20624
diff --git a/audio/sfx/sfx_08_67.asm b/audio/sfx/sfx_08_67.asm
index 89a5cbc7..6e94addf 100755
--- a/audio/sfx/sfx_08_67.asm
+++ b/audio/sfx/sfx_08_67.asm
@@ -25,4 +25,3 @@ SFX_08_67_Ch3: ; 2064a (8:464a)
 	unknownnoise0x20 3, 161, 17
 	loopchannel 10, SFX_08_67_Ch3
 	endchannel
-; 0x20655
diff --git a/audio/sfx/sfx_08_68.asm b/audio/sfx/sfx_08_68.asm
index e0fd06c5..691b9b1f 100755
--- a/audio/sfx/sfx_08_68.asm
+++ b/audio/sfx/sfx_08_68.asm
@@ -19,4 +19,3 @@ SFX_08_68_Ch3: ; 20673 (8:4673)
 	unknownnoise0x20 1, 209, 41
 	loopchannel 6, SFX_08_68_Ch3
 	endchannel
-; 0x2067e
diff --git a/audio/sfx/sfx_08_69.asm b/audio/sfx/sfx_08_69.asm
index 7e1bafae..f202a156 100755
--- a/audio/sfx/sfx_08_69.asm
+++ b/audio/sfx/sfx_08_69.asm
@@ -16,4 +16,3 @@ SFX_08_69_Ch2: ; 20695 (8:4695)
 	unknownnoise0x20 12, 245, 156
 	unknownnoise0x20 15, 244, 172
 	endchannel
-; 0x206a9
diff --git a/audio/sfx/sfx_08_6a.asm b/audio/sfx/sfx_08_6a.asm
index f38948a4..3076956a 100755
--- a/audio/sfx/sfx_08_6a.asm
+++ b/audio/sfx/sfx_08_6a.asm
@@ -26,4 +26,3 @@ SFX_08_6a_Ch3: ; 206db (8:46db)
 	unknownnoise0x20 15, 195, 50
 	loopchannel 2, SFX_08_6a_Ch3
 	endchannel
-; 0x206ec
diff --git a/audio/sfx/sfx_08_6b.asm b/audio/sfx/sfx_08_6b.asm
index 85226308..60783be6 100755
--- a/audio/sfx/sfx_08_6b.asm
+++ b/audio/sfx/sfx_08_6b.asm
@@ -19,4 +19,3 @@ SFX_08_6b_Ch2: ; 2070b (8:470b)
 	loopchannel 5, SFX_08_6b_Ch2
 	unknownnoise0x20 8, 129, 18
 	endchannel
-; 0x20722
diff --git a/audio/sfx/sfx_08_6c.asm b/audio/sfx/sfx_08_6c.asm
index 93821db5..cf83608d 100755
--- a/audio/sfx/sfx_08_6c.asm
+++ b/audio/sfx/sfx_08_6c.asm
@@ -23,4 +23,3 @@ SFX_08_6c_Ch3: ; 20748 (8:4748)
 	unknownnoise0x20 15, 244, 65
 	loopchannel 3, SFX_08_6c_Ch3
 	endchannel
-; 0x20759
diff --git a/audio/sfx/sfx_08_6d.asm b/audio/sfx/sfx_08_6d.asm
index 7693df84..6971a30e 100755
--- a/audio/sfx/sfx_08_6d.asm
+++ b/audio/sfx/sfx_08_6d.asm
@@ -23,4 +23,3 @@ SFX_08_6d_Ch3: ; 20787 (8:4787)
 	unknownnoise0x20 2, 210, 42
 	loopchannel 21, SFX_08_6d_Ch3
 	endchannel
-; 0x20792
diff --git a/audio/sfx/sfx_08_6e.asm b/audio/sfx/sfx_08_6e.asm
index 6a5749c9..00b2c148 100755
--- a/audio/sfx/sfx_08_6e.asm
+++ b/audio/sfx/sfx_08_6e.asm
@@ -25,4 +25,3 @@ SFX_08_6e_Ch3: ; 207c0 (8:47c0)
 	unknownnoise0x20 5, 210, 18
 	loopchannel 9, SFX_08_6e_Ch3
 	endchannel
-; 0x207d1
diff --git a/audio/sfx/sfx_08_6f.asm b/audio/sfx/sfx_08_6f.asm
index c233fd90..69b85d33 100755
--- a/audio/sfx/sfx_08_6f.asm
+++ b/audio/sfx/sfx_08_6f.asm
@@ -19,4 +19,3 @@ SFX_08_6f_Ch3: ; 207ef (8:47ef)
 	unknownnoise0x20 4, 242, 68
 	loopchannel 9, SFX_08_6f_Ch3
 	endchannel
-; 0x207fa
diff --git a/audio/sfx/sfx_08_70.asm b/audio/sfx/sfx_08_70.asm
index 9ac504ff..7a07b340 100755
--- a/audio/sfx/sfx_08_70.asm
+++ b/audio/sfx/sfx_08_70.asm
@@ -30,4 +30,3 @@ SFX_08_70_Ch3: ; 20834 (8:4834)
 	unknownnoise0x20 15, 207, 16
 	unknownnoise0x20 15, 194, 16
 	endchannel
-; 0x20847
diff --git a/audio/sfx/sfx_08_71.asm b/audio/sfx/sfx_08_71.asm
index 92a81006..7b306557 100755
--- a/audio/sfx/sfx_08_71.asm
+++ b/audio/sfx/sfx_08_71.asm
@@ -16,4 +16,3 @@ SFX_08_71_Ch2: ; 2085e (8:485e)
 	unknownsfx0x20 15, 255, 225, 7
 	unknownsfx0x20 15, 242, 226, 7
 	endchannel
-; 0x20875
diff --git a/audio/sfx/sfx_08_72.asm b/audio/sfx/sfx_08_72.asm
index ba307ca0..13000d01 100755
--- a/audio/sfx/sfx_08_72.asm
+++ b/audio/sfx/sfx_08_72.asm
@@ -10,4 +10,3 @@ SFX_08_72_Ch2: ; 20880 (8:4880)
 	duty 3
 	unknownsfx0x20 8, 241, 1, 7
 	endchannel
-; 0x20887
diff --git a/audio/sfx/sfx_08_73.asm b/audio/sfx/sfx_08_73.asm
index c1b189fc..7829fbcd 100755
--- a/audio/sfx/sfx_08_73.asm
+++ b/audio/sfx/sfx_08_73.asm
@@ -16,4 +16,3 @@ SFX_08_73_Ch2: ; 2089e (8:489e)
 	unknownsfx0x20 6, 225, 144, 6
 	unknownsfx0x20 8, 225, 16, 7
 	endchannel
-; 0x208b5
diff --git a/audio/sfx/sfx_08_74.asm b/audio/sfx/sfx_08_74.asm
index 37332169..f8144908 100755
--- a/audio/sfx/sfx_08_74.asm
+++ b/audio/sfx/sfx_08_74.asm
@@ -20,4 +20,3 @@ SFX_08_74_Ch3: ; 208d3 (8:48d3)
 	unknownnoise0x20 15, 255, 85
 	unknownnoise0x20 15, 243, 86
 	endchannel
-; 0x208e0
diff --git a/audio/sfx/sfx_08_75.asm b/audio/sfx/sfx_08_75.asm
index f1513d04..cda1c65f 100755
--- a/audio/sfx/sfx_08_75.asm
+++ b/audio/sfx/sfx_08_75.asm
@@ -27,4 +27,3 @@ SFX_08_75_Ch2: ; 208f0 (8:48f0)
 	octave 5
 	G# 8
 	endchannel
-; 0x20902
diff --git a/audio/sfx/sfx_08_76.asm b/audio/sfx/sfx_08_76.asm
index 1318b1e2..b60e51aa 100755
--- a/audio/sfx/sfx_08_76.asm
+++ b/audio/sfx/sfx_08_76.asm
@@ -45,4 +45,3 @@ SFX_08_76_Ch3: ; 20980 (8:4980)
 	unknownnoise0x20 1, 209, 41
 	loopchannel 26, SFX_08_76_Ch3
 	endchannel
-; 0x2098b
diff --git a/audio/sfx/sfx_08_77.asm b/audio/sfx/sfx_08_77.asm
index 54a0aa3b..840a0ea5 100755
--- a/audio/sfx/sfx_08_77.asm
+++ b/audio/sfx/sfx_08_77.asm
@@ -7,4 +7,3 @@ SFX_08_77_Ch1: ; 20412 (8:4412)
 	unknownsfx0x20 10, 225, 224, 7
 	unknownsfx0x20 1, 0, 0, 0
 	endchannel
-; 0x2042d
diff --git a/audio/sfx/sfx_08_pokeflute.asm b/audio/sfx/sfx_08_pokeflute.asm
index 4c015e73..4ccf89d8 100755
--- a/audio/sfx/sfx_08_pokeflute.asm
+++ b/audio/sfx/sfx_08_pokeflute.asm
@@ -12,4 +12,3 @@ SFX_08_PokeFlute_Ch2: ; 22325 (8:6325)
 	rest 5
 	rest 5
 	endchannel
-; 0x2232f
diff --git a/audio/sfx/sfx_08_pokeflute_ch3.asm b/audio/sfx/sfx_08_pokeflute_ch3.asm
index e0060d7f..0652e673 100755
--- a/audio/sfx/sfx_08_pokeflute_ch3.asm
+++ b/audio/sfx/sfx_08_pokeflute_ch3.asm
@@ -11,4 +11,3 @@ SFX_08_PokeFlute_Ch3: ; 2049b (8:449b)
 	octave 6
 	C_ 13
 	endchannel
-; 0x204aa
diff --git a/audio/sfx/sfx_08_unused.asm b/audio/sfx/sfx_08_unused.asm
index 857502d3..25e4840c 100755
--- a/audio/sfx/sfx_08_unused.asm
+++ b/audio/sfx/sfx_08_unused.asm
@@ -29,4 +29,3 @@ SFX_08_unused_Ch3: ; 209c1 (8:49c1)
 	unknownnoise0x20 12, 125, 76
 	unknownnoise0x20 15, 211, 76
 	endchannel
-; 0x209d7
diff --git a/audio/sfx/sfx_08_unused2.asm b/audio/sfx/sfx_08_unused2.asm
index e69ec72d..1eca4432 100755
--- a/audio/sfx/sfx_08_unused2.asm
+++ b/audio/sfx/sfx_08_unused2.asm
@@ -54,4 +54,3 @@ SFX_08_unused2_Ch3: ; 22359 (8:6359)
 	B_ 4
 	rest 4
 	endchannel
-; 0x22370
diff --git a/audio/sfx/sfx_1f_01.asm b/audio/sfx/sfx_1f_01.asm
index dec8baa6..bd3a2efe 100755
--- a/audio/sfx/sfx_1f_01.asm
+++ b/audio/sfx/sfx_1f_01.asm
@@ -1,4 +1,3 @@
 SFX_1f_01_Ch1: ; 7c2fd (1f:42fd)
 	unknownnoise0x20 0, 193, 51
 	endchannel
-; 0x7c301
diff --git a/audio/sfx/sfx_1f_02.asm b/audio/sfx/sfx_1f_02.asm
index d383abed..9ee8923b 100755
--- a/audio/sfx/sfx_1f_02.asm
+++ b/audio/sfx/sfx_1f_02.asm
@@ -1,4 +1,3 @@
 SFX_1f_02_Ch1: ; 7c301 (1f:4301)
 	unknownnoise0x20 0, 177, 51
 	endchannel
-; 0x7c305
diff --git a/audio/sfx/sfx_1f_03.asm b/audio/sfx/sfx_1f_03.asm
index 57e18697..55d249a7 100755
--- a/audio/sfx/sfx_1f_03.asm
+++ b/audio/sfx/sfx_1f_03.asm
@@ -1,4 +1,3 @@
 SFX_1f_03_Ch1: ; 7c305 (1f:4305)
 	unknownnoise0x20 0, 161, 51
 	endchannel
-; 0x7c309
diff --git a/audio/sfx/sfx_1f_04.asm b/audio/sfx/sfx_1f_04.asm
index 587d9f22..8906de66 100755
--- a/audio/sfx/sfx_1f_04.asm
+++ b/audio/sfx/sfx_1f_04.asm
@@ -1,4 +1,3 @@
 SFX_1f_04_Ch1: ; 7c309 (1f:4309)
 	unknownnoise0x20 0, 129, 51
 	endchannel
-; 0x7c30d
diff --git a/audio/sfx/sfx_1f_05.asm b/audio/sfx/sfx_1f_05.asm
index 1edcdf20..9c0e679b 100755
--- a/audio/sfx/sfx_1f_05.asm
+++ b/audio/sfx/sfx_1f_05.asm
@@ -6,4 +6,3 @@ SFX_1f_05_Ch1: ; 7c30d (1f:430d)
 	unknownnoise0x20 3, 130, 51
 	unknownnoise0x20 2, 129, 50
 	endchannel
-; 0x7c320
diff --git a/audio/sfx/sfx_1f_06.asm b/audio/sfx/sfx_1f_06.asm
index 0470795c..429f18ff 100755
--- a/audio/sfx/sfx_1f_06.asm
+++ b/audio/sfx/sfx_1f_06.asm
@@ -1,4 +1,3 @@
 SFX_1f_06_Ch1: ; 7c320 (1f:4320)
 	unknownnoise0x20 0, 81, 42
 	endchannel
-; 0x7c324
diff --git a/audio/sfx/sfx_1f_07.asm b/audio/sfx/sfx_1f_07.asm
index 0471d63a..1dd80c9e 100755
--- a/audio/sfx/sfx_1f_07.asm
+++ b/audio/sfx/sfx_1f_07.asm
@@ -2,4 +2,3 @@ SFX_1f_07_Ch1: ; 7c324 (1f:4324)
 	unknownnoise0x20 1, 65, 43
 	unknownnoise0x20 0, 97, 42
 	endchannel
-; 0x7c32b
diff --git a/audio/sfx/sfx_1f_08.asm b/audio/sfx/sfx_1f_08.asm
index 94c0e10d..f741bdf1 100755
--- a/audio/sfx/sfx_1f_08.asm
+++ b/audio/sfx/sfx_1f_08.asm
@@ -1,4 +1,3 @@
 SFX_1f_08_Ch1: ; 7c32b (1f:432b)
 	unknownnoise0x20 0, 129, 16
 	endchannel
-; 0x7c32f
diff --git a/audio/sfx/sfx_1f_09.asm b/audio/sfx/sfx_1f_09.asm
index 4a9216e9..73ed88fa 100755
--- a/audio/sfx/sfx_1f_09.asm
+++ b/audio/sfx/sfx_1f_09.asm
@@ -1,4 +1,3 @@
 SFX_1f_09_Ch1: ; 7c32f (1f:432f)
 	unknownnoise0x20 0, 130, 35
 	endchannel
-; 0x7c333
diff --git a/audio/sfx/sfx_1f_0a.asm b/audio/sfx/sfx_1f_0a.asm
index b3c618ca..fb2f620f 100755
--- a/audio/sfx/sfx_1f_0a.asm
+++ b/audio/sfx/sfx_1f_0a.asm
@@ -1,4 +1,3 @@
 SFX_1f_0a_Ch1: ; 7c333 (1f:4333)
 	unknownnoise0x20 0, 130, 37
 	endchannel
-; 0x7c337
diff --git a/audio/sfx/sfx_1f_0b.asm b/audio/sfx/sfx_1f_0b.asm
index 5d21ffb8..46adb73d 100755
--- a/audio/sfx/sfx_1f_0b.asm
+++ b/audio/sfx/sfx_1f_0b.asm
@@ -1,4 +1,3 @@
 SFX_1f_0b_Ch1: ; 7c337 (1f:4337)
 	unknownnoise0x20 0, 130, 38
 	endchannel
-; 0x7c33b
diff --git a/audio/sfx/sfx_1f_0c.asm b/audio/sfx/sfx_1f_0c.asm
index 82cba9c0..bd3fb373 100755
--- a/audio/sfx/sfx_1f_0c.asm
+++ b/audio/sfx/sfx_1f_0c.asm
@@ -1,4 +1,3 @@
 SFX_1f_0c_Ch1: ; 7c33b (1f:433b)
 	unknownnoise0x20 0, 161, 16
 	endchannel
-; 0x7c33f
diff --git a/audio/sfx/sfx_1f_0d.asm b/audio/sfx/sfx_1f_0d.asm
index b7d6ca2f..2f48df5b 100755
--- a/audio/sfx/sfx_1f_0d.asm
+++ b/audio/sfx/sfx_1f_0d.asm
@@ -1,4 +1,3 @@
 SFX_1f_0d_Ch1: ; 7c33f (1f:433f)
 	unknownnoise0x20 0, 162, 17
 	endchannel
-; 0x7c343
diff --git a/audio/sfx/sfx_1f_0e.asm b/audio/sfx/sfx_1f_0e.asm
index 397d78b1..88ba9d30 100755
--- a/audio/sfx/sfx_1f_0e.asm
+++ b/audio/sfx/sfx_1f_0e.asm
@@ -1,4 +1,3 @@
 SFX_1f_0e_Ch1: ; 7c343 (1f:4343)
 	unknownnoise0x20 0, 162, 80
 	endchannel
-; 0x7c347
diff --git a/audio/sfx/sfx_1f_0f.asm b/audio/sfx/sfx_1f_0f.asm
index c9cdaac4..e314bae2 100755
--- a/audio/sfx/sfx_1f_0f.asm
+++ b/audio/sfx/sfx_1f_0f.asm
@@ -2,4 +2,3 @@ SFX_1f_0f_Ch1: ; 7c347 (1f:4347)
 	unknownnoise0x20 0, 161, 24
 	unknownnoise0x20 0, 49, 51
 	endchannel
-; 0x7c34e
diff --git a/audio/sfx/sfx_1f_10.asm b/audio/sfx/sfx_1f_10.asm
index 34bd5cd2..7c22724d 100755
--- a/audio/sfx/sfx_1f_10.asm
+++ b/audio/sfx/sfx_1f_10.asm
@@ -2,4 +2,3 @@ SFX_1f_10_Ch1: ; 7c34e (1f:434e)
 	unknownnoise0x20 2, 145, 40
 	unknownnoise0x20 0, 113, 24
 	endchannel
-; 0x7c355
diff --git a/audio/sfx/sfx_1f_11.asm b/audio/sfx/sfx_1f_11.asm
index b0fe8073..b36fd06b 100755
--- a/audio/sfx/sfx_1f_11.asm
+++ b/audio/sfx/sfx_1f_11.asm
@@ -1,4 +1,3 @@
 SFX_1f_11_Ch1: ; 7c355 (1f:4355)
 	unknownnoise0x20 0, 145, 34
 	endchannel
-; 0x7c359
diff --git a/audio/sfx/sfx_1f_12.asm b/audio/sfx/sfx_1f_12.asm
index 8fc78082..21913c25 100755
--- a/audio/sfx/sfx_1f_12.asm
+++ b/audio/sfx/sfx_1f_12.asm
@@ -1,4 +1,3 @@
 SFX_1f_12_Ch1: ; 7c359 (1f:4359)
 	unknownnoise0x20 0, 113, 34
 	endchannel
-; 0x7c35d
diff --git a/audio/sfx/sfx_1f_13.asm b/audio/sfx/sfx_1f_13.asm
index 831d50c4..d9294eaa 100755
--- a/audio/sfx/sfx_1f_13.asm
+++ b/audio/sfx/sfx_1f_13.asm
@@ -1,4 +1,3 @@
 SFX_1f_13_Ch1: ; 7c35d (1f:435d)
 	unknownnoise0x20 0, 97, 34
 	endchannel
-; 0x7c361
diff --git a/audio/sfx/sfx_1f_14.asm b/audio/sfx/sfx_1f_14.asm
index a1c24136..4f52b842 100755
--- a/audio/sfx/sfx_1f_14.asm
+++ b/audio/sfx/sfx_1f_14.asm
@@ -19,4 +19,3 @@ SFX_1f_14_Ch3: ; 7ca1a (1f:4a1a)
 	unknownnoise0x20 14, 148, 44
 	unknownnoise0x20 8, 129, 28
 	endchannel
-; 0x7ca24
diff --git a/audio/sfx/sfx_1f_15.asm b/audio/sfx/sfx_1f_15.asm
index 3f42e339..0f16cb0e 100755
--- a/audio/sfx/sfx_1f_15.asm
+++ b/audio/sfx/sfx_1f_15.asm
@@ -22,4 +22,3 @@ SFX_1f_15_Ch3: ; 7cc32 (1f:4c32)
 	unknownnoise0x20 3, 130, 28
 	unknownnoise0x20 8, 113, 44
 	endchannel
-; 0x7cc3f
diff --git a/audio/sfx/sfx_1f_16.asm b/audio/sfx/sfx_1f_16.asm
index a9f0e332..450403b4 100755
--- a/audio/sfx/sfx_1f_16.asm
+++ b/audio/sfx/sfx_1f_16.asm
@@ -15,4 +15,3 @@ SFX_1f_16_Ch2: ; 7cb90 (1f:4b90)
 
 SFX_1f_16_Ch3: ; 7cb9e (1f:4b9e)
 	endchannel
-; 0x7cb9f
diff --git a/audio/sfx/sfx_1f_17.asm b/audio/sfx/sfx_1f_17.asm
index f0f15f40..7f0d0fad 100755
--- a/audio/sfx/sfx_1f_17.asm
+++ b/audio/sfx/sfx_1f_17.asm
@@ -28,4 +28,3 @@ SFX_1f_17_Ch3: ; 7c959 (1f:4959)
 	unknownnoise0x20 12, 182, 76
 	unknownnoise0x20 15, 162, 92
 	endchannel
-; 0x7c966
diff --git a/audio/sfx/sfx_1f_18.asm b/audio/sfx/sfx_1f_18.asm
index 4496dd9a..066128bb 100755
--- a/audio/sfx/sfx_1f_18.asm
+++ b/audio/sfx/sfx_1f_18.asm
@@ -30,4 +30,3 @@ SFX_1f_18_Ch3: ; 7cd08 (1f:4d08)
 	unknownnoise0x20 7, 195, 76
 	unknownnoise0x20 8, 161, 92
 	endchannel
-; 0x7cd1b
diff --git a/audio/sfx/sfx_1f_19.asm b/audio/sfx/sfx_1f_19.asm
index 0398340e..119a5f9f 100755
--- a/audio/sfx/sfx_1f_19.asm
+++ b/audio/sfx/sfx_1f_19.asm
@@ -17,4 +17,3 @@ SFX_1f_19_Ch2: ; 7cabd (1f:4abd)
 
 SFX_1f_19_Ch3: ; 7cacf (1f:4acf)
 	endchannel
-; 0x7cad0
diff --git a/audio/sfx/sfx_1f_1a.asm b/audio/sfx/sfx_1f_1a.asm
index 8fca97df..38a6df2a 100755
--- a/audio/sfx/sfx_1f_1a.asm
+++ b/audio/sfx/sfx_1f_1a.asm
@@ -20,4 +20,3 @@ SFX_1f_1a_Ch3: ; 7ca6f (1f:4a6f)
 	unknownnoise0x20 15, 215, 156
 	unknownnoise0x20 15, 242, 172
 	endchannel
-; 0x7ca82
diff --git a/audio/sfx/sfx_1f_1b.asm b/audio/sfx/sfx_1f_1b.asm
index 307e7b43..12c4a66b 100755
--- a/audio/sfx/sfx_1f_1b.asm
+++ b/audio/sfx/sfx_1f_1b.asm
@@ -19,4 +19,3 @@ SFX_1f_1b_Ch3: ; 7caa0 (1f:4aa0)
 	unknownnoise0x20 15, 230, 76
 	unknownnoise0x20 8, 177, 92
 	endchannel
-; 0x7caaa
diff --git a/audio/sfx/sfx_1f_1c.asm b/audio/sfx/sfx_1f_1c.asm
index 3767953d..4ed5efc6 100755
--- a/audio/sfx/sfx_1f_1c.asm
+++ b/audio/sfx/sfx_1f_1c.asm
@@ -21,4 +21,3 @@ SFX_1f_1c_Ch3: ; 7ccc0 (1f:4cc0)
 	unknownnoise0x20 11, 215, 92
 	unknownnoise0x20 15, 194, 76
 	endchannel
-; 0x7ccca
diff --git a/audio/sfx/sfx_1f_1d.asm b/audio/sfx/sfx_1f_1d.asm
index c631f556..ce7f4b4c 100755
--- a/audio/sfx/sfx_1f_1d.asm
+++ b/audio/sfx/sfx_1f_1d.asm
@@ -33,4 +33,3 @@ SFX_1f_1d_Ch3: ; 7c7e2 (1f:47e2)
 	unknownnoise0x20 6, 212, 61
 	unknownnoise0x20 8, 193, 59
 	endchannel
-; 0x7c7fb
diff --git a/audio/sfx/sfx_1f_1e.asm b/audio/sfx/sfx_1f_1e.asm
index f9df4ca3..86f88f54 100755
--- a/audio/sfx/sfx_1f_1e.asm
+++ b/audio/sfx/sfx_1f_1e.asm
@@ -33,4 +33,3 @@ SFX_1f_1e_Ch3: ; 7cc81 (1f:4c81)
 	unknownnoise0x20 3, 164, 44
 	unknownnoise0x20 8, 145, 60
 	endchannel
-; 0x7cc9a
diff --git a/audio/sfx/sfx_1f_1f.asm b/audio/sfx/sfx_1f_1f.asm
index 1466c684..2733036b 100755
--- a/audio/sfx/sfx_1f_1f.asm
+++ b/audio/sfx/sfx_1f_1f.asm
@@ -35,4 +35,3 @@ SFX_1f_1f_Ch3: ; 7cb1a (1f:4b1a)
 	unknownnoise0x20 4, 193, 44
 	unknownnoise0x20 8, 161, 76
 	endchannel
-; 0x7cb33
diff --git a/audio/sfx/sfx_1f_20.asm b/audio/sfx/sfx_1f_20.asm
index 68eb568c..8449e4db 100755
--- a/audio/sfx/sfx_1f_20.asm
+++ b/audio/sfx/sfx_1f_20.asm
@@ -27,4 +27,3 @@ SFX_1f_20_Ch2: ; 7cb5a (1f:4b5a)
 
 SFX_1f_20_Ch3: ; 7cb80 (1f:4b80)
 	endchannel
-; 0x7cb81
diff --git a/audio/sfx/sfx_1f_21.asm b/audio/sfx/sfx_1f_21.asm
index d37e2940..faf056f2 100755
--- a/audio/sfx/sfx_1f_21.asm
+++ b/audio/sfx/sfx_1f_21.asm
@@ -38,4 +38,3 @@ SFX_1f_21_Ch3: ; 7cbed (1f:4bed)
 	unknownnoise0x20 9, 194, 44
 	unknownnoise0x20 4, 161, 60
 	endchannel
-; 0x7cc0c
diff --git a/audio/sfx/sfx_1f_22.asm b/audio/sfx/sfx_1f_22.asm
index f765ed15..bc9c9690 100755
--- a/audio/sfx/sfx_1f_22.asm
+++ b/audio/sfx/sfx_1f_22.asm
@@ -21,4 +21,3 @@ SFX_1f_22_Ch3: ; 7ca4a (1f:4a4a)
 	unknownnoise0x20 2, 97, 33
 	unknownnoise0x20 8, 97, 17
 	endchannel
-; 0x7ca54
diff --git a/audio/sfx/sfx_1f_23.asm b/audio/sfx/sfx_1f_23.asm
index 76151d7e..51066146 100755
--- a/audio/sfx/sfx_1f_23.asm
+++ b/audio/sfx/sfx_1f_23.asm
@@ -27,4 +27,3 @@ SFX_1f_23_Ch3: ; 7c99c (1f:499c)
 	unknownnoise0x20 8, 183, 92
 	unknownnoise0x20 15, 194, 93
 	endchannel
-; 0x7c9ac
diff --git a/audio/sfx/sfx_1f_24.asm b/audio/sfx/sfx_1f_24.asm
index 55d6345c..f4d4e4de 100755
--- a/audio/sfx/sfx_1f_24.asm
+++ b/audio/sfx/sfx_1f_24.asm
@@ -29,4 +29,3 @@ SFX_1f_24_Ch3: ; 7c9f2 (1f:49f2)
 	unknownnoise0x20 4, 116, 16
 	unknownnoise0x20 4, 113, 32
 	endchannel
-; 0x7c9fc
diff --git a/audio/sfx/sfx_1f_25.asm b/audio/sfx/sfx_1f_25.asm
index 15ea54a7..4b137a75 100755
--- a/audio/sfx/sfx_1f_25.asm
+++ b/audio/sfx/sfx_1f_25.asm
@@ -32,4 +32,3 @@ SFX_1f_25_Ch3: ; 7c8ca (1f:48ca)
 	unknownnoise0x20 12, 210, 61
 	unknownnoise0x20 8, 209, 44
 	endchannel
-; 0x7c8e0
diff --git a/audio/sfx/sfx_1f_26.asm b/audio/sfx/sfx_1f_26.asm
index 488c9c32..f3613315 100755
--- a/audio/sfx/sfx_1f_26.asm
+++ b/audio/sfx/sfx_1f_26.asm
@@ -22,4 +22,3 @@ SFX_1f_26_Ch3: ; 7cdc6 (1f:4dc6)
 	unknownnoise0x20 3, 194, 108
 	unknownnoise0x20 8, 209, 92
 	endchannel
-; 0x7cdd3
diff --git a/audio/sfx/sfx_1f_27.asm b/audio/sfx/sfx_1f_27.asm
index ade4b1ba..81ec2ab1 100755
--- a/audio/sfx/sfx_1f_27.asm
+++ b/audio/sfx/sfx_1f_27.asm
@@ -28,4 +28,3 @@ SFX_1f_27_Ch3: ; 7ce09 (1f:4e09)
 	unknownnoise0x20 8, 179, 76
 	unknownnoise0x20 8, 161, 92
 	endchannel
-; 0x7ce1c
diff --git a/audio/sfx/sfx_1f_28.asm b/audio/sfx/sfx_1f_28.asm
index 5f24e7d9..2a510f48 100755
--- a/audio/sfx/sfx_1f_28.asm
+++ b/audio/sfx/sfx_1f_28.asm
@@ -19,4 +19,3 @@ SFX_1f_28_Ch3: ; 7ce3a (1f:4e3a)
 	unknownnoise0x20 14, 196, 60
 	unknownnoise0x20 8, 209, 44
 	endchannel
-; 0x7ce44
diff --git a/audio/sfx/sfx_1f_29.asm b/audio/sfx/sfx_1f_29.asm
index 3c15675b..cb7b5b0c 100755
--- a/audio/sfx/sfx_1f_29.asm
+++ b/audio/sfx/sfx_1f_29.asm
@@ -28,4 +28,3 @@ SFX_1f_29_Ch3: ; 7cee0 (1f:4ee0)
 	unknownnoise0x20 3, 162, 92
 	unknownnoise0x20 8, 177, 108
 	endchannel
-; 0x7cef3
diff --git a/audio/sfx/sfx_1f_2a.asm b/audio/sfx/sfx_1f_2a.asm
index 36f0ccd5..fb0d330f 100755
--- a/audio/sfx/sfx_1f_2a.asm
+++ b/audio/sfx/sfx_1f_2a.asm
@@ -19,4 +19,3 @@ SFX_1f_2a_Ch3: ; 7cd5b (1f:4d5b)
 	unknownnoise0x20 4, 230, 60
 	unknownnoise0x20 15, 242, 76
 	endchannel
-; 0x7cd65
diff --git a/audio/sfx/sfx_1f_2b.asm b/audio/sfx/sfx_1f_2b.asm
index 859969eb..1b588221 100755
--- a/audio/sfx/sfx_1f_2b.asm
+++ b/audio/sfx/sfx_1f_2b.asm
@@ -22,4 +22,3 @@ SFX_1f_2b_Ch3: ; 7cf19 (1f:4f19)
 	unknownnoise0x20 9, 228, 124
 	unknownnoise0x20 15, 226, 108
 	endchannel
-; 0x7cf26
diff --git a/audio/sfx/sfx_1f_2c.asm b/audio/sfx/sfx_1f_2c.asm
index bdbcad46..9c051799 100755
--- a/audio/sfx/sfx_1f_2c.asm
+++ b/audio/sfx/sfx_1f_2c.asm
@@ -32,4 +32,3 @@ SFX_1f_2c_Ch3: ; 7d049 (1f:5049)
 	unknownnoise0x20 6, 180, 60
 	unknownnoise0x20 8, 193, 44
 	endchannel
-; 0x7d05c
diff --git a/audio/sfx/sfx_1f_2d.asm b/audio/sfx/sfx_1f_2d.asm
index 8ba33430..c46af9f2 100755
--- a/audio/sfx/sfx_1f_2d.asm
+++ b/audio/sfx/sfx_1f_2d.asm
@@ -16,4 +16,3 @@ SFX_1f_2d_Ch2: ; 7cd2a (1f:4d2a)
 
 SFX_1f_2d_Ch3: ; 7cd3c (1f:4d3c)
 	endchannel
-; 0x7cd3d
diff --git a/audio/sfx/sfx_1f_2e.asm b/audio/sfx/sfx_1f_2e.asm
index 8c76ae07..50f9f172 100755
--- a/audio/sfx/sfx_1f_2e.asm
+++ b/audio/sfx/sfx_1f_2e.asm
@@ -28,4 +28,3 @@ SFX_1f_2e_Ch3: ; 7cfaa (1f:4faa)
 	unknownnoise0x20 2, 226, 60
 	unknownnoise0x20 8, 209, 44
 	endchannel
-; 0x7cfbd
diff --git a/audio/sfx/sfx_1f_2f.asm b/audio/sfx/sfx_1f_2f.asm
index dbefbf62..10b6698c 100755
--- a/audio/sfx/sfx_1f_2f.asm
+++ b/audio/sfx/sfx_1f_2f.asm
@@ -24,4 +24,3 @@ SFX_1f_2f_Ch3: ; 7cd93 (1f:4d93)
 	unknownnoise0x20 5, 163, 60
 	unknownnoise0x20 8, 145, 44
 	endchannel
-; 0x7cda0
diff --git a/audio/sfx/sfx_1f_30.asm b/audio/sfx/sfx_1f_30.asm
index 89447832..8862b34c 100755
--- a/audio/sfx/sfx_1f_30.asm
+++ b/audio/sfx/sfx_1f_30.asm
@@ -29,4 +29,3 @@ SFX_1f_30_Ch3: ; 7cf64 (1f:4f64)
 	unknownnoise0x20 8, 196, 108
 	unknownnoise0x20 15, 179, 92
 	endchannel
-; 0x7cf74
diff --git a/audio/sfx/sfx_1f_31.asm b/audio/sfx/sfx_1f_31.asm
index 4af60d4a..018a0298 100755
--- a/audio/sfx/sfx_1f_31.asm
+++ b/audio/sfx/sfx_1f_31.asm
@@ -27,4 +27,3 @@ SFX_1f_31_Ch3: ; 7cff3 (1f:4ff3)
 	unknownnoise0x20 1, 178, 91
 	unknownnoise0x20 15, 194, 76
 	endchannel
-; 0x7d003
diff --git a/audio/sfx/sfx_1f_32.asm b/audio/sfx/sfx_1f_32.asm
index 4e11a38e..853b9da3 100755
--- a/audio/sfx/sfx_1f_32.asm
+++ b/audio/sfx/sfx_1f_32.asm
@@ -36,4 +36,3 @@ SFX_1f_32_Ch3: ; 7ce8e (1f:4e8e)
 	unknownnoise0x20 5, 146, 26
 	unknownnoise0x20 8, 129, 24
 	endchannel
-; 0x7ceaa
diff --git a/audio/sfx/sfx_1f_33.asm b/audio/sfx/sfx_1f_33.asm
index b273d6ac..a15fb1d6 100755
--- a/audio/sfx/sfx_1f_33.asm
+++ b/audio/sfx/sfx_1f_33.asm
@@ -22,4 +22,3 @@ SFX_1f_33_Ch3: ; 7d082 (1f:5082)
 	unknownnoise0x20 8, 196, 69
 	unknownnoise0x20 8, 177, 68
 	endchannel
-; 0x7d08f
diff --git a/audio/sfx/sfx_1f_34.asm b/audio/sfx/sfx_1f_34.asm
index 18588747..1bd919ec 100755
--- a/audio/sfx/sfx_1f_34.asm
+++ b/audio/sfx/sfx_1f_34.asm
@@ -22,4 +22,3 @@ SFX_1f_34_Ch3: ; 7d0b5 (1f:50b5)
 	unknownnoise0x20 14, 210, 86
 	unknownnoise0x20 8, 209, 102
 	endchannel
-; 0x7d0c2
diff --git a/audio/sfx/sfx_1f_35.asm b/audio/sfx/sfx_1f_35.asm
index 565dd1f2..befa3e39 100755
--- a/audio/sfx/sfx_1f_35.asm
+++ b/audio/sfx/sfx_1f_35.asm
@@ -25,4 +25,3 @@ SFX_1f_35_Ch2: ; 7d0e5 (1f:50e5)
 
 SFX_1f_35_Ch3: ; 7d107 (1f:5107)
 	endchannel
-; 0x7d108
diff --git a/audio/sfx/sfx_1f_36.asm b/audio/sfx/sfx_1f_36.asm
index 2bb9dc28..9382bb60 100755
--- a/audio/sfx/sfx_1f_36.asm
+++ b/audio/sfx/sfx_1f_36.asm
@@ -22,4 +22,3 @@ SFX_1f_36_Ch3: ; 7d12e (1f:512e)
 	unknownnoise0x20 1, 162, 57
 	unknownnoise0x20 8, 145, 73
 	endchannel
-; 0x7d13b
diff --git a/audio/sfx/sfx_1f_37.asm b/audio/sfx/sfx_1f_37.asm
index 6dd98fb8..b8812f2a 100755
--- a/audio/sfx/sfx_1f_37.asm
+++ b/audio/sfx/sfx_1f_37.asm
@@ -23,4 +23,3 @@ SFX_1f_37_Ch3: ; 7c825 (1f:4825)
 	unknownnoise0x20 15, 215, 60
 	unknownnoise0x20 8, 193, 44
 	endchannel
-; 0x7c832
diff --git a/audio/sfx/sfx_1f_38.asm b/audio/sfx/sfx_1f_38.asm
index 02c65baa..62bd652c 100755
--- a/audio/sfx/sfx_1f_38.asm
+++ b/audio/sfx/sfx_1f_38.asm
@@ -31,4 +31,3 @@ SFX_1f_38_Ch3: ; 7c878 (1f:4878)
 	unknownnoise0x20 12, 183, 76
 	unknownnoise0x20 15, 162, 92
 	endchannel
-; 0x7c888
diff --git a/audio/sfx/sfx_1f_39.asm b/audio/sfx/sfx_1f_39.asm
index 7b9d5121..30703f3a 100755
--- a/audio/sfx/sfx_1f_39.asm
+++ b/audio/sfx/sfx_1f_39.asm
@@ -24,4 +24,3 @@ SFX_1f_39_Ch3: ; 7c90e (1f:490e)
 	unknownnoise0x20 10, 182, 44
 	unknownnoise0x20 8, 145, 28
 	endchannel
-; 0x7c91b
diff --git a/audio/sfx/sfx_1f_3a.asm b/audio/sfx/sfx_1f_3a.asm
index 3ab6c1d3..f39fe5f6 100755
--- a/audio/sfx/sfx_1f_3a.asm
+++ b/audio/sfx/sfx_1f_3a.asm
@@ -45,4 +45,3 @@ SFX_1f_3a_Ch3: ; 7e877 (1f:6877)
 	B_ 2
 	rest 2
 	endchannel
-; 0x7e887
diff --git a/audio/sfx/sfx_1f_3b.asm b/audio/sfx/sfx_1f_3b.asm
index b864987b..66e3ba03 100755
--- a/audio/sfx/sfx_1f_3b.asm
+++ b/audio/sfx/sfx_1f_3b.asm
@@ -67,4 +67,3 @@ SFX_1f_3b_Ch3: ; 7ee5f (1f:6e5f)
 	rest 1
 	A_ 8
 	endchannel
-; 0x7ee74
diff --git a/audio/sfx/sfx_1f_3c.asm b/audio/sfx/sfx_1f_3c.asm
index 051a4376..688e89d2 100755
--- a/audio/sfx/sfx_1f_3c.asm
+++ b/audio/sfx/sfx_1f_3c.asm
@@ -6,4 +6,3 @@ SFX_1f_3c_Ch1: ; 7c3f3 (1f:43f3)
 	unknownsfx0x20 8, 226, 0, 2
 	unknownsfx0x10 8
 	endchannel
-; 0x7c404
diff --git a/audio/sfx/sfx_1f_3d.asm b/audio/sfx/sfx_1f_3d.asm
index 0275329d..f5eb6afa 100755
--- a/audio/sfx/sfx_1f_3d.asm
+++ b/audio/sfx/sfx_1f_3d.asm
@@ -5,4 +5,3 @@ SFX_1f_3d_Ch1: ; 7c490 (1f:4490)
 	unknownsfx0x20 15, 242, 80, 6
 	unknownsfx0x10 8
 	endchannel
-; 0x7c49f
diff --git a/audio/sfx/sfx_1f_3e.asm b/audio/sfx/sfx_1f_3e.asm
index 89518f22..604e553b 100755
--- a/audio/sfx/sfx_1f_3e.asm
+++ b/audio/sfx/sfx_1f_3e.asm
@@ -7,4 +7,3 @@ SFX_1f_3e_Ch1: ; 7c4b2 (1f:44b2)
 	unknownsfx0x20 15, 242, 0, 6
 	unknownsfx0x10 8
 	endchannel
-; 0x7c4c7
diff --git a/audio/sfx/sfx_1f_3f.asm b/audio/sfx/sfx_1f_3f.asm
index 017daf8a..68ab34d5 100755
--- a/audio/sfx/sfx_1f_3f.asm
+++ b/audio/sfx/sfx_1f_3f.asm
@@ -2,4 +2,3 @@ SFX_1f_3f_Ch1: ; 7c3c3 (1f:43c3)
 	unknownnoise0x20 1, 226, 51
 	unknownnoise0x20 8, 225, 34
 	endchannel
-; 0x7c3ca
diff --git a/audio/sfx/sfx_1f_40.asm b/audio/sfx/sfx_1f_40.asm
index 05d2e17d..04f89afb 100755
--- a/audio/sfx/sfx_1f_40.asm
+++ b/audio/sfx/sfx_1f_40.asm
@@ -5,4 +5,3 @@ SFX_1f_40_Ch1: ; 7c44b (1f:444b)
 	unknownsfx0x20 0, 145, 192, 7
 	unknownsfx0x20 12, 161, 208, 7
 	endchannel
-; 0x7c45e
diff --git a/audio/sfx/sfx_1f_41.asm b/audio/sfx/sfx_1f_41.asm
index f255ba76..415d43d5 100755
--- a/audio/sfx/sfx_1f_41.asm
+++ b/audio/sfx/sfx_1f_41.asm
@@ -75,4 +75,3 @@ SFX_1f_41_Ch3: ; 7ee09 (1f:6e09)
 	F_ 2
 	rest 2
 	endchannel
-; 0x7ee28
diff --git a/audio/sfx/sfx_1f_42.asm b/audio/sfx/sfx_1f_42.asm
index daa4c7bb..103b01c6 100755
--- a/audio/sfx/sfx_1f_42.asm
+++ b/audio/sfx/sfx_1f_42.asm
@@ -57,4 +57,3 @@ SFX_1f_42_Ch3: ; 7eeaf (1f:6eaf)
 	F_ 4
 	D# 8
 	endchannel
-; 0x7eeb9
diff --git a/audio/sfx/sfx_1f_43.asm b/audio/sfx/sfx_1f_43.asm
index 94d8fb9c..1f238fb0 100755
--- a/audio/sfx/sfx_1f_43.asm
+++ b/audio/sfx/sfx_1f_43.asm
@@ -6,4 +6,3 @@ SFX_1f_43_Ch1: ; 7c49f (1f:449f)
 	unknownsfx0x20 15, 243, 0, 6
 	unknownsfx0x10 8
 	endchannel
-; 0x7c4b2
diff --git a/audio/sfx/sfx_1f_44.asm b/audio/sfx/sfx_1f_44.asm
index 4efbe345..fc404eab 100755
--- a/audio/sfx/sfx_1f_44.asm
+++ b/audio/sfx/sfx_1f_44.asm
@@ -5,4 +5,3 @@ SFX_1f_44_Ch1: ; 7c4c7 (1f:44c7)
 	unknownsfx0x20 15, 242, 80, 6
 	unknownsfx0x10 8
 	endchannel
-; 0x7c4d6
diff --git a/audio/sfx/sfx_1f_45.asm b/audio/sfx/sfx_1f_45.asm
index e64cb337..f6548431 100755
--- a/audio/sfx/sfx_1f_45.asm
+++ b/audio/sfx/sfx_1f_45.asm
@@ -12,4 +12,3 @@ SFX_1f_45_Ch1: ; 7c4d6 (1f:44d6)
 	unknownsfx0x20 3, 129, 192, 7
 	unknownsfx0x20 3, 129, 0, 7
 	endchannel
-; 0x7c505
diff --git a/audio/sfx/sfx_1f_46.asm b/audio/sfx/sfx_1f_46.asm
index 3989bd00..3cd98880 100755
--- a/audio/sfx/sfx_1f_46.asm
+++ b/audio/sfx/sfx_1f_46.asm
@@ -5,4 +5,3 @@ SFX_1f_46_Ch1: ; 7c505 (1f:4505)
 	unknownsfx0x20 4, 240, 0, 2
 	unknownsfx0x20 1, 0, 0, 0
 	endchannel
-; 0x7c518
diff --git a/audio/sfx/sfx_1f_47.asm b/audio/sfx/sfx_1f_47.asm
index 945e93fe..729369e8 100755
--- a/audio/sfx/sfx_1f_47.asm
+++ b/audio/sfx/sfx_1f_47.asm
@@ -5,4 +5,3 @@ SFX_1f_47_Ch1: ; 7c518 (1f:4518)
 	unknownsfx0x20 4, 240, 0, 7
 	unknownsfx0x20 1, 0, 0, 0
 	endchannel
-; 0x7c52b
diff --git a/audio/sfx/sfx_1f_48.asm b/audio/sfx/sfx_1f_48.asm
index c0854070..35aa7ad5 100755
--- a/audio/sfx/sfx_1f_48.asm
+++ b/audio/sfx/sfx_1f_48.asm
@@ -8,4 +8,3 @@ SFX_1f_48_Ch1: ; 7c52b (1f:452b)
 	unknownsfx0x20 15, 23, 0, 4
 	unknownsfx0x10 8
 	endchannel
-; 0x7c546
diff --git a/audio/sfx/sfx_1f_49.asm b/audio/sfx/sfx_1f_49.asm
index f1ae8229..160979ac 100755
--- a/audio/sfx/sfx_1f_49.asm
+++ b/audio/sfx/sfx_1f_49.asm
@@ -6,4 +6,3 @@ SFX_1f_49_Ch1: ; 7c546 (1f:4546)
 	unknownsfx0x20 4, 241, 128, 7
 	unknownsfx0x20 4, 0, 0, 0
 	endchannel
-; 0x7c55d
diff --git a/audio/sfx/sfx_1f_4a.asm b/audio/sfx/sfx_1f_4a.asm
index 4e1c7e2e..187e9b10 100755
--- a/audio/sfx/sfx_1f_4a.asm
+++ b/audio/sfx/sfx_1f_4a.asm
@@ -7,4 +7,3 @@ SFX_1f_4a_Ch1: ; 7c55d (1f:455d)
 	unknownsfx0x10 8
 	unknownsfx0x20 1, 0, 0, 0
 	endchannel
-; 0x7c572
diff --git a/audio/sfx/sfx_1f_4b.asm b/audio/sfx/sfx_1f_4b.asm
index 2dc74200..b3065b2f 100755
--- a/audio/sfx/sfx_1f_4b.asm
+++ b/audio/sfx/sfx_1f_4b.asm
@@ -8,4 +8,3 @@ SFX_1f_4b_Ch1: ; 7c572 (1f:4572)
 	unknownsfx0x20 15, 23, 0, 7
 	unknownsfx0x10 8
 	endchannel
-; 0x7c58d
diff --git a/audio/sfx/sfx_1f_4c.asm b/audio/sfx/sfx_1f_4c.asm
index 1f55c9c2..56004e05 100755
--- a/audio/sfx/sfx_1f_4c.asm
+++ b/audio/sfx/sfx_1f_4c.asm
@@ -8,4 +8,3 @@ SFX_1f_4c_Ch1: ; 7c58d (1f:458d)
 	unknownsfx0x20 15, 23, 0, 5
 	unknownsfx0x10 8
 	endchannel
-; 0x7c5a8
diff --git a/audio/sfx/sfx_1f_4d.asm b/audio/sfx/sfx_1f_4d.asm
index 9c5686ec..c57299c0 100755
--- a/audio/sfx/sfx_1f_4d.asm
+++ b/audio/sfx/sfx_1f_4d.asm
@@ -4,4 +4,3 @@ SFX_1f_4d_Ch1: ; 7c5a8 (1f:45a8)
 	unknownsfx0x20 15, 210, 0, 5
 	unknownsfx0x10 8
 	endchannel
-; 0x7c5b3
diff --git a/audio/sfx/sfx_1f_4e.asm b/audio/sfx/sfx_1f_4e.asm
index e3f4b6e5..624c2137 100755
--- a/audio/sfx/sfx_1f_4e.asm
+++ b/audio/sfx/sfx_1f_4e.asm
@@ -4,4 +4,3 @@ SFX_1f_4e_Ch1: ; 7c5b3 (1f:45b3)
 	unknownsfx0x20 15, 242, 0, 4
 	unknownsfx0x10 8
 	endchannel
-; 0x7c5be
diff --git a/audio/sfx/sfx_1f_4f.asm b/audio/sfx/sfx_1f_4f.asm
index 5b73d196..91394f9f 100755
--- a/audio/sfx/sfx_1f_4f.asm
+++ b/audio/sfx/sfx_1f_4f.asm
@@ -4,4 +4,3 @@ SFX_1f_4f_Ch1: ; 7c5be (1f:45be)
 	unknownnoise0x20 2, 241, 34
 	unknownnoise0x20 1, 0, 0
 	endchannel
-; 0x7c5cb
diff --git a/audio/sfx/sfx_1f_50.asm b/audio/sfx/sfx_1f_50.asm
index 3b99e1f3..50cc4ee7 100755
--- a/audio/sfx/sfx_1f_50.asm
+++ b/audio/sfx/sfx_1f_50.asm
@@ -16,4 +16,3 @@ SFX_1f_50_Ch1: ; 7c5cb (1f:45cb)
 	unknownnoise0x20 2, 65, 18
 	unknownnoise0x20 2, 0, 0
 	endchannel
-; 0x7c5fc
diff --git a/audio/sfx/sfx_1f_51.asm b/audio/sfx/sfx_1f_51.asm
index 83501af4..438877f1 100755
--- a/audio/sfx/sfx_1f_51.asm
+++ b/audio/sfx/sfx_1f_51.asm
@@ -16,4 +16,3 @@ SFX_1f_51_Ch2: ; 7c613 (1f:4613)
 	unknownsfx0x20 15, 240, 1, 4
 	unknownsfx0x20 1, 0, 0, 0
 	endchannel
-; 0x7c626
diff --git a/audio/sfx/sfx_1f_52.asm b/audio/sfx/sfx_1f_52.asm
index 0ac5e8ee..98ef0d30 100755
--- a/audio/sfx/sfx_1f_52.asm
+++ b/audio/sfx/sfx_1f_52.asm
@@ -4,4 +4,3 @@ SFX_1f_52_Ch1: ; 7c626 (1f:4626)
 	unknownsfx0x20 15, 210, 0, 7
 	unknownsfx0x10 8
 	endchannel
-; 0x7c631
diff --git a/audio/sfx/sfx_1f_53.asm b/audio/sfx/sfx_1f_53.asm
index 47d5d3dd..04415233 100755
--- a/audio/sfx/sfx_1f_53.asm
+++ b/audio/sfx/sfx_1f_53.asm
@@ -8,4 +8,3 @@ SFX_1f_53_Ch1: ; 7c631 (1f:4631)
 	unknownnoise0x20 8, 244, 85
 	unknownnoise0x20 8, 241, 68
 	endchannel
-; 0x7c64a
diff --git a/audio/sfx/sfx_1f_54.asm b/audio/sfx/sfx_1f_54.asm
index 1a6a1031..faf5304e 100755
--- a/audio/sfx/sfx_1f_54.asm
+++ b/audio/sfx/sfx_1f_54.asm
@@ -20,4 +20,3 @@ SFX_1f_54_Ch2: ; 7c669 (1f:4669)
 	unknownsfx0x20 15, 240, 130, 4
 	unknownsfx0x20 15, 242, 130, 4
 	endchannel
-; 0x7c688
diff --git a/audio/sfx/sfx_1f_55.asm b/audio/sfx/sfx_1f_55.asm
index 3622e334..e2fbffae 100755
--- a/audio/sfx/sfx_1f_55.asm
+++ b/audio/sfx/sfx_1f_55.asm
@@ -10,4 +10,3 @@ SFX_1f_55_Ch1: ; 7c688 (1f:4688)
 	unknownsfx0x20 15, 226, 0, 7
 	unknownsfx0x10 8
 	endchannel
-; 0x7c6a5
diff --git a/audio/sfx/sfx_1f_56.asm b/audio/sfx/sfx_1f_56.asm
index 941c4b0c..30de8cd2 100755
--- a/audio/sfx/sfx_1f_56.asm
+++ b/audio/sfx/sfx_1f_56.asm
@@ -5,4 +5,3 @@ SFX_1f_56_Ch1: ; 7c3ca (1f:43ca)
 	unknownnoise0x20 8, 244, 85
 	unknownnoise0x20 8, 241, 68
 	endchannel
-; 0x7c3da
diff --git a/audio/sfx/sfx_1f_57.asm b/audio/sfx/sfx_1f_57.asm
index 3ea03695..b73bb687 100755
--- a/audio/sfx/sfx_1f_57.asm
+++ b/audio/sfx/sfx_1f_57.asm
@@ -2,4 +2,3 @@ SFX_1f_57_Ch1: ; 7c3da (1f:43da)
 	unknownnoise0x20 9, 241, 68
 	unknownnoise0x20 8, 209, 67
 	endchannel
-; 0x7c3e1
diff --git a/audio/sfx/sfx_1f_58.asm b/audio/sfx/sfx_1f_58.asm
index 6a27c732..f5844495 100755
--- a/audio/sfx/sfx_1f_58.asm
+++ b/audio/sfx/sfx_1f_58.asm
@@ -9,4 +9,3 @@ SFX_1f_58_Ch2: ; 7c3e8 (1f:43e8)
 	unknownsfx0x20 2, 8, 0, 0
 	unknownsfx0x20 8, 177, 65, 7
 	endchannel
-; 0x7c3f3
diff --git a/audio/sfx/sfx_1f_59.asm b/audio/sfx/sfx_1f_59.asm
index 45e65572..9c17156f 100755
--- a/audio/sfx/sfx_1f_59.asm
+++ b/audio/sfx/sfx_1f_59.asm
@@ -9,4 +9,3 @@ SFX_1f_59_Ch2: ; 7c40b (1f:440b)
 	unknownsfx0x20 1, 8, 0, 0
 	unknownsfx0x20 4, 161, 97, 7
 	endchannel
-; 0x7c416
diff --git a/audio/sfx/sfx_1f_5a.asm b/audio/sfx/sfx_1f_5a.asm
index 567b331b..29b947b7 100755
--- a/audio/sfx/sfx_1f_5a.asm
+++ b/audio/sfx/sfx_1f_5a.asm
@@ -11,4 +11,3 @@ SFX_1f_5a_Ch2: ; 7c421 (1f:4421)
 	unknownsfx0x20 4, 145, 193, 6
 	unknownsfx0x20 8, 162, 161, 7
 	endchannel
-; 0x7c430
diff --git a/audio/sfx/sfx_1f_5b.asm b/audio/sfx/sfx_1f_5b.asm
index 9921eb88..bc2e6fef 100755
--- a/audio/sfx/sfx_1f_5b.asm
+++ b/audio/sfx/sfx_1f_5b.asm
@@ -4,4 +4,3 @@ SFX_1f_5b_Ch1: ; 7c430 (1f:4430)
 	unknownsfx0x20 15, 241, 0, 3
 	unknownsfx0x10 8
 	endchannel
-; 0x7c43b
diff --git a/audio/sfx/sfx_1f_5c.asm b/audio/sfx/sfx_1f_5c.asm
index 571db9a9..8671002c 100755
--- a/audio/sfx/sfx_1f_5c.asm
+++ b/audio/sfx/sfx_1f_5c.asm
@@ -5,4 +5,3 @@ SFX_1f_5c_Ch1: ; 7c43b (1f:443b)
 	unknownnoise0x20 12, 97, 35
 	unknownnoise0x20 6, 65, 84
 	endchannel
-; 0x7c44b
diff --git a/audio/sfx/sfx_1f_5d.asm b/audio/sfx/sfx_1f_5d.asm
index f0606032..3a325f27 100755
--- a/audio/sfx/sfx_1f_5d.asm
+++ b/audio/sfx/sfx_1f_5d.asm
@@ -34,4 +34,3 @@ ELSE
 	unknownsfx0x20 15, 210, 225, 7
 ENDC
 	endchannel
-; 0x7c490
diff --git a/audio/sfx/sfx_1f_5e.asm b/audio/sfx/sfx_1f_5e.asm
index 30de5a1a..6adbb979 100755
--- a/audio/sfx/sfx_1f_5e.asm
+++ b/audio/sfx/sfx_1f_5e.asm
@@ -8,4 +8,3 @@ SFX_1f_5e_Ch1: ; 7c6a5 (1f:46a5)
 	unknownnoise0x20 15, 231, 67
 	unknownnoise0x20 15, 242, 67
 	endchannel
-; 0x7c6be
diff --git a/audio/sfx/sfx_1f_5f.asm b/audio/sfx/sfx_1f_5f.asm
index 5a18de25..efc1a5e3 100755
--- a/audio/sfx/sfx_1f_5f.asm
+++ b/audio/sfx/sfx_1f_5f.asm
@@ -4,4 +4,3 @@ SFX_1f_5f_Ch1: ; 7c6be (1f:46be)
 	unknownsfx0x20 12, 194, 64, 7
 	unknownsfx0x10 8
 	endchannel
-; 0x7c6c9
diff --git a/audio/sfx/sfx_1f_60.asm b/audio/sfx/sfx_1f_60.asm
index 424a2d28..907aa79f 100755
--- a/audio/sfx/sfx_1f_60.asm
+++ b/audio/sfx/sfx_1f_60.asm
@@ -4,4 +4,3 @@ SFX_1f_60_Ch1: ; 7c6c9 (1f:46c9)
 	unknownsfx0x20 12, 194, 128, 6
 	unknownsfx0x10 8
 	endchannel
-; 0x7c6d4
diff --git a/audio/sfx/sfx_1f_61.asm b/audio/sfx/sfx_1f_61.asm
index afc7dae3..0afe5055 100755
--- a/audio/sfx/sfx_1f_61.asm
+++ b/audio/sfx/sfx_1f_61.asm
@@ -3,4 +3,3 @@ SFX_1f_61_Ch1: ; 7c6d4 (1f:46d4)
 	unknownnoise0x20 2, 175, 49
 	unknownnoise0x20 15, 242, 65
 	endchannel
-; 0x7c6de
diff --git a/audio/sfx/sfx_1f_62.asm b/audio/sfx/sfx_1f_62.asm
index 44a2c2c0..8029ff02 100755
--- a/audio/sfx/sfx_1f_62.asm
+++ b/audio/sfx/sfx_1f_62.asm
@@ -2,4 +2,3 @@ SFX_1f_62_Ch1: ; 7c6de (1f:46de)
 	unknownnoise0x20 2, 210, 50
 	unknownnoise0x20 15, 242, 67
 	endchannel
-; 0x7c6e5
diff --git a/audio/sfx/sfx_1f_63.asm b/audio/sfx/sfx_1f_63.asm
index f47ed1c1..2114130a 100755
--- a/audio/sfx/sfx_1f_63.asm
+++ b/audio/sfx/sfx_1f_63.asm
@@ -5,4 +5,3 @@ SFX_1f_63_Ch1: ; 7c6e5 (1f:46e5)
 	unknownnoise0x20 3, 192, 34
 	unknownnoise0x20 15, 210, 36
 	endchannel
-; 0x7c6f5
diff --git a/audio/sfx/sfx_1f_64.asm b/audio/sfx/sfx_1f_64.asm
index 3e6ec789..ab5a4c04 100755
--- a/audio/sfx/sfx_1f_64.asm
+++ b/audio/sfx/sfx_1f_64.asm
@@ -4,4 +4,3 @@ SFX_1f_64_Ch1: ; 7c6f5 (1f:46f5)
 	unknownsfx0x20 1, 242, 224, 6
 	unknownsfx0x20 8, 241, 0, 7
 	endchannel
-; 0x7c704
diff --git a/audio/sfx/sfx_1f_65.asm b/audio/sfx/sfx_1f_65.asm
index 1f262365..dc564910 100755
--- a/audio/sfx/sfx_1f_65.asm
+++ b/audio/sfx/sfx_1f_65.asm
@@ -3,4 +3,3 @@ SFX_1f_65_Ch1: ; 7c704 (1f:4704)
 	unknownsfx0x20 2, 241, 0, 7
 	unknownsfx0x20 8, 129, 224, 7
 	endchannel
-; 0x7c70f
diff --git a/audio/sfx/sfx_1f_66.asm b/audio/sfx/sfx_1f_66.asm
index 7ffa9bd2..068917bb 100755
--- a/audio/sfx/sfx_1f_66.asm
+++ b/audio/sfx/sfx_1f_66.asm
@@ -12,4 +12,3 @@ SFX_1f_66_Ch2: ; 7c71e (1f:471e)
 	unknownsfx0x20 2, 193, 65, 7
 	unknownsfx0x20 15, 209, 129, 7
 	endchannel
-; 0x7c72d
diff --git a/audio/sfx/sfx_1f_67.asm b/audio/sfx/sfx_1f_67.asm
index 0ba27bad..a81d47bf 100755
--- a/audio/sfx/sfx_1f_67.asm
+++ b/audio/sfx/sfx_1f_67.asm
@@ -12,4 +12,3 @@ SFX_1f_67_Ch1: ; 7c72d (1f:472d)
 	unknownsfx0x20 15, 18, 224, 7
 	unknownsfx0x10 8
 	endchannel
-; 0x7c758
diff --git a/audio/sfx/sfx_1f_unused.asm b/audio/sfx/sfx_1f_unused.asm
index c4109f17..dfb16ee1 100755
--- a/audio/sfx/sfx_1f_unused.asm
+++ b/audio/sfx/sfx_1f_unused.asm
@@ -29,4 +29,3 @@ SFX_1f_unused_Ch3: ; 7c78e (1f:478e)
 	unknownnoise0x20 12, 125, 76
 	unknownnoise0x20 15, 211, 76
 	endchannel
-; 0x7c7a4