Manually merge pokecrystal audio files

and remove more CrystalComplete leftovers
This commit is contained in:
dannye 2019-04-20 18:26:43 -05:00
parent 094594bffb
commit 735d5bd4c2
189 changed files with 9015 additions and 41631 deletions

View file

@ -1,14 +1,12 @@
Music_KantoWildBattle: ; ed06d
dbw $80, Music_KantoWildBattle_Ch1
dbw $01, Music_KantoWildBattle_Ch2
dbw $02, Music_KantoWildBattle_Ch3
; ed076
Music_KantoWildBattle:
musicheader 3, 1, Music_KantoWildBattle_Ch1
musicheader 1, 2, Music_KantoWildBattle_Ch2
musicheader 1, 3, Music_KantoWildBattle_Ch3
db $3
Music_KantoWildBattle_Ch1: ; ed077
ftempo 112
Music_KantoWildBattle_Ch1:
tempo 112
volume $77
vibrato $12, $23
dutycycle $2
@ -26,7 +24,7 @@ Music_KantoWildBattle_Ch1: ; ed077
note G_, 1
note F#, 1
note F_, 1
Music_KantoWildBattle_branch_ed091: ; ed091
Music_KantoWildBattle_branch_ed091:
notetype $c, $b7
callchannel Music_KantoWildBattle_branch_ed18a
octave 4
@ -209,7 +207,7 @@ Music_KantoWildBattle_branch_ed091: ; ed091
note D#, 1
note __, 5
note C#, 8
Music_KantoWildBattle_branch_ed15b: ; ed15b
Music_KantoWildBattle_branch_ed15b:
intensity $b1
octave 3
note C_, 1
@ -217,34 +215,33 @@ Music_KantoWildBattle_branch_ed15b: ; ed15b
note D_, 1
note C#, 1
loopchannel 8, Music_KantoWildBattle_branch_ed15b
Music_KantoWildBattle_branch_ed166: ; ed166
Music_KantoWildBattle_branch_ed166:
note C#, 1
note F_, 1
note E_, 1
note D#, 1
loopchannel 8, Music_KantoWildBattle_branch_ed166
Music_KantoWildBattle_branch_ed16e: ; ed16e
Music_KantoWildBattle_branch_ed16e:
note C_, 1
note D#, 1
note D_, 1
note C#, 1
loopchannel 16, Music_KantoWildBattle_branch_ed16e
Music_KantoWildBattle_branch_ed176: ; ed176
Music_KantoWildBattle_branch_ed176:
note C#, 1
note E_, 1
note D#, 1
note D_, 1
loopchannel 8, Music_KantoWildBattle_branch_ed176
Music_KantoWildBattle_branch_ed17e: ; ed17e
Music_KantoWildBattle_branch_ed17e:
note C_, 1
note D#, 1
note D_, 1
note C#, 1
loopchannel 8, Music_KantoWildBattle_branch_ed17e
loopchannel 0, Music_KantoWildBattle_branch_ed091
; ed18a
Music_KantoWildBattle_branch_ed18a: ; ed18a
Music_KantoWildBattle_branch_ed18a:
octave 4
note C_, 1
note __, 5
@ -266,9 +263,8 @@ Music_KantoWildBattle_branch_ed18a: ; ed18a
note B_, 1
note __, 3
endchannel
; ed19f
Music_KantoWildBattle_Ch2: ; ed19f
Music_KantoWildBattle_Ch2:
dutycycle $1
vibrato $12, $23
notetype $c, $b1
@ -305,7 +301,7 @@ Music_KantoWildBattle_Ch2: ; ed19f
note D#, 1
note D_, 1
note C#, 1
Music_KantoWildBattle_branch_ed1c8: ; ed1c8
Music_KantoWildBattle_branch_ed1c8:
notetype $c, $b7
callchannel Music_KantoWildBattle_branch_ed2c6
octave 2
@ -328,18 +324,17 @@ Music_KantoWildBattle_branch_ed1c8: ; ed1c8
notetype $6, $b7
callchannel Music_KantoWildBattle_branch_ed307
callchannel Music_KantoWildBattle_branch_ed307
forceoctave $1
pitchoffset 0, C#
callchannel Music_KantoWildBattle_branch_ed307
callchannel Music_KantoWildBattle_branch_ed307
forceoctave $0
pitchoffset 0, C_
rept 4
callchannel Music_KantoWildBattle_branch_ed307
endr
pitchoffset 0, C#
callchannel Music_KantoWildBattle_branch_ed307
callchannel Music_KantoWildBattle_branch_ed307
callchannel Music_KantoWildBattle_branch_ed307
callchannel Music_KantoWildBattle_branch_ed307
forceoctave $1
callchannel Music_KantoWildBattle_branch_ed307
callchannel Music_KantoWildBattle_branch_ed307
forceoctave $0
pitchoffset 0, C_
callchannel Music_KantoWildBattle_branch_ed307
callchannel Music_KantoWildBattle_branch_ed307
note __, 16
@ -386,9 +381,9 @@ Music_KantoWildBattle_branch_ed1c8: ; ed1c8
note G#, 1
notetype $6, $b7
callchannel Music_KantoWildBattle_branch_ed31b
forceoctave $1
pitchoffset 0, C#
callchannel Music_KantoWildBattle_branch_ed31b
forceoctave $0
pitchoffset 0, C_
callchannel Music_KantoWildBattle_branch_ed340
octave 2
note C_, 2
@ -452,9 +447,9 @@ Music_KantoWildBattle_branch_ed1c8: ; ed1c8
callchannel Music_KantoWildBattle_branch_ed354
callchannel Music_KantoWildBattle_branch_ed340
callchannel Music_KantoWildBattle_branch_ed354
forceoctave $1
pitchoffset 0, C#
callchannel Music_KantoWildBattle_branch_ed340
forceoctave $0
pitchoffset 0, C_
note C#, 2
note __, 2
octave 3
@ -495,9 +490,8 @@ Music_KantoWildBattle_branch_ed1c8: ; ed1c8
note C_, 2
note __, 2
loopchannel 0, Music_KantoWildBattle_branch_ed1c8
; ed2c6
Music_KantoWildBattle_branch_ed2c6: ; ed2c6
Music_KantoWildBattle_branch_ed2c6:
octave 2
note C_, 1
note __, 2
@ -563,9 +557,8 @@ Music_KantoWildBattle_branch_ed2c6: ; ed2c6
octave 1
note G_, 2
endchannel
; ed307
Music_KantoWildBattle_branch_ed307: ; ed307
Music_KantoWildBattle_branch_ed307:
octave 2
note C_, 2
note __, 4
@ -586,9 +579,8 @@ Music_KantoWildBattle_branch_ed307: ; ed307
octave 2
note C_, 4
endchannel
; ed31b
Music_KantoWildBattle_branch_ed31b: ; ed31b
Music_KantoWildBattle_branch_ed31b:
octave 2
note C_, 2
note __, 4
@ -626,9 +618,8 @@ Music_KantoWildBattle_branch_ed31b: ; ed31b
octave 3
note C_, 2
endchannel
; ed340
Music_KantoWildBattle_branch_ed340: ; ed340
Music_KantoWildBattle_branch_ed340:
octave 3
note G_, 4
octave 2
@ -649,9 +640,8 @@ Music_KantoWildBattle_branch_ed340: ; ed340
note C_, 2
note __, 2
endchannel
; ed354
Music_KantoWildBattle_branch_ed354: ; ed354
Music_KantoWildBattle_branch_ed354:
note C_, 2
note __, 2
octave 3
@ -672,9 +662,8 @@ Music_KantoWildBattle_branch_ed354: ; ed354
note C_, 2
note __, 2
endchannel
; ed368
Music_KantoWildBattle_Ch3: ; ed368
Music_KantoWildBattle_Ch3:
vibrato $14, $23
notetype $c, $14
octave 3
@ -725,7 +714,7 @@ Music_KantoWildBattle_Ch3: ; ed368
note G_, 1
octave 4
note G_, 1
Music_KantoWildBattle_branch_ed39e: ; ed39e
Music_KantoWildBattle_branch_ed39e:
notetype $c, $14
octave 5
note G_, 1
@ -1224,6 +1213,3 @@ Music_KantoWildBattle_branch_ed39e: ; ed39e
note G_, 16
note G_, 16
loopchannel 0, Music_KantoWildBattle_branch_ed39e
; ed5c6