Fix blue and yellow music

constants.asm

@@ -3499,10 +3499,6 @@ unknownmusic0xee: MACRO
 	db \1
 ENDM
 
-unknownmusic0xef: MACRO
-	db $EF
-ENDM
-
 stereopanning: MACRO
 	db $F0
 	db \1

main.asm

@@ -19001,6 +19001,7 @@ Music_unknownmusic0xee: ; 0x93fa
 	ld [$c004], a ; store first param
 	jp Music_endchannel
 
+; this appears to never be used
 Music_unknownmusic0xef ; 0x9407
 	cp $ef ; is this command an unknownmusic0xef?
 	jr nz, Music_dutycycle ; no
@@ -19065,15 +19066,15 @@ Music_octave: ; 0x945f
 
 Music_unknownsfx0x20: ; 0x9472
 	cp $20 ; is this command an unknownsfx0x20?
-	jr nz, .skip ; no
+	jr nz, Music_unknownsfx0x10 ; no
 	ld a, c
 	cp CH3 ; is this a noise or sfx channel?
-	jr c, .skip ; no
+	jr c, Music_unknownsfx0x10 ; no
 	ld b, $0
 	ld hl, $c036
 	add hl, bc
 	bit 0, [hl]
-	jr nz, .skip ; no
+	jr nz, Music_unknownsfx0x10 ; no
 	call Music_notelength ; yes
 	ld d, a
 	ld b, $0
@@ -19107,30 +19108,32 @@ Music_unknownsfx0x20: ; 0x9472
 	pop de
 	call Func_964b
 	ret
-.skip
+
+Music_unknownsfx0x10:
 	ld a, c
 	cp CH4
-	jr c, .asm_94db ; if not a sfx
+	jr c, Music_note ; if not a sfx
 	ld a, d
 	cp $10 ; is this command a unknownsfx0x10?
-	jr nz, .asm_94db ; no
+	jr nz, Music_note ; no
 	ld b, $0 ; yes
 	ld hl, $c036
 	add hl, bc
 	bit 0, [hl]
-	jr nz, .asm_94db ; no
+	jr nz, Music_note ; no
 	call GetNextMusicByte
 	ld [$ff00+$10], a
 	jp Music_endchannel
-.asm_94db
+
+Music_note:
 	ld a, c
 	cp CH3
 	jr nz, Music_notelength ; if not noise channel
 	ld a, d
 	and $f0
 	cp $b0 ; is this command a dnote?
-	jr z, Music_dnote
+	jr z, Music_dnote ; yes
-	jr nc, Music_notelength
+	jr nc, Music_notelength ; no
 	swap a
 	ld b, a
 	ld a, d
@@ -19178,18 +19181,18 @@ Music_notelength: ; 0x950a
 	ld d, a
 	ld a, [$c0e9]
 	ld e, a
-	jr .done
+	jr .skip
 .sfxChannel
 	ld d, $1
 	ld e, $0
 	cp CH7
-	jr z, .done ; if noise channel
+	jr z, .skip ; if noise channel
 	call Func_9693
 	ld a, [$c0ea]
 	ld d, a
 	ld a, [$c0eb]
 	ld e, a
-.done
+.skip
 	ld a, l
 	ld b, $0
 	ld hl, $c0ce

music/blue/sfx_1f_5d.asm

@@ -1,52 +1,20 @@
 SFX_1f_5d_Ch1: ; 7c45e (1f:445e)
 	duty 2
-	note D_, 4
+	unknownsfx0x20 3, 228, 0, 6
-	octave 4
+	unknownsfx0x20 3, 228, 128, 6
-	note C_, 1
+	unknownsfx0x20 3, 228, 192, 6
-	note C_, 7
+	unknownsfx0x20 3, 228, 0, 7
-	note D_, 4
+	unknownsfx0x20 15, 242, 224, 7
-	octave 4
-	note G#, 1
-	note C_, 7
-	note D_, 4
-	octave 4
-	rest 1
-	note C_, 7
-	note D_, 4
-	octave 4
-	note C_, 1
-	note C_, 8
-	note D_, 16
-	unknownmusic0xf2
-	octave 8
-	note C_, 8
 	endchannel
 
 
 SFX_1f_5d_Ch2: ; 7c475 (1f:4475)
 	duty 2
-	note D_, 4
+	unknownsfx0x20 3, 8, 0, 0
-	note C_, 9
+	unknownsfx0x20 3, 196, 1, 6
-	note C_, 1
+	unknownsfx0x20 3, 196, 129, 6
-	note C_, 1
+	unknownsfx0x20 3, 196, 193, 6
-	note D_, 4
+	unknownsfx0x20 3, 196, 1, 7
-	rest 5
+	unknownsfx0x20 15, 210, 225, 7
-	note C_, 2
-	note C_, 7
-	note D_, 4
-	rest 5
-	note G#, 2
-	note C_, 7
-	note D_, 4
-	rest 5
-	rest 2
-	note C_, 7
-	note D_, 4
-	rest 5
-	note C_, 2
-	note C_, 8
-	note D_, 16
-	notetype 2, 14, 1
-	note C_, 8
 	endchannel
 ; 0x7c490

music/yellow/yellowintro.asm

@@ -1,4 +1,4 @@
-Music_IntroBattle_Ch1: ; 7f65c (1f:765c)
+Music_YellowIntro_Ch1: ; 7f65c (1f:765c)
 	tempo 0, 116
 	stereopanning 119
 	duty 3
@@ -100,7 +100,7 @@ Music_IntroBattle_Ch1: ; 7f65c (1f:765c)
 	endchannel
 
 
-Music_IntroBattle_Ch2: ; 7f6d3 (1f:76d3)
+Music_YellowIntro_Ch2: ; 7f6d3 (1f:76d3)
 	duty 2
 	vibrato 6, 1, 5
 	notetype 12, 12, 2
@@ -203,7 +203,7 @@ Music_IntroBattle_Ch2: ; 7f6d3 (1f:76d3)
 	endchannel
 
 
-Music_IntroBattle_Ch3: ; 7f749 (1f:7749)
+Music_YellowIntro_Ch3: ; 7f749 (1f:7749)
 	notetype 12, 1, 0
 	octave 4
 	note E_, 1