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,11 +1,10 @@
Music_SSAqua: ; ead99
dbw $c0, Music_SSAqua_Ch1
dbw $01, Music_SSAqua_Ch2
dbw $02, Music_SSAqua_Ch3
dbw $03, Music_SSAqua_Ch4
; eada5
Music_SSAqua:
musicheader 4, 1, Music_SSAqua_Ch1
musicheader 1, 2, Music_SSAqua_Ch2
musicheader 1, 3, Music_SSAqua_Ch3
musicheader 1, 4, Music_SSAqua_Ch4
Music_SSAqua_Ch1: ; eada5
Music_SSAqua_Ch1:
tempo 117
volume $77
stereopanning $f
@ -18,7 +17,7 @@ Music_SSAqua_Ch1: ; eada5
note __, 1
note G_, 1
note __, 1
Music_SSAqua_branch_eadbc: ; eadbc
Music_SSAqua_branch_eadbc:
octave 2
note G_, 16
note __, 8
@ -248,15 +247,14 @@ Music_SSAqua_branch_eadbc: ; eadbc
note F#, 2
note A_, 2
loopchannel 0, Music_SSAqua_branch_eadbc
; eaeca
Music_SSAqua_Ch2: ; eaeca
Music_SSAqua_Ch2:
stereopanning $f0
dutycycle $2
vibrato $8, $33
notetype $c, $b7
note __, 2
Music_SSAqua_branch_eaed5: ; eaed5
Music_SSAqua_branch_eaed5:
notetype $c, $b7
dutycycle $1
intensity $61
@ -276,9 +274,9 @@ Music_SSAqua_branch_eaed5: ; eaed5
octave 4
note C#, 1
note E_, 1
forceoctave $c
pitchoffset 0, CC
callchannel Music_SSAqua_branch_eafe0
forceoctave $0
pitchoffset 0, C_
octave 3
note B_, 1
note __, 1
@ -392,9 +390,8 @@ Music_SSAqua_branch_eaed5: ; eaed5
note A_, 8
note __, 8
loopchannel 0, Music_SSAqua_branch_eaed5
; eaf88
Music_SSAqua_branch_eaf88: ; eaf88
Music_SSAqua_branch_eaf88:
note D_, 6
octave 3
note B_, 1
@ -468,9 +465,8 @@ Music_SSAqua_branch_eaf88: ; eaf88
note E_, 2
note F#, 2
endchannel
; eafd5
Music_SSAqua_branch_eafd5: ; eafd5
Music_SSAqua_branch_eafd5:
notetype $c, $b7
note B_, 10
note F#, 1
@ -480,9 +476,8 @@ Music_SSAqua_branch_eafd5: ; eafd5
note F#, 1
note __, 1
endchannel
; eafe0
Music_SSAqua_branch_eafe0: ; eafe0
Music_SSAqua_branch_eafe0:
octave 3
note D_, 10
note E_, 1
@ -504,9 +499,8 @@ Music_SSAqua_branch_eafe0: ; eafe0
note A_, 1
note __, 1
endchannel
; eaff5
Music_SSAqua_branch_eaff5: ; eaff5
Music_SSAqua_branch_eaff5:
octave 5
note G_, 1
note D_, 1
@ -580,9 +574,8 @@ Music_SSAqua_branch_eaff5: ; eaff5
note A_, 1
note G_, 1
endchannel
; eb03e
Music_SSAqua_branch_eb03e: ; eb03e
Music_SSAqua_branch_eb03e:
octave 5
note G_, 1
octave 4
@ -607,9 +600,8 @@ Music_SSAqua_branch_eb03e: ; eb03e
octave 3
note G_, 1
endchannel
; eb056
Music_SSAqua_Ch3: ; eb056
Music_SSAqua_Ch3:
stereopanning $ff
vibrato $8, $34
notetype $6, $15
@ -618,7 +610,7 @@ Music_SSAqua_Ch3: ; eb056
note __, 1
note G_, 1
note __, 1
Music_SSAqua_branch_eb063: ; eb063
Music_SSAqua_branch_eb063:
note G_, 16
note __, 8
note G_, 2
@ -651,7 +643,7 @@ Music_SSAqua_branch_eb063: ; eb063
note E_, 1
callchannel Music_SSAqua_branch_eb14d
callchannel Music_SSAqua_branch_eb14d
Music_SSAqua_branch_eb08d: ; eb08d
Music_SSAqua_branch_eb08d:
note G_, 2
note __, 2
octave 3
@ -830,9 +822,8 @@ Music_SSAqua_branch_eb08d: ; eb08d
note G_, 1
note __, 1
loopchannel 0, Music_SSAqua_branch_eb063
; eb14d
Music_SSAqua_branch_eb14d: ; eb14d
Music_SSAqua_branch_eb14d:
notetype $6, $15
octave 2
note G_, 2
@ -868,9 +859,8 @@ Music_SSAqua_branch_eb14d: ; eb14d
note G_, 1
note __, 1
endchannel
; eb172
Music_SSAqua_branch_eb172: ; eb172
Music_SSAqua_branch_eb172:
octave 2
note G_, 2
note __, 2
@ -1061,9 +1051,8 @@ Music_SSAqua_branch_eb172: ; eb172
note F#, 1
note __, 3
endchannel
; eb230
Music_SSAqua_branch_eb230: ; eb230
Music_SSAqua_branch_eb230:
octave 2
note B_, 2
note __, 2
@ -1089,13 +1078,12 @@ Music_SSAqua_branch_eb230: ; eb230
note D#, 1
note __, 3
endchannel
; eb249
Music_SSAqua_Ch4: ; eb249
Music_SSAqua_Ch4:
togglenoise $3
notetype $c
note __, 2
Music_SSAqua_branch_eb24e: ; eb24e
Music_SSAqua_branch_eb24e:
note G#, 1
note G_, 1
note G_, 1
@ -1138,9 +1126,8 @@ Music_SSAqua_branch_eb24e: ; eb24e
callchannel Music_SSAqua_branch_eb2ae
callchannel Music_SSAqua_branch_eb2c7
loopchannel 0, Music_SSAqua_branch_eb24e
; eb2ae
Music_SSAqua_branch_eb2ae: ; eb2ae
Music_SSAqua_branch_eb2ae:
note A#, 2
note G_, 1
note G_, 1
@ -1154,9 +1141,8 @@ Music_SSAqua_branch_eb2ae: ; eb2ae
note G_, 1
note G_, 1
endchannel
; eb2bb
Music_SSAqua_branch_eb2bb: ; eb2bb
Music_SSAqua_branch_eb2bb:
note A#, 2
note G_, 1
note G_, 1
@ -1169,9 +1155,8 @@ Music_SSAqua_branch_eb2bb: ; eb2bb
note D_, 2
note F#, 2
endchannel
; eb2c7
Music_SSAqua_branch_eb2c7: ; eb2c7
Music_SSAqua_branch_eb2c7:
note A#, 2
note G_, 1
note G_, 1
@ -1184,6 +1169,3 @@ Music_SSAqua_branch_eb2c7: ; eb2c7
note D_, 2
note C_, 2
endchannel
; eb2d3