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_PokemonMarch: ; f6e23
dbw $c0, Music_PokemonMarch_Ch1
dbw $01, Music_PokemonMarch_Ch2
dbw $02, Music_PokemonMarch_Ch3
dbw $03, Music_PokemonMarch_Ch4
; f6e2f
Music_PokemonMarch:
musicheader 4, 1, Music_PokemonMarch_Ch1
musicheader 1, 2, Music_PokemonMarch_Ch2
musicheader 1, 3, Music_PokemonMarch_Ch3
musicheader 1, 4, Music_PokemonMarch_Ch4
Music_PokemonMarch_Ch1: ; f6e2f
Music_PokemonMarch_Ch1:
tempo 144
volume $77
stereopanning $f0
@ -21,7 +20,7 @@ Music_PokemonMarch_Ch1: ; f6e2f
intensity $a2
note D_, 4
notetype $8, $a2
Music_PokemonMarch_branch_f6e4c: ; f6e4c
Music_PokemonMarch_branch_f6e4c:
callchannel Music_PokemonMarch_branch_f6eae
note D#, 2
note C_, 2
@ -97,9 +96,8 @@ Music_PokemonMarch_branch_f6e4c: ; f6e4c
note G_, 4
note A#, 2
loopchannel 0, Music_PokemonMarch_branch_f6e4c
; f6eae
Music_PokemonMarch_branch_f6eae: ; f6eae
Music_PokemonMarch_branch_f6eae:
note __, 4
octave 3
note D#, 1
@ -110,9 +108,8 @@ Music_PokemonMarch_branch_f6eae: ; f6eae
note D#, 2
note __, 2
endchannel
; f6eb8
Music_PokemonMarch_branch_f6eb8: ; f6eb8
Music_PokemonMarch_branch_f6eb8:
note __, 4
note F_, 1
note E_, 1
@ -122,9 +119,8 @@ Music_PokemonMarch_branch_f6eb8: ; f6eb8
note F_, 2
note __, 2
endchannel
; f6ec1
Music_PokemonMarch_Ch2: ; f6ec1
Music_PokemonMarch_Ch2:
dutycycle $2
vibrato $10, $22
notetype $c, $b2
@ -133,7 +129,7 @@ Music_PokemonMarch_Ch2: ; f6ec1
note G_, 4
note G_, 4
note G_, 4
Music_PokemonMarch_branch_f6ece: ; f6ece
Music_PokemonMarch_branch_f6ece:
notetype $c, $b7
octave 3
note G#, 12
@ -234,14 +230,13 @@ Music_PokemonMarch_branch_f6ece: ; f6ece
note G_, 1
note __, 5
loopchannel 0, Music_PokemonMarch_branch_f6ece
; f6f4d
Music_PokemonMarch_Ch3: ; f6f4d
Music_PokemonMarch_Ch3:
stereopanning $f
notetype $c, $16
note __, 16
notetype $8, $16
Music_PokemonMarch_branch_f6f56: ; f6f56
Music_PokemonMarch_branch_f6f56:
callchannel Music_PokemonMarch_branch_f6fe8
note __, 2
octave 4
@ -273,7 +268,7 @@ Music_PokemonMarch_branch_f6f56: ; f6f56
note D#, 2
note G_, 2
note G#, 2
Music_PokemonMarch_branch_f6f7b: ; f6f7b
Music_PokemonMarch_branch_f6f7b:
octave 3
note A#, 2
note __, 2
@ -377,9 +372,8 @@ Music_PokemonMarch_branch_f6f7b: ; f6f7b
note __, 2
note G#, 2
loopchannel 0, Music_PokemonMarch_branch_f6f56
; f6fe8
Music_PokemonMarch_branch_f6fe8: ; f6fe8
Music_PokemonMarch_branch_f6fe8:
octave 3
note G#, 2
note __, 2
@ -398,14 +392,13 @@ Music_PokemonMarch_branch_f6fe8: ; f6fe8
octave 3
note G_, 2
endchannel
; f6ffa
Music_PokemonMarch_Ch4: ; f6ffa
Music_PokemonMarch_Ch4:
stereopanning $f0
togglenoise $5
notetype $8
callchannel Music_PokemonMarch_branch_f704c
Music_PokemonMarch_branch_f7003: ; f7003
Music_PokemonMarch_branch_f7003:
callchannel Music_PokemonMarch_branch_f7042
note C_, 4
note C_, 2
@ -441,9 +434,8 @@ Music_PokemonMarch_branch_f7003: ; f7003
notetype $8
callchannel Music_PokemonMarch_branch_f704c
loopchannel 0, Music_PokemonMarch_branch_f7003
; f7042
Music_PokemonMarch_branch_f7042: ; f7042
Music_PokemonMarch_branch_f7042:
note C_, 4
note C_, 2
note C_, 4
@ -454,9 +446,8 @@ Music_PokemonMarch_branch_f7042: ; f7042
note C#, 2
note C#, 2
endchannel
; f704c
Music_PokemonMarch_branch_f704c: ; f704c
Music_PokemonMarch_branch_f704c:
note C_, 4
note C_, 2
note C_, 4
@ -466,6 +457,3 @@ Music_PokemonMarch_branch_f704c: ; f704c
note D_, 2
note C#, 2
endchannel
; f7055