More bank 2 music engine and music/sfx format update

music/sfx/sfx_1f_1e.asm

@@ -1,94 +1,36 @@
 SFX_1f_1e_Ch1: ; 7cc3f (1f:4c3f)
 	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_1f_1e_Ch2: ; 7cc5e (1f:4c5e)
 	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_1f_1e_Ch3: ; 7cc81 (1f:4c81)
-	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
 ; 0x7cc9a