Rearrange files and labels to reflect duplicated sfx in bank AUDIO_4

66 files changed, 193 insertions, 284 deletions

diff --git a/audio.asm b/audio.asm
index 551f8eff..2162e94e 100644
--- a/audio.asm
+++ b/audio.asm
@@ -370,32 +370,36 @@ INCLUDE "audio/sfx/cry21_3.asm"
 INCLUDE "audio/sfx/cry22_3.asm"
 
 SECTION "Sound Effects 4", ROMX, BANK[AUDIO_4]
-INCLUDE "audio/sfx/unknown_801ec.asm"
-INCLUDE "audio/sfx/unknown_801f0.asm"
-INCLUDE "audio/sfx/unknown_801f4.asm"
-INCLUDE "audio/sfx/unknown_801f8.asm"
-INCLUDE "audio/sfx/unknown_801fc.asm"
-INCLUDE "audio/sfx/unknown_8020f.asm"
-INCLUDE "audio/sfx/unknown_80213.asm"
-INCLUDE "audio/sfx/unknown_8021a.asm"
-INCLUDE "audio/sfx/unknown_8021e.asm"
-INCLUDE "audio/sfx/unknown_80222.asm"
-INCLUDE "audio/sfx/unknown_80226.asm"
-INCLUDE "audio/sfx/unknown_8022a.asm"
-INCLUDE "audio/sfx/unknown_8022e.asm"
-INCLUDE "audio/sfx/unknown_80232.asm"
-INCLUDE "audio/sfx/unknown_80236.asm"
-INCLUDE "audio/sfx/unknown_8023d.asm"
-INCLUDE "audio/sfx/unknown_80244.asm"
-INCLUDE "audio/sfx/unknown_80248.asm"
-INCLUDE "audio/sfx/unknown_8024c.asm"
+INCLUDE "audio/sfx/snare1_4.asm"
+INCLUDE "audio/sfx/snare2_4.asm"
+INCLUDE "audio/sfx/snare3_4.asm"
+INCLUDE "audio/sfx/snare4_4.asm"
+INCLUDE "audio/sfx/snare5_4.asm"
+INCLUDE "audio/sfx/triangle1_4.asm"
+INCLUDE "audio/sfx/triangle2_4.asm"
+INCLUDE "audio/sfx/snare6_4.asm"
+INCLUDE "audio/sfx/snare7_4.asm"
+INCLUDE "audio/sfx/snare8_4.asm"
+INCLUDE "audio/sfx/snare9_4.asm"
+INCLUDE "audio/sfx/cymbal1_4.asm"
+INCLUDE "audio/sfx/cymbal2_4.asm"
+INCLUDE "audio/sfx/cymbal3_4.asm"
+INCLUDE "audio/sfx/muted_snare1_4.asm"
+INCLUDE "audio/sfx/triangle3_4.asm"
+INCLUDE "audio/sfx/muted_snare2_4.asm"
+INCLUDE "audio/sfx/muted_snare3_4.asm"
+INCLUDE "audio/sfx/muted_snare4_4.asm"
 INCLUDE "audio/sfx/unknown_80250.asm"
+INCLUDE "audio/sfx/unknown_80263.asm"
 INCLUDE "audio/sfx/unknown_8026a.asm"
+INCLUDE "audio/sfx/heal_ailment_4.asm"
+INCLUDE "audio/sfx/tink_4.asm"
+INCLUDE "audio/sfx/unknown_8029f.asm"
 INCLUDE "audio/sfx/unknown_802b5.asm"
 INCLUDE "audio/sfx/unknown_802cc.asm"
 INCLUDE "audio/sfx/unknown_802d7.asm"
 INCLUDE "audio/sfx/unknown_802e1.asm"
-INCLUDE "audio/sfx/get_item2_4.asm"
+INCLUDE "audio/sfx/get_item2_4_2.asm"
 INCLUDE "audio/sfx/unknown_80337.asm"
 INCLUDE "audio/sfx/unknown_803da.asm"
 INCLUDE "audio/sfx/unknown_80411.asm"
@@ -437,7 +441,7 @@ INCLUDE "audio/sfx/unknown_80ce7.asm"
 INCLUDE "audio/music/printer.asm"
 INCLUDE "audio/sfx/unknown_80e5a.asm"
 INCLUDE "audio/sfx/unknown_80e91.asm"
-INCLUDE "audio/sfx/unknown_80ec8.asm"
+INCLUDE "audio/sfx/get_item2_4.asm"
 	
 SECTION "Audio Engine 1", ROMX, BANK[AUDIO_1]
 
diff --git a/audio/headers/sfxheaders4.asm b/audio/headers/sfxheaders4.asm
index b2092b06..bb60c5bd 100644
--- a/audio/headers/sfxheaders4.asm
+++ b/audio/headers/sfxheaders4.asm
@@ -1,62 +1,62 @@
 SFX_Headers_4:: ; 80000 (20:4000)
 	dbw -1, -1 ; padding
 
-SFX_80003_4:: ; 80003 (20:4003)
-	dbw CH7, SFX_801ec_4_Ch7
+SFX_Snare1_4:: ; 80003 (20:4003)
+	dbw CH7, SFX_Snare1_4_Ch7
 
-SFX_80006_4:: ; 80006 (20:4006)
-	dbw CH7, SFX_801f0_4_Ch7
+SFX_Snare2_4:: ; 80006 (20:4006)
+	dbw CH7, SFX_Snare2_4_Ch7
 
-SFX_80009_4:: ; 80009 (20:4009)
-	dbw CH7, SFX_801f4_4_Ch7
+SFX_Snare3_4:: ; 80009 (20:4009)
+	dbw CH7, SFX_Snare3_4_Ch7
 
-SFX_8000c_4:: ; 8000c (20:400c)
-	dbw CH7, SFX_801f8_4_Ch7
+SFX_Snare4_4:: ; 8000c (20:400c)
+	dbw CH7, SFX_Snare4_4_Ch7
 
-SFX_8000f_4:: ; 8000f (20:400f)
-	dbw CH7, SFX_801fc_4_Ch7
+SFX_Snare5_4:: ; 8000f (20:400f)
+	dbw CH7, SFX_Snare5_4_Ch7
 
-SFX_80012_4:: ; 80012 (20:4012)
-	dbw CH7, SFX_8020f_4_Ch7
+SFX_Triangle1_4:: ; 80012 (20:4012)
+	dbw CH7, SFX_Triangle1_4_Ch7
 
-SFX_80015_4:: ; 80015 (20:4015)
-	dbw CH7, SFX_80213_4_Ch7
+SFX_Triangle2_4:: ; 80015 (20:4015)
+	dbw CH7, SFX_Triangle2_4_Ch7
 
-SFX_80018_4:: ; 80018 (20:4018)
-	dbw CH7, SFX_8021a_4_Ch7
+SFX_Snare6_4:: ; 80018 (20:4018)
+	dbw CH7, SFX_Snare6_4_Ch7
 
-SFX_8001b_4:: ; 8001b (20:401b)
-	dbw CH7, SFX_8021e_4_Ch7
+SFX_Snare7_4:: ; 8001b (20:401b)
+	dbw CH7, SFX_Snare7_4_Ch7
 
-SFX_8001e_4:: ; 8001e (20:401e)
-	dbw CH7, SFX_80222_4_Ch7
+SFX_Snare8_4:: ; 8001e (20:401e)
+	dbw CH7, SFX_Snare8_4_Ch7
 
-SFX_80021_4:: ; 80021 (20:4021)
-	dbw CH7, SFX_80226_4_Ch7
+SFX_Snare9_4:: ; 80021 (20:4021)
+	dbw CH7, SFX_Snare9_4_Ch7
 
-SFX_80024_4:: ; 80024 (20:4024)
-	dbw CH7, SFX_8022a_4_Ch7
+SFX_Cymbal1_4:: ; 80024 (20:4024)
+	dbw CH7, SFX_Cymbal1_4_Ch7
 
-SFX_80027_4:: ; 80027 (20:4027)
-	dbw CH7, SFX_8022e_4_Ch7
+SFX_Cymbal2_4:: ; 80027 (20:4027)
+	dbw CH7, SFX_Cymbal2_4_Ch7
 
-SFX_8002a_4:: ; 8002a (20:402a)
-	dbw CH7, SFX_80232_4_Ch7
+SFX_Cymbal3_4:: ; 8002a (20:402a)
+	dbw CH7, SFX_Cymbal3_4_Ch7
 
-SFX_8002d_4:: ; 8002d (20:402d)
-	dbw CH7, SFX_80236_4_Ch7
+SFX_Muted_Snare1_4:: ; 8002d (20:402d)
+	dbw CH7, SFX_Muted_Snare1_4_Ch7
 
-SFX_80030_4:: ; 80030 (20:4030)
-	dbw CH7, SFX_8023d_4_Ch7
+SFX_Triangle3_4:: ; 80030 (20:4030)
+	dbw CH7, SFX_Triangle3_4_Ch7
 
-SFX_80033_4:: ; 80033 (20:4033)
-	dbw CH7, SFX_80244_4_Ch7
+SFX_Muted_Snare2_4:: ; 80033 (20:4033)
+	dbw CH7, SFX_Muted_Snare2_4_Ch7
 
-SFX_80036_4:: ; 80036 (20:4036)
-	dbw CH7, SFX_80248_4_Ch7
+SFX_Muted_Snare3_4:: ; 80036 (20:4036)
+	dbw CH7, SFX_Muted_Snare3_4_Ch7
 
-SFX_80039_4:: ; 80039 (20:4039)
-	dbw CH7, SFX_8024c_4_Ch7
+SFX_Muted_Snare4_4:: ; 80039 (20:4039)
+	dbw CH7, SFX_Muted_Snare4_4_Ch7
 
 SFX_8003c_4:: ; 8003c (20:403c)
 	dbw ( $80 | CH4 ), SFX_805db_4_Ch4
@@ -248,26 +248,26 @@ SFX_80189_4:: ; 80189 (20:4189)
 	dbw CH5, SFX_804d6_4_Ch5
 	dbw CH7, SFX_804ed_4_Ch7
 
-SFX_80192_4:: ; 80192 (20:4192)
+SFX_Get_Item1_4:: ; 80192 (20:4192)
 	dbw ( $80 | CH4 ), SFX_80e5a_4_Ch4
 	dbw CH5, SFX_80e71_4_Ch5
 	dbw CH6, SFX_80e81_4_Ch6
 
-SFX_8019b_4:: ; 8019b (20:419b)
+SFX_Get_Item2_4:: ; 8019b (20:419b)
 	dbw ( $80 | CH4 ), SFX_80ec8_4_Ch4
 	dbw CH5, SFX_80ee7_4_Ch5
 	dbw CH6, SFX_80eff_4_Ch6
 
-SFX_801a4_4:: ; 801a4 (20:41a4)
+SFX_Tink_4:: ; 801a4 (20:41a4)
 	dbw CH4, SFX_8028e_4_Ch4
 
-SFX_801a7_4:: ; 801a7 (20:41a7)
+SFX_Heal_Ailment_4:: ; 801a7 (20:41a7)
 	dbw CH4, SFX_8027f_4_Ch4
 
-SFX_801aa_4:: ; 801aa (20:41aa)
+SFX_Start_Menu_4:: ; 801aa (20:41aa)
 	dbw CH4, SFX_8026a_4_Ch4
 
-SFX_801ad_4:: ; 801ad (20:41ad)
+SFX_PressAB_4:: ; 801ad (20:41ad)
 	dbw CH7, SFX_80263_4_Ch7
 
 SFX_801b0_4:: ; 801b0 (20:41b0)
@@ -288,7 +288,7 @@ SFX_801bc_4:: ; 801bc (20:41bc)
 SFX_801bf_4:: ; 801bf (20:41bf)
 	dbw CH7, SFX_802d7_4_Ch7
 
-SFX_Get_Item2_4:: ; 801c2 (20:41c2)
-	dbw ( $80 | CH4 ), SFX_Get_Item2_4_Ch1
-	dbw CH5, SFX_Get_Item2_4_Ch2
-	dbw CH6, SFX_Get_Item2_4_Ch3
+SFX_Get_Item2_4_2:: ; 801c2 (20:41c2)
+	dbw ( $80 | CH4 ), SFX_Get_Item2_4_2_Ch1
+	dbw CH5, SFX_Get_Item2_4_2_Ch2
+	dbw CH6, SFX_Get_Item2_4_2_Ch3
diff --git a/audio/sfx/unknown_8022a.asm b/audio/sfx/cymbal1_4.asm
index 245fe212..bd941ef5 100644
--- a/audio/sfx/unknown_8022a.asm
+++ b/audio/sfx/cymbal1_4.asm
@@ -1,4 +1,4 @@
-SFX_8022a_4_Ch7:
+SFX_Cymbal1_4_Ch7:
 	unknownnoise0x20 0, 161, 16
 	endchannel
 
diff --git a/audio/sfx/unknown_8022e.asm b/audio/sfx/cymbal2_4.asm
index 761724c4..b33e10fc 100644
--- a/audio/sfx/unknown_8022e.asm
+++ b/audio/sfx/cymbal2_4.asm
@@ -1,4 +1,4 @@
-SFX_8022e_4_Ch7:
+SFX_Cymbal2_4_Ch7:
 	unknownnoise0x20 0, 162, 17
 	endchannel
 
diff --git a/audio/sfx/unknown_80232.asm b/audio/sfx/cymbal3_4.asm
index 7bfe801b..b5e99c56 100644
--- a/audio/sfx/unknown_80232.asm
+++ b/audio/sfx/cymbal3_4.asm
@@ -1,4 +1,4 @@
-SFX_80232_4_Ch7:
+SFX_Cymbal3_4_Ch7:
 	unknownnoise0x20 0, 162, 80
 	endchannel
 
diff --git a/audio/sfx/get_item2_4.asm b/audio/sfx/get_item2_4.asm
index 166edfc7..b2909739 100644
--- a/audio/sfx/get_item2_4.asm
+++ b/audio/sfx/get_item2_4.asm
@@ -1,4 +1,4 @@
-SFX_Get_Item2_4_Ch1: ; 802eb (20:42eb)
+SFX_80ec8_4_Ch4:
 	executemusic
 	tempo 256
 	volume 7, 7
@@ -24,8 +24,7 @@ SFX_Get_Item2_4_Ch1: ; 802eb (20:42eb)
 	C_ 8
 	endchannel
 
-
-SFX_Get_Item2_4_Ch2: ; 8030a (20:430a)
+SFX_80ee7_4_Ch5:
 	executemusic
 	vibrato 8, 2, 7
 	duty 2
@@ -45,8 +44,7 @@ SFX_Get_Item2_4_Ch2: ; 8030a (20:430a)
 	A_ 8
 	endchannel
 
-
-SFX_Get_Item2_4_Ch3: ; 80322 (20:4322)
+SFX_80eff_4_Ch6:
 	executemusic
 	notetype 5, 1, 0
 	octave 5
diff --git a/audio/sfx/unknown_80ec8.asm b/audio/sfx/get_item2_4_2.asm
index b2909739..6f97390e 100644
--- a/audio/sfx/unknown_80ec8.asm
+++ b/audio/sfx/get_item2_4_2.asm
@@ -1,4 +1,4 @@
-SFX_80ec8_4_Ch4:
+SFX_Get_Item2_4_2_Ch1: ; 802eb (20:42eb)
 	executemusic
 	tempo 256
 	volume 7, 7
@@ -24,7 +24,8 @@ SFX_80ec8_4_Ch4:
 	C_ 8
 	endchannel
 
-SFX_80ee7_4_Ch5:
+
+SFX_Get_Item2_4_2_Ch2: ; 8030a (20:430a)
 	executemusic
 	vibrato 8, 2, 7
 	duty 2
@@ -44,7 +45,8 @@ SFX_80ee7_4_Ch5:
 	A_ 8
 	endchannel
 
-SFX_80eff_4_Ch6:
+
+SFX_Get_Item2_4_2_Ch3: ; 80322 (20:4322)
 	executemusic
 	notetype 5, 1, 0
 	octave 5
diff --git a/audio/sfx/unknown_80236.asm b/audio/sfx/muted_snare1_4.asm
index db3c71e2..bcf8c54b 100644
--- a/audio/sfx/unknown_80236.asm
+++ b/audio/sfx/muted_snare1_4.asm
@@ -1,4 +1,4 @@
-SFX_80236_4_Ch7:
+SFX_Muted_Snare1_4_Ch7:
 	unknownnoise0x20 0, 161, 24
 	unknownnoise0x20 0, 49, 51
 	endchannel
diff --git a/audio/sfx/unknown_80244.asm b/audio/sfx/muted_snare2_4.asm
index 1928089a..8934afe2 100644
--- a/audio/sfx/unknown_80244.asm
+++ b/audio/sfx/muted_snare2_4.asm
@@ -1,4 +1,4 @@
-SFX_80244_4_Ch7:
+SFX_Muted_Snare2_4_Ch7:
 	unknownnoise0x20 0, 145, 34
 	endchannel
 
diff --git a/audio/sfx/unknown_80248.asm b/audio/sfx/muted_snare3_4.asm
index 43f5d906..beeec087 100644
--- a/audio/sfx/unknown_80248.asm
+++ b/audio/sfx/muted_snare3_4.asm
@@ -1,4 +1,4 @@
-SFX_80248_4_Ch7:
+SFX_Muted_Snare3_4_Ch7:
 	unknownnoise0x20 0, 113, 34
 	endchannel
 
diff --git a/audio/sfx/unknown_8024c.asm b/audio/sfx/muted_snare4_4.asm
index ec92e74b..7fc65086 100644
--- a/audio/sfx/unknown_8024c.asm
+++ b/audio/sfx/muted_snare4_4.asm
@@ -1,4 +1,4 @@
-SFX_8024c_4_Ch7:
+SFX_Muted_Snare4_4_Ch7:
 	unknownnoise0x20 0, 97, 34
 	endchannel
 
diff --git a/audio/sfx/unknown_801ec.asm b/audio/sfx/snare1_4.asm
index 5206ac1d..4ba3b8c5 100755
--- a/audio/sfx/unknown_801ec.asm
+++ b/audio/sfx/snare1_4.asm
@@ -1,4 +1,4 @@
-SFX_801ec_4_Ch7: ; 841ec
+SFX_Snare1_4_Ch7: ; 841ec
 	unknownnoise0x20 0, 193, 51
 	endchannel
 
diff --git a/audio/sfx/unknown_801f0.asm b/audio/sfx/snare2_4.asm
index 73edb6f5..dc1a26a9 100755
--- a/audio/sfx/unknown_801f0.asm
+++ b/audio/sfx/snare2_4.asm
@@ -1,4 +1,4 @@
-SFX_801f0_4_Ch7: ; 841f0
+SFX_Snare2_4_Ch7: ; 841f0
 	unknownnoise0x20 0, 177, 51
 	endchannel
 
diff --git a/audio/sfx/unknown_801f4.asm b/audio/sfx/snare3_4.asm
index a794e45a..a0fcb0d7 100755
--- a/audio/sfx/unknown_801f4.asm
+++ b/audio/sfx/snare3_4.asm
@@ -1,4 +1,4 @@
-SFX_801f4_4_Ch7:
+SFX_Snare3_4_Ch7:
 	unknownnoise0x20 0, 161, 51
 	endchannel
 
diff --git a/audio/sfx/unknown_801f8.asm b/audio/sfx/snare4_4.asm
index fbac6ce4..c1d5cc21 100644
--- a/audio/sfx/unknown_801f8.asm
+++ b/audio/sfx/snare4_4.asm
@@ -1,4 +1,4 @@
-SFX_801f8_4_Ch7:
+SFX_Snare4_4_Ch7:
 	unknownnoise0x20 0, 129, 51
 	endchannel
 
diff --git a/audio/sfx/unknown_801fc.asm b/audio/sfx/snare5_4.asm
index 6fa0fa13..37fe8b27 100644
--- a/audio/sfx/unknown_801fc.asm
+++ b/audio/sfx/snare5_4.asm
@@ -1,4 +1,4 @@
-SFX_801fc_4_Ch7:
+SFX_Snare5_4_Ch7:
 	unknownnoise0x20 7, 132, 55
 	unknownnoise0x20 6, 132, 54
 	unknownnoise0x20 5, 131, 53
diff --git a/audio/sfx/unknown_8021a.asm b/audio/sfx/snare6_4.asm
index d555bf9e..1b835f00 100644
--- a/audio/sfx/unknown_8021a.asm
+++ b/audio/sfx/snare6_4.asm
@@ -1,4 +1,4 @@
-SFX_8021a_4_Ch7:
+SFX_Snare6_4_Ch7:
 	unknownnoise0x20 0, 129, 16
 	endchannel
 
diff --git a/audio/sfx/unknown_8021e.asm b/audio/sfx/snare7_4.asm
index 7909cf47..ed03d368 100644
--- a/audio/sfx/unknown_8021e.asm
+++ b/audio/sfx/snare7_4.asm
@@ -1,4 +1,4 @@
-SFX_8021e_4_Ch7:
+SFX_Snare7_4_Ch7:
 	unknownnoise0x20 0, 130, 35
 	endchannel
 
diff --git a/audio/sfx/unknown_80222.asm b/audio/sfx/snare8_4.asm
index a28d5e45..ec0e6665 100644
--- a/audio/sfx/unknown_80222.asm
+++ b/audio/sfx/snare8_4.asm
@@ -1,4 +1,4 @@
-SFX_80222_4_Ch7:
+SFX_Snare8_4_Ch7:
 	unknownnoise0x20 0, 130, 37
 	endchannel
 
diff --git a/audio/sfx/unknown_80226.asm b/audio/sfx/snare9_4.asm
index cf37ac1e..254e9ce6 100644
--- a/audio/sfx/unknown_80226.asm
+++ b/audio/sfx/snare9_4.asm
@@ -1,4 +1,4 @@
-SFX_80226_4_Ch7:
+SFX_Snare9_4_Ch7:
 	unknownnoise0x20 0, 130, 38
 	endchannel
 
diff --git a/audio/sfx/unknown_8020f.asm b/audio/sfx/triangle1_4.asm
index 843ded55..a90e4c48 100644
--- a/audio/sfx/unknown_8020f.asm
+++ b/audio/sfx/triangle1_4.asm
@@ -1,4 +1,4 @@
-SFX_8020f_4_Ch7:
+SFX_Triangle1_4_Ch7:
 	unknownnoise0x20 0, 81, 42
 	endchannel
 
diff --git a/audio/sfx/unknown_80213.asm b/audio/sfx/triangle2_4.asm
index 6395087c..58b6d511 100644
--- a/audio/sfx/unknown_80213.asm
+++ b/audio/sfx/triangle2_4.asm
@@ -1,4 +1,4 @@
-SFX_80213_4_Ch7:
+SFX_Triangle2_4_Ch7:
 	unknownnoise0x20 1, 65, 43
 	unknownnoise0x20 0, 97, 42
 	endchannel
diff --git a/audio/sfx/unknown_8023d.asm b/audio/sfx/triangle3_4.asm
index ec8031d5..a2fab704 100644
--- a/audio/sfx/unknown_8023d.asm
+++ b/audio/sfx/triangle3_4.asm
@@ -1,4 +1,4 @@
-SFX_8023d_4_Ch7:
+SFX_Triangle3_4_Ch7:
 	unknownnoise0x20 2, 145, 40
 	unknownnoise0x20 0, 113, 24
 	endchannel
diff --git a/audio/sfx/unknown_80250.asm b/audio/sfx/unknown_80250.asm
index da0c249c..4f65a6a0 100644
--- a/audio/sfx/unknown_80250.asm
+++ b/audio/sfx/unknown_80250.asm
@@ -1,13 +1,7 @@
 SFX_80250_4_Ch4:
-	duty $02
+	duty 2
 	unknownsfx0x20 0, 145, 192, 7
 	unknownsfx0x20 0, 129, 208, 7
 	unknownsfx0x20 0, 145, 192, 7
 	unknownsfx0x20 12, 161, 208, 7
 	endchannel
-
-SFX_80263_4_Ch7:
-	unknownnoise0x20 1, 226, 51
-	unknownnoise0x20 8, 225, 34
-	endchannel
-
diff --git a/audio/sfx/unknown_8026a.asm b/audio/sfx/unknown_8026a.asm
index a3433fa5..9dd6a02b 100644
--- a/audio/sfx/unknown_8026a.asm
+++ b/audio/sfx/unknown_8026a.asm
@@ -1,5 +1,5 @@
 SFX_8026a_4_Ch4:
-	duty $02
+	duty 2
 	unknownsfx0x10 20
 	unknownsfx0x20 4, 242, 0, 6
 	unknownsfx0x20 4, 242, 0, 6
@@ -8,30 +8,3 @@ SFX_8026a_4_Ch4:
 	unknownsfx0x10 8
 	endchannel
 
-SFX_8027f_4_Ch4:
-	duty $02
-	unknownsfx0x10 23
-	unknownsfx0x20 15, 240, 240, 4
-	unknownsfx0x20 15, 242, 80, 6
-	unknownsfx0x10 8
-	endchannel
-
-SFX_8028e_4_Ch4:
-	duty $02
-	unknownsfx0x10 58
-	unknownsfx0x20 4, 242, 0, 2
-	unknownsfx0x10 34
-	unknownsfx0x20 8, 226, 0, 2
-	unknownsfx0x10 8
-	endchannel
-
-SFX_8029f_4_Ch7:
-	unknownnoise0x20 6, 241, 17
-	unknownnoise0x20 7, 242, 34
-	unknownnoise0x20 8, 243, 51
-	unknownnoise0x20 9, 244, 66
-	unknownnoise0x20 10, 245, 51
-	unknownnoise0x20 11, 246, 34
-	unknownnoise0x20 12, 247, 17
-	endchannel
-
diff --git a/audio/sfx/unknown_802b5.asm b/audio/sfx/unknown_802b5.asm
index 4d3d2f06..364443cf 100644
--- a/audio/sfx/unknown_802b5.asm
+++ b/audio/sfx/unknown_802b5.asm
@@ -1,5 +1,5 @@
 SFX_802b5_4_Ch4:
-	duty $02
+	duty 2
 	unknownsfx0x20 3, 196, 96, 7
 	unknownsfx0x20 0, 164, 64, 7
 	unknownsfx0x20 2, 196, 64, 7
diff --git a/audio/sfx/unknown_802cc.asm b/audio/sfx/unknown_802cc.asm
index d7a398a5..9e209638 100755
--- a/audio/sfx/unknown_802cc.asm
+++ b/audio/sfx/unknown_802cc.asm
@@ -1,5 +1,5 @@
 SFX_802cc_4_Ch4:
-	duty $02
+	duty 2
 	unknownsfx0x20 3, 180, 192, 7
 	unknownsfx0x20 0, 161, 128, 7
 	endchannel
diff --git a/audio/sfx/unknown_80337.asm b/audio/sfx/unknown_80337.asm
index 9feb63d4..c21f8794 100644
--- a/audio/sfx/unknown_80337.asm
+++ b/audio/sfx/unknown_80337.asm
@@ -1,5 +1,5 @@
 SFX_80337_4_Branch:
-	dutycycle $f0
+	dutycycle 240
 	unknownsfx0x20 15, 224, 128, 7
 	unknownsfx0x20 15, 240, 132, 7
 	unknownsfx0x20 15, 195, 224, 5
@@ -9,7 +9,7 @@ SFX_80337_4_Branch:
 	endchannel
 
 SFX_80352_4_Branch:
-	dutycycle $05
+	dutycycle 5
 	unknownsfx0x20 15, 160, 65, 7
 	unknownsfx0x20 15, 176, 67, 7
 	unknownsfx0x20 15, 147, 177, 5
@@ -29,23 +29,23 @@ SFX_8036c_4_Branch:
 	endchannel
 
 SFX_80383_4_Ch4:
-	dutycycle $f0
+	dutycycle 240
 	unknownsfx0x20 15, 247, 160, 7
 	unknownsfx0x20 6, 230, 163, 7
 	unknownsfx0x20 10, 244, 160, 7
-	dutycycle $a5
+	dutycycle 165
 	unknownsfx0x20 10, 246, 216, 7
 	unknownsfx0x20 4, 227, 215, 7
 	unknownsfx0x20 15, 242, 216, 7
 	endchannel
 
 SFX_803a0_4_Ch5:
-	dutycycle $05
+	dutycycle 5
 	unknownsfx0x20 2, 8, 0, 0
 	unknownsfx0x20 15, 167, 161, 6
 	unknownsfx0x20 6, 134, 162, 6
 	unknownsfx0x20 10, 116, 161, 6
-	dutycycle $5f
+	dutycycle 95
 	unknownsfx0x20 10, 118, 214, 6
 	unknownsfx0x20 4, 131, 217, 6
 	unknownsfx0x20 15, 162, 215, 6
diff --git a/audio/sfx/unknown_803da.asm b/audio/sfx/unknown_803da.asm
index cc3dfe4d..442bd112 100644
--- a/audio/sfx/unknown_803da.asm
+++ b/audio/sfx/unknown_803da.asm
@@ -1,5 +1,5 @@
 SFX_803da_4_Ch4:
-	dutycycle $f0
+	dutycycle 240
 	unknownsfx0x20 15, 247, 192, 7
 	unknownsfx0x20 6, 228, 193, 7
 	unknownsfx0x20 10, 246, 192, 7
@@ -8,7 +8,7 @@ SFX_803da_4_Ch4:
 	endchannel
 
 SFX_803f1_4_Ch5:
-	dutycycle $5f
+	dutycycle 95
 	unknownsfx0x20 15, 151, 129, 7
 	unknownsfx0x20 6, 132, 128, 7
 	unknownsfx0x20 10, 150, 129, 7
diff --git a/audio/sfx/unknown_80411.asm b/audio/sfx/unknown_80411.asm
index b0a7615d..4ef49cdf 100644
--- a/audio/sfx/unknown_80411.asm
+++ b/audio/sfx/unknown_80411.asm
@@ -1,5 +1,5 @@
 SFX_80411_4_Ch4:
-	dutycycle $f0
+	dutycycle 240
 	unknownsfx0x20 15, 247, 128, 6
 	unknownsfx0x20 10, 230, 132, 6
 	unknownsfx0x20 15, 215, 144, 6
@@ -11,7 +11,7 @@ SFX_80411_4_Ch4:
 	endchannel
 
 SFX_80434_4_Ch5:
-	dutycycle $05
+	dutycycle 5
 	unknownsfx0x20 15, 183, 65, 6
 	unknownsfx0x20 10, 150, 66, 6
 	unknownsfx0x20 15, 167, 81, 6
diff --git a/audio/sfx/unknown_80467.asm b/audio/sfx/unknown_80467.asm
index 8d5f1c0e..7e5335ff 100644
--- a/audio/sfx/unknown_80467.asm
+++ b/audio/sfx/unknown_80467.asm
@@ -1,5 +1,5 @@
 SFX_80467_4_Ch4:
-	dutycycle $f0
+	dutycycle 240
 	unknownsfx0x20 6, 247, 160, 7
 	unknownsfx0x20 8, 230, 164, 7
 	unknownsfx0x20 4, 214, 160, 7
@@ -10,7 +10,7 @@ SFX_80467_4_Ch4:
 	endchannel
 
 SFX_80486_4_Ch5:
-	dutycycle $0a
+	dutycycle 10
 	unknownsfx0x20 4, 8, 0, 0
 	unknownsfx0x20 6, 167, 65, 7
 	unknownsfx0x20 8, 134, 67, 7
diff --git a/audio/sfx/unknown_804bf.asm b/audio/sfx/unknown_804bf.asm
index ef8de157..6776692c 100644
--- a/audio/sfx/unknown_804bf.asm
+++ b/audio/sfx/unknown_804bf.asm
@@ -1,5 +1,5 @@
 SFX_804bf_4_Ch4:
-	dutycycle $a5
+	dutycycle 165
 	unknownsfx0x20 6, 244, 64, 7
 	unknownsfx0x20 15, 227, 48, 7
 	unknownsfx0x20 4, 244, 64, 7
@@ -8,7 +8,7 @@ SFX_804bf_4_Ch4:
 	endchannel
 
 SFX_804d6_4_Ch5:
-	dutycycle $77
+	dutycycle 119
 	unknownsfx0x20 6, 195, 18, 7
 	unknownsfx0x20 15, 179, 4, 7
 	unknownsfx0x20 3, 195, 18, 7
diff --git a/audio/sfx/unknown_804fa.asm b/audio/sfx/unknown_804fa.asm
index d095d222..74b7e681 100644
--- a/audio/sfx/unknown_804fa.asm
+++ b/audio/sfx/unknown_804fa.asm
@@ -1,5 +1,5 @@
 SFX_804fa_4_Ch4:
-	dutycycle $f0
+	dutycycle 240
 	unknownsfx0x20 4, 247, 8, 6
 	unknownsfx0x20 6, 230, 0, 6
 	unknownsfx0x20 6, 215, 240, 5
@@ -10,7 +10,7 @@ SFX_804fa_4_Ch4:
 	endchannel
 
 SFX_80519_4_Ch5:
-	dutycycle $0a
+	dutycycle 10
 	unknownsfx0x20 4, 199, 4, 5
 	unknownsfx0x20 6, 166, 2, 5
 	unknownsfx0x20 6, 151, 241, 4
diff --git a/audio/sfx/unknown_80545.asm b/audio/sfx/unknown_80545.asm
index ed729578..9ba19478 100644
--- a/audio/sfx/unknown_80545.asm
+++ b/audio/sfx/unknown_80545.asm
@@ -1,5 +1,5 @@
 SFX_80545_4_Ch4:
-	dutycycle $f1
+	dutycycle 241
 	unknownsfx0x20 4, 247, 192, 7
 	unknownsfx0x20 12, 230, 194, 7
 	unknownsfx0x20 6, 181, 128, 6
@@ -9,7 +9,7 @@ SFX_80545_4_Ch4:
 	endchannel
 
 SFX_80560_4_Ch5:
-	dutycycle $cc
+	dutycycle 204
 	unknownsfx0x20 3, 199, 129, 7
 	unknownsfx0x20 12, 182, 128, 7
 	unknownsfx0x20 6, 165, 65, 6
diff --git a/audio/sfx/unknown_8058b.asm b/audio/sfx/unknown_8058b.asm
index 253fcbc6..9e424200 100644
--- a/audio/sfx/unknown_8058b.asm
+++ b/audio/sfx/unknown_8058b.asm
@@ -1,5 +1,5 @@
 SFX_8058b_4_Ch4:
-	dutycycle $c9
+	dutycycle 201
 	unknownsfx0x20 8, 247, 128, 6
 	unknownsfx0x20 2, 247, 96, 6
 	unknownsfx0x20 1, 231, 64, 6
@@ -11,7 +11,7 @@ SFX_8058b_4_Ch4:
 	endchannel
 
 SFX_805ae_4_Ch5:
-	dutycycle $79
+	dutycycle 121
 	unknownsfx0x20 10, 231, 130, 6
 	unknownsfx0x20 2, 231, 98, 6
 	unknownsfx0x20 1, 215, 66, 6
diff --git a/audio/sfx/unknown_805db.asm b/audio/sfx/unknown_805db.asm
index 30ab6e1d..5e978a1e 100644
--- a/audio/sfx/unknown_805db.asm
+++ b/audio/sfx/unknown_805db.asm
@@ -1,12 +1,12 @@
 SFX_805db_4_Ch4:
-	dutycycle $f5
+	dutycycle 245
 	unknownsfx0x20 4, 243, 24, 7
 	unknownsfx0x20 15, 229, 152, 7
 	unknownsfx0x20 8, 145, 88, 7
 	endchannel
 
 SFX_805ea_4_Ch5:
-	dutycycle $a0
+	dutycycle 160
 	unknownsfx0x20 5, 179, 8, 7
 	unknownsfx0x20 15, 197, 136, 7
 	unknownsfx0x20 8, 113, 72, 7
diff --git a/audio/sfx/unknown_80603.asm b/audio/sfx/unknown_80603.asm
index 9f643de8..3cbc9ca2 100644
--- a/audio/sfx/unknown_80603.asm
+++ b/audio/sfx/unknown_80603.asm
@@ -1,5 +1,5 @@
 SFX_80603_4_Ch4:
-	dutycycle $a5
+	dutycycle 165
 	unknownsfx0x20 4, 225, 0, 7
 	unknownsfx0x20 4, 242, 128, 7
 	unknownsfx0x20 2, 146, 64, 7
@@ -7,7 +7,7 @@ SFX_80603_4_Ch4:
 	endchannel
 
 SFX_80616_4_Ch5:
-	dutycycle $0a
+	dutycycle 10
 	unknownsfx0x20 4, 177, 225, 6
 	unknownsfx0x20 3, 194, 225, 6
 	unknownsfx0x20 3, 98, 129, 6
diff --git a/audio/sfx/unknown_80633.asm b/audio/sfx/unknown_80633.asm
index 07c5bc66..9be59347 100644
--- a/audio/sfx/unknown_80633.asm
+++ b/audio/sfx/unknown_80633.asm
@@ -1,5 +1,5 @@
 SFX_80633_4_Ch4:
-	dutycycle $fa
+	dutycycle 250
 	unknownsfx0x20 6, 131, 71, 2
 	unknownsfx0x20 15, 98, 38, 2
 	unknownsfx0x20 4, 82, 69, 2
diff --git a/audio/sfx/unknown_80661.asm b/audio/sfx/unknown_80661.asm
index 3019689a..f6848664 100644
--- a/audio/sfx/unknown_80661.asm
+++ b/audio/sfx/unknown_80661.asm
@@ -1,12 +1,12 @@
 SFX_80661_4_Ch4:
-	dutycycle $f0
+	dutycycle 240
 	unknownsfx0x20 4, 243, 224, 6
 	unknownsfx0x20 15, 228, 64, 6
 	unknownsfx0x20 8, 193, 32, 6
 	endchannel
 
 SFX_80670_4_Ch5:
-	dutycycle $0a
+	dutycycle 10
 	unknownsfx0x20 3, 195, 131, 6
 	unknownsfx0x20 14, 180, 2, 6
 	unknownsfx0x20 8, 161, 1, 6
diff --git a/audio/sfx/unknown_80689.asm b/audio/sfx/unknown_80689.asm
index aeafead6..0e2c573a 100644
--- a/audio/sfx/unknown_80689.asm
+++ b/audio/sfx/unknown_80689.asm
@@ -1,5 +1,5 @@
 SFX_80689_4_Ch4:
-	dutycycle $0a
+	dutycycle 10
 	unknownsfx0x20 6, 226, 0, 5
 	unknownsfx0x20 6, 227, 128, 5
 	unknownsfx0x20 6, 211, 112, 5
@@ -7,7 +7,7 @@ SFX_80689_4_Ch4:
 	endchannel
 
 SFX_8069c_4_Ch5:
-	dutycycle $f5
+	dutycycle 245
 	unknownsfx0x20 6, 226, 130, 4
 	unknownsfx0x20 6, 211, 1, 5
 	unknownsfx0x20 6, 178, 226, 4
diff --git a/audio/sfx/unknown_806af.asm b/audio/sfx/unknown_806af.asm
index 01903477..3cb97c62 100644
--- a/audio/sfx/unknown_806af.asm
+++ b/audio/sfx/unknown_806af.asm
@@ -1,5 +1,5 @@
 SFX_806af_4_Ch4:
-	dutycycle $cc
+	dutycycle 204
 	unknownsfx0x20 4, 241, 0, 7
 	unknownsfx0x20 4, 225, 128, 7
 	unknownsfx0x20 4, 209, 64, 7
@@ -13,7 +13,7 @@ SFX_806af_4_Ch4:
 	endchannel
 
 SFX_806da_4_Ch5:
-	dutycycle $44
+	dutycycle 68
 	unknownsfx0x20 12, 8, 0, 0
 	unknownsfx0x20 4, 241, 1, 7
 	unknownsfx0x20 4, 225, 130, 7
diff --git a/audio/sfx/unknown_80712.asm b/audio/sfx/unknown_80712.asm
index 43151f10..689f12ad 100644
--- a/audio/sfx/unknown_80712.asm
+++ b/audio/sfx/unknown_80712.asm
@@ -1,5 +1,5 @@
 SFX_80712_4_Ch4:
-	dutycycle $cc
+	dutycycle 204
 	unknownsfx0x20 8, 245, 0, 6
 	unknownsfx0x20 2, 210, 56, 6
 	unknownsfx0x20 2, 194, 48, 6
@@ -12,7 +12,7 @@ SFX_80712_4_Ch4:
 	endchannel
 
 SFX_80739_4_Ch5:
-	dutycycle $44
+	dutycycle 68
 	unknownsfx0x20 12, 195, 192, 5
 	unknownsfx0x20 3, 177, 249, 5
 	unknownsfx0x20 2, 161, 241, 5
diff --git a/audio/sfx/unknown_80760.asm b/audio/sfx/unknown_80760.asm
index 601b0893..47d28da0 100644
--- a/audio/sfx/unknown_80760.asm
+++ b/audio/sfx/unknown_80760.asm
@@ -1,12 +1,12 @@
 SFX_80760_4_Ch4:
-	duty $00
+	duty 0
 	unknownsfx0x20 8, 245, 128, 4
 	unknownsfx0x20 2, 225, 224, 5
 	unknownsfx0x20 8, 209, 220, 5
 	endchannel
 
 SFX_8076f_4_Ch5:
-	dutycycle $a5
+	dutycycle 165
 	unknownsfx0x20 7, 149, 65, 4
 	unknownsfx0x20 2, 129, 33, 5
 	unknownsfx0x20 8, 97, 26, 5
diff --git a/audio/sfx/unknown_8077e.asm b/audio/sfx/unknown_8077e.asm
index cd3e252d..2047af78 100644
--- a/audio/sfx/unknown_8077e.asm
+++ b/audio/sfx/unknown_8077e.asm
@@ -1,5 +1,5 @@
 SFX_8077e_4_Ch4:
-	dutycycle $88
+	dutycycle 136
 	unknownsfx0x20 5, 242, 80, 6
 	unknownsfx0x20 9, 209, 96, 6
 	unknownsfx0x20 5, 226, 18, 6
@@ -10,7 +10,7 @@ SFX_8077e_4_Ch4:
 	endchannel
 
 SFX_8079d_4_Ch5:
-	dutycycle $40
+	dutycycle 64
 	unknownsfx0x20 4, 8, 0, 0
 	unknownsfx0x20 5, 242, 81, 6
 	unknownsfx0x20 9, 209, 97, 6
diff --git a/audio/sfx/unknown_807eb.asm b/audio/sfx/unknown_807eb.asm
index 36956618..8554695e 100644
--- a/audio/sfx/unknown_807eb.asm
+++ b/audio/sfx/unknown_807eb.asm
@@ -1,5 +1,5 @@
 SFX_807eb_4_Ch4:
-	dutycycle $a0
+	dutycycle 160
 	unknownsfx0x20 4, 243, 0, 6
 	unknownsfx0x20 8, 213, 96, 7
 	unknownsfx0x20 3, 226, 32, 7
@@ -7,7 +7,7 @@ SFX_807eb_4_Ch4:
 	endchannel
 
 SFX_807fe_4_Ch5:
-	dutycycle $5a
+	dutycycle 90
 	unknownsfx0x20 5, 179, 241, 6
 	unknownsfx0x20 7, 197, 82, 7
 	unknownsfx0x20 3, 162, 17, 7
diff --git a/audio/sfx/unknown_8081e.asm b/audio/sfx/unknown_8081e.asm
index 8dd0a0e3..1581d121 100644
--- a/audio/sfx/unknown_8081e.asm
+++ b/audio/sfx/unknown_8081e.asm
@@ -1,5 +1,5 @@
 SFX_8081e_4_Ch4:
-	dutycycle $f0
+	dutycycle 240
 	unknownsfx0x20 8, 247, 224, 6
 	unknownsfx0x20 6, 230, 229, 6
 	unknownsfx0x20 3, 244, 224, 6
@@ -10,7 +10,7 @@ SFX_8081e_4_Ch4:
 	endchannel
 
 SFX_8083d_4_Ch5:
-	dutycycle $05
+	dutycycle 5
 	unknownsfx0x20 3, 8, 0, 0
 	unknownsfx0x20 8, 167, 161, 6
 	unknownsfx0x20 6, 134, 163, 6
diff --git a/audio/sfx/unknown_80879.asm b/audio/sfx/unknown_80879.asm
index c383f511..23839d60 100644
--- a/audio/sfx/unknown_80879.asm
+++ b/audio/sfx/unknown_80879.asm
@@ -1,5 +1,5 @@
 SFX_80879_4_Ch4:
-	dutycycle $f0
+	dutycycle 240
 	unknownsfx0x20 15, 246, 101, 5
 	unknownsfx0x20 10, 228, 124, 5
 	unknownsfx0x20 3, 194, 92, 5
@@ -7,7 +7,7 @@ SFX_80879_4_Ch4:
 	endchannel
 
 SFX_8088c_4_Ch5:
-	dutycycle $5a
+	dutycycle 90
 	unknownsfx0x20 14, 214, 3, 5
 	unknownsfx0x20 9, 180, 27, 5
 	unknownsfx0x20 4, 146, 250, 4
diff --git a/audio/sfx/unknown_808a9.asm b/audio/sfx/unknown_808a9.asm
index 41bb215a..efa4a0d6 100644
--- a/audio/sfx/unknown_808a9.asm
+++ b/audio/sfx/unknown_808a9.asm
@@ -1,5 +1,5 @@
 SFX_808a9_4_Ch4:
-	dutycycle $f0
+	dutycycle 240
 	unknownsfx0x20 4, 247, 160, 6
 	unknownsfx0x20 8, 230, 164, 6
 	unknownsfx0x20 4, 214, 160, 6
@@ -10,7 +10,7 @@ SFX_808a9_4_Ch4:
 	endchannel
 
 SFX_808c8_4_Ch5:
-	dutycycle $5a
+	dutycycle 90
 	unknownsfx0x20 4, 231, 1, 6
 	unknownsfx0x20 8, 214, 3, 6
 	unknownsfx0x20 4, 198, 1, 6
diff --git a/audio/sfx/unknown_808fa.asm b/audio/sfx/unknown_808fa.asm
index fb95d76d..4bd5839f 100644
--- a/audio/sfx/unknown_808fa.asm
+++ b/audio/sfx/unknown_808fa.asm
@@ -1,12 +1,12 @@
 SFX_808fa_4_Ch4:
-	dutycycle $1b
+	dutycycle 27
 	unknownsfx0x20 7, 210, 64, 7
 	unknownsfx0x20 15, 229, 96, 7
 	unknownsfx0x20 15, 193, 48, 7
 	endchannel
 
 SFX_80909_4_Ch5:
-	dutycycle $81
+	dutycycle 129
 	unknownsfx0x20 2, 194, 1, 7
 	unknownsfx0x20 4, 194, 8, 7
 	unknownsfx0x20 15, 215, 65, 7
diff --git a/audio/sfx/unknown_8091c.asm b/audio/sfx/unknown_8091c.asm
index de09a436..c4fa4c20 100644
--- a/audio/sfx/unknown_8091c.asm
+++ b/audio/sfx/unknown_8091c.asm
@@ -1,12 +1,12 @@
 SFX_8091c_4_Ch4:
-	dutycycle $f0
+	dutycycle 240
 	unknownsfx0x20 15, 215, 128, 7
 	unknownsfx0x20 4, 230, 160, 7
 	unknownsfx0x20 15, 210, 64, 7
 	endchannel
 
 SFX_8092b_4_Ch5:
-	dutycycle $5a
+	dutycycle 90
 	unknownsfx0x20 15, 199, 83, 7
 	unknownsfx0x20 5, 182, 114, 7
 	unknownsfx0x20 15, 194, 17, 7
diff --git a/audio/sfx/unknown_80944.asm b/audio/sfx/unknown_80944.asm
index 068c2f71..e16cec26 100644
--- a/audio/sfx/unknown_80944.asm
+++ b/audio/sfx/unknown_80944.asm
@@ -1,5 +1,5 @@
 SFX_80944_4_Ch4:
-	dutycycle $f0
+	dutycycle 240
 	unknownsfx0x20 6, 247, 192, 6
 	unknownsfx0x20 15, 231, 0, 7
 	unknownsfx0x20 4, 244, 240, 6
@@ -8,7 +8,7 @@ SFX_80944_4_Ch4:
 	endchannel
 
 SFX_8095b_4_Ch5:
-	dutycycle $0a
+	dutycycle 10
 	unknownsfx0x20 7, 230, 129, 6
 	unknownsfx0x20 14, 213, 193, 6
 	unknownsfx0x20 4, 196, 177, 6
diff --git a/audio/sfx/unknown_8097f.asm b/audio/sfx/unknown_8097f.asm
index e8d36973..b178821c 100644
--- a/audio/sfx/unknown_8097f.asm
+++ b/audio/sfx/unknown_8097f.asm
@@ -1,5 +1,5 @@
 SFX_8097f_4_Ch4:
-	dutycycle $a5
+	dutycycle 165
 	unknownsfx0x20 12, 242, 64, 4
 	unknownsfx0x20 15, 227, 160, 4
 	unknownsfx0x20 4, 210, 144, 4
@@ -7,7 +7,7 @@ SFX_8097f_4_Ch4:
 	endchannel
 
 SFX_80992_4_Ch5:
-	dutycycle $ee
+	dutycycle 238
 	unknownsfx0x20 11, 210, 56, 4
 	unknownsfx0x20 14, 198, 152, 4
 	unknownsfx0x20 3, 178, 136, 4
diff --git a/audio/sfx/unknown_809b2.asm b/audio/sfx/unknown_809b2.asm
index dd822e39..095f7134 100644
--- a/audio/sfx/unknown_809b2.asm
+++ b/audio/sfx/unknown_809b2.asm
@@ -1,5 +1,5 @@
 SFX_809b2_4_Ch4:
-	dutycycle $33
+	dutycycle 51
 	unknownsfx0x20 15, 246, 192, 5
 	unknownsfx0x20 8, 227, 188, 5
 	unknownsfx0x20 6, 210, 208, 5
@@ -9,7 +9,7 @@ SFX_809b2_4_Ch4:
 	endchannel
 
 SFX_809cd_4_Ch5:
-	dutycycle $99
+	dutycycle 153
 	unknownsfx0x20 14, 198, 177, 4
 	unknownsfx0x20 7, 195, 173, 4
 	unknownsfx0x20 5, 178, 193, 4
diff --git a/audio/sfx/unknown_809fb.asm b/audio/sfx/unknown_809fb.asm
index 4e361ee6..7424d61b 100644
--- a/audio/sfx/unknown_809fb.asm
+++ b/audio/sfx/unknown_809fb.asm
@@ -1,12 +1,12 @@
 SFX_809fb_4_Ch4:
-	dutycycle $f0
+	dutycycle 240
 	unknownsfx0x20 8, 228, 144, 7
 	unknownsfx0x20 15, 245, 192, 7
 	unknownsfx0x20 8, 209, 216, 7
 	endchannel
 
 SFX_80a0a_4_Ch5:
-	dutycycle $a5
+	dutycycle 165
 	unknownsfx0x20 10, 196, 113, 7
 	unknownsfx0x20 15, 182, 162, 7
 	unknownsfx0x20 8, 161, 183, 7
diff --git a/audio/sfx/unknown_80a23.asm b/audio/sfx/unknown_80a23.asm
index ddb665ad..c20a37d4 100644
--- a/audio/sfx/unknown_80a23.asm
+++ b/audio/sfx/unknown_80a23.asm
@@ -1,5 +1,5 @@
 SFX_80a23_4_Ch4:
-	dutycycle $f0
+	dutycycle 240
 	unknownsfx0x20 6, 242, 0, 6
 	unknownsfx0x20 6, 226, 64, 6
 	unknownsfx0x20 6, 210, 128, 6
@@ -11,7 +11,7 @@ SFX_80a23_4_Ch4:
 	endchannel
 
 SFX_80a46_4_Ch5:
-	dutycycle $11
+	dutycycle 17
 	unknownsfx0x20 3, 8, 1, 0
 	unknownsfx0x20 6, 194, 193, 5
 	unknownsfx0x20 6, 178, 2, 6
diff --git a/audio/sfx/unknown_80a89.asm b/audio/sfx/unknown_80a89.asm
index 4cbe9ae7..b79cf7c3 100644
--- a/audio/sfx/unknown_80a89.asm
+++ b/audio/sfx/unknown_80a89.asm
@@ -1,5 +1,5 @@
 SFX_80a89_4_Ch4:
-	dutycycle $f0
+	dutycycle 240
 	unknownsfx0x20 4, 243, 128, 7
 	unknownsfx0x20 15, 231, 0, 7
 	unknownsfx0x20 8, 211, 16, 7
@@ -9,7 +9,7 @@ SFX_80a89_4_Ch4:
 	endchannel
 
 SFX_80aa4_4_Ch5:
-	dutycycle $5a
+	dutycycle 90
 	unknownsfx0x20 6, 195, 1, 7
 	unknownsfx0x20 14, 183, 129, 6
 	unknownsfx0x20 7, 179, 146, 6
diff --git a/audio/sfx/unknown_80ad2.asm b/audio/sfx/unknown_80ad2.asm
index 77fb97dd..db7b45b2 100644
--- a/audio/sfx/unknown_80ad2.asm
+++ b/audio/sfx/unknown_80ad2.asm
@@ -1,5 +1,5 @@
 SFX_80ad2_4_Ch4:
-	dutycycle $0f
+	dutycycle 15
 	unknownsfx0x20 15, 247, 0, 5
 	unknownsfx0x20 15, 231, 8, 5
 	unknownsfx0x20 8, 180, 128, 4
@@ -7,7 +7,7 @@ SFX_80ad2_4_Ch4:
 	endchannel
 
 SFX_80ae5_4_Ch5:
-	dutycycle $44
+	dutycycle 68
 	unknownsfx0x20 14, 215, 129, 4
 	unknownsfx0x20 14, 199, 137, 4
 	unknownsfx0x20 10, 180, 1, 4
diff --git a/audio/sfx/unknown_80b05.asm b/audio/sfx/unknown_80b05.asm
index bde54170..68ca90f5 100644
--- a/audio/sfx/unknown_80b05.asm
+++ b/audio/sfx/unknown_80b05.asm
@@ -1,5 +1,5 @@
 SFX_80b05_4_Ch4:
-	dutycycle $f5
+	dutycycle 245
 	unknownsfx0x20 7, 214, 225, 7
 	unknownsfx0x20 6, 198, 226, 7
 	unknownsfx0x20 9, 214, 225, 7
@@ -11,7 +11,7 @@ SFX_80b05_4_Ch4:
 	endchannel
 
 SFX_80b28_4_Ch5:
-	dutycycle $44
+	dutycycle 68
 	unknownsfx0x20 6, 195, 201, 7
 	unknownsfx0x20 6, 179, 199, 7
 	unknownsfx0x20 10, 196, 195, 7
diff --git a/audio/sfx/unknown_80b53.asm b/audio/sfx/unknown_80b53.asm
index 27610a29..3033d299 100644
--- a/audio/sfx/unknown_80b53.asm
+++ b/audio/sfx/unknown_80b53.asm
@@ -1,5 +1,5 @@
 SFX_80b53_4_Ch4:
-	dutycycle $f0
+	dutycycle 240
 	unknownsfx0x20 6, 247, 64, 7
 	unknownsfx0x20 12, 230, 68, 7
 	unknownsfx0x20 6, 213, 80, 7
@@ -9,7 +9,7 @@ SFX_80b53_4_Ch4:
 	endchannel
 
 SFX_80b6e_4_Ch5:
-	dutycycle $0a
+	dutycycle 10
 	unknownsfx0x20 6, 199, 1, 7
 	unknownsfx0x20 11, 182, 2, 7
 	unknownsfx0x20 6, 165, 17, 7
diff --git a/audio/sfx/unknown_80b9c.asm b/audio/sfx/unknown_80b9c.asm
index debfef24..5e54107e 100644
--- a/audio/sfx/unknown_80b9c.asm
+++ b/audio/sfx/unknown_80b9c.asm
@@ -1,5 +1,5 @@
 SFX_80b9c_4_Ch4:
-	dutycycle $f4
+	dutycycle 244
 	unknownsfx0x20 15, 240, 5, 7
 	unknownsfx0x20 10, 224, 0, 7
 	unknownsfx0x20 6, 180, 16, 7
@@ -9,7 +9,7 @@ SFX_80b9c_4_Ch4:
 	endchannel
 
 SFX_80bb7_4_Ch5:
-	dutycycle $22
+	dutycycle 34
 	unknownsfx0x20 15, 176, 195, 6
 	unknownsfx0x20 10, 160, 193, 6
 	unknownsfx0x20 6, 132, 210, 6
diff --git a/audio/sfx/unknown_80be2.asm b/audio/sfx/unknown_80be2.asm
index 6db9d39e..4660d8f2 100644
--- a/audio/sfx/unknown_80be2.asm
+++ b/audio/sfx/unknown_80be2.asm
@@ -1,5 +1,5 @@
 SFX_80be2_4_Ch4:
-	dutycycle $50
+	dutycycle 80
 	unknownsfx0x20 10, 245, 128, 6
 	unknownsfx0x20 3, 226, 160, 6
 	unknownsfx0x20 3, 242, 192, 6
@@ -11,7 +11,7 @@ SFX_80be2_4_Ch4:
 	endchannel
 
 SFX_80c05_4_Ch5:
-	dutycycle $0f
+	dutycycle 15
 	unknownsfx0x20 9, 213, 49, 6
 	unknownsfx0x20 3, 210, 82, 6
 	unknownsfx0x20 3, 226, 113, 6
diff --git a/audio/sfx/unknown_80c3b.asm b/audio/sfx/unknown_80c3b.asm
index 31675523..f6106ebf 100644
--- a/audio/sfx/unknown_80c3b.asm
+++ b/audio/sfx/unknown_80c3b.asm
@@ -1,5 +1,5 @@
 SFX_80c3b_4_Ch4:
-	dutycycle $a5
+	dutycycle 165
 	unknownsfx0x20 3, 244, 65, 6
 	unknownsfx0x20 13, 214, 33, 7
 	unknownsfx0x20 8, 244, 25, 7
@@ -7,7 +7,7 @@ SFX_80c3b_4_Ch4:
 	endchannel
 
 SFX_80c4e_4_Ch5:
-	dutycycle $cc
+	dutycycle 204
 	unknownsfx0x20 4, 244, 128, 5
 	unknownsfx0x20 14, 230, 224, 6
 	unknownsfx0x20 8, 213, 216, 6
diff --git a/audio/sfx/unknown_80c6e.asm b/audio/sfx/unknown_80c6e.asm
index 8938dc6d..54c4b3f9 100644
--- a/audio/sfx/unknown_80c6e.asm
+++ b/audio/sfx/unknown_80c6e.asm
@@ -1,5 +1,5 @@
 SFX_80c6e_4_Ch4:
-	dutycycle $f0
+	dutycycle 240
 	unknownsfx0x20 13, 241, 17, 5
 	unknownsfx0x20 13, 225, 21, 5
 	unknownsfx0x20 13, 225, 17, 5
@@ -7,7 +7,7 @@ SFX_80c6e_4_Ch4:
 	endchannel
 
 SFX_80c81_4_Ch5:
-	dutycycle $15
+	dutycycle 21
 	unknownsfx0x20 12, 225, 12, 5
 	unknownsfx0x20 12, 209, 16, 5
 	unknownsfx0x20 14, 193, 12, 5
diff --git a/audio/sfx/unknown_80ca1.asm b/audio/sfx/unknown_80ca1.asm
index ca4bc15c..df3b29be 100644
--- a/audio/sfx/unknown_80ca1.asm
+++ b/audio/sfx/unknown_80ca1.asm
@@ -1,5 +1,5 @@
 SFX_80ca1_4_Ch4:
-	dutycycle $1b
+	dutycycle 27
 	unknownsfx0x20 3, 243, 100, 5
 	unknownsfx0x20 2, 226, 68, 5
 	unknownsfx0x20 5, 209, 34, 5
@@ -11,7 +11,7 @@ SFX_80ca1_4_Ch4:
 	endchannel
 
 SFX_80cc4_4_Ch5:
-	dutycycle $cc
+	dutycycle 204
 	unknownsfx0x20 3, 211, 96, 5
 	unknownsfx0x20 2, 194, 64, 5
 	unknownsfx0x20 5, 193, 32, 5
diff --git a/audio/sfx/unknown_80ce7.asm b/audio/sfx/unknown_80ce7.asm
index a9e07920..6b5a2163 100644
--- a/audio/sfx/unknown_80ce7.asm
+++ b/audio/sfx/unknown_80ce7.asm
@@ -1,5 +1,5 @@
 SFX_80ce7_4_Ch4:
-	dutycycle $11
+	dutycycle 17
 	unknownsfx0x20 2, 61, 129, 3
 	unknownsfx0x20 7, 245, 1, 6
 	unknownsfx0x20 1, 194, 129, 4
@@ -7,7 +7,7 @@ SFX_80ce7_4_Ch4:
 	endchannel
 
 SFX_80cfa_4_Ch5:
-	dutycycle $ee
+	dutycycle 238
 	unknownsfx0x20 2, 62, 176, 5
 	unknownsfx0x20 7, 213, 93, 7
 	unknownsfx0x20 1, 178, 176, 6
diff --git a/constants/music_constants.asm b/constants/music_constants.asm
index d772e4c0..6e34bc0d 100644
--- a/constants/music_constants.asm
+++ b/constants/music_constants.asm
@@ -100,7 +100,7 @@ ENDM
 	music_const MUSIC_YELLOW_UNUSED_SONG,  Music_YellowUnusedSong
 	music_const MUSIC_GB_PRINTER,          Music_GBPrinter
 
-	; AUDIO_1 AUDIO_2 AUDIO_3
+	; AUDIO_1 AUDIO_2 AUDIO_3 AUDIO_4
 	music_const SFX_SNARE_1,            SFX_Snare1_1
 	music_const SFX_SNARE_2,            SFX_Snare2_1
 	music_const SFX_SNARE_3,            SFX_Snare3_1
@@ -158,8 +158,9 @@ 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
 
-	music_const SFX_GET_ITEM_2,         SFX_Get_Item2_1 ; also in bank audio 4
+	; AUDIO_1 AUDIO_2 AUDIO_3
 	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
@@ -200,7 +201,7 @@ ENDM
 	music_const SFX_SAVE,               SFX_Save_1
 
 	; AUDIO_1
-	music_const SFX_POKEFLUTE,           SFX_Pokeflute
+	music_const SFX_POKEFLUTE,          SFX_Pokeflute
 	music_const SFX_SAFARI_ZONE_PA,     SFX_Safari_Zone_PA
 
 	; AUDIO_2
@@ -275,72 +276,9 @@ ENDM
 	music_const SFX_SHOOTING_STAR,      SFX_Shooting_Star
 
 	; AUDIO_4
-	music_const SFX_UNKNOWN_80003_4,     SFX_80003_4
-	music_const SFX_UNKNOWN_80006_4,     SFX_80006_4
-	music_const SFX_UNKNOWN_80009_4,     SFX_80009_4
-	music_const SFX_UNKNOWN_8000C_4,     SFX_8000c_4
-	music_const SFX_UNKNOWN_8000F_4,     SFX_8000f_4
-	music_const SFX_UNKNOWN_80012_4,     SFX_80012_4
-	music_const SFX_UNKNOWN_80015_4,     SFX_80015_4
-	music_const SFX_UNKNOWN_80018_4,     SFX_80018_4
-	music_const SFX_UNKNOWN_8001B_4,     SFX_8001b_4
-	music_const SFX_UNKNOWN_8001E_4,     SFX_8001e_4
-	music_const SFX_UNKNOWN_80021_4,     SFX_80021_4
-	music_const SFX_UNKNOWN_80024_4,     SFX_80024_4
-	music_const SFX_UNKNOWN_80027_4,     SFX_80027_4
-	music_const SFX_UNKNOWN_8002A_4,     SFX_8002a_4
-	music_const SFX_UNKNOWN_8002D_4,     SFX_8002d_4
-	music_const SFX_UNKNOWN_80030_4,     SFX_80030_4
-	music_const SFX_UNKNOWN_80033_4,     SFX_80033_4
-	music_const SFX_UNKNOWN_80036_4,     SFX_80036_4
-	music_const SFX_UNKNOWN_80039_4,     SFX_80039_4
-	music_const SFX_UNKNOWN_8003C_4,     SFX_8003c_4
-	music_const SFX_UNKNOWN_80045_4,     SFX_80045_4
-	music_const SFX_UNKNOWN_8004E_4,     SFX_8004e_4
-	music_const SFX_UNKNOWN_80057_4,     SFX_80057_4
-	music_const SFX_UNKNOWN_80060_4,     SFX_80060_4
-	music_const SFX_UNKNOWN_80069_4,     SFX_80069_4
-	music_const SFX_UNKNOWN_80072_4,     SFX_80072_4
-	music_const SFX_UNKNOWN_8007B_4,     SFX_8007b_4
-	music_const SFX_UNKNOWN_80084_4,     SFX_80084_4
-	music_const SFX_UNKNOWN_8008D_4,     SFX_8008d_4
-	music_const SFX_UNKNOWN_80096_4,     SFX_80096_4
-	music_const SFX_UNKNOWN_8009F_4,     SFX_8009f_4
-	music_const SFX_UNKNOWN_800A8_4,     SFX_800a8_4
-	music_const SFX_UNKNOWN_800B1_4,     SFX_800b1_4
-	music_const SFX_UNKNOWN_800BA_4,     SFX_800ba_4
-	music_const SFX_UNKNOWN_800C3_4,     SFX_800c3_4
-	music_const SFX_UNKNOWN_800CC_4,     SFX_800cc_4
-	music_const SFX_UNKNOWN_800D5_4,     SFX_800d5_4
-	music_const SFX_UNKNOWN_800DE_4,     SFX_800de_4
-	music_const SFX_UNKNOWN_800E7_4,     SFX_800e7_4
-	music_const SFX_UNKNOWN_800F0_4,     SFX_800f0_4
-	music_const SFX_UNKNOWN_800F9_4,     SFX_800f9_4
-	music_const SFX_UNKNOWN_80102_4,     SFX_80102_4
-	music_const SFX_UNKNOWN_8010B_4,     SFX_8010b_4
-	music_const SFX_UNKNOWN_80114_4,     SFX_80114_4
-	music_const SFX_UNKNOWN_8011D_4,     SFX_8011d_4
-	music_const SFX_UNKNOWN_80126_4,     SFX_80126_4
-	music_const SFX_UNKNOWN_8012F_4,     SFX_8012f_4
-	music_const SFX_UNKNOWN_80138_4,     SFX_80138_4
-	music_const SFX_UNKNOWN_80141_4,     SFX_80141_4
-	music_const SFX_UNKNOWN_8014A_4,     SFX_8014a_4
-	music_const SFX_UNKNOWN_80153_4,     SFX_80153_4
-	music_const SFX_UNKNOWN_8015C_4,     SFX_8015c_4
-	music_const SFX_UNKNOWN_80165_4,     SFX_80165_4
-	music_const SFX_UNKNOWN_8016E_4,     SFX_8016e_4
-	music_const SFX_UNKNOWN_80177_4,     SFX_80177_4
-	music_const SFX_UNKNOWN_80180_4,     SFX_80180_4
-	music_const SFX_UNKNOWN_80189_4,     SFX_80189_4
-	music_const SFX_UNKNOWN_80192_4,     SFX_80192_4
-	music_const SFX_UNKNOWN_8019B_4,     SFX_8019b_4
-	music_const SFX_UNKNOWN_801A4_4,     SFX_801a4_4
-	music_const SFX_UNKNOWN_801A7_4,     SFX_801a7_4
-	music_const SFX_UNKNOWN_801AA_4,     SFX_801aa_4
-	music_const SFX_UNKNOWN_801AD_4,     SFX_801ad_4
-	music_const SFX_UNKNOWN_801B0_4,     SFX_801b0_4
-	music_const SFX_UNKNOWN_801B3_4,     SFX_801b3_4
-	music_const SFX_UNKNOWN_801B6_4,     SFX_801b6_4
-	music_const SFX_UNKNOWN_801B9_4,     SFX_801b9_4
-	music_const SFX_UNKNOWN_801BC_4,     SFX_801bc_4
-	music_const SFX_UNKNOWN_801BF_4,     SFX_801bf_4
+	music_const SFX_UNKNOWN_801B3_4,       SFX_801b3_4
+	music_const SFX_UNKNOWN_801B6_4,       SFX_801b6_4
+	music_const SFX_UNKNOWN_801B9_4,       SFX_801b9_4
+	music_const SFX_UNKNOWN_801BC_4,       SFX_801bc_4
+	music_const SFX_UNKNOWN_801BF_4,       SFX_801bf_4
+	music_const SFX_UNKNOWN_GET_ITEM2_4_2, SFX_Get_Item2_4_2