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_KantoGymBattle: ; ec720
dbw $80, Music_KantoGymBattle_Ch1
dbw $01, Music_KantoGymBattle_Ch2
dbw $02, Music_KantoGymBattle_Ch3
; ec729
Music_KantoGymBattle:
musicheader 3, 1, Music_KantoGymBattle_Ch1
musicheader 1, 2, Music_KantoGymBattle_Ch2
musicheader 1, 3, Music_KantoGymBattle_Ch3
Music_KantoGymBattle_Ch1: ; ec729
ftempo 101
Music_KantoGymBattle_Ch1:
tempo 101
volume $77
dutycycle $3
tone $0002
@ -86,7 +85,7 @@ Music_KantoGymBattle_Ch1: ; ec729
note E_, 4
note E_, 4
note E_, 2
Music_KantoGymBattle_branch_ec78b: ; ec78b
Music_KantoGymBattle_branch_ec78b:
callchannel Music_KantoGymBattle_branch_ec832
octave 2
note A#, 2
@ -229,9 +228,8 @@ Music_KantoGymBattle_branch_ec78b: ; ec78b
octave 3
note D_, 4
loopchannel 0, Music_KantoGymBattle_branch_ec78b
; ec832
Music_KantoGymBattle_branch_ec832: ; ec832
Music_KantoGymBattle_branch_ec832:
intensity $b5
note D#, 2
octave 2
@ -252,14 +250,13 @@ Music_KantoGymBattle_branch_ec832: ; ec832
note D#, 2
note C#, 2
endchannel
; ec847
Music_KantoGymBattle_Ch2: ; ec847
Music_KantoGymBattle_Ch2:
dutycycle $3
vibrato $8, $36
tone $0001
notetype $c, $c2
Music_KantoGymBattle_branch_ec852: ; ec852
Music_KantoGymBattle_branch_ec852:
octave 4
note A#, 1
note G#, 1
@ -268,7 +265,7 @@ Music_KantoGymBattle_branch_ec852: ; ec852
note D#, 1
loopchannel 8, Music_KantoGymBattle_branch_ec852
octave 3
Music_KantoGymBattle_branch_ec85d: ; ec85d
Music_KantoGymBattle_branch_ec85d:
intensity $c2
note D#, 2
note D#, 2
@ -316,7 +313,7 @@ Music_KantoGymBattle_branch_ec85d: ; ec85d
intensity $c2
octave 4
loopchannel 2, Music_KantoGymBattle_branch_ec85d
Music_KantoGymBattle_branch_ec894: ; ec894
Music_KantoGymBattle_branch_ec894:
callchannel Music_KantoGymBattle_branch_ec907
note E_, 8
note G#, 8
@ -405,9 +402,8 @@ Music_KantoGymBattle_branch_ec894: ; ec894
octave 3
note A_, 4
loopchannel 0, Music_KantoGymBattle_branch_ec894
; ec907
Music_KantoGymBattle_branch_ec907: ; ec907
Music_KantoGymBattle_branch_ec907:
dutycycle $2
intensity $d1
octave 3
@ -437,21 +433,20 @@ Music_KantoGymBattle_branch_ec907: ; ec907
dutycycle $3
intensity $b0
endchannel
; ec92e
Music_KantoGymBattle_Ch3: ; ec92e
Music_KantoGymBattle_Ch3:
notetype $c, $19
octave 2
note E_, 1
note __, 1
Music_KantoGymBattle_branch_ec934: ; ec934
Music_KantoGymBattle_branch_ec934:
note B_, 3
note __, 1
loopchannel 6, Music_KantoGymBattle_branch_ec934
note B_, 2
note G#, 2
note B_, 2
Music_KantoGymBattle_branch_ec93d: ; ec93d
Music_KantoGymBattle_branch_ec93d:
note D#, 1
note __, 1
note D#, 1
@ -489,12 +484,12 @@ Music_KantoGymBattle_branch_ec93d: ; ec93d
note __, 1
note E_, 2
loopchannel 2, Music_KantoGymBattle_branch_ec93d
Music_KantoGymBattle_branch_ec965: ; ec965
Music_KantoGymBattle_branch_ec965:
octave 2
note D#, 2
note A#, 2
loopchannel 8, Music_KantoGymBattle_branch_ec965
Music_KantoGymBattle_branch_ec96c: ; ec96c
Music_KantoGymBattle_branch_ec96c:
note E_, 2
note B_, 2
loopchannel 4, Music_KantoGymBattle_branch_ec96c
@ -511,13 +506,13 @@ Music_KantoGymBattle_branch_ec96c: ; ec96c
note E_, 2
octave 2
note B_, 2
Music_KantoGymBattle_branch_ec97f: ; ec97f
Music_KantoGymBattle_branch_ec97f:
octave 2
note F#, 2
octave 3
note C#, 2
loopchannel 8, Music_KantoGymBattle_branch_ec97f
Music_KantoGymBattle_branch_ec987: ; ec987
Music_KantoGymBattle_branch_ec987:
octave 2
note E_, 2
note B_, 2
@ -526,7 +521,7 @@ Music_KantoGymBattle_branch_ec987: ; ec987
note E_, 2
octave 2
note B_, 2
Music_KantoGymBattle_branch_ec992: ; ec992
Music_KantoGymBattle_branch_ec992:
note D#, 1
note __, 1
note D#, 1
@ -546,7 +541,7 @@ Music_KantoGymBattle_branch_ec992: ; ec992
note __, 1
note E_, 2
loopchannel 2, Music_KantoGymBattle_branch_ec992
Music_KantoGymBattle_branch_ec9a8: ; ec9a8
Music_KantoGymBattle_branch_ec9a8:
note D#, 2
note A#, 2
loopchannel 7, Music_KantoGymBattle_branch_ec9a8
@ -563,12 +558,12 @@ Music_KantoGymBattle_branch_ec9a8: ; ec9a8
note B_, 2
octave 3
note E_, 2
Music_KantoGymBattle_branch_ec9bb: ; ec9bb
Music_KantoGymBattle_branch_ec9bb:
octave 2
note E_, 2
note B_, 2
loopchannel 5, Music_KantoGymBattle_branch_ec9bb
Music_KantoGymBattle_branch_ec9c2: ; ec9c2
Music_KantoGymBattle_branch_ec9c2:
octave 2
note F#, 2
octave 3
@ -588,16 +583,16 @@ Music_KantoGymBattle_branch_ec9c2: ; ec9c2
note F#, 2
note E_, 2
note C#, 2
Music_KantoGymBattle_branch_ec9d8: ; ec9d8
Music_KantoGymBattle_branch_ec9d8:
octave 2
note D#, 2
note A#, 2
loopchannel 4, Music_KantoGymBattle_branch_ec9d8
Music_KantoGymBattle_branch_ec9df: ; ec9df
Music_KantoGymBattle_branch_ec9df:
note C#, 2
note G#, 2
loopchannel 8, Music_KantoGymBattle_branch_ec9df
Music_KantoGymBattle_branch_ec9e5: ; ec9e5
Music_KantoGymBattle_branch_ec9e5:
note D#, 2
note A#, 2
loopchannel 4, Music_KantoGymBattle_branch_ec9e5
@ -613,6 +608,3 @@ Music_KantoGymBattle_branch_ec9e5: ; ec9e5
note D#, 2
note F_, 2
loopchannel 0, Music_KantoGymBattle_branch_ec965
; ec9fa