More bank 2 music engine and music/sfx format update

music/sfx/sfx_1f_25.asm

@@ -1,87 +1,35 @@
 SFX_1f_25_Ch1: ; 7c888 (1f:4888)
 	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_1f_25_Ch2: ; 7c8a7 (1f:48a7)
 	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_1f_25_Ch3: ; 7c8ca (1f:48ca)
-	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
 ; 0x7c8e0