Rename/organize part 3 of 4

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

96 files changed, 0 insertions, 96 deletions

diff --git a/audio/sfx/sfx_02_01.asm b/audio/sfx/sfx_02_01.asm
index dfae6786..0de37099 100755
--- a/audio/sfx/sfx_02_01.asm
+++ b/audio/sfx/sfx_02_01.asm
@@ -1,4 +1,3 @@
 SFX_02_01_Ch1: ; 82fd (2:42fd)
 	unknownnoise0x20 0, 193, 51
 	endchannel
-; 0x8301
diff --git a/audio/sfx/sfx_02_02.asm b/audio/sfx/sfx_02_02.asm
index 8d0f3a34..ce8efcf0 100755
--- a/audio/sfx/sfx_02_02.asm
+++ b/audio/sfx/sfx_02_02.asm
@@ -1,4 +1,3 @@
 SFX_02_02_Ch1: ; 8301 (2:4301)
 	unknownnoise0x20 0, 177, 51
 	endchannel
-; 0x8305
diff --git a/audio/sfx/sfx_02_03.asm b/audio/sfx/sfx_02_03.asm
index 9b8745e7..3fc19143 100755
--- a/audio/sfx/sfx_02_03.asm
+++ b/audio/sfx/sfx_02_03.asm
@@ -1,4 +1,3 @@
 SFX_02_03_Ch1: ; 8305 (2:4305)
 	unknownnoise0x20 0, 161, 51
 	endchannel
-; 0x8309
diff --git a/audio/sfx/sfx_02_04.asm b/audio/sfx/sfx_02_04.asm
index a0fe41e3..35abd908 100755
--- a/audio/sfx/sfx_02_04.asm
+++ b/audio/sfx/sfx_02_04.asm
@@ -1,4 +1,3 @@
 SFX_02_04_Ch1: ; 8309 (2:4309)
 	unknownnoise0x20 0, 129, 51
 	endchannel
-; 0x830d
diff --git a/audio/sfx/sfx_02_05.asm b/audio/sfx/sfx_02_05.asm
index f5df11e2..5aca7085 100755
--- a/audio/sfx/sfx_02_05.asm
+++ b/audio/sfx/sfx_02_05.asm
@@ -6,4 +6,3 @@ SFX_02_05_Ch1: ; 830d (2:430d)
 	unknownnoise0x20 3, 130, 51
 	unknownnoise0x20 2, 129, 50
 	endchannel
-; 0x8320
diff --git a/audio/sfx/sfx_02_06.asm b/audio/sfx/sfx_02_06.asm
index cccff91b..f2031c3f 100755
--- a/audio/sfx/sfx_02_06.asm
+++ b/audio/sfx/sfx_02_06.asm
@@ -1,4 +1,3 @@
 SFX_02_06_Ch1: ; 8320 (2:4320)
 	unknownnoise0x20 0, 81, 42
 	endchannel
-; 0x8324
diff --git a/audio/sfx/sfx_02_07.asm b/audio/sfx/sfx_02_07.asm
index d960c62e..58ae12fd 100755
--- a/audio/sfx/sfx_02_07.asm
+++ b/audio/sfx/sfx_02_07.asm
@@ -2,4 +2,3 @@ SFX_02_07_Ch1: ; 8324 (2:4324)
 	unknownnoise0x20 1, 65, 43
 	unknownnoise0x20 0, 97, 42
 	endchannel
-; 0x832b
diff --git a/audio/sfx/sfx_02_08.asm b/audio/sfx/sfx_02_08.asm
index 606587a0..5a172e25 100755
--- a/audio/sfx/sfx_02_08.asm
+++ b/audio/sfx/sfx_02_08.asm
@@ -1,4 +1,3 @@
 SFX_02_08_Ch1: ; 832b (2:432b)
 	unknownnoise0x20 0, 129, 16
 	endchannel
-; 0x832f
diff --git a/audio/sfx/sfx_02_09.asm b/audio/sfx/sfx_02_09.asm
index 6b35f5aa..47f85e16 100755
--- a/audio/sfx/sfx_02_09.asm
+++ b/audio/sfx/sfx_02_09.asm
@@ -1,4 +1,3 @@
 SFX_02_09_Ch1: ; 832f (2:432f)
 	unknownnoise0x20 0, 130, 35
 	endchannel
-; 0x8333
diff --git a/audio/sfx/sfx_02_0a.asm b/audio/sfx/sfx_02_0a.asm
index cf9539b6..3d43afa9 100755
--- a/audio/sfx/sfx_02_0a.asm
+++ b/audio/sfx/sfx_02_0a.asm
@@ -1,4 +1,3 @@
 SFX_02_0a_Ch1: ; 8333 (2:4333)
 	unknownnoise0x20 0, 130, 37
 	endchannel
-; 0x8337
diff --git a/audio/sfx/sfx_02_0b.asm b/audio/sfx/sfx_02_0b.asm
index f6142168..9c8d38ca 100755
--- a/audio/sfx/sfx_02_0b.asm
+++ b/audio/sfx/sfx_02_0b.asm
@@ -1,4 +1,3 @@
 SFX_02_0b_Ch1: ; 8337 (2:4337)
 	unknownnoise0x20 0, 130, 38
 	endchannel
-; 0x833b
diff --git a/audio/sfx/sfx_02_0c.asm b/audio/sfx/sfx_02_0c.asm
index 57d20bc6..4f3568e1 100755
--- a/audio/sfx/sfx_02_0c.asm
+++ b/audio/sfx/sfx_02_0c.asm
@@ -1,4 +1,3 @@
 SFX_02_0c_Ch1: ; 833b (2:433b)
 	unknownnoise0x20 0, 161, 16
 	endchannel
-; 0x833f
diff --git a/audio/sfx/sfx_02_0d.asm b/audio/sfx/sfx_02_0d.asm
index f143024f..154b5c1e 100755
--- a/audio/sfx/sfx_02_0d.asm
+++ b/audio/sfx/sfx_02_0d.asm
@@ -1,4 +1,3 @@
 SFX_02_0d_Ch1: ; 833f (2:433f)
 	unknownnoise0x20 0, 162, 17
 	endchannel
-; 0x8343
diff --git a/audio/sfx/sfx_02_0e.asm b/audio/sfx/sfx_02_0e.asm
index 9ba580ae..d1333575 100755
--- a/audio/sfx/sfx_02_0e.asm
+++ b/audio/sfx/sfx_02_0e.asm
@@ -1,4 +1,3 @@
 SFX_02_0e_Ch1: ; 8343 (2:4343)
 	unknownnoise0x20 0, 162, 80
 	endchannel
-; 0x8347
diff --git a/audio/sfx/sfx_02_0f.asm b/audio/sfx/sfx_02_0f.asm
index 906e27d0..32156d7d 100755
--- a/audio/sfx/sfx_02_0f.asm
+++ b/audio/sfx/sfx_02_0f.asm
@@ -2,4 +2,3 @@ SFX_02_0f_Ch1: ; 8347 (2:4347)
 	unknownnoise0x20 0, 161, 24
 	unknownnoise0x20 0, 49, 51
 	endchannel
-; 0x834e
diff --git a/audio/sfx/sfx_02_10.asm b/audio/sfx/sfx_02_10.asm
index 04d67fba..61d57b01 100755
--- a/audio/sfx/sfx_02_10.asm
+++ b/audio/sfx/sfx_02_10.asm
@@ -2,4 +2,3 @@ SFX_02_10_Ch1: ; 834e (2:434e)
 	unknownnoise0x20 2, 145, 40
 	unknownnoise0x20 0, 113, 24
 	endchannel
-; 0x8355
diff --git a/audio/sfx/sfx_02_11.asm b/audio/sfx/sfx_02_11.asm
index 34edf69a..f4bde465 100755
--- a/audio/sfx/sfx_02_11.asm
+++ b/audio/sfx/sfx_02_11.asm
@@ -1,4 +1,3 @@
 SFX_02_11_Ch1: ; 8355 (2:4355)
 	unknownnoise0x20 0, 145, 34
 	endchannel
-; 0x8359
diff --git a/audio/sfx/sfx_02_12.asm b/audio/sfx/sfx_02_12.asm
index 95ea4278..908c3fb2 100755
--- a/audio/sfx/sfx_02_12.asm
+++ b/audio/sfx/sfx_02_12.asm
@@ -1,4 +1,3 @@
 SFX_02_12_Ch1: ; 8359 (2:4359)
 	unknownnoise0x20 0, 113, 34
 	endchannel
-; 0x835d
diff --git a/audio/sfx/sfx_02_13.asm b/audio/sfx/sfx_02_13.asm
index fcf6613a..bd985ab4 100755
--- a/audio/sfx/sfx_02_13.asm
+++ b/audio/sfx/sfx_02_13.asm
@@ -1,4 +1,3 @@
 SFX_02_13_Ch1: ; 835d (2:435d)
 	unknownnoise0x20 0, 97, 34
 	endchannel
-; 0x8361
diff --git a/audio/sfx/sfx_02_14.asm b/audio/sfx/sfx_02_14.asm
index 1d0e647d..3a289882 100755
--- a/audio/sfx/sfx_02_14.asm
+++ b/audio/sfx/sfx_02_14.asm
@@ -19,4 +19,3 @@ SFX_02_14_Ch3: ; 89a5 (2:49a5)
 	unknownnoise0x20 14, 148, 44
 	unknownnoise0x20 8, 129, 28
 	endchannel
-; 0x89af
diff --git a/audio/sfx/sfx_02_15.asm b/audio/sfx/sfx_02_15.asm
index 33699792..91b6c951 100755
--- a/audio/sfx/sfx_02_15.asm
+++ b/audio/sfx/sfx_02_15.asm
@@ -22,4 +22,3 @@ SFX_02_15_Ch3: ; 8bbd (2:4bbd)
 	unknownnoise0x20 3, 130, 28
 	unknownnoise0x20 8, 113, 44
 	endchannel
-; 0x8bca
diff --git a/audio/sfx/sfx_02_16.asm b/audio/sfx/sfx_02_16.asm
index fb1a3755..fe15f6b6 100755
--- a/audio/sfx/sfx_02_16.asm
+++ b/audio/sfx/sfx_02_16.asm
@@ -15,4 +15,3 @@ SFX_02_16_Ch2: ; 8b1b (2:4b1b)
 
 SFX_02_16_Ch3: ; 8b29 (2:4b29)
 	endchannel
-; 0x8b2a
diff --git a/audio/sfx/sfx_02_17.asm b/audio/sfx/sfx_02_17.asm
index cf19ce38..ecc34899 100755
--- a/audio/sfx/sfx_02_17.asm
+++ b/audio/sfx/sfx_02_17.asm
@@ -28,4 +28,3 @@ SFX_02_17_Ch3: ; 88e4 (2:48e4)
 	unknownnoise0x20 12, 182, 76
 	unknownnoise0x20 15, 162, 92
 	endchannel
-; 0x88f1
diff --git a/audio/sfx/sfx_02_18.asm b/audio/sfx/sfx_02_18.asm
index a3039556..73f8f41e 100755
--- a/audio/sfx/sfx_02_18.asm
+++ b/audio/sfx/sfx_02_18.asm
@@ -30,4 +30,3 @@ SFX_02_18_Ch3: ; 8c93 (2:4c93)
 	unknownnoise0x20 7, 195, 76
 	unknownnoise0x20 8, 161, 92
 	endchannel
-; 0x8ca6
diff --git a/audio/sfx/sfx_02_19.asm b/audio/sfx/sfx_02_19.asm
index 4ddb848d..d78b66b4 100755
--- a/audio/sfx/sfx_02_19.asm
+++ b/audio/sfx/sfx_02_19.asm
@@ -17,4 +17,3 @@ SFX_02_19_Ch2: ; 8a48 (2:4a48)
 
 SFX_02_19_Ch3: ; 8a5a (2:4a5a)
 	endchannel
-; 0x8a5b
diff --git a/audio/sfx/sfx_02_1a.asm b/audio/sfx/sfx_02_1a.asm
index efd16f9b..036703b5 100755
--- a/audio/sfx/sfx_02_1a.asm
+++ b/audio/sfx/sfx_02_1a.asm
@@ -20,4 +20,3 @@ SFX_02_1a_Ch3: ; 89fa (2:49fa)
 	unknownnoise0x20 15, 215, 156
 	unknownnoise0x20 15, 242, 172
 	endchannel
-; 0x8a0d
diff --git a/audio/sfx/sfx_02_1b.asm b/audio/sfx/sfx_02_1b.asm
index b1857d2c..0e1112f6 100755
--- a/audio/sfx/sfx_02_1b.asm
+++ b/audio/sfx/sfx_02_1b.asm
@@ -19,4 +19,3 @@ SFX_02_1b_Ch3: ; 8a2b (2:4a2b)
 	unknownnoise0x20 15, 230, 76
 	unknownnoise0x20 8, 177, 92
 	endchannel
-; 0x8a35
diff --git a/audio/sfx/sfx_02_1c.asm b/audio/sfx/sfx_02_1c.asm
index a880a042..3a06819f 100755
--- a/audio/sfx/sfx_02_1c.asm
+++ b/audio/sfx/sfx_02_1c.asm
@@ -21,4 +21,3 @@ SFX_02_1c_Ch3: ; 8c4b (2:4c4b)
 	unknownnoise0x20 11, 215, 92
 	unknownnoise0x20 15, 194, 76
 	endchannel
-; 0x8c55
diff --git a/audio/sfx/sfx_02_1d.asm b/audio/sfx/sfx_02_1d.asm
index fa70c67c..1501e2ab 100755
--- a/audio/sfx/sfx_02_1d.asm
+++ b/audio/sfx/sfx_02_1d.asm
@@ -33,4 +33,3 @@ SFX_02_1d_Ch3: ; 876d (2:476d)
 	unknownnoise0x20 6, 212, 61
 	unknownnoise0x20 8, 193, 59
 	endchannel
-; 0x8786
diff --git a/audio/sfx/sfx_02_1e.asm b/audio/sfx/sfx_02_1e.asm
index 19ccdada..1036f953 100755
--- a/audio/sfx/sfx_02_1e.asm
+++ b/audio/sfx/sfx_02_1e.asm
@@ -33,4 +33,3 @@ SFX_02_1e_Ch3: ; 8c0c (2:4c0c)
 	unknownnoise0x20 3, 164, 44
 	unknownnoise0x20 8, 145, 60
 	endchannel
-; 0x8c25
diff --git a/audio/sfx/sfx_02_1f.asm b/audio/sfx/sfx_02_1f.asm
index 0305f8bf..8f603856 100755
--- a/audio/sfx/sfx_02_1f.asm
+++ b/audio/sfx/sfx_02_1f.asm
@@ -35,4 +35,3 @@ SFX_02_1f_Ch3: ; 8aa5 (2:4aa5)
 	unknownnoise0x20 4, 193, 44
 	unknownnoise0x20 8, 161, 76
 	endchannel
-; 0x8abe
diff --git a/audio/sfx/sfx_02_20.asm b/audio/sfx/sfx_02_20.asm
index 90e68dd0..741ae0e8 100755
--- a/audio/sfx/sfx_02_20.asm
+++ b/audio/sfx/sfx_02_20.asm
@@ -27,4 +27,3 @@ SFX_02_20_Ch2: ; 8ae5 (2:4ae5)
 
 SFX_02_20_Ch3: ; 8b0b (2:4b0b)
 	endchannel
-; 0x8b0c
diff --git a/audio/sfx/sfx_02_21.asm b/audio/sfx/sfx_02_21.asm
index b454585c..4c7bebee 100755
--- a/audio/sfx/sfx_02_21.asm
+++ b/audio/sfx/sfx_02_21.asm
@@ -38,4 +38,3 @@ SFX_02_21_Ch3: ; 8b78 (2:4b78)
 	unknownnoise0x20 9, 194, 44
 	unknownnoise0x20 4, 161, 60
 	endchannel
-; 0x8b97
diff --git a/audio/sfx/sfx_02_22.asm b/audio/sfx/sfx_02_22.asm
index 5fb2b91c..6d4a8f7d 100755
--- a/audio/sfx/sfx_02_22.asm
+++ b/audio/sfx/sfx_02_22.asm
@@ -21,4 +21,3 @@ SFX_02_22_Ch3: ; 89d5 (2:49d5)
 	unknownnoise0x20 2, 97, 33
 	unknownnoise0x20 8, 97, 17
 	endchannel
-; 0x89df
diff --git a/audio/sfx/sfx_02_23.asm b/audio/sfx/sfx_02_23.asm
index 19110b45..fb0ff58c 100755
--- a/audio/sfx/sfx_02_23.asm
+++ b/audio/sfx/sfx_02_23.asm
@@ -27,4 +27,3 @@ SFX_02_23_Ch3: ; 8927 (2:4927)
 	unknownnoise0x20 8, 183, 92
 	unknownnoise0x20 15, 194, 93
 	endchannel
-; 0x8937
diff --git a/audio/sfx/sfx_02_24.asm b/audio/sfx/sfx_02_24.asm
index c487c8b8..c1ff6fcc 100755
--- a/audio/sfx/sfx_02_24.asm
+++ b/audio/sfx/sfx_02_24.asm
@@ -29,4 +29,3 @@ SFX_02_24_Ch3: ; 897d (2:497d)
 	unknownnoise0x20 4, 116, 16
 	unknownnoise0x20 4, 113, 32
 	endchannel
-; 0x8987
diff --git a/audio/sfx/sfx_02_25.asm b/audio/sfx/sfx_02_25.asm
index 97ed7c86..f324be84 100755
--- a/audio/sfx/sfx_02_25.asm
+++ b/audio/sfx/sfx_02_25.asm
@@ -32,4 +32,3 @@ SFX_02_25_Ch3: ; 8855 (2:4855)
 	unknownnoise0x20 12, 210, 61
 	unknownnoise0x20 8, 209, 44
 	endchannel
-; 0x886b
diff --git a/audio/sfx/sfx_02_26.asm b/audio/sfx/sfx_02_26.asm
index 46f596d0..6ecd820f 100755
--- a/audio/sfx/sfx_02_26.asm
+++ b/audio/sfx/sfx_02_26.asm
@@ -22,4 +22,3 @@ SFX_02_26_Ch3: ; 8d51 (2:4d51)
 	unknownnoise0x20 3, 194, 108
 	unknownnoise0x20 8, 209, 92
 	endchannel
-; 0x8d5e
diff --git a/audio/sfx/sfx_02_27.asm b/audio/sfx/sfx_02_27.asm
index d25a4db9..2449cf89 100755
--- a/audio/sfx/sfx_02_27.asm
+++ b/audio/sfx/sfx_02_27.asm
@@ -28,4 +28,3 @@ SFX_02_27_Ch3: ; 8d94 (2:4d94)
 	unknownnoise0x20 8, 179, 76
 	unknownnoise0x20 8, 161, 92
 	endchannel
-; 0x8da7
diff --git a/audio/sfx/sfx_02_28.asm b/audio/sfx/sfx_02_28.asm
index f4ed88b2..bb872795 100755
--- a/audio/sfx/sfx_02_28.asm
+++ b/audio/sfx/sfx_02_28.asm
@@ -19,4 +19,3 @@ SFX_02_28_Ch3: ; 8dc5 (2:4dc5)
 	unknownnoise0x20 14, 196, 60
 	unknownnoise0x20 8, 209, 44
 	endchannel
-; 0x8dcf
diff --git a/audio/sfx/sfx_02_29.asm b/audio/sfx/sfx_02_29.asm
index f0a86c6a..466a8bc8 100755
--- a/audio/sfx/sfx_02_29.asm
+++ b/audio/sfx/sfx_02_29.asm
@@ -28,4 +28,3 @@ SFX_02_29_Ch3: ; 8e6b (2:4e6b)
 	unknownnoise0x20 3, 162, 92
 	unknownnoise0x20 8, 177, 108
 	endchannel
-; 0x8e7e
diff --git a/audio/sfx/sfx_02_2a.asm b/audio/sfx/sfx_02_2a.asm
index 70778f03..13356384 100755
--- a/audio/sfx/sfx_02_2a.asm
+++ b/audio/sfx/sfx_02_2a.asm
@@ -19,4 +19,3 @@ SFX_02_2a_Ch3: ; 8ce6 (2:4ce6)
 	unknownnoise0x20 4, 230, 60
 	unknownnoise0x20 15, 242, 76
 	endchannel
-; 0x8cf0
diff --git a/audio/sfx/sfx_02_2b.asm b/audio/sfx/sfx_02_2b.asm
index dfc4d66d..5aa42f68 100755
--- a/audio/sfx/sfx_02_2b.asm
+++ b/audio/sfx/sfx_02_2b.asm
@@ -22,4 +22,3 @@ SFX_02_2b_Ch3: ; 8ea4 (2:4ea4)
 	unknownnoise0x20 9, 228, 124
 	unknownnoise0x20 15, 226, 108
 	endchannel
-; 0x8eb1
diff --git a/audio/sfx/sfx_02_2c.asm b/audio/sfx/sfx_02_2c.asm
index 642d5fd5..39f2a7da 100755
--- a/audio/sfx/sfx_02_2c.asm
+++ b/audio/sfx/sfx_02_2c.asm
@@ -32,4 +32,3 @@ SFX_02_2c_Ch3: ; 8fd4 (2:4fd4)
 	unknownnoise0x20 6, 180, 60
 	unknownnoise0x20 8, 193, 44
 	endchannel
-; 0x8fe7
diff --git a/audio/sfx/sfx_02_2d.asm b/audio/sfx/sfx_02_2d.asm
index 4c42b231..1e9ef3e5 100755
--- a/audio/sfx/sfx_02_2d.asm
+++ b/audio/sfx/sfx_02_2d.asm
@@ -16,4 +16,3 @@ SFX_02_2d_Ch2: ; 8cb5 (2:4cb5)
 
 SFX_02_2d_Ch3: ; 8cc7 (2:4cc7)
 	endchannel
-; 0x8cc8
diff --git a/audio/sfx/sfx_02_2e.asm b/audio/sfx/sfx_02_2e.asm
index a39964c8..d0c25b47 100755
--- a/audio/sfx/sfx_02_2e.asm
+++ b/audio/sfx/sfx_02_2e.asm
@@ -28,4 +28,3 @@ SFX_02_2e_Ch3: ; 8f35 (2:4f35)
 	unknownnoise0x20 2, 226, 60
 	unknownnoise0x20 8, 209, 44
 	endchannel
-; 0x8f48
diff --git a/audio/sfx/sfx_02_2f.asm b/audio/sfx/sfx_02_2f.asm
index 3594ebd1..ba0ecd23 100755
--- a/audio/sfx/sfx_02_2f.asm
+++ b/audio/sfx/sfx_02_2f.asm
@@ -24,4 +24,3 @@ SFX_02_2f_Ch3: ; 8d1e (2:4d1e)
 	unknownnoise0x20 5, 163, 60
 	unknownnoise0x20 8, 145, 44
 	endchannel
-; 0x8d2b
diff --git a/audio/sfx/sfx_02_30.asm b/audio/sfx/sfx_02_30.asm
index c94fbbbc..41a18486 100755
--- a/audio/sfx/sfx_02_30.asm
+++ b/audio/sfx/sfx_02_30.asm
@@ -29,4 +29,3 @@ SFX_02_30_Ch3: ; 8eef (2:4eef)
 	unknownnoise0x20 8, 196, 108
 	unknownnoise0x20 15, 179, 92
 	endchannel
-; 0x8eff
diff --git a/audio/sfx/sfx_02_31.asm b/audio/sfx/sfx_02_31.asm
index 543aeea9..331413d3 100755
--- a/audio/sfx/sfx_02_31.asm
+++ b/audio/sfx/sfx_02_31.asm
@@ -27,4 +27,3 @@ SFX_02_31_Ch3: ; 8f7e (2:4f7e)
 	unknownnoise0x20 1, 178, 91
 	unknownnoise0x20 15, 194, 76
 	endchannel
-; 0x8f8e
diff --git a/audio/sfx/sfx_02_32.asm b/audio/sfx/sfx_02_32.asm
index c231ace0..a38da7fd 100755
--- a/audio/sfx/sfx_02_32.asm
+++ b/audio/sfx/sfx_02_32.asm
@@ -36,4 +36,3 @@ SFX_02_32_Ch3: ; 8e19 (2:4e19)
 	unknownnoise0x20 5, 146, 26
 	unknownnoise0x20 8, 129, 24
 	endchannel
-; 0x8e35
diff --git a/audio/sfx/sfx_02_33.asm b/audio/sfx/sfx_02_33.asm
index f13e35f7..555f9b14 100755
--- a/audio/sfx/sfx_02_33.asm
+++ b/audio/sfx/sfx_02_33.asm
@@ -22,4 +22,3 @@ SFX_02_33_Ch3: ; 900d (2:500d)
 	unknownnoise0x20 8, 196, 69
 	unknownnoise0x20 8, 177, 68
 	endchannel
-; 0x901a
diff --git a/audio/sfx/sfx_02_34.asm b/audio/sfx/sfx_02_34.asm
index 786ffbd4..a8b21680 100755
--- a/audio/sfx/sfx_02_34.asm
+++ b/audio/sfx/sfx_02_34.asm
@@ -22,4 +22,3 @@ SFX_02_34_Ch3: ; 9040 (2:5040)
 	unknownnoise0x20 14, 210, 86
 	unknownnoise0x20 8, 209, 102
 	endchannel
-; 0x904d
diff --git a/audio/sfx/sfx_02_35.asm b/audio/sfx/sfx_02_35.asm
index 005ea485..61b2a5ac 100755
--- a/audio/sfx/sfx_02_35.asm
+++ b/audio/sfx/sfx_02_35.asm
@@ -25,4 +25,3 @@ SFX_02_35_Ch2: ; 9070 (2:5070)
 
 SFX_02_35_Ch3: ; 9092 (2:5092)
 	endchannel
-; 0x9093
diff --git a/audio/sfx/sfx_02_36.asm b/audio/sfx/sfx_02_36.asm
index 369f6a4b..972f87a6 100755
--- a/audio/sfx/sfx_02_36.asm
+++ b/audio/sfx/sfx_02_36.asm
@@ -22,4 +22,3 @@ SFX_02_36_Ch3: ; 90b9 (2:50b9)
 	unknownnoise0x20 1, 162, 57
 	unknownnoise0x20 8, 145, 73
 	endchannel
-; 0x90c6
diff --git a/audio/sfx/sfx_02_37.asm b/audio/sfx/sfx_02_37.asm
index cc093dcd..c286b018 100755
--- a/audio/sfx/sfx_02_37.asm
+++ b/audio/sfx/sfx_02_37.asm
@@ -23,4 +23,3 @@ SFX_02_37_Ch3: ; 87b0 (2:47b0)
 	unknownnoise0x20 15, 215, 60
 	unknownnoise0x20 8, 193, 44
 	endchannel
-; 0x87bd
diff --git a/audio/sfx/sfx_02_38.asm b/audio/sfx/sfx_02_38.asm
index 5511cfb1..9b6ba80f 100755
--- a/audio/sfx/sfx_02_38.asm
+++ b/audio/sfx/sfx_02_38.asm
@@ -31,4 +31,3 @@ SFX_02_38_Ch3: ; 8803 (2:4803)
 	unknownnoise0x20 12, 183, 76
 	unknownnoise0x20 15, 162, 92
 	endchannel
-; 0x8813
diff --git a/audio/sfx/sfx_02_39.asm b/audio/sfx/sfx_02_39.asm
index 079059ec..3d50aef5 100755
--- a/audio/sfx/sfx_02_39.asm
+++ b/audio/sfx/sfx_02_39.asm
@@ -24,4 +24,3 @@ SFX_02_39_Ch3: ; 8899 (2:4899)
 	unknownnoise0x20 10, 182, 44
 	unknownnoise0x20 8, 145, 28
 	endchannel
-; 0x88a6
diff --git a/audio/sfx/sfx_02_3a.asm b/audio/sfx/sfx_02_3a.asm
index b394d7c9..96c93702 100755
--- a/audio/sfx/sfx_02_3a.asm
+++ b/audio/sfx/sfx_02_3a.asm
@@ -45,4 +45,3 @@ SFX_02_3a_Ch3: ; ad9e (2:6d9e)
 	B_ 2
 	rest 2
 	endchannel
-; 0xadae
diff --git a/audio/sfx/sfx_02_3b.asm b/audio/sfx/sfx_02_3b.asm
index 1c2fbd50..190b1299 100755
--- a/audio/sfx/sfx_02_3b.asm
+++ b/audio/sfx/sfx_02_3b.asm
@@ -67,4 +67,3 @@ SFX_02_3b_Ch3: ; b34d (2:734d)
 	rest 1
 	A_ 8
 	endchannel
-; 0xb362
diff --git a/audio/sfx/sfx_02_3c.asm b/audio/sfx/sfx_02_3c.asm
index 24858e3e..95e2029d 100755
--- a/audio/sfx/sfx_02_3c.asm
+++ b/audio/sfx/sfx_02_3c.asm
@@ -6,4 +6,3 @@ SFX_02_3c_Ch1: ; 840a (2:440a)
 	unknownsfx0x20 8, 226, 0, 2
 	unknownsfx0x10 8
 	endchannel
-; 0x841b
diff --git a/audio/sfx/sfx_02_3d.asm b/audio/sfx/sfx_02_3d.asm
index 35f52890..469776a4 100755
--- a/audio/sfx/sfx_02_3d.asm
+++ b/audio/sfx/sfx_02_3d.asm
@@ -5,4 +5,3 @@ SFX_02_3d_Ch1: ; 84b7 (2:44b7)
 	unknownsfx0x20 15, 242, 80, 6
 	unknownsfx0x10 8
 	endchannel
-; 0x84c6
diff --git a/audio/sfx/sfx_02_3e.asm b/audio/sfx/sfx_02_3e.asm
index 39757272..36824962 100755
--- a/audio/sfx/sfx_02_3e.asm
+++ b/audio/sfx/sfx_02_3e.asm
@@ -7,4 +7,3 @@ SFX_02_3e_Ch1: ; 84d9 (2:44d9)
 	unknownsfx0x20 15, 242, 0, 6
 	unknownsfx0x10 8
 	endchannel
-; 0x84ee
diff --git a/audio/sfx/sfx_02_3f.asm b/audio/sfx/sfx_02_3f.asm
index 57d5feca..dffd99cb 100755
--- a/audio/sfx/sfx_02_3f.asm
+++ b/audio/sfx/sfx_02_3f.asm
@@ -2,4 +2,3 @@ SFX_02_3f_Ch1: ; 83c3 (2:43c3)
 	unknownnoise0x20 1, 226, 51
 	unknownnoise0x20 8, 225, 34
 	endchannel
-; 0x83ca
diff --git a/audio/sfx/sfx_02_40.asm b/audio/sfx/sfx_02_40.asm
index 7b4edd6e..2aa521b4 100755
--- a/audio/sfx/sfx_02_40.asm
+++ b/audio/sfx/sfx_02_40.asm
@@ -5,4 +5,3 @@ SFX_02_40_Ch1: ; 8462 (2:4462)
 	unknownsfx0x20 0, 145, 192, 7
 	unknownsfx0x20 12, 161, 208, 7
 	endchannel
-; 0x8475
diff --git a/audio/sfx/sfx_02_41.asm b/audio/sfx/sfx_02_41.asm
index e40c1fe5..a21595f3 100755
--- a/audio/sfx/sfx_02_41.asm
+++ b/audio/sfx/sfx_02_41.asm
@@ -75,4 +75,3 @@ SFX_02_41_Ch3: ; b2f7 (2:72f7)
 	F_ 2
 	rest 2
 	endchannel
-; 0xb316
diff --git a/audio/sfx/sfx_02_42.asm b/audio/sfx/sfx_02_42.asm
index f31a8e26..9f997b36 100755
--- a/audio/sfx/sfx_02_42.asm
+++ b/audio/sfx/sfx_02_42.asm
@@ -57,4 +57,3 @@ SFX_02_42_Ch3: ; b39d (2:739d)
 	F_ 4
 	D# 8
 	endchannel
-; 0xb3a7
diff --git a/audio/sfx/sfx_02_43.asm b/audio/sfx/sfx_02_43.asm
index 3d588100..3bb6f7ed 100755
--- a/audio/sfx/sfx_02_43.asm
+++ b/audio/sfx/sfx_02_43.asm
@@ -6,4 +6,3 @@ SFX_02_43_Ch1: ; 84c6 (2:44c6)
 	unknownsfx0x20 15, 243, 0, 6
 	unknownsfx0x10 8
 	endchannel
-; 0x84d9
diff --git a/audio/sfx/sfx_02_44.asm b/audio/sfx/sfx_02_44.asm
index 594b4b17..c03155d1 100755
--- a/audio/sfx/sfx_02_44.asm
+++ b/audio/sfx/sfx_02_44.asm
@@ -5,4 +5,3 @@ SFX_02_44_Ch1: ; 84ee (2:44ee)
 	unknownsfx0x20 15, 242, 80, 6
 	unknownsfx0x10 8
 	endchannel
-; 0x84fd
diff --git a/audio/sfx/sfx_02_45.asm b/audio/sfx/sfx_02_45.asm
index 38243a99..a2b9f83d 100755
--- a/audio/sfx/sfx_02_45.asm
+++ b/audio/sfx/sfx_02_45.asm
@@ -11,4 +11,3 @@ SFX_02_45_Ch1: ; 84fd (2:44fd)
 	unknownsfx0x20 3, 161, 192, 7
 	unknownsfx0x20 8, 161, 0, 7
 	endchannel
-; 0x8528
diff --git a/audio/sfx/sfx_02_46.asm b/audio/sfx/sfx_02_46.asm
index acd5299c..b75ef176 100755
--- a/audio/sfx/sfx_02_46.asm
+++ b/audio/sfx/sfx_02_46.asm
@@ -5,4 +5,3 @@ SFX_02_46_Ch1: ; 8528 (2:4528)
 	unknownsfx0x20 4, 240, 0, 2
 	unknownsfx0x20 1, 0, 0, 0
 	endchannel
-; 0x853b
diff --git a/audio/sfx/sfx_02_47.asm b/audio/sfx/sfx_02_47.asm
index ee3214fa..f498077c 100755
--- a/audio/sfx/sfx_02_47.asm
+++ b/audio/sfx/sfx_02_47.asm
@@ -5,4 +5,3 @@ SFX_02_47_Ch1: ; 853b (2:453b)
 	unknownsfx0x20 6, 240, 0, 7
 	unknownsfx0x20 1, 0, 0, 0
 	endchannel
-; 0x854e
diff --git a/audio/sfx/sfx_02_48.asm b/audio/sfx/sfx_02_48.asm
index 58dc2934..e22443cc 100755
--- a/audio/sfx/sfx_02_48.asm
+++ b/audio/sfx/sfx_02_48.asm
@@ -8,4 +8,3 @@ SFX_02_48_Ch1: ; 854e (2:454e)
 	unknownsfx0x20 15, 23, 0, 4
 	unknownsfx0x10 8
 	endchannel
-; 0x8569
diff --git a/audio/sfx/sfx_02_49.asm b/audio/sfx/sfx_02_49.asm
index d2a9922b..6cf3e647 100755
--- a/audio/sfx/sfx_02_49.asm
+++ b/audio/sfx/sfx_02_49.asm
@@ -6,4 +6,3 @@ SFX_02_49_Ch1: ; 8569 (2:4569)
 	unknownsfx0x20 4, 241, 128, 7
 	unknownsfx0x20 4, 0, 0, 0
 	endchannel
-; 0x8580
diff --git a/audio/sfx/sfx_02_4a.asm b/audio/sfx/sfx_02_4a.asm
index f4f37ab8..1cb0e857 100755
--- a/audio/sfx/sfx_02_4a.asm
+++ b/audio/sfx/sfx_02_4a.asm
@@ -7,4 +7,3 @@ SFX_02_4a_Ch1: ; 8580 (2:4580)
 	unknownsfx0x10 8
 	unknownsfx0x20 1, 0, 0, 0
 	endchannel
-; 0x8595
diff --git a/audio/sfx/sfx_02_4b.asm b/audio/sfx/sfx_02_4b.asm
index 5826cf25..173a6c9d 100755
--- a/audio/sfx/sfx_02_4b.asm
+++ b/audio/sfx/sfx_02_4b.asm
@@ -8,4 +8,3 @@ SFX_02_4b_Ch1: ; 8595 (2:4595)
 	unknownsfx0x20 15, 23, 0, 7
 	unknownsfx0x10 8
 	endchannel
-; 0x85b0
diff --git a/audio/sfx/sfx_02_4c.asm b/audio/sfx/sfx_02_4c.asm
index 4bd47818..a52fefcf 100755
--- a/audio/sfx/sfx_02_4c.asm
+++ b/audio/sfx/sfx_02_4c.asm
@@ -8,4 +8,3 @@ SFX_02_4c_Ch1: ; 85b0 (2:45b0)
 	unknownsfx0x20 15, 23, 0, 5
 	unknownsfx0x10 8
 	endchannel
-; 0x85cb
diff --git a/audio/sfx/sfx_02_4d.asm b/audio/sfx/sfx_02_4d.asm
index b3028e82..c7063722 100755
--- a/audio/sfx/sfx_02_4d.asm
+++ b/audio/sfx/sfx_02_4d.asm
@@ -4,4 +4,3 @@ SFX_02_4d_Ch1: ; 85cb (2:45cb)
 	unknownsfx0x20 15, 210, 0, 5
 	unknownsfx0x10 8
 	endchannel
-; 0x85d6
diff --git a/audio/sfx/sfx_02_4e.asm b/audio/sfx/sfx_02_4e.asm
index 9f204e21..78b64198 100755
--- a/audio/sfx/sfx_02_4e.asm
+++ b/audio/sfx/sfx_02_4e.asm
@@ -4,4 +4,3 @@ SFX_02_4e_Ch1: ; 85d6 (2:45d6)
 	unknownsfx0x20 15, 242, 0, 4
 	unknownsfx0x10 8
 	endchannel
-; 0x85e1
diff --git a/audio/sfx/sfx_02_4f.asm b/audio/sfx/sfx_02_4f.asm
index 268586bb..53e523d0 100755
--- a/audio/sfx/sfx_02_4f.asm
+++ b/audio/sfx/sfx_02_4f.asm
@@ -4,4 +4,3 @@ SFX_02_4f_Ch1: ; 85e1 (2:45e1)
 	unknownnoise0x20 2, 241, 34
 	unknownnoise0x20 1, 0, 0
 	endchannel
-; 0x85ee
diff --git a/audio/sfx/sfx_02_50.asm b/audio/sfx/sfx_02_50.asm
index 3d5bf3fe..5a5cd2b6 100755
--- a/audio/sfx/sfx_02_50.asm
+++ b/audio/sfx/sfx_02_50.asm
@@ -16,4 +16,3 @@ SFX_02_50_Ch1: ; 85ee (2:45ee)
 	unknownnoise0x20 2, 65, 18
 	unknownnoise0x20 2, 0, 0
 	endchannel
-; 0x861f
diff --git a/audio/sfx/sfx_02_51.asm b/audio/sfx/sfx_02_51.asm
index 1c039e7c..cb55b512 100755
--- a/audio/sfx/sfx_02_51.asm
+++ b/audio/sfx/sfx_02_51.asm
@@ -16,4 +16,3 @@ SFX_02_51_Ch2: ; 8636 (2:4636)
 	unknownsfx0x20 15, 240, 1, 4
 	unknownsfx0x20 1, 0, 0, 0
 	endchannel
-; 0x8649
diff --git a/audio/sfx/sfx_02_52.asm b/audio/sfx/sfx_02_52.asm
index 6afe2bef..22b72929 100755
--- a/audio/sfx/sfx_02_52.asm
+++ b/audio/sfx/sfx_02_52.asm
@@ -4,4 +4,3 @@ SFX_02_52_Ch1: ; 8649 (2:4649)
 	unknownsfx0x20 15, 210, 0, 7
 	unknownsfx0x10 8
 	endchannel
-; 0x8654
diff --git a/audio/sfx/sfx_02_53.asm b/audio/sfx/sfx_02_53.asm
index dc2f6d92..e81724b0 100755
--- a/audio/sfx/sfx_02_53.asm
+++ b/audio/sfx/sfx_02_53.asm
@@ -8,4 +8,3 @@ SFX_02_53_Ch1: ; 8654 (2:4654)
 	unknownnoise0x20 8, 244, 85
 	unknownnoise0x20 8, 241, 68
 	endchannel
-; 0x866d
diff --git a/audio/sfx/sfx_02_54.asm b/audio/sfx/sfx_02_54.asm
index b15a29cc..72f79c78 100755
--- a/audio/sfx/sfx_02_54.asm
+++ b/audio/sfx/sfx_02_54.asm
@@ -20,4 +20,3 @@ SFX_02_54_Ch2: ; 868c (2:468c)
 	unknownsfx0x20 15, 240, 130, 4
 	unknownsfx0x20 15, 242, 130, 4
 	endchannel
-; 0x86ab
diff --git a/audio/sfx/sfx_02_55.asm b/audio/sfx/sfx_02_55.asm
index e4d46f3a..57182f34 100755
--- a/audio/sfx/sfx_02_55.asm
+++ b/audio/sfx/sfx_02_55.asm
@@ -10,4 +10,3 @@ SFX_02_55_Ch1: ; 86ab (2:46ab)
 	unknownsfx0x20 15, 226, 0, 7
 	unknownsfx0x10 8
 	endchannel
-; 0x86c8
diff --git a/audio/sfx/sfx_02_56.asm b/audio/sfx/sfx_02_56.asm
index ee6636e1..d27fba19 100755
--- a/audio/sfx/sfx_02_56.asm
+++ b/audio/sfx/sfx_02_56.asm
@@ -5,4 +5,3 @@ SFX_02_56_Ch1: ; 83e1 (2:43e1)
 	unknownnoise0x20 8, 244, 85
 	unknownnoise0x20 8, 241, 68
 	endchannel
-; 0x83f1
diff --git a/audio/sfx/sfx_02_57.asm b/audio/sfx/sfx_02_57.asm
index e81877d1..8f8d06e2 100755
--- a/audio/sfx/sfx_02_57.asm
+++ b/audio/sfx/sfx_02_57.asm
@@ -2,4 +2,3 @@ SFX_02_57_Ch1: ; 83f1 (2:43f1)
 	unknownnoise0x20 9, 241, 68
 	unknownnoise0x20 8, 209, 67
 	endchannel
-; 0x83f8
diff --git a/audio/sfx/sfx_02_58.asm b/audio/sfx/sfx_02_58.asm
index bf45fc6c..3a9836fb 100755
--- a/audio/sfx/sfx_02_58.asm
+++ b/audio/sfx/sfx_02_58.asm
@@ -9,4 +9,3 @@ SFX_02_58_Ch2: ; 83ff (2:43ff)
 	unknownsfx0x20 2, 8, 0, 0
 	unknownsfx0x20 8, 177, 65, 7
 	endchannel
-; 0x840a
diff --git a/audio/sfx/sfx_02_59.asm b/audio/sfx/sfx_02_59.asm
index 3fdea72a..c4ea93f7 100755
--- a/audio/sfx/sfx_02_59.asm
+++ b/audio/sfx/sfx_02_59.asm
@@ -9,4 +9,3 @@ SFX_02_59_Ch2: ; 8422 (2:4422)
 	unknownsfx0x20 1, 8, 0, 0
 	unknownsfx0x20 4, 161, 97, 7
 	endchannel
-; 0x842d
diff --git a/audio/sfx/sfx_02_5a.asm b/audio/sfx/sfx_02_5a.asm
index 9ad8098e..d0d6f875 100755
--- a/audio/sfx/sfx_02_5a.asm
+++ b/audio/sfx/sfx_02_5a.asm
@@ -11,4 +11,3 @@ SFX_02_5a_Ch2: ; 8438 (2:4438)
 	unknownsfx0x20 4, 145, 193, 6
 	unknownsfx0x20 8, 162, 161, 7
 	endchannel
-; 0x8447
diff --git a/audio/sfx/sfx_02_5b.asm b/audio/sfx/sfx_02_5b.asm
index 13144567..b09369db 100755
--- a/audio/sfx/sfx_02_5b.asm
+++ b/audio/sfx/sfx_02_5b.asm
@@ -4,4 +4,3 @@ SFX_02_5b_Ch1: ; 8447 (2:4447)
 	unknownsfx0x20 15, 241, 0, 3
 	unknownsfx0x10 8
 	endchannel
-; 0x8452
diff --git a/audio/sfx/sfx_02_5c.asm b/audio/sfx/sfx_02_5c.asm
index 4f48870b..477fd03b 100755
--- a/audio/sfx/sfx_02_5c.asm
+++ b/audio/sfx/sfx_02_5c.asm
@@ -5,4 +5,3 @@ SFX_02_5c_Ch1: ; 8452 (2:4452)
 	unknownnoise0x20 12, 97, 35
 	unknownnoise0x20 6, 65, 84
 	endchannel
-; 0x8462
diff --git a/audio/sfx/sfx_02_5d.asm b/audio/sfx/sfx_02_5d.asm
index b764b5e8..2411c9ee 100755
--- a/audio/sfx/sfx_02_5d.asm
+++ b/audio/sfx/sfx_02_5d.asm
@@ -21,4 +21,3 @@ SFX_02_5d_Ch2: ; 8494 (2:4494)
 	unknownsfx0x20 2, 196, 161, 7
 	unknownsfx0x20 15, 210, 225, 7
 	endchannel
-; 0x84b7
diff --git a/audio/sfx/sfx_02_5e.asm b/audio/sfx/sfx_02_5e.asm
index cd04822d..5f631c2d 100755
--- a/audio/sfx/sfx_02_5e.asm
+++ b/audio/sfx/sfx_02_5e.asm
@@ -19,4 +19,3 @@ SFX_02_5e_Ch1: ; 83ca (2:43ca)
 	G_ 8
 	rest 12
 	endchannel
-; 0x83e1
diff --git a/audio/sfx/sfx_02_5f.asm b/audio/sfx/sfx_02_5f.asm
index 0a60c2b3..c4fe674c 100755
--- a/audio/sfx/sfx_02_5f.asm
+++ b/audio/sfx/sfx_02_5f.asm
@@ -7,4 +7,3 @@ SFX_02_5f_Ch1: ; 86c8 (2:46c8)
 	unknownsfx0x20 15, 68, 0, 7
 	unknownsfx0x20 15, 36, 0, 7
 	endchannel
-; 0x86e3
diff --git a/audio/sfx/sfx_02_unused.asm b/audio/sfx/sfx_02_unused.asm
index 919d7319..bd9bdfb3 100755
--- a/audio/sfx/sfx_02_unused.asm
+++ b/audio/sfx/sfx_02_unused.asm
@@ -29,4 +29,3 @@ SFX_02_unused_Ch3: ; 8719 (2:4719)
 	unknownnoise0x20 12, 125, 76
 	unknownnoise0x20 15, 211, 76
 	endchannel
-; 0x872f