thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-11-12 00:04:48 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

More music engine labels

Browse source
This commit is contained in:
U-Fish-PC\Daniel 2013-10-18 16:28:58 -04:00
parent 4037c6a959
commit a336ddf0e5
1 changed files with 49 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

95
main.asm
View file

@ -18920,7 +18920,7 @@ Music_pitchbend: ; 0x936d
set 4, [hl] set 4, [hl]
call GetNextMusicByte call GetNextMusicByte
ld d, a ld d, a
jp Func_950a jp Music_notelength
Music_duty: ; 0x93a5 Music_duty: ; 0x93a5
cp $ec ; is this command a duty? cp $ec ; is this command a duty?
@ -19044,7 +19044,7 @@ Music_octave: ; 0x945f
add hl, bc add hl, bc
bit 0, [hl] bit 0, [hl]
jr nz, .asm_94bf ; 0x9483 $3a jr nz, .asm_94bf ; 0x9483 $3a
call Func_950a call Music_notelength
ld d, a ld d, a
ld b, $0 ld b, $0
ld hl, $c03e ld hl, $c03e
@ -19080,7 +19080,7 @@ Music_octave: ; 0x945f
.asm_94bf .asm_94bf
ld a, c ld a, c
cp $4 cp $4
jr c, .asm_94db ; 0x94c2 $17 jr c, .asm_94db ; if not a sfx
ld a, d ld a, d
cp $10 cp $10
jr nz, .asm_94db ; 0x94c7 $12 jr nz, .asm_94db ; 0x94c7 $12
@ -19095,12 +19095,12 @@ Music_octave: ; 0x945f
.asm_94db .asm_94db
ld a, c ld a, c
cp $3 cp $3
jr nz, Func_950a ; 0x94de $2a jr nz, Music_notelength ; if not channel 3
ld a, d ld a, d
and $f0 and $f0
cp $b0 cp $b0
jr z, .asm_94f5 ; 0x94e5 $e jr z, .asm_94f5 ; 0x94e5 $e
jr nc, Func_950a ; 0x94e7 $21 jr nc, Music_notelength ; 0x94e7 $21
swap a swap a
ld b, a ld b, a
ld a, d ld a, d
@ -19127,13 +19127,13 @@ Music_octave: ; 0x945f
pop bc pop bc
pop de pop de
Func_950a: ; 0x950a Music_notelength: ; 0x950a
ld a, d ld a, d
push af push af
and $f and $f
inc a inc a
ld b, $0 ld b, $0
ld e, a ld e, a ; store note length (in 16ths)
ld d, b ld d, b
ld hl, $c0c6 ld hl, $c0c6
add hl, bc add hl, bc
@ -19142,23 +19142,23 @@ Func_950a: ; 0x950a
call Func_9847 call Func_9847
ld a, c ld a, c
cp $4 cp $4
jr nc, .asm_952b ; 0x951f $a jr nc, .sfxChannel
ld a, [$c0e8] ld a, [$c0e8]
ld d, a ld d, a
ld a, [$c0e9] ld a, [$c0e9]
ld e, a ld e, a
jr .asm_953e ; 0x9529 $13 jr .done
.asm_952b .sfxChannel
ld d, $1 ld d, $1
ld e, $0 ld e, $0
cp $7 cp $7
jr z, .asm_953e ; 0x9531 $b jr z, .done ; if noise channel
call Func_9693 call Func_9693
ld a, [$c0ea] ld a, [$c0ea]
ld d, a ld d, a
ld a, [$c0eb] ld a, [$c0eb]
ld e, a ld e, a
.asm_953e .done
ld a, l ld a, l
ld b, $0 ld b, $0
ld hl, $c0ce ld hl, $c0ce
@ -19177,41 +19177,43 @@ Func_950a: ; 0x950a
ld hl, $c036 ld hl, $c036
add hl, bc add hl, bc
bit 0, [hl] bit 0, [hl]
jr nz, .asm_9568 ; 0x955c $a jr nz, Music_notepitch ; 0x955c $a
ld hl, $c02e ld hl, $c02e
add hl, bc add hl, bc
bit 2, [hl] bit 2, [hl]
jr z, .asm_9568 ; 0x9564 $2 jr z, Music_notepitch ; 0x9564 $2
pop hl pop hl
ret ret
.asm_9568
Music_notepitch: ; 0x9568
pop af pop af
and $f0 and $f0
cp $c0 cp $c0 ; compare to rest
jr nz, .asm_959f ; 0x956d $30 jr nz, .notRest
ld a, c ld a, c
cp $4 cp $4
jr nc, .asm_957c ; 0x9572 $8 jr nc, .sfxChannel
ld hl, $c02a ld hl, $c02a
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
and a and a
jr nz, .asm_959e ; 0x957a $22 jr nz, .done
.asm_957c ; fall through
.sfxChannel
ld a, c ld a, c
cp $2 cp $2
jr z, .asm_9585 ; 0x957f $4 jr z, .musicChannel3
cp $6 cp $6
jr nz, .asm_9592 ; 0x9583 $d jr nz, .notsfxChannel3
.asm_9585 .musicChannel3
ld b, $0 ld b, $0
ld hl, $5b1f ld hl, $5b1f
add hl, bc add hl, bc
ld a, [$ff00+$25] ld a, [$ff00+$25]
and [hl] and [hl]
ld [$ff00+$25], a ld [$ff00+$25], a
jr .asm_959e ; 0x9590 $c jr .done
.asm_9592 .notsfxChannel3
ld b, $2 ld b, $2
call Func_9838 call Func_9838
ld a, $8 ld a, $8
@ -19219,9 +19221,9 @@ Func_950a: ; 0x950a
inc hl inc hl
ld a, $80 ld a, $80
ld [hl], a ld [hl], a
.asm_959e .done
ret ret
.asm_959f .notRest
swap a swap a
ld b, $0 ld b, $0
ld hl, $c0d6 ld hl, $c0d6
@ -19238,7 +19240,7 @@ Func_950a: ; 0x950a
push de push de
ld a, c ld a, c
cp $4 cp $4
jr nc, .asm_95cd ; 0x95bc $f jr nc, .skip ; if sfx channel
ld hl, $c02a ld hl, $c02a
ld d, $0 ld d, $0
ld e, a ld e, a
@ -19246,11 +19248,11 @@ Func_950a: ; 0x950a
ld a, [hl] ld a, [hl]
and a and a
jr nz, .asm_95cb ; 0x95c7 $2 jr nz, .asm_95cb ; 0x95c7 $2
jr .asm_95cd ; 0x95c9 $2 jr .skip
.asm_95cb .asm_95cb
pop de pop de
ret ret
.asm_95cd .skip
ld b, $0 ld b, $0
ld hl, $c0de ld hl, $c0de
add hl, bc add hl, bc
@ -19286,15 +19288,15 @@ Func_95f8: ; 0x95f8
ld d, a ld d, a
ld a, c ld a, c
cp $7 cp $7
jr z, .asm_9613 ; 0x9605 $c jr z, .sfxNoiseChannel
cp $4 cp $4
jr nc, .asm_9625 ; 0x9609 $1a jr nc, .skip ; if music noise channel
ld hl, $c02a ld hl, $c02a
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
and a and a
jr nz, .asm_9625 ; 0x9611 $12 jr nz, .skip
.asm_9613 .sfxNoiseChannel
ld a, [$c004] ld a, [$c004]
ld hl, $5b27 ld hl, $5b27
add hl, bc add hl, bc
@ -19306,7 +19308,7 @@ Func_95f8: ; 0x95f8
and [hl] and [hl]
or d or d
ld d, a ld d, a
.asm_9625 .skip
ld a, d ld a, d
ld [$ff00+$25], a ld [$ff00+$25], a
ret ret
@ -19319,9 +19321,9 @@ Func_9629: ; 0x9629
ld d, [hl] ld d, [hl]
ld a, c ld a, c
cp $2 cp $2
jr z, .asm_9644 ; 0x9633 $f jr z, .channel3 ; if music channel 3
cp $6 cp $6
jr z, .asm_9644 ; 0x9637 $b jr z, .channel3 ; if sfx channel 3
ld a, d ld a, d
and $3f and $3f
ld d, a ld d, a
@ -19330,7 +19332,7 @@ Func_9629: ; 0x9629
ld a, [hl] ld a, [hl]
or d or d
ld d, a ld d, a
.asm_9644 .channel3
ld b, $1 ld b, $1
call Func_9838 call Func_9838
ld [hl], d ld [hl], d
@ -19340,16 +19342,17 @@ Func_9629: ; 0x9629
Func_964b: ; 0x964b Func_964b: ; 0x964b
ld a, c ld a, c
cp $2 cp $2
jr z, .asm_9654 ; 0x964e $4 jr z, .musicChannel3
cp $6 cp $6
jr nz, .asm_9681 ; 0x9652 $2d jr nz, .notsfxChannel3
.asm_9654 ; fall through
.musicChannel3
push de push de
ld de, $c0e6 ld de, $c0e6
cp $2 cp $2
jr z, .asm_965f ; 0x965a $3 jr z, .musicChannel3again
ld de, $c0e7 ld de, $c0e7
.asm_965f .musicChannel3again
ld a, [de] ld a, [de]
add a add a
ld d, $0 ld d, $0
@ -19363,18 +19366,18 @@ Func_964b: ; 0x964b
ld b, $f ld b, $f
ld a, $0 ld a, $0
ld [$ff00+$1a], a ld [$ff00+$1a], a
.asm_9674 .loop
ld a, [de] ld a, [de]
inc de inc de
ld [hli], a ld [hli], a
ld a, b ld a, b
dec b dec b
and a and a
jr nz, .asm_9674 ; 0x967a $f8 jr nz, .loop
ld a, $80 ld a, $80
ld [$ff00+$1a], a ld [$ff00+$1a], a
pop de pop de
.asm_9681 .notsfxChannel3
ld a, d ld a, d
or $80 or $80
and $c7 and $c7