Merge branch 'master' of https://github.com/iimarckus/pokered

Doesn't build.

356 files changed, 715 insertions, 1038 deletions

diff --git a/audio/sfx/sfx_02_59.asm b/audio/sfx/59_1.asm
index 3fdea72a..6cbfdb16 100755..100644
--- a/audio/sfx/sfx_02_59.asm
+++ b/audio/sfx/59_1.asm
@@ -1,12 +1,11 @@
-SFX_02_59_Ch1: ; 841b (2:441b)
+SFX_59_1_Ch1: ; 841b (2:441b)
 	duty 2
 	unknownsfx0x20 4, 241, 128, 7
 	endchannel
 
 
-SFX_02_59_Ch2: ; 8422 (2:4422)
+SFX_59_1_Ch2: ; 8422 (2:4422)
 	duty 2
 	unknownsfx0x20 1, 8, 0, 0
 	unknownsfx0x20 4, 161, 97, 7
 	endchannel
-; 0x842d
diff --git a/audio/sfx/sfx_1f_59.asm b/audio/sfx/59_3.asm
index 45e65572..9c808359 100755..100644
--- a/audio/sfx/sfx_1f_59.asm
+++ b/audio/sfx/59_3.asm
@@ -1,12 +1,11 @@
-SFX_1f_59_Ch1: ; 7c404 (1f:4404)
+SFX_59_3_Ch1: ; 7c404 (1f:4404)
 	duty 2
 	unknownsfx0x20 4, 241, 128, 7
 	endchannel
 
 
-SFX_1f_59_Ch2: ; 7c40b (1f:440b)
+SFX_59_3_Ch2: ; 7c40b (1f:440b)
 	duty 2
 	unknownsfx0x20 1, 8, 0, 0
 	unknownsfx0x20 4, 161, 97, 7
 	endchannel
-; 0x7c416
diff --git a/audio/sfx/sfx_02_52.asm b/audio/sfx/arrow_tiles_1.asm
index 6afe2bef..172907a8 100755..100644
--- a/audio/sfx/sfx_02_52.asm
+++ b/audio/sfx/arrow_tiles_1.asm
@@ -1,7 +1,6 @@
-SFX_02_52_Ch1: ; 8649 (2:4649)
+SFX_Arrow_Tiles_1_Ch1: ; 8649 (2:4649)
 	duty 0
 	unknownsfx0x10 23
 	unknownsfx0x20 15, 210, 0, 7
 	unknownsfx0x10 8
 	endchannel
-; 0x8654
diff --git a/audio/sfx/sfx_1f_52.asm b/audio/sfx/arrow_tiles_3.asm
index 0ac5e8ee..fd225a5f 100755..100644
--- a/audio/sfx/sfx_1f_52.asm
+++ b/audio/sfx/arrow_tiles_3.asm
@@ -1,7 +1,6 @@
-SFX_1f_52_Ch1: ; 7c626 (1f:4626)
+SFX_Arrow_Tiles_3_Ch1: ; 7c626 (1f:4626)
 	duty 0
 	unknownsfx0x10 23
 	unknownsfx0x20 15, 210, 0, 7
 	unknownsfx0x10 8
 	endchannel
-; 0x7c631
diff --git a/audio/sfx/sfx_08_42.asm b/audio/sfx/ball_poof.asm
index fadf0c42..46fb2a07 100755..100644
--- a/audio/sfx/sfx_08_42.asm
+++ b/audio/sfx/ball_poof.asm
@@ -1,4 +1,4 @@
-SFX_08_42_Ch1: ; 2043d (8:443d)
+SFX_Ball_Poof_Ch1: ; 2043d (8:443d)
 	duty 2
 	unknownsfx0x10 22
 	unknownsfx0x20 15, 242, 0, 4
@@ -6,7 +6,6 @@ SFX_08_42_Ch1: ; 2043d (8:443d)
 	endchannel
 
 
-SFX_08_42_Ch2: ; 20448 (8:4448)
+SFX_Ball_Poof_Ch2: ; 20448 (8:4448)
 	unknownnoise0x20 15, 162, 34
 	endchannel
-; 0x2044c
diff --git a/audio/sfx/sfx_08_41.asm b/audio/sfx/ball_toss.asm
index a4788ad6..fc9f81cc 100755..100644
--- a/audio/sfx/sfx_08_41.asm
+++ b/audio/sfx/ball_toss.asm
@@ -1,12 +1,11 @@
-SFX_08_41_Ch1: ; 2042d (8:442d)
+SFX_Ball_Toss_Ch1: ; 2042d (8:442d)
 	duty 2
 	unknownsfx0x10 47
 	unknownsfx0x20 15, 242, 128, 7
 	endchannel
 
 
-SFX_08_41_Ch2: ; 20436 (8:4436)
+SFX_Ball_Toss_Ch2: ; 20436 (8:4436)
 	duty 2
 	unknownsfx0x20 15, 194, 130, 7
 	endchannel
-; 0x2043d
diff --git a/audio/sfx/sfx_08_49.asm b/audio/sfx/battle_09.asm
index 9d145c09..19e9b9e7 100755..100644
--- a/audio/sfx/sfx_08_49.asm
+++ b/audio/sfx/battle_09.asm
@@ -1,7 +1,6 @@
-SFX_08_49_Ch1: ; 204b9 (8:44b9)
+SFX_Battle_09_Ch1: ; 204b9 (8:44b9)
 	duty 1
 	unknownsfx0x10 151
 	unknownsfx0x20 15, 242, 0, 5
 	unknownsfx0x10 8
 	endchannel
-; 0x204c4
diff --git a/audio/sfx/battle_0b.asm b/audio/sfx/battle_0b.asm
new file mode 100644
index 00000000..1a7e17ec
--- /dev/null
+++ b/audio/sfx/battle_0b.asm
@@ -0,0 +1,3 @@
+SFX_Battle_0B_Ch1: ; 204c8 (8:44c8)
+	unknownnoise0x20 8, 241, 84
+	endchannel
diff --git a/audio/sfx/sfx_08_4c.asm b/audio/sfx/battle_0c.asm
index 3b4d0350..b2fdf455 100755..100644
--- a/audio/sfx/sfx_08_4c.asm
+++ b/audio/sfx/battle_0c.asm
@@ -1,6 +1,5 @@
-SFX_08_4c_Ch1: ; 204cc (8:44cc)
+SFX_Battle_0C_Ch1: ; 204cc (8:44cc)
 	unknownnoise0x20 15, 143, 17
 	unknownnoise0x20 4, 255, 18
 	unknownnoise0x20 10, 241, 85
 	endchannel
-; 0x204d6
diff --git a/audio/sfx/sfx_08_4d.asm b/audio/sfx/battle_0d.asm
index 90c2fe6c..c70b281d 100755..100644
--- a/audio/sfx/sfx_08_4d.asm
+++ b/audio/sfx/battle_0d.asm
@@ -1,6 +1,5 @@
-SFX_08_4d_Ch1: ; 204d6 (8:44d6)
+SFX_Battle_0D_Ch1: ; 204d6 (8:44d6)
 	unknownnoise0x20 15, 143, 52
 	unknownnoise0x20 8, 242, 53
 	unknownnoise0x20 10, 241, 85
 	endchannel
-; 0x204e0
diff --git a/audio/sfx/sfx_08_4e.asm b/audio/sfx/battle_0e.asm
index 172d245c..20c20628 100755..100644
--- a/audio/sfx/sfx_08_4e.asm
+++ b/audio/sfx/battle_0e.asm
@@ -1,5 +1,4 @@
-SFX_08_4e_Ch1: ; 204e0 (8:44e0)
+SFX_Battle_0E_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/battle_0f.asm
index d8f45c20..d84aed37 100755..100644
--- a/audio/sfx/sfx_08_4f.asm
+++ b/audio/sfx/battle_0f.asm
@@ -1,7 +1,6 @@
-SFX_08_4f_Ch1: ; 204e7 (8:44e7)
+SFX_Battle_0F_Ch1: ; 204e7 (8:44e7)
 	unknownnoise0x20 2, 225, 75
 	unknownnoise0x20 10, 241, 68
 	unknownnoise0x20 2, 225, 58
 	unknownnoise0x20 6, 241, 52
 	endchannel
-; 0x204f4
diff --git a/audio/sfx/sfx_08_52.asm b/audio/sfx/battle_12.asm
index 1ffbbd25..324ce9b9 100755..100644
--- a/audio/sfx/sfx_08_52.asm
+++ b/audio/sfx/battle_12.asm
@@ -1,7 +1,6 @@
-SFX_08_52_Ch1: ; 2050b (8:450b)
+SFX_Battle_12_Ch1: ; 2050b (8:450b)
 	unknownnoise0x20 8, 79, 35
 	unknownnoise0x20 4, 196, 34
 	unknownnoise0x20 6, 242, 35
-	loopchannel 4, SFX_08_52_Ch1
+	loopchannel 4, SFX_Battle_12_Ch1
 	endchannel
-; 0x20519
diff --git a/audio/sfx/sfx_08_53.asm b/audio/sfx/battle_13.asm
index aae94ed9..74349bb5 100755..100644
--- a/audio/sfx/sfx_08_53.asm
+++ b/audio/sfx/battle_13.asm
@@ -1,7 +1,6 @@
-SFX_08_53_Ch1: ; 20519 (8:4519)
+SFX_Battle_13_Ch1: ; 20519 (8:4519)
 	unknownnoise0x20 8, 79, 51
 	unknownnoise0x20 4, 196, 34
 	unknownnoise0x20 6, 242, 35
 	unknownnoise0x20 15, 242, 34
 	endchannel
-; 0x20526
diff --git a/audio/sfx/sfx_08_54.asm b/audio/sfx/battle_14.asm
index 92f84454..82234904 100755..100644
--- a/audio/sfx/sfx_08_54.asm
+++ b/audio/sfx/battle_14.asm
@@ -1,7 +1,6 @@
-SFX_08_54_Ch1: ; 20526 (8:4526)
+SFX_Battle_14_Ch1: ; 20526 (8:4526)
 	unknownnoise0x20 8, 255, 50
 	unknownnoise0x20 8, 244, 67
 	unknownnoise0x20 8, 242, 84
 	unknownnoise0x20 8, 241, 101
 	endchannel
-; 0x20533
diff --git a/audio/sfx/sfx_08_56.asm b/audio/sfx/battle_16.asm
index db106420..a2b5031e 100755..100644
--- a/audio/sfx/sfx_08_56.asm
+++ b/audio/sfx/battle_16.asm
@@ -1,6 +1,5 @@
-SFX_08_56_Ch1: ; 2054c (8:454c)
+SFX_Battle_16_Ch1: ; 2054c (8:454c)
 	unknownnoise0x20 1, 148, 35
 	unknownnoise0x20 1, 180, 34
 	unknownnoise0x20 8, 241, 68
 	endchannel
-; 0x20556
diff --git a/audio/sfx/sfx_08_57.asm b/audio/sfx/battle_17.asm
index d69c0e11..4be1d96b 100755..100644
--- a/audio/sfx/sfx_08_57.asm
+++ b/audio/sfx/battle_17.asm
@@ -1,7 +1,6 @@
-SFX_08_57_Ch1: ; 20556 (8:4556)
+SFX_Battle_17_Ch1: ; 20556 (8:4556)
 	unknownnoise0x20 2, 148, 51
 	unknownnoise0x20 4, 180, 34
 	unknownnoise0x20 4, 241, 68
 	unknownnoise0x20 8, 241, 85
 	endchannel
-; 0x20563
diff --git a/audio/sfx/sfx_08_58.asm b/audio/sfx/battle_18.asm
index 92a51d59..6c201d38 100755..100644
--- a/audio/sfx/sfx_08_58.asm
+++ b/audio/sfx/battle_18.asm
@@ -1,5 +1,4 @@
-SFX_08_58_Ch1: ; 20563 (8:4563)
+SFX_Battle_18_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/battle_19.asm
index c8f67cc0..6b54f8cd 100755..100644
--- a/audio/sfx/sfx_08_59.asm
+++ b/audio/sfx/battle_19.asm
@@ -1,6 +1,5 @@
-SFX_08_59_Ch1: ; 2056a (8:456a)
+SFX_Battle_19_Ch1: ; 2056a (8:456a)
 	unknownnoise0x20 2, 132, 67
 	unknownnoise0x20 2, 196, 34
 	unknownnoise0x20 8, 242, 52
 	endchannel
-; 0x20574
diff --git a/audio/sfx/sfx_08_5b.asm b/audio/sfx/battle_1b.asm
index 31a58537..3bb451d5 100755..100644
--- a/audio/sfx/sfx_08_5b.asm
+++ b/audio/sfx/battle_1b.asm
@@ -1,5 +1,4 @@
-SFX_08_5b_Ch1: ; 2057b (8:457b)
+SFX_Battle_1B_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/battle_1c.asm
index f14c9aab..579e36cc 100755..100644
--- a/audio/sfx/sfx_08_5c.asm
+++ b/audio/sfx/battle_1c.asm
@@ -1,6 +1,5 @@
-SFX_08_5c_Ch1: ; 20582 (8:4582)
+SFX_Battle_1C_Ch1: ; 20582 (8:4582)
 	unknownnoise0x20 2, 194, 1
 	unknownnoise0x20 15, 244, 1
 	unknownnoise0x20 15, 242, 1
 	endchannel
-; 0x2058c
diff --git a/audio/sfx/sfx_08_5e.asm b/audio/sfx/battle_1e.asm
index 366a6410..df556540 100755..100644
--- a/audio/sfx/sfx_08_5e.asm
+++ b/audio/sfx/battle_1e.asm
@@ -1,4 +1,4 @@
-SFX_08_5e_Ch1: ; 20593 (8:4593)
+SFX_Battle_1E_Ch1: ; 20593 (8:4593)
 	duty 0
 	unknownsfx0x10 58
 	unknownsfx0x20 4, 242, 0, 2
@@ -8,10 +8,9 @@ SFX_08_5e_Ch1: ; 20593 (8:4593)
 	endchannel
 
 
-SFX_08_5e_Ch2: ; 205a4 (8:45a4)
+SFX_Battle_1E_Ch2: ; 205a4 (8:45a4)
 	unknownnoise0x20 0, 209, 66
 	unknownnoise0x20 4, 161, 50
 	unknownnoise0x20 0, 209, 34
 	unknownnoise0x20 6, 161, 50
 	endchannel
-; 0x205b1
diff --git a/audio/sfx/sfx_08_60.asm b/audio/sfx/battle_20.asm
index a1ae9cdb..142030ee 100755..100644
--- a/audio/sfx/sfx_08_60.asm
+++ b/audio/sfx/battle_20.asm
@@ -1,5 +1,4 @@
-SFX_08_60_Ch1: ; 205be (8:45be)
+SFX_Battle_20_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/battle_21.asm
index c930fed6..10ad350e 100755..100644
--- a/audio/sfx/sfx_08_61.asm
+++ b/audio/sfx/battle_21.asm
@@ -1,8 +1,7 @@
-SFX_08_61_Ch1: ; 205c5 (8:45c5)
+SFX_Battle_21_Ch1: ; 205c5 (8:45c5)
 	unknownnoise0x20 2, 241, 51
 	unknownnoise0x20 2, 193, 50
 	unknownnoise0x20 2, 161, 49
 	unknownnoise0x20 15, 130, 50
 	unknownnoise0x20 8, 241, 52
 	endchannel
-; 0x205d5
diff --git a/audio/sfx/sfx_08_62.asm b/audio/sfx/battle_22.asm
index 62f178fb..c6b0d972 100755..100644
--- a/audio/sfx/sfx_08_62.asm
+++ b/audio/sfx/battle_22.asm
@@ -1,5 +1,4 @@
-SFX_08_62_Ch1: ; 205d5 (8:45d5)
+SFX_Battle_22_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/battle_23.asm
index a69c6976..474e43b6 100755..100644
--- a/audio/sfx/sfx_08_63.asm
+++ b/audio/sfx/battle_23.asm
@@ -1,8 +1,7 @@
-SFX_08_63_Ch1: ; 205dc (8:45dc)
+SFX_Battle_23_Ch1: ; 205dc (8:45dc)
 	unknownnoise0x20 2, 242, 67
 	unknownnoise0x20 4, 181, 50
 	unknownnoise0x20 9, 134, 49
 	unknownnoise0x20 7, 100, 0
 	unknownnoise0x20 15, 242, 85
 	endchannel
-; 0x205ec
diff --git a/audio/sfx/sfx_08_64.asm b/audio/sfx/battle_24.asm
index ad463435..4fea9cf9 100755..100644
--- a/audio/sfx/sfx_08_64.asm
+++ b/audio/sfx/battle_24.asm
@@ -1,4 +1,4 @@
-SFX_08_64_Ch1: ; 205ec (8:45ec)
+SFX_Battle_24_Ch1: ; 205ec (8:45ec)
 	duty 1
 	unknownsfx0x10 151
 	unknownsfx0x20 15, 242, 0, 7
@@ -6,8 +6,7 @@ SFX_08_64_Ch1: ; 205ec (8:45ec)
 	endchannel
 
 
-SFX_08_64_Ch2: ; 205f7 (8:45f7)
+SFX_Battle_24_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/battle_25.asm
index 2e2faa15..18a70f45 100755..100644
--- a/audio/sfx/sfx_08_65.asm
+++ b/audio/sfx/battle_25.asm
@@ -1,8 +1,7 @@
-SFX_08_65_Ch1: ; 205fe (8:45fe)
+SFX_Battle_25_Ch1: ; 205fe (8:45fe)
 	unknownnoise0x20 15, 79, 65
 	unknownnoise0x20 8, 143, 65
 	unknownnoise0x20 8, 207, 65
 	unknownnoise0x20 8, 242, 66
 	unknownnoise0x20 15, 242, 65
 	endchannel
-; 0x2060e
diff --git a/audio/sfx/sfx_08_66.asm b/audio/sfx/battle_26.asm
index 03e351e7..943078e1 100755..100644
--- a/audio/sfx/sfx_08_66.asm
+++ b/audio/sfx/battle_26.asm
@@ -1,4 +1,4 @@
-SFX_08_66_Ch1: ; 2060e (8:460e)
+SFX_Battle_26_Ch1: ; 2060e (8:460e)
 	unknownnoise0x20 10, 255, 80
 	unknownnoise0x20 15, 255, 81
 	unknownnoise0x20 8, 242, 81
@@ -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/battle_27.asm
index 89a5cbc7..ddd4e452 100755..100644
--- a/audio/sfx/sfx_08_67.asm
+++ b/audio/sfx/battle_27.asm
@@ -1,28 +1,27 @@
-SFX_08_67_Ch1: ; 20624 (8:4624)
+SFX_Battle_27_Ch1: ; 20624 (8:4624)
 	duty 2
 	unknownsfx0x20 15, 63, 192, 7
 
-SFX_08_67_branch_2062a:
+SFX_Battle_27_branch_2062a:
 	unknownsfx0x20 15, 223, 192, 7
-	loopchannel 4, SFX_08_67_branch_2062a
+	loopchannel 4, SFX_Battle_27_branch_2062a
 	unknownsfx0x20 15, 209, 192, 7
 	endchannel
 
 
-SFX_08_67_Ch2: ; 20637 (8:4637)
+SFX_Battle_27_Ch2: ; 20637 (8:4637)
 	dutycycle 179
 	unknownsfx0x20 15, 47, 200, 7
 
-SFX_08_67_branch_2063d:
+SFX_Battle_27_branch_2063d:
 	unknownsfx0x20 15, 207, 199, 7
-	loopchannel 4, SFX_08_67_branch_2063d
+	loopchannel 4, SFX_Battle_27_branch_2063d
 	unknownsfx0x20 15, 193, 200, 7
 	endchannel
 
 
-SFX_08_67_Ch3: ; 2064a (8:464a)
+SFX_Battle_27_Ch3: ; 2064a (8:464a)
 	unknownnoise0x20 3, 151, 18
 	unknownnoise0x20 3, 161, 17
-	loopchannel 10, SFX_08_67_Ch3
+	loopchannel 10, SFX_Battle_27_Ch3
 	endchannel
-; 0x20655
diff --git a/audio/sfx/sfx_08_68.asm b/audio/sfx/battle_28.asm
index e0fd06c5..73855179 100755..100644
--- a/audio/sfx/sfx_08_68.asm
+++ b/audio/sfx/battle_28.asm
@@ -1,22 +1,21 @@
-SFX_08_68_Ch1: ; 20655 (8:4655)
+SFX_Battle_28_Ch1: ; 20655 (8:4655)
 	duty 0
 	unknownsfx0x20 0, 241, 192, 7
 	unknownsfx0x20 0, 241, 0, 7
-	loopchannel 12, SFX_08_68_Ch1
+	loopchannel 12, SFX_Battle_28_Ch1
 	endchannel
 
 
-SFX_08_68_Ch2: ; 20664 (8:4664)
+SFX_Battle_28_Ch2: ; 20664 (8:4664)
 	dutycycle 179
 	unknownsfx0x20 0, 225, 193, 7
 	unknownsfx0x20 0, 225, 1, 7
-	loopchannel 12, SFX_08_68_Ch2
+	loopchannel 12, SFX_Battle_28_Ch2
 	endchannel
 
 
-SFX_08_68_Ch3: ; 20673 (8:4673)
+SFX_Battle_28_Ch3: ; 20673 (8:4673)
 	unknownnoise0x20 1, 209, 73
 	unknownnoise0x20 1, 209, 41
-	loopchannel 6, SFX_08_68_Ch3
+	loopchannel 6, SFX_Battle_28_Ch3
 	endchannel
-; 0x2067e
diff --git a/audio/sfx/sfx_08_69.asm b/audio/sfx/battle_29.asm
index 7e1bafae..e766a453 100755..100644
--- a/audio/sfx/sfx_08_69.asm
+++ b/audio/sfx/battle_29.asm
@@ -1,19 +1,18 @@
-SFX_08_69_Ch1: ; 2067e (8:467e)
+SFX_Battle_29_Ch1: ; 2067e (8:467e)
 	dutycycle 201
 	unknownsfx0x20 11, 243, 32, 1
 	unknownsfx0x20 9, 211, 80, 1
-	loopchannel 5, SFX_08_69_Ch1
+	loopchannel 5, SFX_Battle_29_Ch1
 	unknownsfx0x20 8, 227, 48, 1
 	unknownsfx0x20 15, 194, 16, 1
 	endchannel
 
 
-SFX_08_69_Ch2: ; 20695 (8:4695)
+SFX_Battle_29_Ch2: ; 20695 (8:4695)
 	unknownnoise0x20 10, 243, 53
 	unknownnoise0x20 14, 246, 69
-	loopchannel 4, SFX_08_69_Ch2
+	loopchannel 4, SFX_Battle_29_Ch2
 	unknownnoise0x20 12, 244, 188
 	unknownnoise0x20 12, 245, 156
 	unknownnoise0x20 15, 244, 172
 	endchannel
-; 0x206a9
diff --git a/audio/sfx/sfx_08_6a.asm b/audio/sfx/battle_2a.asm
index f38948a4..d7334aae 100755..100644
--- a/audio/sfx/sfx_08_6a.asm
+++ b/audio/sfx/battle_2a.asm
@@ -1,29 +1,28 @@
-SFX_08_6a_Ch1: ; 206a9 (8:46a9)
+SFX_Battle_2A_Ch1: ; 206a9 (8:46a9)
 	dutycycle 57
 	unknownsfx0x20 4, 244, 0, 6
 	unknownsfx0x20 3, 196, 0, 5
 	unknownsfx0x20 5, 181, 0, 6
 	unknownsfx0x20 13, 226, 192, 6
-	loopchannel 3, SFX_08_6a_Ch1
+	loopchannel 3, SFX_Battle_2A_Ch1
 	unknownsfx0x20 8, 209, 0, 6
 	endchannel
 
 
-SFX_08_6a_Ch2: ; 206c4 (8:46c4)
+SFX_Battle_2A_Ch2: ; 206c4 (8:46c4)
 	dutycycle 141
 	unknownsfx0x20 5, 228, 224, 5
 	unknownsfx0x20 4, 180, 224, 4
 	unknownsfx0x20 6, 165, 232, 5
 	unknownsfx0x20 14, 209, 160, 6
-	loopchannel 3, SFX_08_6a_Ch2
+	loopchannel 3, SFX_Battle_2A_Ch2
 	endchannel
 
 
-SFX_08_6a_Ch3: ; 206db (8:46db)
+SFX_Battle_2A_Ch3: ; 206db (8:46db)
 	unknownnoise0x20 5, 195, 51
 	unknownnoise0x20 3, 146, 67
 	unknownnoise0x20 10, 181, 51
 	unknownnoise0x20 15, 195, 50
-	loopchannel 2, SFX_08_6a_Ch3
+	loopchannel 2, SFX_Battle_2A_Ch3
 	endchannel
-; 0x206ec
diff --git a/audio/sfx/sfx_08_6b.asm b/audio/sfx/battle_2b.asm
index 85226308..276627c3 100755..100644
--- a/audio/sfx/sfx_08_6b.asm
+++ b/audio/sfx/battle_2b.asm
@@ -1,22 +1,21 @@
-SFX_08_6b_Ch1: ; 206ec (8:46ec)
+SFX_Battle_2B_Ch1: ; 206ec (8:46ec)
 	dutycycle 210
 	unknownsfx0x20 3, 129, 0, 3
 	unknownsfx0x20 3, 193, 0, 4
 	unknownsfx0x20 3, 241, 0, 5
 	unknownsfx0x20 3, 177, 0, 4
 	unknownsfx0x20 3, 113, 0, 3
-	loopchannel 5, SFX_08_6b_Ch1
+	loopchannel 5, SFX_Battle_2B_Ch1
 	unknownsfx0x20 8, 129, 0, 4
 	endchannel
 
 
-SFX_08_6b_Ch2: ; 2070b (8:470b)
+SFX_Battle_2B_Ch2: ; 2070b (8:470b)
 	unknownnoise0x20 3, 98, 34
 	unknownnoise0x20 3, 162, 50
 	unknownnoise0x20 3, 210, 51
 	unknownnoise0x20 3, 146, 35
 	unknownnoise0x20 3, 82, 18
-	loopchannel 5, SFX_08_6b_Ch2
+	loopchannel 5, SFX_Battle_2B_Ch2
 	unknownnoise0x20 8, 129, 18
 	endchannel
-; 0x20722
diff --git a/audio/sfx/sfx_08_6c.asm b/audio/sfx/battle_2c.asm
index 93821db5..22b902f1 100755..100644
--- a/audio/sfx/sfx_08_6c.asm
+++ b/audio/sfx/battle_2c.asm
@@ -1,26 +1,25 @@
-SFX_08_6c_Ch1: ; 20722 (8:4722)
+SFX_Battle_2C_Ch1: ; 20722 (8:4722)
 	dutycycle 57
 	unknownsfx0x20 15, 244, 0, 5
 	unknownsfx0x20 15, 196, 0, 4
 	unknownsfx0x20 15, 226, 192, 5
-	loopchannel 3, SFX_08_6c_Ch1
+	loopchannel 3, SFX_Battle_2C_Ch1
 	endchannel
 
 
-SFX_08_6c_Ch2: ; 20735 (8:4735)
+SFX_Battle_2C_Ch2: ; 20735 (8:4735)
 	dutycycle 141
 	unknownsfx0x20 7, 228, 48, 4
 	unknownsfx0x20 15, 180, 48, 3
 	unknownsfx0x20 15, 162, 56, 4
-	loopchannel 4, SFX_08_6c_Ch2
+	loopchannel 4, SFX_Battle_2C_Ch2
 	endchannel
 
 
-SFX_08_6c_Ch3: ; 20748 (8:4748)
+SFX_Battle_2C_Ch3: ; 20748 (8:4748)
 	unknownnoise0x20 9, 244, 68
 	unknownnoise0x20 9, 242, 67
 	unknownnoise0x20 15, 244, 66
 	unknownnoise0x20 15, 244, 65
-	loopchannel 3, SFX_08_6c_Ch3
+	loopchannel 3, SFX_Battle_2C_Ch3
 	endchannel
-; 0x20759
diff --git a/audio/sfx/sfx_08_6e.asm b/audio/sfx/battle_2e.asm
index 6a5749c9..91dda605 100755..100644
--- a/audio/sfx/sfx_08_6e.asm
+++ b/audio/sfx/battle_2e.asm
@@ -1,28 +1,27 @@
-SFX_08_6e_Ch1: ; 20792 (8:4792)
+SFX_Battle_2E_Ch1: ; 20792 (8:4792)
 	duty 0
 	unknownsfx0x20 2, 241, 0, 2
 	unknownsfx0x20 3, 241, 0, 7
 	unknownsfx0x20 4, 241, 0, 5
 	unknownsfx0x20 5, 241, 240, 7
-	loopchannel 8, SFX_08_6e_Ch1
+	loopchannel 8, SFX_Battle_2E_Ch1
 	endchannel
 
 
-SFX_08_6e_Ch2: ; 207a9 (8:47a9)
+SFX_Battle_2E_Ch2: ; 207a9 (8:47a9)
 	dutycycle 179
 	unknownsfx0x20 2, 225, 2, 3
 	unknownsfx0x20 3, 225, 242, 7
 	unknownsfx0x20 4, 225, 2, 6
 	unknownsfx0x20 5, 225, 2, 7
-	loopchannel 8, SFX_08_6e_Ch2
+	loopchannel 8, SFX_Battle_2E_Ch2
 	endchannel
 
 
-SFX_08_6e_Ch3: ; 207c0 (8:47c0)
+SFX_Battle_2E_Ch3: ; 207c0 (8:47c0)
 	unknownnoise0x20 2, 211, 16
 	unknownnoise0x20 3, 211, 17
 	unknownnoise0x20 2, 210, 16
 	unknownnoise0x20 5, 210, 18
-	loopchannel 9, SFX_08_6e_Ch3
+	loopchannel 9, SFX_Battle_2E_Ch3
 	endchannel
-; 0x207d1
diff --git a/audio/sfx/sfx_08_6f.asm b/audio/sfx/battle_2f.asm
index c233fd90..4b1d9b2c 100755..100644
--- a/audio/sfx/sfx_08_6f.asm
+++ b/audio/sfx/battle_2f.asm
@@ -1,22 +1,21 @@
-SFX_08_6f_Ch1: ; 207d1 (8:47d1)
+SFX_Battle_2F_Ch1: ; 207d1 (8:47d1)
 	dutycycle 43
 	unknownsfx0x20 3, 241, 240, 7
 	unknownsfx0x20 4, 242, 0, 2
-	loopchannel 8, SFX_08_6f_Ch1
+	loopchannel 8, SFX_Battle_2F_Ch1
 	endchannel
 
 
-SFX_08_6f_Ch2: ; 207e0 (8:47e0)
+SFX_Battle_2F_Ch2: ; 207e0 (8:47e0)
 	dutycycle 179
 	unknownsfx0x20 4, 226, 2, 2
 	unknownsfx0x20 4, 225, 226, 7
-	loopchannel 9, SFX_08_6f_Ch2
+	loopchannel 9, SFX_Battle_2F_Ch2
 	endchannel
 
 
-SFX_08_6f_Ch3: ; 207ef (8:47ef)
+SFX_Battle_2F_Ch3: ; 207ef (8:47ef)
 	unknownnoise0x20 4, 255, 67
 	unknownnoise0x20 4, 242, 68
-	loopchannel 9, SFX_08_6f_Ch3
+	loopchannel 9, SFX_Battle_2F_Ch3
 	endchannel
-; 0x207fa
diff --git a/audio/sfx/sfx_08_71.asm b/audio/sfx/battle_31.asm
index 92a81006..5d3e2e40 100755..100644
--- a/audio/sfx/sfx_08_71.asm
+++ b/audio/sfx/battle_31.asm
@@ -1,4 +1,4 @@
-SFX_08_71_Ch1: ; 20847 (8:4847)
+SFX_Battle_31_Ch1: ; 20847 (8:4847)
 	duty 2
 	unknownsfx0x20 15, 255, 224, 7
 	unknownsfx0x20 15, 255, 224, 7
@@ -8,7 +8,7 @@ SFX_08_71_Ch1: ; 20847 (8:4847)
 	endchannel
 
 
-SFX_08_71_Ch2: ; 2085e (8:485e)
+SFX_Battle_31_Ch2: ; 2085e (8:485e)
 	duty 3
 	unknownsfx0x20 15, 255, 226, 7
 	unknownsfx0x20 15, 255, 225, 7
@@ -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/battle_32.asm
index ba307ca0..c949fb5b 100755..100644
--- a/audio/sfx/sfx_08_72.asm
+++ b/audio/sfx/battle_32.asm
@@ -1,4 +1,4 @@
-SFX_08_72_Ch1: ; 20875 (8:4875)
+SFX_Battle_32_Ch1: ; 20875 (8:4875)
 	duty 2
 	unknownsfx0x10 175
 	unknownsfx0x20 8, 241, 0, 7
@@ -6,8 +6,7 @@ SFX_08_72_Ch1: ; 20875 (8:4875)
 	endchannel
 
 
-SFX_08_72_Ch2: ; 20880 (8:4880)
+SFX_Battle_32_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/battle_33.asm
index c1b189fc..8b2bd17d 100755..100644
--- a/audio/sfx/sfx_08_73.asm
+++ b/audio/sfx/battle_33.asm
@@ -1,4 +1,4 @@
-SFX_08_73_Ch1: ; 20887 (8:4887)
+SFX_Battle_33_Ch1: ; 20887 (8:4887)
 	duty 2
 	unknownsfx0x20 6, 241, 0, 5
 	unknownsfx0x20 6, 241, 128, 5
@@ -8,7 +8,7 @@ SFX_08_73_Ch1: ; 20887 (8:4887)
 	endchannel
 
 
-SFX_08_73_Ch2: ; 2089e (8:489e)
+SFX_Battle_33_Ch2: ; 2089e (8:489e)
 	duty 3
 	unknownsfx0x20 6, 225, 16, 5
 	unknownsfx0x20 6, 225, 144, 5
@@ -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/battle_34.asm
index 37332169..ac80eeea 100755..100644
--- a/audio/sfx/sfx_08_74.asm
+++ b/audio/sfx/battle_34.asm
@@ -1,4 +1,4 @@
-SFX_08_74_Ch1: ; 208b5 (8:48b5)
+SFX_Battle_34_Ch1: ; 208b5 (8:48b5)
 	dutycycle 237
 	unknownsfx0x20 8, 255, 248, 3
 	unknownsfx0x20 15, 255, 0, 4
@@ -6,7 +6,7 @@ SFX_08_74_Ch1: ; 208b5 (8:48b5)
 	endchannel
 
 
-SFX_08_74_Ch2: ; 208c4 (8:48c4)
+SFX_Battle_34_Ch2: ; 208c4 (8:48c4)
 	dutycycle 180
 	unknownsfx0x20 8, 239, 192, 3
 	unknownsfx0x20 15, 239, 192, 3
@@ -14,10 +14,9 @@ SFX_08_74_Ch2: ; 208c4 (8:48c4)
 	endchannel
 
 
-SFX_08_74_Ch3: ; 208d3 (8:48d3)
+SFX_Battle_34_Ch3: ; 208d3 (8:48d3)
 	unknownnoise0x20 4, 255, 81
 	unknownnoise0x20 8, 255, 84
 	unknownnoise0x20 15, 255, 85
 	unknownnoise0x20 15, 243, 86
 	endchannel
-; 0x208e0
diff --git a/audio/sfx/sfx_08_75.asm b/audio/sfx/battle_35.asm
index f1513d04..7e64aca9 100755..100644
--- a/audio/sfx/sfx_08_75.asm
+++ b/audio/sfx/battle_35.asm
@@ -1,4 +1,4 @@
-SFX_08_75_Ch1: ; 208e0 (8:48e0)
+SFX_Battle_35_Ch1: ; 208e0 (8:48e0)
 	executemusic
 	vibrato 10, 2, 4
 	duty 2
@@ -13,7 +13,7 @@ SFX_08_75_Ch1: ; 208e0 (8:48e0)
 	endchannel
 
 
-SFX_08_75_Ch2: ; 208f0 (8:48f0)
+SFX_Battle_35_Ch2: ; 208f0 (8:48f0)
 	executemusic
 	vibrato 10, 2, 3
 	duty 2
@@ -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/battle_36.asm
index 1318b1e2..f878a1c8 100755..100644
--- a/audio/sfx/sfx_08_76.asm
+++ b/audio/sfx/battle_36.asm
@@ -1,4 +1,4 @@
-SFX_08_76_Ch1: ; 20902 (8:4902)
+SFX_Battle_36_Ch1: ; 20902 (8:4902)
 	duty 0
 	unknownsfx0x20 2, 241, 128, 7
 	unknownsfx0x20 2, 241, 0, 7
@@ -12,15 +12,15 @@ SFX_08_76_Ch1: ; 20902 (8:4902)
 	unknownsfx0x20 2, 241, 0, 7
 	unknownsfx0x20 2, 241, 208, 7
 
-SFX_08_76_branch_20930:
+SFX_Battle_36_branch_20930:
 	unknownsfx0x20 2, 241, 0, 7
 	unknownsfx0x20 2, 241, 224, 7
-	loopchannel 12, SFX_08_76_branch_20930
+	loopchannel 12, SFX_Battle_36_branch_20930
 	unknownsfx0x20 15, 241, 0, 7
 	endchannel
 
 
-SFX_08_76_Ch2: ; 20941 (8:4941)
+SFX_Battle_36_Ch2: ; 20941 (8:4941)
 	dutycycle 179
 	unknownsfx0x20 2, 241, 129, 7
 	unknownsfx0x20 2, 241, 1, 7
@@ -35,14 +35,13 @@ SFX_08_76_Ch2: ; 20941 (8:4941)
 	unknownsfx0x20 2, 241, 209, 7
 	unknownsfx0x20 2, 241, 1, 7
 	unknownsfx0x20 2, 241, 225, 7
-	loopchannel 12, SFX_08_76_branch_20930
+	loopchannel 12, SFX_Battle_36_branch_20930
 	unknownsfx0x20 15, 241, 1, 7
 	endchannel
 
 
-SFX_08_76_Ch3: ; 20980 (8:4980)
+SFX_Battle_36_Ch3: ; 20980 (8:4980)
 	unknownnoise0x20 1, 209, 73
 	unknownnoise0x20 1, 209, 41
-	loopchannel 26, SFX_08_76_Ch3
+	loopchannel 26, SFX_Battle_36_Ch3
 	endchannel
-; 0x2098b
diff --git a/audio/sfx/sfx_08_46.asm b/audio/sfx/caught_mon.asm
index 4e4732c5..d841f57a 100755..100644
--- a/audio/sfx/sfx_08_46.asm
+++ b/audio/sfx/caught_mon.asm
@@ -1,4 +1,4 @@
-SFX_08_46_Ch1: ; 23a13 (8:7a13)
+SFX_Caught_Mon_Ch1: ; 23a13 (8:7a13)
 	executemusic
 	tempo 256
 	volume 7, 7
@@ -22,7 +22,7 @@ SFX_08_46_Ch1: ; 23a13 (8:7a13)
 	endchannel
 
 
-SFX_08_46_Ch2: ; 23a2e (8:7a2e)
+SFX_Caught_Mon_Ch2: ; 23a2e (8:7a2e)
 	executemusic
 	duty 2
 	notetype 6, 12, 2
@@ -44,7 +44,7 @@ SFX_08_46_Ch2: ; 23a2e (8:7a2e)
 	endchannel
 
 
-SFX_08_46_Ch3: ; 23a44 (8:7a44)
+SFX_Caught_Mon_Ch3: ; 23a44 (8:7a44)
 	executemusic
 	notetype 6, 1, 0
 	octave 4
@@ -59,4 +59,3 @@ SFX_08_46_Ch3: ; 23a44 (8:7a44)
 	G_ 2
 	G# 4
 	endchannel
-; 0x23a53
diff --git a/audio/sfx/sfx_02_5b.asm b/audio/sfx/collision_1.asm
index 13144567..4b9c4a7e 100755..100644
--- a/audio/sfx/sfx_02_5b.asm
+++ b/audio/sfx/collision_1.asm
@@ -1,7 +1,6 @@
-SFX_02_5b_Ch1: ; 8447 (2:4447)
+SFX_Collision_1_Ch1: ; 8447 (2:4447)
 	duty 2
 	unknownsfx0x10 90
 	unknownsfx0x20 15, 241, 0, 3
 	unknownsfx0x10 8
 	endchannel
-; 0x8452
diff --git a/audio/sfx/sfx_1f_5b.asm b/audio/sfx/collision_3.asm
index 9921eb88..18806c1f 100755..100644
--- a/audio/sfx/sfx_1f_5b.asm
+++ b/audio/sfx/collision_3.asm
@@ -1,7 +1,6 @@
-SFX_1f_5b_Ch1: ; 7c430 (1f:4430)
+SFX_Collision_3_Ch1: ; 7c430 (1f:4430)
 	duty 2
 	unknownsfx0x10 90
 	unknownsfx0x20 15, 241, 0, 3
 	unknownsfx0x10 8
 	endchannel
-; 0x7c43b
diff --git a/audio/sfx/sfx_02_14.asm b/audio/sfx/cry00_1.asm
index 1d0e647d..f29e29ab 100755..100644
--- a/audio/sfx/sfx_02_14.asm
+++ b/audio/sfx/cry00_1.asm
@@ -1,4 +1,4 @@
-SFX_02_14_Ch1: ; 8987 (2:4987)
+SFX_Cry00_1_Ch1: ; 8987 (2:4987)
 	dutycycle 245
 	unknownsfx0x20 4, 243, 24, 7
 	unknownsfx0x20 15, 229, 152, 7
@@ -6,7 +6,7 @@ SFX_02_14_Ch1: ; 8987 (2:4987)
 	endchannel
 
 
-SFX_02_14_Ch2: ; 8996 (2:4996)
+SFX_Cry00_1_Ch2: ; 8996 (2:4996)
 	dutycycle 160
 	unknownsfx0x20 5, 179, 8, 7
 	unknownsfx0x20 15, 197, 136, 7
@@ -14,9 +14,8 @@ SFX_02_14_Ch2: ; 8996 (2:4996)
 	endchannel
 
 
-SFX_02_14_Ch3: ; 89a5 (2:49a5)
+SFX_Cry00_1_Ch3: ; 89a5 (2:49a5)
 	unknownnoise0x20 3, 161, 28
 	unknownnoise0x20 14, 148, 44
 	unknownnoise0x20 8, 129, 28
 	endchannel
-; 0x89af
diff --git a/audio/sfx/sfx_08_14.asm b/audio/sfx/cry00_2.asm
index c0a7d813..fa069f18 100755..100644
--- a/audio/sfx/sfx_08_14.asm
+++ b/audio/sfx/cry00_2.asm
@@ -1,4 +1,4 @@
-SFX_08_14_Ch1: ; 20c2f (8:4c2f)
+SFX_Cry00_2_Ch1: ; 20c2f (8:4c2f)
 	dutycycle 245
 	unknownsfx0x20 4, 243, 24, 7
 	unknownsfx0x20 15, 229, 152, 7
@@ -6,7 +6,7 @@ SFX_08_14_Ch1: ; 20c2f (8:4c2f)
 	endchannel
 
 
-SFX_08_14_Ch2: ; 20c3e (8:4c3e)
+SFX_Cry00_2_Ch2: ; 20c3e (8:4c3e)
 	dutycycle 160
 	unknownsfx0x20 5, 179, 8, 7
 	unknownsfx0x20 15, 197, 136, 7
@@ -14,9 +14,8 @@ SFX_08_14_Ch2: ; 20c3e (8:4c3e)
 	endchannel
 
 
-SFX_08_14_Ch3: ; 20c4d (8:4c4d)
+SFX_Cry00_2_Ch3: ; 20c4d (8:4c4d)
 	unknownnoise0x20 3, 161, 28
 	unknownnoise0x20 14, 148, 44
 	unknownnoise0x20 8, 129, 28
 	endchannel
-; 0x20c57
diff --git a/audio/sfx/sfx_1f_14.asm b/audio/sfx/cry00_3.asm
index a1c24136..bdeadab5 100755..100644
--- a/audio/sfx/sfx_1f_14.asm
+++ b/audio/sfx/cry00_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_14_Ch1: ; 7c9fc (1f:49fc)
+SFX_Cry00_3_Ch1: ; 7c9fc (1f:49fc)
 	dutycycle 245
 	unknownsfx0x20 4, 243, 24, 7
 	unknownsfx0x20 15, 229, 152, 7
@@ -6,7 +6,7 @@ SFX_1f_14_Ch1: ; 7c9fc (1f:49fc)
 	endchannel
 
 
-SFX_1f_14_Ch2: ; 7ca0b (1f:4a0b)
+SFX_Cry00_3_Ch2: ; 7ca0b (1f:4a0b)
 	dutycycle 160
 	unknownsfx0x20 5, 179, 8, 7
 	unknownsfx0x20 15, 197, 136, 7
@@ -14,9 +14,8 @@ SFX_1f_14_Ch2: ; 7ca0b (1f:4a0b)
 	endchannel
 
 
-SFX_1f_14_Ch3: ; 7ca1a (1f:4a1a)
+SFX_Cry00_3_Ch3: ; 7ca1a (1f:4a1a)
 	unknownnoise0x20 3, 161, 28
 	unknownnoise0x20 14, 148, 44
 	unknownnoise0x20 8, 129, 28
 	endchannel
-; 0x7ca24
diff --git a/audio/sfx/sfx_02_15.asm b/audio/sfx/cry01_1.asm
index 33699792..835d41f7 100755..100644
--- a/audio/sfx/sfx_02_15.asm
+++ b/audio/sfx/cry01_1.asm
@@ -1,4 +1,4 @@
-SFX_02_15_Ch1: ; 8b97 (2:4b97)
+SFX_Cry01_1_Ch1: ; 8b97 (2:4b97)
 	dutycycle 160
 	unknownsfx0x20 4, 243, 0, 6
 	unknownsfx0x20 8, 213, 96, 7
@@ -7,7 +7,7 @@ SFX_02_15_Ch1: ; 8b97 (2:4b97)
 	endchannel
 
 
-SFX_02_15_Ch2: ; 8baa (2:4baa)
+SFX_Cry01_1_Ch2: ; 8baa (2:4baa)
 	dutycycle 90
 	unknownsfx0x20 5, 179, 241, 6
 	unknownsfx0x20 7, 197, 82, 7
@@ -16,10 +16,9 @@ SFX_02_15_Ch2: ; 8baa (2:4baa)
 	endchannel
 
 
-SFX_02_15_Ch3: ; 8bbd (2:4bbd)
+SFX_Cry01_1_Ch3: ; 8bbd (2:4bbd)
 	unknownnoise0x20 3, 162, 60
 	unknownnoise0x20 12, 148, 44
 	unknownnoise0x20 3, 130, 28
 	unknownnoise0x20 8, 113, 44
 	endchannel
-; 0x8bca
diff --git a/audio/sfx/sfx_08_15.asm b/audio/sfx/cry01_2.asm
index ae20351d..bcafa873 100755..100644
--- a/audio/sfx/sfx_08_15.asm
+++ b/audio/sfx/cry01_2.asm
@@ -1,4 +1,4 @@
-SFX_08_15_Ch1: ; 20e3f (8:4e3f)
+SFX_Cry01_2_Ch1: ; 20e3f (8:4e3f)
 	dutycycle 160
 	unknownsfx0x20 4, 243, 0, 6
 	unknownsfx0x20 8, 213, 96, 7
@@ -7,7 +7,7 @@ SFX_08_15_Ch1: ; 20e3f (8:4e3f)
 	endchannel
 
 
-SFX_08_15_Ch2: ; 20e52 (8:4e52)
+SFX_Cry01_2_Ch2: ; 20e52 (8:4e52)
 	dutycycle 90
 	unknownsfx0x20 5, 179, 241, 6
 	unknownsfx0x20 7, 197, 82, 7
@@ -16,10 +16,9 @@ SFX_08_15_Ch2: ; 20e52 (8:4e52)
 	endchannel
 
 
-SFX_08_15_Ch3: ; 20e65 (8:4e65)
+SFX_Cry01_2_Ch3: ; 20e65 (8:4e65)
 	unknownnoise0x20 3, 162, 60
 	unknownnoise0x20 12, 148, 44
 	unknownnoise0x20 3, 130, 28
 	unknownnoise0x20 8, 113, 44
 	endchannel
-; 0x20e72
diff --git a/audio/sfx/sfx_1f_15.asm b/audio/sfx/cry01_3.asm
index 3f42e339..1a31c7ca 100755..100644
--- a/audio/sfx/sfx_1f_15.asm
+++ b/audio/sfx/cry01_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_15_Ch1: ; 7cc0c (1f:4c0c)
+SFX_Cry01_3_Ch1: ; 7cc0c (1f:4c0c)
 	dutycycle 160
 	unknownsfx0x20 4, 243, 0, 6
 	unknownsfx0x20 8, 213, 96, 7
@@ -7,7 +7,7 @@ SFX_1f_15_Ch1: ; 7cc0c (1f:4c0c)
 	endchannel
 
 
-SFX_1f_15_Ch2: ; 7cc1f (1f:4c1f)
+SFX_Cry01_3_Ch2: ; 7cc1f (1f:4c1f)
 	dutycycle 90
 	unknownsfx0x20 5, 179, 241, 6
 	unknownsfx0x20 7, 197, 82, 7
@@ -16,10 +16,9 @@ SFX_1f_15_Ch2: ; 7cc1f (1f:4c1f)
 	endchannel
 
 
-SFX_1f_15_Ch3: ; 7cc32 (1f:4c32)
+SFX_Cry01_3_Ch3: ; 7cc32 (1f:4c32)
 	unknownnoise0x20 3, 162, 60
 	unknownnoise0x20 12, 148, 44
 	unknownnoise0x20 3, 130, 28
 	unknownnoise0x20 8, 113, 44
 	endchannel
-; 0x7cc3f
diff --git a/audio/sfx/sfx_02_16.asm b/audio/sfx/cry02_1.asm
index fb1a3755..97cff95e 100755..100644
--- a/audio/sfx/sfx_02_16.asm
+++ b/audio/sfx/cry02_1.asm
@@ -1,4 +1,4 @@
-SFX_02_16_Ch1: ; 8b0c (2:4b0c)
+SFX_Cry02_1_Ch1: ; 8b0c (2:4b0c)
 	duty 0
 	unknownsfx0x20 8, 245, 128, 4
 	unknownsfx0x20 2, 225, 224, 5
@@ -6,13 +6,12 @@ SFX_02_16_Ch1: ; 8b0c (2:4b0c)
 	endchannel
 
 
-SFX_02_16_Ch2: ; 8b1b (2:4b1b)
+SFX_Cry02_1_Ch2: ; 8b1b (2:4b1b)
 	dutycycle 165
 	unknownsfx0x20 7, 149, 65, 4
 	unknownsfx0x20 2, 129, 33, 5
 	unknownsfx0x20 8, 97, 26, 5
 
 
-SFX_02_16_Ch3: ; 8b29 (2:4b29)
+SFX_Cry02_1_Ch3: ; 8b29 (2:4b29)
 	endchannel
-; 0x8b2a
diff --git a/audio/sfx/sfx_08_16.asm b/audio/sfx/cry02_2.asm
index d8a126ed..7d67fc4a 100755..100644
--- a/audio/sfx/sfx_08_16.asm
+++ b/audio/sfx/cry02_2.asm
@@ -1,4 +1,4 @@
-SFX_08_16_Ch1: ; 20db4 (8:4db4)
+SFX_Cry02_2_Ch1: ; 20db4 (8:4db4)
 	duty 0
 	unknownsfx0x20 8, 245, 128, 4
 	unknownsfx0x20 2, 225, 224, 5
@@ -6,13 +6,12 @@ SFX_08_16_Ch1: ; 20db4 (8:4db4)
 	endchannel
 
 
-SFX_08_16_Ch2: ; 20dc3 (8:4dc3)
+SFX_Cry02_2_Ch2: ; 20dc3 (8:4dc3)
 	dutycycle 165
 	unknownsfx0x20 7, 149, 65, 4
 	unknownsfx0x20 2, 129, 33, 5
 	unknownsfx0x20 8, 97, 26, 5
 
 
-SFX_08_16_Ch3: ; 20dd1 (8:4dd1)
+SFX_Cry02_2_Ch3: ; 20dd1 (8:4dd1)
 	endchannel
-; 0x20dd2
diff --git a/audio/sfx/sfx_1f_16.asm b/audio/sfx/cry02_3.asm
index a9f0e332..604d084a 100755..100644
--- a/audio/sfx/sfx_1f_16.asm
+++ b/audio/sfx/cry02_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_16_Ch1: ; 7cb81 (1f:4b81)
+SFX_Cry02_3_Ch1: ; 7cb81 (1f:4b81)
 	duty 0
 	unknownsfx0x20 8, 245, 128, 4
 	unknownsfx0x20 2, 225, 224, 5
@@ -6,13 +6,12 @@ SFX_1f_16_Ch1: ; 7cb81 (1f:4b81)
 	endchannel
 
 
-SFX_1f_16_Ch2: ; 7cb90 (1f:4b90)
+SFX_Cry02_3_Ch2: ; 7cb90 (1f:4b90)
 	dutycycle 165
 	unknownsfx0x20 7, 149, 65, 4
 	unknownsfx0x20 2, 129, 33, 5
 	unknownsfx0x20 8, 97, 26, 5
 
 
-SFX_1f_16_Ch3: ; 7cb9e (1f:4b9e)
+SFX_Cry02_3_Ch3: ; 7cb9e (1f:4b9e)
 	endchannel
-; 0x7cb9f
diff --git a/audio/sfx/sfx_02_17.asm b/audio/sfx/cry03_1.asm
index cf19ce38..42f2c5d3 100755..100644
--- a/audio/sfx/sfx_02_17.asm
+++ b/audio/sfx/cry03_1.asm
@@ -1,4 +1,4 @@
-SFX_02_17_Ch1: ; 88a6 (2:48a6)
+SFX_Cry03_1_Ch1: ; 88a6 (2:48a6)
 	dutycycle 240
 	unknownsfx0x20 4, 247, 8, 6
 	unknownsfx0x20 6, 230, 0, 6
@@ -10,7 +10,7 @@ SFX_02_17_Ch1: ; 88a6 (2:48a6)
 	endchannel
 
 
-SFX_02_17_Ch2: ; 88c5 (2:48c5)
+SFX_Cry03_1_Ch2: ; 88c5 (2:48c5)
 	dutycycle 10
 	unknownsfx0x20 4, 199, 4, 5
 	unknownsfx0x20 6, 166, 2, 5
@@ -22,10 +22,9 @@ SFX_02_17_Ch2: ; 88c5 (2:48c5)
 	endchannel
 
 
-SFX_02_17_Ch3: ; 88e4 (2:48e4)
+SFX_Cry03_1_Ch3: ; 88e4 (2:48e4)
 	unknownnoise0x20 12, 228, 76
 	unknownnoise0x20 10, 199, 92
 	unknownnoise0x20 12, 182, 76
 	unknownnoise0x20 15, 162, 92
 	endchannel
-; 0x88f1
diff --git a/audio/sfx/sfx_08_17.asm b/audio/sfx/cry03_2.asm
index 10143636..92dab482 100755..100644
--- a/audio/sfx/sfx_08_17.asm
+++ b/audio/sfx/cry03_2.asm
@@ -1,4 +1,4 @@
-SFX_08_17_Ch1: ; 20b4e (8:4b4e)
+SFX_Cry03_2_Ch1: ; 20b4e (8:4b4e)
 	dutycycle 240
 	unknownsfx0x20 4, 247, 8, 6
 	unknownsfx0x20 6, 230, 0, 6
@@ -10,7 +10,7 @@ SFX_08_17_Ch1: ; 20b4e (8:4b4e)
 	endchannel
 
 
-SFX_08_17_Ch2: ; 20b6d (8:4b6d)
+SFX_Cry03_2_Ch2: ; 20b6d (8:4b6d)
 	dutycycle 10
 	unknownsfx0x20 4, 199, 4, 5
 	unknownsfx0x20 6, 166, 2, 5
@@ -22,10 +22,9 @@ SFX_08_17_Ch2: ; 20b6d (8:4b6d)
 	endchannel
 
 
-SFX_08_17_Ch3: ; 20b8c (8:4b8c)
+SFX_Cry03_2_Ch3: ; 20b8c (8:4b8c)
 	unknownnoise0x20 12, 228, 76
 	unknownnoise0x20 10, 199, 92
 	unknownnoise0x20 12, 182, 76
 	unknownnoise0x20 15, 162, 92
 	endchannel
-; 0x20b99
diff --git a/audio/sfx/sfx_1f_17.asm b/audio/sfx/cry03_3.asm
index f0f15f40..0161b820 100755..100644
--- a/audio/sfx/sfx_1f_17.asm
+++ b/audio/sfx/cry03_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_17_Ch1: ; 7c91b (1f:491b)
+SFX_Cry03_3_Ch1: ; 7c91b (1f:491b)
 	dutycycle 240
 	unknownsfx0x20 4, 247, 8, 6
 	unknownsfx0x20 6, 230, 0, 6
@@ -10,7 +10,7 @@ SFX_1f_17_Ch1: ; 7c91b (1f:491b)
 	endchannel
 
 
-SFX_1f_17_Ch2: ; 7c93a (1f:493a)
+SFX_Cry03_3_Ch2: ; 7c93a (1f:493a)
 	dutycycle 10
 	unknownsfx0x20 4, 199, 4, 5
 	unknownsfx0x20 6, 166, 2, 5
@@ -22,10 +22,9 @@ SFX_1f_17_Ch2: ; 7c93a (1f:493a)
 	endchannel
 
 
-SFX_1f_17_Ch3: ; 7c959 (1f:4959)
+SFX_Cry03_3_Ch3: ; 7c959 (1f:4959)
 	unknownnoise0x20 12, 228, 76
 	unknownnoise0x20 10, 199, 92
 	unknownnoise0x20 12, 182, 76
 	unknownnoise0x20 15, 162, 92
 	endchannel
-; 0x7c966
diff --git a/audio/sfx/sfx_02_18.asm b/audio/sfx/cry04_1.asm
index a3039556..c80a6bd9 100755..100644
--- a/audio/sfx/sfx_02_18.asm
+++ b/audio/sfx/cry04_1.asm
@@ -1,4 +1,4 @@
-SFX_02_18_Ch1: ; 8c55 (2:4c55)
+SFX_Cry04_1_Ch1: ; 8c55 (2:4c55)
 	dutycycle 240
 	unknownsfx0x20 4, 247, 160, 6
 	unknownsfx0x20 8, 230, 164, 6
@@ -10,7 +10,7 @@ SFX_02_18_Ch1: ; 8c55 (2:4c55)
 	endchannel
 
 
-SFX_02_18_Ch2: ; 8c74 (2:4c74)
+SFX_Cry04_1_Ch2: ; 8c74 (2:4c74)
 	dutycycle 90
 	unknownsfx0x20 4, 231, 1, 6
 	unknownsfx0x20 8, 214, 3, 6
@@ -22,7 +22,7 @@ SFX_02_18_Ch2: ; 8c74 (2:4c74)
 	endchannel
 
 
-SFX_02_18_Ch3: ; 8c93 (2:4c93)
+SFX_Cry04_1_Ch3: ; 8c93 (2:4c93)
 	unknownnoise0x20 7, 214, 92
 	unknownnoise0x20 8, 230, 76
 	unknownnoise0x20 4, 212, 92
@@ -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_08_18.asm b/audio/sfx/cry04_2.asm
index 742edcd0..dcd866da 100755..100644
--- a/audio/sfx/sfx_08_18.asm
+++ b/audio/sfx/cry04_2.asm
@@ -1,4 +1,4 @@
-SFX_08_18_Ch1: ; 20efd (8:4efd)
+SFX_Cry04_2_Ch1: ; 20efd (8:4efd)
 	dutycycle 240
 	unknownsfx0x20 4, 247, 160, 6
 	unknownsfx0x20 8, 230, 164, 6
@@ -10,7 +10,7 @@ SFX_08_18_Ch1: ; 20efd (8:4efd)
 	endchannel
 
 
-SFX_08_18_Ch2: ; 20f1c (8:4f1c)
+SFX_Cry04_2_Ch2: ; 20f1c (8:4f1c)
 	dutycycle 90
 	unknownsfx0x20 4, 231, 1, 6
 	unknownsfx0x20 8, 214, 3, 6
@@ -22,7 +22,7 @@ SFX_08_18_Ch2: ; 20f1c (8:4f1c)
 	endchannel
 
 
-SFX_08_18_Ch3: ; 20f3b (8:4f3b)
+SFX_Cry04_2_Ch3: ; 20f3b (8:4f3b)
 	unknownnoise0x20 7, 214, 92
 	unknownnoise0x20 8, 230, 76
 	unknownnoise0x20 4, 212, 92
@@ -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_1f_18.asm b/audio/sfx/cry04_3.asm
index 4496dd9a..5d8c6df9 100755..100644
--- a/audio/sfx/sfx_1f_18.asm
+++ b/audio/sfx/cry04_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_18_Ch1: ; 7ccca (1f:4cca)
+SFX_Cry04_3_Ch1: ; 7ccca (1f:4cca)
 	dutycycle 240
 	unknownsfx0x20 4, 247, 160, 6
 	unknownsfx0x20 8, 230, 164, 6
@@ -10,7 +10,7 @@ SFX_1f_18_Ch1: ; 7ccca (1f:4cca)
 	endchannel
 
 
-SFX_1f_18_Ch2: ; 7cce9 (1f:4ce9)
+SFX_Cry04_3_Ch2: ; 7cce9 (1f:4ce9)
 	dutycycle 90
 	unknownsfx0x20 4, 231, 1, 6
 	unknownsfx0x20 8, 214, 3, 6
@@ -22,7 +22,7 @@ SFX_1f_18_Ch2: ; 7cce9 (1f:4ce9)
 	endchannel
 
 
-SFX_1f_18_Ch3: ; 7cd08 (1f:4d08)
+SFX_Cry04_3_Ch3: ; 7cd08 (1f:4d08)
 	unknownnoise0x20 7, 214, 92
 	unknownnoise0x20 8, 230, 76
 	unknownnoise0x20 4, 212, 92
@@ -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_02_19.asm b/audio/sfx/cry05_1.asm
index 4ddb848d..891cc50e 100755..100644
--- a/audio/sfx/sfx_02_19.asm
+++ b/audio/sfx/cry05_1.asm
@@ -1,4 +1,4 @@
-SFX_02_19_Ch1: ; 8a35 (2:4a35)
+SFX_Cry05_1_Ch1: ; 8a35 (2:4a35)
 	dutycycle 10
 	unknownsfx0x20 6, 226, 0, 5
 	unknownsfx0x20 6, 227, 128, 5
@@ -7,7 +7,7 @@ SFX_02_19_Ch1: ; 8a35 (2:4a35)
 	endchannel
 
 
-SFX_02_19_Ch2: ; 8a48 (2:4a48)
+SFX_Cry05_1_Ch2: ; 8a48 (2:4a48)
 	dutycycle 245
 	unknownsfx0x20 6, 226, 130, 4
 	unknownsfx0x20 6, 211, 1, 5
@@ -15,6 +15,5 @@ SFX_02_19_Ch2: ; 8a48 (2:4a48)
 	unknownsfx0x20 8, 129, 193, 4
 
 
-SFX_02_19_Ch3: ; 8a5a (2:4a5a)
+SFX_Cry05_1_Ch3: ; 8a5a (2:4a5a)
 	endchannel
-; 0x8a5b
diff --git a/audio/sfx/sfx_08_19.asm b/audio/sfx/cry05_2.asm
index af2cab57..98df4c1d 100755..100644
--- a/audio/sfx/sfx_08_19.asm
+++ b/audio/sfx/cry05_2.asm
@@ -1,4 +1,4 @@
-SFX_08_19_Ch1: ; 20cdd (8:4cdd)
+SFX_Cry05_2_Ch1: ; 20cdd (8:4cdd)
 	dutycycle 10
 	unknownsfx0x20 6, 226, 0, 5
 	unknownsfx0x20 6, 227, 128, 5
@@ -7,7 +7,7 @@ SFX_08_19_Ch1: ; 20cdd (8:4cdd)
 	endchannel
 
 
-SFX_08_19_Ch2: ; 20cf0 (8:4cf0)
+SFX_Cry05_2_Ch2: ; 20cf0 (8:4cf0)
 	dutycycle 245
 	unknownsfx0x20 6, 226, 130, 4
 	unknownsfx0x20 6, 211, 1, 5
@@ -15,6 +15,5 @@ SFX_08_19_Ch2: ; 20cf0 (8:4cf0)
 	unknownsfx0x20 8, 129, 193, 4
 
 
-SFX_08_19_Ch3: ; 20d02 (8:4d02)
+SFX_Cry05_2_Ch3: ; 20d02 (8:4d02)
 	endchannel
-; 0x20d03
diff --git a/audio/sfx/sfx_1f_19.asm b/audio/sfx/cry05_3.asm
index 0398340e..a7f88abf 100755..100644
--- a/audio/sfx/sfx_1f_19.asm
+++ b/audio/sfx/cry05_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_19_Ch1: ; 7caaa (1f:4aaa)
+SFX_Cry05_3_Ch1: ; 7caaa (1f:4aaa)
 	dutycycle 10
 	unknownsfx0x20 6, 226, 0, 5
 	unknownsfx0x20 6, 227, 128, 5
@@ -7,7 +7,7 @@ SFX_1f_19_Ch1: ; 7caaa (1f:4aaa)
 	endchannel
 
 
-SFX_1f_19_Ch2: ; 7cabd (1f:4abd)
+SFX_Cry05_3_Ch2: ; 7cabd (1f:4abd)
 	dutycycle 245
 	unknownsfx0x20 6, 226, 130, 4
 	unknownsfx0x20 6, 211, 1, 5
@@ -15,6 +15,5 @@ SFX_1f_19_Ch2: ; 7cabd (1f:4abd)
 	unknownsfx0x20 8, 129, 193, 4
 
 
-SFX_1f_19_Ch3: ; 7cacf (1f:4acf)
+SFX_Cry05_3_Ch3: ; 7cacf (1f:4acf)
 	endchannel
-; 0x7cad0
diff --git a/audio/sfx/sfx_02_1a.asm b/audio/sfx/cry06_1.asm
index efd16f9b..b26004e2 100755..100644
--- a/audio/sfx/sfx_02_1a.asm
+++ b/audio/sfx/cry06_1.asm
@@ -1,4 +1,4 @@
-SFX_02_1a_Ch1: ; 89df (2:49df)
+SFX_Cry06_1_Ch1: ; 89df (2:49df)
 	dutycycle 250
 	unknownsfx0x20 6, 131, 71, 2
 	unknownsfx0x20 15, 98, 38, 2
@@ -8,11 +8,11 @@ SFX_02_1a_Ch1: ; 89df (2:49df)
 	unknownsfx0x20 15, 66, 7, 2
 
 
-SFX_02_1a_Ch2: ; 89f9 (2:49f9)
+SFX_Cry06_1_Ch2: ; 89f9 (2:49f9)
 	endchannel
 
 
-SFX_02_1a_Ch3: ; 89fa (2:49fa)
+SFX_Cry06_1_Ch3: ; 89fa (2:49fa)
 	unknownnoise0x20 8, 212, 140
 	unknownnoise0x20 4, 226, 156
 	unknownnoise0x20 15, 198, 140
@@ -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_08_1a.asm b/audio/sfx/cry06_2.asm
index 9bd8f231..283c1360 100755..100644
--- a/audio/sfx/sfx_08_1a.asm
+++ b/audio/sfx/cry06_2.asm
@@ -1,4 +1,4 @@
-SFX_08_1a_Ch1: ; 20c87 (8:4c87)
+SFX_Cry06_2_Ch1: ; 20c87 (8:4c87)
 	dutycycle 250
 	unknownsfx0x20 6, 131, 71, 2
 	unknownsfx0x20 15, 98, 38, 2
@@ -8,11 +8,11 @@ SFX_08_1a_Ch1: ; 20c87 (8:4c87)
 	unknownsfx0x20 15, 66, 7, 2
 
 
-SFX_08_1a_Ch2: ; 20ca1 (8:4ca1)
+SFX_Cry06_2_Ch2: ; 20ca1 (8:4ca1)
 	endchannel
 
 
-SFX_08_1a_Ch3: ; 20ca2 (8:4ca2)
+SFX_Cry06_2_Ch3: ; 20ca2 (8:4ca2)
 	unknownnoise0x20 8, 212, 140
 	unknownnoise0x20 4, 226, 156
 	unknownnoise0x20 15, 198, 140
@@ -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_1f_1a.asm b/audio/sfx/cry06_3.asm
index 8fca97df..9feecc3b 100755..100644
--- a/audio/sfx/sfx_1f_1a.asm
+++ b/audio/sfx/cry06_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_1a_Ch1: ; 7ca54 (1f:4a54)
+SFX_Cry06_3_Ch1: ; 7ca54 (1f:4a54)
 	dutycycle 250
 	unknownsfx0x20 6, 131, 71, 2
 	unknownsfx0x20 15, 98, 38, 2
@@ -8,11 +8,11 @@ SFX_1f_1a_Ch1: ; 7ca54 (1f:4a54)
 	unknownsfx0x20 15, 66, 7, 2
 
 
-SFX_1f_1a_Ch2: ; 7ca6e (1f:4a6e)
+SFX_Cry06_3_Ch2: ; 7ca6e (1f:4a6e)
 	endchannel
 
 
-SFX_1f_1a_Ch3: ; 7ca6f (1f:4a6f)
+SFX_Cry06_3_Ch3: ; 7ca6f (1f:4a6f)
 	unknownnoise0x20 8, 212, 140
 	unknownnoise0x20 4, 226, 156
 	unknownnoise0x20 15, 198, 140
@@ -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_02_1b.asm b/audio/sfx/cry07_1.asm
index b1857d2c..b1346b94 100755..100644
--- a/audio/sfx/sfx_02_1b.asm
+++ b/audio/sfx/cry07_1.asm
@@ -1,4 +1,4 @@
-SFX_02_1b_Ch1: ; 8a0d (2:4a0d)
+SFX_Cry07_1_Ch1: ; 8a0d (2:4a0d)
 	dutycycle 240
 	unknownsfx0x20 4, 243, 224, 6
 	unknownsfx0x20 15, 228, 64, 6
@@ -6,7 +6,7 @@ SFX_02_1b_Ch1: ; 8a0d (2:4a0d)
 	endchannel
 
 
-SFX_02_1b_Ch2: ; 8a1c (2:4a1c)
+SFX_Cry07_1_Ch2: ; 8a1c (2:4a1c)
 	dutycycle 10
 	unknownsfx0x20 3, 195, 131, 6
 	unknownsfx0x20 14, 180, 2, 6
@@ -14,9 +14,8 @@ SFX_02_1b_Ch2: ; 8a1c (2:4a1c)
 	endchannel
 
 
-SFX_02_1b_Ch3: ; 8a2b (2:4a2b)
+SFX_Cry07_1_Ch3: ; 8a2b (2:4a2b)
 	unknownnoise0x20 4, 211, 92
 	unknownnoise0x20 15, 230, 76
 	unknownnoise0x20 8, 177, 92
 	endchannel
-; 0x8a35
diff --git a/audio/sfx/sfx_08_1b.asm b/audio/sfx/cry07_2.asm
index 3ccfdd05..075b7139 100755..100644
--- a/audio/sfx/sfx_08_1b.asm
+++ b/audio/sfx/cry07_2.asm
@@ -1,4 +1,4 @@
-SFX_08_1b_Ch1: ; 20cb5 (8:4cb5)
+SFX_Cry07_2_Ch1: ; 20cb5 (8:4cb5)
 	dutycycle 240
 	unknownsfx0x20 4, 243, 224, 6
 	unknownsfx0x20 15, 228, 64, 6
@@ -6,7 +6,7 @@ SFX_08_1b_Ch1: ; 20cb5 (8:4cb5)
 	endchannel
 
 
-SFX_08_1b_Ch2: ; 20cc4 (8:4cc4)
+SFX_Cry07_2_Ch2: ; 20cc4 (8:4cc4)
 	dutycycle 10
 	unknownsfx0x20 3, 195, 131, 6
 	unknownsfx0x20 14, 180, 2, 6
@@ -14,9 +14,8 @@ SFX_08_1b_Ch2: ; 20cc4 (8:4cc4)
 	endchannel
 
 
-SFX_08_1b_Ch3: ; 20cd3 (8:4cd3)
+SFX_Cry07_2_Ch3: ; 20cd3 (8:4cd3)
 	unknownnoise0x20 4, 211, 92
 	unknownnoise0x20 15, 230, 76
 	unknownnoise0x20 8, 177, 92
 	endchannel
-; 0x20cdd
diff --git a/audio/sfx/sfx_1f_1b.asm b/audio/sfx/cry07_3.asm
index 307e7b43..4955e115 100755..100644
--- a/audio/sfx/sfx_1f_1b.asm
+++ b/audio/sfx/cry07_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_1b_Ch1: ; 7ca82 (1f:4a82)
+SFX_Cry07_3_Ch1: ; 7ca82 (1f:4a82)
 	dutycycle 240
 	unknownsfx0x20 4, 243, 224, 6
 	unknownsfx0x20 15, 228, 64, 6
@@ -6,7 +6,7 @@ SFX_1f_1b_Ch1: ; 7ca82 (1f:4a82)
 	endchannel
 
 
-SFX_1f_1b_Ch2: ; 7ca91 (1f:4a91)
+SFX_Cry07_3_Ch2: ; 7ca91 (1f:4a91)
 	dutycycle 10
 	unknownsfx0x20 3, 195, 131, 6
 	unknownsfx0x20 14, 180, 2, 6
@@ -14,9 +14,8 @@ SFX_1f_1b_Ch2: ; 7ca91 (1f:4a91)
 	endchannel
 
 
-SFX_1f_1b_Ch3: ; 7caa0 (1f:4aa0)
+SFX_Cry07_3_Ch3: ; 7caa0 (1f:4aa0)
 	unknownnoise0x20 4, 211, 92
 	unknownnoise0x20 15, 230, 76
 	unknownnoise0x20 8, 177, 92
 	endchannel
-; 0x7caaa
diff --git a/audio/sfx/sfx_02_1c.asm b/audio/sfx/cry08_1.asm
index a880a042..65131766 100755..100644
--- a/audio/sfx/sfx_02_1c.asm
+++ b/audio/sfx/cry08_1.asm
@@ -1,4 +1,4 @@
-SFX_02_1c_Ch1: ; 8c25 (2:4c25)
+SFX_Cry08_1_Ch1: ; 8c25 (2:4c25)
 	dutycycle 240
 	unknownsfx0x20 15, 246, 101, 5
 	unknownsfx0x20 10, 228, 124, 5
@@ -7,7 +7,7 @@ SFX_02_1c_Ch1: ; 8c25 (2:4c25)
 	endchannel
 
 
-SFX_02_1c_Ch2: ; 8c38 (2:4c38)
+SFX_Cry08_1_Ch2: ; 8c38 (2:4c38)
 	dutycycle 90
 	unknownsfx0x20 14, 214, 3, 5
 	unknownsfx0x20 9, 180, 27, 5
@@ -16,9 +16,8 @@ SFX_02_1c_Ch2: ; 8c38 (2:4c38)
 	endchannel
 
 
-SFX_02_1c_Ch3: ; 8c4b (2:4c4b)
+SFX_Cry08_1_Ch3: ; 8c4b (2:4c4b)
 	unknownnoise0x20 12, 230, 76
 	unknownnoise0x20 11, 215, 92
 	unknownnoise0x20 15, 194, 76
 	endchannel
-; 0x8c55
diff --git a/audio/sfx/sfx_08_1c.asm b/audio/sfx/cry08_2.asm
index 75f74f3e..71a0e205 100755..100644
--- a/audio/sfx/sfx_08_1c.asm
+++ b/audio/sfx/cry08_2.asm
@@ -1,4 +1,4 @@
-SFX_08_1c_Ch1: ; 20ecd (8:4ecd)
+SFX_Cry08_2_Ch1: ; 20ecd (8:4ecd)
 	dutycycle 240
 	unknownsfx0x20 15, 246, 101, 5
 	unknownsfx0x20 10, 228, 124, 5
@@ -7,7 +7,7 @@ SFX_08_1c_Ch1: ; 20ecd (8:4ecd)
 	endchannel
 
 
-SFX_08_1c_Ch2: ; 20ee0 (8:4ee0)
+SFX_Cry08_2_Ch2: ; 20ee0 (8:4ee0)
 	dutycycle 90
 	unknownsfx0x20 14, 214, 3, 5
 	unknownsfx0x20 9, 180, 27, 5
@@ -16,9 +16,8 @@ SFX_08_1c_Ch2: ; 20ee0 (8:4ee0)
 	endchannel
 
 
-SFX_08_1c_Ch3: ; 20ef3 (8:4ef3)
+SFX_Cry08_2_Ch3: ; 20ef3 (8:4ef3)
 	unknownnoise0x20 12, 230, 76
 	unknownnoise0x20 11, 215, 92
 	unknownnoise0x20 15, 194, 76
 	endchannel
-; 0x20efd
diff --git a/audio/sfx/sfx_1f_1c.asm b/audio/sfx/cry08_3.asm
index 3767953d..bfda8c3d 100755..100644
--- a/audio/sfx/sfx_1f_1c.asm
+++ b/audio/sfx/cry08_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_1c_Ch1: ; 7cc9a (1f:4c9a)
+SFX_Cry08_3_Ch1: ; 7cc9a (1f:4c9a)
 	dutycycle 240
 	unknownsfx0x20 15, 246, 101, 5
 	unknownsfx0x20 10, 228, 124, 5
@@ -7,7 +7,7 @@ SFX_1f_1c_Ch1: ; 7cc9a (1f:4c9a)
 	endchannel
 
 
-SFX_1f_1c_Ch2: ; 7ccad (1f:4cad)
+SFX_Cry08_3_Ch2: ; 7ccad (1f:4cad)
 	dutycycle 90
 	unknownsfx0x20 14, 214, 3, 5
 	unknownsfx0x20 9, 180, 27, 5
@@ -16,9 +16,8 @@ SFX_1f_1c_Ch2: ; 7ccad (1f:4cad)
 	endchannel
 
 
-SFX_1f_1c_Ch3: ; 7ccc0 (1f:4cc0)
+SFX_Cry08_3_Ch3: ; 7ccc0 (1f:4cc0)
 	unknownnoise0x20 12, 230, 76
 	unknownnoise0x20 11, 215, 92
 	unknownnoise0x20 15, 194, 76
 	endchannel
-; 0x7ccca
diff --git a/audio/sfx/sfx_02_1d.asm b/audio/sfx/cry09_1.asm
index fa70c67c..29dffdb6 100755..100644
--- a/audio/sfx/sfx_02_1d.asm
+++ b/audio/sfx/cry09_1.asm
@@ -1,4 +1,4 @@
-SFX_02_1d_Ch1: ; 872f (2:472f)
+SFX_Cry09_1_Ch1: ; 872f (2:472f)
 	dutycycle 240
 	unknownsfx0x20 15, 247, 160, 7
 	unknownsfx0x20 6, 230, 163, 7
@@ -10,7 +10,7 @@ SFX_02_1d_Ch1: ; 872f (2:472f)
 	endchannel
 
 
-SFX_02_1d_Ch2: ; 874c (2:474c)
+SFX_Cry09_1_Ch2: ; 874c (2:474c)
 	dutycycle 5
 	unknownsfx0x20 2, 8, 0, 0
 	unknownsfx0x20 15, 167, 161, 6
@@ -23,7 +23,7 @@ SFX_02_1d_Ch2: ; 874c (2:474c)
 	endchannel
 
 
-SFX_02_1d_Ch3: ; 876d (2:476d)
+SFX_Cry09_1_Ch3: ; 876d (2:476d)
 	unknownnoise0x20 2, 242, 60
 	unknownnoise0x20 8, 228, 62
 	unknownnoise0x20 15, 215, 60
@@ -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_08_1d.asm b/audio/sfx/cry09_2.asm
index 44f9a64f..c0e61ec7 100755..100644
--- a/audio/sfx/sfx_08_1d.asm
+++ b/audio/sfx/cry09_2.asm
@@ -1,4 +1,4 @@
-SFX_08_1d_Ch1: ; 209d7 (8:49d7)
+SFX_Cry09_2_Ch1: ; 209d7 (8:49d7)
 	dutycycle 240
 	unknownsfx0x20 15, 247, 160, 7
 	unknownsfx0x20 6, 230, 163, 7
@@ -10,7 +10,7 @@ SFX_08_1d_Ch1: ; 209d7 (8:49d7)
 	endchannel
 
 
-SFX_08_1d_Ch2: ; 209f4 (8:49f4)
+SFX_Cry09_2_Ch2: ; 209f4 (8:49f4)
 	dutycycle 5
 	unknownsfx0x20 2, 8, 0, 0
 	unknownsfx0x20 15, 167, 161, 6
@@ -23,7 +23,7 @@ SFX_08_1d_Ch2: ; 209f4 (8:49f4)
 	endchannel
 
 
-SFX_08_1d_Ch3: ; 20a15 (8:4a15)
+SFX_Cry09_2_Ch3: ; 20a15 (8:4a15)
 	unknownnoise0x20 2, 242, 60
 	unknownnoise0x20 8, 228, 62
 	unknownnoise0x20 15, 215, 60
@@ -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_1f_1d.asm b/audio/sfx/cry09_3.asm
index c631f556..c5c0f599 100755..100644
--- a/audio/sfx/sfx_1f_1d.asm
+++ b/audio/sfx/cry09_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_1d_Ch1: ; 7c7a4 (1f:47a4)
+SFX_Cry09_3_Ch1: ; 7c7a4 (1f:47a4)
 	dutycycle 240
 	unknownsfx0x20 15, 247, 160, 7
 	unknownsfx0x20 6, 230, 163, 7
@@ -10,7 +10,7 @@ SFX_1f_1d_Ch1: ; 7c7a4 (1f:47a4)
 	endchannel
 
 
-SFX_1f_1d_Ch2: ; 7c7c1 (1f:47c1)
+SFX_Cry09_3_Ch2: ; 7c7c1 (1f:47c1)
 	dutycycle 5
 	unknownsfx0x20 2, 8, 0, 0
 	unknownsfx0x20 15, 167, 161, 6
@@ -23,7 +23,7 @@ SFX_1f_1d_Ch2: ; 7c7c1 (1f:47c1)
 	endchannel
 
 
-SFX_1f_1d_Ch3: ; 7c7e2 (1f:47e2)
+SFX_Cry09_3_Ch3: ; 7c7e2 (1f:47e2)
 	unknownnoise0x20 2, 242, 60
 	unknownnoise0x20 8, 228, 62
 	unknownnoise0x20 15, 215, 60
@@ -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_02_1e.asm b/audio/sfx/cry0a_1.asm
index 19ccdada..9a8e616b 100755..100644
--- a/audio/sfx/sfx_02_1e.asm
+++ b/audio/sfx/cry0a_1.asm
@@ -1,4 +1,4 @@
-SFX_02_1e_Ch1: ; 8bca (2:4bca)
+SFX_Cry0A_1_Ch1: ; 8bca (2:4bca)
 	dutycycle 240
 	unknownsfx0x20 8, 247, 224, 6
 	unknownsfx0x20 6, 230, 229, 6
@@ -10,7 +10,7 @@ SFX_02_1e_Ch1: ; 8bca (2:4bca)
 	endchannel
 
 
-SFX_02_1e_Ch2: ; 8be9 (2:4be9)
+SFX_Cry0A_1_Ch2: ; 8be9 (2:4be9)
 	dutycycle 5
 	unknownsfx0x20 3, 8, 0, 0
 	unknownsfx0x20 8, 167, 161, 6
@@ -23,7 +23,7 @@ SFX_02_1e_Ch2: ; 8be9 (2:4be9)
 	endchannel
 
 
-SFX_02_1e_Ch3: ; 8c0c (2:4c0c)
+SFX_Cry0A_1_Ch3: ; 8c0c (2:4c0c)
 	unknownnoise0x20 2, 242, 60
 	unknownnoise0x20 8, 228, 62
 	unknownnoise0x20 8, 215, 60
@@ -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_08_1e.asm b/audio/sfx/cry0a_2.asm
index 372ecd89..0386099d 100755..100644
--- a/audio/sfx/sfx_08_1e.asm
+++ b/audio/sfx/cry0a_2.asm
@@ -1,4 +1,4 @@
-SFX_08_1e_Ch1: ; 20e72 (8:4e72)
+SFX_Cry0A_2_Ch1: ; 20e72 (8:4e72)
 	dutycycle 240
 	unknownsfx0x20 8, 247, 224, 6
 	unknownsfx0x20 6, 230, 229, 6
@@ -10,7 +10,7 @@ SFX_08_1e_Ch1: ; 20e72 (8:4e72)
 	endchannel
 
 
-SFX_08_1e_Ch2: ; 20e91 (8:4e91)
+SFX_Cry0A_2_Ch2: ; 20e91 (8:4e91)
 	dutycycle 5
 	unknownsfx0x20 3, 8, 0, 0
 	unknownsfx0x20 8, 167, 161, 6
@@ -23,7 +23,7 @@ SFX_08_1e_Ch2: ; 20e91 (8:4e91)
 	endchannel
 
 
-SFX_08_1e_Ch3: ; 20eb4 (8:4eb4)
+SFX_Cry0A_2_Ch3: ; 20eb4 (8:4eb4)
 	unknownnoise0x20 2, 242, 60
 	unknownnoise0x20 8, 228, 62
 	unknownnoise0x20 8, 215, 60
@@ -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_1f_1e.asm b/audio/sfx/cry0a_3.asm
index f9df4ca3..4cf59333 100755..100644
--- a/audio/sfx/sfx_1f_1e.asm
+++ b/audio/sfx/cry0a_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_1e_Ch1: ; 7cc3f (1f:4c3f)
+SFX_Cry0A_3_Ch1: ; 7cc3f (1f:4c3f)
 	dutycycle 240
 	unknownsfx0x20 8, 247, 224, 6
 	unknownsfx0x20 6, 230, 229, 6
@@ -10,7 +10,7 @@ SFX_1f_1e_Ch1: ; 7cc3f (1f:4c3f)
 	endchannel
 
 
-SFX_1f_1e_Ch2: ; 7cc5e (1f:4c5e)
+SFX_Cry0A_3_Ch2: ; 7cc5e (1f:4c5e)
 	dutycycle 5
 	unknownsfx0x20 3, 8, 0, 0
 	unknownsfx0x20 8, 167, 161, 6
@@ -23,7 +23,7 @@ SFX_1f_1e_Ch2: ; 7cc5e (1f:4c5e)
 	endchannel
 
 
-SFX_1f_1e_Ch3: ; 7cc81 (1f:4c81)
+SFX_Cry0A_3_Ch3: ; 7cc81 (1f:4c81)
 	unknownnoise0x20 2, 242, 60
 	unknownnoise0x20 8, 228, 62
 	unknownnoise0x20 8, 215, 60
@@ -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_02_1f.asm b/audio/sfx/cry0b_1.asm
index 0305f8bf..0f0edca7 100755..100644
--- a/audio/sfx/sfx_02_1f.asm
+++ b/audio/sfx/cry0b_1.asm
@@ -1,4 +1,4 @@
-SFX_02_1f_Ch1: ; 8a5b (2:4a5b)
+SFX_Cry0B_1_Ch1: ; 8a5b (2:4a5b)
 	dutycycle 204
 	unknownsfx0x20 4, 241, 0, 7
 	unknownsfx0x20 4, 225, 128, 7
@@ -13,7 +13,7 @@ SFX_02_1f_Ch1: ; 8a5b (2:4a5b)
 	endchannel
 
 
-SFX_02_1f_Ch2: ; 8a86 (2:4a86)
+SFX_Cry0B_1_Ch2: ; 8a86 (2:4a86)
 	dutycycle 68
 	unknownsfx0x20 12, 8, 0, 0
 	unknownsfx0x20 4, 241, 1, 7
@@ -25,7 +25,7 @@ SFX_02_1f_Ch2: ; 8a86 (2:4a86)
 	endchannel
 
 
-SFX_02_1f_Ch3: ; 8aa5 (2:4aa5)
+SFX_Cry0B_1_Ch3: ; 8aa5 (2:4aa5)
 	unknownnoise0x20 15, 8, 0
 	unknownnoise0x20 4, 8, 0
 	unknownnoise0x20 4, 209, 76
@@ -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_08_1f.asm b/audio/sfx/cry0b_2.asm
index 6ff114ea..071cd9b1 100755..100644
--- a/audio/sfx/sfx_08_1f.asm
+++ b/audio/sfx/cry0b_2.asm
@@ -1,4 +1,4 @@
-SFX_08_1f_Ch1: ; 20d03 (8:4d03)
+SFX_Cry0B_2_Ch1: ; 20d03 (8:4d03)
 	dutycycle 204
 	unknownsfx0x20 4, 241, 0, 7
 	unknownsfx0x20 4, 225, 128, 7
@@ -13,7 +13,7 @@ SFX_08_1f_Ch1: ; 20d03 (8:4d03)
 	endchannel
 
 
-SFX_08_1f_Ch2: ; 20d2e (8:4d2e)
+SFX_Cry0B_2_Ch2: ; 20d2e (8:4d2e)
 	dutycycle 68
 	unknownsfx0x20 12, 8, 0, 0
 	unknownsfx0x20 4, 241, 1, 7
@@ -25,7 +25,7 @@ SFX_08_1f_Ch2: ; 20d2e (8:4d2e)
 	endchannel
 
 
-SFX_08_1f_Ch3: ; 20d4d (8:4d4d)
+SFX_Cry0B_2_Ch3: ; 20d4d (8:4d4d)
 	unknownnoise0x20 15, 8, 0
 	unknownnoise0x20 4, 8, 0
 	unknownnoise0x20 4, 209, 76
@@ -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_1f_1f.asm b/audio/sfx/cry0b_3.asm
index 1466c684..c2bd1809 100755..100644
--- a/audio/sfx/sfx_1f_1f.asm
+++ b/audio/sfx/cry0b_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_1f_Ch1: ; 7cad0 (1f:4ad0)
+SFX_Cry0B_3_Ch1: ; 7cad0 (1f:4ad0)
 	dutycycle 204
 	unknownsfx0x20 4, 241, 0, 7
 	unknownsfx0x20 4, 225, 128, 7
@@ -13,7 +13,7 @@ SFX_1f_1f_Ch1: ; 7cad0 (1f:4ad0)
 	endchannel
 
 
-SFX_1f_1f_Ch2: ; 7cafb (1f:4afb)
+SFX_Cry0B_3_Ch2: ; 7cafb (1f:4afb)
 	dutycycle 68
 	unknownsfx0x20 12, 8, 0, 0
 	unknownsfx0x20 4, 241, 1, 7
@@ -25,7 +25,7 @@ SFX_1f_1f_Ch2: ; 7cafb (1f:4afb)
 	endchannel
 
 
-SFX_1f_1f_Ch3: ; 7cb1a (1f:4b1a)
+SFX_Cry0B_3_Ch3: ; 7cb1a (1f:4b1a)
 	unknownnoise0x20 15, 8, 0
 	unknownnoise0x20 4, 8, 0
 	unknownnoise0x20 4, 209, 76
@@ -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_02_20.asm b/audio/sfx/cry0c_1.asm
index 90e68dd0..1c0f9f65 100755..100644
--- a/audio/sfx/sfx_02_20.asm
+++ b/audio/sfx/cry0c_1.asm
@@ -1,4 +1,4 @@
-SFX_02_20_Ch1: ; 8abe (2:4abe)
+SFX_Cry0C_1_Ch1: ; 8abe (2:4abe)
 	dutycycle 204
 	unknownsfx0x20 8, 245, 0, 6
 	unknownsfx0x20 2, 210, 56, 6
@@ -12,7 +12,7 @@ SFX_02_20_Ch1: ; 8abe (2:4abe)
 	endchannel
 
 
-SFX_02_20_Ch2: ; 8ae5 (2:4ae5)
+SFX_Cry0C_1_Ch2: ; 8ae5 (2:4ae5)
 	dutycycle 68
 	unknownsfx0x20 12, 195, 192, 5
 	unknownsfx0x20 3, 177, 249, 5
@@ -25,6 +25,5 @@ SFX_02_20_Ch2: ; 8ae5 (2:4ae5)
 	unknownsfx0x20 8, 145, 225, 5
 
 
-SFX_02_20_Ch3: ; 8b0b (2:4b0b)
+SFX_Cry0C_1_Ch3: ; 8b0b (2:4b0b)
 	endchannel
-; 0x8b0c
diff --git a/audio/sfx/sfx_08_20.asm b/audio/sfx/cry0c_2.asm
index 35cd9acc..ef598b3e 100755..100644
--- a/audio/sfx/sfx_08_20.asm
+++ b/audio/sfx/cry0c_2.asm
@@ -1,4 +1,4 @@
-SFX_08_20_Ch1: ; 20d66 (8:4d66)
+SFX_Cry0C_2_Ch1: ; 20d66 (8:4d66)
 	dutycycle 204
 	unknownsfx0x20 8, 245, 0, 6
 	unknownsfx0x20 2, 210, 56, 6
@@ -12,7 +12,7 @@ SFX_08_20_Ch1: ; 20d66 (8:4d66)
 	endchannel
 
 
-SFX_08_20_Ch2: ; 20d8d (8:4d8d)
+SFX_Cry0C_2_Ch2: ; 20d8d (8:4d8d)
 	dutycycle 68
 	unknownsfx0x20 12, 195, 192, 5
 	unknownsfx0x20 3, 177, 249, 5
@@ -25,6 +25,5 @@ SFX_08_20_Ch2: ; 20d8d (8:4d8d)
 	unknownsfx0x20 8, 145, 225, 5
 
 
-SFX_08_20_Ch3: ; 20db3 (8:4db3)
+SFX_Cry0C_2_Ch3: ; 20db3 (8:4db3)
 	endchannel
-; 0x20db4
diff --git a/audio/sfx/sfx_1f_20.asm b/audio/sfx/cry0c_3.asm
index 68eb568c..4075ac51 100755..100644
--- a/audio/sfx/sfx_1f_20.asm
+++ b/audio/sfx/cry0c_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_20_Ch1: ; 7cb33 (1f:4b33)
+SFX_Cry0C_3_Ch1: ; 7cb33 (1f:4b33)
 	dutycycle 204
 	unknownsfx0x20 8, 245, 0, 6
 	unknownsfx0x20 2, 210, 56, 6
@@ -12,7 +12,7 @@ SFX_1f_20_Ch1: ; 7cb33 (1f:4b33)
 	endchannel
 
 
-SFX_1f_20_Ch2: ; 7cb5a (1f:4b5a)
+SFX_Cry0C_3_Ch2: ; 7cb5a (1f:4b5a)
 	dutycycle 68
 	unknownsfx0x20 12, 195, 192, 5
 	unknownsfx0x20 3, 177, 249, 5
@@ -25,6 +25,5 @@ SFX_1f_20_Ch2: ; 7cb5a (1f:4b5a)
 	unknownsfx0x20 8, 145, 225, 5
 
 
-SFX_1f_20_Ch3: ; 7cb80 (1f:4b80)
+SFX_Cry0C_3_Ch3: ; 7cb80 (1f:4b80)
 	endchannel
-; 0x7cb81
diff --git a/audio/sfx/sfx_02_21.asm b/audio/sfx/cry0d_1.asm
index b454585c..591bf58e 100755..100644
--- a/audio/sfx/sfx_02_21.asm
+++ b/audio/sfx/cry0d_1.asm
@@ -1,4 +1,4 @@
-SFX_02_21_Ch1: ; 8b2a (2:4b2a)
+SFX_Cry0D_1_Ch1: ; 8b2a (2:4b2a)
 	dutycycle 136
 	unknownsfx0x20 5, 242, 80, 6
 	unknownsfx0x20 9, 209, 96, 6
@@ -6,11 +6,11 @@ SFX_02_21_Ch1: ; 8b2a (2:4b2a)
 	unknownsfx0x20 9, 193, 34, 6
 	unknownsfx0x20 5, 242, 16, 6
 	unknownsfx0x20 6, 209, 32, 6
-	loopchannel 2, SFX_02_21_Ch1
+	loopchannel 2, SFX_Cry0D_1_Ch1
 	endchannel
 
 
-SFX_02_21_Ch2: ; 8b49 (2:4b49)
+SFX_Cry0D_1_Ch2: ; 8b49 (2:4b49)
 	dutycycle 64
 	unknownsfx0x20 4, 8, 0, 0
 	unknownsfx0x20 5, 242, 81, 6
@@ -26,7 +26,7 @@ SFX_02_21_Ch2: ; 8b49 (2:4b49)
 	endchannel
 
 
-SFX_02_21_Ch3: ; 8b78 (2:4b78)
+SFX_Cry0D_1_Ch3: ; 8b78 (2:4b78)
 	unknownnoise0x20 6, 210, 28
 	unknownnoise0x20 9, 177, 44
 	unknownnoise0x20 8, 194, 44
@@ -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_08_21.asm b/audio/sfx/cry0d_2.asm
index 50c0106a..a7ca34f1 100755..100644
--- a/audio/sfx/sfx_08_21.asm
+++ b/audio/sfx/cry0d_2.asm
@@ -1,4 +1,4 @@
-SFX_08_21_Ch1: ; 20dd2 (8:4dd2)
+SFX_Cry0D_2_Ch1: ; 20dd2 (8:4dd2)
 	dutycycle 136
 	unknownsfx0x20 5, 242, 80, 6
 	unknownsfx0x20 9, 209, 96, 6
@@ -6,11 +6,11 @@ SFX_08_21_Ch1: ; 20dd2 (8:4dd2)
 	unknownsfx0x20 9, 193, 34, 6
 	unknownsfx0x20 5, 242, 16, 6
 	unknownsfx0x20 6, 209, 32, 6
-	loopchannel 2, SFX_08_21_Ch1
+	loopchannel 2, SFX_Cry0D_2_Ch1
 	endchannel
 
 
-SFX_08_21_Ch2: ; 20df1 (8:4df1)
+SFX_Cry0D_2_Ch2: ; 20df1 (8:4df1)
 	dutycycle 64
 	unknownsfx0x20 4, 8, 0, 0
 	unknownsfx0x20 5, 242, 81, 6
@@ -26,7 +26,7 @@ SFX_08_21_Ch2: ; 20df1 (8:4df1)
 	endchannel
 
 
-SFX_08_21_Ch3: ; 20e20 (8:4e20)
+SFX_Cry0D_2_Ch3: ; 20e20 (8:4e20)
 	unknownnoise0x20 6, 210, 28
 	unknownnoise0x20 9, 177, 44
 	unknownnoise0x20 8, 194, 44
@@ -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_1f_21.asm b/audio/sfx/cry0d_3.asm
index d37e2940..a9187dc8 100755..100644
--- a/audio/sfx/sfx_1f_21.asm
+++ b/audio/sfx/cry0d_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_21_Ch1: ; 7cb9f (1f:4b9f)
+SFX_Cry0D_3_Ch1: ; 7cb9f (1f:4b9f)
 	dutycycle 136
 	unknownsfx0x20 5, 242, 80, 6
 	unknownsfx0x20 9, 209, 96, 6
@@ -6,11 +6,11 @@ SFX_1f_21_Ch1: ; 7cb9f (1f:4b9f)
 	unknownsfx0x20 9, 193, 34, 6
 	unknownsfx0x20 5, 242, 16, 6
 	unknownsfx0x20 6, 209, 32, 6
-	loopchannel 2, SFX_1f_21_Ch1
+	loopchannel 2, SFX_Cry0D_3_Ch1
 	endchannel
 
 
-SFX_1f_21_Ch2: ; 7cbbe (1f:4bbe)
+SFX_Cry0D_3_Ch2: ; 7cbbe (1f:4bbe)
 	dutycycle 64
 	unknownsfx0x20 4, 8, 0, 0
 	unknownsfx0x20 5, 242, 81, 6
@@ -26,7 +26,7 @@ SFX_1f_21_Ch2: ; 7cbbe (1f:4bbe)
 	endchannel
 
 
-SFX_1f_21_Ch3: ; 7cbed (1f:4bed)
+SFX_Cry0D_3_Ch3: ; 7cbed (1f:4bed)
 	unknownnoise0x20 6, 210, 28
 	unknownnoise0x20 9, 177, 44
 	unknownnoise0x20 8, 194, 44
@@ -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_02_22.asm b/audio/sfx/cry0e_1.asm
index 5fb2b91c..1e778dea 100755..100644
--- a/audio/sfx/sfx_02_22.asm
+++ b/audio/sfx/cry0e_1.asm
@@ -1,4 +1,4 @@
-SFX_02_22_Ch1: ; 89af (2:49af)
+SFX_Cry0E_1_Ch1: ; 89af (2:49af)
 	dutycycle 165
 	unknownsfx0x20 4, 225, 0, 7
 	unknownsfx0x20 4, 242, 128, 7
@@ -7,7 +7,7 @@ SFX_02_22_Ch1: ; 89af (2:49af)
 	endchannel
 
 
-SFX_02_22_Ch2: ; 89c2 (2:49c2)
+SFX_Cry0E_1_Ch2: ; 89c2 (2:49c2)
 	dutycycle 10
 	unknownsfx0x20 4, 177, 225, 6
 	unknownsfx0x20 3, 194, 225, 6
@@ -16,9 +16,8 @@ SFX_02_22_Ch2: ; 89c2 (2:49c2)
 	endchannel
 
 
-SFX_02_22_Ch3: ; 89d5 (2:49d5)
+SFX_Cry0E_1_Ch3: ; 89d5 (2:49d5)
 	unknownnoise0x20 2, 97, 50
 	unknownnoise0x20 2, 97, 33
 	unknownnoise0x20 8, 97, 17
 	endchannel
-; 0x89df
diff --git a/audio/sfx/sfx_08_22.asm b/audio/sfx/cry0e_2.asm
index a08f0a89..bab74449 100755..100644
--- a/audio/sfx/sfx_08_22.asm
+++ b/audio/sfx/cry0e_2.asm
@@ -1,4 +1,4 @@
-SFX_08_22_Ch1: ; 20c57 (8:4c57)
+SFX_Cry0E_2_Ch1: ; 20c57 (8:4c57)
 	dutycycle 165
 	unknownsfx0x20 4, 225, 0, 7
 	unknownsfx0x20 4, 242, 128, 7
@@ -7,7 +7,7 @@ SFX_08_22_Ch1: ; 20c57 (8:4c57)
 	endchannel
 
 
-SFX_08_22_Ch2: ; 20c6a (8:4c6a)
+SFX_Cry0E_2_Ch2: ; 20c6a (8:4c6a)
 	dutycycle 10
 	unknownsfx0x20 4, 177, 225, 6
 	unknownsfx0x20 3, 194, 225, 6
@@ -16,9 +16,8 @@ SFX_08_22_Ch2: ; 20c6a (8:4c6a)
 	endchannel
 
 
-SFX_08_22_Ch3: ; 20c7d (8:4c7d)
+SFX_Cry0E_2_Ch3: ; 20c7d (8:4c7d)
 	unknownnoise0x20 2, 97, 50
 	unknownnoise0x20 2, 97, 33
 	unknownnoise0x20 8, 97, 17
 	endchannel
-; 0x20c87
diff --git a/audio/sfx/sfx_1f_22.asm b/audio/sfx/cry0e_3.asm
index f765ed15..da14b3a7 100755..100644
--- a/audio/sfx/sfx_1f_22.asm
+++ b/audio/sfx/cry0e_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_22_Ch1: ; 7ca24 (1f:4a24)
+SFX_Cry0E_3_Ch1: ; 7ca24 (1f:4a24)
 	dutycycle 165
 	unknownsfx0x20 4, 225, 0, 7
 	unknownsfx0x20 4, 242, 128, 7
@@ -7,7 +7,7 @@ SFX_1f_22_Ch1: ; 7ca24 (1f:4a24)
 	endchannel
 
 
-SFX_1f_22_Ch2: ; 7ca37 (1f:4a37)
+SFX_Cry0E_3_Ch2: ; 7ca37 (1f:4a37)
 	dutycycle 10
 	unknownsfx0x20 4, 177, 225, 6
 	unknownsfx0x20 3, 194, 225, 6
@@ -16,9 +16,8 @@ SFX_1f_22_Ch2: ; 7ca37 (1f:4a37)
 	endchannel
 
 
-SFX_1f_22_Ch3: ; 7ca4a (1f:4a4a)
+SFX_Cry0E_3_Ch3: ; 7ca4a (1f:4a4a)
 	unknownnoise0x20 2, 97, 50
 	unknownnoise0x20 2, 97, 33
 	unknownnoise0x20 8, 97, 17
 	endchannel
-; 0x7ca54
diff --git a/audio/sfx/sfx_02_23.asm b/audio/sfx/cry0f_1.asm
index 19110b45..84563293 100755..100644
--- a/audio/sfx/sfx_02_23.asm
+++ b/audio/sfx/cry0f_1.asm
@@ -1,4 +1,4 @@
-SFX_02_23_Ch1: ; 88f1 (2:48f1)
+SFX_Cry0F_1_Ch1: ; 88f1 (2:48f1)
 	dutycycle 241
 	unknownsfx0x20 4, 247, 192, 7
 	unknownsfx0x20 12, 230, 194, 7
@@ -9,7 +9,7 @@ SFX_02_23_Ch1: ; 88f1 (2:48f1)
 	endchannel
 
 
-SFX_02_23_Ch2: ; 890c (2:490c)
+SFX_Cry0F_1_Ch2: ; 890c (2:490c)
 	dutycycle 204
 	unknownsfx0x20 3, 199, 129, 7
 	unknownsfx0x20 12, 182, 128, 7
@@ -20,11 +20,10 @@ SFX_02_23_Ch2: ; 890c (2:490c)
 	endchannel
 
 
-SFX_02_23_Ch3: ; 8927 (2:4927)
+SFX_Cry0F_1_Ch3: ; 8927 (2:4927)
 	unknownnoise0x20 3, 228, 60
 	unknownnoise0x20 12, 214, 44
 	unknownnoise0x20 4, 228, 60
 	unknownnoise0x20 8, 183, 92
 	unknownnoise0x20 15, 194, 93
 	endchannel
-; 0x8937
diff --git a/audio/sfx/sfx_08_23.asm b/audio/sfx/cry0f_2.asm
index 8552ddc7..0fbaeb7a 100755..100644
--- a/audio/sfx/sfx_08_23.asm
+++ b/audio/sfx/cry0f_2.asm
@@ -1,4 +1,4 @@
-SFX_08_23_Ch1: ; 20b99 (8:4b99)
+SFX_Cry0F_2_Ch1: ; 20b99 (8:4b99)
 	dutycycle 241
 	unknownsfx0x20 4, 247, 192, 7
 	unknownsfx0x20 12, 230, 194, 7
@@ -9,7 +9,7 @@ SFX_08_23_Ch1: ; 20b99 (8:4b99)
 	endchannel
 
 
-SFX_08_23_Ch2: ; 20bb4 (8:4bb4)
+SFX_Cry0F_2_Ch2: ; 20bb4 (8:4bb4)
 	dutycycle 204
 	unknownsfx0x20 3, 199, 129, 7
 	unknownsfx0x20 12, 182, 128, 7
@@ -20,11 +20,10 @@ SFX_08_23_Ch2: ; 20bb4 (8:4bb4)
 	endchannel
 
 
-SFX_08_23_Ch3: ; 20bcf (8:4bcf)
+SFX_Cry0F_2_Ch3: ; 20bcf (8:4bcf)
 	unknownnoise0x20 3, 228, 60
 	unknownnoise0x20 12, 214, 44
 	unknownnoise0x20 4, 228, 60
 	unknownnoise0x20 8, 183, 92
 	unknownnoise0x20 15, 194, 93
 	endchannel
-; 0x20bdf
diff --git a/audio/sfx/sfx_1f_23.asm b/audio/sfx/cry0f_3.asm
index 76151d7e..810ab949 100755..100644
--- a/audio/sfx/sfx_1f_23.asm
+++ b/audio/sfx/cry0f_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_23_Ch1: ; 7c966 (1f:4966)
+SFX_Cry0F_3_Ch1: ; 7c966 (1f:4966)
 	dutycycle 241
 	unknownsfx0x20 4, 247, 192, 7
 	unknownsfx0x20 12, 230, 194, 7
@@ -9,7 +9,7 @@ SFX_1f_23_Ch1: ; 7c966 (1f:4966)
 	endchannel
 
 
-SFX_1f_23_Ch2: ; 7c981 (1f:4981)
+SFX_Cry0F_3_Ch2: ; 7c981 (1f:4981)
 	dutycycle 204
 	unknownsfx0x20 3, 199, 129, 7
 	unknownsfx0x20 12, 182, 128, 7
@@ -20,11 +20,10 @@ SFX_1f_23_Ch2: ; 7c981 (1f:4981)
 	endchannel
 
 
-SFX_1f_23_Ch3: ; 7c99c (1f:499c)
+SFX_Cry0F_3_Ch3: ; 7c99c (1f:499c)
 	unknownnoise0x20 3, 228, 60
 	unknownnoise0x20 12, 214, 44
 	unknownnoise0x20 4, 228, 60
 	unknownnoise0x20 8, 183, 92
 	unknownnoise0x20 15, 194, 93
 	endchannel
-; 0x7c9ac
diff --git a/audio/sfx/sfx_02_24.asm b/audio/sfx/cry10_1.asm
index c487c8b8..956fc910 100755..100644
--- a/audio/sfx/sfx_02_24.asm
+++ b/audio/sfx/cry10_1.asm
@@ -1,4 +1,4 @@
-SFX_02_24_Ch1: ; 8937 (2:4937)
+SFX_Cry10_1_Ch1: ; 8937 (2:4937)
 	dutycycle 201
 	unknownsfx0x20 8, 247, 128, 6
 	unknownsfx0x20 2, 247, 96, 6
@@ -11,7 +11,7 @@ SFX_02_24_Ch1: ; 8937 (2:4937)
 	endchannel
 
 
-SFX_02_24_Ch2: ; 895a (2:495a)
+SFX_Cry10_1_Ch2: ; 895a (2:495a)
 	dutycycle 121
 	unknownsfx0x20 10, 231, 130, 6
 	unknownsfx0x20 2, 231, 98, 6
@@ -24,9 +24,8 @@ SFX_02_24_Ch2: ; 895a (2:495a)
 	endchannel
 
 
-SFX_02_24_Ch3: ; 897d (2:497d)
+SFX_Cry10_1_Ch3: ; 897d (2:497d)
 	unknownnoise0x20 4, 116, 33
 	unknownnoise0x20 4, 116, 16
 	unknownnoise0x20 4, 113, 32
 	endchannel
-; 0x8987
diff --git a/audio/sfx/sfx_08_24.asm b/audio/sfx/cry10_2.asm
index 9b4def61..5d4cc3aa 100755..100644
--- a/audio/sfx/sfx_08_24.asm
+++ b/audio/sfx/cry10_2.asm
@@ -1,4 +1,4 @@
-SFX_08_24_Ch1: ; 20bdf (8:4bdf)
+SFX_Cry10_2_Ch1: ; 20bdf (8:4bdf)
 	dutycycle 201
 	unknownsfx0x20 8, 247, 128, 6
 	unknownsfx0x20 2, 247, 96, 6
@@ -11,7 +11,7 @@ SFX_08_24_Ch1: ; 20bdf (8:4bdf)
 	endchannel
 
 
-SFX_08_24_Ch2: ; 20c02 (8:4c02)
+SFX_Cry10_2_Ch2: ; 20c02 (8:4c02)
 	dutycycle 121
 	unknownsfx0x20 10, 231, 130, 6
 	unknownsfx0x20 2, 231, 98, 6
@@ -24,9 +24,8 @@ SFX_08_24_Ch2: ; 20c02 (8:4c02)
 	endchannel
 
 
-SFX_08_24_Ch3: ; 20c25 (8:4c25)
+SFX_Cry10_2_Ch3: ; 20c25 (8:4c25)
 	unknownnoise0x20 4, 116, 33
 	unknownnoise0x20 4, 116, 16
 	unknownnoise0x20 4, 113, 32
 	endchannel
-; 0x20c2f
diff --git a/audio/sfx/sfx_1f_24.asm b/audio/sfx/cry10_3.asm
index 55d6345c..2d5df465 100755..100644
--- a/audio/sfx/sfx_1f_24.asm
+++ b/audio/sfx/cry10_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_24_Ch1: ; 7c9ac (1f:49ac)
+SFX_Cry10_3_Ch1: ; 7c9ac (1f:49ac)
 	dutycycle 201
 	unknownsfx0x20 8, 247, 128, 6
 	unknownsfx0x20 2, 247, 96, 6
@@ -11,7 +11,7 @@ SFX_1f_24_Ch1: ; 7c9ac (1f:49ac)
 	endchannel
 
 
-SFX_1f_24_Ch2: ; 7c9cf (1f:49cf)
+SFX_Cry10_3_Ch2: ; 7c9cf (1f:49cf)
 	dutycycle 121
 	unknownsfx0x20 10, 231, 130, 6
 	unknownsfx0x20 2, 231, 98, 6
@@ -24,9 +24,8 @@ SFX_1f_24_Ch2: ; 7c9cf (1f:49cf)
 	endchannel
 
 
-SFX_1f_24_Ch3: ; 7c9f2 (1f:49f2)
+SFX_Cry10_3_Ch3: ; 7c9f2 (1f:49f2)
 	unknownnoise0x20 4, 116, 33
 	unknownnoise0x20 4, 116, 16
 	unknownnoise0x20 4, 113, 32
 	endchannel
-; 0x7c9fc
diff --git a/audio/sfx/sfx_02_25.asm b/audio/sfx/cry11_1.asm
index 97ed7c86..dd354c90 100755..100644
--- a/audio/sfx/sfx_02_25.asm
+++ b/audio/sfx/cry11_1.asm
@@ -1,4 +1,4 @@
-SFX_02_25_Ch1: ; 8813 (2:4813)
+SFX_Cry11_1_Ch1: ; 8813 (2:4813)
 	dutycycle 240
 	unknownsfx0x20 6, 247, 160, 7
 	unknownsfx0x20 8, 230, 164, 7
@@ -10,7 +10,7 @@ SFX_02_25_Ch1: ; 8813 (2:4813)
 	endchannel
 
 
-SFX_02_25_Ch2: ; 8832 (2:4832)
+SFX_Cry11_1_Ch2: ; 8832 (2:4832)
 	dutycycle 10
 	unknownsfx0x20 4, 8, 0, 0
 	unknownsfx0x20 6, 167, 65, 7
@@ -23,7 +23,7 @@ SFX_02_25_Ch2: ; 8832 (2:4832)
 	endchannel
 
 
-SFX_02_25_Ch3: ; 8855 (2:4855)
+SFX_Cry11_1_Ch3: ; 8855 (2:4855)
 	unknownnoise0x20 2, 242, 76
 	unknownnoise0x20 6, 230, 58
 	unknownnoise0x20 4, 215, 58
@@ -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_08_25.asm b/audio/sfx/cry11_2.asm
index b305664b..37546fe1 100755..100644
--- a/audio/sfx/sfx_08_25.asm
+++ b/audio/sfx/cry11_2.asm
@@ -1,4 +1,4 @@
-SFX_08_25_Ch1: ; 20abb (8:4abb)
+SFX_Cry11_2_Ch1: ; 20abb (8:4abb)
 	dutycycle 240
 	unknownsfx0x20 6, 247, 160, 7
 	unknownsfx0x20 8, 230, 164, 7
@@ -10,7 +10,7 @@ SFX_08_25_Ch1: ; 20abb (8:4abb)
 	endchannel
 
 
-SFX_08_25_Ch2: ; 20ada (8:4ada)
+SFX_Cry11_2_Ch2: ; 20ada (8:4ada)
 	dutycycle 10
 	unknownsfx0x20 4, 8, 0, 0
 	unknownsfx0x20 6, 167, 65, 7
@@ -23,7 +23,7 @@ SFX_08_25_Ch2: ; 20ada (8:4ada)
 	endchannel
 
 
-SFX_08_25_Ch3: ; 20afd (8:4afd)
+SFX_Cry11_2_Ch3: ; 20afd (8:4afd)
 	unknownnoise0x20 2, 242, 76
 	unknownnoise0x20 6, 230, 58
 	unknownnoise0x20 4, 215, 58
@@ -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_1f_25.asm b/audio/sfx/cry11_3.asm
index 15ea54a7..75b9a861 100755..100644
--- a/audio/sfx/sfx_1f_25.asm
+++ b/audio/sfx/cry11_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_25_Ch1: ; 7c888 (1f:4888)
+SFX_Cry11_3_Ch1: ; 7c888 (1f:4888)
 	dutycycle 240
 	unknownsfx0x20 6, 247, 160, 7
 	unknownsfx0x20 8, 230, 164, 7
@@ -10,7 +10,7 @@ SFX_1f_25_Ch1: ; 7c888 (1f:4888)
 	endchannel
 
 
-SFX_1f_25_Ch2: ; 7c8a7 (1f:48a7)
+SFX_Cry11_3_Ch2: ; 7c8a7 (1f:48a7)
 	dutycycle 10
 	unknownsfx0x20 4, 8, 0, 0
 	unknownsfx0x20 6, 167, 65, 7
@@ -23,7 +23,7 @@ SFX_1f_25_Ch2: ; 7c8a7 (1f:48a7)
 	endchannel
 
 
-SFX_1f_25_Ch3: ; 7c8ca (1f:48ca)
+SFX_Cry11_3_Ch3: ; 7c8ca (1f:48ca)
 	unknownnoise0x20 2, 242, 76
 	unknownnoise0x20 6, 230, 58
 	unknownnoise0x20 4, 215, 58
@@ -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_02_26.asm b/audio/sfx/cry12_1.asm
index 46f596d0..a6b1a0f8 100755..100644
--- a/audio/sfx/sfx_02_26.asm
+++ b/audio/sfx/cry12_1.asm
@@ -1,4 +1,4 @@
-SFX_02_26_Ch1: ; 8d2b (2:4d2b)
+SFX_Cry12_1_Ch1: ; 8d2b (2:4d2b)
 	dutycycle 165
 	unknownsfx0x20 12, 242, 64, 4
 	unknownsfx0x20 15, 227, 160, 4
@@ -7,7 +7,7 @@ SFX_02_26_Ch1: ; 8d2b (2:4d2b)
 	endchannel
 
 
-SFX_02_26_Ch2: ; 8d3e (2:4d3e)
+SFX_Cry12_1_Ch2: ; 8d3e (2:4d3e)
 	dutycycle 238
 	unknownsfx0x20 11, 210, 56, 4
 	unknownsfx0x20 14, 198, 152, 4
@@ -16,10 +16,9 @@ SFX_02_26_Ch2: ; 8d3e (2:4d3e)
 	endchannel
 
 
-SFX_02_26_Ch3: ; 8d51 (2:4d51)
+SFX_Cry12_1_Ch3: ; 8d51 (2:4d51)
 	unknownnoise0x20 10, 230, 108
 	unknownnoise0x20 15, 210, 92
 	unknownnoise0x20 3, 194, 108
 	unknownnoise0x20 8, 209, 92
 	endchannel
-; 0x8d5e
diff --git a/audio/sfx/sfx_08_26.asm b/audio/sfx/cry12_2.asm
index dd5f7897..e2b29de7 100755..100644
--- a/audio/sfx/sfx_08_26.asm
+++ b/audio/sfx/cry12_2.asm
@@ -1,4 +1,4 @@
-SFX_08_26_Ch1: ; 20fd3 (8:4fd3)
+SFX_Cry12_2_Ch1: ; 20fd3 (8:4fd3)
 	dutycycle 165
 	unknownsfx0x20 12, 242, 64, 4
 	unknownsfx0x20 15, 227, 160, 4
@@ -7,7 +7,7 @@ SFX_08_26_Ch1: ; 20fd3 (8:4fd3)
 	endchannel
 
 
-SFX_08_26_Ch2: ; 20fe6 (8:4fe6)
+SFX_Cry12_2_Ch2: ; 20fe6 (8:4fe6)
 	dutycycle 238
 	unknownsfx0x20 11, 210, 56, 4
 	unknownsfx0x20 14, 198, 152, 4
@@ -16,10 +16,9 @@ SFX_08_26_Ch2: ; 20fe6 (8:4fe6)
 	endchannel
 
 
-SFX_08_26_Ch3: ; 20ff9 (8:4ff9)
+SFX_Cry12_2_Ch3: ; 20ff9 (8:4ff9)
 	unknownnoise0x20 10, 230, 108
 	unknownnoise0x20 15, 210, 92
 	unknownnoise0x20 3, 194, 108
 	unknownnoise0x20 8, 209, 92
 	endchannel
-; 0x21006
diff --git a/audio/sfx/sfx_1f_26.asm b/audio/sfx/cry12_3.asm
index 488c9c32..143f8045 100755..100644
--- a/audio/sfx/sfx_1f_26.asm
+++ b/audio/sfx/cry12_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_26_Ch1: ; 7cda0 (1f:4da0)
+SFX_Cry12_3_Ch1: ; 7cda0 (1f:4da0)
 	dutycycle 165
 	unknownsfx0x20 12, 242, 64, 4
 	unknownsfx0x20 15, 227, 160, 4
@@ -7,7 +7,7 @@ SFX_1f_26_Ch1: ; 7cda0 (1f:4da0)
 	endchannel
 
 
-SFX_1f_26_Ch2: ; 7cdb3 (1f:4db3)
+SFX_Cry12_3_Ch2: ; 7cdb3 (1f:4db3)
 	dutycycle 238
 	unknownsfx0x20 11, 210, 56, 4
 	unknownsfx0x20 14, 198, 152, 4
@@ -16,10 +16,9 @@ SFX_1f_26_Ch2: ; 7cdb3 (1f:4db3)
 	endchannel
 
 
-SFX_1f_26_Ch3: ; 7cdc6 (1f:4dc6)
+SFX_Cry12_3_Ch3: ; 7cdc6 (1f:4dc6)
 	unknownnoise0x20 10, 230, 108
 	unknownnoise0x20 15, 210, 92
 	unknownnoise0x20 3, 194, 108
 	unknownnoise0x20 8, 209, 92
 	endchannel
-; 0x7cdd3
diff --git a/audio/sfx/sfx_02_27.asm b/audio/sfx/cry13_1.asm
index d25a4db9..c2f1002f 100755..100644
--- a/audio/sfx/sfx_02_27.asm
+++ b/audio/sfx/cry13_1.asm
@@ -1,4 +1,4 @@
-SFX_02_27_Ch1: ; 8d5e (2:4d5e)
+SFX_Cry13_1_Ch1: ; 8d5e (2:4d5e)
 	dutycycle 51
 	unknownsfx0x20 15, 246, 192, 5
 	unknownsfx0x20 8, 227, 188, 5
@@ -9,7 +9,7 @@ SFX_02_27_Ch1: ; 8d5e (2:4d5e)
 	endchannel
 
 
-SFX_02_27_Ch2: ; 8d79 (2:4d79)
+SFX_Cry13_1_Ch2: ; 8d79 (2:4d79)
 	dutycycle 153
 	unknownsfx0x20 14, 198, 177, 4
 	unknownsfx0x20 7, 195, 173, 4
@@ -20,7 +20,7 @@ SFX_02_27_Ch2: ; 8d79 (2:4d79)
 	endchannel
 
 
-SFX_02_27_Ch3: ; 8d94 (2:4d94)
+SFX_Cry13_1_Ch3: ; 8d94 (2:4d94)
 	unknownnoise0x20 10, 230, 92
 	unknownnoise0x20 10, 214, 108
 	unknownnoise0x20 4, 194, 76
@@ -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_08_27.asm b/audio/sfx/cry13_2.asm
index 044e1d6f..b072fb07 100755..100644
--- a/audio/sfx/sfx_08_27.asm
+++ b/audio/sfx/cry13_2.asm
@@ -1,4 +1,4 @@
-SFX_08_27_Ch1: ; 21006 (8:5006)
+SFX_Cry13_2_Ch1: ; 21006 (8:5006)
 	dutycycle 51
 	unknownsfx0x20 15, 246, 192, 5
 	unknownsfx0x20 8, 227, 188, 5
@@ -9,7 +9,7 @@ SFX_08_27_Ch1: ; 21006 (8:5006)
 	endchannel
 
 
-SFX_08_27_Ch2: ; 21021 (8:5021)
+SFX_Cry13_2_Ch2: ; 21021 (8:5021)
 	dutycycle 153
 	unknownsfx0x20 14, 198, 177, 4
 	unknownsfx0x20 7, 195, 173, 4
@@ -20,7 +20,7 @@ SFX_08_27_Ch2: ; 21021 (8:5021)
 	endchannel
 
 
-SFX_08_27_Ch3: ; 2103c (8:503c)
+SFX_Cry13_2_Ch3: ; 2103c (8:503c)
 	unknownnoise0x20 10, 230, 92
 	unknownnoise0x20 10, 214, 108
 	unknownnoise0x20 4, 194, 76
@@ -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_1f_27.asm b/audio/sfx/cry13_3.asm
index ade4b1ba..f2c110b8 100755..100644
--- a/audio/sfx/sfx_1f_27.asm
+++ b/audio/sfx/cry13_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_27_Ch1: ; 7cdd3 (1f:4dd3)
+SFX_Cry13_3_Ch1: ; 7cdd3 (1f:4dd3)
 	dutycycle 51
 	unknownsfx0x20 15, 246, 192, 5
 	unknownsfx0x20 8, 227, 188, 5
@@ -9,7 +9,7 @@ SFX_1f_27_Ch1: ; 7cdd3 (1f:4dd3)
 	endchannel
 
 
-SFX_1f_27_Ch2: ; 7cdee (1f:4dee)
+SFX_Cry13_3_Ch2: ; 7cdee (1f:4dee)
 	dutycycle 153
 	unknownsfx0x20 14, 198, 177, 4
 	unknownsfx0x20 7, 195, 173, 4
@@ -20,7 +20,7 @@ SFX_1f_27_Ch2: ; 7cdee (1f:4dee)
 	endchannel
 
 
-SFX_1f_27_Ch3: ; 7ce09 (1f:4e09)
+SFX_Cry13_3_Ch3: ; 7ce09 (1f:4e09)
 	unknownnoise0x20 10, 230, 92
 	unknownnoise0x20 10, 214, 108
 	unknownnoise0x20 4, 194, 76
@@ -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_02_28.asm b/audio/sfx/cry14_1.asm
index f4ed88b2..125fe86e 100755..100644
--- a/audio/sfx/sfx_02_28.asm
+++ b/audio/sfx/cry14_1.asm
@@ -1,4 +1,4 @@
-SFX_02_28_Ch1: ; 8da7 (2:4da7)
+SFX_Cry14_1_Ch1: ; 8da7 (2:4da7)
 	dutycycle 240
 	unknownsfx0x20 8, 228, 144, 7
 	unknownsfx0x20 15, 245, 192, 7
@@ -6,7 +6,7 @@ SFX_02_28_Ch1: ; 8da7 (2:4da7)
 	endchannel
 
 
-SFX_02_28_Ch2: ; 8db6 (2:4db6)
+SFX_Cry14_1_Ch2: ; 8db6 (2:4db6)
 	dutycycle 165
 	unknownsfx0x20 10, 196, 113, 7
 	unknownsfx0x20 15, 182, 162, 7
@@ -14,9 +14,8 @@ SFX_02_28_Ch2: ; 8db6 (2:4db6)
 	endchannel
 
 
-SFX_02_28_Ch3: ; 8dc5 (2:4dc5)
+SFX_Cry14_1_Ch3: ; 8dc5 (2:4dc5)
 	unknownnoise0x20 8, 228, 76
 	unknownnoise0x20 14, 196, 60
 	unknownnoise0x20 8, 209, 44
 	endchannel
-; 0x8dcf
diff --git a/audio/sfx/sfx_08_28.asm b/audio/sfx/cry14_2.asm
index c7f7e3a7..3ba2ac26 100755..100644
--- a/audio/sfx/sfx_08_28.asm
+++ b/audio/sfx/cry14_2.asm
@@ -1,4 +1,4 @@
-SFX_08_28_Ch1: ; 2104f (8:504f)
+SFX_Cry14_2_Ch1: ; 2104f (8:504f)
 	dutycycle 240
 	unknownsfx0x20 8, 228, 144, 7
 	unknownsfx0x20 15, 245, 192, 7
@@ -6,7 +6,7 @@ SFX_08_28_Ch1: ; 2104f (8:504f)
 	endchannel
 
 
-SFX_08_28_Ch2: ; 2105e (8:505e)
+SFX_Cry14_2_Ch2: ; 2105e (8:505e)
 	dutycycle 165
 	unknownsfx0x20 10, 196, 113, 7
 	unknownsfx0x20 15, 182, 162, 7
@@ -14,9 +14,8 @@ SFX_08_28_Ch2: ; 2105e (8:505e)
 	endchannel
 
 
-SFX_08_28_Ch3: ; 2106d (8:506d)
+SFX_Cry14_2_Ch3: ; 2106d (8:506d)
 	unknownnoise0x20 8, 228, 76
 	unknownnoise0x20 14, 196, 60
 	unknownnoise0x20 8, 209, 44
 	endchannel
-; 0x21077
diff --git a/audio/sfx/sfx_1f_28.asm b/audio/sfx/cry14_3.asm
index 5f24e7d9..fe2cd1e8 100755..100644
--- a/audio/sfx/sfx_1f_28.asm
+++ b/audio/sfx/cry14_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_28_Ch1: ; 7ce1c (1f:4e1c)
+SFX_Cry14_3_Ch1: ; 7ce1c (1f:4e1c)
 	dutycycle 240
 	unknownsfx0x20 8, 228, 144, 7
 	unknownsfx0x20 15, 245, 192, 7
@@ -6,7 +6,7 @@ SFX_1f_28_Ch1: ; 7ce1c (1f:4e1c)
 	endchannel
 
 
-SFX_1f_28_Ch2: ; 7ce2b (1f:4e2b)
+SFX_Cry14_3_Ch2: ; 7ce2b (1f:4e2b)
 	dutycycle 165
 	unknownsfx0x20 10, 196, 113, 7
 	unknownsfx0x20 15, 182, 162, 7
@@ -14,9 +14,8 @@ SFX_1f_28_Ch2: ; 7ce2b (1f:4e2b)
 	endchannel
 
 
-SFX_1f_28_Ch3: ; 7ce3a (1f:4e3a)
+SFX_Cry14_3_Ch3: ; 7ce3a (1f:4e3a)
 	unknownnoise0x20 8, 228, 76
 	unknownnoise0x20 14, 196, 60
 	unknownnoise0x20 8, 209, 44
 	endchannel
-; 0x7ce44
diff --git a/audio/sfx/sfx_02_29.asm b/audio/sfx/cry15_1.asm
index f0a86c6a..54f94deb 100755..100644
--- a/audio/sfx/sfx_02_29.asm
+++ b/audio/sfx/cry15_1.asm
@@ -1,4 +1,4 @@
-SFX_02_29_Ch1: ; 8e35 (2:4e35)
+SFX_Cry15_1_Ch1: ; 8e35 (2:4e35)
 	dutycycle 240
 	unknownsfx0x20 4, 243, 128, 7
 	unknownsfx0x20 15, 231, 0, 7
@@ -9,7 +9,7 @@ SFX_02_29_Ch1: ; 8e35 (2:4e35)
 	endchannel
 
 
-SFX_02_29_Ch2: ; 8e50 (2:4e50)
+SFX_Cry15_1_Ch2: ; 8e50 (2:4e50)
 	dutycycle 90
 	unknownsfx0x20 6, 195, 1, 7
 	unknownsfx0x20 14, 183, 129, 6
@@ -20,7 +20,7 @@ SFX_02_29_Ch2: ; 8e50 (2:4e50)
 	endchannel
 
 
-SFX_02_29_Ch3: ; 8e6b (2:4e6b)
+SFX_Cry15_1_Ch3: ; 8e6b (2:4e6b)
 	unknownnoise0x20 6, 227, 92
 	unknownnoise0x20 14, 214, 76
 	unknownnoise0x20 6, 198, 60
@@ -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_08_29.asm b/audio/sfx/cry15_2.asm
index 7149e4e1..14b1af72 100755..100644
--- a/audio/sfx/sfx_08_29.asm
+++ b/audio/sfx/cry15_2.asm
@@ -1,4 +1,4 @@
-SFX_08_29_Ch1: ; 210dd (8:50dd)
+SFX_Cry15_2_Ch1: ; 210dd (8:50dd)
 	dutycycle 240
 	unknownsfx0x20 4, 243, 128, 7
 	unknownsfx0x20 15, 231, 0, 7
@@ -9,7 +9,7 @@ SFX_08_29_Ch1: ; 210dd (8:50dd)
 	endchannel
 
 
-SFX_08_29_Ch2: ; 210f8 (8:50f8)
+SFX_Cry15_2_Ch2: ; 210f8 (8:50f8)
 	dutycycle 90
 	unknownsfx0x20 6, 195, 1, 7
 	unknownsfx0x20 14, 183, 129, 6
@@ -20,7 +20,7 @@ SFX_08_29_Ch2: ; 210f8 (8:50f8)
 	endchannel
 
 
-SFX_08_29_Ch3: ; 21113 (8:5113)
+SFX_Cry15_2_Ch3: ; 21113 (8:5113)
 	unknownnoise0x20 6, 227, 92
 	unknownnoise0x20 14, 214, 76
 	unknownnoise0x20 6, 198, 60
@@ -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_1f_29.asm b/audio/sfx/cry15_3.asm
index 3c15675b..36951439 100755..100644
--- a/audio/sfx/sfx_1f_29.asm
+++ b/audio/sfx/cry15_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_29_Ch1: ; 7ceaa (1f:4eaa)
+SFX_Cry15_3_Ch1: ; 7ceaa (1f:4eaa)
 	dutycycle 240
 	unknownsfx0x20 4, 243, 128, 7
 	unknownsfx0x20 15, 231, 0, 7
@@ -9,7 +9,7 @@ SFX_1f_29_Ch1: ; 7ceaa (1f:4eaa)
 	endchannel
 
 
-SFX_1f_29_Ch2: ; 7cec5 (1f:4ec5)
+SFX_Cry15_3_Ch2: ; 7cec5 (1f:4ec5)
 	dutycycle 90
 	unknownsfx0x20 6, 195, 1, 7
 	unknownsfx0x20 14, 183, 129, 6
@@ -20,7 +20,7 @@ SFX_1f_29_Ch2: ; 7cec5 (1f:4ec5)
 	endchannel
 
 
-SFX_1f_29_Ch3: ; 7cee0 (1f:4ee0)
+SFX_Cry15_3_Ch3: ; 7cee0 (1f:4ee0)
 	unknownnoise0x20 6, 227, 92
 	unknownnoise0x20 14, 214, 76
 	unknownnoise0x20 6, 198, 60
@@ -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_02_2a.asm b/audio/sfx/cry16_1.asm
index 70778f03..91fa2596 100755..100644
--- a/audio/sfx/sfx_02_2a.asm
+++ b/audio/sfx/cry16_1.asm
@@ -1,4 +1,4 @@
-SFX_02_2a_Ch1: ; 8cc8 (2:4cc8)
+SFX_Cry16_1_Ch1: ; 8cc8 (2:4cc8)
 	dutycycle 240
 	unknownsfx0x20 15, 215, 128, 7
 	unknownsfx0x20 4, 230, 160, 7
@@ -6,7 +6,7 @@ SFX_02_2a_Ch1: ; 8cc8 (2:4cc8)
 	endchannel
 
 
-SFX_02_2a_Ch2: ; 8cd7 (2:4cd7)
+SFX_Cry16_1_Ch2: ; 8cd7 (2:4cd7)
 	dutycycle 90
 	unknownsfx0x20 15, 199, 83, 7
 	unknownsfx0x20 5, 182, 114, 7
@@ -14,9 +14,8 @@ SFX_02_2a_Ch2: ; 8cd7 (2:4cd7)
 	endchannel
 
 
-SFX_02_2a_Ch3: ; 8ce6 (2:4ce6)
+SFX_Cry16_1_Ch3: ; 8ce6 (2:4ce6)
 	unknownnoise0x20 13, 246, 76
 	unknownnoise0x20 4, 230, 60
 	unknownnoise0x20 15, 242, 76
 	endchannel
-; 0x8cf0
diff --git a/audio/sfx/sfx_08_2a.asm b/audio/sfx/cry16_2.asm
index a2b247ef..5e29eba8 100755..100644
--- a/audio/sfx/sfx_08_2a.asm
+++ b/audio/sfx/cry16_2.asm
@@ -1,4 +1,4 @@
-SFX_08_2a_Ch1: ; 20f70 (8:4f70)
+SFX_Cry16_2_Ch1: ; 20f70 (8:4f70)
 	dutycycle 240
 	unknownsfx0x20 15, 215, 128, 7
 	unknownsfx0x20 4, 230, 160, 7
@@ -6,7 +6,7 @@ SFX_08_2a_Ch1: ; 20f70 (8:4f70)
 	endchannel
 
 
-SFX_08_2a_Ch2: ; 20f7f (8:4f7f)
+SFX_Cry16_2_Ch2: ; 20f7f (8:4f7f)
 	dutycycle 90
 	unknownsfx0x20 15, 199, 83, 7
 	unknownsfx0x20 5, 182, 114, 7
@@ -14,9 +14,8 @@ SFX_08_2a_Ch2: ; 20f7f (8:4f7f)
 	endchannel
 
 
-SFX_08_2a_Ch3: ; 20f8e (8:4f8e)
+SFX_Cry16_2_Ch3: ; 20f8e (8:4f8e)
 	unknownnoise0x20 13, 246, 76
 	unknownnoise0x20 4, 230, 60
 	unknownnoise0x20 15, 242, 76
 	endchannel
-; 0x20f98
diff --git a/audio/sfx/sfx_1f_2a.asm b/audio/sfx/cry16_3.asm
index 36f0ccd5..af32e9ef 100755..100644
--- a/audio/sfx/sfx_1f_2a.asm
+++ b/audio/sfx/cry16_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_2a_Ch1: ; 7cd3d (1f:4d3d)
+SFX_Cry16_3_Ch1: ; 7cd3d (1f:4d3d)
 	dutycycle 240
 	unknownsfx0x20 15, 215, 128, 7
 	unknownsfx0x20 4, 230, 160, 7
@@ -6,7 +6,7 @@ SFX_1f_2a_Ch1: ; 7cd3d (1f:4d3d)
 	endchannel
 
 
-SFX_1f_2a_Ch2: ; 7cd4c (1f:4d4c)
+SFX_Cry16_3_Ch2: ; 7cd4c (1f:4d4c)
 	dutycycle 90
 	unknownsfx0x20 15, 199, 83, 7
 	unknownsfx0x20 5, 182, 114, 7
@@ -14,9 +14,8 @@ SFX_1f_2a_Ch2: ; 7cd4c (1f:4d4c)
 	endchannel
 
 
-SFX_1f_2a_Ch3: ; 7cd5b (1f:4d5b)
+SFX_Cry16_3_Ch3: ; 7cd5b (1f:4d5b)
 	unknownnoise0x20 13, 246, 76
 	unknownnoise0x20 4, 230, 60
 	unknownnoise0x20 15, 242, 76
 	endchannel
-; 0x7cd65
diff --git a/audio/sfx/sfx_02_2b.asm b/audio/sfx/cry17_1.asm
index dfc4d66d..2f2cde11 100755..100644
--- a/audio/sfx/sfx_02_2b.asm
+++ b/audio/sfx/cry17_1.asm
@@ -1,4 +1,4 @@
-SFX_02_2b_Ch1: ; 8e7e (2:4e7e)
+SFX_Cry17_1_Ch1: ; 8e7e (2:4e7e)
 	dutycycle 15
 	unknownsfx0x20 15, 247, 0, 5
 	unknownsfx0x20 15, 231, 8, 5
@@ -7,7 +7,7 @@ SFX_02_2b_Ch1: ; 8e7e (2:4e7e)
 	endchannel
 
 
-SFX_02_2b_Ch2: ; 8e91 (2:4e91)
+SFX_Cry17_1_Ch2: ; 8e91 (2:4e91)
 	dutycycle 68
 	unknownsfx0x20 14, 215, 129, 4
 	unknownsfx0x20 14, 199, 137, 4
@@ -16,10 +16,9 @@ SFX_02_2b_Ch2: ; 8e91 (2:4e91)
 	endchannel
 
 
-SFX_02_2b_Ch3: ; 8ea4 (2:4ea4)
+SFX_Cry17_1_Ch3: ; 8ea4 (2:4ea4)
 	unknownnoise0x20 14, 247, 124
 	unknownnoise0x20 12, 246, 108
 	unknownnoise0x20 9, 228, 124
 	unknownnoise0x20 15, 226, 108
 	endchannel
-; 0x8eb1
diff --git a/audio/sfx/sfx_08_2b.asm b/audio/sfx/cry17_2.asm
index 36411656..cca78ae2 100755..100644
--- a/audio/sfx/sfx_08_2b.asm
+++ b/audio/sfx/cry17_2.asm
@@ -1,4 +1,4 @@
-SFX_08_2b_Ch1: ; 21126 (8:5126)
+SFX_Cry17_2_Ch1: ; 21126 (8:5126)
 	dutycycle 15
 	unknownsfx0x20 15, 247, 0, 5
 	unknownsfx0x20 15, 231, 8, 5
@@ -7,7 +7,7 @@ SFX_08_2b_Ch1: ; 21126 (8:5126)
 	endchannel
 
 
-SFX_08_2b_Ch2: ; 21139 (8:5139)
+SFX_Cry17_2_Ch2: ; 21139 (8:5139)
 	dutycycle 68
 	unknownsfx0x20 14, 215, 129, 4
 	unknownsfx0x20 14, 199, 137, 4
@@ -16,10 +16,9 @@ SFX_08_2b_Ch2: ; 21139 (8:5139)
 	endchannel
 
 
-SFX_08_2b_Ch3: ; 2114c (8:514c)
+SFX_Cry17_2_Ch3: ; 2114c (8:514c)
 	unknownnoise0x20 14, 247, 124
 	unknownnoise0x20 12, 246, 108
 	unknownnoise0x20 9, 228, 124
 	unknownnoise0x20 15, 226, 108
 	endchannel
-; 0x21159
diff --git a/audio/sfx/sfx_1f_2b.asm b/audio/sfx/cry17_3.asm
index 859969eb..6aad35d0 100755..100644
--- a/audio/sfx/sfx_1f_2b.asm
+++ b/audio/sfx/cry17_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_2b_Ch1: ; 7cef3 (1f:4ef3)
+SFX_Cry17_3_Ch1: ; 7cef3 (1f:4ef3)
 	dutycycle 15
 	unknownsfx0x20 15, 247, 0, 5
 	unknownsfx0x20 15, 231, 8, 5
@@ -7,7 +7,7 @@ SFX_1f_2b_Ch1: ; 7cef3 (1f:4ef3)
 	endchannel
 
 
-SFX_1f_2b_Ch2: ; 7cf06 (1f:4f06)
+SFX_Cry17_3_Ch2: ; 7cf06 (1f:4f06)
 	dutycycle 68
 	unknownsfx0x20 14, 215, 129, 4
 	unknownsfx0x20 14, 199, 137, 4
@@ -16,10 +16,9 @@ SFX_1f_2b_Ch2: ; 7cf06 (1f:4f06)
 	endchannel
 
 
-SFX_1f_2b_Ch3: ; 7cf19 (1f:4f19)
+SFX_Cry17_3_Ch3: ; 7cf19 (1f:4f19)
 	unknownnoise0x20 14, 247, 124
 	unknownnoise0x20 12, 246, 108
 	unknownnoise0x20 9, 228, 124
 	unknownnoise0x20 15, 226, 108
 	endchannel
-; 0x7cf26
diff --git a/audio/sfx/sfx_02_2c.asm b/audio/sfx/cry18_1.asm
index 642d5fd5..576ea693 100755..100644
--- a/audio/sfx/sfx_02_2c.asm
+++ b/audio/sfx/cry18_1.asm
@@ -1,4 +1,4 @@
-SFX_02_2c_Ch1: ; 8f8e (2:4f8e)
+SFX_Cry18_1_Ch1: ; 8f8e (2:4f8e)
 	dutycycle 80
 	unknownsfx0x20 10, 245, 128, 6
 	unknownsfx0x20 3, 226, 160, 6
@@ -11,7 +11,7 @@ SFX_02_2c_Ch1: ; 8f8e (2:4f8e)
 	endchannel
 
 
-SFX_02_2c_Ch2: ; 8fb1 (2:4fb1)
+SFX_Cry18_1_Ch2: ; 8fb1 (2:4fb1)
 	dutycycle 15
 	unknownsfx0x20 9, 213, 49, 6
 	unknownsfx0x20 3, 210, 82, 6
@@ -24,7 +24,7 @@ SFX_02_2c_Ch2: ; 8fb1 (2:4fb1)
 	endchannel
 
 
-SFX_02_2c_Ch3: ; 8fd4 (2:4fd4)
+SFX_Cry18_1_Ch3: ; 8fd4 (2:4fd4)
 	unknownnoise0x20 6, 227, 76
 	unknownnoise0x20 4, 195, 60
 	unknownnoise0x20 5, 212, 60
@@ -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_08_2c.asm b/audio/sfx/cry18_2.asm
index 5c7d9541..333ddb9e 100755..100644
--- a/audio/sfx/sfx_08_2c.asm
+++ b/audio/sfx/cry18_2.asm
@@ -1,4 +1,4 @@
-SFX_08_2c_Ch1: ; 21236 (8:5236)
+SFX_Cry18_2_Ch1: ; 21236 (8:5236)
 	dutycycle 80
 	unknownsfx0x20 10, 245, 128, 6
 	unknownsfx0x20 3, 226, 160, 6
@@ -11,7 +11,7 @@ SFX_08_2c_Ch1: ; 21236 (8:5236)
 	endchannel
 
 
-SFX_08_2c_Ch2: ; 21259 (8:5259)
+SFX_Cry18_2_Ch2: ; 21259 (8:5259)
 	dutycycle 15
 	unknownsfx0x20 9, 213, 49, 6
 	unknownsfx0x20 3, 210, 82, 6
@@ -24,7 +24,7 @@ SFX_08_2c_Ch2: ; 21259 (8:5259)
 	endchannel
 
 
-SFX_08_2c_Ch3: ; 2127c (8:527c)
+SFX_Cry18_2_Ch3: ; 2127c (8:527c)
 	unknownnoise0x20 6, 227, 76
 	unknownnoise0x20 4, 195, 60
 	unknownnoise0x20 5, 212, 60
@@ -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_1f_2c.asm b/audio/sfx/cry18_3.asm
index bdbcad46..3c7b1a99 100755..100644
--- a/audio/sfx/sfx_1f_2c.asm
+++ b/audio/sfx/cry18_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_2c_Ch1: ; 7d003 (1f:5003)
+SFX_Cry18_3_Ch1: ; 7d003 (1f:5003)
 	dutycycle 80
 	unknownsfx0x20 10, 245, 128, 6
 	unknownsfx0x20 3, 226, 160, 6
@@ -11,7 +11,7 @@ SFX_1f_2c_Ch1: ; 7d003 (1f:5003)
 	endchannel
 
 
-SFX_1f_2c_Ch2: ; 7d026 (1f:5026)
+SFX_Cry18_3_Ch2: ; 7d026 (1f:5026)
 	dutycycle 15
 	unknownsfx0x20 9, 213, 49, 6
 	unknownsfx0x20 3, 210, 82, 6
@@ -24,7 +24,7 @@ SFX_1f_2c_Ch2: ; 7d026 (1f:5026)
 	endchannel
 
 
-SFX_1f_2c_Ch3: ; 7d049 (1f:5049)
+SFX_Cry18_3_Ch3: ; 7d049 (1f:5049)
 	unknownnoise0x20 6, 227, 76
 	unknownnoise0x20 4, 195, 60
 	unknownnoise0x20 5, 212, 60
@@ -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_02_2d.asm b/audio/sfx/cry19_1.asm
index 4c42b231..94607b9b 100755..100644
--- a/audio/sfx/sfx_02_2d.asm
+++ b/audio/sfx/cry19_1.asm
@@ -1,4 +1,4 @@
-SFX_02_2d_Ch1: ; 8ca6 (2:4ca6)
+SFX_Cry19_1_Ch1: ; 8ca6 (2:4ca6)
 	dutycycle 27
 	unknownsfx0x20 7, 210, 64, 7
 	unknownsfx0x20 15, 229, 96, 7
@@ -6,7 +6,7 @@ SFX_02_2d_Ch1: ; 8ca6 (2:4ca6)
 	endchannel
 
 
-SFX_02_2d_Ch2: ; 8cb5 (2:4cb5)
+SFX_Cry19_1_Ch2: ; 8cb5 (2:4cb5)
 	dutycycle 129
 	unknownsfx0x20 2, 194, 1, 7
 	unknownsfx0x20 4, 194, 8, 7
@@ -14,6 +14,5 @@ SFX_02_2d_Ch2: ; 8cb5 (2:4cb5)
 	unknownsfx0x20 15, 162, 1, 7
 
 
-SFX_02_2d_Ch3: ; 8cc7 (2:4cc7)
+SFX_Cry19_1_Ch3: ; 8cc7 (2:4cc7)
 	endchannel
-; 0x8cc8
diff --git a/audio/sfx/sfx_08_2d.asm b/audio/sfx/cry19_2.asm
index 44033318..717a5d2b 100755..100644
--- a/audio/sfx/sfx_08_2d.asm
+++ b/audio/sfx/cry19_2.asm
@@ -1,4 +1,4 @@
-SFX_08_2d_Ch1: ; 20f4e (8:4f4e)
+SFX_Cry19_2_Ch1: ; 20f4e (8:4f4e)
 	dutycycle 27
 	unknownsfx0x20 7, 210, 64, 7
 	unknownsfx0x20 15, 229, 96, 7
@@ -6,7 +6,7 @@ SFX_08_2d_Ch1: ; 20f4e (8:4f4e)
 	endchannel
 
 
-SFX_08_2d_Ch2: ; 20f5d (8:4f5d)
+SFX_Cry19_2_Ch2: ; 20f5d (8:4f5d)
 	dutycycle 129
 	unknownsfx0x20 2, 194, 1, 7
 	unknownsfx0x20 4, 194, 8, 7
@@ -14,6 +14,5 @@ SFX_08_2d_Ch2: ; 20f5d (8:4f5d)
 	unknownsfx0x20 15, 162, 1, 7
 
 
-SFX_08_2d_Ch3: ; 20f6f (8:4f6f)
+SFX_Cry19_2_Ch3: ; 20f6f (8:4f6f)
 	endchannel
-; 0x20f70
diff --git a/audio/sfx/sfx_1f_2d.asm b/audio/sfx/cry19_3.asm
index 8ba33430..535be2b6 100755..100644
--- a/audio/sfx/sfx_1f_2d.asm
+++ b/audio/sfx/cry19_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_2d_Ch1: ; 7cd1b (1f:4d1b)
+SFX_Cry19_3_Ch1: ; 7cd1b (1f:4d1b)
 	dutycycle 27
 	unknownsfx0x20 7, 210, 64, 7
 	unknownsfx0x20 15, 229, 96, 7
@@ -6,7 +6,7 @@ SFX_1f_2d_Ch1: ; 7cd1b (1f:4d1b)
 	endchannel
 
 
-SFX_1f_2d_Ch2: ; 7cd2a (1f:4d2a)
+SFX_Cry19_3_Ch2: ; 7cd2a (1f:4d2a)
 	dutycycle 129
 	unknownsfx0x20 2, 194, 1, 7
 	unknownsfx0x20 4, 194, 8, 7
@@ -14,6 +14,5 @@ SFX_1f_2d_Ch2: ; 7cd2a (1f:4d2a)
 	unknownsfx0x20 15, 162, 1, 7
 
 
-SFX_1f_2d_Ch3: ; 7cd3c (1f:4d3c)
+SFX_Cry19_3_Ch3: ; 7cd3c (1f:4d3c)
 	endchannel
-; 0x7cd3d
diff --git a/audio/sfx/sfx_02_2e.asm b/audio/sfx/cry1a_1.asm
index a39964c8..0217deef 100755..100644
--- a/audio/sfx/sfx_02_2e.asm
+++ b/audio/sfx/cry1a_1.asm
@@ -1,4 +1,4 @@
-SFX_02_2e_Ch1: ; 8eff (2:4eff)
+SFX_Cry1A_1_Ch1: ; 8eff (2:4eff)
 	dutycycle 240
 	unknownsfx0x20 6, 247, 64, 7
 	unknownsfx0x20 12, 230, 68, 7
@@ -9,7 +9,7 @@ SFX_02_2e_Ch1: ; 8eff (2:4eff)
 	endchannel
 
 
-SFX_02_2e_Ch2: ; 8f1a (2:4f1a)
+SFX_Cry1A_1_Ch2: ; 8f1a (2:4f1a)
 	dutycycle 10
 	unknownsfx0x20 6, 199, 1, 7
 	unknownsfx0x20 11, 182, 2, 7
@@ -20,7 +20,7 @@ SFX_02_2e_Ch2: ; 8f1a (2:4f1a)
 	endchannel
 
 
-SFX_02_2e_Ch3: ; 8f35 (2:4f35)
+SFX_Cry1A_1_Ch3: ; 8f35 (2:4f35)
 	unknownnoise0x20 3, 226, 60
 	unknownnoise0x20 8, 214, 76
 	unknownnoise0x20 5, 212, 60
@@ -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_08_2e.asm b/audio/sfx/cry1a_2.asm
index 617d3b8b..c94fc657 100755..100644
--- a/audio/sfx/sfx_08_2e.asm
+++ b/audio/sfx/cry1a_2.asm
@@ -1,4 +1,4 @@
-SFX_08_2e_Ch1: ; 211a7 (8:51a7)
+SFX_Cry1A_2_Ch1: ; 211a7 (8:51a7)
 	dutycycle 240
 	unknownsfx0x20 6, 247, 64, 7
 	unknownsfx0x20 12, 230, 68, 7
@@ -9,7 +9,7 @@ SFX_08_2e_Ch1: ; 211a7 (8:51a7)
 	endchannel
 
 
-SFX_08_2e_Ch2: ; 211c2 (8:51c2)
+SFX_Cry1A_2_Ch2: ; 211c2 (8:51c2)
 	dutycycle 10
 	unknownsfx0x20 6, 199, 1, 7
 	unknownsfx0x20 11, 182, 2, 7
@@ -20,7 +20,7 @@ SFX_08_2e_Ch2: ; 211c2 (8:51c2)
 	endchannel
 
 
-SFX_08_2e_Ch3: ; 211dd (8:51dd)
+SFX_Cry1A_2_Ch3: ; 211dd (8:51dd)
 	unknownnoise0x20 3, 226, 60
 	unknownnoise0x20 8, 214, 76
 	unknownnoise0x20 5, 212, 60
@@ -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_1f_2e.asm b/audio/sfx/cry1a_3.asm
index 8c76ae07..29ff2ec0 100755..100644
--- a/audio/sfx/sfx_1f_2e.asm
+++ b/audio/sfx/cry1a_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_2e_Ch1: ; 7cf74 (1f:4f74)
+SFX_Cry1A_3_Ch1: ; 7cf74 (1f:4f74)
 	dutycycle 240
 	unknownsfx0x20 6, 247, 64, 7
 	unknownsfx0x20 12, 230, 68, 7
@@ -9,7 +9,7 @@ SFX_1f_2e_Ch1: ; 7cf74 (1f:4f74)
 	endchannel
 
 
-SFX_1f_2e_Ch2: ; 7cf8f (1f:4f8f)
+SFX_Cry1A_3_Ch2: ; 7cf8f (1f:4f8f)
 	dutycycle 10
 	unknownsfx0x20 6, 199, 1, 7
 	unknownsfx0x20 11, 182, 2, 7
@@ -20,7 +20,7 @@ SFX_1f_2e_Ch2: ; 7cf8f (1f:4f8f)
 	endchannel
 
 
-SFX_1f_2e_Ch3: ; 7cfaa (1f:4faa)
+SFX_Cry1A_3_Ch3: ; 7cfaa (1f:4faa)
 	unknownnoise0x20 3, 226, 60
 	unknownnoise0x20 8, 214, 76
 	unknownnoise0x20 5, 212, 60
@@ -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_02_2f.asm b/audio/sfx/cry1b_1.asm
index 3594ebd1..858d724a 100755..100644
--- a/audio/sfx/sfx_02_2f.asm
+++ b/audio/sfx/cry1b_1.asm
@@ -1,4 +1,4 @@
-SFX_02_2f_Ch1: ; 8cf0 (2:4cf0)
+SFX_Cry1B_1_Ch1: ; 8cf0 (2:4cf0)
 	dutycycle 240
 	unknownsfx0x20 6, 247, 192, 6
 	unknownsfx0x20 15, 231, 0, 7
@@ -8,7 +8,7 @@ SFX_02_2f_Ch1: ; 8cf0 (2:4cf0)
 	endchannel
 
 
-SFX_02_2f_Ch2: ; 8d07 (2:4d07)
+SFX_Cry1B_1_Ch2: ; 8d07 (2:4d07)
 	dutycycle 10
 	unknownsfx0x20 7, 230, 129, 6
 	unknownsfx0x20 14, 213, 193, 6
@@ -18,10 +18,9 @@ SFX_02_2f_Ch2: ; 8d07 (2:4d07)
 	endchannel
 
 
-SFX_02_2f_Ch3: ; 8d1e (2:4d1e)
+SFX_Cry1B_1_Ch3: ; 8d1e (2:4d1e)
 	unknownnoise0x20 10, 166, 60
 	unknownnoise0x20 14, 148, 44
 	unknownnoise0x20 5, 163, 60
 	unknownnoise0x20 8, 145, 44
 	endchannel
-; 0x8d2b
diff --git a/audio/sfx/sfx_08_2f.asm b/audio/sfx/cry1b_2.asm
index 5d786f9c..423258ee 100755..100644
--- a/audio/sfx/sfx_08_2f.asm
+++ b/audio/sfx/cry1b_2.asm
@@ -1,4 +1,4 @@
-SFX_08_2f_Ch1: ; 20f98 (8:4f98)
+SFX_Cry1B_2_Ch1: ; 20f98 (8:4f98)
 	dutycycle 240
 	unknownsfx0x20 6, 247, 192, 6
 	unknownsfx0x20 15, 231, 0, 7
@@ -8,7 +8,7 @@ SFX_08_2f_Ch1: ; 20f98 (8:4f98)
 	endchannel
 
 
-SFX_08_2f_Ch2: ; 20faf (8:4faf)
+SFX_Cry1B_2_Ch2: ; 20faf (8:4faf)
 	dutycycle 10
 	unknownsfx0x20 7, 230, 129, 6
 	unknownsfx0x20 14, 213, 193, 6
@@ -18,10 +18,9 @@ SFX_08_2f_Ch2: ; 20faf (8:4faf)
 	endchannel
 
 
-SFX_08_2f_Ch3: ; 20fc6 (8:4fc6)
+SFX_Cry1B_2_Ch3: ; 20fc6 (8:4fc6)
 	unknownnoise0x20 10, 166, 60
 	unknownnoise0x20 14, 148, 44
 	unknownnoise0x20 5, 163, 60
 	unknownnoise0x20 8, 145, 44
 	endchannel
-; 0x20fd3
diff --git a/audio/sfx/sfx_1f_2f.asm b/audio/sfx/cry1b_3.asm
index dbefbf62..7fe6019f 100755..100644
--- a/audio/sfx/sfx_1f_2f.asm
+++ b/audio/sfx/cry1b_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_2f_Ch1: ; 7cd65 (1f:4d65)
+SFX_Cry1B_3_Ch1: ; 7cd65 (1f:4d65)
 	dutycycle 240
 	unknownsfx0x20 6, 247, 192, 6
 	unknownsfx0x20 15, 231, 0, 7
@@ -8,7 +8,7 @@ SFX_1f_2f_Ch1: ; 7cd65 (1f:4d65)
 	endchannel
 
 
-SFX_1f_2f_Ch2: ; 7cd7c (1f:4d7c)
+SFX_Cry1B_3_Ch2: ; 7cd7c (1f:4d7c)
 	dutycycle 10
 	unknownsfx0x20 7, 230, 129, 6
 	unknownsfx0x20 14, 213, 193, 6
@@ -18,10 +18,9 @@ SFX_1f_2f_Ch2: ; 7cd7c (1f:4d7c)
 	endchannel
 
 
-SFX_1f_2f_Ch3: ; 7cd93 (1f:4d93)
+SFX_Cry1B_3_Ch3: ; 7cd93 (1f:4d93)
 	unknownnoise0x20 10, 166, 60
 	unknownnoise0x20 14, 148, 44
 	unknownnoise0x20 5, 163, 60
 	unknownnoise0x20 8, 145, 44
 	endchannel
-; 0x7cda0
diff --git a/audio/sfx/sfx_02_30.asm b/audio/sfx/cry1c_1.asm
index c94fbbbc..f7e66dfb 100755..100644
--- a/audio/sfx/sfx_02_30.asm
+++ b/audio/sfx/cry1c_1.asm
@@ -1,4 +1,4 @@
-SFX_02_30_Ch1: ; 8eb1 (2:4eb1)
+SFX_Cry1C_1_Ch1: ; 8eb1 (2:4eb1)
 	dutycycle 245
 	unknownsfx0x20 7, 214, 225, 7
 	unknownsfx0x20 6, 198, 226, 7
@@ -11,7 +11,7 @@ SFX_02_30_Ch1: ; 8eb1 (2:4eb1)
 	endchannel
 
 
-SFX_02_30_Ch2: ; 8ed4 (2:4ed4)
+SFX_Cry1C_1_Ch2: ; 8ed4 (2:4ed4)
 	dutycycle 68
 	unknownsfx0x20 6, 195, 201, 7
 	unknownsfx0x20 6, 179, 199, 7
@@ -22,11 +22,10 @@ SFX_02_30_Ch2: ; 8ed4 (2:4ed4)
 	endchannel
 
 
-SFX_02_30_Ch3: ; 8eef (2:4eef)
+SFX_Cry1C_1_Ch3: ; 8eef (2:4eef)
 	unknownnoise0x20 13, 25, 124
 	unknownnoise0x20 13, 247, 140
 	unknownnoise0x20 12, 214, 124
 	unknownnoise0x20 8, 196, 108
 	unknownnoise0x20 15, 179, 92
 	endchannel
-; 0x8eff
diff --git a/audio/sfx/sfx_08_30.asm b/audio/sfx/cry1c_2.asm
index 8877a00f..8037fc96 100755..100644
--- a/audio/sfx/sfx_08_30.asm
+++ b/audio/sfx/cry1c_2.asm
@@ -1,4 +1,4 @@
-SFX_08_30_Ch1: ; 21159 (8:5159)
+SFX_Cry1C_2_Ch1: ; 21159 (8:5159)
 	dutycycle 245
 	unknownsfx0x20 7, 214, 225, 7
 	unknownsfx0x20 6, 198, 226, 7
@@ -11,7 +11,7 @@ SFX_08_30_Ch1: ; 21159 (8:5159)
 	endchannel
 
 
-SFX_08_30_Ch2: ; 2117c (8:517c)
+SFX_Cry1C_2_Ch2: ; 2117c (8:517c)
 	dutycycle 68
 	unknownsfx0x20 6, 195, 201, 7
 	unknownsfx0x20 6, 179, 199, 7
@@ -22,11 +22,10 @@ SFX_08_30_Ch2: ; 2117c (8:517c)
 	endchannel
 
 
-SFX_08_30_Ch3: ; 21197 (8:5197)
+SFX_Cry1C_2_Ch3: ; 21197 (8:5197)
 	unknownnoise0x20 13, 25, 124
 	unknownnoise0x20 13, 247, 140
 	unknownnoise0x20 12, 214, 124
 	unknownnoise0x20 8, 196, 108
 	unknownnoise0x20 15, 179, 92
 	endchannel
-; 0x211a7
diff --git a/audio/sfx/sfx_1f_30.asm b/audio/sfx/cry1c_3.asm
index 89447832..853eb1c6 100755..100644
--- a/audio/sfx/sfx_1f_30.asm
+++ b/audio/sfx/cry1c_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_30_Ch1: ; 7cf26 (1f:4f26)
+SFX_Cry1C_3_Ch1: ; 7cf26 (1f:4f26)
 	dutycycle 245
 	unknownsfx0x20 7, 214, 225, 7
 	unknownsfx0x20 6, 198, 226, 7
@@ -11,7 +11,7 @@ SFX_1f_30_Ch1: ; 7cf26 (1f:4f26)
 	endchannel
 
 
-SFX_1f_30_Ch2: ; 7cf49 (1f:4f49)
+SFX_Cry1C_3_Ch2: ; 7cf49 (1f:4f49)
 	dutycycle 68
 	unknownsfx0x20 6, 195, 201, 7
 	unknownsfx0x20 6, 179, 199, 7
@@ -22,11 +22,10 @@ SFX_1f_30_Ch2: ; 7cf49 (1f:4f49)
 	endchannel
 
 
-SFX_1f_30_Ch3: ; 7cf64 (1f:4f64)
+SFX_Cry1C_3_Ch3: ; 7cf64 (1f:4f64)
 	unknownnoise0x20 13, 25, 124
 	unknownnoise0x20 13, 247, 140
 	unknownnoise0x20 12, 214, 124
 	unknownnoise0x20 8, 196, 108
 	unknownnoise0x20 15, 179, 92
 	endchannel
-; 0x7cf74
diff --git a/audio/sfx/sfx_02_31.asm b/audio/sfx/cry1d_1.asm
index 543aeea9..6e2818c1 100755..100644
--- a/audio/sfx/sfx_02_31.asm
+++ b/audio/sfx/cry1d_1.asm
@@ -1,4 +1,4 @@
-SFX_02_31_Ch1: ; 8f48 (2:4f48)
+SFX_Cry1D_1_Ch1: ; 8f48 (2:4f48)
 	dutycycle 244
 	unknownsfx0x20 15, 240, 5, 7
 	unknownsfx0x20 10, 224, 0, 7
@@ -9,7 +9,7 @@ SFX_02_31_Ch1: ; 8f48 (2:4f48)
 	endchannel
 
 
-SFX_02_31_Ch2: ; 8f63 (2:4f63)
+SFX_Cry1D_1_Ch2: ; 8f63 (2:4f63)
 	dutycycle 34
 	unknownsfx0x20 15, 176, 195, 6
 	unknownsfx0x20 10, 160, 193, 6
@@ -20,11 +20,10 @@ SFX_02_31_Ch2: ; 8f63 (2:4f63)
 	endchannel
 
 
-SFX_02_31_Ch3: ; 8f7e (2:4f7e)
+SFX_Cry1D_1_Ch3: ; 8f7e (2:4f7e)
 	unknownnoise0x20 6, 230, 76
 	unknownnoise0x20 15, 214, 60
 	unknownnoise0x20 10, 197, 74
 	unknownnoise0x20 1, 178, 91
 	unknownnoise0x20 15, 194, 76
 	endchannel
-; 0x8f8e
diff --git a/audio/sfx/sfx_08_31.asm b/audio/sfx/cry1d_2.asm
index 5afe29c7..c7a2c512 100755..100644
--- a/audio/sfx/sfx_08_31.asm
+++ b/audio/sfx/cry1d_2.asm
@@ -1,4 +1,4 @@
-SFX_08_31_Ch1: ; 211f0 (8:51f0)
+SFX_Cry1D_2_Ch1: ; 211f0 (8:51f0)
 	dutycycle 244
 	unknownsfx0x20 15, 240, 5, 7
 	unknownsfx0x20 10, 224, 0, 7
@@ -9,7 +9,7 @@ SFX_08_31_Ch1: ; 211f0 (8:51f0)
 	endchannel
 
 
-SFX_08_31_Ch2: ; 2120b (8:520b)
+SFX_Cry1D_2_Ch2: ; 2120b (8:520b)
 	dutycycle 34
 	unknownsfx0x20 15, 176, 195, 6
 	unknownsfx0x20 10, 160, 193, 6
@@ -20,11 +20,10 @@ SFX_08_31_Ch2: ; 2120b (8:520b)
 	endchannel
 
 
-SFX_08_31_Ch3: ; 21226 (8:5226)
+SFX_Cry1D_2_Ch3: ; 21226 (8:5226)
 	unknownnoise0x20 6, 230, 76
 	unknownnoise0x20 15, 214, 60
 	unknownnoise0x20 10, 197, 74
 	unknownnoise0x20 1, 178, 91
 	unknownnoise0x20 15, 194, 76
 	endchannel
-; 0x21236
diff --git a/audio/sfx/sfx_1f_31.asm b/audio/sfx/cry1d_3.asm
index 4af60d4a..7210406c 100755..100644
--- a/audio/sfx/sfx_1f_31.asm
+++ b/audio/sfx/cry1d_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_31_Ch1: ; 7cfbd (1f:4fbd)
+SFX_Cry1D_3_Ch1: ; 7cfbd (1f:4fbd)
 	dutycycle 244
 	unknownsfx0x20 15, 240, 5, 7
 	unknownsfx0x20 10, 224, 0, 7
@@ -9,7 +9,7 @@ SFX_1f_31_Ch1: ; 7cfbd (1f:4fbd)
 	endchannel
 
 
-SFX_1f_31_Ch2: ; 7cfd8 (1f:4fd8)
+SFX_Cry1D_3_Ch2: ; 7cfd8 (1f:4fd8)
 	dutycycle 34
 	unknownsfx0x20 15, 176, 195, 6
 	unknownsfx0x20 10, 160, 193, 6
@@ -20,11 +20,10 @@ SFX_1f_31_Ch2: ; 7cfd8 (1f:4fd8)
 	endchannel
 
 
-SFX_1f_31_Ch3: ; 7cff3 (1f:4ff3)
+SFX_Cry1D_3_Ch3: ; 7cff3 (1f:4ff3)
 	unknownnoise0x20 6, 230, 76
 	unknownnoise0x20 15, 214, 60
 	unknownnoise0x20 10, 197, 74
 	unknownnoise0x20 1, 178, 91
 	unknownnoise0x20 15, 194, 76
 	endchannel
-; 0x7d003
diff --git a/audio/sfx/sfx_02_32.asm b/audio/sfx/cry1e_1.asm
index c231ace0..e445fdd7 100755..100644
--- a/audio/sfx/sfx_02_32.asm
+++ b/audio/sfx/cry1e_1.asm
@@ -1,4 +1,4 @@
-SFX_02_32_Ch1: ; 8dcf (2:4dcf)
+SFX_Cry1E_1_Ch1: ; 8dcf (2:4dcf)
 	dutycycle 240
 	unknownsfx0x20 6, 242, 0, 6
 	unknownsfx0x20 6, 226, 64, 6
@@ -11,7 +11,7 @@ SFX_02_32_Ch1: ; 8dcf (2:4dcf)
 	endchannel
 
 
-SFX_02_32_Ch2: ; 8df2 (2:4df2)
+SFX_Cry1E_1_Ch2: ; 8df2 (2:4df2)
 	dutycycle 17
 	unknownsfx0x20 3, 8, 1, 0
 	unknownsfx0x20 6, 194, 193, 5
@@ -25,7 +25,7 @@ SFX_02_32_Ch2: ; 8df2 (2:4df2)
 	endchannel
 
 
-SFX_02_32_Ch3: ; 8e19 (2:4e19)
+SFX_Cry1E_1_Ch3: ; 8e19 (2:4e19)
 	unknownnoise0x20 6, 8, 1
 	unknownnoise0x20 5, 226, 92
 	unknownnoise0x20 5, 194, 76
@@ -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_08_32.asm b/audio/sfx/cry1e_2.asm
index cda5f116..59c9985f 100755..100644
--- a/audio/sfx/sfx_08_32.asm
+++ b/audio/sfx/cry1e_2.asm
@@ -1,4 +1,4 @@
-SFX_08_32_Ch1: ; 21077 (8:5077)
+SFX_Cry1E_2_Ch1: ; 21077 (8:5077)
 	dutycycle 240
 	unknownsfx0x20 6, 242, 0, 6
 	unknownsfx0x20 6, 226, 64, 6
@@ -11,7 +11,7 @@ SFX_08_32_Ch1: ; 21077 (8:5077)
 	endchannel
 
 
-SFX_08_32_Ch2: ; 2109a (8:509a)
+SFX_Cry1E_2_Ch2: ; 2109a (8:509a)
 	dutycycle 17
 	unknownsfx0x20 3, 8, 1, 0
 	unknownsfx0x20 6, 194, 193, 5
@@ -25,7 +25,7 @@ SFX_08_32_Ch2: ; 2109a (8:509a)
 	endchannel
 
 
-SFX_08_32_Ch3: ; 210c1 (8:50c1)
+SFX_Cry1E_2_Ch3: ; 210c1 (8:50c1)
 	unknownnoise0x20 6, 8, 1
 	unknownnoise0x20 5, 226, 92
 	unknownnoise0x20 5, 194, 76
@@ -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_1f_32.asm b/audio/sfx/cry1e_3.asm
index 4e11a38e..1c50d4b8 100755..100644
--- a/audio/sfx/sfx_1f_32.asm
+++ b/audio/sfx/cry1e_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_32_Ch1: ; 7ce44 (1f:4e44)
+SFX_Cry1E_3_Ch1: ; 7ce44 (1f:4e44)
 	dutycycle 240
 	unknownsfx0x20 6, 242, 0, 6
 	unknownsfx0x20 6, 226, 64, 6
@@ -11,7 +11,7 @@ SFX_1f_32_Ch1: ; 7ce44 (1f:4e44)
 	endchannel
 
 
-SFX_1f_32_Ch2: ; 7ce67 (1f:4e67)
+SFX_Cry1E_3_Ch2: ; 7ce67 (1f:4e67)
 	dutycycle 17
 	unknownsfx0x20 3, 8, 1, 0
 	unknownsfx0x20 6, 194, 193, 5
@@ -25,7 +25,7 @@ SFX_1f_32_Ch2: ; 7ce67 (1f:4e67)
 	endchannel
 
 
-SFX_1f_32_Ch3: ; 7ce8e (1f:4e8e)
+SFX_Cry1E_3_Ch3: ; 7ce8e (1f:4e8e)
 	unknownnoise0x20 6, 8, 1
 	unknownnoise0x20 5, 226, 92
 	unknownnoise0x20 5, 194, 76
@@ -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_02_33.asm b/audio/sfx/cry1f_1.asm
index f13e35f7..52be80df 100755..100644
--- a/audio/sfx/sfx_02_33.asm
+++ b/audio/sfx/cry1f_1.asm
@@ -1,4 +1,4 @@
-SFX_02_33_Ch1: ; 8fe7 (2:4fe7)
+SFX_Cry1F_1_Ch1: ; 8fe7 (2:4fe7)
 	dutycycle 165
 	unknownsfx0x20 3, 244, 65, 6
 	unknownsfx0x20 13, 214, 33, 7
@@ -7,7 +7,7 @@ SFX_02_33_Ch1: ; 8fe7 (2:4fe7)
 	endchannel
 
 
-SFX_02_33_Ch2: ; 8ffa (2:4ffa)
+SFX_Cry1F_1_Ch2: ; 8ffa (2:4ffa)
 	dutycycle 204
 	unknownsfx0x20 4, 244, 128, 5
 	unknownsfx0x20 14, 230, 224, 6
@@ -16,10 +16,9 @@ SFX_02_33_Ch2: ; 8ffa (2:4ffa)
 	endchannel
 
 
-SFX_02_33_Ch3: ; 900d (2:500d)
+SFX_Cry1F_1_Ch3: ; 900d (2:500d)
 	unknownnoise0x20 5, 196, 70
 	unknownnoise0x20 13, 165, 68
 	unknownnoise0x20 8, 196, 69
 	unknownnoise0x20 8, 177, 68
 	endchannel
-; 0x901a
diff --git a/audio/sfx/sfx_08_33.asm b/audio/sfx/cry1f_2.asm
index 21c1fd1e..da7df61a 100755..100644
--- a/audio/sfx/sfx_08_33.asm
+++ b/audio/sfx/cry1f_2.asm
@@ -1,4 +1,4 @@
-SFX_08_33_Ch1: ; 2128f (8:528f)
+SFX_Cry1F_2_Ch1: ; 2128f (8:528f)
 	dutycycle 165
 	unknownsfx0x20 3, 244, 65, 6
 	unknownsfx0x20 13, 214, 33, 7
@@ -7,7 +7,7 @@ SFX_08_33_Ch1: ; 2128f (8:528f)
 	endchannel
 
 
-SFX_08_33_Ch2: ; 212a2 (8:52a2)
+SFX_Cry1F_2_Ch2: ; 212a2 (8:52a2)
 	dutycycle 204
 	unknownsfx0x20 4, 244, 128, 5
 	unknownsfx0x20 14, 230, 224, 6
@@ -16,10 +16,9 @@ SFX_08_33_Ch2: ; 212a2 (8:52a2)
 	endchannel
 
 
-SFX_08_33_Ch3: ; 212b5 (8:52b5)
+SFX_Cry1F_2_Ch3: ; 212b5 (8:52b5)
 	unknownnoise0x20 5, 196, 70
 	unknownnoise0x20 13, 165, 68
 	unknownnoise0x20 8, 196, 69
 	unknownnoise0x20 8, 177, 68
 	endchannel
-; 0x212c2
diff --git a/audio/sfx/sfx_1f_33.asm b/audio/sfx/cry1f_3.asm
index b273d6ac..2f6c1eda 100755..100644
--- a/audio/sfx/sfx_1f_33.asm
+++ b/audio/sfx/cry1f_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_33_Ch1: ; 7d05c (1f:505c)
+SFX_Cry1F_3_Ch1: ; 7d05c (1f:505c)
 	dutycycle 165
 	unknownsfx0x20 3, 244, 65, 6
 	unknownsfx0x20 13, 214, 33, 7
@@ -7,7 +7,7 @@ SFX_1f_33_Ch1: ; 7d05c (1f:505c)
 	endchannel
 
 
-SFX_1f_33_Ch2: ; 7d06f (1f:506f)
+SFX_Cry1F_3_Ch2: ; 7d06f (1f:506f)
 	dutycycle 204
 	unknownsfx0x20 4, 244, 128, 5
 	unknownsfx0x20 14, 230, 224, 6
@@ -16,10 +16,9 @@ SFX_1f_33_Ch2: ; 7d06f (1f:506f)
 	endchannel
 
 
-SFX_1f_33_Ch3: ; 7d082 (1f:5082)
+SFX_Cry1F_3_Ch3: ; 7d082 (1f:5082)
 	unknownnoise0x20 5, 196, 70
 	unknownnoise0x20 13, 165, 68
 	unknownnoise0x20 8, 196, 69
 	unknownnoise0x20 8, 177, 68
 	endchannel
-; 0x7d08f
diff --git a/audio/sfx/sfx_02_34.asm b/audio/sfx/cry20_1.asm
index 786ffbd4..d6586bdd 100755..100644
--- a/audio/sfx/sfx_02_34.asm
+++ b/audio/sfx/cry20_1.asm
@@ -1,4 +1,4 @@
-SFX_02_34_Ch1: ; 901a (2:501a)
+SFX_Cry20_1_Ch1: ; 901a (2:501a)
 	dutycycle 240
 	unknownsfx0x20 13, 241, 17, 5
 	unknownsfx0x20 13, 225, 21, 5
@@ -7,7 +7,7 @@ SFX_02_34_Ch1: ; 901a (2:501a)
 	endchannel
 
 
-SFX_02_34_Ch2: ; 902d (2:502d)
+SFX_Cry20_1_Ch2: ; 902d (2:502d)
 	dutycycle 21
 	unknownsfx0x20 12, 225, 12, 5
 	unknownsfx0x20 12, 209, 16, 5
@@ -16,10 +16,9 @@ SFX_02_34_Ch2: ; 902d (2:502d)
 	endchannel
 
 
-SFX_02_34_Ch3: ; 9040 (2:5040)
+SFX_Cry20_1_Ch3: ; 9040 (2:5040)
 	unknownnoise0x20 14, 242, 101
 	unknownnoise0x20 13, 226, 85
 	unknownnoise0x20 14, 210, 86
 	unknownnoise0x20 8, 209, 102
 	endchannel
-; 0x904d
diff --git a/audio/sfx/sfx_08_34.asm b/audio/sfx/cry20_2.asm
index 4c892016..b345eba5 100755..100644
--- a/audio/sfx/sfx_08_34.asm
+++ b/audio/sfx/cry20_2.asm
@@ -1,4 +1,4 @@
-SFX_08_34_Ch1: ; 212c2 (8:52c2)
+SFX_Cry20_2_Ch1: ; 212c2 (8:52c2)
 	dutycycle 240
 	unknownsfx0x20 13, 241, 17, 5
 	unknownsfx0x20 13, 225, 21, 5
@@ -7,7 +7,7 @@ SFX_08_34_Ch1: ; 212c2 (8:52c2)
 	endchannel
 
 
-SFX_08_34_Ch2: ; 212d5 (8:52d5)
+SFX_Cry20_2_Ch2: ; 212d5 (8:52d5)
 	dutycycle 21
 	unknownsfx0x20 12, 225, 12, 5
 	unknownsfx0x20 12, 209, 16, 5
@@ -16,10 +16,9 @@ SFX_08_34_Ch2: ; 212d5 (8:52d5)
 	endchannel
 
 
-SFX_08_34_Ch3: ; 212e8 (8:52e8)
+SFX_Cry20_2_Ch3: ; 212e8 (8:52e8)
 	unknownnoise0x20 14, 242, 101
 	unknownnoise0x20 13, 226, 85
 	unknownnoise0x20 14, 210, 86
 	unknownnoise0x20 8, 209, 102
 	endchannel
-; 0x212f5
diff --git a/audio/sfx/sfx_1f_34.asm b/audio/sfx/cry20_3.asm
index 18588747..5bcdf3df 100755..100644
--- a/audio/sfx/sfx_1f_34.asm
+++ b/audio/sfx/cry20_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_34_Ch1: ; 7d08f (1f:508f)
+SFX_Cry20_3_Ch1: ; 7d08f (1f:508f)
 	dutycycle 240
 	unknownsfx0x20 13, 241, 17, 5
 	unknownsfx0x20 13, 225, 21, 5
@@ -7,7 +7,7 @@ SFX_1f_34_Ch1: ; 7d08f (1f:508f)
 	endchannel
 
 
-SFX_1f_34_Ch2: ; 7d0a2 (1f:50a2)
+SFX_Cry20_3_Ch2: ; 7d0a2 (1f:50a2)
 	dutycycle 21
 	unknownsfx0x20 12, 225, 12, 5
 	unknownsfx0x20 12, 209, 16, 5
@@ -16,10 +16,9 @@ SFX_1f_34_Ch2: ; 7d0a2 (1f:50a2)
 	endchannel
 
 
-SFX_1f_34_Ch3: ; 7d0b5 (1f:50b5)
+SFX_Cry20_3_Ch3: ; 7d0b5 (1f:50b5)
 	unknownnoise0x20 14, 242, 101
 	unknownnoise0x20 13, 226, 85
 	unknownnoise0x20 14, 210, 86
 	unknownnoise0x20 8, 209, 102
 	endchannel
-; 0x7d0c2
diff --git a/audio/sfx/sfx_02_35.asm b/audio/sfx/cry21_1.asm
index 005ea485..9b81e2a3 100755..100644
--- a/audio/sfx/sfx_02_35.asm
+++ b/audio/sfx/cry21_1.asm
@@ -1,4 +1,4 @@
-SFX_02_35_Ch1: ; 904d (2:504d)
+SFX_Cry21_1_Ch1: ; 904d (2:504d)
 	dutycycle 27
 	unknownsfx0x20 3, 243, 100, 5
 	unknownsfx0x20 2, 226, 68, 5
@@ -11,7 +11,7 @@ SFX_02_35_Ch1: ; 904d (2:504d)
 	endchannel
 
 
-SFX_02_35_Ch2: ; 9070 (2:5070)
+SFX_Cry21_1_Ch2: ; 9070 (2:5070)
 	dutycycle 204
 	unknownsfx0x20 3, 211, 96, 5
 	unknownsfx0x20 2, 194, 64, 5
@@ -23,6 +23,5 @@ SFX_02_35_Ch2: ; 9070 (2:5070)
 	unknownsfx0x20 8, 193, 0, 5
 
 
-SFX_02_35_Ch3: ; 9092 (2:5092)
+SFX_Cry21_1_Ch3: ; 9092 (2:5092)
 	endchannel
-; 0x9093
diff --git a/audio/sfx/sfx_08_35.asm b/audio/sfx/cry21_2.asm
index 463f3597..f5571642 100755..100644
--- a/audio/sfx/sfx_08_35.asm
+++ b/audio/sfx/cry21_2.asm
@@ -1,4 +1,4 @@
-SFX_08_35_Ch1: ; 212f5 (8:52f5)
+SFX_Cry21_2_Ch1: ; 212f5 (8:52f5)
 	dutycycle 27
 	unknownsfx0x20 3, 243, 100, 5
 	unknownsfx0x20 2, 226, 68, 5
@@ -11,7 +11,7 @@ SFX_08_35_Ch1: ; 212f5 (8:52f5)
 	endchannel
 
 
-SFX_08_35_Ch2: ; 21318 (8:5318)
+SFX_Cry21_2_Ch2: ; 21318 (8:5318)
 	dutycycle 204
 	unknownsfx0x20 3, 211, 96, 5
 	unknownsfx0x20 2, 194, 64, 5
@@ -23,6 +23,5 @@ SFX_08_35_Ch2: ; 21318 (8:5318)
 	unknownsfx0x20 8, 193, 0, 5
 
 
-SFX_08_35_Ch3: ; 2133a (8:533a)
+SFX_Cry21_2_Ch3: ; 2133a (8:533a)
 	endchannel
-; 0x2133b
diff --git a/audio/sfx/sfx_1f_35.asm b/audio/sfx/cry21_3.asm
index 565dd1f2..d91177b8 100755..100644
--- a/audio/sfx/sfx_1f_35.asm
+++ b/audio/sfx/cry21_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_35_Ch1: ; 7d0c2 (1f:50c2)
+SFX_Cry21_3_Ch1: ; 7d0c2 (1f:50c2)
 	dutycycle 27
 	unknownsfx0x20 3, 243, 100, 5
 	unknownsfx0x20 2, 226, 68, 5
@@ -11,7 +11,7 @@ SFX_1f_35_Ch1: ; 7d0c2 (1f:50c2)
 	endchannel
 
 
-SFX_1f_35_Ch2: ; 7d0e5 (1f:50e5)
+SFX_Cry21_3_Ch2: ; 7d0e5 (1f:50e5)
 	dutycycle 204
 	unknownsfx0x20 3, 211, 96, 5
 	unknownsfx0x20 2, 194, 64, 5
@@ -23,6 +23,5 @@ SFX_1f_35_Ch2: ; 7d0e5 (1f:50e5)
 	unknownsfx0x20 8, 193, 0, 5
 
 
-SFX_1f_35_Ch3: ; 7d107 (1f:5107)
+SFX_Cry21_3_Ch3: ; 7d107 (1f:5107)
 	endchannel
-; 0x7d108
diff --git a/audio/sfx/sfx_02_36.asm b/audio/sfx/cry22_1.asm
index 369f6a4b..90961298 100755..100644
--- a/audio/sfx/sfx_02_36.asm
+++ b/audio/sfx/cry22_1.asm
@@ -1,4 +1,4 @@
-SFX_02_36_Ch1: ; 9093 (2:5093)
+SFX_Cry22_1_Ch1: ; 9093 (2:5093)
 	dutycycle 17
 	unknownsfx0x20 2, 61, 129, 3
 	unknownsfx0x20 7, 245, 1, 6
@@ -7,7 +7,7 @@ SFX_02_36_Ch1: ; 9093 (2:5093)
 	endchannel
 
 
-SFX_02_36_Ch2: ; 90a6 (2:50a6)
+SFX_Cry22_1_Ch2: ; 90a6 (2:50a6)
 	dutycycle 238
 	unknownsfx0x20 2, 62, 176, 5
 	unknownsfx0x20 7, 213, 93, 7
@@ -16,10 +16,9 @@ SFX_02_36_Ch2: ; 90a6 (2:50a6)
 	endchannel
 
 
-SFX_02_36_Ch3: ; 90b9 (2:50b9)
+SFX_Cry22_1_Ch3: ; 90b9 (2:50b9)
 	unknownnoise0x20 2, 146, 73
 	unknownnoise0x20 7, 181, 41
 	unknownnoise0x20 1, 162, 57
 	unknownnoise0x20 8, 145, 73
 	endchannel
-; 0x90c6
diff --git a/audio/sfx/sfx_08_36.asm b/audio/sfx/cry22_2.asm
index 843fa8e5..861c3bfb 100755..100644
--- a/audio/sfx/sfx_08_36.asm
+++ b/audio/sfx/cry22_2.asm
@@ -1,4 +1,4 @@
-SFX_08_36_Ch1: ; 2133b (8:533b)
+SFX_Cry22_2_Ch1: ; 2133b (8:533b)
 	dutycycle 17
 	unknownsfx0x20 2, 61, 129, 3
 	unknownsfx0x20 7, 245, 1, 6
@@ -7,7 +7,7 @@ SFX_08_36_Ch1: ; 2133b (8:533b)
 	endchannel
 
 
-SFX_08_36_Ch2: ; 2134e (8:534e)
+SFX_Cry22_2_Ch2: ; 2134e (8:534e)
 	dutycycle 238
 	unknownsfx0x20 2, 62, 176, 5
 	unknownsfx0x20 7, 213, 93, 7
@@ -16,10 +16,9 @@ SFX_08_36_Ch2: ; 2134e (8:534e)
 	endchannel
 
 
-SFX_08_36_Ch3: ; 21361 (8:5361)
+SFX_Cry22_2_Ch3: ; 21361 (8:5361)
 	unknownnoise0x20 2, 146, 73
 	unknownnoise0x20 7, 181, 41
 	unknownnoise0x20 1, 162, 57
 	unknownnoise0x20 8, 145, 73
 	endchannel
-; 0x2136e
diff --git a/audio/sfx/sfx_1f_36.asm b/audio/sfx/cry22_3.asm
index 2bb9dc28..42b3039c 100755..100644
--- a/audio/sfx/sfx_1f_36.asm
+++ b/audio/sfx/cry22_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_36_Ch1: ; 7d108 (1f:5108)
+SFX_Cry22_3_Ch1: ; 7d108 (1f:5108)
 	dutycycle 17
 	unknownsfx0x20 2, 61, 129, 3
 	unknownsfx0x20 7, 245, 1, 6
@@ -7,7 +7,7 @@ SFX_1f_36_Ch1: ; 7d108 (1f:5108)
 	endchannel
 
 
-SFX_1f_36_Ch2: ; 7d11b (1f:511b)
+SFX_Cry22_3_Ch2: ; 7d11b (1f:511b)
 	dutycycle 238
 	unknownsfx0x20 2, 62, 176, 5
 	unknownsfx0x20 7, 213, 93, 7
@@ -16,10 +16,9 @@ SFX_1f_36_Ch2: ; 7d11b (1f:511b)
 	endchannel
 
 
-SFX_1f_36_Ch3: ; 7d12e (1f:512e)
+SFX_Cry22_3_Ch3: ; 7d12e (1f:512e)
 	unknownnoise0x20 2, 146, 73
 	unknownnoise0x20 7, 181, 41
 	unknownnoise0x20 1, 162, 57
 	unknownnoise0x20 8, 145, 73
 	endchannel
-; 0x7d13b
diff --git a/audio/sfx/sfx_02_37.asm b/audio/sfx/cry23_1.asm
index cc093dcd..02868042 100755..100644
--- a/audio/sfx/sfx_02_37.asm
+++ b/audio/sfx/cry23_1.asm
@@ -1,4 +1,4 @@
-SFX_02_37_Ch1: ; 8786 (2:4786)
+SFX_Cry23_1_Ch1: ; 8786 (2:4786)
 	dutycycle 240
 	unknownsfx0x20 15, 247, 192, 7
 	unknownsfx0x20 6, 228, 193, 7
@@ -8,7 +8,7 @@ SFX_02_37_Ch1: ; 8786 (2:4786)
 	endchannel
 
 
-SFX_02_37_Ch2: ; 879d (2:479d)
+SFX_Cry23_1_Ch2: ; 879d (2:479d)
 	dutycycle 95
 	unknownsfx0x20 15, 151, 129, 7
 	unknownsfx0x20 6, 132, 128, 7
@@ -17,10 +17,9 @@ SFX_02_37_Ch2: ; 879d (2:479d)
 	endchannel
 
 
-SFX_02_37_Ch3: ; 87b0 (2:47b0)
+SFX_Cry23_1_Ch3: ; 87b0 (2:47b0)
 	unknownnoise0x20 3, 242, 60
 	unknownnoise0x20 13, 230, 44
 	unknownnoise0x20 15, 215, 60
 	unknownnoise0x20 8, 193, 44
 	endchannel
-; 0x87bd
diff --git a/audio/sfx/sfx_08_37.asm b/audio/sfx/cry23_2.asm
index 32a44e59..089a233c 100755..100644
--- a/audio/sfx/sfx_08_37.asm
+++ b/audio/sfx/cry23_2.asm
@@ -1,4 +1,4 @@
-SFX_08_37_Ch1: ; 20a2e (8:4a2e)
+SFX_Cry23_2_Ch1: ; 20a2e (8:4a2e)
 	dutycycle 240
 	unknownsfx0x20 15, 247, 192, 7
 	unknownsfx0x20 6, 228, 193, 7
@@ -8,7 +8,7 @@ SFX_08_37_Ch1: ; 20a2e (8:4a2e)
 	endchannel
 
 
-SFX_08_37_Ch2: ; 20a45 (8:4a45)
+SFX_Cry23_2_Ch2: ; 20a45 (8:4a45)
 	dutycycle 95
 	unknownsfx0x20 15, 151, 129, 7
 	unknownsfx0x20 6, 132, 128, 7
@@ -17,10 +17,9 @@ SFX_08_37_Ch2: ; 20a45 (8:4a45)
 	endchannel
 
 
-SFX_08_37_Ch3: ; 20a58 (8:4a58)
+SFX_Cry23_2_Ch3: ; 20a58 (8:4a58)
 	unknownnoise0x20 3, 242, 60
 	unknownnoise0x20 13, 230, 44
 	unknownnoise0x20 15, 215, 60
 	unknownnoise0x20 8, 193, 44
 	endchannel
-; 0x20a65
diff --git a/audio/sfx/sfx_1f_37.asm b/audio/sfx/cry23_3.asm
index 6dd98fb8..31ba3743 100755..100644
--- a/audio/sfx/sfx_1f_37.asm
+++ b/audio/sfx/cry23_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_37_Ch1: ; 7c7fb (1f:47fb)
+SFX_Cry23_3_Ch1: ; 7c7fb (1f:47fb)
 	dutycycle 240
 	unknownsfx0x20 15, 247, 192, 7
 	unknownsfx0x20 6, 228, 193, 7
@@ -8,7 +8,7 @@ SFX_1f_37_Ch1: ; 7c7fb (1f:47fb)
 	endchannel
 
 
-SFX_1f_37_Ch2: ; 7c812 (1f:4812)
+SFX_Cry23_3_Ch2: ; 7c812 (1f:4812)
 	dutycycle 95
 	unknownsfx0x20 15, 151, 129, 7
 	unknownsfx0x20 6, 132, 128, 7
@@ -17,10 +17,9 @@ SFX_1f_37_Ch2: ; 7c812 (1f:4812)
 	endchannel
 
 
-SFX_1f_37_Ch3: ; 7c825 (1f:4825)
+SFX_Cry23_3_Ch3: ; 7c825 (1f:4825)
 	unknownnoise0x20 3, 242, 60
 	unknownnoise0x20 13, 230, 44
 	unknownnoise0x20 15, 215, 60
 	unknownnoise0x20 8, 193, 44
 	endchannel
-; 0x7c832
diff --git a/audio/sfx/sfx_02_38.asm b/audio/sfx/cry24_1.asm
index 5511cfb1..061ed65a 100755..100644
--- a/audio/sfx/sfx_02_38.asm
+++ b/audio/sfx/cry24_1.asm
@@ -1,4 +1,4 @@
-SFX_02_38_Ch1: ; 87bd (2:47bd)
+SFX_Cry24_1_Ch1: ; 87bd (2:47bd)
 	dutycycle 240
 	unknownsfx0x20 15, 247, 128, 6
 	unknownsfx0x20 10, 230, 132, 6
@@ -11,7 +11,7 @@ SFX_02_38_Ch1: ; 87bd (2:47bd)
 	endchannel
 
 
-SFX_02_38_Ch2: ; 87e0 (2:47e0)
+SFX_Cry24_1_Ch2: ; 87e0 (2:47e0)
 	dutycycle 5
 	unknownsfx0x20 15, 183, 65, 6
 	unknownsfx0x20 10, 150, 66, 6
@@ -24,11 +24,10 @@ SFX_02_38_Ch2: ; 87e0 (2:47e0)
 	endchannel
 
 
-SFX_02_38_Ch3: ; 8803 (2:4803)
+SFX_Cry24_1_Ch3: ; 8803 (2:4803)
 	unknownnoise0x20 15, 228, 60
 	unknownnoise0x20 10, 199, 76
 	unknownnoise0x20 10, 199, 60
 	unknownnoise0x20 12, 183, 76
 	unknownnoise0x20 15, 162, 92
 	endchannel
-; 0x8813
diff --git a/audio/sfx/sfx_08_38.asm b/audio/sfx/cry24_2.asm
index 7db5b654..52986829 100755..100644
--- a/audio/sfx/sfx_08_38.asm
+++ b/audio/sfx/cry24_2.asm
@@ -1,4 +1,4 @@
-SFX_08_38_Ch1: ; 20a65 (8:4a65)
+SFX_Cry24_2_Ch1: ; 20a65 (8:4a65)
 	dutycycle 240
 	unknownsfx0x20 15, 247, 128, 6
 	unknownsfx0x20 10, 230, 132, 6
@@ -11,7 +11,7 @@ SFX_08_38_Ch1: ; 20a65 (8:4a65)
 	endchannel
 
 
-SFX_08_38_Ch2: ; 20a88 (8:4a88)
+SFX_Cry24_2_Ch2: ; 20a88 (8:4a88)
 	dutycycle 5
 	unknownsfx0x20 15, 183, 65, 6
 	unknownsfx0x20 10, 150, 66, 6
@@ -24,11 +24,10 @@ SFX_08_38_Ch2: ; 20a88 (8:4a88)
 	endchannel
 
 
-SFX_08_38_Ch3: ; 20aab (8:4aab)
+SFX_Cry24_2_Ch3: ; 20aab (8:4aab)
 	unknownnoise0x20 15, 228, 60
 	unknownnoise0x20 10, 199, 76
 	unknownnoise0x20 10, 199, 60
 	unknownnoise0x20 12, 183, 76
 	unknownnoise0x20 15, 162, 92
 	endchannel
-; 0x20abb
diff --git a/audio/sfx/sfx_1f_38.asm b/audio/sfx/cry24_3.asm
index 02c65baa..8c9cfc81 100755..100644
--- a/audio/sfx/sfx_1f_38.asm
+++ b/audio/sfx/cry24_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_38_Ch1: ; 7c832 (1f:4832)
+SFX_Cry24_3_Ch1: ; 7c832 (1f:4832)
 	dutycycle 240
 	unknownsfx0x20 15, 247, 128, 6
 	unknownsfx0x20 10, 230, 132, 6
@@ -11,7 +11,7 @@ SFX_1f_38_Ch1: ; 7c832 (1f:4832)
 	endchannel
 
 
-SFX_1f_38_Ch2: ; 7c855 (1f:4855)
+SFX_Cry24_3_Ch2: ; 7c855 (1f:4855)
 	dutycycle 5
 	unknownsfx0x20 15, 183, 65, 6
 	unknownsfx0x20 10, 150, 66, 6
@@ -24,11 +24,10 @@ SFX_1f_38_Ch2: ; 7c855 (1f:4855)
 	endchannel
 
 
-SFX_1f_38_Ch3: ; 7c878 (1f:4878)
+SFX_Cry24_3_Ch3: ; 7c878 (1f:4878)
 	unknownnoise0x20 15, 228, 60
 	unknownnoise0x20 10, 199, 76
 	unknownnoise0x20 10, 199, 60
 	unknownnoise0x20 12, 183, 76
 	unknownnoise0x20 15, 162, 92
 	endchannel
-; 0x7c888
diff --git a/audio/sfx/sfx_02_39.asm b/audio/sfx/cry25_1.asm
index 079059ec..ce238db2 100755..100644
--- a/audio/sfx/sfx_02_39.asm
+++ b/audio/sfx/cry25_1.asm
@@ -1,4 +1,4 @@
-SFX_02_39_Ch1: ; 886b (2:486b)
+SFX_Cry25_1_Ch1: ; 886b (2:486b)
 	dutycycle 165
 	unknownsfx0x20 6, 244, 64, 7
 	unknownsfx0x20 15, 227, 48, 7
@@ -8,7 +8,7 @@ SFX_02_39_Ch1: ; 886b (2:486b)
 	endchannel
 
 
-SFX_02_39_Ch2: ; 8882 (2:4882)
+SFX_Cry25_1_Ch2: ; 8882 (2:4882)
 	dutycycle 119
 	unknownsfx0x20 6, 195, 18, 7
 	unknownsfx0x20 15, 179, 4, 7
@@ -18,10 +18,9 @@ SFX_02_39_Ch2: ; 8882 (2:4882)
 	endchannel
 
 
-SFX_02_39_Ch3: ; 8899 (2:4899)
+SFX_Cry25_1_Ch3: ; 8899 (2:4899)
 	unknownnoise0x20 8, 214, 44
 	unknownnoise0x20 12, 198, 60
 	unknownnoise0x20 10, 182, 44
 	unknownnoise0x20 8, 145, 28
 	endchannel
-; 0x88a6
diff --git a/audio/sfx/sfx_08_39.asm b/audio/sfx/cry25_2.asm
index 1b9b0dae..b00210a9 100755..100644
--- a/audio/sfx/sfx_08_39.asm
+++ b/audio/sfx/cry25_2.asm
@@ -1,4 +1,4 @@
-SFX_08_39_Ch1: ; 20b13 (8:4b13)
+SFX_Cry25_2_Ch1: ; 20b13 (8:4b13)
 	dutycycle 165
 	unknownsfx0x20 6, 244, 64, 7
 	unknownsfx0x20 15, 227, 48, 7
@@ -8,7 +8,7 @@ SFX_08_39_Ch1: ; 20b13 (8:4b13)
 	endchannel
 
 
-SFX_08_39_Ch2: ; 20b2a (8:4b2a)
+SFX_Cry25_2_Ch2: ; 20b2a (8:4b2a)
 	dutycycle 119
 	unknownsfx0x20 6, 195, 18, 7
 	unknownsfx0x20 15, 179, 4, 7
@@ -18,10 +18,9 @@ SFX_08_39_Ch2: ; 20b2a (8:4b2a)
 	endchannel
 
 
-SFX_08_39_Ch3: ; 20b41 (8:4b41)
+SFX_Cry25_2_Ch3: ; 20b41 (8:4b41)
 	unknownnoise0x20 8, 214, 44
 	unknownnoise0x20 12, 198, 60
 	unknownnoise0x20 10, 182, 44
 	unknownnoise0x20 8, 145, 28
 	endchannel
-; 0x20b4e
diff --git a/audio/sfx/sfx_1f_39.asm b/audio/sfx/cry25_3.asm
index 7b9d5121..7c93b0e6 100755..100644
--- a/audio/sfx/sfx_1f_39.asm
+++ b/audio/sfx/cry25_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_39_Ch1: ; 7c8e0 (1f:48e0)
+SFX_Cry25_3_Ch1: ; 7c8e0 (1f:48e0)
 	dutycycle 165
 	unknownsfx0x20 6, 244, 64, 7
 	unknownsfx0x20 15, 227, 48, 7
@@ -8,7 +8,7 @@ SFX_1f_39_Ch1: ; 7c8e0 (1f:48e0)
 	endchannel
 
 
-SFX_1f_39_Ch2: ; 7c8f7 (1f:48f7)
+SFX_Cry25_3_Ch2: ; 7c8f7 (1f:48f7)
 	dutycycle 119
 	unknownsfx0x20 6, 195, 18, 7
 	unknownsfx0x20 15, 179, 4, 7
@@ -18,10 +18,9 @@ SFX_1f_39_Ch2: ; 7c8f7 (1f:48f7)
 	endchannel
 
 
-SFX_1f_39_Ch3: ; 7c90e (1f:490e)
+SFX_Cry25_3_Ch3: ; 7c90e (1f:490e)
 	unknownnoise0x20 8, 214, 44
 	unknownnoise0x20 12, 198, 60
 	unknownnoise0x20 10, 182, 44
 	unknownnoise0x20 8, 145, 28
 	endchannel
-; 0x7c91b
diff --git a/audio/sfx/sfx_02_56.asm b/audio/sfx/cut_1.asm
index ee6636e1..c1b763e0 100755..100644
--- a/audio/sfx/sfx_02_56.asm
+++ b/audio/sfx/cut_1.asm
@@ -1,8 +1,7 @@
-SFX_02_56_Ch1: ; 83e1 (2:43e1)
+SFX_Cut_1_Ch1: ; 83e1 (2:43e1)
 	unknownnoise0x20 2, 247, 36
 	unknownnoise0x20 2, 247, 52
 	unknownnoise0x20 4, 247, 68
 	unknownnoise0x20 8, 244, 85
 	unknownnoise0x20 8, 241, 68
 	endchannel
-; 0x83f1
diff --git a/audio/sfx/sfx_1f_56.asm b/audio/sfx/cut_3.asm
index 941c4b0c..4ad5551d 100755..100644
--- a/audio/sfx/sfx_1f_56.asm
+++ b/audio/sfx/cut_3.asm
@@ -1,8 +1,7 @@
-SFX_1f_56_Ch1: ; 7c3ca (1f:43ca)
+SFX_Cut_3_Ch1: ; 7c3ca (1f:43ca)
 	unknownnoise0x20 2, 247, 36
 	unknownnoise0x20 2, 247, 52
 	unknownnoise0x20 4, 247, 68
 	unknownnoise0x20 8, 244, 85
 	unknownnoise0x20 8, 241, 68
 	endchannel
-; 0x7c3da
diff --git a/audio/sfx/sfx_02_0c.asm b/audio/sfx/cymbal1_1.asm
index 57d20bc6..d001b750 100755..100644
--- a/audio/sfx/sfx_02_0c.asm
+++ b/audio/sfx/cymbal1_1.asm
@@ -1,4 +1,3 @@
-SFX_02_0c_Ch1: ; 833b (2:433b)
+SFX_Cymbal1_1_Ch1: ; 833b (2:433b)
 	unknownnoise0x20 0, 161, 16
 	endchannel
-; 0x833f
diff --git a/audio/sfx/cymbal1_2.asm b/audio/sfx/cymbal1_2.asm
new file mode 100644
index 00000000..8987d85f
--- /dev/null
+++ b/audio/sfx/cymbal1_2.asm
@@ -0,0 +1,3 @@
+SFX_Cymbal1_2_Ch1: ; 2033b (8:433b)
+	unknownnoise0x20 0, 161, 16
+	endchannel
diff --git a/audio/sfx/cymbal1_3.asm b/audio/sfx/cymbal1_3.asm
new file mode 100644
index 00000000..597a8b61
--- /dev/null
+++ b/audio/sfx/cymbal1_3.asm
@@ -0,0 +1,3 @@
+SFX_Cymbal1_3_Ch1: ; 7c33b (1f:433b)
+	unknownnoise0x20 0, 161, 16
+	endchannel
diff --git a/audio/sfx/sfx_02_0d.asm b/audio/sfx/cymbal2_1.asm
index f143024f..3f50299a 100755..100644
--- a/audio/sfx/sfx_02_0d.asm
+++ b/audio/sfx/cymbal2_1.asm
@@ -1,4 +1,3 @@
-SFX_02_0d_Ch1: ; 833f (2:433f)
+SFX_Cymbal2_1_Ch1: ; 833f (2:433f)
 	unknownnoise0x20 0, 162, 17
 	endchannel
-; 0x8343
diff --git a/audio/sfx/cymbal2_2.asm b/audio/sfx/cymbal2_2.asm
new file mode 100644
index 00000000..5224a20d
--- /dev/null
+++ b/audio/sfx/cymbal2_2.asm
@@ -0,0 +1,3 @@
+SFX_Cymbal2_2_Ch1: ; 2033f (8:433f)
+	unknownnoise0x20 0, 162, 17
+	endchannel
diff --git a/audio/sfx/cymbal2_3.asm b/audio/sfx/cymbal2_3.asm
new file mode 100644
index 00000000..dd3a4fc9
--- /dev/null
+++ b/audio/sfx/cymbal2_3.asm
@@ -0,0 +1,3 @@
+SFX_Cymbal2_3_Ch1: ; 7c33f (1f:433f)
+	unknownnoise0x20 0, 162, 17
+	endchannel
diff --git a/audio/sfx/sfx_02_0e.asm b/audio/sfx/cymbal3_1.asm
index 9ba580ae..8aa5ebe5 100755..100644
--- a/audio/sfx/sfx_02_0e.asm
+++ b/audio/sfx/cymbal3_1.asm
@@ -1,4 +1,3 @@
-SFX_02_0e_Ch1: ; 8343 (2:4343)
+SFX_Cymbal3_1_Ch1: ; 8343 (2:4343)
 	unknownnoise0x20 0, 162, 80
 	endchannel
-; 0x8347
diff --git a/audio/sfx/cymbal3_2.asm b/audio/sfx/cymbal3_2.asm
new file mode 100644
index 00000000..d1fd3b90
--- /dev/null
+++ b/audio/sfx/cymbal3_2.asm
@@ -0,0 +1,3 @@
+SFX_Cymbal3_2_Ch1: ; 20343 (8:4343)
+	unknownnoise0x20 0, 162, 80
+	endchannel
diff --git a/audio/sfx/cymbal3_3.asm b/audio/sfx/cymbal3_3.asm
new file mode 100644
index 00000000..45e41c15
--- /dev/null
+++ b/audio/sfx/cymbal3_3.asm
@@ -0,0 +1,3 @@
+SFX_Cymbal3_3_Ch1: ; 7c343 (1f:4343)
+	unknownnoise0x20 0, 162, 80
+	endchannel
diff --git a/audio/sfx/sfx_08_50.asm b/audio/sfx/damage.asm
index 23b6d22c..4022fcbf 100755..100644
--- a/audio/sfx/sfx_08_50.asm
+++ b/audio/sfx/damage.asm
@@ -1,6 +1,5 @@
-SFX_08_50_Ch1: ; 204f4 (8:44f4)
+SFX_Damage_Ch1: ; 204f4 (8:44f4)
 	unknownnoise0x20 2, 244, 68
 	unknownnoise0x20 2, 244, 20
 	unknownnoise0x20 15, 241, 50
 	endchannel
-; 0x204fe
diff --git a/audio/sfx/sfx_02_51.asm b/audio/sfx/denied_1.asm
index 1c039e7c..46520151 100755..100644
--- a/audio/sfx/sfx_02_51.asm
+++ b/audio/sfx/denied_1.asm
@@ -1,4 +1,4 @@
-SFX_02_51_Ch1: ; 861f (2:461f)
+SFX_Denied_1_Ch1: ; 861f (2:461f)
 	duty 3
 	unknownsfx0x10 90
 	unknownsfx0x20 4, 240, 0, 5
@@ -9,11 +9,10 @@ SFX_02_51_Ch1: ; 861f (2:461f)
 	endchannel
 
 
-SFX_02_51_Ch2: ; 8636 (2:4636)
+SFX_Denied_1_Ch2: ; 8636 (2:4636)
 	duty 3
 	unknownsfx0x20 4, 240, 1, 4
 	unknownsfx0x20 4, 0, 0, 0
 	unknownsfx0x20 15, 240, 1, 4
 	unknownsfx0x20 1, 0, 0, 0
 	endchannel
-; 0x8649
diff --git a/audio/sfx/sfx_1f_51.asm b/audio/sfx/denied_3.asm
index 83501af4..2cebd766 100755..100644
--- a/audio/sfx/sfx_1f_51.asm
+++ b/audio/sfx/denied_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_51_Ch1: ; 7c5fc (1f:45fc)
+SFX_Denied_3_Ch1: ; 7c5fc (1f:45fc)
 	duty 3
 	unknownsfx0x10 90
 	unknownsfx0x20 4, 240, 0, 5
@@ -9,11 +9,10 @@ SFX_1f_51_Ch1: ; 7c5fc (1f:45fc)
 	endchannel
 
 
-SFX_1f_51_Ch2: ; 7c613 (1f:4613)
+SFX_Denied_3_Ch2: ; 7c613 (1f:4613)
 	duty 3
 	unknownsfx0x20 4, 240, 1, 4
 	unknownsfx0x20 4, 0, 0, 0
 	unknownsfx0x20 15, 240, 1, 4
 	unknownsfx0x20 1, 0, 0, 0
 	endchannel
-; 0x7c626
diff --git a/audio/sfx/sfx_08_45.asm b/audio/sfx/dex_page_added.asm
index 77a1065f..dac55ed9 100755..100644
--- a/audio/sfx/sfx_08_45.asm
+++ b/audio/sfx/dex_page_added.asm
@@ -1,4 +1,4 @@
-SFX_08_45_Ch1: ; 2047f (8:447f)
+SFX_Dex_Page_Added_Ch1: ; 2047f (8:447f)
 	duty 2
 	unknownsfx0x10 68
 	unknownsfx0x20 15, 240, 240, 4
@@ -8,9 +8,8 @@ SFX_08_45_Ch1: ; 2047f (8:447f)
 	endchannel
 
 
-SFX_08_45_Ch2: ; 20490 (8:4490)
+SFX_Dex_Page_Added_Ch2: ; 20490 (8:4490)
 	duty 2
 	unknownsfx0x20 15, 146, 0, 6
 	unknownsfx0x20 15, 146, 130, 7
 	endchannel
-; 0x2049b
diff --git a/audio/sfx/sfx_08_5d.asm b/audio/sfx/doubleslap.asm
index c973dcf6..0918238a 100755..100644
--- a/audio/sfx/sfx_08_5d.asm
+++ b/audio/sfx/doubleslap.asm
@@ -1,5 +1,4 @@
-SFX_08_5d_Ch1: ; 2058c (8:458c)
+SFX_Doubleslap_Ch1: ; 2058c (8:458c)
 	unknownnoise0x20 8, 241, 50
 	unknownnoise0x20 8, 241, 51
 	endchannel
-; 0x20593
diff --git a/audio/sfx/sfx_02_47.asm b/audio/sfx/enter_pc_1.asm
index ee3214fa..5c1a189a 100755..100644
--- a/audio/sfx/sfx_02_47.asm
+++ b/audio/sfx/enter_pc_1.asm
@@ -1,8 +1,7 @@
-SFX_02_47_Ch1: ; 853b (2:453b)
+SFX_Enter_PC_1_Ch1: ; 853b (2:453b)
 	duty 2
 	unknownsfx0x20 6, 240, 0, 7
 	unknownsfx0x20 4, 0, 0, 0
 	unknownsfx0x20 6, 240, 0, 7
 	unknownsfx0x20 1, 0, 0, 0
 	endchannel
-; 0x854e
diff --git a/audio/sfx/sfx_1f_47.asm b/audio/sfx/enter_pc_3.asm
index 945e93fe..5907a7e5 100755..100644
--- a/audio/sfx/sfx_1f_47.asm
+++ b/audio/sfx/enter_pc_3.asm
@@ -1,8 +1,7 @@
-SFX_1f_47_Ch1: ; 7c518 (1f:4518)
+SFX_Enter_PC_3_Ch1: ; 7c518 (1f:4518)
 	duty 2
 	unknownsfx0x20 4, 240, 0, 7
 	unknownsfx0x20 4, 0, 0, 0
 	unknownsfx0x20 4, 240, 0, 7
 	unknownsfx0x20 1, 0, 0, 0
 	endchannel
-; 0x7c52b
diff --git a/audio/sfx/sfx_08_48.asm b/audio/sfx/faint_fall.asm
index 0792ae25..c252b93a 100755..100644
--- a/audio/sfx/sfx_08_48.asm
+++ b/audio/sfx/faint_fall.asm
@@ -1,7 +1,6 @@
-SFX_08_48_Ch1: ; 204ae (8:44ae)
+SFX_Faint_Fall_Ch1: ; 204ae (8:44ae)
 	duty 1
 	unknownsfx0x10 175
 	unknownsfx0x20 15, 242, 128, 7
 	unknownsfx0x10 8
 	endchannel
-; 0x204b9
diff --git a/audio/sfx/sfx_08_43.asm b/audio/sfx/faint_thud.asm
index 27bd52fb..5ef100c5 100755..100644
--- a/audio/sfx/sfx_08_43.asm
+++ b/audio/sfx/faint_thud.asm
@@ -1,12 +1,11 @@
-SFX_08_43_Ch1: ; 2044c (8:444c)
+SFX_Faint_Thud_Ch1: ; 2044c (8:444c)
 	unknownsfx0x20 15, 209, 0, 2
 	unknownsfx0x10 8
 	endchannel
 
 
-SFX_08_43_Ch2: ; 20453 (8:4453)
+SFX_Faint_Thud_Ch2: ; 20453 (8:4453)
 	unknownnoise0x20 4, 245, 51
 	unknownnoise0x20 8, 244, 34
 	unknownnoise0x20 15, 242, 33
 	endchannel
-; 0x2045d
diff --git a/audio/sfx/sfx_02_50.asm b/audio/sfx/fly_1.asm
index 3d5bf3fe..c2ecf435 100755..100644
--- a/audio/sfx/sfx_02_50.asm
+++ b/audio/sfx/fly_1.asm
@@ -1,4 +1,4 @@
-SFX_02_50_Ch1: ; 85ee (2:45ee)
+SFX_Fly_1_Ch1: ; 85ee (2:45ee)
 	unknownnoise0x20 2, 241, 18
 	unknownnoise0x20 2, 0, 0
 	unknownnoise0x20 2, 161, 18
@@ -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_1f_50.asm b/audio/sfx/fly_3.asm
index 3b99e1f3..043d4b51 100755..100644
--- a/audio/sfx/sfx_1f_50.asm
+++ b/audio/sfx/fly_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_50_Ch1: ; 7c5cb (1f:45cb)
+SFX_Fly_3_Ch1: ; 7c5cb (1f:45cb)
 	unknownnoise0x20 2, 241, 18
 	unknownnoise0x20 2, 0, 0
 	unknownnoise0x20 2, 161, 18
@@ -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_02_3a.asm b/audio/sfx/get_item1_1.asm
index b394d7c9..471124d7 100755..100644
--- a/audio/sfx/sfx_02_3a.asm
+++ b/audio/sfx/get_item1_1.asm
@@ -1,4 +1,4 @@
-SFX_02_3a_Ch1: ; ad77 (2:6d77)
+SFX_Get_Item1_1_Ch1: ; ad77 (2:6d77)
 	executemusic
 	tempo 256
 	volume 7, 7
@@ -16,7 +16,7 @@ SFX_02_3a_Ch1: ; ad77 (2:6d77)
 	endchannel
 
 
-SFX_02_3a_Ch2: ; ad8e (2:6d8e)
+SFX_Get_Item1_1_Ch2: ; ad8e (2:6d8e)
 	executemusic
 	vibrato 8, 2, 7
 	duty 2
@@ -30,7 +30,7 @@ SFX_02_3a_Ch2: ; ad8e (2:6d8e)
 	endchannel
 
 
-SFX_02_3a_Ch3: ; ad9e (2:6d9e)
+SFX_Get_Item1_1_Ch3: ; ad9e (2:6d9e)
 	executemusic
 	notetype 4, 1, 0
 	octave 4
@@ -45,4 +45,3 @@ SFX_02_3a_Ch3: ; ad9e (2:6d9e)
 	B_ 2
 	rest 2
 	endchannel
-; 0xadae
diff --git a/audio/sfx/sfx_1f_3a.asm b/audio/sfx/get_item1_3.asm
index 3ab6c1d3..6a7ebabc 100755..100644
--- a/audio/sfx/sfx_1f_3a.asm
+++ b/audio/sfx/get_item1_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_3a_Ch1: ; 7e850 (1f:6850)
+SFX_Get_Item1_3_Ch1: ; 7e850 (1f:6850)
 	executemusic
 	tempo 256
 	volume 7, 7
@@ -16,7 +16,7 @@ SFX_1f_3a_Ch1: ; 7e850 (1f:6850)
 	endchannel
 
 
-SFX_1f_3a_Ch2: ; 7e867 (1f:6867)
+SFX_Get_Item1_3_Ch2: ; 7e867 (1f:6867)
 	executemusic
 	vibrato 8, 2, 7
 	duty 2
@@ -30,7 +30,7 @@ SFX_1f_3a_Ch2: ; 7e867 (1f:6867)
 	endchannel
 
 
-SFX_1f_3a_Ch3: ; 7e877 (1f:6877)
+SFX_Get_Item1_3_Ch3: ; 7e877 (1f:6877)
 	executemusic
 	notetype 4, 1, 0
 	octave 4
@@ -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/get_item2_1.asm
index b864987b..6fda3404 100755..100644
--- a/audio/sfx/sfx_1f_3b.asm
+++ b/audio/sfx/get_item2_1.asm
@@ -1,4 +1,4 @@
-SFX_1f_3b_Ch1: ; 7ee28 (1f:6e28)
+SFX_Get_Item2_1_Ch1: ; b316 (2:7316)
 	executemusic
 	tempo 256
 	volume 7, 7
@@ -25,7 +25,7 @@ SFX_1f_3b_Ch1: ; 7ee28 (1f:6e28)
 	endchannel
 
 
-SFX_1f_3b_Ch2: ; 7ee47 (1f:6e47)
+SFX_Get_Item2_1_Ch2: ; b335 (2:7335)
 	executemusic
 	vibrato 8, 2, 7
 	duty 2
@@ -46,7 +46,7 @@ SFX_1f_3b_Ch2: ; 7ee47 (1f:6e47)
 	endchannel
 
 
-SFX_1f_3b_Ch3: ; 7ee5f (1f:6e5f)
+SFX_Get_Item2_1_Ch3: ; b34d (2:734d)
 	executemusic
 	notetype 5, 1, 0
 	octave 5
@@ -67,4 +67,3 @@ SFX_1f_3b_Ch3: ; 7ee5f (1f:6e5f)
 	rest 1
 	A_ 8
 	endchannel
-; 0x7ee74
diff --git a/audio/sfx/sfx_02_3b.asm b/audio/sfx/get_item2_2.asm
index 1c2fbd50..25e40744 100755..100644
--- a/audio/sfx/sfx_02_3b.asm
+++ b/audio/sfx/get_item2_2.asm
@@ -1,4 +1,4 @@
-SFX_02_3b_Ch1: ; b316 (2:7316)
+SFX_Get_Item2_2_Ch1: ; 239c7 (8:79c7)
 	executemusic
 	tempo 256
 	volume 7, 7
@@ -25,7 +25,7 @@ SFX_02_3b_Ch1: ; b316 (2:7316)
 	endchannel
 
 
-SFX_02_3b_Ch2: ; b335 (2:7335)
+SFX_Get_Item2_2_Ch2: ; 239e6 (8:79e6)
 	executemusic
 	vibrato 8, 2, 7
 	duty 2
@@ -46,7 +46,7 @@ SFX_02_3b_Ch2: ; b335 (2:7335)
 	endchannel
 
 
-SFX_02_3b_Ch3: ; b34d (2:734d)
+SFX_Get_Item2_2_Ch3: ; 239fe (8:79fe)
 	executemusic
 	notetype 5, 1, 0
 	octave 5
@@ -67,4 +67,3 @@ SFX_02_3b_Ch3: ; b34d (2:734d)
 	rest 1
 	A_ 8
 	endchannel
-; 0xb362
diff --git a/audio/sfx/sfx_08_3b.asm b/audio/sfx/get_item2_3.asm
index 6a178f4c..20a0ee04 100755..100644
--- a/audio/sfx/sfx_08_3b.asm
+++ b/audio/sfx/get_item2_3.asm
@@ -1,4 +1,4 @@
-SFX_08_3b_Ch1: ; 239c7 (8:79c7)
+SFX_Get_Item2_3_Ch1: ; 7ee28 (1f:6e28)
 	executemusic
 	tempo 256
 	volume 7, 7
@@ -25,7 +25,7 @@ SFX_08_3b_Ch1: ; 239c7 (8:79c7)
 	endchannel
 
 
-SFX_08_3b_Ch2: ; 239e6 (8:79e6)
+SFX_Get_Item2_3_Ch2: ; 7ee47 (1f:6e47)
 	executemusic
 	vibrato 8, 2, 7
 	duty 2
@@ -46,7 +46,7 @@ SFX_08_3b_Ch2: ; 239e6 (8:79e6)
 	endchannel
 
 
-SFX_08_3b_Ch3: ; 239fe (8:79fe)
+SFX_Get_Item2_3_Ch3: ; 7ee5f (1f:6e5f)
 	executemusic
 	notetype 5, 1, 0
 	octave 5
@@ -67,4 +67,3 @@ SFX_08_3b_Ch3: ; 239fe (8:79fe)
 	rest 1
 	A_ 8
 	endchannel
-; 0x23a13
diff --git a/audio/sfx/sfx_1f_42.asm b/audio/sfx/get_key_item_1.asm
index daa4c7bb..233ea01b 100755..100644
--- a/audio/sfx/sfx_1f_42.asm
+++ b/audio/sfx/get_key_item_1.asm
@@ -1,4 +1,4 @@
-SFX_1f_42_Ch1: ; 7ee74 (1f:6e74)
+SFX_Get_Key_Item_1_Ch1: ; b362 (2:7362)
 	executemusic
 	tempo 256
 	volume 7, 7
@@ -23,7 +23,7 @@ SFX_1f_42_Ch1: ; 7ee74 (1f:6e74)
 	endchannel
 
 
-SFX_1f_42_Ch2: ; 7ee93 (1f:6e93)
+SFX_Get_Key_Item_1_Ch2: ; b381 (2:7381)
 	executemusic
 	vibrato 4, 2, 3
 	duty 2
@@ -47,7 +47,7 @@ SFX_1f_42_Ch2: ; 7ee93 (1f:6e93)
 	endchannel
 
 
-SFX_1f_42_Ch3: ; 7eeaf (1f:6eaf)
+SFX_Get_Key_Item_1_Ch3: ; b39d (2:739d)
 	executemusic
 	notetype 5, 1, 0
 	octave 4
@@ -57,4 +57,3 @@ SFX_1f_42_Ch3: ; 7eeaf (1f:6eaf)
 	F_ 4
 	D# 8
 	endchannel
-; 0x7eeb9
diff --git a/audio/sfx/sfx_02_42.asm b/audio/sfx/get_key_item_3.asm
index f31a8e26..f918e1bf 100755..100644
--- a/audio/sfx/sfx_02_42.asm
+++ b/audio/sfx/get_key_item_3.asm
@@ -1,4 +1,4 @@
-SFX_02_42_Ch1: ; b362 (2:7362)
+SFX_Get_Key_Item_3_Ch1: ; 7ee74 (1f:6e74)
 	executemusic
 	tempo 256
 	volume 7, 7
@@ -23,7 +23,7 @@ SFX_02_42_Ch1: ; b362 (2:7362)
 	endchannel
 
 
-SFX_02_42_Ch2: ; b381 (2:7381)
+SFX_Get_Key_Item_3_Ch2: ; 7ee93 (1f:6e93)
 	executemusic
 	vibrato 4, 2, 3
 	duty 2
@@ -47,7 +47,7 @@ SFX_02_42_Ch2: ; b381 (2:7381)
 	endchannel
 
 
-SFX_02_42_Ch3: ; b39d (2:739d)
+SFX_Get_Key_Item_3_Ch3: ; 7eeaf (1f:6eaf)
 	executemusic
 	notetype 5, 1, 0
 	octave 4
@@ -57,4 +57,3 @@ SFX_02_42_Ch3: ; b39d (2:739d)
 	F_ 4
 	D# 8
 	endchannel
-; 0xb3a7
diff --git a/audio/sfx/sfx_02_57.asm b/audio/sfx/go_inside_1.asm
index e81877d1..1eb1e2ca 100755..100644
--- a/audio/sfx/sfx_02_57.asm
+++ b/audio/sfx/go_inside_1.asm
@@ -1,5 +1,4 @@
-SFX_02_57_Ch1: ; 83f1 (2:43f1)
+SFX_Go_Inside_1_Ch1: ; 83f1 (2:43f1)
 	unknownnoise0x20 9, 241, 68
 	unknownnoise0x20 8, 209, 67
 	endchannel
-; 0x83f8
diff --git a/audio/sfx/sfx_1f_57.asm b/audio/sfx/go_inside_3.asm
index 3ea03695..d8e18b7d 100755..100644
--- a/audio/sfx/sfx_1f_57.asm
+++ b/audio/sfx/go_inside_3.asm
@@ -1,5 +1,4 @@
-SFX_1f_57_Ch1: ; 7c3da (1f:43da)
+SFX_Go_Inside_3_Ch1: ; 7c3da (1f:43da)
 	unknownnoise0x20 9, 241, 68
 	unknownnoise0x20 8, 209, 67
 	endchannel
-; 0x7c3e1
diff --git a/audio/sfx/sfx_02_5c.asm b/audio/sfx/go_outside_1.asm
index 4f48870b..2e8a8b31 100755..100644
--- a/audio/sfx/sfx_02_5c.asm
+++ b/audio/sfx/go_outside_1.asm
@@ -1,8 +1,7 @@
-SFX_02_5c_Ch1: ; 8452 (2:4452)
+SFX_Go_Outside_1_Ch1: ; 8452 (2:4452)
 	unknownnoise0x20 2, 241, 84
 	unknownnoise0x20 12, 113, 35
 	unknownnoise0x20 2, 177, 84
 	unknownnoise0x20 12, 97, 35
 	unknownnoise0x20 6, 65, 84
 	endchannel
-; 0x8462
diff --git a/audio/sfx/sfx_1f_5c.asm b/audio/sfx/go_outside_3.asm
index 571db9a9..2dc4242d 100755..100644
--- a/audio/sfx/sfx_1f_5c.asm
+++ b/audio/sfx/go_outside_3.asm
@@ -1,8 +1,7 @@
-SFX_1f_5c_Ch1: ; 7c43b (1f:443b)
+SFX_Go_Outside_3_Ch1: ; 7c43b (1f:443b)
 	unknownnoise0x20 2, 241, 84
 	unknownnoise0x20 12, 113, 35
 	unknownnoise0x20 2, 177, 84
 	unknownnoise0x20 12, 97, 35
 	unknownnoise0x20 6, 65, 84
 	endchannel
-; 0x7c44b
diff --git a/audio/sfx/sfx_02_3e.asm b/audio/sfx/heal_ailment_1.asm
index 39757272..5937f3a2 100755..100644
--- a/audio/sfx/sfx_02_3e.asm
+++ b/audio/sfx/heal_ailment_1.asm
@@ -1,4 +1,4 @@
-SFX_02_3e_Ch1: ; 84d9 (2:44d9)
+SFX_Heal_Ailment_1_Ch1: ; 84d9 (2:44d9)
 	duty 2
 	unknownsfx0x10 20
 	unknownsfx0x20 4, 242, 0, 6
@@ -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_08_3e.asm b/audio/sfx/heal_ailment_2.asm
index 0808979b..4b39895a 100755..100644
--- a/audio/sfx/sfx_08_3e.asm
+++ b/audio/sfx/heal_ailment_2.asm
@@ -1,4 +1,4 @@
-SFX_08_3e_Ch1: ; 203fd (8:43fd)
+SFX_Heal_Ailment_2_Ch1: ; 203fd (8:43fd)
 	duty 2
 	unknownsfx0x10 20
 	unknownsfx0x20 4, 242, 0, 6
@@ -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_1f_3e.asm b/audio/sfx/heal_ailment_3.asm
index 89518f22..b2805f3d 100755..100644
--- a/audio/sfx/sfx_1f_3e.asm
+++ b/audio/sfx/heal_ailment_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_3e_Ch1: ; 7c4b2 (1f:44b2)
+SFX_Heal_Ailment_3_Ch1: ; 7c4b2 (1f:44b2)
 	duty 2
 	unknownsfx0x10 20
 	unknownsfx0x20 4, 242, 0, 6
@@ -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_02_3d.asm b/audio/sfx/heal_hp_1.asm
index 35f52890..eb8063f7 100755..100644
--- a/audio/sfx/sfx_02_3d.asm
+++ b/audio/sfx/heal_hp_1.asm
@@ -1,8 +1,7 @@
-SFX_02_3d_Ch1: ; 84b7 (2:44b7)
+SFX_Heal_HP_1_Ch1: ; 84b7 (2:44b7)
 	duty 2
 	unknownsfx0x10 23
 	unknownsfx0x20 15, 240, 240, 4
 	unknownsfx0x20 15, 242, 80, 6
 	unknownsfx0x10 8
 	endchannel
-; 0x84c6
diff --git a/audio/sfx/sfx_08_3d.asm b/audio/sfx/heal_hp_2.asm
index c263a999..890a2151 100755..100644
--- a/audio/sfx/sfx_08_3d.asm
+++ b/audio/sfx/heal_hp_2.asm
@@ -1,8 +1,7 @@
-SFX_08_3d_Ch1: ; 203ee (8:43ee)
+SFX_Heal_HP_2_Ch1: ; 203ee (8:43ee)
 	duty 2
 	unknownsfx0x10 23
 	unknownsfx0x20 15, 240, 240, 4
 	unknownsfx0x20 15, 242, 80, 6
 	unknownsfx0x10 8
 	endchannel
-; 0x203fd
diff --git a/audio/sfx/sfx_1f_3d.asm b/audio/sfx/heal_hp_3.asm
index 0275329d..da80d48f 100755..100644
--- a/audio/sfx/sfx_1f_3d.asm
+++ b/audio/sfx/heal_hp_3.asm
@@ -1,8 +1,7 @@
-SFX_1f_3d_Ch1: ; 7c490 (1f:4490)
+SFX_Heal_HP_3_Ch1: ; 7c490 (1f:4490)
 	duty 2
 	unknownsfx0x10 23
 	unknownsfx0x20 15, 240, 240, 4
 	unknownsfx0x20 15, 242, 80, 6
 	unknownsfx0x10 8
 	endchannel
-; 0x7c49f
diff --git a/audio/sfx/sfx_1f_4a.asm b/audio/sfx/healing_machine_1.asm
index 4e1c7e2e..4babf6b0 100755..100644
--- a/audio/sfx/sfx_1f_4a.asm
+++ b/audio/sfx/healing_machine_1.asm
@@ -1,4 +1,4 @@
-SFX_1f_4a_Ch1: ; 7c55d (1f:455d)
+SFX_Healing_Machine_1_Ch1: ; 8580 (2:4580)
 	duty 2
 	unknownsfx0x10 44
 	unknownsfx0x20 4, 242, 0, 5
@@ -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_02_4a.asm b/audio/sfx/healing_machine_3.asm
index f4f37ab8..c72f7905 100755..100644
--- a/audio/sfx/sfx_02_4a.asm
+++ b/audio/sfx/healing_machine_3.asm
@@ -1,4 +1,4 @@
-SFX_02_4a_Ch1: ; 8580 (2:4580)
+SFX_Healing_Machine_3_Ch1: ; 7c55d (1f:455d)
 	duty 2
 	unknownsfx0x10 44
 	unknownsfx0x20 4, 242, 0, 5
@@ -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_08_5f.asm b/audio/sfx/horn_drill.asm
index cd5da5a0..e68e5834 100755..100644
--- a/audio/sfx/sfx_08_5f.asm
+++ b/audio/sfx/horn_drill.asm
@@ -1,7 +1,6 @@
-SFX_08_5f_Ch1: ; 205b1 (8:45b1)
+SFX_Horn_Drill_Ch1: ; 205b1 (8:45b1)
 	unknownnoise0x20 3, 146, 49
 	unknownnoise0x20 3, 178, 50
 	unknownnoise0x20 3, 194, 51
 	unknownnoise0x20 8, 241, 84
 	endchannel
-; 0x205be
diff --git a/audio/sfx/sfx_1f_62.asm b/audio/sfx/intro_crash.asm
index 44a2c2c0..65e475f8 100755..100644
--- a/audio/sfx/sfx_1f_62.asm
+++ b/audio/sfx/intro_crash.asm
@@ -1,5 +1,4 @@
-SFX_1f_62_Ch1: ; 7c6de (1f:46de)
+SFX_Intro_Crash_Ch1: ; 7c6de (1f:46de)
 	unknownnoise0x20 2, 210, 50
 	unknownnoise0x20 15, 242, 67
 	endchannel
-; 0x7c6e5
diff --git a/audio/sfx/sfx_1f_5f.asm b/audio/sfx/intro_hip.asm
index 5a18de25..70d0f8b1 100755..100644
--- a/audio/sfx/sfx_1f_5f.asm
+++ b/audio/sfx/intro_hip.asm
@@ -1,7 +1,6 @@
-SFX_1f_5f_Ch1: ; 7c6be (1f:46be)
+SFX_Intro_Hip_Ch1: ; 7c6be (1f:46be)
 	duty 2
 	unknownsfx0x10 38
 	unknownsfx0x20 12, 194, 64, 7
 	unknownsfx0x10 8
 	endchannel
-; 0x7c6c9
diff --git a/audio/sfx/sfx_1f_60.asm b/audio/sfx/intro_hop.asm
index 424a2d28..223c7f25 100755..100644
--- a/audio/sfx/sfx_1f_60.asm
+++ b/audio/sfx/intro_hop.asm
@@ -1,7 +1,6 @@
-SFX_1f_60_Ch1: ; 7c6c9 (1f:46c9)
+SFX_Intro_Hop_Ch1: ; 7c6c9 (1f:46c9)
 	duty 2
 	unknownsfx0x10 38
 	unknownsfx0x20 12, 194, 128, 6
 	unknownsfx0x10 8
 	endchannel
-; 0x7c6d4
diff --git a/audio/sfx/sfx_1f_5e.asm b/audio/sfx/intro_lunge.asm
index 30de5a1a..ad00f56f 100755..100644
--- a/audio/sfx/sfx_1f_5e.asm
+++ b/audio/sfx/intro_lunge.asm
@@ -1,4 +1,4 @@
-SFX_1f_5e_Ch1: ; 7c6a5 (1f:46a5)
+SFX_Intro_Lunge_Ch1: ; 7c6a5 (1f:46a5)
 	unknownnoise0x20 6, 32, 16
 	unknownnoise0x20 6, 47, 64
 	unknownnoise0x20 6, 79, 65
@@ -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_61.asm b/audio/sfx/intro_raise.asm
index afc7dae3..d6ee1430 100755..100644
--- a/audio/sfx/sfx_1f_61.asm
+++ b/audio/sfx/intro_raise.asm
@@ -1,6 +1,5 @@
-SFX_1f_61_Ch1: ; 7c6d4 (1f:46d4)
+SFX_Intro_Raise_Ch1: ; 7c6d4 (1f:46d4)
 	unknownnoise0x20 2, 111, 33
 	unknownnoise0x20 2, 175, 49
 	unknownnoise0x20 15, 242, 65
 	endchannel
-; 0x7c6de
diff --git a/audio/sfx/sfx_1f_63.asm b/audio/sfx/intro_whoosh.asm
index f47ed1c1..903b7252 100755..100644
--- a/audio/sfx/sfx_1f_63.asm
+++ b/audio/sfx/intro_whoosh.asm
@@ -1,8 +1,7 @@
-SFX_1f_63_Ch1: ; 7c6e5 (1f:46e5)
+SFX_Intro_Whoosh_Ch1: ; 7c6e5 (1f:46e5)
 	unknownnoise0x20 4, 44, 32
 	unknownnoise0x20 3, 160, 32
 	unknownnoise0x20 3, 176, 33
 	unknownnoise0x20 3, 192, 34
 	unknownnoise0x20 15, 210, 36
 	endchannel
-; 0x7c6f5
diff --git a/audio/sfx/sfx_02_4e.asm b/audio/sfx/ledge_1.asm
index 9f204e21..dfd7c819 100755..100644
--- a/audio/sfx/sfx_02_4e.asm
+++ b/audio/sfx/ledge_1.asm
@@ -1,7 +1,6 @@
-SFX_02_4e_Ch1: ; 85d6 (2:45d6)
+SFX_Ledge_1_Ch1: ; 85d6 (2:45d6)
 	duty 2
 	unknownsfx0x10 149
 	unknownsfx0x20 15, 242, 0, 4
 	unknownsfx0x10 8
 	endchannel
-; 0x85e1
diff --git a/audio/sfx/sfx_1f_4e.asm b/audio/sfx/ledge_3.asm
index e3f4b6e5..2bf172e7 100755..100644
--- a/audio/sfx/sfx_1f_4e.asm
+++ b/audio/sfx/ledge_3.asm
@@ -1,7 +1,6 @@
-SFX_1f_4e_Ch1: ; 7c5b3 (1f:45b3)
+SFX_Ledge_3_Ch1: ; 7c5b3 (1f:45b3)
 	duty 2
 	unknownsfx0x10 149
 	unknownsfx0x20 15, 242, 0, 4
 	unknownsfx0x10 8
 	endchannel
-; 0x7c5be
diff --git a/audio/sfx/sfx_08_3a.asm b/audio/sfx/level_up.asm
index cc992756..03e077ec 100755..100644
--- a/audio/sfx/sfx_08_3a.asm
+++ b/audio/sfx/level_up.asm
@@ -1,4 +1,4 @@
-SFX_08_3a_Ch1: ; 2397d (8:797d)
+SFX_Level_Up_Ch1: ; 2397d (8:797d)
 	executemusic
 	tempo 256
 	volume 7, 7
@@ -20,7 +20,7 @@ SFX_08_3a_Ch1: ; 2397d (8:797d)
 	endchannel
 
 
-SFX_08_3a_Ch2: ; 23998 (8:7998)
+SFX_Level_Up_Ch2: ; 23998 (8:7998)
 	executemusic
 	vibrato 4, 2, 2
 	duty 2
@@ -40,7 +40,7 @@ SFX_08_3a_Ch2: ; 23998 (8:7998)
 	endchannel
 
 
-SFX_08_3a_Ch3: ; 239b0 (8:79b0)
+SFX_Level_Up_Ch3: ; 239b0 (8:79b0)
 	executemusic
 	notetype 6, 1, 0
 	octave 5
@@ -61,4 +61,3 @@ SFX_08_3a_Ch3: ; 239b0 (8:79b0)
 	rest 1
 	A_ 8
 	endchannel
-; 0x239c7
diff --git a/audio/sfx/sfx_02_0f.asm b/audio/sfx/muted_snare1_1.asm
index 906e27d0..5d10ecc1 100755..100644
--- a/audio/sfx/sfx_02_0f.asm
+++ b/audio/sfx/muted_snare1_1.asm
@@ -1,5 +1,4 @@
-SFX_02_0f_Ch1: ; 8347 (2:4347)
+SFX_Muted_Snare1_1_Ch1: ; 8347 (2:4347)
 	unknownnoise0x20 0, 161, 24
 	unknownnoise0x20 0, 49, 51
 	endchannel
-; 0x834e
diff --git a/audio/sfx/sfx_08_0f.asm b/audio/sfx/muted_snare1_2.asm
index b7bbfb7f..ea3cfc8c 100755..100644
--- a/audio/sfx/sfx_08_0f.asm
+++ b/audio/sfx/muted_snare1_2.asm
@@ -1,5 +1,4 @@
-SFX_08_0f_Ch1: ; 20347 (8:4347)
+SFX_Muted_Snare1_2_Ch1: ; 20347 (8:4347)
 	unknownnoise0x20 0, 161, 24
 	unknownnoise0x20 0, 49, 51
 	endchannel
-; 0x2034e
diff --git a/audio/sfx/sfx_1f_0f.asm b/audio/sfx/muted_snare1_3.asm
index c9cdaac4..27caa37b 100755..100644
--- a/audio/sfx/sfx_1f_0f.asm
+++ b/audio/sfx/muted_snare1_3.asm
@@ -1,5 +1,4 @@
-SFX_1f_0f_Ch1: ; 7c347 (1f:4347)
+SFX_Muted_Snare1_3_Ch1: ; 7c347 (1f:4347)
 	unknownnoise0x20 0, 161, 24
 	unknownnoise0x20 0, 49, 51
 	endchannel
-; 0x7c34e
diff --git a/audio/sfx/sfx_02_11.asm b/audio/sfx/muted_snare2_1.asm
index 34edf69a..7ab6252b 100755..100644
--- a/audio/sfx/sfx_02_11.asm
+++ b/audio/sfx/muted_snare2_1.asm
@@ -1,4 +1,3 @@
-SFX_02_11_Ch1: ; 8355 (2:4355)
+SFX_Muted_Snare2_1_Ch1: ; 8355 (2:4355)
 	unknownnoise0x20 0, 145, 34
 	endchannel
-; 0x8359
diff --git a/audio/sfx/muted_snare2_2.asm b/audio/sfx/muted_snare2_2.asm
new file mode 100644
index 00000000..a9359226
--- /dev/null
+++ b/audio/sfx/muted_snare2_2.asm
@@ -0,0 +1,3 @@
+SFX_Muted_Snare2_2_Ch1: ; 20355 (8:4355)
+	unknownnoise0x20 0, 145, 34
+	endchannel
diff --git a/audio/sfx/muted_snare2_3.asm b/audio/sfx/muted_snare2_3.asm
new file mode 100644
index 00000000..7ac9705d
--- /dev/null
+++ b/audio/sfx/muted_snare2_3.asm
@@ -0,0 +1,3 @@
+SFX_Muted_Snare2_3_Ch1: ; 7c355 (1f:4355)
+	unknownnoise0x20 0, 145, 34
+	endchannel
diff --git a/audio/sfx/sfx_02_12.asm b/audio/sfx/muted_snare3_1.asm
index 95ea4278..1cd27319 100755..100644
--- a/audio/sfx/sfx_02_12.asm
+++ b/audio/sfx/muted_snare3_1.asm
@@ -1,4 +1,3 @@
-SFX_02_12_Ch1: ; 8359 (2:4359)
+SFX_Muted_Snare3_1_Ch1: ; 8359 (2:4359)
 	unknownnoise0x20 0, 113, 34
 	endchannel
-; 0x835d
diff --git a/audio/sfx/muted_snare3_2.asm b/audio/sfx/muted_snare3_2.asm
new file mode 100644
index 00000000..1606b6d5
--- /dev/null
+++ b/audio/sfx/muted_snare3_2.asm
@@ -0,0 +1,3 @@
+SFX_Muted_Snare3_2_Ch1: ; 20359 (8:4359)
+	unknownnoise0x20 0, 113, 34
+	endchannel
diff --git a/audio/sfx/muted_snare3_3.asm b/audio/sfx/muted_snare3_3.asm
new file mode 100644
index 00000000..c0fe7efb
--- /dev/null
+++ b/audio/sfx/muted_snare3_3.asm
@@ -0,0 +1,3 @@
+SFX_Muted_Snare3_3_Ch1: ; 7c359 (1f:4359)
+	unknownnoise0x20 0, 113, 34
+	endchannel
diff --git a/audio/sfx/sfx_02_13.asm b/audio/sfx/muted_snare4_1.asm
index fcf6613a..bcac6440 100755..100644
--- a/audio/sfx/sfx_02_13.asm
+++ b/audio/sfx/muted_snare4_1.asm
@@ -1,4 +1,3 @@
-SFX_02_13_Ch1: ; 835d (2:435d)
+SFX_Muted_Snare4_1_Ch1: ; 835d (2:435d)
 	unknownnoise0x20 0, 97, 34
 	endchannel
-; 0x8361
diff --git a/audio/sfx/muted_snare4_2.asm b/audio/sfx/muted_snare4_2.asm
new file mode 100644
index 00000000..6910c20d
--- /dev/null
+++ b/audio/sfx/muted_snare4_2.asm
@@ -0,0 +1,3 @@
+SFX_Muted_Snare4_2_Ch1: ; 2035d (8:435d)
+	unknownnoise0x20 0, 97, 34
+	endchannel
diff --git a/audio/sfx/muted_snare4_3.asm b/audio/sfx/muted_snare4_3.asm
new file mode 100644
index 00000000..52f14f21
--- /dev/null
+++ b/audio/sfx/muted_snare4_3.asm
@@ -0,0 +1,3 @@
+SFX_Muted_Snare4_3_Ch1: ; 7c35d (1f:435d)
+	unknownnoise0x20 0, 97, 34
+	endchannel
diff --git a/audio/sfx/sfx_08_51.asm b/audio/sfx/not_very_effective.asm
index d34a0d2b..959f33e3 100755..100644
--- a/audio/sfx/sfx_08_51.asm
+++ b/audio/sfx/not_very_effective.asm
@@ -1,7 +1,6 @@
-SFX_08_51_Ch1: ; 204fe (8:44fe)
+SFX_Not_Very_Effective_Ch1: ; 204fe (8:44fe)
 	unknownnoise0x20 4, 143, 85
 	unknownnoise0x20 2, 244, 68
 	unknownnoise0x20 8, 244, 34
 	unknownnoise0x20 15, 242, 33
 	endchannel
-; 0x2050b
diff --git a/audio/sfx/peck.asm b/audio/sfx/peck.asm
new file mode 100644
index 00000000..e4632281
--- /dev/null
+++ b/audio/sfx/peck.asm
@@ -0,0 +1,3 @@
+SFX_Peck_Ch1: ; 204aa (8:44aa)
+	unknownnoise0x20 2, 161, 18
+	endchannel
diff --git a/audio/sfx/sfx_02_43.asm b/audio/sfx/poisoned_1.asm
index 3d588100..4760696d 100755..100644
--- a/audio/sfx/sfx_02_43.asm
+++ b/audio/sfx/poisoned_1.asm
@@ -1,9 +1,8 @@
-SFX_02_43_Ch1: ; 84c6 (2:44c6)
+SFX_Poisoned_1_Ch1: ; 84c6 (2:44c6)
 	duty 0
 	unknownsfx0x10 20
 	unknownsfx0x20 4, 242, 0, 6
-	loopchannel 4, SFX_02_43_Ch1
+	loopchannel 4, SFX_Poisoned_1_Ch1
 	unknownsfx0x20 15, 243, 0, 6
 	unknownsfx0x10 8
 	endchannel
-; 0x84d9
diff --git a/audio/sfx/sfx_1f_43.asm b/audio/sfx/poisoned_3.asm
index 94d8fb9c..b6d69dc6 100755..100644
--- a/audio/sfx/sfx_1f_43.asm
+++ b/audio/sfx/poisoned_3.asm
@@ -1,9 +1,8 @@
-SFX_1f_43_Ch1: ; 7c49f (1f:449f)
+SFX_Poisoned_3_Ch1: ; 7c49f (1f:449f)
 	duty 0
 	unknownsfx0x10 20
 	unknownsfx0x20 4, 242, 0, 6
-	loopchannel 4, SFX_1f_43_Ch1
+	loopchannel 4, SFX_Poisoned_3_Ch1
 	unknownsfx0x20 15, 243, 0, 6
 	unknownsfx0x10 8
 	endchannel
-; 0x7c4b2
diff --git a/audio/sfx/sfx_1f_41.asm b/audio/sfx/pokedex_rating_1.asm
index f255ba76..21503d16 100755..100644
--- a/audio/sfx/sfx_1f_41.asm
+++ b/audio/sfx/pokedex_rating_1.asm
@@ -1,4 +1,4 @@
-SFX_1f_41_Ch1: ; 7edda (1f:6dda)
+SFX_Pokedex_Rating_1_Ch1: ; b2c8 (2:72c8)
 	executemusic
 	tempo 256
 	volume 7, 7
@@ -21,7 +21,7 @@ SFX_1f_41_Ch1: ; 7edda (1f:6dda)
 	endchannel
 
 
-SFX_1f_41_Ch2: ; 7edf3 (1f:6df3)
+SFX_Pokedex_Rating_1_Ch2: ; b2e1 (2:72e1)
 	executemusic
 	duty 2
 	notetype 5, 12, 2
@@ -44,7 +44,7 @@ SFX_1f_41_Ch2: ; 7edf3 (1f:6df3)
 	endchannel
 
 
-SFX_1f_41_Ch3: ; 7ee09 (1f:6e09)
+SFX_Pokedex_Rating_1_Ch3: ; b2f7 (2:72f7)
 	executemusic
 	notetype 5, 1, 0
 	octave 5
@@ -75,4 +75,3 @@ SFX_1f_41_Ch3: ; 7ee09 (1f:6e09)
 	F_ 2
 	rest 2
 	endchannel
-; 0x7ee28
diff --git a/audio/sfx/sfx_02_41.asm b/audio/sfx/pokedex_rating_3.asm
index e40c1fe5..a9ea1c75 100755..100644
--- a/audio/sfx/sfx_02_41.asm
+++ b/audio/sfx/pokedex_rating_3.asm
@@ -1,4 +1,4 @@
-SFX_02_41_Ch1: ; b2c8 (2:72c8)
+SFX_Pokedex_Rating_3_Ch1: ; 7edda (1f:6dda)
 	executemusic
 	tempo 256
 	volume 7, 7
@@ -21,7 +21,7 @@ SFX_02_41_Ch1: ; b2c8 (2:72c8)
 	endchannel
 
 
-SFX_02_41_Ch2: ; b2e1 (2:72e1)
+SFX_Pokedex_Rating_3_Ch2: ; 7edf3 (1f:6df3)
 	executemusic
 	duty 2
 	notetype 5, 12, 2
@@ -44,7 +44,7 @@ SFX_02_41_Ch2: ; b2e1 (2:72e1)
 	endchannel
 
 
-SFX_02_41_Ch3: ; b2f7 (2:72f7)
+SFX_Pokedex_Rating_3_Ch3: ; 7ee09 (1f:6e09)
 	executemusic
 	notetype 5, 1, 0
 	octave 5
@@ -75,4 +75,3 @@ SFX_02_41_Ch3: ; b2f7 (2:72f7)
 	F_ 2
 	rest 2
 	endchannel
-; 0xb316
diff --git a/audio/sfx/sfx_02_5e.asm b/audio/sfx/pokeflute.asm
index cd04822d..4abf1713 100755..100644
--- a/audio/sfx/sfx_02_5e.asm
+++ b/audio/sfx/pokeflute.asm
@@ -1,4 +1,4 @@
-SFX_02_5e_Ch1: ; 83ca (2:43ca)
+SFX_Pokeflute_Ch1: ; 83ca (2:43ca)
 	vibrato 16, 1, 4
 	notetype 12, 1, 0
 	octave 5
@@ -19,4 +19,3 @@ SFX_02_5e_Ch1: ; 83ca (2:43ca)
 	G_ 8
 	rest 12
 	endchannel
-; 0x83e1
diff --git a/audio/sfx/sfx_08_pokeflute.asm b/audio/sfx/pokeflute_ch1_ch2.asm
index 4c015e73..4ccf89d8 100755..100644
--- a/audio/sfx/sfx_08_pokeflute.asm
+++ b/audio/sfx/pokeflute_ch1_ch2.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/pokeflute_ch3.asm
index e0060d7f..0652e673 100755..100644
--- a/audio/sfx/sfx_08_pokeflute_ch3.asm
+++ b/audio/sfx/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/pound.asm b/audio/sfx/pound.asm
new file mode 100644
index 00000000..102d7d6d
--- /dev/null
+++ b/audio/sfx/pound.asm
@@ -0,0 +1,3 @@
+SFX_Pound_Ch1: ; 204c4 (8:44c4)
+	unknownnoise0x20 2, 161, 34
+	endchannel
diff --git a/audio/sfx/sfx_02_40.asm b/audio/sfx/press_ab_1.asm
index 7b4edd6e..5925b788 100755..100644
--- a/audio/sfx/sfx_02_40.asm
+++ b/audio/sfx/press_ab_1.asm
@@ -1,8 +1,7 @@
-SFX_02_40_Ch1: ; 8462 (2:4462)
+SFX_Press_AB_1_Ch1: ; 8462 (2:4462)
 	duty 2
 	unknownsfx0x20 0, 145, 192, 7
 	unknownsfx0x20 0, 129, 208, 7
 	unknownsfx0x20 0, 145, 192, 7
 	unknownsfx0x20 12, 161, 208, 7
 	endchannel
-; 0x8475
diff --git a/audio/sfx/sfx_08_40.asm b/audio/sfx/press_ab_2.asm
index f62eb148..e15dadc4 100755..100644
--- a/audio/sfx/sfx_08_40.asm
+++ b/audio/sfx/press_ab_2.asm
@@ -1,8 +1,7 @@
-SFX_08_40_Ch1: ; 203c3 (8:43c3)
+SFX_Press_AB_2_Ch1: ; 203c3 (8:43c3)
 	duty 2
 	unknownsfx0x20 0, 145, 192, 7
 	unknownsfx0x20 0, 129, 208, 7
 	unknownsfx0x20 0, 145, 192, 7
 	unknownsfx0x20 12, 161, 208, 7
 	endchannel
-; 0x203d6
diff --git a/audio/sfx/sfx_1f_40.asm b/audio/sfx/press_ab_3.asm
index 05d2e17d..8af4a335 100755..100644
--- a/audio/sfx/sfx_1f_40.asm
+++ b/audio/sfx/press_ab_3.asm
@@ -1,8 +1,7 @@
-SFX_1f_40_Ch1: ; 7c44b (1f:444b)
+SFX_Press_AB_3_Ch1: ; 7c44b (1f:444b)
 	duty 2
 	unknownsfx0x20 0, 145, 192, 7
 	unknownsfx0x20 0, 129, 208, 7
 	unknownsfx0x20 0, 145, 192, 7
 	unknownsfx0x20 12, 161, 208, 7
 	endchannel
-; 0x7c45e
diff --git a/audio/sfx/sfx_08_6d.asm b/audio/sfx/psybeam.asm
index 7693df84..65fcc229 100755..100644
--- a/audio/sfx/sfx_08_6d.asm
+++ b/audio/sfx/psybeam.asm
@@ -1,26 +1,25 @@
-SFX_08_6d_Ch1: ; 20759 (8:4759)
+SFX_Psybeam_Ch1: ; 20759 (8:4759)
 	dutycycle 161
 	unknownsfx0x20 10, 241, 64, 6
 	unknownsfx0x20 10, 243, 128, 6
 	unknownsfx0x20 10, 242, 32, 6
-	loopchannel 4, SFX_08_6d_Ch1
+	loopchannel 4, SFX_Psybeam_Ch1
 	unknownsfx0x20 10, 241, 64, 6
 	endchannel
 
 
-SFX_08_6d_Ch2: ; 20770 (8:4770)
+SFX_Psybeam_Ch2: ; 20770 (8:4770)
 	dutycycle 179
 	unknownsfx0x20 10, 243, 113, 5
 	unknownsfx0x20 7, 227, 49, 5
 	unknownsfx0x20 10, 241, 81, 5
-	loopchannel 4, SFX_08_6d_Ch2
+	loopchannel 4, SFX_Psybeam_Ch2
 	unknownsfx0x20 10, 241, 113, 5
 	endchannel
 
 
-SFX_08_6d_Ch3: ; 20787 (8:4787)
+SFX_Psybeam_Ch3: ; 20787 (8:4787)
 	unknownnoise0x20 2, 209, 74
 	unknownnoise0x20 2, 210, 42
-	loopchannel 21, SFX_08_6d_Ch3
+	loopchannel 21, SFX_Psybeam_Ch3
 	endchannel
-; 0x20792
diff --git a/audio/sfx/sfx_08_70.asm b/audio/sfx/psychic_m.asm
index 9ac504ff..e734b7ac 100755..100644
--- a/audio/sfx/sfx_08_70.asm
+++ b/audio/sfx/psychic_m.asm
@@ -1,4 +1,4 @@
-SFX_08_70_Ch1: ; 207fa (8:47fa)
+SFX_Psychic_M_Ch1: ; 207fa (8:47fa)
 	duty 2
 	unknownsfx0x10 247
 	unknownsfx0x20 8, 196, 189, 7
@@ -11,7 +11,7 @@ SFX_08_70_Ch1: ; 207fa (8:47fa)
 	endchannel
 
 
-SFX_08_70_Ch2: ; 20819 (8:4819)
+SFX_Psychic_M_Ch2: ; 20819 (8:4819)
 	duty 2
 	unknownsfx0x20 8, 196, 112, 7
 	unknownsfx0x20 8, 196, 97, 7
@@ -22,7 +22,7 @@ SFX_08_70_Ch2: ; 20819 (8:4819)
 	endchannel
 
 
-SFX_08_70_Ch3: ; 20834 (8:4834)
+SFX_Psychic_M_Ch3: ; 20834 (8:4834)
 	unknownnoise0x20 15, 63, 20
 	unknownnoise0x20 15, 207, 19
 	unknownnoise0x20 15, 207, 18
@@ -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_02_5a.asm b/audio/sfx/purchase_1.asm
index 9ad8098e..fc0cecb5 100755..100644
--- a/audio/sfx/sfx_02_5a.asm
+++ b/audio/sfx/purchase_1.asm
@@ -1,14 +1,13 @@
-SFX_02_5a_Ch1: ; 842d (2:442d)
+SFX_Purchase_1_Ch1: ; 842d (2:442d)
 	duty 2
 	unknownsfx0x20 4, 225, 0, 7
 	unknownsfx0x20 8, 242, 224, 7
 	endchannel
 
 
-SFX_02_5a_Ch2: ; 8438 (2:4438)
+SFX_Purchase_1_Ch2: ; 8438 (2:4438)
 	duty 2
 	unknownsfx0x20 1, 8, 0, 0
 	unknownsfx0x20 4, 145, 193, 6
 	unknownsfx0x20 8, 162, 161, 7
 	endchannel
-; 0x8447
diff --git a/audio/sfx/sfx_1f_5a.asm b/audio/sfx/purchase_3.asm
index 567b331b..5d649958 100755..100644
--- a/audio/sfx/sfx_1f_5a.asm
+++ b/audio/sfx/purchase_3.asm
@@ -1,14 +1,13 @@
-SFX_1f_5a_Ch1: ; 7c416 (1f:4416)
+SFX_Purchase_3_Ch1: ; 7c416 (1f:4416)
 	duty 2
 	unknownsfx0x20 4, 225, 0, 7
 	unknownsfx0x20 8, 242, 224, 7
 	endchannel
 
 
-SFX_1f_5a_Ch2: ; 7c421 (1f:4421)
+SFX_Purchase_3_Ch2: ; 7c421 (1f:4421)
 	duty 2
 	unknownsfx0x20 1, 8, 0, 0
 	unknownsfx0x20 4, 145, 193, 6
 	unknownsfx0x20 8, 162, 161, 7
 	endchannel
-; 0x7c430
diff --git a/audio/sfx/sfx_02_53.asm b/audio/sfx/push_boulder_1.asm
index dc2f6d92..31096861 100755..100644
--- a/audio/sfx/sfx_02_53.asm
+++ b/audio/sfx/push_boulder_1.asm
@@ -1,4 +1,4 @@
-SFX_02_53_Ch1: ; 8654 (2:4654)
+SFX_Push_Boulder_1_Ch1: ; 8654 (2:4654)
 	unknownnoise0x20 4, 162, 35
 	unknownnoise0x20 8, 241, 52
 	unknownnoise0x20 15, 0, 0
@@ -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_1f_53.asm b/audio/sfx/push_boulder_3.asm
index 47d5d3dd..ca7d2cd1 100755..100644
--- a/audio/sfx/sfx_1f_53.asm
+++ b/audio/sfx/push_boulder_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_53_Ch1: ; 7c631 (1f:4631)
+SFX_Push_Boulder_3_Ch1: ; 7c631 (1f:4631)
 	unknownnoise0x20 4, 162, 35
 	unknownnoise0x20 8, 241, 52
 	unknownnoise0x20 15, 0, 0
@@ -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_08_44.asm b/audio/sfx/run.asm
index 57f8901a..653b0f6b 100755..100644
--- a/audio/sfx/sfx_08_44.asm
+++ b/audio/sfx/run.asm
@@ -1,4 +1,4 @@
-SFX_08_44_Ch1: ; 2045d (8:445d)
+SFX_Run_Ch1: ; 2045d (8:445d)
 	unknownnoise0x20 2, 97, 35
 	unknownnoise0x20 2, 161, 51
 	unknownnoise0x20 2, 193, 51
@@ -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_02_5f.asm b/audio/sfx/safari_zone_pa.asm
index 0a60c2b3..fb8c4d1f 100755..100644
--- a/audio/sfx/sfx_02_5f.asm
+++ b/audio/sfx/safari_zone_pa.asm
@@ -1,4 +1,4 @@
-SFX_02_5f_Ch1: ; 86c8 (2:46c8)
+SFX_Safari_Zone_PA_Ch1: ; 86c8 (2:46c8)
 	duty 2
 	unknownsfx0x20 15, 243, 48, 7
 	unknownsfx0x20 8, 101, 48, 7
@@ -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_5d.asm b/audio/sfx/save_1.asm
index b764b5e8..2e6c1f2b 100755..100644
--- a/audio/sfx/sfx_02_5d.asm
+++ b/audio/sfx/save_1.asm
@@ -1,4 +1,4 @@
-SFX_02_5d_Ch1: ; 8475 (2:4475)
+SFX_Save_1_Ch1: ; 8475 (2:4475)
 	duty 2
 	unknownsfx0x20 4, 244, 0, 7
 	unknownsfx0x20 2, 228, 0, 6
@@ -10,7 +10,7 @@ SFX_02_5d_Ch1: ; 8475 (2:4475)
 	endchannel
 
 
-SFX_02_5d_Ch2: ; 8494 (2:4494)
+SFX_Save_1_Ch2: ; 8494 (2:4494)
 	duty 2
 	unknownsfx0x20 4, 8, 0, 0
 	unknownsfx0x20 2, 212, 1, 7
@@ -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_1f_5d.asm b/audio/sfx/save_3.asm
index b26e5e09..70b6a81c 100755..100644
--- a/audio/sfx/sfx_1f_5d.asm
+++ b/audio/sfx/save_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_5d_Ch1: ; 7c45e (1f:445e)
+SFX_Save_3_Ch1: ; 7c45e (1f:445e)
 	duty 2
 	unknownsfx0x20 4, 244, 0, 7
 	unknownsfx0x20 3, 228, 128, 6
@@ -8,7 +8,7 @@ SFX_1f_5d_Ch1: ; 7c45e (1f:445e)
 	endchannel
 
 
-SFX_1f_5d_Ch2: ; 7c475 (1f:4475)
+SFX_Save_3_Ch2: ; 7c475 (1f:4475)
 	duty 2
 	unknownsfx0x20 4, 8, 0, 0
 	unknownsfx0x20 3, 212, 1, 7
@@ -17,4 +17,3 @@ SFX_1f_5d_Ch2: ; 7c475 (1f:4475)
 	unknownsfx0x20 3, 196, 1, 7
 	unknownsfx0x20 2, 196, 161, 7
 	endchannel
-; 0x7c490
diff --git a/audio/sfx/sfx_08_01.asm b/audio/sfx/sfx_08_01.asm
deleted file mode 100755
index ddfb484c..00000000
--- a/audio/sfx/sfx_08_01.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100755
index 38464468..00000000
--- a/audio/sfx/sfx_08_02.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100755
index 1e20c0ce..00000000
--- a/audio/sfx/sfx_08_03.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100755
index 01a30723..00000000
--- a/audio/sfx/sfx_08_04.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-SFX_08_04_Ch1: ; 20309 (8:4309)
-	unknownnoise0x20 0, 129, 51
-	endchannel
-; 0x2030d
diff --git a/audio/sfx/sfx_08_06.asm b/audio/sfx/sfx_08_06.asm
deleted file mode 100755
index 6d2d8366..00000000
--- a/audio/sfx/sfx_08_06.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-SFX_08_06_Ch1: ; 20320 (8:4320)
-	unknownnoise0x20 0, 81, 42
-	endchannel
-; 0x20324
diff --git a/audio/sfx/sfx_08_08.asm b/audio/sfx/sfx_08_08.asm
deleted file mode 100755
index d4ab06c1..00000000
--- a/audio/sfx/sfx_08_08.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100755
index 9e801da7..00000000
--- a/audio/sfx/sfx_08_09.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100755
index 6da585ac..00000000
--- a/audio/sfx/sfx_08_0a.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100755
index c2d0c079..00000000
--- a/audio/sfx/sfx_08_0b.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100755
index 9f872678..00000000
--- a/audio/sfx/sfx_08_0c.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100755
index 245add5b..00000000
--- a/audio/sfx/sfx_08_0d.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100755
index 096e0a33..00000000
--- a/audio/sfx/sfx_08_0e.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-SFX_08_0e_Ch1: ; 20343 (8:4343)
-	unknownnoise0x20 0, 162, 80
-	endchannel
-; 0x20347
diff --git a/audio/sfx/sfx_08_11.asm b/audio/sfx/sfx_08_11.asm
deleted file mode 100755
index ae617471..00000000
--- a/audio/sfx/sfx_08_11.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100755
index e391b0a9..00000000
--- a/audio/sfx/sfx_08_12.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100755
index 4c478514..00000000
--- a/audio/sfx/sfx_08_13.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-SFX_08_13_Ch1: ; 2035d (8:435d)
-	unknownnoise0x20 0, 97, 34
-	endchannel
-; 0x20361
diff --git a/audio/sfx/sfx_08_47.asm b/audio/sfx/sfx_08_47.asm
deleted file mode 100755
index 47f8b645..00000000
--- a/audio/sfx/sfx_08_47.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-SFX_08_47_Ch1: ; 204aa (8:44aa)
-	unknownnoise0x20 2, 161, 18
-	endchannel
-; 0x204ae
diff --git a/audio/sfx/sfx_08_4a.asm b/audio/sfx/sfx_08_4a.asm
deleted file mode 100755
index f566332b..00000000
--- a/audio/sfx/sfx_08_4a.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100755
index 24e6bfc3..00000000
--- a/audio/sfx/sfx_08_4b.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-SFX_08_4b_Ch1: ; 204c8 (8:44c8)
-	unknownnoise0x20 8, 241, 84
-	endchannel
-; 0x204cc
diff --git a/audio/sfx/sfx_1f_01.asm b/audio/sfx/sfx_1f_01.asm
deleted file mode 100755
index dec8baa6..00000000
--- a/audio/sfx/sfx_1f_01.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100755
index d383abed..00000000
--- a/audio/sfx/sfx_1f_02.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100755
index 57e18697..00000000
--- a/audio/sfx/sfx_1f_03.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100755
index 587d9f22..00000000
--- a/audio/sfx/sfx_1f_04.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-SFX_1f_04_Ch1: ; 7c309 (1f:4309)
-	unknownnoise0x20 0, 129, 51
-	endchannel
-; 0x7c30d
diff --git a/audio/sfx/sfx_1f_06.asm b/audio/sfx/sfx_1f_06.asm
deleted file mode 100755
index 0470795c..00000000
--- a/audio/sfx/sfx_1f_06.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-SFX_1f_06_Ch1: ; 7c320 (1f:4320)
-	unknownnoise0x20 0, 81, 42
-	endchannel
-; 0x7c324
diff --git a/audio/sfx/sfx_1f_08.asm b/audio/sfx/sfx_1f_08.asm
deleted file mode 100755
index 94c0e10d..00000000
--- a/audio/sfx/sfx_1f_08.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100755
index 4a9216e9..00000000
--- a/audio/sfx/sfx_1f_09.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100755
index b3c618ca..00000000
--- a/audio/sfx/sfx_1f_0a.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100755
index 5d21ffb8..00000000
--- a/audio/sfx/sfx_1f_0b.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100755
index 82cba9c0..00000000
--- a/audio/sfx/sfx_1f_0c.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100755
index b7d6ca2f..00000000
--- a/audio/sfx/sfx_1f_0d.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100755
index 397d78b1..00000000
--- a/audio/sfx/sfx_1f_0e.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-SFX_1f_0e_Ch1: ; 7c343 (1f:4343)
-	unknownnoise0x20 0, 162, 80
-	endchannel
-; 0x7c347
diff --git a/audio/sfx/sfx_1f_11.asm b/audio/sfx/sfx_1f_11.asm
deleted file mode 100755
index b0fe8073..00000000
--- a/audio/sfx/sfx_1f_11.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100755
index 8fc78082..00000000
--- a/audio/sfx/sfx_1f_12.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100755
index 831d50c4..00000000
--- a/audio/sfx/sfx_1f_13.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-SFX_1f_13_Ch1: ; 7c35d (1f:435d)
-	unknownnoise0x20 0, 97, 34
-	endchannel
-; 0x7c361
diff --git a/audio/sfx/sfx_1f_67.asm b/audio/sfx/shooting_star.asm
index 0ba27bad..2cb831c8 100755..100644
--- a/audio/sfx/sfx_1f_67.asm
+++ b/audio/sfx/shooting_star.asm
@@ -1,4 +1,4 @@
-SFX_1f_67_Ch1: ; 7c72d (1f:472d)
+SFX_Shooting_Star_Ch1: ; 7c72d (1f:472d)
 	dutycycle 228
 	unknownsfx0x10 47
 	unknownsfx0x20 4, 64, 224, 7
@@ -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_02_48.asm b/audio/sfx/shrink_1.asm
index 58dc2934..61ca1933 100755..100644
--- a/audio/sfx/sfx_02_48.asm
+++ b/audio/sfx/shrink_1.asm
@@ -1,4 +1,4 @@
-SFX_02_48_Ch1: ; 854e (2:454e)
+SFX_Shrink_1_Ch1: ; 854e (2:454e)
 	duty 1
 	unknownsfx0x10 23
 	unknownsfx0x20 15, 215, 0, 6
@@ -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_1f_48.asm b/audio/sfx/shrink_3.asm
index c0854070..59fe1556 100755..100644
--- a/audio/sfx/sfx_1f_48.asm
+++ b/audio/sfx/shrink_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_48_Ch1: ; 7c52b (1f:452b)
+SFX_Shrink_3_Ch1: ; 7c52b (1f:452b)
 	duty 1
 	unknownsfx0x10 23
 	unknownsfx0x20 15, 215, 0, 6
@@ -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_08_77.asm b/audio/sfx/silph_scope.asm
index 54a0aa3b..66e4fe95 100755..100644
--- a/audio/sfx/sfx_08_77.asm
+++ b/audio/sfx/silph_scope.asm
@@ -1,4 +1,4 @@
-SFX_08_77_Ch1: ; 20412 (8:4412)
+SFX_Silph_Scope_Ch1: ; 20412 (8:4412)
 	duty 0
 	unknownsfx0x20 0, 210, 0, 7
 	unknownsfx0x20 0, 210, 64, 7
@@ -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_1f_66.asm b/audio/sfx/slots_new_spin.asm
index 7ffa9bd2..d122517d 100755..100644
--- a/audio/sfx/sfx_1f_66.asm
+++ b/audio/sfx/slots_new_spin.asm
@@ -1,4 +1,4 @@
-SFX_1f_66_Ch1: ; 7c70f (1f:470f)
+SFX_Slots_New_Spin_Ch1: ; 7c70f (1f:470f)
 	duty 3
 	unknownsfx0x20 5, 225, 0, 7
 	unknownsfx0x20 2, 225, 128, 7
@@ -6,10 +6,9 @@ SFX_1f_66_Ch1: ; 7c70f (1f:470f)
 	endchannel
 
 
-SFX_1f_66_Ch2: ; 7c71e (1f:471e)
+SFX_Slots_New_Spin_Ch2: ; 7c71e (1f:471e)
 	duty 2
 	unknownsfx0x20 4, 193, 193, 6
 	unknownsfx0x20 2, 193, 65, 7
 	unknownsfx0x20 15, 209, 129, 7
 	endchannel
-; 0x7c72d
diff --git a/audio/sfx/sfx_1f_65.asm b/audio/sfx/slots_reward.asm
index 1f262365..2400c0df 100755..100644
--- a/audio/sfx/sfx_1f_65.asm
+++ b/audio/sfx/slots_reward.asm
@@ -1,6 +1,5 @@
-SFX_1f_65_Ch1: ; 7c704 (1f:4704)
+SFX_Slots_Reward_Ch1: ; 7c704 (1f:4704)
 	duty 2
 	unknownsfx0x20 2, 241, 0, 7
 	unknownsfx0x20 8, 129, 224, 7
 	endchannel
-; 0x7c70f
diff --git a/audio/sfx/sfx_1f_64.asm b/audio/sfx/slots_stop_wheel.asm
index 3e6ec789..e67af4c4 100755..100644
--- a/audio/sfx/sfx_1f_64.asm
+++ b/audio/sfx/slots_stop_wheel.asm
@@ -1,7 +1,6 @@
-SFX_1f_64_Ch1: ; 7c6f5 (1f:46f5)
+SFX_Slots_Stop_Wheel_Ch1: ; 7c6f5 (1f:46f5)
 	duty 2
 	unknownsfx0x20 1, 242, 160, 6
 	unknownsfx0x20 1, 242, 224, 6
 	unknownsfx0x20 8, 241, 0, 7
 	endchannel
-; 0x7c704
diff --git a/audio/sfx/sfx_02_01.asm b/audio/sfx/snare1_1.asm
index dfae6786..3aa0f74e 100755..100644
--- a/audio/sfx/sfx_02_01.asm
+++ b/audio/sfx/snare1_1.asm
@@ -1,4 +1,3 @@
-SFX_02_01_Ch1: ; 82fd (2:42fd)
+SFX_Snare1_1_Ch1: ; 82fd (2:42fd)
 	unknownnoise0x20 0, 193, 51
 	endchannel
-; 0x8301
diff --git a/audio/sfx/snare1_2.asm b/audio/sfx/snare1_2.asm
new file mode 100644
index 00000000..7d0c3413
--- /dev/null
+++ b/audio/sfx/snare1_2.asm
@@ -0,0 +1,3 @@
+SFX_Snare1_2_Ch1: ; 202fd (8:42fd)
+	unknownnoise0x20 0, 193, 51
+	endchannel
diff --git a/audio/sfx/snare1_3.asm b/audio/sfx/snare1_3.asm
new file mode 100644
index 00000000..8d92bff6
--- /dev/null
+++ b/audio/sfx/snare1_3.asm
@@ -0,0 +1,3 @@
+SFX_Snare1_3_Ch1: ; 7c2fd (1f:42fd)
+	unknownnoise0x20 0, 193, 51
+	endchannel
diff --git a/audio/sfx/sfx_02_02.asm b/audio/sfx/snare2_1.asm
index 8d0f3a34..7636a4f3 100755..100644
--- a/audio/sfx/sfx_02_02.asm
+++ b/audio/sfx/snare2_1.asm
@@ -1,4 +1,3 @@
-SFX_02_02_Ch1: ; 8301 (2:4301)
+SFX_Snare2_1_Ch1: ; 8301 (2:4301)
 	unknownnoise0x20 0, 177, 51
 	endchannel
-; 0x8305
diff --git a/audio/sfx/snare2_2.asm b/audio/sfx/snare2_2.asm
new file mode 100644
index 00000000..4c34e91a
--- /dev/null
+++ b/audio/sfx/snare2_2.asm
@@ -0,0 +1,3 @@
+SFX_Snare2_2_Ch1: ; 20301 (8:4301)
+	unknownnoise0x20 0, 177, 51
+	endchannel
diff --git a/audio/sfx/snare2_3.asm b/audio/sfx/snare2_3.asm
new file mode 100644
index 00000000..eb816f54
--- /dev/null
+++ b/audio/sfx/snare2_3.asm
@@ -0,0 +1,3 @@
+SFX_Snare2_3_Ch1: ; 7c301 (1f:4301)
+	unknownnoise0x20 0, 177, 51
+	endchannel
diff --git a/audio/sfx/sfx_02_03.asm b/audio/sfx/snare3_1.asm
index 9b8745e7..b7e319b2 100755..100644
--- a/audio/sfx/sfx_02_03.asm
+++ b/audio/sfx/snare3_1.asm
@@ -1,4 +1,3 @@
-SFX_02_03_Ch1: ; 8305 (2:4305)
+SFX_Snare3_1_Ch1: ; 8305 (2:4305)
 	unknownnoise0x20 0, 161, 51
 	endchannel
-; 0x8309
diff --git a/audio/sfx/snare3_2.asm b/audio/sfx/snare3_2.asm
new file mode 100644
index 00000000..ce889e55
--- /dev/null
+++ b/audio/sfx/snare3_2.asm
@@ -0,0 +1,3 @@
+SFX_Snare3_2_Ch1: ; 20305 (8:4305)
+	unknownnoise0x20 0, 161, 51
+	endchannel
diff --git a/audio/sfx/snare3_3.asm b/audio/sfx/snare3_3.asm
new file mode 100644
index 00000000..c94f436f
--- /dev/null
+++ b/audio/sfx/snare3_3.asm
@@ -0,0 +1,3 @@
+SFX_Snare3_3_Ch1: ; 7c305 (1f:4305)
+	unknownnoise0x20 0, 161, 51
+	endchannel
diff --git a/audio/sfx/sfx_02_04.asm b/audio/sfx/snare4_1.asm
index a0fe41e3..20c62731 100755..100644
--- a/audio/sfx/sfx_02_04.asm
+++ b/audio/sfx/snare4_1.asm
@@ -1,4 +1,3 @@
-SFX_02_04_Ch1: ; 8309 (2:4309)
+SFX_Snare4_1_Ch1: ; 8309 (2:4309)
 	unknownnoise0x20 0, 129, 51
 	endchannel
-; 0x830d
diff --git a/audio/sfx/snare4_2.asm b/audio/sfx/snare4_2.asm
new file mode 100644
index 00000000..da38dd62
--- /dev/null
+++ b/audio/sfx/snare4_2.asm
@@ -0,0 +1,3 @@
+SFX_Snare4_2_Ch1: ; 20309 (8:4309)
+	unknownnoise0x20 0, 129, 51
+	endchannel
diff --git a/audio/sfx/snare4_3.asm b/audio/sfx/snare4_3.asm
new file mode 100644
index 00000000..4496260b
--- /dev/null
+++ b/audio/sfx/snare4_3.asm
@@ -0,0 +1,3 @@
+SFX_Snare4_3_Ch1: ; 7c309 (1f:4309)
+	unknownnoise0x20 0, 129, 51
+	endchannel
diff --git a/audio/sfx/sfx_02_05.asm b/audio/sfx/snare5_1.asm
index f5df11e2..e0ae8b4c 100755..100644
--- a/audio/sfx/sfx_02_05.asm
+++ b/audio/sfx/snare5_1.asm
@@ -1,4 +1,4 @@
-SFX_02_05_Ch1: ; 830d (2:430d)
+SFX_Snare5_1_Ch1: ; 830d (2:430d)
 	unknownnoise0x20 7, 132, 55
 	unknownnoise0x20 6, 132, 54
 	unknownnoise0x20 5, 131, 53
@@ -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_08_05.asm b/audio/sfx/snare5_2.asm
index 1568969c..649463cc 100755..100644
--- a/audio/sfx/sfx_08_05.asm
+++ b/audio/sfx/snare5_2.asm
@@ -1,4 +1,4 @@
-SFX_08_05_Ch1: ; 2030d (8:430d)
+SFX_Snare5_2_Ch1: ; 2030d (8:430d)
 	unknownnoise0x20 7, 132, 55
 	unknownnoise0x20 6, 132, 54
 	unknownnoise0x20 5, 131, 53
@@ -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_1f_05.asm b/audio/sfx/snare5_3.asm
index 1edcdf20..33a169b9 100755..100644
--- a/audio/sfx/sfx_1f_05.asm
+++ b/audio/sfx/snare5_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_05_Ch1: ; 7c30d (1f:430d)
+SFX_Snare5_3_Ch1: ; 7c30d (1f:430d)
 	unknownnoise0x20 7, 132, 55
 	unknownnoise0x20 6, 132, 54
 	unknownnoise0x20 5, 131, 53
@@ -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_02_08.asm b/audio/sfx/snare6_1.asm
index 606587a0..4779226f 100755..100644
--- a/audio/sfx/sfx_02_08.asm
+++ b/audio/sfx/snare6_1.asm
@@ -1,4 +1,3 @@
-SFX_02_08_Ch1: ; 832b (2:432b)
+SFX_Snare6_1_Ch1: ; 832b (2:432b)
 	unknownnoise0x20 0, 129, 16
 	endchannel
-; 0x832f
diff --git a/audio/sfx/snare6_2.asm b/audio/sfx/snare6_2.asm
new file mode 100644
index 00000000..36359d02
--- /dev/null
+++ b/audio/sfx/snare6_2.asm
@@ -0,0 +1,3 @@
+SFX_Snare6_2_Ch1: ; 2032b (8:432b)
+	unknownnoise0x20 0, 129, 16
+	endchannel
diff --git a/audio/sfx/snare6_3.asm b/audio/sfx/snare6_3.asm
new file mode 100644
index 00000000..d4807ff6
--- /dev/null
+++ b/audio/sfx/snare6_3.asm
@@ -0,0 +1,3 @@
+SFX_Snare6_3_Ch1: ; 7c32b (1f:432b)
+	unknownnoise0x20 0, 129, 16
+	endchannel
diff --git a/audio/sfx/sfx_02_09.asm b/audio/sfx/snare7_1.asm
index 6b35f5aa..c53642ed 100755..100644
--- a/audio/sfx/sfx_02_09.asm
+++ b/audio/sfx/snare7_1.asm
@@ -1,4 +1,3 @@
-SFX_02_09_Ch1: ; 832f (2:432f)
+SFX_Snare7_1_Ch1: ; 832f (2:432f)
 	unknownnoise0x20 0, 130, 35
 	endchannel
-; 0x8333
diff --git a/audio/sfx/snare7_2.asm b/audio/sfx/snare7_2.asm
new file mode 100644
index 00000000..066aaa53
--- /dev/null
+++ b/audio/sfx/snare7_2.asm
@@ -0,0 +1,3 @@
+SFX_Snare7_2_Ch1: ; 2032f (8:432f)
+	unknownnoise0x20 0, 130, 35
+	endchannel
diff --git a/audio/sfx/snare7_3.asm b/audio/sfx/snare7_3.asm
new file mode 100644
index 00000000..1b058a9b
--- /dev/null
+++ b/audio/sfx/snare7_3.asm
@@ -0,0 +1,3 @@
+SFX_Snare7_3_Ch1: ; 7c32f (1f:432f)
+	unknownnoise0x20 0, 130, 35
+	endchannel
diff --git a/audio/sfx/sfx_02_0a.asm b/audio/sfx/snare8_1.asm
index cf9539b6..6269c7dc 100755..100644
--- a/audio/sfx/sfx_02_0a.asm
+++ b/audio/sfx/snare8_1.asm
@@ -1,4 +1,3 @@
-SFX_02_0a_Ch1: ; 8333 (2:4333)
+SFX_Snare8_1_Ch1: ; 8333 (2:4333)
 	unknownnoise0x20 0, 130, 37
 	endchannel
-; 0x8337
diff --git a/audio/sfx/snare8_2.asm b/audio/sfx/snare8_2.asm
new file mode 100644
index 00000000..4c5bb18e
--- /dev/null
+++ b/audio/sfx/snare8_2.asm
@@ -0,0 +1,3 @@
+SFX_Snare8_2_Ch1: ; 20333 (8:4333)
+	unknownnoise0x20 0, 130, 37
+	endchannel
diff --git a/audio/sfx/snare8_3.asm b/audio/sfx/snare8_3.asm
new file mode 100644
index 00000000..d1f0edc0
--- /dev/null
+++ b/audio/sfx/snare8_3.asm
@@ -0,0 +1,3 @@
+SFX_Snare8_3_Ch1: ; 7c333 (1f:4333)
+	unknownnoise0x20 0, 130, 37
+	endchannel
diff --git a/audio/sfx/sfx_02_0b.asm b/audio/sfx/snare9_1.asm
index f6142168..44b2e8c7 100755..100644
--- a/audio/sfx/sfx_02_0b.asm
+++ b/audio/sfx/snare9_1.asm
@@ -1,4 +1,3 @@
-SFX_02_0b_Ch1: ; 8337 (2:4337)
+SFX_Snare9_1_Ch1: ; 8337 (2:4337)
 	unknownnoise0x20 0, 130, 38
 	endchannel
-; 0x833b
diff --git a/audio/sfx/snare9_2.asm b/audio/sfx/snare9_2.asm
new file mode 100644
index 00000000..1d20de2d
--- /dev/null
+++ b/audio/sfx/snare9_2.asm
@@ -0,0 +1,3 @@
+SFX_Snare9_2_Ch1: ; 20337 (8:4337)
+	unknownnoise0x20 0, 130, 38
+	endchannel
diff --git a/audio/sfx/snare9_3.asm b/audio/sfx/snare9_3.asm
new file mode 100644
index 00000000..849f4404
--- /dev/null
+++ b/audio/sfx/snare9_3.asm
@@ -0,0 +1,3 @@
+SFX_Snare9_3_Ch1: ; 7c337 (1f:4337)
+	unknownnoise0x20 0, 130, 38
+	endchannel
diff --git a/audio/sfx/sfx_02_54.asm b/audio/sfx/ss_anne_horn_1.asm
index b15a29cc..3989c148 100755..100644
--- a/audio/sfx/sfx_02_54.asm
+++ b/audio/sfx/ss_anne_horn_1.asm
@@ -1,4 +1,4 @@
-SFX_02_54_Ch1: ; 866d (2:466d)
+SFX_SS_Anne_Horn_1_Ch1: ; 866d (2:466d)
 	duty 2
 	unknownsfx0x20 15, 240, 0, 5
 	unknownsfx0x20 4, 0, 0, 0
@@ -10,7 +10,7 @@ SFX_02_54_Ch1: ; 866d (2:466d)
 	endchannel
 
 
-SFX_02_54_Ch2: ; 868c (2:468c)
+SFX_SS_Anne_Horn_1_Ch2: ; 868c (2:468c)
 	duty 3
 	unknownsfx0x20 15, 240, 130, 4
 	unknownsfx0x20 4, 0, 0, 0
@@ -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_1f_54.asm b/audio/sfx/ss_anne_horn_3.asm
index 1a6a1031..c671b6cb 100755..100644
--- a/audio/sfx/sfx_1f_54.asm
+++ b/audio/sfx/ss_anne_horn_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_54_Ch1: ; 7c64a (1f:464a)
+SFX_SS_Anne_Horn_3_Ch1: ; 7c64a (1f:464a)
 	duty 2
 	unknownsfx0x20 15, 240, 0, 5
 	unknownsfx0x20 4, 0, 0, 0
@@ -10,7 +10,7 @@ SFX_1f_54_Ch1: ; 7c64a (1f:464a)
 	endchannel
 
 
-SFX_1f_54_Ch2: ; 7c669 (1f:4669)
+SFX_SS_Anne_Horn_3_Ch2: ; 7c669 (1f:4669)
 	duty 3
 	unknownsfx0x20 15, 240, 130, 4
 	unknownsfx0x20 4, 0, 0, 0
@@ -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_02_3f.asm b/audio/sfx/start_menu_1.asm
index 57d5feca..350b08ce 100755..100644
--- a/audio/sfx/sfx_02_3f.asm
+++ b/audio/sfx/start_menu_1.asm
@@ -1,5 +1,4 @@
-SFX_02_3f_Ch1: ; 83c3 (2:43c3)
+SFX_Start_Menu_1_Ch1: ; 83c3 (2:43c3)
 	unknownnoise0x20 1, 226, 51
 	unknownnoise0x20 8, 225, 34
 	endchannel
-; 0x83ca
diff --git a/audio/sfx/sfx_08_3f.asm b/audio/sfx/start_menu_2.asm
index 6351f53c..aabd41ce 100755..100644
--- a/audio/sfx/sfx_08_3f.asm
+++ b/audio/sfx/start_menu_2.asm
@@ -1,5 +1,4 @@
-SFX_08_3f_Ch1: ; 203d6 (8:43d6)
+SFX_Start_Menu_2_Ch1: ; 203d6 (8:43d6)
 	unknownnoise0x20 1, 226, 51
 	unknownnoise0x20 8, 225, 34
 	endchannel
-; 0x203dd
diff --git a/audio/sfx/sfx_1f_3f.asm b/audio/sfx/start_menu_3.asm
index 017daf8a..566f11f4 100755..100644
--- a/audio/sfx/sfx_1f_3f.asm
+++ b/audio/sfx/start_menu_3.asm
@@ -1,5 +1,4 @@
-SFX_1f_3f_Ch1: ; 7c3c3 (1f:43c3)
+SFX_Start_Menu_3_Ch1: ; 7c3c3 (1f:43c3)
 	unknownnoise0x20 1, 226, 51
 	unknownnoise0x20 8, 225, 34
 	endchannel
-; 0x7c3ca
diff --git a/audio/sfx/sfx_08_5a.asm b/audio/sfx/super_effective.asm
index 788ac25e..6759ef6a 100755..100644
--- a/audio/sfx/sfx_08_5a.asm
+++ b/audio/sfx/super_effective.asm
@@ -1,5 +1,4 @@
-SFX_08_5a_Ch1: ; 20574 (8:4574)
+SFX_Super_Effective_Ch1: ; 20574 (8:4574)
 	unknownnoise0x20 4, 241, 52
 	unknownnoise0x20 15, 242, 100
 	endchannel
-; 0x2057b
diff --git a/audio/sfx/sfx_02_58.asm b/audio/sfx/swap_1.asm
index bf45fc6c..c96d8522 100755..100644
--- a/audio/sfx/sfx_02_58.asm
+++ b/audio/sfx/swap_1.asm
@@ -1,12 +1,11 @@
-SFX_02_58_Ch1: ; 83f8 (2:43f8)
+SFX_Swap_1_Ch1: ; 83f8 (2:43f8)
 	duty 2
 	unknownsfx0x20 8, 225, 64, 7
 	endchannel
 
 
-SFX_02_58_Ch2: ; 83ff (2:43ff)
+SFX_Swap_1_Ch2: ; 83ff (2:43ff)
 	duty 2
 	unknownsfx0x20 2, 8, 0, 0
 	unknownsfx0x20 8, 177, 65, 7
 	endchannel
-; 0x840a
diff --git a/audio/sfx/sfx_1f_58.asm b/audio/sfx/swap_3.asm
index 6a27c732..95aa3f19 100755..100644
--- a/audio/sfx/sfx_1f_58.asm
+++ b/audio/sfx/swap_3.asm
@@ -1,12 +1,11 @@
-SFX_1f_58_Ch1: ; 7c3e1 (1f:43e1)
+SFX_Swap_3_Ch1: ; 7c3e1 (1f:43e1)
 	duty 2
 	unknownsfx0x20 8, 225, 64, 7
 	endchannel
 
 
-SFX_1f_58_Ch2: ; 7c3e8 (1f:43e8)
+SFX_Swap_3_Ch2: ; 7c3e8 (1f:43e8)
 	duty 2
 	unknownsfx0x20 2, 8, 0, 0
 	unknownsfx0x20 8, 177, 65, 7
 	endchannel
-; 0x7c3f3
diff --git a/audio/sfx/sfx_02_49.asm b/audio/sfx/switch_1.asm
index d2a9922b..040e95aa 100755..100644
--- a/audio/sfx/sfx_02_49.asm
+++ b/audio/sfx/switch_1.asm
@@ -1,4 +1,4 @@
-SFX_02_49_Ch1: ; 8569 (2:4569)
+SFX_Switch_1_Ch1: ; 8569 (2:4569)
 	duty 2
 	unknownsfx0x20 4, 0, 0, 0
 	unknownsfx0x20 2, 241, 128, 6
@@ -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_1f_49.asm b/audio/sfx/switch_3.asm
index f1ae8229..cbe6c8b2 100755..100644
--- a/audio/sfx/sfx_1f_49.asm
+++ b/audio/sfx/switch_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_49_Ch1: ; 7c546 (1f:4546)
+SFX_Switch_3_Ch1: ; 7c546 (1f:4546)
 	duty 2
 	unknownsfx0x20 4, 0, 0, 0
 	unknownsfx0x20 2, 241, 128, 6
@@ -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_02_4c.asm b/audio/sfx/teleport_enter1_1.asm
index 4bd47818..f9fc5ee2 100755..100644
--- a/audio/sfx/sfx_02_4c.asm
+++ b/audio/sfx/teleport_enter1_1.asm
@@ -1,4 +1,4 @@
-SFX_02_4c_Ch1: ; 85b0 (2:45b0)
+SFX_Teleport_Enter1_1_Ch1: ; 85b0 (2:45b0)
 	duty 1
 	unknownsfx0x10 23
 	unknownsfx0x20 15, 215, 0, 7
@@ -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_1f_4c.asm b/audio/sfx/teleport_enter1_3.asm
index 1f55c9c2..24220173 100755..100644
--- a/audio/sfx/sfx_1f_4c.asm
+++ b/audio/sfx/teleport_enter1_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_4c_Ch1: ; 7c58d (1f:458d)
+SFX_Teleport_Enter1_3_Ch1: ; 7c58d (1f:458d)
 	duty 1
 	unknownsfx0x10 23
 	unknownsfx0x20 15, 215, 0, 7
@@ -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_02_4f.asm b/audio/sfx/teleport_enter2_1.asm
index 268586bb..c3c593b2 100755..100644
--- a/audio/sfx/sfx_02_4f.asm
+++ b/audio/sfx/teleport_enter2_1.asm
@@ -1,7 +1,6 @@
-SFX_02_4f_Ch1: ; 85e1 (2:45e1)
+SFX_Teleport_Enter2_1_Ch1: ; 85e1 (2:45e1)
 	unknownnoise0x20 2, 241, 50
 	unknownnoise0x20 2, 0, 0
 	unknownnoise0x20 2, 241, 34
 	unknownnoise0x20 1, 0, 0
 	endchannel
-; 0x85ee
diff --git a/audio/sfx/sfx_1f_4f.asm b/audio/sfx/teleport_enter2_3.asm
index 5b73d196..628bb9fa 100755..100644
--- a/audio/sfx/sfx_1f_4f.asm
+++ b/audio/sfx/teleport_enter2_3.asm
@@ -1,7 +1,6 @@
-SFX_1f_4f_Ch1: ; 7c5be (1f:45be)
+SFX_Teleport_Enter2_3_Ch1: ; 7c5be (1f:45be)
 	unknownnoise0x20 2, 241, 50
 	unknownnoise0x20 2, 0, 0
 	unknownnoise0x20 2, 241, 34
 	unknownnoise0x20 1, 0, 0
 	endchannel
-; 0x7c5cb
diff --git a/audio/sfx/sfx_02_4b.asm b/audio/sfx/teleport_exit1_1.asm
index 5826cf25..46ba29cf 100755..100644
--- a/audio/sfx/sfx_02_4b.asm
+++ b/audio/sfx/teleport_exit1_1.asm
@@ -1,4 +1,4 @@
-SFX_02_4b_Ch1: ; 8595 (2:4595)
+SFX_Teleport_Exit1_1_Ch1: ; 8595 (2:4595)
 	duty 1
 	unknownsfx0x10 23
 	unknownsfx0x20 15, 215, 0, 5
@@ -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_1f_4b.asm b/audio/sfx/teleport_exit1_3.asm
index 2dc74200..8d203212 100755..100644
--- a/audio/sfx/sfx_1f_4b.asm
+++ b/audio/sfx/teleport_exit1_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_4b_Ch1: ; 7c572 (1f:4572)
+SFX_Teleport_Exit1_3_Ch1: ; 7c572 (1f:4572)
 	duty 1
 	unknownsfx0x10 23
 	unknownsfx0x20 15, 215, 0, 5
@@ -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_02_4d.asm b/audio/sfx/teleport_exit2_1.asm
index b3028e82..37159083 100755..100644
--- a/audio/sfx/sfx_02_4d.asm
+++ b/audio/sfx/teleport_exit2_1.asm
@@ -1,7 +1,6 @@
-SFX_02_4d_Ch1: ; 85cb (2:45cb)
+SFX_Teleport_Exit2_1_Ch1: ; 85cb (2:45cb)
 	duty 1
 	unknownsfx0x10 22
 	unknownsfx0x20 15, 210, 0, 5
 	unknownsfx0x10 8
 	endchannel
-; 0x85d6
diff --git a/audio/sfx/sfx_1f_4d.asm b/audio/sfx/teleport_exit2_3.asm
index 9c5686ec..c7ad054b 100755..100644
--- a/audio/sfx/sfx_1f_4d.asm
+++ b/audio/sfx/teleport_exit2_3.asm
@@ -1,7 +1,6 @@
-SFX_1f_4d_Ch1: ; 7c5a8 (1f:45a8)
+SFX_Teleport_Exit2_3_Ch1: ; 7c5a8 (1f:45a8)
 	duty 1
 	unknownsfx0x10 22
 	unknownsfx0x20 15, 210, 0, 5
 	unknownsfx0x10 8
 	endchannel
-; 0x7c5b3
diff --git a/audio/sfx/sfx_02_3c.asm b/audio/sfx/tink_1.asm
index 24858e3e..a8099ae1 100755..100644
--- a/audio/sfx/sfx_02_3c.asm
+++ b/audio/sfx/tink_1.asm
@@ -1,4 +1,4 @@
-SFX_02_3c_Ch1: ; 840a (2:440a)
+SFX_Tink_1_Ch1: ; 840a (2:440a)
 	duty 2
 	unknownsfx0x10 58
 	unknownsfx0x20 4, 242, 0, 2
@@ -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_08_3c.asm b/audio/sfx/tink_2.asm
index 2bbc9caf..cca37381 100755..100644
--- a/audio/sfx/sfx_08_3c.asm
+++ b/audio/sfx/tink_2.asm
@@ -1,4 +1,4 @@
-SFX_08_3c_Ch1: ; 203dd (8:43dd)
+SFX_Tink_2_Ch1: ; 203dd (8:43dd)
 	duty 2
 	unknownsfx0x10 58
 	unknownsfx0x20 4, 242, 0, 2
@@ -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_1f_3c.asm b/audio/sfx/tink_3.asm
index 051a4376..7299b7ae 100755..100644
--- a/audio/sfx/sfx_1f_3c.asm
+++ b/audio/sfx/tink_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_3c_Ch1: ; 7c3f3 (1f:43f3)
+SFX_Tink_3_Ch1: ; 7c3f3 (1f:43f3)
 	duty 2
 	unknownsfx0x10 58
 	unknownsfx0x20 4, 242, 0, 2
@@ -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_02_44.asm b/audio/sfx/trade_machine_1.asm
index 594b4b17..ce2bbc0a 100755..100644
--- a/audio/sfx/sfx_02_44.asm
+++ b/audio/sfx/trade_machine_1.asm
@@ -1,8 +1,7 @@
-SFX_02_44_Ch1: ; 84ee (2:44ee)
+SFX_Trade_Machine_1_Ch1: ; 84ee (2:44ee)
 	duty 2
 	unknownsfx0x10 21
 	unknownsfx0x20 15, 240, 240, 4
 	unknownsfx0x20 15, 242, 80, 6
 	unknownsfx0x10 8
 	endchannel
-; 0x84fd
diff --git a/audio/sfx/sfx_1f_44.asm b/audio/sfx/trade_machine_3.asm
index 4efbe345..f7515ffb 100755..100644
--- a/audio/sfx/sfx_1f_44.asm
+++ b/audio/sfx/trade_machine_3.asm
@@ -1,8 +1,7 @@
-SFX_1f_44_Ch1: ; 7c4c7 (1f:44c7)
+SFX_Trade_Machine_3_Ch1: ; 7c4c7 (1f:44c7)
 	duty 2
 	unknownsfx0x10 21
 	unknownsfx0x20 15, 240, 240, 4
 	unknownsfx0x20 15, 242, 80, 6
 	unknownsfx0x10 8
 	endchannel
-; 0x7c4d6
diff --git a/audio/sfx/sfx_02_06.asm b/audio/sfx/triangle1_1.asm
index cccff91b..fded5b94 100755..100644
--- a/audio/sfx/sfx_02_06.asm
+++ b/audio/sfx/triangle1_1.asm
@@ -1,4 +1,3 @@
-SFX_02_06_Ch1: ; 8320 (2:4320)
+SFX_Triangle1_1_Ch1: ; 8320 (2:4320)
 	unknownnoise0x20 0, 81, 42
 	endchannel
-; 0x8324
diff --git a/audio/sfx/triangle1_2.asm b/audio/sfx/triangle1_2.asm
new file mode 100644
index 00000000..4f4474ee
--- /dev/null
+++ b/audio/sfx/triangle1_2.asm
@@ -0,0 +1,3 @@
+SFX_Triangle1_2_Ch1: ; 20320 (8:4320)
+	unknownnoise0x20 0, 81, 42
+	endchannel
diff --git a/audio/sfx/triangle1_3.asm b/audio/sfx/triangle1_3.asm
new file mode 100644
index 00000000..d1ad9390
--- /dev/null
+++ b/audio/sfx/triangle1_3.asm
@@ -0,0 +1,3 @@
+SFX_Triangle1_3_Ch1: ; 7c320 (1f:4320)
+	unknownnoise0x20 0, 81, 42
+	endchannel
diff --git a/audio/sfx/sfx_02_07.asm b/audio/sfx/triangle2_1.asm
index d960c62e..f9c4bc6a 100755..100644
--- a/audio/sfx/sfx_02_07.asm
+++ b/audio/sfx/triangle2_1.asm
@@ -1,5 +1,4 @@
-SFX_02_07_Ch1: ; 8324 (2:4324)
+SFX_Triangle2_1_Ch1: ; 8324 (2:4324)
 	unknownnoise0x20 1, 65, 43
 	unknownnoise0x20 0, 97, 42
 	endchannel
-; 0x832b
diff --git a/audio/sfx/sfx_08_07.asm b/audio/sfx/triangle2_2.asm
index 7392a1d8..feddf1af 100755..100644
--- a/audio/sfx/sfx_08_07.asm
+++ b/audio/sfx/triangle2_2.asm
@@ -1,5 +1,4 @@
-SFX_08_07_Ch1: ; 20324 (8:4324)
+SFX_Triangle2_2_Ch1: ; 20324 (8:4324)
 	unknownnoise0x20 1, 65, 43
 	unknownnoise0x20 0, 97, 42
 	endchannel
-; 0x2032b
diff --git a/audio/sfx/sfx_1f_07.asm b/audio/sfx/triangle2_3.asm
index 0471d63a..a4acff1b 100755..100644
--- a/audio/sfx/sfx_1f_07.asm
+++ b/audio/sfx/triangle2_3.asm
@@ -1,5 +1,4 @@
-SFX_1f_07_Ch1: ; 7c324 (1f:4324)
+SFX_Triangle2_3_Ch1: ; 7c324 (1f:4324)
 	unknownnoise0x20 1, 65, 43
 	unknownnoise0x20 0, 97, 42
 	endchannel
-; 0x7c32b
diff --git a/audio/sfx/sfx_02_10.asm b/audio/sfx/triangle3_1.asm
index 04d67fba..e4c3c919 100755..100644
--- a/audio/sfx/sfx_02_10.asm
+++ b/audio/sfx/triangle3_1.asm
@@ -1,5 +1,4 @@
-SFX_02_10_Ch1: ; 834e (2:434e)
+SFX_Triangle3_1_Ch1: ; 834e (2:434e)
 	unknownnoise0x20 2, 145, 40
 	unknownnoise0x20 0, 113, 24
 	endchannel
-; 0x8355
diff --git a/audio/sfx/sfx_08_10.asm b/audio/sfx/triangle3_2.asm
index 6399a966..7a642878 100755..100644
--- a/audio/sfx/sfx_08_10.asm
+++ b/audio/sfx/triangle3_2.asm
@@ -1,5 +1,4 @@
-SFX_08_10_Ch1: ; 2034e (8:434e)
+SFX_Triangle3_2_Ch1: ; 2034e (8:434e)
 	unknownnoise0x20 2, 145, 40
 	unknownnoise0x20 0, 113, 24
 	endchannel
-; 0x20355
diff --git a/audio/sfx/sfx_1f_10.asm b/audio/sfx/triangle3_3.asm
index 34bd5cd2..73ad42ce 100755..100644
--- a/audio/sfx/sfx_1f_10.asm
+++ b/audio/sfx/triangle3_3.asm
@@ -1,5 +1,4 @@
-SFX_1f_10_Ch1: ; 7c34e (1f:434e)
+SFX_Triangle3_3_Ch1: ; 7c34e (1f:434e)
 	unknownnoise0x20 2, 145, 40
 	unknownnoise0x20 0, 113, 24
 	endchannel
-; 0x7c355
diff --git a/audio/sfx/sfx_02_46.asm b/audio/sfx/turn_off_pc_1.asm
index acd5299c..7b4e999d 100755..100644
--- a/audio/sfx/sfx_02_46.asm
+++ b/audio/sfx/turn_off_pc_1.asm
@@ -1,8 +1,7 @@
-SFX_02_46_Ch1: ; 8528 (2:4528)
+SFX_Turn_Off_PC_1_Ch1: ; 8528 (2:4528)
 	duty 2
 	unknownsfx0x20 4, 240, 0, 6
 	unknownsfx0x20 4, 240, 0, 4
 	unknownsfx0x20 4, 240, 0, 2
 	unknownsfx0x20 1, 0, 0, 0
 	endchannel
-; 0x853b
diff --git a/audio/sfx/sfx_1f_46.asm b/audio/sfx/turn_off_pc_3.asm
index 3989bd00..057ab9a4 100755..100644
--- a/audio/sfx/sfx_1f_46.asm
+++ b/audio/sfx/turn_off_pc_3.asm
@@ -1,8 +1,7 @@
-SFX_1f_46_Ch1: ; 7c505 (1f:4505)
+SFX_Turn_Off_PC_3_Ch1: ; 7c505 (1f:4505)
 	duty 2
 	unknownsfx0x20 4, 240, 0, 6
 	unknownsfx0x20 4, 240, 0, 4
 	unknownsfx0x20 4, 240, 0, 2
 	unknownsfx0x20 1, 0, 0, 0
 	endchannel
-; 0x7c518
diff --git a/audio/sfx/sfx_02_45.asm b/audio/sfx/turn_on_pc_1.asm
index 38243a99..b537791c 100755..100644
--- a/audio/sfx/sfx_02_45.asm
+++ b/audio/sfx/turn_on_pc_1.asm
@@ -1,4 +1,4 @@
-SFX_02_45_Ch1: ; 84fd (2:44fd)
+SFX_Turn_On_PC_1_Ch1: ; 84fd (2:44fd)
 	duty 2
 	unknownsfx0x20 15, 242, 192, 7
 	unknownsfx0x20 15, 0, 0, 0
@@ -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_1f_45.asm b/audio/sfx/turn_on_pc_3.asm
index e64cb337..df654cfa 100755..100644
--- a/audio/sfx/sfx_1f_45.asm
+++ b/audio/sfx/turn_on_pc_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_45_Ch1: ; 7c4d6 (1f:44d6)
+SFX_Turn_On_PC_3_Ch1: ; 7c4d6 (1f:44d6)
 	duty 2
 	unknownsfx0x20 15, 242, 192, 7
 	unknownsfx0x20 15, 0, 0, 0
@@ -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_08_unused2.asm b/audio/sfx/unused2_2.asm
index e69ec72d..1eca4432 100755..100644
--- a/audio/sfx/sfx_08_unused2.asm
+++ b/audio/sfx/unused2_2.asm
@@ -54,4 +54,3 @@ SFX_08_unused2_Ch3: ; 22359 (8:6359)
 	B_ 4
 	rest 4
 	endchannel
-; 0x22370
diff --git a/audio/sfx/sfx_02_unused.asm b/audio/sfx/unused_1.asm
index 919d7319..bd9bdfb3 100755..100644
--- a/audio/sfx/sfx_02_unused.asm
+++ b/audio/sfx/unused_1.asm
@@ -29,4 +29,3 @@ SFX_02_unused_Ch3: ; 8719 (2:4719)
 	unknownnoise0x20 12, 125, 76
 	unknownnoise0x20 15, 211, 76
 	endchannel
-; 0x872f
diff --git a/audio/sfx/sfx_08_unused.asm b/audio/sfx/unused_2.asm
index 857502d3..25e4840c 100755..100644
--- a/audio/sfx/sfx_08_unused.asm
+++ b/audio/sfx/unused_2.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_1f_unused.asm b/audio/sfx/unused_3.asm
index c4109f17..dfb16ee1 100755..100644
--- a/audio/sfx/sfx_1f_unused.asm
+++ b/audio/sfx/unused_3.asm
@@ -29,4 +29,3 @@ SFX_1f_unused_Ch3: ; 7c78e (1f:478e)
 	unknownnoise0x20 12, 125, 76
 	unknownnoise0x20 15, 211, 76
 	endchannel
-; 0x7c7a4
diff --git a/audio/sfx/sfx_08_55.asm b/audio/sfx/vine_whip.asm
index 50b73f0d..c1e610b6 100755..100644
--- a/audio/sfx/sfx_08_55.asm
+++ b/audio/sfx/vine_whip.asm
@@ -1,4 +1,4 @@
-SFX_08_55_Ch1: ; 20533 (8:4533)
+SFX_Vine_Whip_Ch1: ; 20533 (8:4533)
 	unknownnoise0x20 1, 194, 51
 	unknownnoise0x20 2, 242, 33
 	unknownnoise0x20 1, 226, 51
@@ -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_02_55.asm b/audio/sfx/withdraw_deposit_1.asm
index e4d46f3a..bb7a8d6e 100755..100644
--- a/audio/sfx/sfx_02_55.asm
+++ b/audio/sfx/withdraw_deposit_1.asm
@@ -1,4 +1,4 @@
-SFX_02_55_Ch1: ; 86ab (2:46ab)
+SFX_Withdraw_Deposit_1_Ch1: ; 86ab (2:46ab)
 	duty 1
 	unknownsfx0x10 58
 	unknownsfx0x20 4, 242, 0, 5
@@ -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_1f_55.asm b/audio/sfx/withdraw_deposit_3.asm
index 3622e334..99e47fee 100755..100644
--- a/audio/sfx/sfx_1f_55.asm
+++ b/audio/sfx/withdraw_deposit_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_55_Ch1: ; 7c688 (1f:4688)
+SFX_Withdraw_Deposit_3_Ch1: ; 7c688 (1f:4688)
 	duty 1
 	unknownsfx0x10 58
 	unknownsfx0x20 4, 242, 0, 5
@@ -10,4 +10,3 @@ SFX_1f_55_Ch1: ; 7c688 (1f:4688)
 	unknownsfx0x20 15, 226, 0, 7
 	unknownsfx0x10 8
 	endchannel
-; 0x7c6a5