Rename sound effect files

1 files changed, 297 insertions, 297 deletions

diff --git a/audio/headers/sfxheaders1f.asm b/audio/headers/sfxheaders1f.asm
index 52766a76..7af4755f 100755..100644
--- a/audio/headers/sfxheaders1f.asm
+++ b/audio/headers/sfxheaders1f.asm
@@ -1,596 +1,596 @@
 SFX_Headers_1f::
 	db $ff, $ff, $ff ; padding
 
-SFX_1f_01:: ; 7c003 (1f:4003)
+SFX_Snare1_3:: ; 7c003 (1f:4003)
 	db CH7
-	dw SFX_1f_01_Ch1
+	dw SFX_Snare1_3_Ch1
 
-SFX_1f_02:: ; 7c006 (1f:4006)
+SFX_Snare2_3:: ; 7c006 (1f:4006)
 	db CH7
-	dw SFX_1f_02_Ch1
+	dw SFX_Snare2_3_Ch1
 
-SFX_1f_03:: ; 7c009 (1f:4009)
+SFX_Snare3_3:: ; 7c009 (1f:4009)
 	db CH7
-	dw SFX_1f_03_Ch1
+	dw SFX_Snare3_3_Ch1
 
-SFX_1f_04:: ; 7c00c (1f:400c)
+SFX_Snare4_3:: ; 7c00c (1f:400c)
 	db CH7
-	dw SFX_1f_04_Ch1
+	dw SFX_Snare4_3_Ch1
 
-SFX_1f_05:: ; 7c00f (1f:400f)
+SFX_Snare5_3:: ; 7c00f (1f:400f)
 	db CH7
-	dw SFX_1f_05_Ch1
+	dw SFX_Snare5_3_Ch1
 
-SFX_1f_06:: ; 7c012 (1f:4012)
+SFX_Triangle1_3:: ; 7c012 (1f:4012)
 	db CH7
-	dw SFX_1f_06_Ch1
+	dw SFX_Triangle1_3_Ch1
 
-SFX_1f_07:: ; 7c015 (1f:4015)
+SFX_Triangle2_3:: ; 7c015 (1f:4015)
 	db CH7
-	dw SFX_1f_07_Ch1
+	dw SFX_Triangle2_3_Ch1
 
-SFX_1f_08:: ; 7c018 (1f:4018)
+SFX_Snare6_3:: ; 7c018 (1f:4018)
 	db CH7
-	dw SFX_1f_08_Ch1
+	dw SFX_Snare6_3_Ch1
 
-SFX_1f_09:: ; 7c01b (1f:401b)
+SFX_Snare7_3:: ; 7c01b (1f:401b)
 	db CH7
-	dw SFX_1f_09_Ch1
+	dw SFX_Snare7_3_Ch1
 
-SFX_1f_0a:: ; 7c01e (1f:401e)
+SFX_Snare8_3:: ; 7c01e (1f:401e)
 	db CH7
-	dw SFX_1f_0a_Ch1
+	dw SFX_Snare8_3_Ch1
 
-SFX_1f_0b:: ; 7c021 (1f:4021)
+SFX_Snare9_3:: ; 7c021 (1f:4021)
 	db CH7
-	dw SFX_1f_0b_Ch1
+	dw SFX_Snare9_3_Ch1
 
-SFX_1f_0c:: ; 7c024 (1f:4024)
+SFX_Cymbal1_3:: ; 7c024 (1f:4024)
 	db CH7
-	dw SFX_1f_0c_Ch1
+	dw SFX_Cymbal1_3_Ch1
 
-SFX_1f_0d:: ; 7c027 (1f:4027)
+SFX_Cymbal2_3:: ; 7c027 (1f:4027)
 	db CH7
-	dw SFX_1f_0d_Ch1
+	dw SFX_Cymbal2_3_Ch1
 
-SFX_1f_0e:: ; 7c02a (1f:402a)
+SFX_Cymbal3_3:: ; 7c02a (1f:402a)
 	db CH7
-	dw SFX_1f_0e_Ch1
+	dw SFX_Cymbal3_3_Ch1
 
-SFX_1f_0f:: ; 7c02d (1f:402d)
+SFX_Muted_Snare1_3:: ; 7c02d (1f:402d)
 	db CH7
-	dw SFX_1f_0f_Ch1
+	dw SFX_Muted_Snare1_3_Ch1
 
-SFX_1f_10:: ; 7c030 (1f:4030)
+SFX_Triangle3_3:: ; 7c030 (1f:4030)
 	db CH7
-	dw SFX_1f_10_Ch1
+	dw SFX_Triangle3_3_Ch1
 
-SFX_1f_11:: ; 7c033 (1f:4033)
+SFX_Muted_Snare2_3:: ; 7c033 (1f:4033)
 	db CH7
-	dw SFX_1f_11_Ch1
+	dw SFX_Muted_Snare2_3_Ch1
 
-SFX_1f_12:: ; 7c036 (1f:4036)
+SFX_Muted_Snare3_3:: ; 7c036 (1f:4036)
 	db CH7
-	dw SFX_1f_12_Ch1
+	dw SFX_Muted_Snare3_3_Ch1
 
-SFX_1f_13:: ; 7c039 (1f:4039)
+SFX_Muted_Snare4_3:: ; 7c039 (1f:4039)
 	db CH7
-	dw SFX_1f_13_Ch1
+	dw SFX_Muted_Snare4_3_Ch1
 
-SFX_1f_14:: ; 7c03c (1f:403c)
+SFX_Cry00_3:: ; 7c03c (1f:403c)
 	db ( $80 | CH4 )
-	dw SFX_1f_14_Ch1
+	dw SFX_Cry00_3_Ch1
 	db CH5
-	dw SFX_1f_14_Ch2
+	dw SFX_Cry00_3_Ch2
 	db CH7
-	dw SFX_1f_14_Ch3
+	dw SFX_Cry00_3_Ch3
 
-SFX_1f_15:: ; 7c045 (1f:4045)
+SFX_Cry01_3:: ; 7c045 (1f:4045)
 	db ( $80 | CH4 )
-	dw SFX_1f_15_Ch1
+	dw SFX_Cry01_3_Ch1
 	db CH5
-	dw SFX_1f_15_Ch2
+	dw SFX_Cry01_3_Ch2
 	db CH7
-	dw SFX_1f_15_Ch3
+	dw SFX_Cry01_3_Ch3
 
-SFX_1f_16:: ; 7c04e (1f:404e)
+SFX_Cry02_3:: ; 7c04e (1f:404e)
 	db ( $80 | CH4 )
-	dw SFX_1f_16_Ch1
+	dw SFX_Cry02_3_Ch1
 	db CH5
-	dw SFX_1f_16_Ch2
+	dw SFX_Cry02_3_Ch2
 	db CH7
-	dw SFX_1f_16_Ch3
+	dw SFX_Cry02_3_Ch3
 
-SFX_1f_17:: ; 7c057 (1f:4057)
+SFX_Cry03_3:: ; 7c057 (1f:4057)
 	db ( $80 | CH4 )
-	dw SFX_1f_17_Ch1
+	dw SFX_Cry03_3_Ch1
 	db CH5
-	dw SFX_1f_17_Ch2
+	dw SFX_Cry03_3_Ch2
 	db CH7
-	dw SFX_1f_17_Ch3
+	dw SFX_Cry03_3_Ch3
 
-SFX_1f_18:: ; 7c060 (1f:4060)
+SFX_Cry04_3:: ; 7c060 (1f:4060)
 	db ( $80 | CH4 )
-	dw SFX_1f_18_Ch1
+	dw SFX_Cry04_3_Ch1
 	db CH5
-	dw SFX_1f_18_Ch2
+	dw SFX_Cry04_3_Ch2
 	db CH7
-	dw SFX_1f_18_Ch3
+	dw SFX_Cry04_3_Ch3
 
-SFX_1f_19:: ; 7c069 (1f:4069)
+SFX_Cry05_3:: ; 7c069 (1f:4069)
 	db ( $80 | CH4 )
-	dw SFX_1f_19_Ch1
+	dw SFX_Cry05_3_Ch1
 	db CH5
-	dw SFX_1f_19_Ch2
+	dw SFX_Cry05_3_Ch2
 	db CH7
-	dw SFX_1f_19_Ch3
+	dw SFX_Cry05_3_Ch3
 
-SFX_1f_1a:: ; 7c072 (1f:4072)
+SFX_Cry06_3:: ; 7c072 (1f:4072)
 	db ( $80 | CH4 )
-	dw SFX_1f_1a_Ch1
+	dw SFX_Cry06_3_Ch1
 	db CH5
-	dw SFX_1f_1a_Ch2
+	dw SFX_Cry06_3_Ch2
 	db CH7
-	dw SFX_1f_1a_Ch3
+	dw SFX_Cry06_3_Ch3
 
-SFX_1f_1b:: ; 7c07b (1f:407b)
+SFX_Cry07_3:: ; 7c07b (1f:407b)
 	db ( $80 | CH4 )
-	dw SFX_1f_1b_Ch1
+	dw SFX_Cry07_3_Ch1
 	db CH5
-	dw SFX_1f_1b_Ch2
+	dw SFX_Cry07_3_Ch2
 	db CH7
-	dw SFX_1f_1b_Ch3
+	dw SFX_Cry07_3_Ch3
 
-SFX_1f_1c:: ; 7c084 (1f:4084)
+SFX_Cry08_3:: ; 7c084 (1f:4084)
 	db ( $80 | CH4 )
-	dw SFX_1f_1c_Ch1
+	dw SFX_Cry08_3_Ch1
 	db CH5
-	dw SFX_1f_1c_Ch2
+	dw SFX_Cry08_3_Ch2
 	db CH7
-	dw SFX_1f_1c_Ch3
+	dw SFX_Cry08_3_Ch3
 
-SFX_1f_1d:: ; 7c08d (1f:408d)
+SFX_Cry09_3:: ; 7c08d (1f:408d)
 	db ( $80 | CH4 )
-	dw SFX_1f_1d_Ch1
+	dw SFX_Cry09_3_Ch1
 	db CH5
-	dw SFX_1f_1d_Ch2
+	dw SFX_Cry09_3_Ch2
 	db CH7
-	dw SFX_1f_1d_Ch3
+	dw SFX_Cry09_3_Ch3
 
-SFX_1f_1e:: ; 7c096 (1f:4096)
+SFX_Cry0A_3:: ; 7c096 (1f:4096)
 	db ( $80 | CH4 )
-	dw SFX_1f_1e_Ch1
+	dw SFX_Cry0A_3_Ch1
 	db CH5
-	dw SFX_1f_1e_Ch2
+	dw SFX_Cry0A_3_Ch2
 	db CH7
-	dw SFX_1f_1e_Ch3
+	dw SFX_Cry0A_3_Ch3
 
-SFX_1f_1f:: ; 7c09f (1f:409f)
+SFX_Cry0B_3:: ; 7c09f (1f:409f)
 	db ( $80 | CH4 )
-	dw SFX_1f_1f_Ch1
+	dw SFX_Cry0B_3_Ch1
 	db CH5
-	dw SFX_1f_1f_Ch2
+	dw SFX_Cry0B_3_Ch2
 	db CH7
-	dw SFX_1f_1f_Ch3
+	dw SFX_Cry0B_3_Ch3
 
-SFX_1f_20:: ; 7c0a8 (1f:40a8)
+SFX_Cry0C_3:: ; 7c0a8 (1f:40a8)
 	db ( $80 | CH4 )
-	dw SFX_1f_20_Ch1
+	dw SFX_Cry0C_3_Ch1
 	db CH5
-	dw SFX_1f_20_Ch2
+	dw SFX_Cry0C_3_Ch2
 	db CH7
-	dw SFX_1f_20_Ch3
+	dw SFX_Cry0C_3_Ch3
 
-SFX_1f_21:: ; 7c0b1 (1f:40b1)
+SFX_Cry0D_3:: ; 7c0b1 (1f:40b1)
 	db ( $80 | CH4 )
-	dw SFX_1f_21_Ch1
+	dw SFX_Cry0D_3_Ch1
 	db CH5
-	dw SFX_1f_21_Ch2
+	dw SFX_Cry0D_3_Ch2
 	db CH7
-	dw SFX_1f_21_Ch3
+	dw SFX_Cry0D_3_Ch3
 
-SFX_1f_22:: ; 7c0ba (1f:40ba)
+SFX_Cry0E_3:: ; 7c0ba (1f:40ba)
 	db ( $80 | CH4 )
-	dw SFX_1f_22_Ch1
+	dw SFX_Cry0E_3_Ch1
 	db CH5
-	dw SFX_1f_22_Ch2
+	dw SFX_Cry0E_3_Ch2
 	db CH7
-	dw SFX_1f_22_Ch3
+	dw SFX_Cry0E_3_Ch3
 
-SFX_1f_23:: ; 7c0c3 (1f:40c3)
+SFX_Cry0F_3:: ; 7c0c3 (1f:40c3)
 	db ( $80 | CH4 )
-	dw SFX_1f_23_Ch1
+	dw SFX_Cry0F_3_Ch1
 	db CH5
-	dw SFX_1f_23_Ch2
+	dw SFX_Cry0F_3_Ch2
 	db CH7
-	dw SFX_1f_23_Ch3
+	dw SFX_Cry0F_3_Ch3
 
-SFX_1f_24:: ; 7c0cc (1f:40cc)
+SFX_Cry10_3:: ; 7c0cc (1f:40cc)
 	db ( $80 | CH4 )
-	dw SFX_1f_24_Ch1
+	dw SFX_Cry10_3_Ch1
 	db CH5
-	dw SFX_1f_24_Ch2
+	dw SFX_Cry10_3_Ch2
 	db CH7
-	dw SFX_1f_24_Ch3
+	dw SFX_Cry10_3_Ch3
 
-SFX_1f_25:: ; 7c0d5 (1f:40d5)
+SFX_Cry11_3:: ; 7c0d5 (1f:40d5)
 	db ( $80 | CH4 )
-	dw SFX_1f_25_Ch1
+	dw SFX_Cry11_3_Ch1
 	db CH5
-	dw SFX_1f_25_Ch2
+	dw SFX_Cry11_3_Ch2
 	db CH7
-	dw SFX_1f_25_Ch3
+	dw SFX_Cry11_3_Ch3
 
-SFX_1f_26:: ; 7c0de (1f:40de)
+SFX_Cry12_3:: ; 7c0de (1f:40de)
 	db ( $80 | CH4 )
-	dw SFX_1f_26_Ch1
+	dw SFX_Cry12_3_Ch1
 	db CH5
-	dw SFX_1f_26_Ch2
+	dw SFX_Cry12_3_Ch2
 	db CH7
-	dw SFX_1f_26_Ch3
+	dw SFX_Cry12_3_Ch3
 
-SFX_1f_27:: ; 7c0e7 (1f:40e7)
+SFX_Cry13_3:: ; 7c0e7 (1f:40e7)
 	db ( $80 | CH4 )
-	dw SFX_1f_27_Ch1
+	dw SFX_Cry13_3_Ch1
 	db CH5
-	dw SFX_1f_27_Ch2
+	dw SFX_Cry13_3_Ch2
 	db CH7
-	dw SFX_1f_27_Ch3
+	dw SFX_Cry13_3_Ch3
 
-SFX_1f_28:: ; 7c0f0 (1f:40f0)
+SFX_Cry14_3:: ; 7c0f0 (1f:40f0)
 	db ( $80 | CH4 )
-	dw SFX_1f_28_Ch1
+	dw SFX_Cry14_3_Ch1
 	db CH5
-	dw SFX_1f_28_Ch2
+	dw SFX_Cry14_3_Ch2
 	db CH7
-	dw SFX_1f_28_Ch3
+	dw SFX_Cry14_3_Ch3
 
-SFX_1f_29:: ; 7c0f9 (1f:40f9)
+SFX_Cry15_3:: ; 7c0f9 (1f:40f9)
 	db ( $80 | CH4 )
-	dw SFX_1f_29_Ch1
+	dw SFX_Cry15_3_Ch1
 	db CH5
-	dw SFX_1f_29_Ch2
+	dw SFX_Cry15_3_Ch2
 	db CH7
-	dw SFX_1f_29_Ch3
+	dw SFX_Cry15_3_Ch3
 
-SFX_1f_2a:: ; 7c102 (1f:4102)
+SFX_Cry16_3:: ; 7c102 (1f:4102)
 	db ( $80 | CH4 )
-	dw SFX_1f_2a_Ch1
+	dw SFX_Cry16_3_Ch1
 	db CH5
-	dw SFX_1f_2a_Ch2
+	dw SFX_Cry16_3_Ch2
 	db CH7
-	dw SFX_1f_2a_Ch3
+	dw SFX_Cry16_3_Ch3
 
-SFX_1f_2b:: ; 7c10b (1f:410b)
+SFX_Cry17_3:: ; 7c10b (1f:410b)
 	db ( $80 | CH4 )
-	dw SFX_1f_2b_Ch1
+	dw SFX_Cry17_3_Ch1
 	db CH5
-	dw SFX_1f_2b_Ch2
+	dw SFX_Cry17_3_Ch2
 	db CH7
-	dw SFX_1f_2b_Ch3
+	dw SFX_Cry17_3_Ch3
 
-SFX_1f_2c:: ; 7c114 (1f:4114)
+SFX_Cry18_3:: ; 7c114 (1f:4114)
 	db ( $80 | CH4 )
-	dw SFX_1f_2c_Ch1
+	dw SFX_Cry18_3_Ch1
 	db CH5
-	dw SFX_1f_2c_Ch2
+	dw SFX_Cry18_3_Ch2
 	db CH7
-	dw SFX_1f_2c_Ch3
+	dw SFX_Cry18_3_Ch3
 
-SFX_1f_2d:: ; 7c11d (1f:411d)
+SFX_Cry19_3:: ; 7c11d (1f:411d)
 	db ( $80 | CH4 )
-	dw SFX_1f_2d_Ch1
+	dw SFX_Cry19_3_Ch1
 	db CH5
-	dw SFX_1f_2d_Ch2
+	dw SFX_Cry19_3_Ch2
 	db CH7
-	dw SFX_1f_2d_Ch3
+	dw SFX_Cry19_3_Ch3
 
-SFX_1f_2e:: ; 7c126 (1f:4126)
+SFX_Cry1A_3:: ; 7c126 (1f:4126)
 	db ( $80 | CH4 )
-	dw SFX_1f_2e_Ch1
+	dw SFX_Cry1A_3_Ch1
 	db CH5
-	dw SFX_1f_2e_Ch2
+	dw SFX_Cry1A_3_Ch2
 	db CH7
-	dw SFX_1f_2e_Ch3
+	dw SFX_Cry1A_3_Ch3
 
-SFX_1f_2f:: ; 7c12f (1f:412f)
+SFX_Cry1B_3:: ; 7c12f (1f:412f)
 	db ( $80 | CH4 )
-	dw SFX_1f_2f_Ch1
+	dw SFX_Cry1B_3_Ch1
 	db CH5
-	dw SFX_1f_2f_Ch2
+	dw SFX_Cry1B_3_Ch2
 	db CH7
-	dw SFX_1f_2f_Ch3
+	dw SFX_Cry1B_3_Ch3
 
-SFX_1f_30:: ; 7c138 (1f:4138)
+SFX_Cry1C_3:: ; 7c138 (1f:4138)
 	db ( $80 | CH4 )
-	dw SFX_1f_30_Ch1
+	dw SFX_Cry1C_3_Ch1
 	db CH5
-	dw SFX_1f_30_Ch2
+	dw SFX_Cry1C_3_Ch2
 	db CH7
-	dw SFX_1f_30_Ch3
+	dw SFX_Cry1C_3_Ch3
 
-SFX_1f_31:: ; 7c141 (1f:4141)
+SFX_Cry1D_3:: ; 7c141 (1f:4141)
 	db ( $80 | CH4 )
-	dw SFX_1f_31_Ch1
+	dw SFX_Cry1D_3_Ch1
 	db CH5
-	dw SFX_1f_31_Ch2
+	dw SFX_Cry1D_3_Ch2
 	db CH7
-	dw SFX_1f_31_Ch3
+	dw SFX_Cry1D_3_Ch3
 
-SFX_1f_32:: ; 7c14a (1f:414a)
+SFX_Cry1E_3:: ; 7c14a (1f:414a)
 	db ( $80 | CH4 )
-	dw SFX_1f_32_Ch1
+	dw SFX_Cry1E_3_Ch1
 	db CH5
-	dw SFX_1f_32_Ch2
+	dw SFX_Cry1E_3_Ch2
 	db CH7
-	dw SFX_1f_32_Ch3
+	dw SFX_Cry1E_3_Ch3
 
-SFX_1f_33:: ; 7c153 (1f:4153)
+SFX_Cry1F_3:: ; 7c153 (1f:4153)
 	db ( $80 | CH4 )
-	dw SFX_1f_33_Ch1
+	dw SFX_Cry1F_3_Ch1
 	db CH5
-	dw SFX_1f_33_Ch2
+	dw SFX_Cry1F_3_Ch2
 	db CH7
-	dw SFX_1f_33_Ch3
+	dw SFX_Cry1F_3_Ch3
 
-SFX_1f_34:: ; 7c15c (1f:415c)
+SFX_Cry20_3:: ; 7c15c (1f:415c)
 	db ( $80 | CH4 )
-	dw SFX_1f_34_Ch1
+	dw SFX_Cry20_3_Ch1
 	db CH5
-	dw SFX_1f_34_Ch2
+	dw SFX_Cry20_3_Ch2
 	db CH7
-	dw SFX_1f_34_Ch3
+	dw SFX_Cry20_3_Ch3
 
-SFX_1f_35:: ; 7c165 (1f:4165)
+SFX_Cry21_3:: ; 7c165 (1f:4165)
 	db ( $80 | CH4 )
-	dw SFX_1f_35_Ch1
+	dw SFX_Cry21_3_Ch1
 	db CH5
-	dw SFX_1f_35_Ch2
+	dw SFX_Cry21_3_Ch2
 	db CH7
-	dw SFX_1f_35_Ch3
+	dw SFX_Cry21_3_Ch3
 
-SFX_1f_36:: ; 7c16e (1f:416e)
+SFX_Cry22_3:: ; 7c16e (1f:416e)
 	db ( $80 | CH4 )
-	dw SFX_1f_36_Ch1
+	dw SFX_Cry22_3_Ch1
 	db CH5
-	dw SFX_1f_36_Ch2
+	dw SFX_Cry22_3_Ch2
 	db CH7
-	dw SFX_1f_36_Ch3
+	dw SFX_Cry22_3_Ch3
 
-SFX_1f_37:: ; 7c177 (1f:4177)
+SFX_Cry23_3:: ; 7c177 (1f:4177)
 	db ( $80 | CH4 )
-	dw SFX_1f_37_Ch1
+	dw SFX_Cry23_3_Ch1
 	db CH5
-	dw SFX_1f_37_Ch2
+	dw SFX_Cry23_3_Ch2
 	db CH7
-	dw SFX_1f_37_Ch3
+	dw SFX_Cry23_3_Ch3
 
-SFX_1f_38:: ; 7c180 (1f:4180)
+SFX_Cry24_3:: ; 7c180 (1f:4180)
 	db ( $80 | CH4 )
-	dw SFX_1f_38_Ch1
+	dw SFX_Cry24_3_Ch1
 	db CH5
-	dw SFX_1f_38_Ch2
+	dw SFX_Cry24_3_Ch2
 	db CH7
-	dw SFX_1f_38_Ch3
+	dw SFX_Cry24_3_Ch3
 
-SFX_1f_39:: ; 7c189 (1f:4189)
+SFX_Cry25_3:: ; 7c189 (1f:4189)
 	db ( $80 | CH4 )
-	dw SFX_1f_39_Ch1
+	dw SFX_Cry25_3_Ch1
 	db CH5
-	dw SFX_1f_39_Ch2
+	dw SFX_Cry25_3_Ch2
 	db CH7
-	dw SFX_1f_39_Ch3
+	dw SFX_Cry25_3_Ch3
 
-SFX_1f_3a:: ; 7c192 (1f:4192)
+SFX_Get_Item1_3:: ; 7c192 (1f:4192)
 	db ( $80 | CH4 )
-	dw SFX_1f_3a_Ch1
+	dw SFX_Get_Item1_3_Ch1
 	db CH5
-	dw SFX_1f_3a_Ch2
+	dw SFX_Get_Item1_3_Ch2
 	db CH6
-	dw SFX_1f_3a_Ch3
+	dw SFX_Get_Item1_3_Ch3
 
-SFX_1f_3b:: ; 7c19b (1f:419b)
+SFX_Get_Item2_3:: ; 7c19b (1f:419b)
 	db ( $80 | CH4 )
-	dw SFX_1f_3b_Ch1
+	dw SFX_Get_Item2_3_Ch1
 	db CH5
-	dw SFX_1f_3b_Ch2
+	dw SFX_Get_Item2_3_Ch2
 	db CH6
-	dw SFX_1f_3b_Ch3
+	dw SFX_Get_Item2_3_Ch3
 
-SFX_1f_3c:: ; 7c1a4 (1f:41a4)
+SFX_Tink_3:: ; 7c1a4 (1f:41a4)
 	db CH4
-	dw SFX_1f_3c_Ch1
+	dw SFX_Tink_3_Ch1
 
-SFX_1f_3d:: ; 7c1a7 (1f:41a7)
+SFX_Heal_HP_3:: ; 7c1a7 (1f:41a7)
 	db CH4
-	dw SFX_1f_3d_Ch1
+	dw SFX_Heal_HP_3_Ch1
 
-SFX_1f_3e:: ; 7c1aa (1f:41aa)
+SFX_Heal_Ailment_3:: ; 7c1aa (1f:41aa)
 	db CH4
-	dw SFX_1f_3e_Ch1
+	dw SFX_Heal_Ailment_3_Ch1
 
-SFX_1f_3f:: ; 7c1ad (1f:41ad)
+SFX_Start_Menu_3:: ; 7c1ad (1f:41ad)
 	db CH7
-	dw SFX_1f_3f_Ch1
+	dw SFX_Start_Menu_3_Ch1
 
-SFX_1f_40:: ; 7c1b0 (1f:41b0)
+SFX_Press_AB_3:: ; 7c1b0 (1f:41b0)
 	db CH4
-	dw SFX_1f_40_Ch1
+	dw SFX_Press_AB_3_Ch1
 
-SFX_1f_41:: ; 7c1b3 (1f:41b3)
+SFX_Pokedex_Rating_3:: ; 7c1b3 (1f:41b3)
 	db ( $80 | CH4 )
-	dw SFX_1f_41_Ch1
+	dw SFX_Pokedex_Rating_3_Ch1
 	db CH5
-	dw SFX_1f_41_Ch2
+	dw SFX_Pokedex_Rating_3_Ch2
 	db CH6
-	dw SFX_1f_41_Ch3
+	dw SFX_Pokedex_Rating_3_Ch3
 
-SFX_1f_42:: ; 7c1bc (1f:41bc)
+SFX_Get_Key_Item_3:: ; 7c1bc (1f:41bc)
 	db ( $80 | CH4 )
-	dw SFX_1f_42_Ch1
+	dw SFX_Get_Key_Item_3_Ch1
 	db CH5
-	dw SFX_1f_42_Ch2
+	dw SFX_Get_Key_Item_3_Ch2
 	db CH6
-	dw SFX_1f_42_Ch3
+	dw SFX_Get_Key_Item_3_Ch3
 
-SFX_1f_43:: ; 7c1c5 (1f:41c5)
+SFX_Poisoned_3:: ; 7c1c5 (1f:41c5)
 	db CH4
-	dw SFX_1f_43_Ch1
+	dw SFX_Poisoned_3_Ch1
 
-SFX_1f_44:: ; 7c1c8 (1f:41c8)
+SFX_Trade_Machine_3:: ; 7c1c8 (1f:41c8)
 	db CH4
-	dw SFX_1f_44_Ch1
+	dw SFX_Trade_Machine_3_Ch1
 
-SFX_1f_45:: ; 7c1cb (1f:41cb)
+SFX_Turn_On_PC_3:: ; 7c1cb (1f:41cb)
 	db CH4
-	dw SFX_1f_45_Ch1
+	dw SFX_Turn_On_PC_3_Ch1
 
-SFX_1f_46:: ; 7c1ce (1f:41ce)
+SFX_Turn_Off_PC_3:: ; 7c1ce (1f:41ce)
 	db CH4
-	dw SFX_1f_46_Ch1
+	dw SFX_Turn_Off_PC_3_Ch1
 
-SFX_1f_47:: ; 7c1d1 (1f:41d1)
+SFX_Enter_PC_3:: ; 7c1d1 (1f:41d1)
 	db CH4
-	dw SFX_1f_47_Ch1
+	dw SFX_Enter_PC_3_Ch1
 
-SFX_1f_48:: ; 7c1d4 (1f:41d4)
+SFX_Shrink_3:: ; 7c1d4 (1f:41d4)
 	db CH4
-	dw SFX_1f_48_Ch1
+	dw SFX_Shrink_3_Ch1
 
-SFX_1f_49:: ; 7c1d7 (1f:41d7)
+SFX_Switch_3:: ; 7c1d7 (1f:41d7)
 	db CH4
-	dw SFX_1f_49_Ch1
+	dw SFX_Switch_3_Ch1
 
-SFX_1f_4a:: ; 7c1da (1f:41da)
+SFX_Healing_Machine_3:: ; 7c1da (1f:41da)
 	db CH4
-	dw SFX_1f_4a_Ch1
+	dw SFX_Healing_Machine_3_Ch1
 
-SFX_1f_4b:: ; 7c1dd (1f:41dd)
+SFX_Teleport_Exit1_3:: ; 7c1dd (1f:41dd)
 	db CH4
-	dw SFX_1f_4b_Ch1
+	dw SFX_Teleport_Exit1_3_Ch1
 
-SFX_1f_4c:: ; 7c1e0 (1f:41e0)
+SFX_Teleport_Enter1_3:: ; 7c1e0 (1f:41e0)
 	db CH4
-	dw SFX_1f_4c_Ch1
+	dw SFX_Teleport_Enter1_3_Ch1
 
-SFX_1f_4d:: ; 7c1e3 (1f:41e3)
+SFX_Teleport_Exit2_3:: ; 7c1e3 (1f:41e3)
 	db CH4
-	dw SFX_1f_4d_Ch1
+	dw SFX_Teleport_Exit2_3_Ch1
 
-SFX_1f_4e:: ; 7c1e6 (1f:41e6)
+SFX_Ledge_3:: ; 7c1e6 (1f:41e6)
 	db CH4
-	dw SFX_1f_4e_Ch1
+	dw SFX_Ledge_3_Ch1
 
-SFX_1f_4f:: ; 7c1e9 (1f:41e9)
+SFX_Teleport_Enter2_3:: ; 7c1e9 (1f:41e9)
 	db CH7
-	dw SFX_1f_4f_Ch1
+	dw SFX_Teleport_Enter2_3_Ch1
 
-SFX_1f_50:: ; 7c1ec (1f:41ec)
+SFX_Fly_3:: ; 7c1ec (1f:41ec)
 	db CH7
-	dw SFX_1f_50_Ch1
+	dw SFX_Fly_3_Ch1
 
-SFX_1f_51:: ; 7c1ef (1f:41ef)
+SFX_Denied_3:: ; 7c1ef (1f:41ef)
 	db ( $40 | CH4 )
-	dw SFX_1f_51_Ch1
+	dw SFX_Denied_3_Ch1
 	db CH5
-	dw SFX_1f_51_Ch2
+	dw SFX_Denied_3_Ch2
 
-SFX_1f_52:: ; 7c1f5 (1f:41f5)
+SFX_Arrow_Tiles_3:: ; 7c1f5 (1f:41f5)
 	db CH4
-	dw SFX_1f_52_Ch1
+	dw SFX_Arrow_Tiles_3_Ch1
 
-SFX_1f_53:: ; 7c1f8 (1f:41f8)
+SFX_Push_Boulder_3:: ; 7c1f8 (1f:41f8)
 	db CH7
-	dw SFX_1f_53_Ch1
+	dw SFX_Push_Boulder_3_Ch1
 
-SFX_1f_54:: ; 7c1fb (1f:41fb)
+SFX_SS_Anne_Horn_3:: ; 7c1fb (1f:41fb)
 	db ( $40 | CH4 )
-	dw SFX_1f_54_Ch1
+	dw SFX_SS_Anne_Horn_3_Ch1
 	db CH5
-	dw SFX_1f_54_Ch2
+	dw SFX_SS_Anne_Horn_3_Ch2
 
-SFX_1f_55:: ; 7c201 (1f:4201)
+SFX_Withdraw_Deposit_3:: ; 7c201 (1f:4201)
 	db CH4
-	dw SFX_1f_55_Ch1
+	dw SFX_Withdraw_Deposit_3_Ch1
 
-SFX_1f_56:: ; 7c204 (1f:4204)
+SFX_Cut_3:: ; 7c204 (1f:4204)
 	db CH7
-	dw SFX_1f_56_Ch1
+	dw SFX_Cut_3_Ch1
 
-SFX_1f_57:: ; 7c207 (1f:4207)
+SFX_Go_Inside_3:: ; 7c207 (1f:4207)
 	db CH7
-	dw SFX_1f_57_Ch1
+	dw SFX_Go_Inside_3_Ch1
 
-SFX_1f_58:: ; 7c20a (1f:420a)
+SFX_Swap_3:: ; 7c20a (1f:420a)
 	db ( $40 | CH4 )
-	dw SFX_1f_58_Ch1
+	dw SFX_Swap_3_Ch1
 	db CH5
-	dw SFX_1f_58_Ch2
+	dw SFX_Swap_3_Ch2
 
-SFX_1f_59:: ; 7c210 (1f:4210)
+SFX_59_3:: ; 7c210 (1f:4210)
 	db ( $40 | CH4 )
-	dw SFX_1f_59_Ch1
+	dw SFX_59_3_Ch1
 	db CH5
-	dw SFX_1f_59_Ch2
+	dw SFX_59_3_Ch2
 
-SFX_1f_5a:: ; 7c216 (1f:4216)
+SFX_Purchase_3:: ; 7c216 (1f:4216)
 	db ( $40 | CH4 )
-	dw SFX_1f_5a_Ch1
+	dw SFX_Purchase_3_Ch1
 	db CH5
-	dw SFX_1f_5a_Ch2
+	dw SFX_Purchase_3_Ch2
 
-SFX_1f_5b:: ; 7c21c (1f:421c)
+SFX_Collision_3:: ; 7c21c (1f:421c)
 	db CH4
-	dw SFX_1f_5b_Ch1
+	dw SFX_Collision_3_Ch1
 
-SFX_1f_5c:: ; 7c21f (1f:421f)
+SFX_Go_Outside_3:: ; 7c21f (1f:421f)
 	db CH7
-	dw SFX_1f_5c_Ch1
+	dw SFX_Go_Outside_3_Ch1
 
-SFX_1f_5d:: ; 7c222 (1f:4222)
+SFX_Save_3:: ; 7c222 (1f:4222)
 	db ( $40 | CH4 )
-	dw SFX_1f_5d_Ch1
+	dw SFX_Save_3_Ch1
 	db CH5
-	dw SFX_1f_5d_Ch2
+	dw SFX_Save_3_Ch2
 
-SFX_1f_5e:: ; 7c228 (1f:4228)
+SFX_Intro_Lunge:: ; 7c228 (1f:4228)
 	db CH7
-	dw SFX_1f_5e_Ch1
+	dw SFX_Intro_Lunge_Ch1
 
-SFX_1f_5f:: ; 7c22b (1f:422b)
+SFX_Intro_Hip:: ; 7c22b (1f:422b)
 	db CH4
-	dw SFX_1f_5f_Ch1
+	dw SFX_Intro_Hip_Ch1
 
-SFX_1f_60:: ; 7c22e (1f:422e)
+SFX_Intro_Hop:: ; 7c22e (1f:422e)
 	db CH4
-	dw SFX_1f_60_Ch1
+	dw SFX_Intro_Hop_Ch1
 
-SFX_1f_61:: ; 7c231 (1f:4231)
+SFX_Intro_Raise:: ; 7c231 (1f:4231)
 	db CH7
-	dw SFX_1f_61_Ch1
+	dw SFX_Intro_Raise_Ch1
 
-SFX_1f_62:: ; 7c234 (1f:4234)
+SFX_Intro_Crash:: ; 7c234 (1f:4234)
 	db CH7
-	dw SFX_1f_62_Ch1
+	dw SFX_Intro_Crash_Ch1
 
-SFX_1f_63:: ; 7c237 (1f:4237)
+SFX_Intro_Whoosh:: ; 7c237 (1f:4237)
 	db CH7
-	dw SFX_1f_63_Ch1
+	dw SFX_Intro_Whoosh_Ch1
 
-SFX_1f_64:: ; 7c23a (1f:423a)
+SFX_Slots_Stop_Wheel:: ; 7c23a (1f:423a)
 	db CH4
-	dw SFX_1f_64_Ch1
+	dw SFX_Slots_Stop_Wheel_Ch1
 
-SFX_1f_65:: ; 7c23d (1f:423d)
+SFX_Slots_Reward:: ; 7c23d (1f:423d)
 	db CH4
-	dw SFX_1f_65_Ch1
+	dw SFX_Slots_Reward_Ch1
 
-SFX_1f_66:: ; 7c240 (1f:4240)
+SFX_Slots_New_Spin:: ; 7c240 (1f:4240)
 	db ( $40 | CH4 )
-	dw SFX_1f_66_Ch1
+	dw SFX_Slots_New_Spin_Ch1
 	db CH5
-	dw SFX_1f_66_Ch2
+	dw SFX_Slots_New_Spin_Ch2
 
-SFX_1f_67:: ; 7c246 (1f:4246)
+SFX_Shooting_Star:: ; 7c246 (1f:4246)
 	db CH4
-	dw SFX_1f_67_Ch1
+	dw SFX_Shooting_Star_Ch1