More bank 2 music engine and music/sfx format update

music/sfx/sfx_1f_21.asm

@@ -1,106 +1,41 @@
 SFX_1f_21_Ch1: ; 7cb9f (1f:4b9f)
 	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_1f_21_Ch1
 	endchannel
 
 
 SFX_1f_21_Ch2: ; 7cbbe (1f:4bbe)
 	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_1f_21_Ch3: ; 7cbed (1f:4bed)
-	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
 ; 0x7cc0c