More bank 2 music engine and music/sfx format update

2026-04-17 07:33:23 +12:00 · 2013-10-21 19:30:07 -04:00 · 2013-10-21 19:30:07 -04:00 · d47cdd6e15
commit d47cdd6e15
parent 74948728aa
362 changed files with 2902 additions and 9142 deletions
--- a/music/sfx/sfx_02_01.asm
+++ b/music/sfx/sfx_02_01.asm
@ -1,6 +1,4 @@
 SFX_02_01_Ch1: ; 82fd (2:42fd)
-	note D_, 1
-	rest 2
-	note D#, 4
+	unknownnoise0x20 0, 193, 51
 	endchannel
 ; 0x8301
--- a/music/sfx/sfx_02_02.asm
+++ b/music/sfx/sfx_02_02.asm
@ -1,6 +1,4 @@
 SFX_02_02_Ch1: ; 8301 (2:4301)
-	note D_, 1
-	note B_, 2
-	note D#, 4
+	unknownnoise0x20 0, 177, 51
 	endchannel
 ; 0x8305
--- a/music/sfx/sfx_02_03.asm
+++ b/music/sfx/sfx_02_03.asm
@ -1,6 +1,4 @@
 SFX_02_03_Ch1: ; 8305 (2:4305)
-	note D_, 1
-	note A#, 2
-	note D#, 4
+	unknownnoise0x20 0, 161, 51
 	endchannel
 ; 0x8309
--- a/music/sfx/sfx_02_04.asm
+++ b/music/sfx/sfx_02_04.asm
@ -1,6 +1,4 @@
 SFX_02_04_Ch1: ; 8309 (2:4309)
-	note D_, 1
-	note G#, 2
-	note D#, 4
+	unknownnoise0x20 0, 129, 51
 	endchannel
 ; 0x830d
--- a/music/sfx/sfx_02_05.asm
+++ b/music/sfx/sfx_02_05.asm
@ -1,21 +1,9 @@
 SFX_02_05_Ch1: ; 830d (2:430d)
-	note D_, 8
-	note G#, 5
-	note D#, 8
-	note D_, 7
-	note G#, 5
-	note D#, 7
-	note D_, 6
-	note G#, 4
-	note D#, 6
-	note D_, 5
-	note G#, 4
-	note D#, 5
-	note D_, 4
-	note G#, 3
-	note D#, 4
-	note D_, 3
-	note G#, 2
-	note D#, 3
+	unknownnoise0x20 7, 132, 55
+	unknownnoise0x20 6, 132, 54
+	unknownnoise0x20 5, 131, 53
+	unknownnoise0x20 4, 131, 52
+	unknownnoise0x20 3, 130, 51
+	unknownnoise0x20 2, 129, 50
 	endchannel
 ; 0x8320
--- a/music/sfx/sfx_02_06.asm
+++ b/music/sfx/sfx_02_06.asm
@ -1,6 +1,4 @@
 SFX_02_06_Ch1: ; 8320 (2:4320)
-	note D_, 1
-	note F_, 2
-	note D_, 11
+	unknownnoise0x20 0, 81, 42
 	endchannel
 ; 0x8324
--- a/music/sfx/sfx_02_07.asm
+++ b/music/sfx/sfx_02_07.asm
@ -1,9 +1,5 @@
 SFX_02_07_Ch1: ; 8324 (2:4324)
-	note D_, 2
-	note E_, 2
-	note D_, 12
-	note D_, 1
-	note F#, 2
-	note D_, 11
+	unknownnoise0x20 1, 65, 43
+	unknownnoise0x20 0, 97, 42
 	endchannel
 ; 0x832b
--- a/music/sfx/sfx_02_08.asm
+++ b/music/sfx/sfx_02_08.asm
@ -1,6 +1,4 @@
 SFX_02_08_Ch1: ; 832b (2:432b)
-	note D_, 1
-	note G#, 2
-	note C#, 1
+	unknownnoise0x20 0, 129, 16
 	endchannel
 ; 0x832f
--- a/music/sfx/sfx_02_09.asm
+++ b/music/sfx/sfx_02_09.asm
@ -1,6 +1,4 @@
 SFX_02_09_Ch1: ; 832f (2:432f)
-	note D_, 1
-	note G#, 3
-	note D_, 4
+	unknownnoise0x20 0, 130, 35
 	endchannel
 ; 0x8333
--- a/music/sfx/sfx_02_0a.asm
+++ b/music/sfx/sfx_02_0a.asm
@ -1,6 +1,4 @@
 SFX_02_0a_Ch1: ; 8333 (2:4333)
-	note D_, 1
-	note G#, 3
-	note D_, 6
+	unknownnoise0x20 0, 130, 37
 	endchannel
 ; 0x8337
--- a/music/sfx/sfx_02_0b.asm
+++ b/music/sfx/sfx_02_0b.asm
@ -1,6 +1,4 @@
 SFX_02_0b_Ch1: ; 8337 (2:4337)
-	note D_, 1
-	note G#, 3
-	note D_, 7
+	unknownnoise0x20 0, 130, 38
 	endchannel
 ; 0x833b
--- a/music/sfx/sfx_02_0c.asm
+++ b/music/sfx/sfx_02_0c.asm
@ -1,6 +1,4 @@
 SFX_02_0c_Ch1: ; 833b (2:433b)
-	note D_, 1
-	note A#, 2
-	note C#, 1
+	unknownnoise0x20 0, 161, 16
 	endchannel
 ; 0x833f
--- a/music/sfx/sfx_02_0d.asm
+++ b/music/sfx/sfx_02_0d.asm
@ -1,6 +1,4 @@
 SFX_02_0d_Ch1: ; 833f (2:433f)
-	note D_, 1
-	note A#, 3
-	note C#, 2
+	unknownnoise0x20 0, 162, 17
 	endchannel
 ; 0x8343
--- a/music/sfx/sfx_02_0e.asm
+++ b/music/sfx/sfx_02_0e.asm
@ -1,6 +1,4 @@
 SFX_02_0e_Ch1: ; 8343 (2:4343)
-	note D_, 1
-	note A#, 3
-	note F_, 1
+	unknownnoise0x20 0, 162, 80
 	endchannel
 ; 0x8347
--- a/music/sfx/sfx_02_0f.asm
+++ b/music/sfx/sfx_02_0f.asm
@ -1,9 +1,5 @@
 SFX_02_0f_Ch1: ; 8347 (2:4347)
-	note D_, 1
-	note A#, 2
-	note C#, 9
-	note D_, 1
-	note D#, 2
-	note D#, 4
+	unknownnoise0x20 0, 161, 24
+	unknownnoise0x20 0, 49, 51
 	endchannel
 ; 0x834e
--- a/music/sfx/sfx_02_10.asm
+++ b/music/sfx/sfx_02_10.asm
@ -1,9 +1,5 @@
 SFX_02_10_Ch1: ; 834e (2:434e)
-	note D_, 3
-	note A_, 2
-	note D_, 9
-	note D_, 1
-	note G_, 2
-	note C#, 9
+	unknownnoise0x20 2, 145, 40
+	unknownnoise0x20 0, 113, 24
 	endchannel
 ; 0x8355
--- a/music/sfx/sfx_02_11.asm
+++ b/music/sfx/sfx_02_11.asm
@ -1,6 +1,4 @@
 SFX_02_11_Ch1: ; 8355 (2:4355)
-	note D_, 1
-	note A_, 2
-	note D_, 3
+	unknownnoise0x20 0, 145, 34
 	endchannel
 ; 0x8359
--- a/music/sfx/sfx_02_12.asm
+++ b/music/sfx/sfx_02_12.asm
@ -1,6 +1,4 @@
 SFX_02_12_Ch1: ; 8359 (2:4359)
-	note D_, 1
-	note G_, 2
-	note D_, 3
+	unknownnoise0x20 0, 113, 34
 	endchannel
 ; 0x835d
--- a/music/sfx/sfx_02_13.asm
+++ b/music/sfx/sfx_02_13.asm
@ -1,6 +1,4 @@
 SFX_02_13_Ch1: ; 835d (2:435d)
-	note D_, 1
-	note F#, 2
-	note D_, 3
+	unknownnoise0x20 0, 97, 34
 	endchannel
 ; 0x8361
--- a/music/sfx/sfx_02_14.asm
+++ b/music/sfx/sfx_02_14.asm
@ -1,46 +1,22 @@
 SFX_02_14_Ch1: ; 8987 (2:4987)
 	dutycycle 245
-	note D_, 5
-	unknownmusic0xf3
-	note C#, 9
-	note C_, 8
-	note D_, 16
-	octave 3
-	note A_, 9
-	note C_, 8
-	note D_, 9
-	note A_, 2
-	note F_, 9
-	note C_, 8
+	unknownsfx0x20 4, 243, 24, 7
+	unknownsfx0x20 15, 229, 152, 7
+	unknownsfx0x20 8, 145, 88, 7
 	endchannel


 SFX_02_14_Ch2: ; 8996 (2:4996)
 	dutycycle 160
-	note D_, 6
-	note B_, 4
-	note C_, 9
-	note C_, 8
-	note D_, 16
-	rest 6
-	note G#, 9
-	note C_, 8
-	note D_, 9
-	note G_, 2
-	note E_, 9
-	note C_, 8
+	unknownsfx0x20 5, 179, 8, 7
+	unknownsfx0x20 15, 197, 136, 7
+	unknownsfx0x20 8, 113, 72, 7
 	endchannel


 SFX_02_14_Ch3: ; 89a5 (2:49a5)
-	note D_, 4
-	note A#, 2
-	note C#, 13
-	note D_, 15
-	note A_, 5
-	note D_, 13
-	note D_, 9
-	note G#, 2
-	note C#, 13
+	unknownnoise0x20 3, 161, 28
+	unknownnoise0x20 14, 148, 44
+	unknownnoise0x20 8, 129, 28
 	endchannel
 ; 0x89af
--- a/music/sfx/sfx_02_15.asm
+++ b/music/sfx/sfx_02_15.asm
@ -1,55 +1,25 @@
 SFX_02_15_Ch1: ; 8b97 (2:4b97)
 	dutycycle 160
-	note D_, 5
-	unknownmusic0xf3
-	note C_, 1
-	note C_, 7
-	note D_, 9
-	notetype 5, 6, 0
-	note C_, 8
-	note D_, 4
-	octave 6
-	note D_, 1
-	note C_, 8
-	note D_, 9
-	notetype 1, 1, 0
-	note C_, 8
+	unknownsfx0x20 4, 243, 0, 6
+	unknownsfx0x20 8, 213, 96, 7
+	unknownsfx0x20 3, 226, 32, 7
+	unknownsfx0x20 8, 209, 16, 7
 	endchannel


 SFX_02_15_Ch2: ; 8baa (2:4baa)
 	dutycycle 90
-	note D_, 6
-	note B_, 4
-	unknownmusic0xf1
-	note C_, 7
-	note D_, 8
-	rest 6
-	note F_, 3
-	note C_, 8
-	note D_, 4
-	note A#, 3
-	note C#, 2
-	note C_, 8
-	note D_, 9
-	note B_, 2
-	note C_, 2
-	note C_, 7
+	unknownsfx0x20 5, 179, 241, 6
+	unknownsfx0x20 7, 197, 82, 7
+	unknownsfx0x20 3, 162, 17, 7
+	unknownsfx0x20 8, 177, 1, 6
 	endchannel


 SFX_02_15_Ch3: ; 8bbd (2:4bbd)
-	note D_, 4
-	note A#, 3
-	note D#, 13
-	note D_, 13
-	note A_, 5
-	note D_, 13
-	note D_, 4
-	note G#, 3
-	note C#, 13
-	note D_, 9
-	note G_, 2
-	note D_, 13
+	unknownnoise0x20 3, 162, 60
+	unknownnoise0x20 12, 148, 44
+	unknownnoise0x20 3, 130, 28
+	unknownnoise0x20 8, 113, 44
 	endchannel
 ; 0x8bca
--- a/music/sfx/sfx_02_16.asm
+++ b/music/sfx/sfx_02_16.asm
@ -1,33 +1,16 @@
 SFX_02_16_Ch1: ; 8b0c (2:4b0c)
 	duty 0
-	note D_, 9
-	unknownmusic0xf5
-	note G#, 1
-	note C_, 5
-	note D_, 3
-	octave 7
-	octave 8
-	note C_, 6
-	note D_, 9
-	notetype 1, 13, 12
-	note C_, 6
+	unknownsfx0x20 8, 245, 128, 4
+	unknownsfx0x20 2, 225, 224, 5
+	unknownsfx0x20 8, 209, 220, 5
 	endchannel


 SFX_02_16_Ch2: ; 8b1b (2:4b1b)
 	dutycycle 165
-	note D_, 8
-	note A_, 6
-	note E_, 2
-	note C_, 5
-	note D_, 3
-	note G#, 2
-	note D_, 2
-	note C_, 6
-	note D_, 9
-	note F#, 2
-	note C#, 11
-	note C_, 6
+	unknownsfx0x20 7, 149, 65, 4
+	unknownsfx0x20 2, 129, 33, 5
+	unknownsfx0x20 8, 97, 26, 5


 SFX_02_16_Ch3: ; 8b29 (2:4b29)
--- a/music/sfx/sfx_02_17.asm
+++ b/music/sfx/sfx_02_17.asm
@ -1,78 +1,31 @@
 SFX_02_17_Ch1: ; 88a6 (2:48a6)
 	dutycycle 240
-	note D_, 5
-	unknownmusic0xf7
-	note C_, 9
-	note C_, 7
-	note D_, 7
-	octave 2
-	note C_, 1
-	note C_, 7
-	note D_, 7
-	notetype 7, 15, 0
-	note C_, 6
-	note D_, 7
-	rest 5
-	octave 8
-	note C_, 6
-	note D_, 6
-	notetype 3, 12, 0
-	note C_, 6
-	note D_, 5
-	notetype 3, 10, 0
-	note C_, 6
-	note D_, 9
-	octave 7
-	note G#, 1
-	note C_, 6
+	unknownsfx0x20 4, 247, 8, 6
+	unknownsfx0x20 6, 230, 0, 6
+	unknownsfx0x20 6, 215, 240, 5
+	unknownsfx0x20 6, 196, 224, 5
+	unknownsfx0x20 5, 211, 192, 5
+	unknownsfx0x20 4, 211, 160, 5
+	unknownsfx0x20 8, 225, 128, 5
 	endchannel


 SFX_02_17_Ch2: ; 88c5 (2:48c5)
 	dutycycle 10
-	note D_, 5
-	rest 8
-	note C_, 5
-	note C_, 6
-	note D_, 7
-	note A#, 7
-	note C_, 3
-	note C_, 6
-	note D_, 7
-	note A_, 8
-	unknownmusic0xf1
-	note C_, 5
-	note D_, 5
-	note B_, 5
-	octave 7
-	note C_, 5
-	note D_, 6
-	note A#, 4
-	rest 3
-	note C_, 5
-	note D_, 5
-	note B_, 4
-	note A#, 4
-	note C_, 5
-	note D_, 9
-	rest 2
-	note G#, 3
-	note C_, 5
+	unknownsfx0x20 4, 199, 4, 5
+	unknownsfx0x20 6, 166, 2, 5
+	unknownsfx0x20 6, 151, 241, 4
+	unknownsfx0x20 4, 180, 225, 4
+	unknownsfx0x20 5, 163, 194, 4
+	unknownsfx0x20 4, 179, 163, 4
+	unknownsfx0x20 8, 193, 130, 4
 	endchannel


 SFX_02_17_Ch3: ; 88e4 (2:48e4)
-	note D_, 13
-	octave 4
-	note E_, 13
-	note D_, 11
-	rest 8
-	note F_, 13
-	note D_, 13
-	note B_, 7
-	note E_, 13
-	note D_, 16
-	note A#, 3
-	note F_, 13
+	unknownnoise0x20 12, 228, 76
+	unknownnoise0x20 10, 199, 92
+	unknownnoise0x20 12, 182, 76
+	unknownnoise0x20 15, 162, 92
 	endchannel
 ; 0x88f1
--- a/music/sfx/sfx_02_18.asm
+++ b/music/sfx/sfx_02_18.asm
@ -1,81 +1,33 @@
 SFX_02_18_Ch1: ; 8c55 (2:4c55)
 	dutycycle 240
-	note D_, 5
-	unknownmusic0xf7
-	note A#, 1
-	note C_, 7
-	note D_, 9
-	octave 2
-	note A#, 5
-	note C_, 7
-	note D_, 5
-	notetype 6, 10, 0
-	note C_, 7
-	note D_, 13
-	notetype 3, 2, 0
-	note C_, 7
-	note D_, 9
-	rest 4
-	note D_, 5
-	note C_, 7
-	note D_, 5
-	rest 3
-	note D_, 1
-	note C_, 7
-	note D_, 9
-	note B_, 2
-	note C#, 1
-	note C_, 7
+	unknownsfx0x20 4, 247, 160, 6
+	unknownsfx0x20 8, 230, 164, 6
+	unknownsfx0x20 4, 214, 160, 6
+	unknownsfx0x20 12, 211, 32, 6
+	unknownsfx0x20 8, 195, 36, 6
+	unknownsfx0x20 4, 194, 32, 6
+	unknownsfx0x20 8, 177, 16, 6
 	endchannel


 SFX_02_18_Ch2: ; 8c74 (2:4c74)
 	dutycycle 90
-	note D_, 5
-	octave 1
-	note C_, 2
-	note C_, 7
-	note D_, 9
-	notetype 6, 0, 3
-	note C_, 7
-	note D_, 5
-	rest 7
-	note C_, 2
-	note C_, 7
-	note D_, 13
-	rest 4
-	note G#, 2
-	note C_, 6
-	note D_, 9
-	note B_, 4
-	note G#, 4
-	note C_, 6
-	note D_, 5
-	note B_, 3
-	note G#, 3
-	note C_, 6
-	note D_, 9
-	note A#, 2
-	note G_, 2
-	note C_, 6
+	unknownsfx0x20 4, 231, 1, 6
+	unknownsfx0x20 8, 214, 3, 6
+	unknownsfx0x20 4, 198, 1, 6
+	unknownsfx0x20 12, 195, 129, 5
+	unknownsfx0x20 8, 179, 131, 5
+	unknownsfx0x20 4, 178, 130, 5
+	unknownsfx0x20 8, 161, 113, 5
 	endchannel


 SFX_02_18_Ch3: ; 8c93 (2:4c93)
-	note D_, 8
-	notetype 6, 5, 12
-	note D_, 9
-	octave 2
-	note E_, 13
-	note D_, 5
-	notetype 4, 5, 12
-	note D_, 5
-	notetype 4, 4, 12
-	note D_, 8
-	rest 4
-	note E_, 13
-	note D_, 9
-	note A#, 2
-	note F_, 13
+	unknownnoise0x20 7, 214, 92
+	unknownnoise0x20 8, 230, 76
+	unknownnoise0x20 4, 212, 92
+	unknownnoise0x20 4, 212, 76
+	unknownnoise0x20 7, 195, 76
+	unknownnoise0x20 8, 161, 92
 	endchannel
 ; 0x8ca6
--- a/music/sfx/sfx_02_19.asm
+++ b/music/sfx/sfx_02_19.asm
@ -1,40 +1,18 @@
 SFX_02_19_Ch1: ; 8a35 (2:4a35)
 	dutycycle 10
-	note D_, 7
-	octave 6
-	note C_, 1
-	note C_, 6
-	note D_, 7
-	octave 5
-	note G#, 1
-	note C_, 6
-	note D_, 7
-	notetype 3, 7, 0
-	note C_, 6
-	note D_, 9
-	note A#, 2
-	note F#, 1
-	note C_, 6
+	unknownsfx0x20 6, 226, 0, 5
+	unknownsfx0x20 6, 227, 128, 5
+	unknownsfx0x20 6, 211, 112, 5
+	unknownsfx0x20 8, 161, 96, 5
 	endchannel


 SFX_02_19_Ch2: ; 8a48 (2:4a48)
 	dutycycle 245
-	note D_, 7
-	octave 6
-	note G#, 3
-	note C_, 5
-	note D_, 7
-	notetype 3, 0, 1
-	note C_, 6
-	note D_, 7
-	note B_, 3
-	octave 6
-	note C_, 5
-	note D_, 9
-	note G#, 2
-	rest 2
-	note C_, 5
+	unknownsfx0x20 6, 226, 130, 4
+	unknownsfx0x20 6, 211, 1, 5
+	unknownsfx0x20 6, 178, 226, 4
+	unknownsfx0x20 8, 129, 193, 4


 SFX_02_19_Ch3: ; 8a5a (2:4a5a)
--- a/music/sfx/sfx_02_1a.asm
+++ b/music/sfx/sfx_02_1a.asm
@ -1,29 +1,11 @@
 SFX_02_1a_Ch1: ; 89df (2:49df)
 	dutycycle 250
-	note D_, 7
-	note G#, 4
-	note E_, 8
-	note C_, 3
-	note D_, 16
-	note F#, 3
-	note D_, 7
-	note C_, 3
-	note D_, 5
-	note F_, 3
-	note E_, 6
-	note C_, 3
-	note D_, 10
-	note F#, 4
-	note C_, 7
-	note C_, 3
-	note D_, 16
-	note G#, 3
-	note D_, 6
-	note C_, 3
-	note D_, 16
-	note E_, 3
-	note C_, 8
-	note C_, 3
+	unknownsfx0x20 6, 131, 71, 2
+	unknownsfx0x20 15, 98, 38, 2
+	unknownsfx0x20 4, 82, 69, 2
+	unknownsfx0x20 9, 99, 6, 2
+	unknownsfx0x20 15, 130, 37, 2
+	unknownsfx0x20 15, 66, 7, 2


 SFX_02_1a_Ch2: ; 89f9 (2:49f9)
@ -31,21 +13,11 @@ SFX_02_1a_Ch2: ; 89f9 (2:49f9)


 SFX_02_1a_Ch3: ; 89fa (2:49fa)
-	note D_, 9
-	notetype 4, 8, 12
-	note D_, 5
-	octave 6
-	note A_, 13
-	note D_, 16
-	rest 7
-	note G#, 13
-	note D_, 9
-	octave 4
-	note A#, 13
-	note D_, 16
-	notetype 7, 9, 12
-	note D_, 16
-	unknownmusic0xf2
-	note A#, 13
+	unknownnoise0x20 8, 212, 140
+	unknownnoise0x20 4, 226, 156
+	unknownnoise0x20 15, 198, 140
+	unknownnoise0x20 8, 228, 172
+	unknownnoise0x20 15, 215, 156
+	unknownnoise0x20 15, 242, 172
 	endchannel
 ; 0x8a0d
--- a/music/sfx/sfx_02_1b.asm
+++ b/music/sfx/sfx_02_1b.asm
@ -1,45 +1,22 @@
 SFX_02_1b_Ch1: ; 8a0d (2:4a0d)
 	dutycycle 240
-	note D_, 5
-	unknownmusic0xf3
-	octave 8
-	note C_, 7
-	note D_, 16
-	octave 4
-	note E_, 1
-	note C_, 7
-	note D_, 9
-	rest 2
-	note D_, 1
-	note C_, 7
+	unknownsfx0x20 4, 243, 224, 6
+	unknownsfx0x20 15, 228, 64, 6
+	unknownsfx0x20 8, 193, 32, 6
 	endchannel


 SFX_02_1b_Ch2: ; 8a1c (2:4a1c)
 	dutycycle 10
-	note D_, 4
-	rest 4
-	note G#, 4
-	note C_, 7
-	note D_, 15
-	note B_, 5
-	note C_, 3
-	note C_, 7
-	note D_, 9
-	note A#, 2
-	note C_, 2
-	note C_, 7
+	unknownsfx0x20 3, 195, 131, 6
+	unknownsfx0x20 14, 180, 2, 6
+	unknownsfx0x20 8, 161, 1, 6
 	endchannel


 SFX_02_1b_Ch3: ; 8a2b (2:4a2b)
-	note D_, 5
-	notetype 3, 5, 12
-	note D_, 16
-	octave 2
-	note E_, 13
-	note D_, 9
-	note B_, 2
-	note F_, 13
+	unknownnoise0x20 4, 211, 92
+	unknownnoise0x20 15, 230, 76
+	unknownnoise0x20 8, 177, 92
 	endchannel
 ; 0x8a35
--- a/music/sfx/sfx_02_1c.asm
+++ b/music/sfx/sfx_02_1c.asm
@ -1,51 +1,24 @@
 SFX_02_1c_Ch1: ; 8c25 (2:4c25)
 	dutycycle 240
-	note D_, 16
-	unknownmusic0xf6
-	note F#, 6
-	note C_, 6
-	note D_, 11
-	octave 4
-	note G_, 13
-	note C_, 6
-	note D_, 4
-	rest 3
-	note F_, 13
-	note C_, 6
-	note D_, 16
-	note B_, 3
-	note D#, 13
-	note C_, 6
+	unknownsfx0x20 15, 246, 101, 5
+	unknownsfx0x20 10, 228, 124, 5
+	unknownsfx0x20 3, 194, 92, 5
+	unknownsfx0x20 15, 178, 60, 5
 	endchannel


 SFX_02_1c_Ch2: ; 8c38 (2:4c38)
 	dutycycle 90
-	note D_, 15
-	notetype 6, 0, 3
-	note C_, 6
-	note D_, 10
-	note B_, 5
-	note C#, 12
-	note C_, 6
-	note D_, 5
-	note A_, 3
-	unknownmusic0xfa
-	note C_, 5
-	note D_, 16
-	note A#, 3
-	notetype 11, 0, 4
+	unknownsfx0x20 14, 214, 3, 5
+	unknownsfx0x20 9, 180, 27, 5
+	unknownsfx0x20 4, 146, 250, 4
+	unknownsfx0x20 15, 162, 219, 4
 	endchannel


 SFX_02_1c_Ch3: ; 8c4b (2:4c4b)
-	note D_, 13
-	octave 2
-	note E_, 13
-	note D_, 12
-	notetype 7, 5, 12
-	note D_, 16
-	rest 3
-	note E_, 13
+	unknownnoise0x20 12, 230, 76
+	unknownnoise0x20 11, 215, 92
+	unknownnoise0x20 15, 194, 76
 	endchannel
 ; 0x8c55
--- a/music/sfx/sfx_02_1d.asm
+++ b/music/sfx/sfx_02_1d.asm
@ -1,83 +1,36 @@
 SFX_02_1d_Ch1: ; 872f (2:472f)
 	dutycycle 240
-	note D_, 16
-	unknownmusic0xf7
-	note A#, 1
-	note C_, 8
-	note D_, 7
-	octave 2
-	note A#, 4
-	note C_, 8
-	note D_, 11
-	unknownmusic0xf4
-	note A#, 1
-	note C_, 8
+	unknownsfx0x20 15, 247, 160, 7
+	unknownsfx0x20 6, 230, 163, 7
+	unknownsfx0x20 10, 244, 160, 7
 	dutycycle 165
-	note D_, 11
-	unknownmusic0xf6
-	notetype 8, 0, 7
-	note D_, 5
-	octave 5
-	notetype 7, 0, 7
-	note D_, 16
-	unknownmusic0xf2
-	notetype 8, 0, 7
+	unknownsfx0x20 10, 246, 216, 7
+	unknownsfx0x20 4, 227, 215, 7
+	unknownsfx0x20 15, 242, 216, 7
 	endchannel


 SFX_02_1d_Ch2: ; 874c (2:474c)
 	dutycycle 5
-	note D_, 3
-	note C_, 9
-	note C_, 1
-	note C_, 1
-	note D_, 16
-	note A#, 8
-	note A#, 2
-	note C_, 7
-	note D_, 7
-	note G#, 7
-	note A#, 3
-	note C_, 7
-	note D_, 11
-	note G_, 5
-	note A#, 2
-	note C_, 7
+	unknownsfx0x20 2, 8, 0, 0
+	unknownsfx0x20 15, 167, 161, 6
+	unknownsfx0x20 6, 134, 162, 6
+	unknownsfx0x20 10, 116, 161, 6
 	dutycycle 95
-	note D_, 11
-	note G_, 7
-	notetype 6, 0, 6
-	note D_, 5
-	note G#, 4
-	notetype 9, 0, 6
-	note D_, 16
-	note A#, 3
-	notetype 7, 0, 6
+	unknownsfx0x20 10, 118, 214, 6
+	unknownsfx0x20 4, 131, 217, 6
+	unknownsfx0x20 15, 162, 215, 6
 	endchannel


 SFX_02_1d_Ch3: ; 876d (2:476d)
-	note D_, 3
-	unknownmusic0xf2
-	note D#, 13
-	note D_, 9
-	octave 4
-	note D#, 15
-	note D_, 16
-	notetype 7, 3, 12
-	note D_, 7
-	rest 6
-	note D#, 12
-	note D_, 7
-	octave 4
-	note D#, 14
-	note D_, 9
-	note B_, 7
-	note D#, 13
-	note D_, 7
-	notetype 4, 3, 13
-	note D_, 9
-	rest 2
-	note D#, 12
+	unknownnoise0x20 2, 242, 60
+	unknownnoise0x20 8, 228, 62
+	unknownnoise0x20 15, 215, 60
+	unknownnoise0x20 6, 197, 59
+	unknownnoise0x20 6, 228, 61
+	unknownnoise0x20 8, 182, 60
+	unknownnoise0x20 6, 212, 61
+	unknownnoise0x20 8, 193, 59
 	endchannel
 ; 0x8786
--- a/music/sfx/sfx_02_1e.asm
+++ b/music/sfx/sfx_02_1e.asm
@ -1,94 +1,36 @@
 SFX_02_1e_Ch1: ; 8bca (2:4bca)
 	dutycycle 240
-	note D_, 9
-	unknownmusic0xf7
-	octave 8
-	note C_, 7
-	note D_, 7
-	octave 2
-	octave 3
-	note C_, 7
-	note D_, 4
-	unknownmusic0xf4
-	octave 8
-	note C_, 7
-	note D_, 4
-	unknownmusic0xf6
-	notetype 0, 0, 6
-	note D_, 4
-	octave 5
-	rest 1
-	note C_, 7
-	note D_, 5
-	unknownmusic0xf2
-	note B_, 1
-	note C_, 7
-	note D_, 16
-	note A#, 3
-	rest 9
-	note C_, 7
+	unknownsfx0x20 8, 247, 224, 6
+	unknownsfx0x20 6, 230, 229, 6
+	unknownsfx0x20 3, 244, 224, 6
+	unknownsfx0x20 3, 246, 208, 6
+	unknownsfx0x20 3, 227, 192, 6
+	unknownsfx0x20 4, 242, 176, 6
+	unknownsfx0x20 15, 162, 200, 6
 	endchannel


 SFX_02_1e_Ch2: ; 8be9 (2:4be9)
 	dutycycle 5
-	note D_, 4
-	note C_, 9
-	note C_, 1
-	note C_, 1
-	note D_, 9
-	note A#, 8
-	note A#, 2
-	note C_, 7
-	note D_, 7
-	note G#, 7
-	note A#, 4
-	note C_, 7
-	note D_, 4
-	note G_, 5
-	note A#, 2
-	note C_, 7
-	note D_, 4
-	note G_, 7
-	note A_, 2
-	note C_, 7
-	note D_, 4
-	note G#, 4
-	note G#, 3
-	note C_, 7
-	note D_, 5
-	note A#, 3
-	note G_, 2
-	note C_, 7
-	note D_, 16
-	note G_, 3
-	note G#, 10
-	note C_, 7
+	unknownsfx0x20 3, 8, 0, 0
+	unknownsfx0x20 8, 167, 161, 6
+	unknownsfx0x20 6, 134, 163, 6
+	unknownsfx0x20 3, 116, 161, 6
+	unknownsfx0x20 3, 118, 145, 6
+	unknownsfx0x20 3, 131, 130, 6
+	unknownsfx0x20 4, 162, 113, 6
+	unknownsfx0x20 15, 114, 137, 6
 	endchannel


 SFX_02_1e_Ch3: ; 8c0c (2:4c0c)
-	note D_, 3
-	unknownmusic0xf2
-	note D#, 13
-	note D_, 9
-	octave 4
-	note D#, 15
-	note D_, 9
-	notetype 7, 3, 12
-	note D_, 6
-	rest 6
-	note D#, 12
-	note D_, 4
-	notetype 4, 2, 12
-	note D_, 3
-	note B_, 7
-	note D#, 13
-	note D_, 4
-	note A#, 5
-	note D_, 13
-	note D_, 9
-	note A_, 2
-	note D#, 13
+	unknownnoise0x20 2, 242, 60
+	unknownnoise0x20 8, 228, 62
+	unknownnoise0x20 8, 215, 60
+	unknownnoise0x20 5, 197, 59
+	unknownnoise0x20 3, 212, 44
+	unknownnoise0x20 2, 182, 60
+	unknownnoise0x20 3, 164, 44
+	unknownnoise0x20 8, 145, 60
 	endchannel
 ; 0x8c25
--- a/music/sfx/sfx_02_1f.asm
+++ b/music/sfx/sfx_02_1f.asm
@ -1,98 +1,38 @@
 SFX_02_1f_Ch1: ; 8a5b (2:4a5b)
 	dutycycle 204
-	note D_, 5
-	unknownmusic0xf1
-	note C_, 1
-	note C_, 8
-	note D_, 5
-	octave 7
-	note G#, 1
-	note C_, 8
-	note D_, 5
-	notetype 1, 4, 0
-	note C_, 8
-	note D_, 5
-	octave 7
-	note E_, 1
-	note C_, 8
-	note D_, 5
-	unknownmusic0xf1
-	note G#, 1
-	note C_, 8
-	note D_, 5
-	notetype 1, 0, 0
-	note C_, 8
-	note D_, 5
-	unknownmusic0xf1
-	note C_, 2
-	note C_, 8
-	note D_, 5
-	notetype 1, 8, 2
-	note C_, 8
-	note D_, 5
-	rest 2
-	note E_, 3
-	note C_, 8
-	note D_, 9
-	note B_, 2
-	note E_, 2
-	note C_, 8
+	unknownsfx0x20 4, 241, 0, 7
+	unknownsfx0x20 4, 225, 128, 7
+	unknownsfx0x20 4, 209, 64, 7
+	unknownsfx0x20 4, 225, 64, 7
+	unknownsfx0x20 4, 241, 128, 7
+	unknownsfx0x20 4, 209, 0, 7
+	unknownsfx0x20 4, 241, 1, 7
+	unknownsfx0x20 4, 209, 130, 7
+	unknownsfx0x20 4, 193, 66, 7
+	unknownsfx0x20 8, 177, 65, 7
 	endchannel


 SFX_02_1f_Ch2: ; 8a86 (2:4a86)
 	dutycycle 68
-	note D_, 13
-	note C_, 9
-	note C_, 1
-	note C_, 1
-	note D_, 5
-	unknownmusic0xf1
-	note C_, 2
-	note C_, 8
-	note D_, 5
-	octave 7
-	note G#, 3
-	note C_, 8
-	note D_, 5
-	notetype 1, 4, 1
-	note C_, 8
-	note D_, 5
-	octave 7
-	note E_, 2
-	note C_, 8
-	note D_, 5
-	unknownmusic0xf1
-	note G#, 3
-	note C_, 8
-	note D_, 9
-	notetype 1, 0, 1
-	note C_, 8
+	unknownsfx0x20 12, 8, 0, 0
+	unknownsfx0x20 4, 241, 1, 7
+	unknownsfx0x20 4, 225, 130, 7
+	unknownsfx0x20 4, 209, 65, 7
+	unknownsfx0x20 4, 225, 65, 7
+	unknownsfx0x20 4, 241, 130, 7
+	unknownsfx0x20 8, 209, 1, 7
 	endchannel


 SFX_02_1f_Ch3: ; 8aa5 (2:4aa5)
-	note D_, 16
-	note C_, 9
-	note C_, 1
-	note D_, 5
-	note C_, 9
-	note C_, 1
-	note D_, 5
-	notetype 1, 4, 12
-	note D_, 5
-	note B_, 2
-	note D_, 13
-	note D_, 5
-	notetype 1, 3, 12
-	note D_, 5
-	note B_, 2
-	note D#, 13
-	note D_, 5
-	rest 2
-	note D_, 13
-	note D_, 9
-	note A#, 2
-	note E_, 13
+	unknownnoise0x20 15, 8, 0
+	unknownnoise0x20 4, 8, 0
+	unknownnoise0x20 4, 209, 76
+	unknownnoise0x20 4, 177, 44
+	unknownnoise0x20 4, 209, 60
+	unknownnoise0x20 4, 177, 60
+	unknownnoise0x20 4, 193, 44
+	unknownnoise0x20 8, 161, 76
 	endchannel
 ; 0x8abe
--- a/music/sfx/sfx_02_20.asm
+++ b/music/sfx/sfx_02_20.asm
@ -1,78 +1,28 @@
 SFX_02_20_Ch1: ; 8abe (2:4abe)
 	dutycycle 204
-	note D_, 9
-	unknownmusic0xf5
-	note C_, 1
-	note C_, 7
-	note D_, 3
-	notetype 2, 3, 8
-	note C_, 7
-	note D_, 3
-	rest 3
-	note D#, 1
-	note C_, 7
-	note D_, 3
-	rest 3
-	note D_, 9
-	note C_, 7
-	note D_, 3
-	note B_, 3
-	note D_, 1
-	note C_, 7
-	note D_, 3
-	note B_, 3
-	note C#, 1
-	note C_, 7
-	note D_, 3
-	note A#, 3
-	note C#, 9
-	note C_, 7
-	note D_, 3
-	note B_, 3
-	note C#, 1
-	note C_, 7
-	note D_, 9
-	rest 2
-	note D_, 1
-	note C_, 7
+	unknownsfx0x20 8, 245, 0, 6
+	unknownsfx0x20 2, 210, 56, 6
+	unknownsfx0x20 2, 194, 48, 6
+	unknownsfx0x20 2, 194, 40, 6
+	unknownsfx0x20 2, 178, 32, 6
+	unknownsfx0x20 2, 178, 16, 6
+	unknownsfx0x20 2, 162, 24, 6
+	unknownsfx0x20 2, 178, 16, 6
+	unknownsfx0x20 8, 193, 32, 6
 	endchannel


 SFX_02_20_Ch2: ; 8ae5 (2:4ae5)
 	dutycycle 68
-	note D_, 13
-	rest 4
-	rest 1
-	note C_, 6
-	note D_, 4
-	note B_, 2
-	unknownmusic0xf9
-	note C_, 6
-	note D_, 3
-	note A#, 2
-	unknownmusic0xf1
-	note C_, 6
-	note D_, 3
-	note A#, 2
-	unknownmusic0xe9
-	note C_, 6
-	note D_, 3
-	note A_, 2
-	octave 7
-	note C_, 6
-	note D_, 3
-	note A_, 2
-	notetype 9, 0, 5
-	note D_, 3
-	note G#, 2
-	notetype 1, 0, 5
-	note D_, 3
-	note A_, 2
-	notetype 9, 0, 5
-	note D_, 9
-	note A_, 2
-	octave 7
-	note C_, 6
+	unknownsfx0x20 12, 195, 192, 5
+	unknownsfx0x20 3, 177, 249, 5
+	unknownsfx0x20 2, 161, 241, 5
+	unknownsfx0x20 2, 161, 233, 5
+	unknownsfx0x20 2, 145, 225, 5
+	unknownsfx0x20 2, 145, 217, 5
+	unknownsfx0x20 2, 129, 209, 5
+	unknownsfx0x20 2, 145, 217, 5
+	unknownsfx0x20 8, 145, 225, 5


 SFX_02_20_Ch3: ; 8b0b (2:4b0b)
--- a/music/sfx/sfx_02_21.asm
+++ b/music/sfx/sfx_02_21.asm
@ -1,106 +1,41 @@
 SFX_02_21_Ch1: ; 8b2a (2:4b2a)
 	dutycycle 136
-	note D_, 6
-	unknownmusic0xf2
-	note F_, 1
-	note C_, 7
-	note D_, 10
-	notetype 1, 6, 0
-	note C_, 7
-	note D_, 6
-	octave 6
-	note C#, 3
-	note C_, 7
-	note D_, 10
-	rest 2
-	note D_, 3
-	note C_, 7
-	note D_, 6
-	unknownmusic0xf2
-	note C#, 1
-	note C_, 7
-	note D_, 7
-	notetype 1, 2, 0
-	note C_, 7
+	unknownsfx0x20 5, 242, 80, 6
+	unknownsfx0x20 9, 209, 96, 6
+	unknownsfx0x20 5, 226, 18, 6
+	unknownsfx0x20 9, 193, 34, 6
+	unknownsfx0x20 5, 242, 16, 6
+	unknownsfx0x20 6, 209, 32, 6
 	loopchannel 2, SFX_02_21_Ch1
 	endchannel


 SFX_02_21_Ch2: ; 8b49 (2:4b49)
 	dutycycle 64
-	note D_, 5
-	note C_, 9
-	note C_, 1
-	note C_, 1
-	note D_, 6
-	unknownmusic0xf2
-	note F_, 2
-	note C_, 7
-	note D_, 10
-	notetype 1, 6, 1
-	note C_, 7
-	note D_, 6
-	octave 6
-	note C#, 5
-	note C_, 7
-	note D_, 9
-	rest 2
-	note D_, 5
-	note C_, 7
-	note D_, 6
-	unknownmusic0xf2
-	note C#, 2
-	note C_, 7
-	note D_, 13
-	notetype 1, 2, 1
-	note C_, 7
-	note D_, 6
-	octave 6
-	note C#, 5
-	note C_, 7
-	note D_, 9
-	rest 2
-	note D_, 5
-	note C_, 7
-	note D_, 6
-	unknownmusic0xf2
-	note C#, 2
-	note C_, 7
-	note D_, 5
-	notetype 1, 2, 1
-	note C_, 7
+	unknownsfx0x20 4, 8, 0, 0
+	unknownsfx0x20 5, 242, 81, 6
+	unknownsfx0x20 9, 209, 97, 6
+	unknownsfx0x20 5, 226, 20, 6
+	unknownsfx0x20 8, 193, 36, 6
+	unknownsfx0x20 5, 242, 17, 6
+	unknownsfx0x20 12, 209, 33, 6
+	unknownsfx0x20 5, 226, 20, 6
+	unknownsfx0x20 8, 193, 36, 6
+	unknownsfx0x20 5, 242, 17, 6
+	unknownsfx0x20 4, 209, 33, 6
 	endchannel


 SFX_02_21_Ch3: ; 8b78 (2:4b78)
-	note D_, 7
-	notetype 2, 1, 12
-	note D_, 10
-	note B_, 2
-	note D_, 13
-	note D_, 9
-	rest 3
-	note D_, 13
-	note D_, 10
-	note B_, 2
-	note D#, 13
-	note D_, 7
-	rest 3
-	note D_, 13
-	note D_, 10
-	note A#, 3
-	note D#, 13
-	note D_, 8
-	rest 3
-	note D_, 13
-	note D_, 6
-	note A#, 2
-	note D#, 13
-	note D_, 10
-	rest 3
-	note D_, 13
-	note D_, 5
-	note A#, 2
-	note D#, 13
+	unknownnoise0x20 6, 210, 28
+	unknownnoise0x20 9, 177, 44
+	unknownnoise0x20 8, 194, 44
+	unknownnoise0x20 9, 177, 60
+	unknownnoise0x20 6, 194, 44
+	unknownnoise0x20 9, 162, 60
+	unknownnoise0x20 7, 194, 44
+	unknownnoise0x20 5, 161, 60
+	unknownnoise0x20 9, 194, 44
+	unknownnoise0x20 4, 161, 60
 	endchannel
 ; 0x8b97
--- a/music/sfx/sfx_02_22.asm
+++ b/music/sfx/sfx_02_22.asm
@ -1,54 +1,24 @@
 SFX_02_22_Ch1: ; 89af (2:49af)
 	dutycycle 165
-	note D_, 5
-	octave 7
-	note C_, 1
-	note C_, 8
-	note D_, 5
-	unknownmusic0xf2
-	note G#, 1
-	note C_, 8
-	note D_, 3
-	note A_, 3
-	note E_, 1
-	note C_, 8
-	note D_, 9
-	octave 7
-	note C_, 1
-	note C_, 7
+	unknownsfx0x20 4, 225, 0, 7
+	unknownsfx0x20 4, 242, 128, 7
+	unknownsfx0x20 2, 146, 64, 7
+	unknownsfx0x20 8, 225, 0, 6
 	endchannel


 SFX_02_22_Ch2: ; 89c2 (2:49c2)
 	dutycycle 10
-	note D_, 5
-	note B_, 2
-	octave 7
-	note C_, 7
-	note D_, 4
-	rest 3
-	octave 7
-	note C_, 7
-	note D_, 4
-	note F#, 3
-	note G#, 2
-	note C_, 7
-	note D_, 9
-	note B_, 2
-	octave 7
-	note C_, 6
+	unknownsfx0x20 4, 177, 225, 6
+	unknownsfx0x20 3, 194, 225, 6
+	unknownsfx0x20 3, 98, 129, 6
+	unknownsfx0x20 8, 177, 225, 5
 	endchannel


 SFX_02_22_Ch3: ; 89d5 (2:49d5)
-	note D_, 3
-	note F#, 2
-	note D#, 3
-	note D_, 3
-	note F#, 2
-	note D_, 2
-	note D_, 9
-	note F#, 2
-	note C#, 2
+	unknownnoise0x20 2, 97, 50
+	unknownnoise0x20 2, 97, 33
+	unknownnoise0x20 8, 97, 17
 	endchannel
 ; 0x89df
--- a/music/sfx/sfx_02_23.asm
+++ b/music/sfx/sfx_02_23.asm
@ -1,75 +1,30 @@
 SFX_02_23_Ch1: ; 88f1 (2:48f1)
 	dutycycle 241
-	note D_, 5
-	unknownmusic0xf7
-	rest 1
-	note C_, 8
-	note D_, 13
-	octave 2
-	rest 3
-	note C_, 8
-	note D_, 7
-	note B_, 6
-	note G#, 1
-	note C_, 7
-	note D_, 5
-	rest 5
-	note G_, 1
-	note C_, 7
-	note D_, 5
-	note B_, 6
-	note F#, 1
-	note C_, 7
-	note D_, 9
-	rest 2
-	note E_, 1
-	note C_, 7
+	unknownsfx0x20 4, 247, 192, 7
+	unknownsfx0x20 12, 230, 194, 7
+	unknownsfx0x20 6, 181, 128, 6
+	unknownsfx0x20 4, 196, 112, 6
+	unknownsfx0x20 4, 181, 96, 6
+	unknownsfx0x20 8, 193, 64, 6
 	endchannel


 SFX_02_23_Ch2: ; 890c (2:490c)
 	dutycycle 204
-	note D_, 4
-	rest 8
-	note G#, 2
-	note C_, 8
-	note D_, 13
-	note B_, 7
-	note G#, 1
-	note C_, 8
-	note D_, 7
-	note A#, 6
-	note E_, 2
-	note C_, 7
-	note D_, 5
-	rest 5
-	note D#, 3
-	note C_, 7
-	note D_, 7
-	note B_, 6
-	note D_, 2
-	note C_, 7
-	note D_, 9
-	note A#, 2
-	note C_, 3
-	note C_, 7
+	unknownsfx0x20 3, 199, 129, 7
+	unknownsfx0x20 12, 182, 128, 7
+	unknownsfx0x20 6, 165, 65, 6
+	unknownsfx0x20 4, 196, 50, 6
+	unknownsfx0x20 6, 181, 33, 6
+	unknownsfx0x20 8, 161, 2, 6
 	endchannel


 SFX_02_23_Ch3: ; 8927 (2:4927)
-	note D_, 4
-	octave 4
-	note D#, 13
-	note D_, 13
-	notetype 6, 2, 12
-	note D_, 5
-	octave 4
-	note D#, 13
-	note D_, 9
-	note B_, 8
-	note F_, 13
-	note D_, 16
-	rest 3
-	note F_, 14
+	unknownnoise0x20 3, 228, 60
+	unknownnoise0x20 12, 214, 44
+	unknownnoise0x20 4, 228, 60
+	unknownnoise0x20 8, 183, 92
+	unknownnoise0x20 15, 194, 93
 	endchannel
 ; 0x8937
--- a/music/sfx/sfx_02_24.asm
+++ b/music/sfx/sfx_02_24.asm
@ -1,83 +1,32 @@
 SFX_02_24_Ch1: ; 8937 (2:4937)
 	dutycycle 201
-	note D_, 9
-	unknownmusic0xf7
-	note G#, 1
-	note C_, 7
-	note D_, 3
-	unknownmusic0xf7
-	note F#, 1
-	note C_, 7
-	note D_, 2
-	octave 1
-	note E_, 1
-	note C_, 7
-	note D_, 2
-	octave 1
-	note D_, 1
-	note C_, 7
-	note D_, 16
-	notetype 1, 0, 0
-	note C_, 7
-	note D_, 5
-	rest 8
-	note E_, 1
-	note C_, 8
-	note D_, 5
-	note A#, 8
-	note D#, 1
-	note C_, 8
-	note D_, 16
-	note A_, 2
-	note D_, 1
-	note C_, 8
+	unknownsfx0x20 8, 247, 128, 6
+	unknownsfx0x20 2, 247, 96, 6
+	unknownsfx0x20 1, 231, 64, 6
+	unknownsfx0x20 1, 231, 32, 6
+	unknownsfx0x20 15, 209, 0, 6
+	unknownsfx0x20 4, 199, 64, 7
+	unknownsfx0x20 4, 167, 48, 7
+	unknownsfx0x20 15, 145, 32, 7
 	endchannel


 SFX_02_24_Ch2: ; 895a (2:495a)
 	dutycycle 121
-	note D_, 11
-	octave 1
-	note G#, 3
-	note C_, 7
-	note D_, 3
-	octave 1
-	note F#, 3
-	note C_, 7
-	note D_, 2
-	notetype 7, 4, 2
-	note C_, 7
-	note D_, 2
-	notetype 7, 2, 2
-	note C_, 7
-	note D_, 16
-	rest 2
-	note C_, 3
-	note C_, 7
-	note D_, 5
-	note B_, 8
-	note E_, 3
-	note C_, 8
-	note D_, 3
-	note A_, 8
-	note D#, 3
-	note C_, 8
-	note D_, 16
-	note G#, 2
-	note D_, 3
-	note C_, 8
+	unknownsfx0x20 10, 231, 130, 6
+	unknownsfx0x20 2, 231, 98, 6
+	unknownsfx0x20 1, 215, 66, 6
+	unknownsfx0x20 1, 215, 34, 6
+	unknownsfx0x20 15, 193, 2, 6
+	unknownsfx0x20 4, 183, 66, 7
+	unknownsfx0x20 2, 151, 50, 7
+	unknownsfx0x20 15, 129, 34, 7
 	endchannel


 SFX_02_24_Ch3: ; 897d (2:497d)
-	note D_, 5
-	note G_, 5
-	note D_, 2
-	note D_, 5
-	note G_, 5
-	note C#, 1
-	note D_, 5
-	note G_, 2
-	note D_, 1
+	unknownnoise0x20 4, 116, 33
+	unknownnoise0x20 4, 116, 16
+	unknownnoise0x20 4, 113, 32
 	endchannel
 ; 0x8987
--- a/music/sfx/sfx_02_25.asm
+++ b/music/sfx/sfx_02_25.asm
@ -1,87 +1,35 @@
 SFX_02_25_Ch1: ; 8813 (2:4813)
 	dutycycle 240
-	note D_, 7
-	unknownmusic0xf7
-	note A#, 1
-	note C_, 8
-	note D_, 9
-	octave 2
-	note A#, 5
-	note C_, 8
-	note D_, 5
-	notetype 6, 10, 0
-	note C_, 8
-	note D_, 16
-	notetype 3, 2, 0
-	note C_, 8
-	note D_, 9
-	rest 4
-	note D_, 4
-	note C_, 8
-	note D_, 3
-	rest 3
-	note D_, 9
-	note C_, 8
-	note D_, 9
-	note B_, 2
-	note D#, 1
-	note C_, 8
+	unknownsfx0x20 6, 247, 160, 7
+	unknownsfx0x20 8, 230, 164, 7
+	unknownsfx0x20 4, 214, 160, 7
+	unknownsfx0x20 15, 211, 32, 7
+	unknownsfx0x20 8, 195, 35, 7
+	unknownsfx0x20 2, 194, 40, 7
+	unknownsfx0x20 8, 177, 48, 7
 	endchannel


 SFX_02_25_Ch2: ; 8832 (2:4832)
 	dutycycle 10
-	note D_, 5
-	note C_, 9
-	note C_, 1
-	note C_, 1
-	note D_, 7
-	note A#, 8
-	note E_, 2
-	note C_, 8
-	note D_, 9
-	note G#, 7
-	note E_, 4
-	note C_, 8
-	note D_, 5
-	note G_, 7
-	note E_, 2
-	note C_, 8
-	note D_, 14
-	note G#, 4
-	rest 3
-	note C_, 7
-	note D_, 8
-	note G_, 4
-	rest 2
-	note C_, 7
-	note D_, 4
-	note G#, 3
-	rest 13
-	note C_, 7
-	note D_, 9
-	note G_, 2
-	notetype 8, 0, 6
+	unknownsfx0x20 4, 8, 0, 0
+	unknownsfx0x20 6, 167, 65, 7
+	unknownsfx0x20 8, 134, 67, 7
+	unknownsfx0x20 4, 118, 65, 7
+	unknownsfx0x20 13, 131, 194, 6
+	unknownsfx0x20 7, 115, 193, 6
+	unknownsfx0x20 3, 130, 204, 6
+	unknownsfx0x20 8, 113, 216, 6
 	endchannel


 SFX_02_25_Ch3: ; 8855 (2:4855)
-	note D_, 3
-	unknownmusic0xf2
-	note E_, 13
-	note D_, 7
-	octave 2
-	note D#, 11
-	note D_, 5
-	notetype 7, 3, 10
-	note D_, 7
-	notetype 6, 2, 12
-	note D_, 9
-	octave 3
-	note D#, 13
-	note D_, 13
-	notetype 2, 3, 13
-	note D_, 9
-	notetype 1, 2, 12
+	unknownnoise0x20 2, 242, 76
+	unknownnoise0x20 6, 230, 58
+	unknownnoise0x20 4, 215, 58
+	unknownnoise0x20 6, 214, 44
+	unknownnoise0x20 8, 229, 60
+	unknownnoise0x20 12, 210, 61
+	unknownnoise0x20 8, 209, 44
 	endchannel
 ; 0x886b
--- a/music/sfx/sfx_02_26.asm
+++ b/music/sfx/sfx_02_26.asm
@ -1,52 +1,25 @@
 SFX_02_26_Ch1: ; 8d2b (2:4d2b)
 	dutycycle 165
-	note D_, 13
-	unknownmusic0xf2
-	note E_, 1
-	note C_, 5
-	note D_, 16
-	octave 5
-	note A#, 1
-	note C_, 5
-	note D_, 5
-	notetype 2, 9, 0
-	note C_, 5
-	note D_, 9
-	notetype 1, 8, 0
-	note C_, 5
+	unknownsfx0x20 12, 242, 64, 4
+	unknownsfx0x20 15, 227, 160, 4
+	unknownsfx0x20 4, 210, 144, 4
+	unknownsfx0x20 8, 209, 128, 4
 	endchannel


 SFX_02_26_Ch2: ; 8d3e (2:4d3e)
 	dutycycle 238
-	note D_, 12
-	notetype 2, 3, 8
-	note C_, 5
-	note D_, 15
-	rest 7
-	note A_, 9
-	note C_, 5
-	note D_, 4
-	note B_, 3
-	note G#, 9
-	note C_, 5
-	note D_, 9
-	note B_, 2
-	note G_, 9
-	note C_, 5
+	unknownsfx0x20 11, 210, 56, 4
+	unknownsfx0x20 14, 198, 152, 4
+	unknownsfx0x20 3, 178, 136, 4
+	unknownsfx0x20 8, 177, 120, 4
 	endchannel


 SFX_02_26_Ch3: ; 8d51 (2:4d51)
-	note D_, 11
-	octave 2
-	note F#, 13
-	note D_, 16
-	notetype 2, 5, 12
-	note D_, 4
-	rest 3
-	note F#, 13
-	note D_, 9
-	notetype 1, 5, 12
+	unknownnoise0x20 10, 230, 108
+	unknownnoise0x20 15, 210, 92
+	unknownnoise0x20 3, 194, 108
+	unknownnoise0x20 8, 209, 92
 	endchannel
 ; 0x8d5e
--- a/music/sfx/sfx_02_27.asm
+++ b/music/sfx/sfx_02_27.asm
@ -1,74 +1,31 @@
 SFX_02_27_Ch1: ; 8d5e (2:4d5e)
 	dutycycle 51
-	note D_, 16
-	unknownmusic0xf6
-	rest 1
-	note C_, 6
-	note D_, 9
-	octave 5
-	note B_, 13
-	note C_, 6
-	note D_, 7
-	notetype 2, 13, 0
-	note C_, 6
-	note D_, 7
-	note B_, 3
-	octave 8
-	note C_, 6
-	note D_, 7
-	rest 3
-	stereopanning 5
-	note D_, 9
-	note B_, 2
-	note C_, 1
-	note C_, 7
+	unknownsfx0x20 15, 246, 192, 5
+	unknownsfx0x20 8, 227, 188, 5
+	unknownsfx0x20 6, 210, 208, 5
+	unknownsfx0x20 6, 178, 224, 5
+	unknownsfx0x20 6, 194, 240, 5
+	unknownsfx0x20 8, 177, 0, 6
 	endchannel


 SFX_02_27_Ch2: ; 8d79 (2:4d79)
 	dutycycle 153
-	note D_, 15
-	rest 7
-	note B_, 2
-	note C_, 5
-	note D_, 8
-	rest 4
-	note A#, 14
-	note C_, 5
-	note D_, 6
-	note B_, 3
-	rest 2
-	note C_, 5
-	note D_, 9
-	note A_, 3
-	notetype 1, 0, 4
-	note D_, 7
-	note A#, 3
-	octave 7
-	note C_, 5
-	note D_, 9
-	note A_, 2
-	unknownmusic0xf1
-	note C_, 5
+	unknownsfx0x20 14, 198, 177, 4
+	unknownsfx0x20 7, 195, 173, 4
+	unknownsfx0x20 5, 178, 193, 4
+	unknownsfx0x20 8, 146, 209, 4
+	unknownsfx0x20 6, 162, 225, 4
+	unknownsfx0x20 8, 145, 241, 4
 	endchannel


 SFX_02_27_Ch3: ; 8d94 (2:4d94)
-	note D_, 11
-	octave 2
-	note F_, 13
-	note D_, 11
-	notetype 6, 6, 12
-	note D_, 5
-	rest 3
-	note E_, 13
-	note D_, 7
-	notetype 3, 5, 12
-	note D_, 9
-	note B_, 4
-	note E_, 13
-	note D_, 9
-	note A#, 2
-	note F_, 13
+	unknownnoise0x20 10, 230, 92
+	unknownnoise0x20 10, 214, 108
+	unknownnoise0x20 4, 194, 76
+	unknownnoise0x20 6, 211, 92
+	unknownnoise0x20 8, 179, 76
+	unknownnoise0x20 8, 161, 92
 	endchannel
 ; 0x8da7
--- a/music/sfx/sfx_02_28.asm
+++ b/music/sfx/sfx_02_28.asm
@ -1,44 +1,22 @@
 SFX_02_28_Ch1: ; 8da7 (2:4da7)
 	dutycycle 240
-	note D_, 9
-	octave 4
-	note A_, 1
-	note C_, 8
-	note D_, 16
-	unknownmusic0xf5
-	rest 1
-	note C_, 8
-	note D_, 9
-	notetype 1, 13, 8
-	note C_, 8
+	unknownsfx0x20 8, 228, 144, 7
+	unknownsfx0x20 15, 245, 192, 7
+	unknownsfx0x20 8, 209, 216, 7
 	endchannel


 SFX_02_28_Ch2: ; 8db6 (2:4db6)
 	dutycycle 165
-	note D_, 11
-	rest 5
-	note G_, 2
-	note C_, 8
-	note D_, 16
-	note B_, 7
-	note A#, 3
-	note C_, 8
-	note D_, 9
-	note A#, 2
-	note B_, 8
-	note C_, 8
+	unknownsfx0x20 10, 196, 113, 7
+	unknownsfx0x20 15, 182, 162, 7
+	unknownsfx0x20 8, 161, 183, 7
 	endchannel


 SFX_02_28_Ch3: ; 8dc5 (2:4dc5)
-	note D_, 9
-	octave 4
-	note E_, 13
-	note D_, 15
-	rest 5
-	note D#, 13
-	note D_, 9
-	notetype 1, 2, 12
+	unknownnoise0x20 8, 228, 76
+	unknownnoise0x20 14, 196, 60
+	unknownnoise0x20 8, 209, 44
 	endchannel
 ; 0x8dcf
--- a/music/sfx/sfx_02_29.asm
+++ b/music/sfx/sfx_02_29.asm
@ -1,76 +1,31 @@
 SFX_02_29_Ch1: ; 8e35 (2:4e35)
 	dutycycle 240
-	note D_, 5
-	unknownmusic0xf3
-	note G#, 1
-	note C_, 8
-	note D_, 16
-	octave 1
-	note C_, 1
-	note C_, 8
-	note D_, 9
-	notetype 3, 1, 0
-	note C_, 8
-	note D_, 5
-	rest 3
-	note C_, 1
-	note C_, 8
-	note D_, 5
-	notetype 2, 15, 0
-	note C_, 7
-	note D_, 9
-	rest 2
-	octave 8
-	note C_, 7
+	unknownsfx0x20 4, 243, 128, 7
+	unknownsfx0x20 15, 231, 0, 7
+	unknownsfx0x20 8, 211, 16, 7
+	unknownsfx0x20 4, 194, 0, 7
+	unknownsfx0x20 4, 210, 240, 6
+	unknownsfx0x20 8, 193, 224, 6
 	endchannel


 SFX_02_29_Ch2: ; 8e50 (2:4e50)
 	dutycycle 90
-	note D_, 7
-	rest 4
-	note C_, 2
-	note C_, 8
-	note D_, 15
-	note B_, 8
-	note G#, 2
-	note C_, 7
-	note D_, 8
-	note B_, 4
-	note A_, 3
-	note C_, 7
-	note D_, 4
-	note A#, 3
-	note G#, 2
-	note C_, 7
-	note D_, 5
-	note B_, 3
-	note G_, 3
-	note C_, 7
-	note D_, 9
-	note A#, 2
-	note F#, 2
-	note C_, 7
+	unknownsfx0x20 6, 195, 1, 7
+	unknownsfx0x20 14, 183, 129, 6
+	unknownsfx0x20 7, 179, 146, 6
+	unknownsfx0x20 3, 162, 129, 6
+	unknownsfx0x20 4, 178, 114, 6
+	unknownsfx0x20 8, 161, 97, 6
 	endchannel


 SFX_02_29_Ch3: ; 8e6b (2:4e6b)
-	note D_, 7
-	octave 5
-	note F_, 13
-	note D_, 15
-	notetype 6, 4, 12
-	note D_, 7
-	rest 7
-	note D#, 13
-	note D_, 4
-	note B_, 4
-	note E_, 13
-	note D_, 4
-	note A#, 3
-	note F_, 13
-	note D_, 9
-	note B_, 2
-	note F#, 13
+	unknownnoise0x20 6, 227, 92
+	unknownnoise0x20 14, 214, 76
+	unknownnoise0x20 6, 198, 60
+	unknownnoise0x20 3, 179, 76
+	unknownnoise0x20 3, 162, 92
+	unknownnoise0x20 8, 177, 108
 	endchannel
 ; 0x8e7e
--- a/music/sfx/sfx_02_2a.asm
+++ b/music/sfx/sfx_02_2a.asm
@ -1,44 +1,22 @@
 SFX_02_2a_Ch1: ; 8cc8 (2:4cc8)
 	dutycycle 240
-	note D_, 16
-	notetype 7, 8, 0
-	note C_, 8
-	note D_, 5
-	octave 2
-	note A#, 1
-	note C_, 8
-	note D_, 16
-	notetype 2, 4, 0
-	note C_, 8
+	unknownsfx0x20 15, 215, 128, 7
+	unknownsfx0x20 4, 230, 160, 7
+	unknownsfx0x20 15, 210, 64, 7
 	endchannel


 SFX_02_2a_Ch2: ; 8cd7 (2:4cd7)
 	dutycycle 90
-	note D_, 16
-	rest 8
-	note F_, 4
-	note C_, 8
-	note D_, 6
-	note B_, 7
-	note G_, 3
-	note C_, 8
-	note D_, 16
-	rest 3
-	note C#, 2
-	note C_, 8
+	unknownsfx0x20 15, 199, 83, 7
+	unknownsfx0x20 5, 182, 114, 7
+	unknownsfx0x20 15, 194, 17, 7
 	endchannel


 SFX_02_2a_Ch3: ; 8ce6 (2:4ce6)
-	note D_, 14
-	unknownmusic0xf6
-	note E_, 13
-	note D_, 5
-	octave 2
-	note D#, 13
-	note D_, 16
-	unknownmusic0xf2
-	note E_, 13
+	unknownnoise0x20 13, 246, 76
+	unknownnoise0x20 4, 230, 60
+	unknownnoise0x20 15, 242, 76
 	endchannel
 ; 0x8cf0
--- a/music/sfx/sfx_02_2b.asm
+++ b/music/sfx/sfx_02_2b.asm
@ -1,56 +1,25 @@
 SFX_02_2b_Ch1: ; 8e7e (2:4e7e)
 	dutycycle 15
-	note D_, 16
-	unknownmusic0xf7
-	note C_, 1
-	note C_, 6
-	note D_, 16
-	octave 1
-	note C_, 9
-	note C_, 6
-	note D_, 9
-	note B_, 5
-	note G#, 1
-	note C_, 5
-	note D_, 16
-	note A#, 3
-	note F#, 1
-	note C_, 5
+	unknownsfx0x20 15, 247, 0, 5
+	unknownsfx0x20 15, 231, 8, 5
+	unknownsfx0x20 8, 180, 128, 4
+	unknownsfx0x20 15, 162, 96, 4
 	endchannel


 SFX_02_2b_Ch2: ; 8e91 (2:4e91)
 	dutycycle 68
-	note D_, 15
-	notetype 7, 8, 1
-	note C_, 5
-	note D_, 15
-	rest 8
-	note G#, 10
-	note C_, 5
-	note D_, 11
-	note B_, 5
-	note C_, 2
-	note C_, 5
-	note D_, 16
-	rest 3
-	octave 7
-	note C_, 4
+	unknownsfx0x20 14, 215, 129, 4
+	unknownsfx0x20 14, 199, 137, 4
+	unknownsfx0x20 10, 180, 1, 4
+	unknownsfx0x20 15, 194, 225, 3
 	endchannel


 SFX_02_2b_Ch3: ; 8ea4 (2:4ea4)
-	note D_, 15
-	unknownmusic0xf7
-	note G_, 13
-	note D_, 13
-	unknownmusic0xf6
-	note F#, 13
-	note D_, 10
-	octave 4
-	note G_, 13
-	note D_, 16
-	octave 6
-	note F#, 13
+	unknownnoise0x20 14, 247, 124
+	unknownnoise0x20 12, 246, 108
+	unknownnoise0x20 9, 228, 124
+	unknownnoise0x20 15, 226, 108
 	endchannel
 ; 0x8eb1
--- a/music/sfx/sfx_02_2c.asm
+++ b/music/sfx/sfx_02_2c.asm
@ -1,90 +1,35 @@
 SFX_02_2c_Ch1: ; 8f8e (2:4f8e)
 	dutycycle 80
-	note D_, 11
-	unknownmusic0xf5
-	note G#, 1
-	note C_, 7
-	note D_, 4
-	octave 6
-	note A#, 1
-	note C_, 7
-	note D_, 4
-	unknownmusic0xf2
-	rest 1
-	note C_, 7
-	note D_, 4
-	octave 6
-	octave 8
-	note C_, 7
-	note D_, 4
-	notetype 2, 0, 0
-	note C_, 8
-	note D_, 4
-	rest 3
-	octave 8
-	note C_, 7
-	note D_, 4
-	notetype 2, 12, 0
-	note C_, 7
-	note D_, 9
-	rest 2
-	note A#, 1
-	note C_, 7
+	unknownsfx0x20 10, 245, 128, 6
+	unknownsfx0x20 3, 226, 160, 6
+	unknownsfx0x20 3, 242, 192, 6
+	unknownsfx0x20 3, 226, 224, 6
+	unknownsfx0x20 3, 210, 0, 7
+	unknownsfx0x20 3, 194, 224, 6
+	unknownsfx0x20 3, 210, 192, 6
+	unknownsfx0x20 8, 193, 160, 6
 	endchannel


 SFX_02_2c_Ch2: ; 8fb1 (2:4fb1)
 	dutycycle 15
-	note D_, 10
-	notetype 5, 3, 1
-	note C_, 7
-	note D_, 4
-	notetype 2, 5, 2
-	note C_, 7
-	note D_, 4
-	octave 6
-	note G_, 2
-	note C_, 7
-	note D_, 4
-	note B_, 3
-	note A_, 2
-	note C_, 7
-	note D_, 4
-	rest 3
-	note B_, 3
-	note C_, 7
-	note D_, 4
-	note B_, 3
-	note A_, 2
-	note C_, 7
-	note D_, 4
-	rest 3
-	note G_, 2
-	note C_, 7
-	note D_, 9
-	note B_, 2
-	note F_, 2
-	note C_, 7
+	unknownsfx0x20 9, 213, 49, 6
+	unknownsfx0x20 3, 210, 82, 6
+	unknownsfx0x20 3, 226, 113, 6
+	unknownsfx0x20 3, 178, 145, 6
+	unknownsfx0x20 3, 194, 178, 6
+	unknownsfx0x20 3, 178, 145, 6
+	unknownsfx0x20 3, 194, 113, 6
+	unknownsfx0x20 8, 177, 81, 6
 	endchannel


 SFX_02_2c_Ch3: ; 8fd4 (2:4fd4)
-	note D_, 7
-	octave 5
-	note E_, 13
-	note D_, 5
-	rest 4
-	note D#, 13
-	note D_, 6
-	notetype 4, 3, 12
-	note D_, 5
-	rest 5
-	note D_, 13
-	note D_, 7
-	note B_, 5
-	note D#, 13
-	note D_, 9
-	rest 2
-	note D_, 13
+	unknownnoise0x20 6, 227, 76
+	unknownnoise0x20 4, 195, 60
+	unknownnoise0x20 5, 212, 60
+	unknownnoise0x20 4, 196, 44
+	unknownnoise0x20 6, 180, 60
+	unknownnoise0x20 8, 193, 44
 	endchannel
 ; 0x8fe7
--- a/music/sfx/sfx_02_2d.asm
+++ b/music/sfx/sfx_02_2d.asm
@ -1,36 +1,17 @@
 SFX_02_2d_Ch1: ; 8ca6 (2:4ca6)
 	dutycycle 27
-	note D_, 8
-	notetype 2, 4, 0
-	note C_, 8
-	note D_, 16
-	octave 3
-	note F#, 1
-	note C_, 8
-	note D_, 16
-	rest 2
-	note D#, 1
-	note C_, 8
+	unknownsfx0x20 7, 210, 64, 7
+	unknownsfx0x20 15, 229, 96, 7
+	unknownsfx0x20 15, 193, 48, 7
 	endchannel


 SFX_02_2d_Ch2: ; 8cb5 (2:4cb5)
 	dutycycle 129
-	note D_, 3
-	rest 3
-	note C_, 2
-	note C_, 8
-	note D_, 5
-	rest 3
-	note C_, 9
-	note C_, 8
-	note D_, 16
-	notetype 7, 4, 1
-	note C_, 8
-	note D_, 16
-	note A#, 3
-	note C_, 2
-	note C_, 8
+	unknownsfx0x20 2, 194, 1, 7
+	unknownsfx0x20 4, 194, 8, 7
+	unknownsfx0x20 15, 215, 65, 7
+	unknownsfx0x20 15, 162, 1, 7


 SFX_02_2d_Ch3: ; 8cc7 (2:4cc7)
--- a/music/sfx/sfx_02_2e.asm
+++ b/music/sfx/sfx_02_2e.asm
@ -1,74 +1,31 @@
 SFX_02_2e_Ch1: ; 8eff (2:4eff)
 	dutycycle 240
-	note D_, 7
-	unknownmusic0xf7
-	note E_, 1
-	note C_, 8
-	note D_, 13
-	octave 2
-	note E_, 5
-	note C_, 8
-	note D_, 7
-	notetype 5, 5, 0
-	note C_, 8
-	note D_, 5
-	rest 4
-	note F#, 1
-	note C_, 8
-	note D_, 4
-	rest 4
-	note G#, 1
-	note C_, 8
-	note D_, 9
-	notetype 1, 10, 0
-	note C_, 8
+	unknownsfx0x20 6, 247, 64, 7
+	unknownsfx0x20 12, 230, 68, 7
+	unknownsfx0x20 6, 213, 80, 7
+	unknownsfx0x20 4, 195, 96, 7
+	unknownsfx0x20 3, 195, 128, 7
+	unknownsfx0x20 8, 209, 160, 7
 	endchannel


 SFX_02_2e_Ch2: ; 8f1a (2:4f1a)
 	dutycycle 10
-	note D_, 7
-	rest 8
-	note C_, 2
-	note C_, 8
-	note D_, 12
-	note B_, 7
-	note C_, 3
-	note C_, 8
-	note D_, 7
-	note A#, 6
-	note C#, 2
-	note C_, 8
-	note D_, 5
-	note A_, 4
-	note D_, 2
-	note C_, 8
-	note D_, 4
-	note A#, 4
-	note E_, 2
-	note C_, 8
-	note D_, 9
-	note A_, 2
-	note F#, 3
-	note C_, 8
+	unknownsfx0x20 6, 199, 1, 7
+	unknownsfx0x20 11, 182, 2, 7
+	unknownsfx0x20 6, 165, 17, 7
+	unknownsfx0x20 4, 147, 33, 7
+	unknownsfx0x20 3, 163, 65, 7
+	unknownsfx0x20 8, 145, 98, 7
 	endchannel


 SFX_02_2e_Ch3: ; 8f35 (2:4f35)
-	note D_, 4
-	octave 6
-	note D#, 13
-	note D_, 9
-	notetype 6, 4, 12
-	note D_, 6
-	notetype 4, 3, 12
-	note D_, 13
-	rest 8
-	note E_, 13
-	note D_, 3
-	octave 6
-	note D#, 13
-	note D_, 9
-	notetype 1, 2, 12
+	unknownnoise0x20 3, 226, 60
+	unknownnoise0x20 8, 214, 76
+	unknownnoise0x20 5, 212, 60
+	unknownnoise0x20 12, 199, 76
+	unknownnoise0x20 2, 226, 60
+	unknownnoise0x20 8, 209, 44
 	endchannel
 ; 0x8f48
--- a/music/sfx/sfx_02_2f.asm
+++ b/music/sfx/sfx_02_2f.asm
@ -1,61 +1,27 @@
 SFX_02_2f_Ch1: ; 8cf0 (2:4cf0)
 	dutycycle 240
-	note D_, 7
-	unknownmusic0xf7
-	rest 1
-	note C_, 7
-	note D_, 16
-	octave 1
-	note C_, 1
-	note C_, 8
-	note D_, 5
-	unknownmusic0xf4
-	stereopanning 6
-	note D_, 5
-	octave 4
-	octave 8
-	note C_, 7
-	note D_, 9
-	notetype 1, 13, 0
-	note C_, 7
+	unknownsfx0x20 6, 247, 192, 6
+	unknownsfx0x20 15, 231, 0, 7
+	unknownsfx0x20 4, 244, 240, 6
+	unknownsfx0x20 4, 228, 224, 6
+	unknownsfx0x20 8, 209, 208, 6
 	endchannel


 SFX_02_2f_Ch2: ; 8d07 (2:4d07)
 	dutycycle 10
-	note D_, 8
-	octave 2
-	note G#, 2
-	note C_, 7
-	note D_, 15
-	notetype 5, 12, 1
-	note C_, 7
-	note D_, 5
-	rest 5
-	note B_, 2
-	note C_, 7
-	note D_, 5
-	notetype 4, 10, 1
-	note C_, 7
-	note D_, 9
-	rest 2
-	note A_, 2
-	note C_, 7
+	unknownsfx0x20 7, 230, 129, 6
+	unknownsfx0x20 14, 213, 193, 6
+	unknownsfx0x20 4, 196, 177, 6
+	unknownsfx0x20 4, 212, 161, 6
+	unknownsfx0x20 8, 193, 145, 6
 	endchannel


 SFX_02_2f_Ch3: ; 8d1e (2:4d1e)
-	note D_, 11
-	note A#, 7
-	note D#, 13
-	note D_, 15
-	note A_, 5
-	note D_, 13
-	note D_, 6
-	note A#, 4
-	note D#, 13
-	note D_, 9
-	note A_, 2
-	note D_, 13
+	unknownnoise0x20 10, 166, 60
+	unknownnoise0x20 14, 148, 44
+	unknownnoise0x20 5, 163, 60
+	unknownnoise0x20 8, 145, 44
 	endchannel
 ; 0x8d2b
--- a/music/sfx/sfx_02_30.asm
+++ b/music/sfx/sfx_02_30.asm
@ -1,80 +1,32 @@
 SFX_02_30_Ch1: ; 8eb1 (2:4eb1)
 	dutycycle 245
-	note D_, 8
-	notetype 6, 14, 1
-	note C_, 8
-	note D_, 7
-	rest 7
-	octave 6
-	note C_, 8
-	note D_, 10
-	notetype 6, 14, 1
-	note C_, 8
-	note D_, 8
-	rest 7
-	octave 8
-	note C_, 8
-	note D_, 6
-	note B_, 7
-	octave 6
-	note C_, 8
-	note D_, 8
-	rest 7
-	octave 7
-	note C_, 8
-	note D_, 7
-	note B_, 7
-	octave 8
-	note C_, 8
-	note D_, 9
-	note A#, 2
-	notetype 15, 0, 7
+	unknownsfx0x20 7, 214, 225, 7
+	unknownsfx0x20 6, 198, 226, 7
+	unknownsfx0x20 9, 214, 225, 7
+	unknownsfx0x20 7, 198, 224, 7
+	unknownsfx0x20 5, 182, 226, 7
+	unknownsfx0x20 7, 198, 225, 7
+	unknownsfx0x20 6, 182, 224, 7
+	unknownsfx0x20 8, 161, 223, 7
 	endchannel


 SFX_02_30_Ch2: ; 8ed4 (2:4ed4)
 	dutycycle 68
-	note D_, 7
-	rest 4
-	rest 10
-	note C_, 8
-	note D_, 7
-	note B_, 4
-	rest 8
-	note C_, 8
-	note D_, 11
-	rest 5
-	rest 4
-	note C_, 8
-	note D_, 9
-	note B_, 5
-	rest 8
-	note C_, 8
-	note D_, 7
-	rest 4
-	rest 10
-	note C_, 8
-	note D_, 16
-	note A#, 3
-	rest 6
-	note C_, 8
+	unknownsfx0x20 6, 195, 201, 7
+	unknownsfx0x20 6, 179, 199, 7
+	unknownsfx0x20 10, 196, 195, 7
+	unknownsfx0x20 8, 180, 199, 7
+	unknownsfx0x20 6, 195, 201, 7
+	unknownsfx0x20 15, 162, 197, 7
 	endchannel


 SFX_02_30_Ch3: ; 8eef (2:4eef)
-	note D_, 14
-	note C#, 10
-	note G_, 13
-	note D_, 14
-	unknownmusic0xf7
-	note G#, 13
-	note D_, 13
-	notetype 6, 7, 12
-	note D_, 9
-	rest 5
-	note F#, 13
-	note D_, 16
-	note B_, 4
-	note F_, 13
+	unknownnoise0x20 13, 25, 124
+	unknownnoise0x20 13, 247, 140
+	unknownnoise0x20 12, 214, 124
+	unknownnoise0x20 8, 196, 108
+	unknownnoise0x20 15, 179, 92
 	endchannel
 ; 0x8eff
--- a/music/sfx/sfx_02_31.asm
+++ b/music/sfx/sfx_02_31.asm
@ -1,72 +1,30 @@
 SFX_02_31_Ch1: ; 8f48 (2:4f48)
 	dutycycle 244
-	note D_, 16
-	stereopanning 5
-	note C_, 8
-	note D_, 11
-	octave 8
-	note C_, 1
-	note C_, 8
-	note D_, 7
-	note B_, 5
-	note C#, 1
-	note C_, 8
-	note D_, 5
-	notetype 3, 0, 0
-	note C_, 8
-	note D_, 7
-	note B_, 3
-	note D_, 1
-	note C_, 7
-	note D_, 9
-	note A#, 2
-	note D_, 5
-	note C_, 7
+	unknownsfx0x20 15, 240, 5, 7
+	unknownsfx0x20 10, 224, 0, 7
+	unknownsfx0x20 6, 180, 16, 7
+	unknownsfx0x20 4, 211, 0, 7
+	unknownsfx0x20 6, 178, 32, 6
+	unknownsfx0x20 8, 161, 36, 6
 	endchannel


 SFX_02_31_Ch2: ; 8f63 (2:4f63)
 	dutycycle 34
-	note D_, 16
-	note B_, 1
-	rest 4
-	note C_, 7
-	note D_, 11
-	note A#, 1
-	rest 2
-	note C_, 7
-	note D_, 7
-	note G#, 5
-	notetype 2, 0, 6
-	note D_, 5
-	note A_, 4
-	rest 2
-	note C_, 7
-	note D_, 7
-	note G#, 3
-	octave 7
-	note C_, 6
-	note D_, 9
-	note F#, 2
-	unknownmusic0xe8
-	note C_, 6
+	unknownsfx0x20 15, 176, 195, 6
+	unknownsfx0x20 10, 160, 193, 6
+	unknownsfx0x20 6, 132, 210, 6
+	unknownsfx0x20 4, 147, 193, 6
+	unknownsfx0x20 6, 130, 225, 5
+	unknownsfx0x20 8, 97, 232, 5
 	endchannel


 SFX_02_31_Ch3: ; 8f7e (2:4f7e)
-	note D_, 7
-	octave 2
-	note E_, 13
-	note D_, 16
-	notetype 6, 3, 12
-	note D_, 11
-	rest 6
-	note E_, 11
-	note D_, 2
-	note B_, 3
-	note F_, 12
-	note D_, 16
-	rest 3
-	note E_, 13
+	unknownnoise0x20 6, 230, 76
+	unknownnoise0x20 15, 214, 60
+	unknownnoise0x20 10, 197, 74
+	unknownnoise0x20 1, 178, 91
+	unknownnoise0x20 15, 194, 76
 	endchannel
 ; 0x8f8e
--- a/music/sfx/sfx_02_32.asm
+++ b/music/sfx/sfx_02_32.asm
@ -1,105 +1,39 @@
 SFX_02_32_Ch1: ; 8dcf (2:4dcf)
 	dutycycle 240
-	note D_, 7
-	unknownmusic0xf2
-	note C_, 1
-	note C_, 7
-	note D_, 7
-	octave 6
-	note E_, 1
-	note C_, 7
-	note D_, 7
-	notetype 2, 8, 0
-	note C_, 7
-	note D_, 7
-	octave 6
-	rest 1
-	note C_, 7
-	note D_, 7
-	notetype 2, 0, 0
-	note C_, 8
-	note D_, 7
-	rest 3
-	note E_, 1
-	note C_, 8
-	note D_, 7
-	note B_, 3
-	note G#, 1
-	note C_, 8
-	note D_, 9
-	note A#, 2
-	rest 1
-	note C_, 8
+	unknownsfx0x20 6, 242, 0, 6
+	unknownsfx0x20 6, 226, 64, 6
+	unknownsfx0x20 6, 210, 128, 6
+	unknownsfx0x20 6, 226, 192, 6
+	unknownsfx0x20 6, 210, 0, 7
+	unknownsfx0x20 6, 194, 64, 7
+	unknownsfx0x20 6, 178, 128, 7
+	unknownsfx0x20 8, 161, 192, 7
 	endchannel


 SFX_02_32_Ch2: ; 8df2 (2:4df2)
 	dutycycle 17
-	note D_, 4
-	note C_, 9
-	note C_, 2
-	note C_, 1
-	note D_, 7
-	rest 3
-	rest 2
-	note C_, 6
-	note D_, 7
-	note B_, 3
-	note C_, 3
-	note C_, 7
-	note D_, 7
-	note A#, 3
-	note E_, 2
-	note C_, 7
-	note D_, 7
-	note B_, 3
-	note G#, 3
-	note C_, 7
-	note D_, 7
-	note A#, 3
-	rest 3
-	note C_, 7
-	note D_, 7
-	note A_, 3
-	note C_, 2
-	note C_, 8
-	note D_, 7
-	note A#, 3
-	note E_, 3
-	note C_, 8
-	note D_, 9
-	note G#, 2
-	note G#, 2
-	note C_, 8
+	unknownsfx0x20 3, 8, 1, 0
+	unknownsfx0x20 6, 194, 193, 5
+	unknownsfx0x20 6, 178, 2, 6
+	unknownsfx0x20 6, 162, 65, 6
+	unknownsfx0x20 6, 178, 130, 6
+	unknownsfx0x20 6, 162, 194, 6
+	unknownsfx0x20 6, 146, 1, 7
+	unknownsfx0x20 6, 162, 66, 7
+	unknownsfx0x20 8, 129, 129, 7
 	endchannel


 SFX_02_32_Ch3: ; 8e19 (2:4e19)
-	note D_, 7
-	note C_, 9
-	note C_, 2
-	note D_, 6
-	octave 6
-	note F_, 13
-	note D_, 6
-	rest 3
-	note E_, 13
-	note D_, 6
-	notetype 2, 3, 12
-	note D_, 6
-	note B_, 3
-	note D_, 13
-	note D_, 6
-	rest 3
-	note C#, 13
-	note D_, 6
-	note A#, 3
-	note C#, 12
-	note D_, 6
-	note A_, 3
-	note C#, 11
-	note D_, 9
-	note G#, 2
-	note C#, 9
+	unknownnoise0x20 6, 8, 1
+	unknownnoise0x20 5, 226, 92
+	unknownnoise0x20 5, 194, 76
+	unknownnoise0x20 5, 210, 60
+	unknownnoise0x20 5, 178, 44
+	unknownnoise0x20 5, 194, 28
+	unknownnoise0x20 5, 162, 27
+	unknownnoise0x20 5, 146, 26
+	unknownnoise0x20 8, 129, 24
 	endchannel
 ; 0x8e35
--- a/music/sfx/sfx_02_33.asm
+++ b/music/sfx/sfx_02_33.asm
@ -1,54 +1,25 @@
 SFX_02_33_Ch1: ; 8fe7 (2:4fe7)
 	dutycycle 165
-	note D_, 4
-	unknownmusic0xf4
-	note E_, 2
-	note C_, 7
-	note D_, 14
-	notetype 6, 2, 1
-	note C_, 8
-	note D_, 9
-	unknownmusic0xf4
-	note C#, 10
-	note C_, 8
-	note D_, 9
-	rest 2
-	note C#, 11
-	note C_, 8
+	unknownsfx0x20 3, 244, 65, 6
+	unknownsfx0x20 13, 214, 33, 7
+	unknownsfx0x20 8, 244, 25, 7
+	unknownsfx0x20 8, 193, 26, 7
 	endchannel


 SFX_02_33_Ch2: ; 8ffa (2:4ffa)
 	dutycycle 204
-	note D_, 5
-	unknownmusic0xf4
-	note G#, 1
-	note C_, 6
-	note D_, 15
-	octave 2
-	octave 8
-	note C_, 7
-	note D_, 9
-	notetype 5, 13, 8
-	note C_, 7
-	note D_, 9
-	notetype 1, 13, 12
-	note C_, 7
+	unknownsfx0x20 4, 244, 128, 5
+	unknownsfx0x20 14, 230, 224, 6
+	unknownsfx0x20 8, 213, 216, 6
+	unknownsfx0x20 8, 209, 220, 6
 	endchannel


 SFX_02_33_Ch3: ; 900d (2:500d)
-	note D_, 6
-	rest 5
-	note E_, 7
-	note D_, 14
-	note A#, 6
-	note E_, 5
-	note D_, 9
-	rest 5
-	note E_, 6
-	note D_, 9
-	note B_, 2
-	note E_, 5
+	unknownnoise0x20 5, 196, 70
+	unknownnoise0x20 13, 165, 68
+	unknownnoise0x20 8, 196, 69
+	unknownnoise0x20 8, 177, 68
 	endchannel
 ; 0x901a
--- a/music/sfx/sfx_02_34.asm
+++ b/music/sfx/sfx_02_34.asm
@ -1,53 +1,25 @@
 SFX_02_34_Ch1: ; 901a (2:501a)
 	dutycycle 240
-	note D_, 14
-	unknownmusic0xf1
-	note C#, 2
-	note C_, 6
-	note D_, 14
-	octave 7
-	note C#, 6
-	note C_, 6
-	note D_, 14
-	octave 7
-	note C#, 2
-	note C_, 6
-	note D_, 9
-	notetype 1, 1, 1
-	note C_, 6
+	unknownsfx0x20 13, 241, 17, 5
+	unknownsfx0x20 13, 225, 21, 5
+	unknownsfx0x20 13, 225, 17, 5
+	unknownsfx0x20 8, 209, 17, 5
 	endchannel


 SFX_02_34_Ch2: ; 902d (2:502d)
 	dutycycle 21
-	note D_, 13
-	octave 7
-	note C_, 13
-	note C_, 6
-	note D_, 13
-	notetype 1, 1, 0
-	note C_, 6
-	note D_, 15
-	rest 2
-	note C_, 13
-	note C_, 6
-	note D_, 9
-	rest 2
-	note C_, 11
-	note C_, 6
+	unknownsfx0x20 12, 225, 12, 5
+	unknownsfx0x20 12, 209, 16, 5
+	unknownsfx0x20 14, 193, 12, 5
+	unknownsfx0x20 8, 193, 10, 5
 	endchannel


 SFX_02_34_Ch3: ; 9040 (2:5040)
-	note D_, 15
-	unknownmusic0xf2
-	note F#, 6
-	note D_, 14
-	octave 6
-	note F_, 6
-	note D_, 15
-	notetype 2, 5, 6
-	note D_, 9
-	notetype 1, 6, 6
+	unknownnoise0x20 14, 242, 101
+	unknownnoise0x20 13, 226, 85
+	unknownnoise0x20 14, 210, 86
+	unknownnoise0x20 8, 209, 102
 	endchannel
 ; 0x904d
--- a/music/sfx/sfx_02_35.asm
+++ b/music/sfx/sfx_02_35.asm
@ -1,69 +1,26 @@
 SFX_02_35_Ch1: ; 904d (2:504d)
 	dutycycle 27
-	note D_, 4
-	unknownmusic0xf3
-	note F#, 5
-	note C_, 6
-	note D_, 3
-	octave 6
-	note E_, 5
-	note C_, 6
-	note D_, 6
-	notetype 1, 2, 2
-	note C_, 6
-	note D_, 3
-	note B_, 3
-	note G#, 5
-	note C_, 5
-	note D_, 9
-	notetype 1, 10, 2
-	note C_, 5
-	note D_, 4
-	unknownmusic0xf3
-	note D_, 5
-	note C_, 6
-	note D_, 5
-	octave 4
-	octave 4
-	note C_, 5
-	note D_, 9
-	notetype 1, 0, 2
-	note C_, 6
+	unknownsfx0x20 3, 243, 100, 5
+	unknownsfx0x20 2, 226, 68, 5
+	unknownsfx0x20 5, 209, 34, 5
+	unknownsfx0x20 2, 178, 132, 4
+	unknownsfx0x20 8, 209, 162, 4
+	unknownsfx0x20 3, 243, 36, 5
+	unknownsfx0x20 4, 228, 228, 4
+	unknownsfx0x20 8, 209, 2, 5
 	endchannel


 SFX_02_35_Ch2: ; 9070 (2:5070)
 	dutycycle 204
-	note D_, 4
-	notetype 3, 6, 0
-	note C_, 6
-	note D_, 3
-	rest 3
-	note E_, 1
-	note C_, 6
-	note D_, 6
-	rest 2
-	note D_, 1
-	note C_, 6
-	note D_, 3
-	note A_, 3
-	note G#, 1
-	note C_, 5
-	note D_, 9
-	rest 2
-	note A#, 1
-	note C_, 5
-	note D_, 4
-	notetype 3, 2, 0
-	note C_, 6
-	note D_, 4
-	rest 5
-	octave 8
-	note C_, 5
-	note D_, 9
-	rest 2
-	note C_, 1
-	note C_, 6
+	unknownsfx0x20 3, 211, 96, 5
+	unknownsfx0x20 2, 194, 64, 5
+	unknownsfx0x20 5, 193, 32, 5
+	unknownsfx0x20 2, 146, 128, 4
+	unknownsfx0x20 8, 193, 160, 4
+	unknownsfx0x20 3, 211, 32, 5
+	unknownsfx0x20 3, 196, 224, 4
+	unknownsfx0x20 8, 193, 0, 5


 SFX_02_35_Ch3: ; 9092 (2:5092)
--- a/music/sfx/sfx_02_36.asm
+++ b/music/sfx/sfx_02_36.asm
@ -1,56 +1,25 @@
 SFX_02_36_Ch1: ; 9093 (2:5093)
 	dutycycle 17
-	note D_, 3
-	note D#, 14
-	note G#, 2
-	note C_, 4
-	note D_, 8
-	unknownmusic0xf5
-	note C_, 2
-	note C_, 7
-	note D_, 2
-	rest 3
-	note G#, 2
-	note C_, 5
-	note D_, 9
-	note A_, 2
-	note G#, 2
-	note C_, 4
+	unknownsfx0x20 2, 61, 129, 3
+	unknownsfx0x20 7, 245, 1, 6
+	unknownsfx0x20 1, 194, 129, 4
+	unknownsfx0x20 8, 145, 129, 3
 	endchannel


 SFX_02_36_Ch2: ; 90a6 (2:50a6)
 	dutycycle 238
-	note D_, 3
-	note D#, 15
-	note B_, 1
-	note C_, 6
-	note D_, 8
-	notetype 5, 5, 13
-	note C_, 8
-	note D_, 2
-	note B_, 3
-	note B_, 1
-	note C_, 7
-	note D_, 9
-	note F#, 2
-	note B_, 1
-	note C_, 6
+	unknownsfx0x20 2, 62, 176, 5
+	unknownsfx0x20 7, 213, 93, 7
+	unknownsfx0x20 1, 178, 176, 6
+	unknownsfx0x20 8, 97, 176, 5
 	endchannel


 SFX_02_36_Ch3: ; 90b9 (2:50b9)
-	note D_, 3
-	note A_, 3
-	note E_, 10
-	note D_, 8
-	note B_, 6
-	note D_, 10
-	note D_, 2
-	note A#, 3
-	note D#, 10
-	note D_, 9
-	note A_, 2
-	note E_, 10
+	unknownnoise0x20 2, 146, 73
+	unknownnoise0x20 7, 181, 41
+	unknownnoise0x20 1, 162, 57
+	unknownnoise0x20 8, 145, 73
 	endchannel
 ; 0x90c6
--- a/music/sfx/sfx_02_37.asm
+++ b/music/sfx/sfx_02_37.asm
@ -1,59 +1,26 @@
 SFX_02_37_Ch1: ; 8786 (2:4786)
 	dutycycle 240
-	note D_, 16
-	unknownmusic0xf7
-	rest 1
-	note C_, 8
-	note D_, 7
-	octave 4
-	rest 2
-	note C_, 8
-	note D_, 11
-	unknownmusic0xf6
-	rest 1
-	note C_, 8
-	note D_, 5
-	notetype 3, 12, 2
-	note C_, 8
-	note D_, 9
-	rest 2
-	rest 1
-	note C_, 8
+	unknownsfx0x20 15, 247, 192, 7
+	unknownsfx0x20 6, 228, 193, 7
+	unknownsfx0x20 10, 246, 192, 7
+	unknownsfx0x20 4, 211, 194, 7
+	unknownsfx0x20 8, 193, 192, 7
 	endchannel


 SFX_02_37_Ch2: ; 879d (2:479d)
 	dutycycle 95
-	note D_, 16
-	note A_, 8
-	note G#, 2
-	note C_, 8
-	note D_, 7
-	note G#, 5
-	note G#, 1
-	note C_, 8
-	note D_, 11
-	note A_, 7
-	note G#, 2
-	note C_, 8
-	note D_, 16
-	note G#, 4
-	note G#, 2
-	note C_, 8
+	unknownsfx0x20 15, 151, 129, 7
+	unknownsfx0x20 6, 132, 128, 7
+	unknownsfx0x20 10, 150, 129, 7
+	unknownsfx0x20 15, 131, 129, 7
 	endchannel


 SFX_02_37_Ch3: ; 87b0 (2:47b0)
-	note D_, 4
-	unknownmusic0xf2
-	note D#, 13
-	note D_, 14
-	octave 2
-	note D_, 13
-	note D_, 16
-	notetype 7, 3, 12
-	note D_, 9
-	rest 2
-	note D_, 13
+	unknownnoise0x20 3, 242, 60
+	unknownnoise0x20 13, 230, 44
+	unknownnoise0x20 15, 215, 60
+	unknownnoise0x20 8, 193, 44
 	endchannel
 ; 0x87bd
--- a/music/sfx/sfx_02_38.asm
+++ b/music/sfx/sfx_02_38.asm
@ -1,88 +1,34 @@
 SFX_02_38_Ch1: ; 87bd (2:47bd)
 	dutycycle 240
-	note D_, 16
-	unknownmusic0xf7
-	note G#, 1
-	note C_, 7
-	note D_, 11
-	octave 2
-	note G#, 5
-	note C_, 7
-	note D_, 16
-	notetype 7, 9, 0
-	note C_, 7
-	note D_, 9
-	notetype 5, 9, 0
-	note C_, 7
-	note D_, 7
-	rest 5
-	note G#, 9
-	note C_, 7
-	note D_, 6
-	notetype 3, 7, 0
-	note C_, 7
-	note D_, 5
-	notetype 3, 6, 0
-	note C_, 7
-	note D_, 9
-	rest 2
-	note E_, 1
-	note C_, 7
+	unknownsfx0x20 15, 247, 128, 6
+	unknownsfx0x20 10, 230, 132, 6
+	unknownsfx0x20 15, 215, 144, 6
+	unknownsfx0x20 8, 213, 144, 6
+	unknownsfx0x20 6, 196, 136, 6
+	unknownsfx0x20 5, 211, 112, 6
+	unknownsfx0x20 4, 211, 96, 6
+	unknownsfx0x20 8, 193, 64, 6
 	endchannel


 SFX_02_38_Ch2: ; 87e0 (2:47e0)
 	dutycycle 5
-	note D_, 16
-	note B_, 8
-	note E_, 2
-	note C_, 7
-	note D_, 11
-	note A_, 7
-	note E_, 3
-	note C_, 7
-	note D_, 16
-	note A#, 8
-	note F_, 2
-	note C_, 7
-	note D_, 9
-	note A#, 6
-	note F_, 2
-	note C_, 7
-	note D_, 7
-	note A_, 5
-	note E_, 8
-	note C_, 7
-	note D_, 6
-	note A#, 4
-	note D#, 2
-	note C_, 7
-	note D_, 5
-	note A_, 4
-	note D_, 3
-	note C_, 7
-	note D_, 9
-	note G_, 2
-	note C_, 2
-	note C_, 7
+	unknownsfx0x20 15, 183, 65, 6
+	unknownsfx0x20 10, 150, 66, 6
+	unknownsfx0x20 15, 167, 81, 6
+	unknownsfx0x20 8, 165, 81, 6
+	unknownsfx0x20 6, 148, 71, 6
+	unknownsfx0x20 5, 163, 49, 6
+	unknownsfx0x20 4, 147, 34, 6
+	unknownsfx0x20 8, 113, 1, 6
 	endchannel


 SFX_02_38_Ch3: ; 8803 (2:4803)
-	note D_, 16
-	octave 4
-	note D#, 13
-	note D_, 11
-	rest 8
-	note E_, 13
-	note D_, 11
-	rest 8
-	note D#, 13
-	note D_, 13
-	note B_, 8
-	note E_, 13
-	note D_, 16
-	note A#, 3
-	note F_, 13
+	unknownnoise0x20 15, 228, 60
+	unknownnoise0x20 10, 199, 76
+	unknownnoise0x20 10, 199, 60
+	unknownnoise0x20 12, 183, 76
+	unknownnoise0x20 15, 162, 92
 	endchannel
 ; 0x8813
--- a/music/sfx/sfx_02_39.asm
+++ b/music/sfx/sfx_02_39.asm
@ -1,63 +1,27 @@
 SFX_02_39_Ch1: ; 886b (2:486b)
 	dutycycle 165
-	note D_, 7
-	unknownmusic0xf4
-	note E_, 1
-	note C_, 8
-	note D_, 16
-	octave 5
-	note D#, 1
-	note C_, 8
-	note D_, 5
-	unknownmusic0xf4
-	note E_, 1
-	note C_, 8
-	note D_, 6
-	note B_, 4
-	note E_, 9
-	note C_, 8
-	note D_, 9
-	notetype 1, 5, 0
-	note C_, 8
+	unknownsfx0x20 6, 244, 64, 7
+	unknownsfx0x20 15, 227, 48, 7
+	unknownsfx0x20 4, 244, 64, 7
+	unknownsfx0x20 5, 179, 72, 7
+	unknownsfx0x20 8, 209, 80, 7
 	endchannel


 SFX_02_39_Ch2: ; 8882 (2:4882)
 	dutycycle 119
-	note D_, 7
-	rest 4
-	note C#, 3
-	note C_, 8
-	note D_, 16
-	note B_, 4
-	note C_, 5
-	note C_, 8
-	note D_, 4
-	rest 4
-	note C#, 3
-	note C_, 8
-	note D_, 5
-	rest 4
-	note D_, 2
-	note C_, 8
-	note D_, 9
-	note B_, 2
-	note D#, 3
-	note C_, 8
+	unknownsfx0x20 6, 195, 18, 7
+	unknownsfx0x20 15, 179, 4, 7
+	unknownsfx0x20 3, 195, 18, 7
+	unknownsfx0x20 4, 195, 33, 7
+	unknownsfx0x20 8, 177, 50, 7
 	endchannel


 SFX_02_39_Ch3: ; 8899 (2:4899)
-	note D_, 9
-	notetype 6, 2, 12
-	note D_, 13
-	rest 7
-	note D#, 13
-	note D_, 11
-	note B_, 7
-	note D_, 13
-	note D_, 9
-	note A_, 2
-	note C#, 13
+	unknownnoise0x20 8, 214, 44
+	unknownnoise0x20 12, 198, 60
+	unknownnoise0x20 10, 182, 44
+	unknownnoise0x20 8, 145, 28
 	endchannel
 ; 0x88a6
--- a/music/sfx/sfx_02_3a.asm
+++ b/music/sfx/sfx_02_3a.asm
@ -1,10 +1,10 @@
 SFX_02_3a_Ch1: ; ad77 (2:6d77)
-	unknownmusic0xf8
+	executemusic
 	tempo 1, 0
 	stereopanning 119
 	vibrato 6, 2, 6
 	duty 2
-	unknownmusic0xe8
+	togglecall
 	notetype 4, 11, 1
 	octave 3
 	note G#, 2
@ -17,7 +17,7 @@ SFX_02_3a_Ch1: ; ad77 (2:6d77)


 SFX_02_3a_Ch2: ; ad8e (2:6d8e)
-	unknownmusic0xf8
+	executemusic
 	vibrato 8, 2, 7
 	duty 2
 	notetype 4, 12, 1
@ -31,7 +31,7 @@ SFX_02_3a_Ch2: ; ad8e (2:6d8e)


 SFX_02_3a_Ch3: ; ad9e (2:6d9e)
-	unknownmusic0xf8
+	executemusic
 	notetype 4, 1, 0
 	octave 4
 	note B_, 1
--- a/music/sfx/sfx_02_3b.asm
+++ b/music/sfx/sfx_02_3b.asm
@ -1,9 +1,9 @@
 SFX_02_3b_Ch1: ; b316 (2:7316)
-	unknownmusic0xf8
+	executemusic
 	tempo 1, 0
 	stereopanning 119
 	duty 2
-	unknownmusic0xe8
+	togglecall
 	notetype 5, 11, 4
 	octave 4
 	note D_, 4
@ -26,7 +26,7 @@ SFX_02_3b_Ch1: ; b316 (2:7316)


 SFX_02_3b_Ch2: ; b335 (2:7335)
-	unknownmusic0xf8
+	executemusic
 	vibrato 8, 2, 7
 	duty 2
 	notetype 5, 12, 5
@ -47,7 +47,7 @@ SFX_02_3b_Ch2: ; b335 (2:7335)


 SFX_02_3b_Ch3: ; b34d (2:734d)
-	unknownmusic0xf8
+	executemusic
 	notetype 5, 1, 0
 	octave 5
 	note F_, 4
--- a/music/sfx/sfx_02_3c.asm
+++ b/music/sfx/sfx_02_3c.asm
@ -1,18 +1,9 @@
 SFX_02_3c_Ch1: ; 840a (2:440a)
 	duty 2
-	note C#, 1
-	note D#, 11
-	note D_, 5
-	unknownmusic0xf2
-	note C_, 1
-	note C_, 3
-	note C#, 1
-	note D_, 3
-	note D_, 9
-	octave 6
-	note C_, 1
-	note C_, 3
-	note C#, 1
-	note C_, 9
+	unknownsfx0x10 58
+	unknownsfx0x20 4, 242, 0, 2
+	unknownsfx0x10 34
+	unknownsfx0x20 8, 226, 0, 2
+	unknownsfx0x10 8
 	endchannel
 ; 0x841b
--- a/music/sfx/sfx_02_3d.asm
+++ b/music/sfx/sfx_02_3d.asm
@ -1,15 +1,8 @@
 SFX_02_3d_Ch1: ; 84b7 (2:44b7)
 	duty 2
-	note C#, 1
-	note C#, 8
-	note D_, 16
-	stereopanning 240
-	note C_, 5
-	note D_, 16
-	unknownmusic0xf2
-	note F_, 1
-	note C_, 7
-	note C#, 1
-	note C_, 9
+	unknownsfx0x10 23
+	unknownsfx0x20 15, 240, 240, 4
+	unknownsfx0x20 15, 242, 80, 6
+	unknownsfx0x10 8
 	endchannel
 ; 0x84c6
--- a/music/sfx/sfx_02_3e.asm
+++ b/music/sfx/sfx_02_3e.asm
@ -1,22 +1,10 @@
 SFX_02_3e_Ch1: ; 84d9 (2:44d9)
 	duty 2
-	note C#, 1
-	note C#, 5
-	note D_, 5
-	unknownmusic0xf2
-	note C_, 1
-	note C_, 7
-	note D_, 5
-	unknownmusic0xf2
-	note C_, 1
-	note C_, 7
-	note C#, 1
-	note C#, 8
-	note D_, 16
-	unknownmusic0xf2
-	note C_, 1
-	note C_, 7
-	note C#, 1
-	note C_, 9
+	unknownsfx0x10 20
+	unknownsfx0x20 4, 242, 0, 6
+	unknownsfx0x20 4, 242, 0, 6
+	unknownsfx0x10 23
+	unknownsfx0x20 15, 242, 0, 6
+	unknownsfx0x10 8
 	endchannel
 ; 0x84ee
--- a/music/sfx/sfx_02_3f.asm
+++ b/music/sfx/sfx_02_3f.asm
@ -1,9 +1,5 @@
 SFX_02_3f_Ch1: ; 83c3 (2:43c3)
-	note D_, 2
-	octave 6
-	note D#, 4
-	note D_, 9
-	octave 7
-	note D_, 3
+	unknownnoise0x20 1, 226, 51
+	unknownnoise0x20 8, 225, 34
 	endchannel
 ; 0x83ca
--- a/music/sfx/sfx_02_40.asm
+++ b/music/sfx/sfx_02_40.asm
@ -1,18 +1,8 @@
 SFX_02_40_Ch1: ; 8462 (2:4462)
 	duty 2
-	note D_, 1
-	note A_, 2
-	rest 1
-	note C_, 8
-	note D_, 1
-	note G#, 2
-	notetype 0, 0, 7
-	note D_, 1
-	note A_, 2
-	rest 1
-	note C_, 8
-	note D_, 13
-	note A#, 2
-	notetype 0, 0, 7
+	unknownsfx0x20 0, 145, 192, 7
+	unknownsfx0x20 0, 129, 208, 7
+	unknownsfx0x20 0, 145, 192, 7
+	unknownsfx0x20 12, 161, 208, 7
 	endchannel
 ; 0x8475
--- a/music/sfx/sfx_02_41.asm
+++ b/music/sfx/sfx_02_41.asm
@ -1,5 +1,5 @@
 SFX_02_41_Ch1: ; b2c8 (2:72c8)
-	unknownmusic0xf8
+	executemusic
 	tempo 1, 0
 	stereopanning 119
 	duty 2
@ -22,7 +22,7 @@ SFX_02_41_Ch1: ; b2c8 (2:72c8)


 SFX_02_41_Ch2: ; b2e1 (2:72e1)
-	unknownmusic0xf8
+	executemusic
 	duty 2
 	notetype 5, 12, 2
 	octave 5
@ -45,7 +45,7 @@ SFX_02_41_Ch2: ; b2e1 (2:72e1)


 SFX_02_41_Ch3: ; b2f7 (2:72f7)
-	unknownmusic0xf8
+	executemusic
 	notetype 5, 1, 0
 	octave 5
 	note C_, 1
--- a/music/sfx/sfx_02_42.asm
+++ b/music/sfx/sfx_02_42.asm
@ -1,9 +1,9 @@
 SFX_02_42_Ch1: ; b362 (2:7362)
-	unknownmusic0xf8
+	executemusic
 	tempo 1, 0
 	stereopanning 119
 	duty 2
-	unknownmusic0xe8
+	togglecall
 	notetype 5, 10, 4
 	octave 3
 	note A#, 4
@ -24,7 +24,7 @@ SFX_02_42_Ch1: ; b362 (2:7362)


 SFX_02_42_Ch2: ; b381 (2:7381)
-	unknownmusic0xf8
+	executemusic
 	vibrato 4, 2, 3
 	duty 2
 	notetype 5, 13, 1
@ -48,7 +48,7 @@ SFX_02_42_Ch2: ; b381 (2:7381)


 SFX_02_42_Ch3: ; b39d (2:739d)
-	unknownmusic0xf8
+	executemusic
 	notetype 5, 1, 0
 	octave 4
 	note D#, 4
--- a/music/sfx/sfx_02_43.asm
+++ b/music/sfx/sfx_02_43.asm
@ -1,17 +1,9 @@
 SFX_02_43_Ch1: ; 84c6 (2:44c6)
 	duty 0
-	note C#, 1
-	note C#, 5
-	note D_, 5
-	unknownmusic0xf2
-	note C_, 1
-	note C_, 7
+	unknownsfx0x10 20
+	unknownsfx0x20 4, 242, 0, 6
 	loopchannel 4, SFX_02_43_Ch1
-	note D_, 16
-	unknownmusic0xf3
-	note C_, 1
-	note C_, 7
-	note C#, 1
-	note C_, 9
+	unknownsfx0x20 15, 243, 0, 6
+	unknownsfx0x10 8
 	endchannel
 ; 0x84d9
--- a/music/sfx/sfx_02_44.asm
+++ b/music/sfx/sfx_02_44.asm
@ -1,15 +1,8 @@
 SFX_02_44_Ch1: ; 84ee (2:44ee)
 	duty 2
-	note C#, 1
-	note C#, 6
-	note D_, 16
-	stereopanning 240
-	note C_, 5
-	note D_, 16
-	unknownmusic0xf2
-	note F_, 1
-	note C_, 7
-	note C#, 1
-	note C_, 9
+	unknownsfx0x10 21
+	unknownsfx0x20 15, 240, 240, 4
+	unknownsfx0x20 15, 242, 80, 6
+	unknownsfx0x10 8
 	endchannel
 ; 0x84fd
--- a/music/sfx/sfx_02_45.asm
+++ b/music/sfx/sfx_02_45.asm
@ -1,44 +1,14 @@
 SFX_02_45_Ch1: ; 84fd (2:44fd)
 	duty 2
-	note D_, 16
-	unknownmusic0xf2
-	rest 1
-	note C_, 8
-	note D_, 16
-	note C_, 1
-	note C_, 1
-	note C_, 1
-	note D_, 4
-	note A#, 2
-	note G#, 1
-	note C_, 8
-	note D_, 4
-	note A#, 2
-	note C_, 1
-	note C_, 8
-	note D_, 4
-	note A#, 2
-	note E_, 1
-	note C_, 8
-	note D_, 4
-	note A#, 2
-	note C_, 1
-	note C_, 8
-	note D_, 4
-	note A#, 2
-	note G#, 1
-	note C_, 8
-	note D_, 4
-	note A#, 2
-	note C_, 1
-	note C_, 8
-	note D_, 4
-	note A#, 2
-	rest 1
-	note C_, 8
-	note D_, 9
-	note A#, 2
-	note C_, 1
-	note C_, 8
+	unknownsfx0x20 15, 242, 192, 7
+	unknownsfx0x20 15, 0, 0, 0
+	unknownsfx0x20 3, 161, 128, 7
+	unknownsfx0x20 3, 161, 0, 7
+	unknownsfx0x20 3, 161, 64, 7
+	unknownsfx0x20 3, 161, 0, 7
+	unknownsfx0x20 3, 161, 128, 7
+	unknownsfx0x20 3, 161, 0, 7
+	unknownsfx0x20 3, 161, 192, 7
+	unknownsfx0x20 8, 161, 0, 7
 	endchannel
 ; 0x8528
--- a/music/sfx/sfx_02_46.asm
+++ b/music/sfx/sfx_02_46.asm
@ -1,17 +1,8 @@
 SFX_02_46_Ch1: ; 8528 (2:4528)
 	duty 2
-	note D_, 5
-	stereopanning 0
-	note C_, 7
-	note D_, 5
-	stereopanning 0
-	note C_, 5
-	note D_, 5
-	stereopanning 0
-	note C_, 3
-	note D_, 2
-	note C_, 1
-	note C_, 1
-	note C_, 1
+	unknownsfx0x20 4, 240, 0, 6
+	unknownsfx0x20 4, 240, 0, 4
+	unknownsfx0x20 4, 240, 0, 2
+	unknownsfx0x20 1, 0, 0, 0
 	endchannel
 ; 0x853b
--- a/music/sfx/sfx_02_47.asm
+++ b/music/sfx/sfx_02_47.asm
@ -1,18 +1,8 @@
 SFX_02_47_Ch1: ; 853b (2:453b)
 	duty 2
-	note D_, 7
-	stereopanning 0
-	note C_, 8
-	note D_, 5
-	note C_, 1
-	note C_, 1
-	note C_, 1
-	note D_, 7
-	stereopanning 0
-	note C_, 8
-	note D_, 2
-	note C_, 1
-	note C_, 1
-	note C_, 1
+	unknownsfx0x20 6, 240, 0, 7
+	unknownsfx0x20 4, 0, 0, 0
+	unknownsfx0x20 6, 240, 0, 7
+	unknownsfx0x20 1, 0, 0, 0
 	endchannel
 ; 0x854e
--- a/music/sfx/sfx_02_48.asm
+++ b/music/sfx/sfx_02_48.asm
@ -1,27 +1,11 @@
 SFX_02_48_Ch1: ; 854e (2:454e)
 	duty 1
-	note C#, 1
-	note C#, 8
-	note D_, 16
-	notetype 7, 0, 0
-	note C_, 7
-	note D_, 16
-	note B_, 8
-	note G#, 1
-	note C_, 6
-	note D_, 16
-	note G#, 8
-	note C_, 1
-	note C_, 6
-	note D_, 16
-	note E_, 8
-	note G#, 1
-	note C_, 5
-	note D_, 16
-	note C#, 8
-	note C_, 1
-	note C_, 5
-	note C#, 1
-	note C_, 9
+	unknownsfx0x10 23
+	unknownsfx0x20 15, 215, 0, 6
+	unknownsfx0x20 15, 183, 128, 5
+	unknownsfx0x20 15, 135, 0, 5
+	unknownsfx0x20 15, 71, 128, 4
+	unknownsfx0x20 15, 23, 0, 4
+	unknownsfx0x10 8
 	endchannel
 ; 0x8569
--- a/music/sfx/sfx_02_49.asm
+++ b/music/sfx/sfx_02_49.asm
@ -1,24 +1,9 @@
 SFX_02_49_Ch1: ; 8569 (2:4569)
 	duty 2
-	note D_, 5
-	note C_, 1
-	note C_, 1
-	note C_, 1
-	note D_, 3
-	unknownmusic0xf1
-	note G#, 1
-	note C_, 7
-	note D_, 2
-	note C_, 1
-	note C_, 1
-	note C_, 1
-	note D_, 5
-	unknownmusic0xf1
-	note G#, 1
-	note C_, 8
-	note D_, 5
-	note C_, 1
-	note C_, 1
-	note C_, 1
+	unknownsfx0x20 4, 0, 0, 0
+	unknownsfx0x20 2, 241, 128, 6
+	unknownsfx0x20 1, 0, 0, 0
+	unknownsfx0x20 4, 241, 128, 7
+	unknownsfx0x20 4, 0, 0, 0
 	endchannel
 ; 0x8580
--- a/music/sfx/sfx_02_4a.asm
+++ b/music/sfx/sfx_02_4a.asm
@ -1,22 +1,10 @@
 SFX_02_4a_Ch1: ; 8580 (2:4580)
 	duty 2
-	note C#, 1
-	note D_, 13
-	note D_, 5
-	unknownmusic0xf2
-	note C_, 1
-	note C_, 6
-	note C#, 1
-	note D_, 3
-	note D_, 3
-	unknownmusic0xf1
-	note C_, 1
-	note C_, 6
-	note C#, 1
-	note C_, 9
-	note D_, 2
-	note C_, 1
-	note C_, 1
-	note C_, 1
+	unknownsfx0x10 44
+	unknownsfx0x20 4, 242, 0, 5
+	unknownsfx0x10 34
+	unknownsfx0x20 2, 241, 0, 5
+	unknownsfx0x10 8
+	unknownsfx0x20 1, 0, 0, 0
 	endchannel
 ; 0x8595
--- a/music/sfx/sfx_02_4b.asm
+++ b/music/sfx/sfx_02_4b.asm
@ -1,27 +1,11 @@
 SFX_02_4b_Ch1: ; 8595 (2:4595)
 	duty 1
-	note C#, 1
-	note C#, 8
-	note D_, 16
-	notetype 7, 0, 0
-	note C_, 6
-	note D_, 16
-	note B_, 8
-	note G#, 1
-	note C_, 6
-	note D_, 16
-	note G#, 8
-	note C_, 1
-	note C_, 7
-	note D_, 16
-	note E_, 8
-	note G#, 1
-	note C_, 7
-	note D_, 16
-	note C#, 8
-	note C_, 1
-	note C_, 8
-	note C#, 1
-	note C_, 9
+	unknownsfx0x10 23
+	unknownsfx0x20 15, 215, 0, 5
+	unknownsfx0x20 15, 183, 128, 5
+	unknownsfx0x20 15, 135, 0, 6
+	unknownsfx0x20 15, 71, 128, 6
+	unknownsfx0x20 15, 23, 0, 7
+	unknownsfx0x10 8
 	endchannel
 ; 0x85b0
--- a/music/sfx/sfx_02_4c.asm
+++ b/music/sfx/sfx_02_4c.asm
@ -1,27 +1,11 @@
 SFX_02_4c_Ch1: ; 85b0 (2:45b0)
 	duty 1
-	note C#, 1
-	note C#, 8
-	note D_, 16
-	notetype 7, 0, 0
-	note C_, 8
-	note D_, 16
-	note B_, 8
-	note G#, 1
-	note C_, 7
-	note D_, 16
-	note G#, 8
-	note C_, 1
-	note C_, 7
-	note D_, 16
-	note E_, 8
-	note G#, 1
-	note C_, 6
-	note D_, 16
-	note C#, 8
-	note C_, 1
-	note C_, 6
-	note C#, 1
-	note C_, 9
+	unknownsfx0x10 23
+	unknownsfx0x20 15, 215, 0, 7
+	unknownsfx0x20 15, 183, 128, 6
+	unknownsfx0x20 15, 135, 0, 6
+	unknownsfx0x20 15, 71, 128, 5
+	unknownsfx0x20 15, 23, 0, 5
+	unknownsfx0x10 8
 	endchannel
 ; 0x85cb
--- a/music/sfx/sfx_02_4d.asm
+++ b/music/sfx/sfx_02_4d.asm
@ -1,11 +1,7 @@
 SFX_02_4d_Ch1: ; 85cb (2:45cb)
 	duty 1
-	note C#, 1
-	note C#, 7
-	note D_, 16
-	notetype 2, 0, 0
-	note C_, 6
-	note C#, 1
-	note C_, 9
+	unknownsfx0x10 22
+	unknownsfx0x20 15, 210, 0, 5
+	unknownsfx0x10 8
 	endchannel
 ; 0x85d6
--- a/music/sfx/sfx_02_4e.asm
+++ b/music/sfx/sfx_02_4e.asm
@ -1,12 +1,7 @@
 SFX_02_4e_Ch1: ; 85d6 (2:45d6)
 	duty 2
-	note C#, 1
-	note A_, 6
-	note D_, 16
-	unknownmusic0xf2
-	note C_, 1
-	note C_, 5
-	note C#, 1
-	note C_, 9
+	unknownsfx0x10 149
+	unknownsfx0x20 15, 242, 0, 4
+	unknownsfx0x10 8
 	endchannel
 ; 0x85e1
--- a/music/sfx/sfx_02_4f.asm
+++ b/music/sfx/sfx_02_4f.asm
@ -1,15 +1,7 @@
 SFX_02_4f_Ch1: ; 85e1 (2:45e1)
-	note D_, 3
-	unknownmusic0xf1
-	note D#, 3
-	note D_, 3
-	note C_, 1
-	note C_, 1
-	note D_, 3
-	unknownmusic0xf1
-	note D_, 3
-	note D_, 2
-	note C_, 1
-	note C_, 1
+	unknownnoise0x20 2, 241, 50
+	unknownnoise0x20 2, 0, 0
+	unknownnoise0x20 2, 241, 34
+	unknownnoise0x20 1, 0, 0
 	endchannel
 ; 0x85ee
--- a/music/sfx/sfx_02_50.asm
+++ b/music/sfx/sfx_02_50.asm
@ -1,50 +1,19 @@
 SFX_02_50_Ch1: ; 85ee (2:45ee)
-	note D_, 3
-	unknownmusic0xf1
-	note C#, 3
-	note D_, 3
-	note C_, 1
-	note C_, 1
-	note D_, 3
-	note A#, 2
-	note C#, 3
-	note D_, 3
-	note C_, 1
-	note C_, 1
-	note D_, 3
-	notetype 1, 1, 2
-	note D_, 3
-	note C_, 1
-	note C_, 1
-	note D_, 3
-	note G#, 2
-	note C#, 3
-	note D_, 3
-	note C_, 1
-	note C_, 1
-	note D_, 3
-	note B_, 2
-	note C#, 3
-	note D_, 3
-	note C_, 1
-	note C_, 1
-	note D_, 3
-	note F#, 2
-	note C#, 3
-	note D_, 3
-	note C_, 1
-	note C_, 1
-	note D_, 3
-	note A_, 2
-	note C#, 3
-	note D_, 3
-	note C_, 1
-	note C_, 1
-	note D_, 3
-	note E_, 2
-	note C#, 3
-	note D_, 3
-	note C_, 1
-	note C_, 1
+	unknownnoise0x20 2, 241, 18
+	unknownnoise0x20 2, 0, 0
+	unknownnoise0x20 2, 161, 18
+	unknownnoise0x20 2, 0, 0
+	unknownnoise0x20 2, 209, 18
+	unknownnoise0x20 2, 0, 0
+	unknownnoise0x20 2, 129, 18
+	unknownnoise0x20 2, 0, 0
+	unknownnoise0x20 2, 177, 18
+	unknownnoise0x20 2, 0, 0
+	unknownnoise0x20 2, 97, 18
+	unknownnoise0x20 2, 0, 0
+	unknownnoise0x20 2, 145, 18
+	unknownnoise0x20 2, 0, 0
+	unknownnoise0x20 2, 65, 18
+	unknownnoise0x20 2, 0, 0
 	endchannel
 ; 0x861f
--- a/music/sfx/sfx_02_51.asm
+++ b/music/sfx/sfx_02_51.asm
@ -1,41 +1,19 @@
 SFX_02_51_Ch1: ; 861f (2:461f)
 	duty 3
-	note C#, 1
-	note F_, 11
-	note D_, 5
-	stereopanning 0
-	note C_, 6
-	note C#, 1
-	note C_, 9
-	note D_, 5
-	note C_, 1
-	note C_, 1
-	note C_, 1
-	note D_, 16
-	stereopanning 0
-	note C_, 6
-	note D_, 2
-	note C_, 1
-	note C_, 1
-	note C_, 1
+	unknownsfx0x10 90
+	unknownsfx0x20 4, 240, 0, 5
+	unknownsfx0x10 8
+	unknownsfx0x20 4, 0, 0, 0
+	unknownsfx0x20 15, 240, 0, 5
+	unknownsfx0x20 1, 0, 0, 0
 	endchannel


 SFX_02_51_Ch2: ; 8636 (2:4636)
 	duty 3
-	note D_, 5
-	stereopanning 1
-	note C_, 5
-	note D_, 5
-	note C_, 1
-	note C_, 1
-	note C_, 1
-	note D_, 16
-	stereopanning 1
-	note C_, 5
-	note D_, 2
-	note C_, 1
-	note C_, 1
-	note C_, 1
+	unknownsfx0x20 4, 240, 1, 4
+	unknownsfx0x20 4, 0, 0, 0
+	unknownsfx0x20 15, 240, 1, 4
+	unknownsfx0x20 1, 0, 0, 0
 	endchannel
 ; 0x8649
--- a/music/sfx/sfx_02_52.asm
+++ b/music/sfx/sfx_02_52.asm
@ -1,11 +1,7 @@
 SFX_02_52_Ch1: ; 8649 (2:4649)
 	duty 0
-	note C#, 1
-	note C#, 8
-	note D_, 16
-	notetype 2, 0, 0
-	note C_, 8
-	note C#, 1
-	note C_, 9
+	unknownsfx0x10 23
+	unknownsfx0x20 15, 210, 0, 7
+	unknownsfx0x10 8
 	endchannel
 ; 0x8654
--- a/music/sfx/sfx_02_53.asm
+++ b/music/sfx/sfx_02_53.asm
@ -1,27 +1,11 @@
 SFX_02_53_Ch1: ; 8654 (2:4654)
-	note D_, 5
-	note A#, 3
-	note D_, 4
-	note D_, 9
-	unknownmusic0xf1
-	note D#, 5
-	note D_, 16
-	note C_, 1
-	note C_, 1
-	note D_, 3
-	unknownmusic0xf7
-	note D_, 5
-	note D_, 3
-	unknownmusic0xf7
-	note D#, 5
-	note D_, 5
-	unknownmusic0xf7
-	note E_, 5
-	note D_, 9
-	unknownmusic0xf4
-	note F_, 6
-	note D_, 9
-	unknownmusic0xf1
-	note E_, 5
+	unknownnoise0x20 4, 162, 35
+	unknownnoise0x20 8, 241, 52
+	unknownnoise0x20 15, 0, 0
+	unknownnoise0x20 2, 247, 36
+	unknownnoise0x20 2, 247, 52
+	unknownnoise0x20 4, 247, 68
+	unknownnoise0x20 8, 244, 85
+	unknownnoise0x20 8, 241, 68
 	endchannel
 ; 0x866d
--- a/music/sfx/sfx_02_54.asm
+++ b/music/sfx/sfx_02_54.asm
@ -1,55 +1,23 @@
 SFX_02_54_Ch1: ; 866d (2:466d)
 	duty 2
-	note D_, 16
-	stereopanning 0
-	note C_, 6
-	note D_, 5
-	note C_, 1
-	note C_, 1
-	note C_, 1
-	note D_, 16
-	stereopanning 0
-	note C_, 6
-	note D_, 16
-	stereopanning 0
-	note C_, 6
-	note D_, 16
-	stereopanning 0
-	note C_, 6
-	note D_, 16
-	stereopanning 0
-	note C_, 6
-	note D_, 16
-	unknownmusic0xf2
-	note C_, 1
-	note C_, 6
+	unknownsfx0x20 15, 240, 0, 5
+	unknownsfx0x20 4, 0, 0, 0
+	unknownsfx0x20 15, 240, 0, 5
+	unknownsfx0x20 15, 240, 0, 5
+	unknownsfx0x20 15, 240, 0, 5
+	unknownsfx0x20 15, 240, 0, 5
+	unknownsfx0x20 15, 242, 0, 5
 	endchannel


 SFX_02_54_Ch2: ; 868c (2:468c)
 	duty 3
-	note D_, 16
-	stereopanning 130
-	note C_, 5
-	note D_, 5
-	note C_, 1
-	note C_, 1
-	note C_, 1
-	note D_, 16
-	stereopanning 130
-	note C_, 5
-	note D_, 16
-	stereopanning 130
-	note C_, 5
-	note D_, 16
-	stereopanning 130
-	note C_, 5
-	note D_, 16
-	stereopanning 130
-	note C_, 5
-	note D_, 16
-	unknownmusic0xf2
-	note G#, 3
-	note C_, 5
+	unknownsfx0x20 15, 240, 130, 4
+	unknownsfx0x20 4, 0, 0, 0
+	unknownsfx0x20 15, 240, 130, 4
+	unknownsfx0x20 15, 240, 130, 4
+	unknownsfx0x20 15, 240, 130, 4
+	unknownsfx0x20 15, 240, 130, 4
+	unknownsfx0x20 15, 242, 130, 4
 	endchannel
 ; 0x86ab
--- a/music/sfx/sfx_02_55.asm
+++ b/music/sfx/sfx_02_55.asm
@ -1,30 +1,13 @@
 SFX_02_55_Ch1: ; 86ab (2:46ab)
 	duty 1
-	note C#, 1
-	note D#, 11
-	note D_, 5
-	unknownmusic0xf2
-	note C_, 1
-	note C_, 6
-	note C#, 1
-	note D_, 3
-	note D_, 5
-	octave 6
-	note C_, 1
-	note C_, 6
-	note C#, 1
-	note D#, 11
-	note D_, 5
-	unknownmusic0xf2
-	note C_, 1
-	note C_, 8
-	note C#, 1
-	note D_, 3
-	note D_, 16
-	octave 6
-	note C_, 1
-	note C_, 8
-	note C#, 1
-	note C_, 9
+	unknownsfx0x10 58
+	unknownsfx0x20 4, 242, 0, 5
+	unknownsfx0x10 34
+	unknownsfx0x20 4, 226, 0, 5
+	unknownsfx0x10 58
+	unknownsfx0x20 4, 242, 0, 7
+	unknownsfx0x10 34
+	unknownsfx0x20 15, 226, 0, 7
+	unknownsfx0x10 8
 	endchannel
 ; 0x86c8
--- a/music/sfx/sfx_02_56.asm
+++ b/music/sfx/sfx_02_56.asm
@ -1,18 +1,8 @@
 SFX_02_56_Ch1: ; 83e1 (2:43e1)
-	note D_, 3
-	unknownmusic0xf7
-	note D_, 5
-	note D_, 3
-	unknownmusic0xf7
-	note D#, 5
-	note D_, 5
-	unknownmusic0xf7
-	note E_, 5
-	note D_, 9
-	unknownmusic0xf4
-	note F_, 6
-	note D_, 9
-	unknownmusic0xf1
-	note E_, 5
+	unknownnoise0x20 2, 247, 36
+	unknownnoise0x20 2, 247, 52
+	unknownnoise0x20 4, 247, 68
+	unknownnoise0x20 8, 244, 85
+	unknownnoise0x20 8, 241, 68
 	endchannel
 ; 0x83f1
--- a/music/sfx/sfx_02_57.asm
+++ b/music/sfx/sfx_02_57.asm
@ -1,8 +1,5 @@
 SFX_02_57_Ch1: ; 83f1 (2:43f1)
-	note D_, 10
-	unknownmusic0xf1
-	note E_, 5
-	note D_, 9
-	notetype 1, 4, 3
+	unknownnoise0x20 9, 241, 68
+	unknownnoise0x20 8, 209, 67
 	endchannel
 ; 0x83f8
--- a/music/sfx/sfx_02_58.asm
+++ b/music/sfx/sfx_02_58.asm
@ -1,21 +1,12 @@
 SFX_02_58_Ch1: ; 83f8 (2:43f8)
 	duty 2
-	note D_, 9
-	octave 7
-	note E_, 1
-	note C_, 8
+	unknownsfx0x20 8, 225, 64, 7
 	endchannel


 SFX_02_58_Ch2: ; 83ff (2:43ff)
 	duty 2
-	note D_, 3
-	note C_, 9
-	note C_, 1
-	note C_, 1
-	note D_, 9
-	note B_, 2
-	note E_, 2
-	note C_, 8
+	unknownsfx0x20 2, 8, 0, 0
+	unknownsfx0x20 8, 177, 65, 7
 	endchannel
 ; 0x840a
--- a/music/sfx/sfx_02_59.asm
+++ b/music/sfx/sfx_02_59.asm
@ -1,21 +1,12 @@
 SFX_02_59_Ch1: ; 841b (2:441b)
 	duty 2
-	note D_, 5
-	unknownmusic0xf1
-	note G#, 1
-	note C_, 8
+	unknownsfx0x20 4, 241, 128, 7
 	endchannel


 SFX_02_59_Ch2: ; 8422 (2:4422)
 	duty 2
-	note D_, 2
-	note C_, 9
-	note C_, 1
-	note C_, 1
-	note D_, 5
-	note A#, 2
-	note F#, 2
-	note C_, 8
+	unknownsfx0x20 1, 8, 0, 0
+	unknownsfx0x20 4, 161, 97, 7
 	endchannel
 ; 0x842d
--- a/music/sfx/sfx_02_5a.asm
+++ b/music/sfx/sfx_02_5a.asm
@ -1,29 +1,14 @@
 SFX_02_5a_Ch1: ; 842d (2:442d)
 	duty 2
-	note D_, 5
-	octave 7
-	note C_, 1
-	note C_, 8
-	note D_, 9
-	unknownmusic0xf2
-	octave 8
-	note C_, 8
+	unknownsfx0x20 4, 225, 0, 7
+	unknownsfx0x20 8, 242, 224, 7
 	endchannel


 SFX_02_5a_Ch2: ; 8438 (2:4438)
 	duty 2
-	note D_, 2
-	note C_, 9
-	note C_, 1
-	note C_, 1
-	note D_, 5
-	note A_, 2
-	rest 2
-	note C_, 7
-	note D_, 9
-	note A#, 3
-	note A#, 2
-	note C_, 8
+	unknownsfx0x20 1, 8, 0, 0
+	unknownsfx0x20 4, 145, 193, 6
+	unknownsfx0x20 8, 162, 161, 7
 	endchannel
 ; 0x8447
--- a/music/sfx/sfx_02_5b.asm
+++ b/music/sfx/sfx_02_5b.asm
@ -1,12 +1,7 @@
 SFX_02_5b_Ch1: ; 8447 (2:4447)
 	duty 2
-	note C#, 1
-	note F_, 11
-	note D_, 16
-	unknownmusic0xf1
-	note C_, 1
-	note C_, 4
-	note C#, 1
-	note C_, 9
+	unknownsfx0x10 90
+	unknownsfx0x20 15, 241, 0, 3
+	unknownsfx0x10 8
 	endchannel
 ; 0x8452
--- a/music/sfx/sfx_02_5c.asm
+++ b/music/sfx/sfx_02_5c.asm
@ -1,18 +1,8 @@
 SFX_02_5c_Ch1: ; 8452 (2:4452)
-	note D_, 3
-	unknownmusic0xf1
-	note F_, 5
-	note D_, 13
-	note G_, 2
-	note D_, 4
-	note D_, 3
-	note B_, 2
-	note F_, 5
-	note D_, 13
-	note F#, 2
-	note D_, 4
-	note D_, 7
-	note E_, 2
-	note F_, 5
+	unknownnoise0x20 2, 241, 84
+	unknownnoise0x20 12, 113, 35
+	unknownnoise0x20 2, 177, 84
+	unknownnoise0x20 12, 97, 35
+	unknownnoise0x20 6, 65, 84
 	endchannel
 ; 0x8462
--- a/music/sfx/sfx_02_5d.asm
+++ b/music/sfx/sfx_02_5d.asm
@ -1,67 +1,24 @@
 SFX_02_5d_Ch1: ; 8475 (2:4475)
 	duty 2
-	note D_, 5
-	unknownmusic0xf4
-	note C_, 1
-	note C_, 8
-	note D_, 3
-	octave 4
-	note C_, 1
-	note C_, 7
-	note D_, 3
-	octave 4
-	note G#, 1
-	note C_, 7
-	note D_, 3
-	octave 4
-	rest 1
-	note C_, 7
-	note D_, 3
-	octave 4
-	note C_, 1
-	note C_, 8
-	note D_, 3
-	octave 4
-	note A#, 1
-	note C_, 8
-	note D_, 16
-	unknownmusic0xf2
-	octave 8
-	note C_, 8
+	unknownsfx0x20 4, 244, 0, 7
+	unknownsfx0x20 2, 228, 0, 6
+	unknownsfx0x20 2, 228, 128, 6
+	unknownsfx0x20 2, 228, 192, 6
+	unknownsfx0x20 2, 228, 0, 7
+	unknownsfx0x20 2, 228, 160, 7
+	unknownsfx0x20 15, 242, 224, 7
 	endchannel


 SFX_02_5d_Ch2: ; 8494 (2:4494)
 	duty 2
-	note D_, 5
-	note C_, 9
-	note C_, 1
-	note C_, 1
-	note D_, 3
-	notetype 4, 0, 1
-	note C_, 8
-	note D_, 3
-	rest 5
-	note C_, 2
-	note C_, 7
-	note D_, 3
-	rest 5
-	note G#, 2
-	note C_, 7
-	note D_, 3
-	rest 5
-	rest 2
-	note C_, 7
-	note D_, 3
-	rest 5
-	note C_, 2
-	note C_, 8
-	note D_, 3
-	rest 5
-	note A#, 2
-	note C_, 8
-	note D_, 16
-	notetype 2, 14, 1
-	note C_, 8
+	unknownsfx0x20 4, 8, 0, 0
+	unknownsfx0x20 2, 212, 1, 7
+	unknownsfx0x20 2, 196, 1, 6
+	unknownsfx0x20 2, 196, 129, 6
+	unknownsfx0x20 2, 196, 193, 6
+	unknownsfx0x20 2, 196, 1, 7
+	unknownsfx0x20 2, 196, 161, 7
+	unknownsfx0x20 15, 210, 225, 7
 	endchannel
 ; 0x84b7
--- a/music/sfx/sfx_02_5e.asm
+++ b/music/sfx/sfx_02_5e.asm
@ -8,12 +8,9 @@ SFX_02_5e_Ch1: ; 83ca (2:43ca)
 	note A_, 2
 	note G_, 2
 	octave 6
-	note C_, 4
-	note C_, 2
-	note D_, 2
-	note C_, 2
-	octave 5
-	note G_, 2
+	db $03
+	db $01
+	unknownsfx0x20 1, 1, 227, 113
 	note A_, 2
 	note F_, 2
 	note G_, 8
--- a/music/sfx/sfx_02_5f.asm
+++ b/music/sfx/sfx_02_5f.asm
@ -1,28 +1,10 @@
 SFX_02_5f_Ch1: ; 86c8 (2:46c8)
 	duty 2
-	note D_, 16
-	unknownmusic0xf3
-	note D#, 1
-	note C_, 8
-	note D_, 9
-	note F#, 6
-	note D#, 1
-	note C_, 8
-	note D_, 16
-	unknownmusic0xf4
-	note C_, 1
-	note C_, 8
-	note D_, 16
-	note G_, 5
-	note C_, 1
-	note C_, 8
-	note D_, 16
-	note E_, 5
-	note C_, 1
-	note C_, 8
-	note D_, 16
-	note D_, 5
-	note C_, 1
-	note C_, 8
+	unknownsfx0x20 15, 243, 48, 7
+	unknownsfx0x20 8, 101, 48, 7
+	unknownsfx0x20 15, 244, 0, 7
+	unknownsfx0x20 15, 116, 0, 7
+	unknownsfx0x20 15, 68, 0, 7
+	unknownsfx0x20 15, 36, 0, 7
 	endchannel
 ; 0x86e3
--- a/music/sfx/sfx_08_01.asm
+++ b/music/sfx/sfx_08_01.asm
@ -1,6 +1,4 @@
 SFX_08_01_Ch1: ; 202fd (8:42fd)
-	note D_, 1
-	rest 2
-	note D#, 4
+	unknownnoise0x20 0, 193, 51
 	endchannel
 ; 0x20301
--- a/music/sfx/sfx_08_02.asm
+++ b/music/sfx/sfx_08_02.asm
@ -1,6 +1,4 @@
 SFX_08_02_Ch1: ; 20301 (8:4301)
-	note D_, 1
-	note B_, 2
-	note D#, 4
+	unknownnoise0x20 0, 177, 51
 	endchannel
 ; 0x20305
--- a/music/sfx/sfx_08_03.asm
+++ b/music/sfx/sfx_08_03.asm
@ -1,6 +1,4 @@
 SFX_08_03_Ch1: ; 20305 (8:4305)
-	note D_, 1
-	note A#, 2
-	note D#, 4
+	unknownnoise0x20 0, 161, 51
 	endchannel
 ; 0x20309
--- a/music/sfx/sfx_08_04.asm
+++ b/music/sfx/sfx_08_04.asm
@ -1,6 +1,4 @@
 SFX_08_04_Ch1: ; 20309 (8:4309)
-	note D_, 1
-	note G#, 2
-	note D#, 4
+	unknownnoise0x20 0, 129, 51
 	endchannel
 ; 0x2030d
--- a/music/sfx/sfx_08_05.asm
+++ b/music/sfx/sfx_08_05.asm
@ -1,21 +1,9 @@
 SFX_08_05_Ch1: ; 2030d (8:430d)
-	note D_, 8
-	note G#, 5
-	note D#, 8
-	note D_, 7
-	note G#, 5
-	note D#, 7
-	note D_, 6
-	note G#, 4
-	note D#, 6
-	note D_, 5
-	note G#, 4
-	note D#, 5
-	note D_, 4
-	note G#, 3
-	note D#, 4
-	note D_, 3
-	note G#, 2
-	note D#, 3
+	unknownnoise0x20 7, 132, 55
+	unknownnoise0x20 6, 132, 54
+	unknownnoise0x20 5, 131, 53
+	unknownnoise0x20 4, 131, 52
+	unknownnoise0x20 3, 130, 51
+	unknownnoise0x20 2, 129, 50
 	endchannel
 ; 0x20320
--- a/Show more
+++ b/Show more