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
2026-03-26 14:29:22 +13:00 · 2015-07-03 14:39:24 -05:00 · 2015-07-03 14:39:24 -05:00 · fc9b61e8ac
commit fc9b61e8ac
parent f4a31b3e0b
155 changed files with 156 additions and 312 deletions
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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