ref: 7059bb15f3c7b1ba0f589126ae71fdca55c4a993
parent: d47cdd6e159066fa71a0ca2a0571b10547834159
author: U-Fish-PC\Daniel <corrnondacqb@yahoo.com>
date: Mon Oct 21 22:13:16 EDT 2013
Fix blue and yellow music
--- a/constants.asm
+++ b/constants.asm
@@ -3499,10 +3499,6 @@
db \1
ENDM
-unknownmusic0xef: MACRO
- db $EF
-ENDM
-
stereopanning: MACRO
db $F0
db \1
--- a/main.asm
+++ b/main.asm
@@ -19000,7 +19000,8 @@
call GetNextMusicByte ; yes
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_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,22 +19108,24 @@
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
@@ -19129,8 +19132,8 @@
ld a, d
and $f0
cp $b0 ; is this command a dnote?
- jr z, Music_dnote
- jr nc, Music_notelength
+ jr z, Music_dnote ; yes
+ jr nc, Music_notelength ; no
swap a
ld b, a
ld a, d
@@ -19178,18 +19181,18 @@
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
--- a/music/blue/sfx_1f_5d.asm
+++ b/music/blue/sfx_1f_5d.asm
@@ -1,52 +1,20 @@
SFX_1f_5d_Ch1: ; 7c45e (1f:445e)
duty 2
- note D_, 4
- octave 4
- note C_, 1
- note C_, 7
- note D_, 4
- 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
+ unknownsfx0x20 3, 228, 0, 6
+ unknownsfx0x20 3, 228, 128, 6
+ unknownsfx0x20 3, 228, 192, 6
+ unknownsfx0x20 3, 228, 0, 7
+ unknownsfx0x20 15, 242, 224, 7
endchannel
SFX_1f_5d_Ch2: ; 7c475 (1f:4475)
duty 2
- note D_, 4
- note C_, 9
- note C_, 1
- note C_, 1
- note D_, 4
- rest 5
- 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
+ unknownsfx0x20 3, 8, 0, 0
+ unknownsfx0x20 3, 196, 1, 6
+ unknownsfx0x20 3, 196, 129, 6
+ unknownsfx0x20 3, 196, 193, 6
+ unknownsfx0x20 3, 196, 1, 7
+ unknownsfx0x20 15, 210, 225, 7
endchannel
; 0x7c490
\ No newline at end of file
--- a/music/yellow/intro.asm
+++ /dev/null
@@ -1,485 +1,0 @@
-Music_IntroBattle_Ch1: ; 7f65c (1f:765c)
- tempo 0, 116
- stereopanning 119
- duty 3
- vibrato 8, 1, 4
- notetype 12, 11, 2
- octave 3
- note G#, 2
- note B_, 4
- note B_, 4
- note B_, 4
- note B_, 4
- note B_, 4
- note B_, 3
- note A#, 1
- note B_, 2
- note B_, 10
- notetype 12, 11, 6
- octave 4
- note C#, 1
- note C_, 1
- note C#, 10
- octave 3
- note G#, 1
- note G_, 1
- note G#, 4
- note B_, 4
- octave 4
- note E_, 4
- note F#, 8
- note E_, 8
- octave 3
- note A_, 4
- note B_, 4
- octave 4
- note C#, 4
- octave 3
- note B_, 4
- note G#, 6
- notetype 12, 11, 2
- note B_, 2
- notetype 12, 11, 6
- note G#, 6
- notetype 12, 11, 2
- note B_, 2
- notetype 12, 11, 6
- octave 4
- note E_, 6
- notetype 12, 11, 2
- note G#, 2
- notetype 12, 11, 6
- note E_, 6
- notetype 12, 11, 2
- note G#, 2
- notetype 12, 11, 6
- octave 3
- note A_, 4
- note F#, 4
- note A_, 4
- note B_, 4
- note F#, 4
- note G#, 4
- note A_, 2
- note G#, 2
- note F#, 2
- note D#, 2
- notetype 12, 11, 3
- note B_, 2
- octave 4
- note E_, 4
- note E_, 4
- note E_, 4
- note E_, 2
- note C#, 2
- note F#, 4
- note F#, 3
- note D#, 1
- note F#, 2
- note F#, 8
- notetype 12, 11, 6
- note F#, 1
- note F_, 1
- note F#, 8
- octave 3
- note B_, 1
- note A#, 1
- note B_, 8
- octave 4
- note F#, 1
- note F_, 1
- note F#, 2
- notetype 12, 11, 3
- note F#, 1
- note E_, 1
- note D#, 1
- note C#, 1
- notetype 12, 11, 2
- octave 3
- note B_, 16
- endchannel
-
-
-Music_IntroBattle_Ch2: ; 7f6d3 (1f:76d3)
- duty 2
- vibrato 6, 1, 5
- notetype 12, 12, 2
- octave 3
- note B_, 2
- octave 4
- note E_, 4
- note E_, 4
- note E_, 4
- note E_, 4
- note E_, 4
- note E_, 3
- note D#, 1
- note E_, 2
- note E_, 4
- notetype 12, 12, 5
- note G#, 1
- note G_, 1
- note G#, 10
- octave 3
- note B_, 1
- note A#, 1
- note B_, 6
- notetype 12, 12, 7
- octave 4
- note E_, 4
- note G#, 4
- note B_, 4
- octave 5
- note C#, 16
- octave 4
- note A_, 4
- note G#, 4
- note F#, 4
- note E_, 4
- octave 3
- note B_, 6
- notetype 12, 12, 2
- octave 4
- note E_, 2
- notetype 12, 12, 7
- octave 3
- note B_, 6
- notetype 12, 12, 2
- octave 4
- note E_, 2
- notetype 12, 12, 7
- note G#, 6
- notetype 12, 12, 2
- note B_, 2
- notetype 12, 12, 7
- note G#, 6
- notetype 12, 12, 2
- note B_, 2
- notetype 12, 12, 7
- note C#, 4
- octave 3
- note A_, 4
- octave 4
- note C#, 4
- note D#, 4
- note E_, 2
- note D#, 2
- note C#, 2
- note D#, 4
- note D#, 2
- note C#, 2
- octave 3
- note B_, 2
- notetype 12, 12, 3
- octave 4
- note E_, 2
- note G#, 4
- note G#, 4
- note G#, 4
- note G#, 2
- note F#, 2
- note A_, 4
- note A_, 3
- note F#, 1
- note A_, 2
- note A_, 4
- notetype 12, 12, 7
- note B_, 1
- note A#, 1
- note B_, 8
- note B_, 1
- note A#, 1
- note B_, 8
- note B_, 1
- note A#, 1
- note B_, 6
- notetype 12, 12, 3
- note B_, 1
- note A_, 1
- note G#, 1
- note F#, 1
- notetype 12, 12, 2
- note E_, 16
- endchannel
-
-
-Music_IntroBattle_Ch3: ; 7f749 (1f:7749)
- notetype 12, 1, 0
- octave 4
- note E_, 1
- rest 1
- note G#, 1
- rest 1
- octave 3
- note B_, 1
- rest 1
- octave 4
- note G#, 1
- rest 1
- note E_, 1
- rest 1
- note G#, 1
- rest 1
- octave 3
- note B_, 1
- rest 1
- octave 4
- note G#, 1
- rest 1
- note E_, 1
- rest 1
- note G#, 1
- rest 1
- octave 3
- note B_, 1
- rest 1
- octave 4
- note G#, 1
- rest 1
- note E_, 1
- rest 1
- octave 3
- note B_, 1
- rest 1
- octave 4
- note C#, 1
- rest 1
- note D#, 1
- rest 1
- note G#, 1
- rest 1
- note B_, 1
- rest 1
- note E_, 1
- rest 1
- note B_, 1
- rest 1
- note G#, 1
- rest 1
- note B_, 1
- rest 1
- note E_, 1
- rest 1
- note B_, 1
- rest 1
- note G#, 1
- rest 1
- note B_, 1
- rest 1
- note E_, 1
- rest 1
- note B_, 1
- rest 1
- note G#, 1
- rest 1
- note B_, 1
- rest 1
- note E_, 1
- rest 1
- note B_, 1
- rest 1
- note F#, 1
- rest 1
- note A_, 1
- rest 1
- note C#, 1
- rest 1
- note A_, 1
- rest 1
- note F#, 1
- rest 1
- note A_, 1
- rest 1
- note C#, 1
- rest 1
- note A_, 1
- rest 1
- note A_, 1
- rest 1
- octave 5
- note C#, 1
- rest 1
- octave 4
- note F#, 1
- rest 1
- octave 5
- note C#, 1
- rest 1
- octave 4
- note A_, 1
- rest 1
- octave 5
- note C#, 1
- rest 1
- octave 4
- note F#, 1
- rest 1
- octave 5
- note C#, 1
- rest 1
- octave 4
- note B_, 1
- rest 1
- octave 5
- note E_, 1
- rest 1
- octave 4
- note G#, 1
- rest 1
- octave 5
- note E_, 1
- rest 1
- octave 4
- note B_, 1
- rest 1
- octave 5
- note E_, 1
- rest 1
- octave 4
- note G#, 1
- rest 1
- octave 5
- note E_, 1
- rest 1
- octave 4
- note G#, 1
- rest 1
- note B_, 1
- rest 1
- note E_, 1
- rest 1
- note B_, 1
- rest 1
- note G#, 1
- rest 1
- note E_, 1
- rest 1
- note G#, 1
- rest 1
- note B_, 1
- rest 1
- note A_, 1
- rest 1
- octave 5
- note C#, 1
- rest 1
- octave 4
- note F#, 1
- rest 1
- octave 5
- note C#, 1
- rest 1
- octave 4
- note A_, 1
- rest 1
- octave 5
- note C#, 1
- rest 1
- octave 4
- note F#, 1
- rest 1
- octave 5
- note C#, 1
- rest 1
- octave 4
- note A_, 1
- rest 1
- octave 5
- note C#, 1
- rest 1
- octave 4
- note F#, 1
- rest 1
- octave 5
- note C#, 1
- rest 1
- octave 4
- note A_, 1
- rest 1
- octave 5
- note C#, 1
- rest 1
- octave 4
- note B_, 1
- rest 1
- note A_, 1
- rest 1
- note G#, 1
- rest 1
- note B_, 1
- rest 1
- note E_, 1
- rest 1
- note B_, 1
- rest 1
- note G#, 1
- rest 1
- note B_, 1
- rest 1
- note E_, 1
- rest 1
- note B_, 1
- rest 1
- note G#, 1
- rest 1
- note B_, 1
- rest 1
- note E_, 1
- rest 1
- note B_, 1
- rest 1
- note G#, 1
- rest 1
- note B_, 1
- rest 1
- note E_, 1
- rest 1
- note B_, 1
- rest 1
- note A_, 1
- rest 1
- octave 5
- note E_, 1
- rest 1
- octave 4
- note E_, 1
- rest 1
- octave 5
- note E_, 1
- rest 1
- octave 4
- note A_, 1
- rest 1
- octave 5
- note E_, 1
- rest 1
- octave 4
- note E_, 1
- rest 1
- octave 5
- note E_, 1
- rest 1
- octave 4
- note A_, 1
- rest 1
- octave 5
- note F#, 1
- rest 1
- octave 4
- note F#, 1
- rest 1
- octave 5
- note C#, 1
- rest 3
- note F#, 1
- rest 1
- octave 4
- note F#, 1
- note G#, 1
- note A_, 1
- octave 5
- note C#, 1
- note E_, 1
- rest 15
- endchannel
-; 0x7f860
\ No newline at end of file
--- /dev/null
+++ b/music/yellow/yellowintro.asm
@@ -1,0 +1,485 @@
+Music_YellowIntro_Ch1: ; 7f65c (1f:765c)
+ tempo 0, 116
+ stereopanning 119
+ duty 3
+ vibrato 8, 1, 4
+ notetype 12, 11, 2
+ octave 3
+ note G#, 2
+ note B_, 4
+ note B_, 4
+ note B_, 4
+ note B_, 4
+ note B_, 4
+ note B_, 3
+ note A#, 1
+ note B_, 2
+ note B_, 10
+ notetype 12, 11, 6
+ octave 4
+ note C#, 1
+ note C_, 1
+ note C#, 10
+ octave 3
+ note G#, 1
+ note G_, 1
+ note G#, 4
+ note B_, 4
+ octave 4
+ note E_, 4
+ note F#, 8
+ note E_, 8
+ octave 3
+ note A_, 4
+ note B_, 4
+ octave 4
+ note C#, 4
+ octave 3
+ note B_, 4
+ note G#, 6
+ notetype 12, 11, 2
+ note B_, 2
+ notetype 12, 11, 6
+ note G#, 6
+ notetype 12, 11, 2
+ note B_, 2
+ notetype 12, 11, 6
+ octave 4
+ note E_, 6
+ notetype 12, 11, 2
+ note G#, 2
+ notetype 12, 11, 6
+ note E_, 6
+ notetype 12, 11, 2
+ note G#, 2
+ notetype 12, 11, 6
+ octave 3
+ note A_, 4
+ note F#, 4
+ note A_, 4
+ note B_, 4
+ note F#, 4
+ note G#, 4
+ note A_, 2
+ note G#, 2
+ note F#, 2
+ note D#, 2
+ notetype 12, 11, 3
+ note B_, 2
+ octave 4
+ note E_, 4
+ note E_, 4
+ note E_, 4
+ note E_, 2
+ note C#, 2
+ note F#, 4
+ note F#, 3
+ note D#, 1
+ note F#, 2
+ note F#, 8
+ notetype 12, 11, 6
+ note F#, 1
+ note F_, 1
+ note F#, 8
+ octave 3
+ note B_, 1
+ note A#, 1
+ note B_, 8
+ octave 4
+ note F#, 1
+ note F_, 1
+ note F#, 2
+ notetype 12, 11, 3
+ note F#, 1
+ note E_, 1
+ note D#, 1
+ note C#, 1
+ notetype 12, 11, 2
+ octave 3
+ note B_, 16
+ endchannel
+
+
+Music_YellowIntro_Ch2: ; 7f6d3 (1f:76d3)
+ duty 2
+ vibrato 6, 1, 5
+ notetype 12, 12, 2
+ octave 3
+ note B_, 2
+ octave 4
+ note E_, 4
+ note E_, 4
+ note E_, 4
+ note E_, 4
+ note E_, 4
+ note E_, 3
+ note D#, 1
+ note E_, 2
+ note E_, 4
+ notetype 12, 12, 5
+ note G#, 1
+ note G_, 1
+ note G#, 10
+ octave 3
+ note B_, 1
+ note A#, 1
+ note B_, 6
+ notetype 12, 12, 7
+ octave 4
+ note E_, 4
+ note G#, 4
+ note B_, 4
+ octave 5
+ note C#, 16
+ octave 4
+ note A_, 4
+ note G#, 4
+ note F#, 4
+ note E_, 4
+ octave 3
+ note B_, 6
+ notetype 12, 12, 2
+ octave 4
+ note E_, 2
+ notetype 12, 12, 7
+ octave 3
+ note B_, 6
+ notetype 12, 12, 2
+ octave 4
+ note E_, 2
+ notetype 12, 12, 7
+ note G#, 6
+ notetype 12, 12, 2
+ note B_, 2
+ notetype 12, 12, 7
+ note G#, 6
+ notetype 12, 12, 2
+ note B_, 2
+ notetype 12, 12, 7
+ note C#, 4
+ octave 3
+ note A_, 4
+ octave 4
+ note C#, 4
+ note D#, 4
+ note E_, 2
+ note D#, 2
+ note C#, 2
+ note D#, 4
+ note D#, 2
+ note C#, 2
+ octave 3
+ note B_, 2
+ notetype 12, 12, 3
+ octave 4
+ note E_, 2
+ note G#, 4
+ note G#, 4
+ note G#, 4
+ note G#, 2
+ note F#, 2
+ note A_, 4
+ note A_, 3
+ note F#, 1
+ note A_, 2
+ note A_, 4
+ notetype 12, 12, 7
+ note B_, 1
+ note A#, 1
+ note B_, 8
+ note B_, 1
+ note A#, 1
+ note B_, 8
+ note B_, 1
+ note A#, 1
+ note B_, 6
+ notetype 12, 12, 3
+ note B_, 1
+ note A_, 1
+ note G#, 1
+ note F#, 1
+ notetype 12, 12, 2
+ note E_, 16
+ endchannel
+
+
+Music_YellowIntro_Ch3: ; 7f749 (1f:7749)
+ notetype 12, 1, 0
+ octave 4
+ note E_, 1
+ rest 1
+ note G#, 1
+ rest 1
+ octave 3
+ note B_, 1
+ rest 1
+ octave 4
+ note G#, 1
+ rest 1
+ note E_, 1
+ rest 1
+ note G#, 1
+ rest 1
+ octave 3
+ note B_, 1
+ rest 1
+ octave 4
+ note G#, 1
+ rest 1
+ note E_, 1
+ rest 1
+ note G#, 1
+ rest 1
+ octave 3
+ note B_, 1
+ rest 1
+ octave 4
+ note G#, 1
+ rest 1
+ note E_, 1
+ rest 1
+ octave 3
+ note B_, 1
+ rest 1
+ octave 4
+ note C#, 1
+ rest 1
+ note D#, 1
+ rest 1
+ note G#, 1
+ rest 1
+ note B_, 1
+ rest 1
+ note E_, 1
+ rest 1
+ note B_, 1
+ rest 1
+ note G#, 1
+ rest 1
+ note B_, 1
+ rest 1
+ note E_, 1
+ rest 1
+ note B_, 1
+ rest 1
+ note G#, 1
+ rest 1
+ note B_, 1
+ rest 1
+ note E_, 1
+ rest 1
+ note B_, 1
+ rest 1
+ note G#, 1
+ rest 1
+ note B_, 1
+ rest 1
+ note E_, 1
+ rest 1
+ note B_, 1
+ rest 1
+ note F#, 1
+ rest 1
+ note A_, 1
+ rest 1
+ note C#, 1
+ rest 1
+ note A_, 1
+ rest 1
+ note F#, 1
+ rest 1
+ note A_, 1
+ rest 1
+ note C#, 1
+ rest 1
+ note A_, 1
+ rest 1
+ note A_, 1
+ rest 1
+ octave 5
+ note C#, 1
+ rest 1
+ octave 4
+ note F#, 1
+ rest 1
+ octave 5
+ note C#, 1
+ rest 1
+ octave 4
+ note A_, 1
+ rest 1
+ octave 5
+ note C#, 1
+ rest 1
+ octave 4
+ note F#, 1
+ rest 1
+ octave 5
+ note C#, 1
+ rest 1
+ octave 4
+ note B_, 1
+ rest 1
+ octave 5
+ note E_, 1
+ rest 1
+ octave 4
+ note G#, 1
+ rest 1
+ octave 5
+ note E_, 1
+ rest 1
+ octave 4
+ note B_, 1
+ rest 1
+ octave 5
+ note E_, 1
+ rest 1
+ octave 4
+ note G#, 1
+ rest 1
+ octave 5
+ note E_, 1
+ rest 1
+ octave 4
+ note G#, 1
+ rest 1
+ note B_, 1
+ rest 1
+ note E_, 1
+ rest 1
+ note B_, 1
+ rest 1
+ note G#, 1
+ rest 1
+ note E_, 1
+ rest 1
+ note G#, 1
+ rest 1
+ note B_, 1
+ rest 1
+ note A_, 1
+ rest 1
+ octave 5
+ note C#, 1
+ rest 1
+ octave 4
+ note F#, 1
+ rest 1
+ octave 5
+ note C#, 1
+ rest 1
+ octave 4
+ note A_, 1
+ rest 1
+ octave 5
+ note C#, 1
+ rest 1
+ octave 4
+ note F#, 1
+ rest 1
+ octave 5
+ note C#, 1
+ rest 1
+ octave 4
+ note A_, 1
+ rest 1
+ octave 5
+ note C#, 1
+ rest 1
+ octave 4
+ note F#, 1
+ rest 1
+ octave 5
+ note C#, 1
+ rest 1
+ octave 4
+ note A_, 1
+ rest 1
+ octave 5
+ note C#, 1
+ rest 1
+ octave 4
+ note B_, 1
+ rest 1
+ note A_, 1
+ rest 1
+ note G#, 1
+ rest 1
+ note B_, 1
+ rest 1
+ note E_, 1
+ rest 1
+ note B_, 1
+ rest 1
+ note G#, 1
+ rest 1
+ note B_, 1
+ rest 1
+ note E_, 1
+ rest 1
+ note B_, 1
+ rest 1
+ note G#, 1
+ rest 1
+ note B_, 1
+ rest 1
+ note E_, 1
+ rest 1
+ note B_, 1
+ rest 1
+ note G#, 1
+ rest 1
+ note B_, 1
+ rest 1
+ note E_, 1
+ rest 1
+ note B_, 1
+ rest 1
+ note A_, 1
+ rest 1
+ octave 5
+ note E_, 1
+ rest 1
+ octave 4
+ note E_, 1
+ rest 1
+ octave 5
+ note E_, 1
+ rest 1
+ octave 4
+ note A_, 1
+ rest 1
+ octave 5
+ note E_, 1
+ rest 1
+ octave 4
+ note E_, 1
+ rest 1
+ octave 5
+ note E_, 1
+ rest 1
+ octave 4
+ note A_, 1
+ rest 1
+ octave 5
+ note F#, 1
+ rest 1
+ octave 4
+ note F#, 1
+ rest 1
+ octave 5
+ note C#, 1
+ rest 3
+ note F#, 1
+ rest 1
+ octave 4
+ note F#, 1
+ note G#, 1
+ note A_, 1
+ octave 5
+ note C#, 1
+ note E_, 1
+ rest 15
+ endchannel
+; 0x7f860
\ No newline at end of file