56 files changed, 284 insertions, 285 deletions
diff --git a/audio.asm b/audio.asm
index 9e1a6046..cff600d2 100644
--- a/audio.asm
+++ b/audio.asm
@@ -381,59 +381,59 @@ INCLUDE "audio/sfx/noise_instrument17_4.asm"
 INCLUDE "audio/sfx/noise_instrument18_4.asm"
 INCLUDE "audio/sfx/noise_instrument19_4.asm"
 
-INCLUDE "audio/sfx/surfing_add_points.asm"
-INCLUDE "audio/sfx/unknown_80263.asm"
-INCLUDE "audio/sfx/unknown_8026a.asm"
-INCLUDE "audio/sfx/unknown_8027f.asm"
+INCLUDE "audio/sfx/press_ab_4.asm"
+INCLUDE "audio/sfx/start_menu_4.asm"
+INCLUDE "audio/sfx/heal_ailment_4.asm"
+INCLUDE "audio/sfx/heal_hp_4.asm"
 INCLUDE "audio/sfx/tink_4.asm"
 INCLUDE "audio/sfx/surfing_jump.asm"
 INCLUDE "audio/sfx/surfing_flip.asm"
 INCLUDE "audio/sfx/unknown_802cc.asm"
-INCLUDE "audio/sfx/surfing_crash.asm"
 INCLUDE "audio/sfx/surfing_land.asm"
+INCLUDE "audio/sfx/surfing_crash.asm"
 INCLUDE "audio/sfx/get_item2_4_2.asm"
-INCLUDE "audio/sfx/unknown_80337.asm"
-INCLUDE "audio/sfx/unknown_80383.asm"
-INCLUDE "audio/sfx/unknown_803da.asm"
-INCLUDE "audio/sfx/unknown_80411.asm"
-INCLUDE "audio/sfx/unknown_80467.asm"
-INCLUDE "audio/sfx/unknown_804bf.asm"
-INCLUDE "audio/sfx/unknown_804fa.asm"
-INCLUDE "audio/sfx/unknown_80545.asm"
-INCLUDE "audio/sfx/unknown_8058b.asm"
-INCLUDE "audio/sfx/unknown_805db.asm"
-INCLUDE "audio/sfx/unknown_80603.asm"
-INCLUDE "audio/sfx/unknown_80633.asm"
-INCLUDE "audio/sfx/unknown_80661.asm"
-INCLUDE "audio/sfx/unknown_80689.asm"
-INCLUDE "audio/sfx/unknown_806af.asm"
-INCLUDE "audio/sfx/unknown_80712.asm"
-INCLUDE "audio/sfx/unknown_80760.asm"
-INCLUDE "audio/sfx/unknown_8077e.asm"
-INCLUDE "audio/sfx/unknown_807eb.asm"
-INCLUDE "audio/sfx/unknown_8081e.asm"
-INCLUDE "audio/sfx/unknown_80879.asm"
-INCLUDE "audio/sfx/unknown_808a9.asm"
-INCLUDE "audio/sfx/unknown_808fa.asm"
-INCLUDE "audio/sfx/unknown_8091c.asm"
-INCLUDE "audio/sfx/unknown_80944.asm"
-INCLUDE "audio/sfx/unknown_8097f.asm"
-INCLUDE "audio/sfx/unknown_809b2.asm"
-INCLUDE "audio/sfx/unknown_809fb.asm"
-INCLUDE "audio/sfx/unknown_80a23.asm"
-INCLUDE "audio/sfx/unknown_80a89.asm"
-INCLUDE "audio/sfx/unknown_80ad2.asm"
-INCLUDE "audio/sfx/unknown_80b05.asm"
-INCLUDE "audio/sfx/unknown_80b53.asm"
-INCLUDE "audio/sfx/unknown_80b9c.asm"
-INCLUDE "audio/sfx/unknown_80be2.asm"
-INCLUDE "audio/sfx/unknown_80c3b.asm"
-INCLUDE "audio/sfx/unknown_80c6e.asm"
-INCLUDE "audio/sfx/unknown_80ca1.asm"
-INCLUDE "audio/sfx/unknown_80ce7.asm"
+INCLUDE "audio/sfx/unused_4.asm"
+INCLUDE "audio/sfx/cry09_4.asm"
+INCLUDE "audio/sfx/cry23_4.asm"
+INCLUDE "audio/sfx/cry24_4.asm"
+INCLUDE "audio/sfx/cry11_4.asm"
+INCLUDE "audio/sfx/cry25_4.asm"
+INCLUDE "audio/sfx/cry03_4.asm"
+INCLUDE "audio/sfx/cry0f_4.asm"
+INCLUDE "audio/sfx/cry10_4.asm"
+INCLUDE "audio/sfx/cry00_4.asm"
+INCLUDE "audio/sfx/cry0e_4.asm"
+INCLUDE "audio/sfx/cry06_4.asm"
+INCLUDE "audio/sfx/cry07_4.asm"
+INCLUDE "audio/sfx/cry05_4.asm"
+INCLUDE "audio/sfx/cry0b_4.asm"
+INCLUDE "audio/sfx/cry0c_4.asm"
+INCLUDE "audio/sfx/cry02_4.asm"
+INCLUDE "audio/sfx/cry0d_4.asm"
+INCLUDE "audio/sfx/cry01_4.asm"
+INCLUDE "audio/sfx/cry0a_4.asm"
+INCLUDE "audio/sfx/cry08_4.asm"
+INCLUDE "audio/sfx/cry04_4.asm"
+INCLUDE "audio/sfx/cry19_4.asm"
+INCLUDE "audio/sfx/cry16_4.asm"
+INCLUDE "audio/sfx/cry1b_4.asm"
+INCLUDE "audio/sfx/cry12_4.asm"
+INCLUDE "audio/sfx/cry13_4.asm"
+INCLUDE "audio/sfx/cry14_4.asm"
+INCLUDE "audio/sfx/cry1e_4.asm"
+INCLUDE "audio/sfx/cry15_4.asm"
+INCLUDE "audio/sfx/cry17_4.asm"
+INCLUDE "audio/sfx/cry1c_4.asm"
+INCLUDE "audio/sfx/cry1a_4.asm"
+INCLUDE "audio/sfx/cry1d_4.asm"
+INCLUDE "audio/sfx/cry18_4.asm"
+INCLUDE "audio/sfx/cry1f_4.asm"
+INCLUDE "audio/sfx/cry20_4.asm"
+INCLUDE "audio/sfx/cry21_4.asm"
+INCLUDE "audio/sfx/cry22_4.asm"
 INCLUDE "audio/music/printer.asm"
 INCLUDE "audio/sfx/get_item1_4.asm"
-INCLUDE "audio/sfx/unknown_80e91.asm"
+INCLUDE "audio/sfx/get_item1_4_2.asm"
 INCLUDE "audio/sfx/get_item2_4.asm"
 
 
diff --git a/audio/headers/sfxheaders1.asm b/audio/headers/sfxheaders1.asm
index de0d3b89..2d5eca4a 100644
--- a/audio/headers/sfxheaders1.asm
+++ b/audio/headers/sfxheaders1.asm
@@ -1,5 +1,5 @@
 SFX_Headers_1::
-	dbw -1, -1 ; padding
+	db $ff, $ff, $ff ; padding
 
 SFX_Noise_Instrument01_1::
 	audio_header SFX_Noise_Instrument01_1, Ch8
diff --git a/audio/headers/sfxheaders2.asm b/audio/headers/sfxheaders2.asm
index eb8eb4c1..912d137e 100644
--- a/audio/headers/sfxheaders2.asm
+++ b/audio/headers/sfxheaders2.asm
@@ -1,5 +1,5 @@
 SFX_Headers_2::
-	dbw -1, -1 ; padding
+	db $ff, $ff, $ff ; padding
 
 SFX_Noise_Instrument01_2::
 	audio_header SFX_Noise_Instrument01_2, Ch8
diff --git a/audio/headers/sfxheaders3.asm b/audio/headers/sfxheaders3.asm
index d1e0a127..2732767f 100644
--- a/audio/headers/sfxheaders3.asm
+++ b/audio/headers/sfxheaders3.asm
@@ -1,5 +1,5 @@
 SFX_Headers_3::
-	dbw -1, -1 ; padding
+	db $ff, $ff, $ff ; padding
 
 SFX_Noise_Instrument01_3::
 	audio_header SFX_Noise_Instrument01_3, Ch8
diff --git a/audio/headers/sfxheaders4.asm b/audio/headers/sfxheaders4.asm
index c7f7e9d6..d371d3f8 100644
--- a/audio/headers/sfxheaders4.asm
+++ b/audio/headers/sfxheaders4.asm
@@ -1,5 +1,5 @@
 SFX_Headers_4::
-	dbw -1, -1 ; padding
+	db $ff, $ff, $ff ; padding
 
 SFX_Noise_Instrument01_4::
 	audio_header SFX_Noise_Instrument01_4, Ch8
@@ -58,119 +58,119 @@ SFX_Noise_Instrument18_4::
 SFX_Noise_Instrument19_4::
 	audio_header SFX_Noise_Instrument19_4, Ch8
 
-SFX_Unknown_805db::
-	audio_header SFX_Unknown_805db, Ch5, Ch6, Ch8
+SFX_Cry00_4::
+	audio_header SFX_Cry00_4, Ch5, Ch6, Ch8
 
-SFX_Unknown_807eb::
-	audio_header SFX_Unknown_807eb, Ch5, Ch6, Ch8
+SFX_Cry01_4::
+	audio_header SFX_Cry01_4, Ch5, Ch6, Ch8
 
-SFX_Unknown_80760::
-	audio_header SFX_Unknown_80760, Ch5, Ch6, Ch8
+SFX_Cry02_4::
+	audio_header SFX_Cry02_4, Ch5, Ch6, Ch8
 
-SFX_Unknown_804fa::
-	audio_header SFX_Unknown_804fa, Ch5, Ch6, Ch8
+SFX_Cry03_4::
+	audio_header SFX_Cry03_4, Ch5, Ch6, Ch8
 
-SFX_Unknown_808a9::
-	audio_header SFX_Unknown_808a9, Ch5, Ch6, Ch8
+SFX_Cry04_4::
+	audio_header SFX_Cry04_4, Ch5, Ch6, Ch8
 
-SFX_Unknown_80689::
-	audio_header SFX_Unknown_80689, Ch5, Ch6, Ch8
+SFX_Cry05_4::
+	audio_header SFX_Cry05_4, Ch5, Ch6, Ch8
 
-SFX_Unknown_80633::
-	audio_header SFX_Unknown_80633, Ch5, Ch6, Ch8
+SFX_Cry06_4::
+	audio_header SFX_Cry06_4, Ch5, Ch6, Ch8
 
-SFX_Unknown_80661::
-	audio_header SFX_Unknown_80661, Ch5, Ch6, Ch8
+SFX_Cry07_4::
+	audio_header SFX_Cry07_4, Ch5, Ch6, Ch8
 
-SFX_Unknown_80879::
-	audio_header SFX_Unknown_80879, Ch5, Ch6, Ch8
+SFX_Cry08_4::
+	audio_header SFX_Cry08_4, Ch5, Ch6, Ch8
 
-SFX_Unknown_80383::
-	audio_header SFX_Unknown_80383, Ch5, Ch6, Ch8
+SFX_Cry09_4::
+	audio_header SFX_Cry09_4, Ch5, Ch6, Ch8
 
-SFX_Unknown_8081e::
-	audio_header SFX_Unknown_8081e, Ch5, Ch6, Ch8
+SFX_Cry0A_4::
+	audio_header SFX_Cry0A_4, Ch5, Ch6, Ch8
 
-SFX_Unknown_806af::
-	audio_header SFX_Unknown_806af, Ch5, Ch6, Ch8
+SFX_Cry0B_4::
+	audio_header SFX_Cry0B_4, Ch5, Ch6, Ch8
 
-SFX_Unknown_80712::
-	audio_header SFX_Unknown_80712, Ch5, Ch6, Ch8
+SFX_Cry0C_4::
+	audio_header SFX_Cry0C_4, Ch5, Ch6, Ch8
 
-SFX_Unknown_8077e::
-	audio_header SFX_Unknown_8077e, Ch5, Ch6, Ch8
+SFX_Cry0D_4::
+	audio_header SFX_Cry0D_4, Ch5, Ch6, Ch8
 
-SFX_Unknown_80603::
-	audio_header SFX_Unknown_80603, Ch5, Ch6, Ch8
+SFX_Cry0E_4::
+	audio_header SFX_Cry0E_4, Ch5, Ch6, Ch8
 
-SFX_Unknown_80545::
-	audio_header SFX_Unknown_80545, Ch5, Ch6, Ch8
+SFX_Cry0F_4::
+	audio_header SFX_Cry0F_4, Ch5, Ch6, Ch8
 
-SFX_Unknown_8058b::
-	audio_header SFX_Unknown_8058b, Ch5, Ch6, Ch8
+SFX_Cry10_4::
+	audio_header SFX_Cry10_4, Ch5, Ch6, Ch8
 
-SFX_Unknown_80467::
-	audio_header SFX_Unknown_80467, Ch5, Ch6, Ch8
+SFX_Cry11_4::
+	audio_header SFX_Cry11_4, Ch5, Ch6, Ch8
 
-SFX_Unknown_8097f::
-	audio_header SFX_Unknown_8097f, Ch5, Ch6, Ch8
+SFX_Cry12_4::
+	audio_header SFX_Cry12_4, Ch5, Ch6, Ch8
 
-SFX_Unknown_809b2::
-	audio_header SFX_Unknown_809b2, Ch5, Ch6, Ch8
+SFX_Cry13_4::
+	audio_header SFX_Cry13_4, Ch5, Ch6, Ch8
 
-SFX_Unknown_809fb::
-	audio_header SFX_Unknown_809fb, Ch5, Ch6, Ch8
+SFX_Cry14_4::
+	audio_header SFX_Cry14_4, Ch5, Ch6, Ch8
 
-SFX_Unknown_80a89::
-	audio_header SFX_Unknown_80a89, Ch5, Ch6, Ch8
+SFX_Cry15_4::
+	audio_header SFX_Cry15_4, Ch5, Ch6, Ch8
 
-SFX_Unknown_8091c::
-	audio_header SFX_Unknown_8091c, Ch5, Ch6, Ch8
+SFX_Cry16_4::
+	audio_header SFX_Cry16_4, Ch5, Ch6, Ch8
 
-SFX_Unknown_80ad2::
-	audio_header SFX_Unknown_80ad2, Ch5, Ch6, Ch8
+SFX_Cry17_4::
+	audio_header SFX_Cry17_4, Ch5, Ch6, Ch8
 
-SFX_Unknown_80be2::
-	audio_header SFX_Unknown_80be2, Ch5, Ch6, Ch8
+SFX_Cry18_4::
+	audio_header SFX_Cry18_4, Ch5, Ch6, Ch8
 
-SFX_Unknown_808fa::
-	audio_header SFX_Unknown_808fa, Ch5, Ch6, Ch8
+SFX_Cry19_4::
+	audio_header SFX_Cry19_4, Ch5, Ch6, Ch8
 
-SFX_Unknown_80b53::
-	audio_header SFX_Unknown_80b53, Ch5, Ch6, Ch8
+SFX_Cry1A_4::
+	audio_header SFX_Cry1A_4, Ch5, Ch6, Ch8
 
-SFX_Unknown_80944::
-	audio_header SFX_Unknown_80944, Ch5, Ch6, Ch8
+SFX_Cry1B_4::
+	audio_header SFX_Cry1B_4, Ch5, Ch6, Ch8
 
-SFX_Unknown_80b05::
-	audio_header SFX_Unknown_80b05, Ch5, Ch6, Ch8
+SFX_Cry1C_4::
+	audio_header SFX_Cry1C_4, Ch5, Ch6, Ch8
 
-SFX_Unknown_80b9c::
-	audio_header SFX_Unknown_80b9c, Ch5, Ch6, Ch8
+SFX_Cry1D_4::
+	audio_header SFX_Cry1D_4, Ch5, Ch6, Ch8
 
-SFX_Unknown_80a23::
-	audio_header SFX_Unknown_80a23, Ch5, Ch6, Ch8
+SFX_Cry1E_4::
+	audio_header SFX_Cry1E_4, Ch5, Ch6, Ch8
 
-SFX_Unknown_80c3b::
-	audio_header SFX_Unknown_80c3b, Ch5, Ch6, Ch8
+SFX_Cry1F_4::
+	audio_header SFX_Cry1F_4, Ch5, Ch6, Ch8
 
-SFX_Unknown_80c6e::
-	audio_header SFX_Unknown_80c6e, Ch5, Ch6, Ch8
+SFX_Cry20_4::
+	audio_header SFX_Cry20_4, Ch5, Ch6, Ch8
 
-SFX_Unknown_80ca1::
-	audio_header SFX_Unknown_80ca1, Ch5, Ch6, Ch8
+SFX_Cry21_4::
+	audio_header SFX_Cry21_4, Ch5, Ch6, Ch8
 
-SFX_Unknown_80ce7::
-	audio_header SFX_Unknown_80ce7, Ch5, Ch6, Ch8
+SFX_Cry22_4::
+	audio_header SFX_Cry22_4, Ch5, Ch6, Ch8
 
-SFX_Unknown_803da::
-	audio_header SFX_Unknown_803da, Ch5, Ch6, Ch8
+SFX_Cry23_4::
+	audio_header SFX_Cry23_4, Ch5, Ch6, Ch8
 
-SFX_Unknown_80411::
-	audio_header SFX_Unknown_80411, Ch5, Ch6, Ch8
+SFX_Cry24_4::
+	audio_header SFX_Cry24_4, Ch5, Ch6, Ch8
 
-SFX_Unknown_804bf::
-	audio_header SFX_Unknown_804bf, Ch5, Ch6, Ch8
+SFX_Cry25_4::
+	audio_header SFX_Cry25_4, Ch5, Ch6, Ch8
 
 SFX_Get_Item1_4::
 	audio_header SFX_Get_Item1_4, Ch5, Ch6, Ch7
@@ -181,17 +181,17 @@ SFX_Get_Item2_4::
 SFX_Tink_4::
 	audio_header SFX_Tink_4, Ch5
 
-SFX_Unknown_8027f::
-	audio_header SFX_Unknown_8027f, Ch5
+SFX_Heal_HP_4::
+	audio_header SFX_Heal_HP_4, Ch5
 
-SFX_Unknown_8026a::
-	audio_header SFX_Unknown_8026a, Ch5
+SFX_Heal_Ailment_4::
+	audio_header SFX_Heal_Ailment_4, Ch5
 
-SFX_Unknown_80263::
-	audio_header SFX_Unknown_80263, Ch8
+SFX_Start_Menu_4::
+	audio_header SFX_Start_Menu_4, Ch8
 
-SFX_Surfing_Add_Points::
-	audio_header SFX_Surfing_Add_Points, Ch5
+SFX_Press_AB_4::
+	audio_header SFX_Press_AB_4, Ch5
 
 SFX_Surfing_Jump::
 	audio_header SFX_Surfing_Jump, Ch8
@@ -199,14 +199,14 @@ SFX_Surfing_Jump::
 SFX_Surfing_Flip::
 	audio_header SFX_Surfing_Flip, Ch5
 
-SFX_Surfing_Land::
-	audio_header SFX_Surfing_Land, Ch8
+SFX_Surfing_Crash::
+	audio_header SFX_Surfing_Crash, Ch8
 
 SFX_Unknown_802cc::
 	audio_header SFX_Unknown_802cc, Ch5
 
-SFX_Surfing_Crash::
-	audio_header SFX_Surfing_Crash, Ch8
+SFX_Surfing_Land::
+	audio_header SFX_Surfing_Land, Ch8
 
 SFX_Get_Item2_4_2::
 	audio_header SFX_Get_Item2_4_2, Ch5, Ch6, Ch7
diff --git a/audio/sfx/battle_27.asm b/audio/sfx/battle_27.asm
index 1b505811..33f273fa 100644
--- a/audio/sfx/battle_27.asm
+++ b/audio/sfx/battle_27.asm
@@ -2,9 +2,9 @@ SFX_Battle_27_Ch5:
 	duty_cycle 2
 	square_note 15, 3, -7, 1984
 
-SFX_Battle_27_branch_2062a:
+SFX_Battle_27_branch_205da:
 	square_note 15, 13, -7, 1984
-	sound_loop 4, SFX_Battle_27_branch_2062a
+	sound_loop 4, SFX_Battle_27_branch_205da
 	square_note 15, 13, 1, 1984
 	sound_ret
 
@@ -13,9 +13,9 @@ SFX_Battle_27_Ch6:
 	duty_cycle_pattern 2, 3, 0, 3
 	square_note 15, 2, -7, 1992
 
-SFX_Battle_27_branch_2063d:
+SFX_Battle_27_branch_205ed:
 	square_note 15, 12, -7, 1991
-	sound_loop 4, SFX_Battle_27_branch_2063d
+	sound_loop 4, SFX_Battle_27_branch_205ed
 	square_note 15, 12, 1, 1992
 	sound_ret
 
diff --git a/audio/sfx/battle_36.asm b/audio/sfx/battle_36.asm
index 773bf753..ea4d351f 100644
--- a/audio/sfx/battle_36.asm
+++ b/audio/sfx/battle_36.asm
@@ -12,10 +12,10 @@ SFX_Battle_36_Ch5:
 	square_note 2, 15, 1, 1792
 	square_note 2, 15, 1, 2000
 
-SFX_Battle_36_branch_20930:
+SFX_Battle_36_branch_208e0:
 	square_note 2, 15, 1, 1792
 	square_note 2, 15, 1, 2016
-	sound_loop 12, SFX_Battle_36_branch_20930
+	sound_loop 12, SFX_Battle_36_branch_208e0
 	square_note 15, 15, 1, 1792
 	sound_ret
 
@@ -35,7 +35,7 @@ SFX_Battle_36_Ch6:
 	square_note 2, 15, 1, 2001
 	square_note 2, 15, 1, 1793
 	square_note 2, 15, 1, 2017
-	sound_loop 12, SFX_Battle_36_branch_20930
+	sound_loop 12, SFX_Battle_36_branch_208e0
 	square_note 15, 15, 1, 1793
 	sound_ret
 
diff --git a/audio/sfx/unknown_805db.asm b/audio/sfx/cry00_4.asm
index 7bb82004..87bf036e 100644
--- a/audio/sfx/unknown_805db.asm
+++ b/audio/sfx/cry00_4.asm
@@ -1,4 +1,4 @@
-SFX_Unknown_805db_Ch5:
+SFX_Cry00_4_Ch5:
 	duty_cycle_pattern 3, 3, 1, 1
 	square_note 4, 15, 3, 1816
 	square_note 15, 14, 5, 1944
@@ -6,7 +6,7 @@ SFX_Unknown_805db_Ch5:
 	sound_ret
 
 
-SFX_Unknown_805db_Ch6:
+SFX_Cry00_4_Ch6:
 	duty_cycle_pattern 2, 2, 0, 0
 	square_note 5, 11, 3, 1800
 	square_note 15, 12, 5, 1928
@@ -14,7 +14,7 @@ SFX_Unknown_805db_Ch6:
 	sound_ret
 
 
-SFX_Unknown_805db_Ch8:
+SFX_Cry00_4_Ch8:
 	noise_note 3, 10, 1, 28
 	noise_note 14, 9, 4, 44
 	noise_note 8, 8, 1, 28
diff --git a/audio/sfx/unknown_807eb.asm b/audio/sfx/cry01_4.asm
index c98628a0..98824d06 100644
--- a/audio/sfx/unknown_807eb.asm
+++ b/audio/sfx/cry01_4.asm
@@ -1,4 +1,4 @@
-SFX_Unknown_807eb_Ch5:
+SFX_Cry01_4_Ch5:
 	duty_cycle_pattern 2, 2, 0, 0
 	square_note 4, 15, 3, 1536
 	square_note 8, 13, 5, 1888
@@ -7,7 +7,7 @@ SFX_Unknown_807eb_Ch5:
 	sound_ret
 
 
-SFX_Unknown_807eb_Ch6:
+SFX_Cry01_4_Ch6:
 	duty_cycle_pattern 1, 1, 2, 2
 	square_note 5, 11, 3, 1777
 	square_note 7, 12, 5, 1874
@@ -16,7 +16,7 @@ SFX_Unknown_807eb_Ch6:
 	sound_ret
 
 
-SFX_Unknown_807eb_Ch8:
+SFX_Cry01_4_Ch8:
 	noise_note 3, 10, 2, 60
 	noise_note 12, 9, 4, 44
 	noise_note 3, 8, 2, 28
diff --git a/audio/sfx/unknown_80760.asm b/audio/sfx/cry02_4.asm
index 4fd9eba2..aed17087 100644
--- a/audio/sfx/unknown_80760.asm
+++ b/audio/sfx/cry02_4.asm
@@ -1,4 +1,4 @@
-SFX_Unknown_80760_Ch5:
+SFX_Cry02_4_Ch5:
 	duty_cycle 0
 	square_note 8, 15, 5, 1152
 	square_note 2, 14, 1, 1504
@@ -6,12 +6,12 @@ SFX_Unknown_80760_Ch5:
 	sound_ret
 
 
-SFX_Unknown_80760_Ch6:
+SFX_Cry02_4_Ch6:
 	duty_cycle_pattern 2, 2, 1, 1
 	square_note 7, 9, 5, 1089
 	square_note 2, 8, 1, 1313
 	square_note 8, 6, 1, 1306
 
 
-SFX_Unknown_80760_Ch8:
+SFX_Cry02_4_Ch8:
 	sound_ret
diff --git a/audio/sfx/unknown_804fa.asm b/audio/sfx/cry03_4.asm
index 0660ffd5..b4de22ce 100644
--- a/audio/sfx/unknown_804fa.asm
+++ b/audio/sfx/cry03_4.asm
@@ -1,4 +1,4 @@
-SFX_Unknown_804fa_Ch5:
+SFX_Cry03_4_Ch5:
 	duty_cycle_pattern 3, 3, 0, 0
 	square_note 4, 15, 7, 1544
 	square_note 6, 14, 6, 1536
@@ -10,7 +10,7 @@ SFX_Unknown_804fa_Ch5:
 	sound_ret
 
 
-SFX_Unknown_804fa_Ch6:
+SFX_Cry03_4_Ch6:
 	duty_cycle_pattern 0, 0, 2, 2
 	square_note 4, 12, 7, 1284
 	square_note 6, 10, 6, 1282
@@ -22,7 +22,7 @@ SFX_Unknown_804fa_Ch6:
 	sound_ret
 
 
-SFX_Unknown_804fa_Ch8:
+SFX_Cry03_4_Ch8:
 	noise_note 12, 14, 4, 76
 	noise_note 10, 12, 7, 92
 	noise_note 12, 11, 6, 76
diff --git a/audio/sfx/unknown_808a9.asm b/audio/sfx/cry04_4.asm
index b27eeada..408ab37a 100644
--- a/audio/sfx/unknown_808a9.asm
+++ b/audio/sfx/cry04_4.asm
@@ -1,4 +1,4 @@
-SFX_Unknown_808a9_Ch5:
+SFX_Cry04_4_Ch5:
 	duty_cycle_pattern 3, 3, 0, 0
 	square_note 4, 15, 7, 1696
 	square_note 8, 14, 6, 1700
@@ -10,7 +10,7 @@ SFX_Unknown_808a9_Ch5:
 	sound_ret
 
 
-SFX_Unknown_808a9_Ch6:
+SFX_Cry04_4_Ch6:
 	duty_cycle_pattern 1, 1, 2, 2
 	square_note 4, 14, 7, 1537
 	square_note 8, 13, 6, 1539
@@ -22,7 +22,7 @@ SFX_Unknown_808a9_Ch6:
 	sound_ret
 
 
-SFX_Unknown_808a9_Ch8:
+SFX_Cry04_4_Ch8:
 	noise_note 7, 13, 6, 92
 	noise_note 8, 14, 6, 76
 	noise_note 4, 13, 4, 92
diff --git a/audio/sfx/unknown_80689.asm b/audio/sfx/cry05_4.asm
index 50e3d7dc..cce656b1 100644
--- a/audio/sfx/unknown_80689.asm
+++ b/audio/sfx/cry05_4.asm
@@ -1,4 +1,4 @@
-SFX_Unknown_80689_Ch5:
+SFX_Cry05_4_Ch5:
 	duty_cycle_pattern 0, 0, 2, 2
 	square_note 6, 14, 2, 1280
 	square_note 6, 14, 3, 1408
@@ -7,7 +7,7 @@ SFX_Unknown_80689_Ch5:
 	sound_ret
 
 
-SFX_Unknown_80689_Ch6:
+SFX_Cry05_4_Ch6:
 	duty_cycle_pattern 3, 3, 1, 1
 	square_note 6, 14, 2, 1154
 	square_note 6, 13, 3, 1281
@@ -15,5 +15,5 @@ SFX_Unknown_80689_Ch6:
 	square_note 8, 8, 1, 1217
 
 
-SFX_Unknown_80689_Ch8:
+SFX_Cry05_4_Ch8:
 	sound_ret
diff --git a/audio/sfx/unknown_80633.asm b/audio/sfx/cry06_4.asm
index c2b421e1..2fbbb161 100644
--- a/audio/sfx/unknown_80633.asm
+++ b/audio/sfx/cry06_4.asm
@@ -1,4 +1,4 @@
-SFX_Unknown_80633_Ch5:
+SFX_Cry06_4_Ch5:
 	duty_cycle_pattern 3, 3, 2, 2
 	square_note 6, 8, 3, 583
 	square_note 15, 6, 2, 550
@@ -8,11 +8,11 @@ SFX_Unknown_80633_Ch5:
 	square_note 15, 4, 2, 519
 
 
-SFX_Unknown_80633_Ch6:
+SFX_Cry06_4_Ch6:
 	sound_ret
 
 
-SFX_Unknown_80633_Ch8:
+SFX_Cry06_4_Ch8:
 	noise_note 8, 13, 4, 140
 	noise_note 4, 14, 2, 156
 	noise_note 15, 12, 6, 140
diff --git a/audio/sfx/unknown_80661.asm b/audio/sfx/cry07_4.asm
index e45a2b1f..7e44544f 100644
--- a/audio/sfx/unknown_80661.asm
+++ b/audio/sfx/cry07_4.asm
@@ -1,4 +1,4 @@
-SFX_Unknown_80661_Ch5:
+SFX_Cry07_4_Ch5:
 	duty_cycle_pattern 3, 3, 0, 0
 	square_note 4, 15, 3, 1760
 	square_note 15, 14, 4, 1600
@@ -6,7 +6,7 @@ SFX_Unknown_80661_Ch5:
 	sound_ret
 
 
-SFX_Unknown_80661_Ch6:
+SFX_Cry07_4_Ch6:
 	duty_cycle_pattern 0, 0, 2, 2
 	square_note 3, 12, 3, 1667
 	square_note 14, 11, 4, 1538
@@ -14,7 +14,7 @@ SFX_Unknown_80661_Ch6:
 	sound_ret
 
 
-SFX_Unknown_80661_Ch8:
+SFX_Cry07_4_Ch8:
 	noise_note 4, 13, 3, 92
 	noise_note 15, 14, 6, 76
 	noise_note 8, 11, 1, 92
diff --git a/audio/sfx/unknown_80879.asm b/audio/sfx/cry08_4.asm
index bbb4043e..67dcb820 100644
--- a/audio/sfx/unknown_80879.asm
+++ b/audio/sfx/cry08_4.asm
@@ -1,4 +1,4 @@
-SFX_Unknown_80879_Ch5:
+SFX_Cry08_4_Ch5:
 	duty_cycle_pattern 3, 3, 0, 0
 	square_note 15, 15, 6, 1381
 	square_note 10, 14, 4, 1404
@@ -7,7 +7,7 @@ SFX_Unknown_80879_Ch5:
 	sound_ret
 
 
-SFX_Unknown_80879_Ch6:
+SFX_Cry08_4_Ch6:
 	duty_cycle_pattern 1, 1, 2, 2
 	square_note 14, 13, 6, 1283
 	square_note 9, 11, 4, 1307
@@ -16,7 +16,7 @@ SFX_Unknown_80879_Ch6:
 	sound_ret
 
 
-SFX_Unknown_80879_Ch8:
+SFX_Cry08_4_Ch8:
 	noise_note 12, 14, 6, 76
 	noise_note 11, 13, 7, 92
 	noise_note 15, 12, 2, 76
diff --git a/audio/sfx/unknown_80383.asm b/audio/sfx/cry09_4.asm
index a99c601b..7dec80d3 100644
--- a/audio/sfx/unknown_80383.asm
+++ b/audio/sfx/cry09_4.asm
@@ -1,4 +1,4 @@
-SFX_Unknown_80383_Ch5:
+SFX_Cry09_4_Ch5:
 	duty_cycle_pattern 3, 3, 0, 0
 	square_note 15, 15, 7, 1952
 	square_note 6, 14, 6, 1955
@@ -10,7 +10,7 @@ SFX_Unknown_80383_Ch5:
 	sound_ret
 
 
-SFX_Unknown_80383_Ch6:
+SFX_Cry09_4_Ch6:
 	duty_cycle_pattern 0, 0, 1, 1
 	square_note 2, 0, 8, 0
 	square_note 15, 10, 7, 1697
@@ -23,7 +23,7 @@ SFX_Unknown_80383_Ch6:
 	sound_ret
 
 
-SFX_Unknown_80383_Ch8:
+SFX_Cry09_4_Ch8:
 	noise_note 2, 15, 2, 60
 	noise_note 8, 14, 4, 62
 	noise_note 15, 13, 7, 60
diff --git a/audio/sfx/unknown_8081e.asm b/audio/sfx/cry0a_4.asm
index ca5e8aa1..c3cf315b 100644
--- a/audio/sfx/unknown_8081e.asm
+++ b/audio/sfx/cry0a_4.asm
@@ -1,4 +1,4 @@
-SFX_Unknown_8081e_Ch5:
+SFX_Cry0A_4_Ch5:
 	duty_cycle_pattern 3, 3, 0, 0
 	square_note 8, 15, 7, 1760
 	square_note 6, 14, 6, 1765
@@ -10,7 +10,7 @@ SFX_Unknown_8081e_Ch5:
 	sound_ret
 
 
-SFX_Unknown_8081e_Ch6:
+SFX_Cry0A_4_Ch6:
 	duty_cycle_pattern 0, 0, 1, 1
 	square_note 3, 0, 8, 0
 	square_note 8, 10, 7, 1697
@@ -23,7 +23,7 @@ SFX_Unknown_8081e_Ch6:
 	sound_ret
 
 
-SFX_Unknown_8081e_Ch8:
+SFX_Cry0A_4_Ch8:
 	noise_note 2, 15, 2, 60
 	noise_note 8, 14, 4, 62
 	noise_note 8, 13, 7, 60
diff --git a/audio/sfx/unknown_806af.asm b/audio/sfx/cry0b_4.asm
index 611b655a..610e2831 100644
--- a/audio/sfx/unknown_806af.asm
+++ b/audio/sfx/cry0b_4.asm
@@ -1,4 +1,4 @@
-SFX_Unknown_806af_Ch5:
+SFX_Cry0B_4_Ch5:
 	duty_cycle_pattern 3, 0, 3, 0
 	square_note 4, 15, 1, 1792
 	square_note 4, 14, 1, 1920
@@ -13,7 +13,7 @@ SFX_Unknown_806af_Ch5:
 	sound_ret
 
 
-SFX_Unknown_806af_Ch6:
+SFX_Cry0B_4_Ch6:
 	duty_cycle_pattern 1, 0, 1, 0
 	square_note 12, 0, 8, 0
 	square_note 4, 15, 1, 1793
@@ -25,7 +25,7 @@ SFX_Unknown_806af_Ch6:
 	sound_ret
 
 
-SFX_Unknown_806af_Ch8:
+SFX_Cry0B_4_Ch8:
 	noise_note 15, 0, 8, 0
 	noise_note 4, 0, 8, 0
 	noise_note 4, 13, 1, 76
diff --git a/audio/sfx/unknown_80712.asm b/audio/sfx/cry0c_4.asm
index 48d00508..cc8766a1 100644
--- a/audio/sfx/unknown_80712.asm
+++ b/audio/sfx/cry0c_4.asm
@@ -1,4 +1,4 @@
-SFX_Unknown_80712_Ch5:
+SFX_Cry0C_4_Ch5:
 	duty_cycle_pattern 3, 0, 3, 0
 	square_note 8, 15, 5, 1536
 	square_note 2, 13, 2, 1592
@@ -12,7 +12,7 @@ SFX_Unknown_80712_Ch5:
 	sound_ret
 
 
-SFX_Unknown_80712_Ch6:
+SFX_Cry0C_4_Ch6:
 	duty_cycle_pattern 1, 0, 1, 0
 	square_note 12, 12, 3, 1472
 	square_note 3, 11, 1, 1529
@@ -25,5 +25,5 @@ SFX_Unknown_80712_Ch6:
 	square_note 8, 9, 1, 1505
 
 
-SFX_Unknown_80712_Ch8:
+SFX_Cry0C_4_Ch8:
 	sound_ret
diff --git a/audio/sfx/unknown_8077e.asm b/audio/sfx/cry0d_4.asm
index c0ea51ad..2119f0a9 100644
--- a/audio/sfx/unknown_8077e.asm
+++ b/audio/sfx/cry0d_4.asm
@@ -1,4 +1,4 @@
-SFX_Unknown_8077e_Ch5:
+SFX_Cry0D_4_Ch5:
 	duty_cycle_pattern 2, 0, 2, 0
 	square_note 5, 15, 2, 1616
 	square_note 9, 13, 1, 1632
@@ -6,11 +6,11 @@ SFX_Unknown_8077e_Ch5:
 	square_note 9, 12, 1, 1570
 	square_note 5, 15, 2, 1552
 	square_note 6, 13, 1, 1568
-	sound_loop 2, SFX_Unknown_8077e_Ch5
+	sound_loop 2, SFX_Cry0D_4_Ch5
 	sound_ret
 
 
-SFX_Unknown_8077e_Ch6:
+SFX_Cry0D_4_Ch6:
 	duty_cycle_pattern 1, 0, 0, 0
 	square_note 4, 0, 8, 0
 	square_note 5, 15, 2, 1617
@@ -26,7 +26,7 @@ SFX_Unknown_8077e_Ch6:
 	sound_ret
 
 
-SFX_Unknown_8077e_Ch8:
+SFX_Cry0D_4_Ch8:
 	noise_note 6, 13, 2, 28
 	noise_note 9, 11, 1, 44
 	noise_note 8, 12, 2, 44
diff --git a/audio/sfx/unknown_80603.asm b/audio/sfx/cry0e_4.asm
index c673990c..0c18e996 100644
--- a/audio/sfx/unknown_80603.asm
+++ b/audio/sfx/cry0e_4.asm
@@ -1,4 +1,4 @@
-SFX_Unknown_80603_Ch5:
+SFX_Cry0E_4_Ch5:
 	duty_cycle_pattern 2, 2, 1, 1
 	square_note 4, 14, 1, 1792
 	square_note 4, 15, 2, 1920
@@ -7,7 +7,7 @@ SFX_Unknown_80603_Ch5:
 	sound_ret
 
 
-SFX_Unknown_80603_Ch6:
+SFX_Cry0E_4_Ch6:
 	duty_cycle_pattern 0, 0, 2, 2
 	square_note 4, 11, 1, 1761
 	square_note 3, 12, 2, 1761
@@ -16,7 +16,7 @@ SFX_Unknown_80603_Ch6:
 	sound_ret
 
 
-SFX_Unknown_80603_Ch8:
+SFX_Cry0E_4_Ch8:
 	noise_note 2, 6, 1, 50
 	noise_note 2, 6, 1, 33
 	noise_note 8, 6, 1, 17
diff --git a/audio/sfx/unknown_80545.asm b/audio/sfx/cry0f_4.asm
index ab819869..6debdb09 100644
--- a/audio/sfx/unknown_80545.asm
+++ b/audio/sfx/cry0f_4.asm
@@ -1,4 +1,4 @@
-SFX_Unknown_80545_Ch5:
+SFX_Cry0F_4_Ch5:
 	duty_cycle_pattern 3, 3, 0, 1
 	square_note 4, 15, 7, 1984
 	square_note 12, 14, 6, 1986
@@ -9,7 +9,7 @@ SFX_Unknown_80545_Ch5:
 	sound_ret
 
 
-SFX_Unknown_80545_Ch6:
+SFX_Cry0F_4_Ch6:
 	duty_cycle_pattern 3, 0, 3, 0
 	square_note 3, 12, 7, 1921
 	square_note 12, 11, 6, 1920
@@ -20,7 +20,7 @@ SFX_Unknown_80545_Ch6:
 	sound_ret
 
 
-SFX_Unknown_80545_Ch8:
+SFX_Cry0F_4_Ch8:
 	noise_note 3, 14, 4, 60
 	noise_note 12, 13, 6, 44
 	noise_note 4, 14, 4, 60
diff --git a/audio/sfx/unknown_8058b.asm b/audio/sfx/cry10_4.asm
index b3082714..39c374bc 100644
--- a/audio/sfx/unknown_8058b.asm
+++ b/audio/sfx/cry10_4.asm
@@ -1,4 +1,4 @@
-SFX_Unknown_8058b_Ch5:
+SFX_Cry10_4_Ch5:
 	duty_cycle_pattern 3, 0, 2, 1
 	square_note 8, 15, 7, 1664
 	square_note 2, 15, 7, 1632
@@ -11,7 +11,7 @@ SFX_Unknown_8058b_Ch5:
 	sound_ret
 
 
-SFX_Unknown_8058b_Ch6:
+SFX_Cry10_4_Ch6:
 	duty_cycle_pattern 1, 3, 2, 1
 	square_note 10, 14, 7, 1666
 	square_note 2, 14, 7, 1634
@@ -24,7 +24,7 @@ SFX_Unknown_8058b_Ch6:
 	sound_ret
 
 
-SFX_Unknown_8058b_Ch8:
+SFX_Cry10_4_Ch8:
 	noise_note 4, 7, 4, 33
 	noise_note 4, 7, 4, 16
 	noise_note 4, 7, 1, 32
diff --git a/audio/sfx/unknown_80467.asm b/audio/sfx/cry11_4.asm
index 07fe1ca8..8e75ec6a 100644
--- a/audio/sfx/unknown_80467.asm
+++ b/audio/sfx/cry11_4.asm
@@ -1,4 +1,4 @@
-SFX_Unknown_80467_Ch5:
+SFX_Cry11_4_Ch5:
 	duty_cycle_pattern 3, 3, 0, 0
 	square_note 6, 15, 7, 1952
 	square_note 8, 14, 6, 1956
@@ -10,7 +10,7 @@ SFX_Unknown_80467_Ch5:
 	sound_ret
 
 
-SFX_Unknown_80467_Ch6:
+SFX_Cry11_4_Ch6:
 	duty_cycle_pattern 0, 0, 2, 2
 	square_note 4, 0, 8, 0
 	square_note 6, 10, 7, 1857
@@ -23,7 +23,7 @@ SFX_Unknown_80467_Ch6:
 	sound_ret
 
 
-SFX_Unknown_80467_Ch8:
+SFX_Cry11_4_Ch8:
 	noise_note 2, 15, 2, 76
 	noise_note 6, 14, 6, 58
 	noise_note 4, 13, 7, 58
diff --git a/audio/sfx/unknown_8097f.asm b/audio/sfx/cry12_4.asm
index 259b6b34..0c98bdee 100644
--- a/audio/sfx/unknown_8097f.asm
+++ b/audio/sfx/cry12_4.asm
@@ -1,4 +1,4 @@
-SFX_Unknown_8097f_Ch5:
+SFX_Cry12_4_Ch5:
 	duty_cycle_pattern 2, 2, 1, 1
 	square_note 12, 15, 2, 1088
 	square_note 15, 14, 3, 1184
@@ -7,7 +7,7 @@ SFX_Unknown_8097f_Ch5:
 	sound_ret
 
 
-SFX_Unknown_8097f_Ch6:
+SFX_Cry12_4_Ch6:
 	duty_cycle_pattern 3, 2, 3, 2
 	square_note 11, 13, 2, 1080
 	square_note 14, 12, 6, 1176
@@ -16,7 +16,7 @@ SFX_Unknown_8097f_Ch6:
 	sound_ret
 
 
-SFX_Unknown_8097f_Ch8:
+SFX_Cry12_4_Ch8:
 	noise_note 10, 14, 6, 108
 	noise_note 15, 13, 2, 92
 	noise_note 3, 12, 2, 108
diff --git a/audio/sfx/unknown_809b2.asm b/audio/sfx/cry13_4.asm
index 08946ec9..649e1a73 100644
--- a/audio/sfx/unknown_809b2.asm
+++ b/audio/sfx/cry13_4.asm
@@ -1,4 +1,4 @@
-SFX_Unknown_809b2_Ch5:
+SFX_Cry13_4_Ch5:
 	duty_cycle_pattern 0, 3, 0, 3
 	square_note 15, 15, 6, 1472
 	square_note 8, 14, 3, 1468
@@ -9,7 +9,7 @@ SFX_Unknown_809b2_Ch5:
 	sound_ret
 
 
-SFX_Unknown_809b2_Ch6:
+SFX_Cry13_4_Ch6:
 	duty_cycle_pattern 2, 1, 2, 1
 	square_note 14, 12, 6, 1201
 	square_note 7, 12, 3, 1197
@@ -20,7 +20,7 @@ SFX_Unknown_809b2_Ch6:
 	sound_ret
 
 
-SFX_Unknown_809b2_Ch8:
+SFX_Cry13_4_Ch8:
 	noise_note 10, 14, 6, 92
 	noise_note 10, 13, 6, 108
 	noise_note 4, 12, 2, 76
diff --git a/audio/sfx/unknown_809fb.asm b/audio/sfx/cry14_4.asm
index 68edf2c9..b3dc1b2d 100644
--- a/audio/sfx/unknown_809fb.asm
+++ b/audio/sfx/cry14_4.asm
@@ -1,4 +1,4 @@
-SFX_Unknown_809fb_Ch5:
+SFX_Cry14_4_Ch5:
 	duty_cycle_pattern 3, 3, 0, 0
 	square_note 8, 14, 4, 1936
 	square_note 15, 15, 5, 1984
@@ -6,7 +6,7 @@ SFX_Unknown_809fb_Ch5:
 	sound_ret
 
 
-SFX_Unknown_809fb_Ch6:
+SFX_Cry14_4_Ch6:
 	duty_cycle_pattern 2, 2, 1, 1
 	square_note 10, 12, 4, 1905
 	square_note 15, 11, 6, 1954
@@ -14,7 +14,7 @@ SFX_Unknown_809fb_Ch6:
 	sound_ret
 
 
-SFX_Unknown_809fb_Ch8:
+SFX_Cry14_4_Ch8:
 	noise_note 8, 14, 4, 76
 	noise_note 14, 12, 4, 60
 	noise_note 8, 13, 1, 44
diff --git a/audio/sfx/unknown_80a89.asm b/audio/sfx/cry15_4.asm
index 21a1d998..7764d751 100644
--- a/audio/sfx/unknown_80a89.asm
+++ b/audio/sfx/cry15_4.asm
@@ -1,4 +1,4 @@
-SFX_Unknown_80a89_Ch5:
+SFX_Cry15_4_Ch5:
 	duty_cycle_pattern 3, 3, 0, 0
 	square_note 4, 15, 3, 1920
 	square_note 15, 14, 7, 1792
@@ -9,7 +9,7 @@ SFX_Unknown_80a89_Ch5:
 	sound_ret
 
 
-SFX_Unknown_80a89_Ch6:
+SFX_Cry15_4_Ch6:
 	duty_cycle_pattern 1, 1, 2, 2
 	square_note 6, 12, 3, 1793
 	square_note 14, 11, 7, 1665
@@ -20,7 +20,7 @@ SFX_Unknown_80a89_Ch6:
 	sound_ret
 
 
-SFX_Unknown_80a89_Ch8:
+SFX_Cry15_4_Ch8:
 	noise_note 6, 14, 3, 92
 	noise_note 14, 13, 6, 76
 	noise_note 6, 12, 6, 60
diff --git a/audio/sfx/unknown_8091c.asm b/audio/sfx/cry16_4.asm
index 0d160799..35ddd284 100644
--- a/audio/sfx/unknown_8091c.asm
+++ b/audio/sfx/cry16_4.asm
@@ -1,4 +1,4 @@
-SFX_Unknown_8091c_Ch5:
+SFX_Cry16_4_Ch5:
 	duty_cycle_pattern 3, 3, 0, 0
 	square_note 15, 13, 7, 1920
 	square_note 4, 14, 6, 1952
@@ -6,7 +6,7 @@ SFX_Unknown_8091c_Ch5:
 	sound_ret
 
 
-SFX_Unknown_8091c_Ch6:
+SFX_Cry16_4_Ch6:
 	duty_cycle_pattern 1, 1, 2, 2
 	square_note 15, 12, 7, 1875
 	square_note 5, 11, 6, 1906
@@ -14,7 +14,7 @@ SFX_Unknown_8091c_Ch6:
 	sound_ret
 
 
-SFX_Unknown_8091c_Ch8:
+SFX_Cry16_4_Ch8:
 	noise_note 13, 15, 6, 76
 	noise_note 4, 14, 6, 60
 	noise_note 15, 15, 2, 76
diff --git a/audio/sfx/unknown_80ad2.asm b/audio/sfx/cry17_4.asm
index ab114678..a5c8de8e 100644
--- a/audio/sfx/unknown_80ad2.asm
+++ b/audio/sfx/cry17_4.asm
@@ -1,4 +1,4 @@
-SFX_Unknown_80ad2_Ch5:
+SFX_Cry17_4_Ch5:
 	duty_cycle_pattern 0, 0, 3, 3
 	square_note 15, 15, 7, 1280
 	square_note 15, 14, 7, 1288
@@ -7,7 +7,7 @@ SFX_Unknown_80ad2_Ch5:
 	sound_ret
 
 
-SFX_Unknown_80ad2_Ch6:
+SFX_Cry17_4_Ch6:
 	duty_cycle_pattern 1, 0, 1, 0
 	square_note 14, 13, 7, 1153
 	square_note 14, 12, 7, 1161
@@ -16,7 +16,7 @@ SFX_Unknown_80ad2_Ch6:
 	sound_ret
 
 
-SFX_Unknown_80ad2_Ch8:
+SFX_Cry17_4_Ch8:
 	noise_note 14, 15, 7, 124
 	noise_note 12, 15, 6, 108
 	noise_note 9, 14, 4, 124
diff --git a/audio/sfx/unknown_80be2.asm b/audio/sfx/cry18_4.asm
index 2efda306..2909234a 100644
--- a/audio/sfx/unknown_80be2.asm
+++ b/audio/sfx/cry18_4.asm
@@ -1,4 +1,4 @@
-SFX_Unknown_80be2_Ch5:
+SFX_Cry18_4_Ch5:
 	duty_cycle_pattern 1, 1, 0, 0
 	square_note 10, 15, 5, 1664
 	square_note 3, 14, 2, 1696
@@ -11,7 +11,7 @@ SFX_Unknown_80be2_Ch5:
 	sound_ret
 
 
-SFX_Unknown_80be2_Ch6:
+SFX_Cry18_4_Ch6:
 	duty_cycle_pattern 0, 0, 3, 3
 	square_note 9, 13, 5, 1585
 	square_note 3, 13, 2, 1618
@@ -24,7 +24,7 @@ SFX_Unknown_80be2_Ch6:
 	sound_ret
 
 
-SFX_Unknown_80be2_Ch8:
+SFX_Cry18_4_Ch8:
 	noise_note 6, 14, 3, 76
 	noise_note 4, 12, 3, 60
 	noise_note 5, 13, 4, 60
diff --git a/audio/sfx/unknown_808fa.asm b/audio/sfx/cry19_4.asm
index 37d49937..0deaf3e3 100644
--- a/audio/sfx/unknown_808fa.asm
+++ b/audio/sfx/cry19_4.asm
@@ -1,4 +1,4 @@
-SFX_Unknown_808fa_Ch5:
+SFX_Cry19_4_Ch5:
 	duty_cycle_pattern 0, 1, 2, 3
 	square_note 7, 13, 2, 1856
 	square_note 15, 14, 5, 1888
@@ -6,7 +6,7 @@ SFX_Unknown_808fa_Ch5:
 	sound_ret
 
 
-SFX_Unknown_808fa_Ch6:
+SFX_Cry19_4_Ch6:
 	duty_cycle_pattern 2, 0, 0, 1
 	square_note 2, 12, 2, 1793
 	square_note 4, 12, 2, 1800
@@ -14,5 +14,5 @@ SFX_Unknown_808fa_Ch6:
 	square_note 15, 10, 2, 1793
 
 
-SFX_Unknown_808fa_Ch8:
+SFX_Cry19_4_Ch8:
 	sound_ret
diff --git a/audio/sfx/unknown_80b53.asm b/audio/sfx/cry1a_4.asm
index 7645d225..1a1856e7 100644
--- a/audio/sfx/unknown_80b53.asm
+++ b/audio/sfx/cry1a_4.asm
@@ -1,4 +1,4 @@
-SFX_Unknown_80b53_Ch5:
+SFX_Cry1A_4_Ch5:
 	duty_cycle_pattern 3, 3, 0, 0
 	square_note 6, 15, 7, 1856
 	square_note 12, 14, 6, 1860
@@ -9,7 +9,7 @@ SFX_Unknown_80b53_Ch5:
 	sound_ret
 
 
-SFX_Unknown_80b53_Ch6:
+SFX_Cry1A_4_Ch6:
 	duty_cycle_pattern 0, 0, 2, 2
 	square_note 6, 12, 7, 1793
 	square_note 11, 11, 6, 1794
@@ -20,7 +20,7 @@ SFX_Unknown_80b53_Ch6:
 	sound_ret
 
 
-SFX_Unknown_80b53_Ch8:
+SFX_Cry1A_4_Ch8:
 	noise_note 3, 14, 2, 60
 	noise_note 8, 13, 6, 76
 	noise_note 5, 13, 4, 60
diff --git a/audio/sfx/unknown_80944.asm b/audio/sfx/cry1b_4.asm
index adfc42b2..f0a57d88 100644
--- a/audio/sfx/unknown_80944.asm
+++ b/audio/sfx/cry1b_4.asm
@@ -1,4 +1,4 @@
-SFX_Unknown_80944_Ch5:
+SFX_Cry1B_4_Ch5:
 	duty_cycle_pattern 3, 3, 0, 0
 	square_note 6, 15, 7, 1728
 	square_note 15, 14, 7, 1792
@@ -8,7 +8,7 @@ SFX_Unknown_80944_Ch5:
 	sound_ret
 
 
-SFX_Unknown_80944_Ch6:
+SFX_Cry1B_4_Ch6:
 	duty_cycle_pattern 0, 0, 2, 2
 	square_note 7, 14, 6, 1665
 	square_note 14, 13, 5, 1729
@@ -18,7 +18,7 @@ SFX_Unknown_80944_Ch6:
 	sound_ret
 
 
-SFX_Unknown_80944_Ch8:
+SFX_Cry1B_4_Ch8:
 	noise_note 10, 10, 6, 60
 	noise_note 14, 9, 4, 44
 	noise_note 5, 10, 3, 60
diff --git a/audio/sfx/unknown_80b05.asm b/audio/sfx/cry1c_4.asm
index e92fb103..2df760db 100644
--- a/audio/sfx/unknown_80b05.asm
+++ b/audio/sfx/cry1c_4.asm
@@ -1,4 +1,4 @@
-SFX_Unknown_80b05_Ch5:
+SFX_Cry1C_4_Ch5:
 	duty_cycle_pattern 3, 3, 1, 1
 	square_note 7, 13, 6, 2017
 	square_note 6, 12, 6, 2018
@@ -11,7 +11,7 @@ SFX_Unknown_80b05_Ch5:
 	sound_ret
 
 
-SFX_Unknown_80b05_Ch6:
+SFX_Cry1C_4_Ch6:
 	duty_cycle_pattern 1, 0, 1, 0
 	square_note 6, 12, 3, 1993
 	square_note 6, 11, 3, 1991
@@ -22,7 +22,7 @@ SFX_Unknown_80b05_Ch6:
 	sound_ret
 
 
-SFX_Unknown_80b05_Ch8:
+SFX_Cry1C_4_Ch8:
 	noise_note 13, 1, -1, 124
 	noise_note 13, 15, 7, 140
 	noise_note 12, 13, 6, 124
diff --git a/audio/sfx/unknown_80b9c.asm b/audio/sfx/cry1d_4.asm
index 9e6bf047..52f4f474 100644
--- a/audio/sfx/unknown_80b9c.asm
+++ b/audio/sfx/cry1d_4.asm
@@ -1,4 +1,4 @@
-SFX_Unknown_80b9c_Ch5:
+SFX_Cry1D_4_Ch5:
 	duty_cycle_pattern 3, 3, 1, 0
 	square_note 15, 15, 0, 1797
 	square_note 10, 14, 0, 1792
@@ -9,7 +9,7 @@ SFX_Unknown_80b9c_Ch5:
 	sound_ret
 
 
-SFX_Unknown_80b9c_Ch6:
+SFX_Cry1D_4_Ch6:
 	duty_cycle_pattern 0, 2, 0, 2
 	square_note 15, 11, 0, 1731
 	square_note 10, 10, 0, 1729
@@ -20,7 +20,7 @@ SFX_Unknown_80b9c_Ch6:
 	sound_ret
 
 
-SFX_Unknown_80b9c_Ch8:
+SFX_Cry1D_4_Ch8:
 	noise_note 6, 14, 6, 76
 	noise_note 15, 13, 6, 60
 	noise_note 10, 12, 5, 74
diff --git a/audio/sfx/unknown_80a23.asm b/audio/sfx/cry1e_4.asm
index 447ad7f3..70bbc648 100644
--- a/audio/sfx/unknown_80a23.asm
+++ b/audio/sfx/cry1e_4.asm
@@ -1,4 +1,4 @@
-SFX_Unknown_80a23_Ch5:
+SFX_Cry1E_4_Ch5:
 	duty_cycle_pattern 3, 3, 0, 0
 	square_note 6, 15, 2, 1536
 	square_note 6, 14, 2, 1600
@@ -11,7 +11,7 @@ SFX_Unknown_80a23_Ch5:
 	sound_ret
 
 
-SFX_Unknown_80a23_Ch6:
+SFX_Cry1E_4_Ch6:
 	duty_cycle_pattern 0, 1, 0, 1
 	square_note 3, 0, 8, 1
 	square_note 6, 12, 2, 1473
@@ -25,7 +25,7 @@ SFX_Unknown_80a23_Ch6:
 	sound_ret
 
 
-SFX_Unknown_80a23_Ch8:
+SFX_Cry1E_4_Ch8:
 	noise_note 6, 0, 8, 1
 	noise_note 5, 14, 2, 92
 	noise_note 5, 12, 2, 76
diff --git a/audio/sfx/unknown_80c3b.asm b/audio/sfx/cry1f_4.asm
index 9eadefb9..b0c843f2 100644
--- a/audio/sfx/unknown_80c3b.asm
+++ b/audio/sfx/cry1f_4.asm
@@ -1,4 +1,4 @@
-SFX_Unknown_80c3b_Ch5:
+SFX_Cry1F_4_Ch5:
 	duty_cycle_pattern 2, 2, 1, 1
 	square_note 3, 15, 4, 1601
 	square_note 13, 13, 6, 1825
@@ -7,7 +7,7 @@ SFX_Unknown_80c3b_Ch5:
 	sound_ret
 
 
-SFX_Unknown_80c3b_Ch6:
+SFX_Cry1F_4_Ch6:
 	duty_cycle_pattern 3, 0, 3, 0
 	square_note 4, 15, 4, 1408
 	square_note 14, 14, 6, 1760
@@ -16,7 +16,7 @@ SFX_Unknown_80c3b_Ch6:
 	sound_ret
 
 
-SFX_Unknown_80c3b_Ch8:
+SFX_Cry1F_4_Ch8:
 	noise_note 5, 12, 4, 70
 	noise_note 13, 10, 5, 68
 	noise_note 8, 12, 4, 69
diff --git a/audio/sfx/unknown_80c6e.asm b/audio/sfx/cry20_4.asm
index 360ad173..858fe171 100644
--- a/audio/sfx/unknown_80c6e.asm
+++ b/audio/sfx/cry20_4.asm
@@ -1,4 +1,4 @@
-SFX_Unknown_80c6e_Ch5:
+SFX_Cry20_4_Ch5:
 	duty_cycle_pattern 3, 3, 0, 0
 	square_note 13, 15, 1, 1297
 	square_note 13, 14, 1, 1301
@@ -7,7 +7,7 @@ SFX_Unknown_80c6e_Ch5:
 	sound_ret
 
 
-SFX_Unknown_80c6e_Ch6:
+SFX_Cry20_4_Ch6:
 	duty_cycle_pattern 0, 1, 1, 1
 	square_note 12, 14, 1, 1292
 	square_note 12, 13, 1, 1296
@@ -16,7 +16,7 @@ SFX_Unknown_80c6e_Ch6:
 	sound_ret
 
 
-SFX_Unknown_80c6e_Ch8:
+SFX_Cry20_4_Ch8:
 	noise_note 14, 15, 2, 101
 	noise_note 13, 14, 2, 85
 	noise_note 14, 13, 2, 86
diff --git a/audio/sfx/unknown_80ca1.asm b/audio/sfx/cry21_4.asm
index d42abd93..bc720c10 100644
--- a/audio/sfx/unknown_80ca1.asm
+++ b/audio/sfx/cry21_4.asm
@@ -1,4 +1,4 @@
-SFX_Unknown_80ca1_Ch5:
+SFX_Cry21_4_Ch5:
 	duty_cycle_pattern 0, 1, 2, 3
 	square_note 3, 15, 3, 1380
 	square_note 2, 14, 2, 1348
@@ -11,7 +11,7 @@ SFX_Unknown_80ca1_Ch5:
 	sound_ret
 
 
-SFX_Unknown_80ca1_Ch6:
+SFX_Cry21_4_Ch6:
 	duty_cycle_pattern 3, 0, 3, 0
 	square_note 3, 13, 3, 1376
 	square_note 2, 12, 2, 1344
@@ -23,5 +23,5 @@ SFX_Unknown_80ca1_Ch6:
 	square_note 8, 12, 1, 1280
 
 
-SFX_Unknown_80ca1_Ch8:
+SFX_Cry21_4_Ch8:
 	sound_ret
diff --git a/audio/sfx/unknown_80ce7.asm b/audio/sfx/cry22_4.asm
index 9c7706c2..e27f0770 100644
--- a/audio/sfx/unknown_80ce7.asm
+++ b/audio/sfx/cry22_4.asm
@@ -1,4 +1,4 @@
-SFX_Unknown_80ce7_Ch5:
+SFX_Cry22_4_Ch5:
 	duty_cycle_pattern 0, 1, 0, 1
 	square_note 2, 3, -5, 897
 	square_note 7, 15, 5, 1537
@@ -7,7 +7,7 @@ SFX_Unknown_80ce7_Ch5:
 	sound_ret
 
 
-SFX_Unknown_80ce7_Ch6:
+SFX_Cry22_4_Ch6:
 	duty_cycle_pattern 3, 2, 3, 2
 	square_note 2, 3, -6, 1456
 	square_note 7, 13, 5, 1885
@@ -16,7 +16,7 @@ SFX_Unknown_80ce7_Ch6:
 	sound_ret
 
 
-SFX_Unknown_80ce7_Ch8:
+SFX_Cry22_4_Ch8:
 	noise_note 2, 9, 2, 73
 	noise_note 7, 11, 5, 41
 	noise_note 1, 10, 2, 57
diff --git a/audio/sfx/unknown_803da.asm b/audio/sfx/cry23_4.asm
index 40fba1ca..7e087dd2 100644
--- a/audio/sfx/unknown_803da.asm
+++ b/audio/sfx/cry23_4.asm
@@ -1,4 +1,4 @@
-SFX_Unknown_803da_Ch5:
+SFX_Cry23_4_Ch5:
 	duty_cycle_pattern 3, 3, 0, 0
 	square_note 15, 15, 7, 1984
 	square_note 6, 14, 4, 1985
@@ -8,7 +8,7 @@ SFX_Unknown_803da_Ch5:
 	sound_ret
 
 
-SFX_Unknown_803da_Ch6:
+SFX_Cry23_4_Ch6:
 	duty_cycle_pattern 1, 1, 3, 3
 	square_note 15, 9, 7, 1921
 	square_note 6, 8, 4, 1920
@@ -17,7 +17,7 @@ SFX_Unknown_803da_Ch6:
 	sound_ret
 
 
-SFX_Unknown_803da_Ch8:
+SFX_Cry23_4_Ch8:
 	noise_note 3, 15, 2, 60
 	noise_note 13, 14, 6, 44
 	noise_note 15, 13, 7, 60
diff --git a/audio/sfx/unknown_80411.asm b/audio/sfx/cry24_4.asm
index a6ba154b..e08d59f4 100644
--- a/audio/sfx/unknown_80411.asm
+++ b/audio/sfx/cry24_4.asm
@@ -1,4 +1,4 @@
-SFX_Unknown_80411_Ch5:
+SFX_Cry24_4_Ch5:
 	duty_cycle_pattern 3, 3, 0, 0
 	square_note 15, 15, 7, 1664
 	square_note 10, 14, 6, 1668
@@ -11,7 +11,7 @@ SFX_Unknown_80411_Ch5:
 	sound_ret
 
 
-SFX_Unknown_80411_Ch6:
+SFX_Cry24_4_Ch6:
 	duty_cycle_pattern 0, 0, 1, 1
 	square_note 15, 11, 7, 1601
 	square_note 10, 9, 6, 1602
@@ -24,7 +24,7 @@ SFX_Unknown_80411_Ch6:
 	sound_ret
 
 
-SFX_Unknown_80411_Ch8:
+SFX_Cry24_4_Ch8:
 	noise_note 15, 14, 4, 60
 	noise_note 10, 12, 7, 76
 	noise_note 10, 12, 7, 60
diff --git a/audio/sfx/unknown_804bf.asm b/audio/sfx/cry25_4.asm
index a4e5c616..02af0c0a 100644
--- a/audio/sfx/unknown_804bf.asm
+++ b/audio/sfx/cry25_4.asm
@@ -1,4 +1,4 @@
-SFX_Unknown_804bf_Ch5:
+SFX_Cry25_4_Ch5:
 	duty_cycle_pattern 2, 2, 1, 1
 	square_note 6, 15, 4, 1856
 	square_note 15, 14, 3, 1840
@@ -8,7 +8,7 @@ SFX_Unknown_804bf_Ch5:
 	sound_ret
 
 
-SFX_Unknown_804bf_Ch6:
+SFX_Cry25_4_Ch6:
 	duty_cycle_pattern 1, 3, 1, 3
 	square_note 6, 12, 3, 1810
 	square_note 15, 11, 3, 1796
@@ -18,7 +18,7 @@ SFX_Unknown_804bf_Ch6:
 	sound_ret
 
 
-SFX_Unknown_804bf_Ch8:
+SFX_Cry25_4_Ch8:
 	noise_note 8, 13, 6, 44
 	noise_note 12, 12, 6, 60
 	noise_note 10, 11, 6, 44
diff --git a/audio/sfx/unknown_80e91.asm b/audio/sfx/get_item1_4_2.asm
index 8db0a395..f2889b62 100644
--- a/audio/sfx/unknown_80e91.asm
+++ b/audio/sfx/get_item1_4_2.asm
@@ -1,4 +1,4 @@
-SFX_Unknown_80e91_Ch5:
+SFX_Get_Item1_4_2_Ch5:
 	execute_music
 	tempo 256
 	volume 7, 7
@@ -16,7 +16,7 @@ SFX_Unknown_80e91_Ch5:
 	sound_ret
 
 
-SFX_Unknown_80e91_Ch6:
+SFX_Get_Item1_4_2_Ch6:
 	execute_music
 	vibrato 8, 2, 7
 	duty_cycle 2
@@ -30,7 +30,7 @@ SFX_Unknown_80e91_Ch6:
 	sound_ret
 
 
-SFX_Unknown_80e91_Ch8:
+SFX_Get_Item1_4_2_Ch8:
 	execute_music
 	note_type 4, 1, 0
 	octave 4
diff --git a/audio/sfx/unknown_8026a.asm b/audio/sfx/heal_ailment_4.asm
index c9ee20c4..4320c06b 100644
--- a/audio/sfx/unknown_8026a.asm
+++ b/audio/sfx/heal_ailment_4.asm
@@ -1,4 +1,4 @@
-SFX_Unknown_8026a_Ch5:
+SFX_Heal_Ailment_4_Ch5:
 	duty_cycle 2
 	pitch_sweep 1, 4
 	square_note 4, 15, 2, 1536
diff --git a/audio/sfx/unknown_8027f.asm b/audio/sfx/heal_hp_4.asm
index 5fbb4618..95dbadb0 100644
--- a/audio/sfx/unknown_8027f.asm
+++ b/audio/sfx/heal_hp_4.asm
@@ -1,4 +1,4 @@
-SFX_Unknown_8027f_Ch5:
+SFX_Heal_HP_4_Ch5:
 	duty_cycle 2
 	pitch_sweep 1, 7
 	square_note 15, 15, 0, 1264
diff --git a/audio/sfx/surfing_add_points.asm b/audio/sfx/press_ab_4.asm
index 3eeed285..aecfe952 100644
--- a/audio/sfx/surfing_add_points.asm
+++ b/audio/sfx/press_ab_4.asm
@@ -1,4 +1,4 @@
-SFX_Surfing_Add_Points_Ch5:
+SFX_Press_AB_4_Ch5:
 	duty_cycle 2
 	square_note 0, 9, 1, 1984
 	square_note 0, 8, 1, 2000
diff --git a/audio/sfx/unknown_80263.asm b/audio/sfx/start_menu_4.asm
index e1be6dd5..9debc1c8 100755..100644
--- a/audio/sfx/unknown_80263.asm
+++ b/audio/sfx/start_menu_4.asm
@@ -1,4 +1,4 @@
-SFX_Unknown_80263_Ch8:
+SFX_Start_Menu_4_Ch8:
 	noise_note 1, 14, 2, 51
 	noise_note 8, 14, 1, 34
 	sound_ret
diff --git a/audio/sfx/surfing_crash.asm b/audio/sfx/surfing_crash.asm
index e1af7f6a..26e5b0f7 100644
--- a/audio/sfx/surfing_crash.asm
+++ b/audio/sfx/surfing_crash.asm
@@ -1,5 +1,5 @@
 SFX_Surfing_Crash_Ch8:
-	noise_note 2, 15, 1, 50
-	noise_note 2, 0, 0, 0
-	noise_note 4, 14, 6, 33
+	noise_note 3, 15, 3, 102
+	noise_note 3, 3, 3, 83
+	noise_note 7, 15, 5, 81
 	sound_ret
diff --git a/audio/sfx/surfing_land.asm b/audio/sfx/surfing_land.asm
index 41ece761..8cc4ffa1 100644
--- a/audio/sfx/surfing_land.asm
+++ b/audio/sfx/surfing_land.asm
@@ -1,5 +1,5 @@
 SFX_Surfing_Land_Ch8:
-	noise_note 3, 15, 3, 102
-	noise_note 3, 3, 3, 83
-	noise_note 7, 15, 5, 81
+	noise_note 2, 15, 1, 50
+	noise_note 2, 0, 0, 0
+	noise_note 4, 14, 6, 33
 	sound_ret
diff --git a/audio/sfx/unknown_802cc.asm b/audio/sfx/unknown_802cc.asm
index 3126cf1e..3126cf1e 100755..100644
--- a/audio/sfx/unknown_802cc.asm
+++ b/audio/sfx/unknown_802cc.asm
diff --git a/audio/sfx/unknown_80337.asm b/audio/sfx/unused_4.asm
index 047dfaf4..8967157d 100644
--- a/audio/sfx/unknown_80337.asm
+++ b/audio/sfx/unused_4.asm
@@ -1,4 +1,4 @@
-SFX_Unknown_80337_Ch5:
+SFX_Unused_4_Ch5:
 	duty_cycle_pattern 3, 3, 0, 0
 	square_note 15, 14, 0, 1920
 	square_note 15, 15, 0, 1924
@@ -9,7 +9,7 @@ SFX_Unknown_80337_Ch5:
 	sound_ret
 
 
-SFX_Unknown_80337_Ch6:
+SFX_Unused_4_Ch6:
 	duty_cycle_pattern 0, 0, 1, 1
 	square_note 15, 10, 0, 1857
 	square_note 15, 11, 0, 1859
@@ -20,7 +20,7 @@ SFX_Unknown_80337_Ch6:
 	sound_ret
 
 
-SFX_Unknown_80337_Ch8:
+SFX_Unused_4_Ch8:
 	noise_note 2, 15, 2, 76
 	noise_note 6, 14, 0, 58
 	noise_note 15, 13, 0, 58
diff --git a/constants/music_constants.asm b/constants/music_constants.asm
index bf37dea9..117ed2e3 100644
--- a/constants/music_constants.asm
+++ b/constants/music_constants.asm
@@ -167,18 +167,18 @@ ENDM
 	music_const SFX_CRY_23,             SFX_Cry23_1
 	music_const SFX_CRY_24,             SFX_Cry24_1
 	music_const SFX_CRY_25,             SFX_Cry25_1
-	music_const SFX_GET_ITEM_2,         SFX_Get_Item2_1
 
-	; AUDIO_1 AUDIO_2 AUDIO_3
+	music_const SFX_GET_ITEM_2,         SFX_Get_Item2_1
 	music_const SFX_TINK,               SFX_Tink_1
 	music_const SFX_HEAL_HP,            SFX_Heal_HP_1
 	music_const SFX_HEAL_AILMENT,       SFX_Heal_Ailment_1
 	music_const SFX_START_MENU,         SFX_Start_Menu_1
 	music_const SFX_PRESS_AB,           SFX_Press_AB_1
 
-	; AUDIO_1 AUDIO_3
+	; AUDIO_1 AUDIO_3 AUDIO_4
 	music_const SFX_GET_ITEM_1,         SFX_Get_Item1_1
 
+	; AUDIO_1 AUDIO_3
 	music_const SFX_POKEDEX_RATING,     SFX_Pokedex_Rating_1
 	music_const SFX_GET_KEY_ITEM,       SFX_Get_Key_Item_1
 	music_const SFX_POISONED,           SFX_Poisoned_1
@@ -285,10 +285,9 @@ ENDM
 	music_const SFX_SHOOTING_STAR,      SFX_Shooting_Star
 
 	; AUDIO_4
-	music_const SFX_SURFING_ADD_POINTS, SFX_Surfing_Add_Points
 	music_const SFX_SURFING_JUMP,       SFX_Surfing_Jump
 	music_const SFX_SURFING_FLIP,       SFX_Surfing_Flip
-	music_const SFX_SURFING_LAND,       SFX_Surfing_Land
-	music_const SFX_UNKNOWN_801BC_4,    SFX_801bc_4
 	music_const SFX_SURFING_CRASH,      SFX_Surfing_Crash
+	music_const SFX_UNKNOWN_802CC_4,    SFX_802cc_4
+	music_const SFX_SURFING_LAND,       SFX_Surfing_Land
 	music_const SFX_GET_ITEM2_4_2,      SFX_Get_Item2_4_2
diff --git a/engine/surfing_minigame.asm b/engine/surfing_minigame.asm
index 81e5296d..b89d22dc 100755
--- a/engine/surfing_minigame.asm
+++ b/engine/surfing_minigame.asm
@@ -752,7 +752,7 @@ SurfingMinigame_ScoreCurrentWave:
 	call SetCurrentAnimatedObjectCallbackAndResetFrameStateRegisters
 	xor a
 	ld [wChannelSoundIDs + Ch8], a
-	ld a, SFX_SURFING_LAND
+	ld a, SFX_SURFING_CRASH
 	call PlaySound
 	ret
 
@@ -1011,7 +1011,7 @@ SurfingMinigame_TileInteraction:
 .action_3
 	xor a
 	ld [wChannelSoundIDs + Ch8], a
-	ld a, SFX_SURFING_CRASH
+	ld a, SFX_SURFING_LAND
 	call PlaySound
 	and a
 	ret
@@ -1559,7 +1559,7 @@ SurfingMinigame_AddRemainingHPToTotal:
 	pop bc
 	dec c
 	jr nz, .loop
-	ld a, SFX_SURFING_ADD_POINTS
+	ld a, SFX_PRESS_AB
 	call PlaySound
 	and a
 	ret
@@ -1621,7 +1621,7 @@ SurfingMinigame_AddRadnessToTotal:
 	pop bc
 	dec c
 	jr nz, .loop
-	ld a, SFX_SURFING_ADD_POINTS
+	ld a, SFX_PRESS_AB
 	call PlaySound
 	and a
 	ret