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_ChampionBattle: ; ea9c1
dbw $80, Music_ChampionBattle_Ch1
dbw $01, Music_ChampionBattle_Ch2
dbw $02, Music_ChampionBattle_Ch3
; ea9ca
Music_ChampionBattle:
musicheader 3, 1, Music_ChampionBattle_Ch1
musicheader 1, 2, Music_ChampionBattle_Ch2
musicheader 1, 3, Music_ChampionBattle_Ch3
Music_ChampionBattle_Ch1: ; ea9ca
ftempo 98
Music_ChampionBattle_Ch1:
tempo 98
volume $77
dutycycle $3
tone $0002
@ -18,7 +17,7 @@ Music_ChampionBattle_Ch1: ; ea9ca
note A#, 4
intensity $b7
note B_, 4
Music_ChampionBattle_branch_ea9e2: ; ea9e2
Music_ChampionBattle_branch_ea9e2:
callchannel Music_ChampionBattle_branch_eaaee
octave 3
note D#, 4
@ -26,11 +25,11 @@ Music_ChampionBattle_branch_ea9e2: ; ea9e2
callchannel Music_ChampionBattle_branch_eaaee
octave 3
note E_, 4
Music_ChampionBattle_branch_ea9f0: ; ea9f0
Music_ChampionBattle_branch_ea9f0:
callchannel Music_ChampionBattle_branch_eaafc
loopchannel 3, Music_ChampionBattle_branch_ea9f0
callchannel Music_ChampionBattle_branch_eab06
Music_ChampionBattle_branch_ea9fa: ; ea9fa
Music_ChampionBattle_branch_ea9fa:
callchannel Music_ChampionBattle_branch_eaafc
loopchannel 7, Music_ChampionBattle_branch_ea9fa
callchannel Music_ChampionBattle_branch_eab06
@ -73,13 +72,13 @@ Music_ChampionBattle_branch_ea9fa: ; ea9fa
octave 4
note C_, 1
note C#, 1
Music_ChampionBattle_branch_eaa35: ; eaa35
Music_ChampionBattle_branch_eaa35:
callchannel Music_ChampionBattle_branch_eab0f
note E_, 2
note E_, 2
intensity $b7
note F#, 4
Music_ChampionBattle_branch_eaa3d: ; eaa3d
Music_ChampionBattle_branch_eaa3d:
intensity $b2
note E_, 2
note E_, 2
@ -167,7 +166,7 @@ Music_ChampionBattle_branch_eaa3d: ; eaa3d
intensity $90
note D#, 16
note C#, 16
Music_ChampionBattle_branch_eaab1: ; eaab1
Music_ChampionBattle_branch_eaab1:
intensity $b2
octave 2
note A#, 2
@ -176,7 +175,7 @@ Music_ChampionBattle_branch_eaab1: ; eaab1
octave 3
note D#, 4
loopchannel 4, Music_ChampionBattle_branch_eaab1
Music_ChampionBattle_branch_eaabe: ; eaabe
Music_ChampionBattle_branch_eaabe:
intensity $b2
note C_, 2
note C_, 2
@ -207,9 +206,8 @@ Music_ChampionBattle_branch_eaabe: ; eaabe
octave 4
note D_, 4
loopchannel 0, Music_ChampionBattle_branch_eaa35
; eaaee
Music_ChampionBattle_branch_eaaee: ; eaaee
Music_ChampionBattle_branch_eaaee:
intensity $b2
octave 2
note A#, 2
@ -222,9 +220,8 @@ Music_ChampionBattle_branch_eaaee: ; eaaee
note A#, 2
intensity $b7
endchannel
; eaafc
Music_ChampionBattle_branch_eaafc: ; eaafc
Music_ChampionBattle_branch_eaafc:
intensity $b2
octave 2
note A#, 2
@ -233,9 +230,8 @@ Music_ChampionBattle_branch_eaafc: ; eaafc
octave 3
note D#, 4
endchannel
; eab06
Music_ChampionBattle_branch_eab06: ; eab06
Music_ChampionBattle_branch_eab06:
intensity $b2
octave 2
note A#, 2
@ -243,9 +239,8 @@ Music_ChampionBattle_branch_eab06: ; eab06
intensity $b7
note B_, 4
endchannel
; eab0f
Music_ChampionBattle_branch_eab0f: ; eab0f
Music_ChampionBattle_branch_eab0f:
intensity $b5
octave 3
note D#, 2
@ -265,9 +260,8 @@ Music_ChampionBattle_branch_eab0f: ; eab0f
note G_, 2
intensity $b2
endchannel
; eab24
Music_ChampionBattle_branch_eab24: ; eab24
Music_ChampionBattle_branch_eab24:
intensity $b2
octave 3
note A#, 2
@ -279,9 +273,8 @@ Music_ChampionBattle_branch_eab24: ; eab24
note A#, 2
intensity $b7
endchannel
; eab31
Music_ChampionBattle_branch_eab31: ; eab31
Music_ChampionBattle_branch_eab31:
intensity $b2
note D#, 2
note D#, 2
@ -300,9 +293,8 @@ Music_ChampionBattle_branch_eab31: ; eab31
note C#, 4
intensity $b2
endchannel
; eab4a
Music_ChampionBattle_Ch2: ; eab4a
Music_ChampionBattle_Ch2:
dutycycle $3
vibrato $8, $36
tone $0001
@ -357,7 +349,7 @@ Music_ChampionBattle_Ch2: ; eab4a
note E_, 8
intensity $3c
note E_, 8
Music_ChampionBattle_branch_eab9d: ; eab9d
Music_ChampionBattle_branch_eab9d:
intensity $c5
note D#, 6
octave 3
@ -425,7 +417,7 @@ Music_ChampionBattle_branch_eab9d: ; eab9d
note F_, 16
note F#, 16
intensity $c4
Music_ChampionBattle_branch_eabef: ; eabef
Music_ChampionBattle_branch_eabef:
octave 5
note D#, 4
note D_, 4
@ -498,9 +490,8 @@ Music_ChampionBattle_branch_eabef: ; eabef
note F#, 8
note G#, 8
loopchannel 0, Music_ChampionBattle_branch_eab9d
; eac4f
Music_ChampionBattle_branch_eac4f: ; eac4f
Music_ChampionBattle_branch_eac4f:
intensity $c2
note D#, 2
note D#, 6
@ -512,9 +503,8 @@ Music_ChampionBattle_branch_eac4f: ; eac4f
note D#, 2
intensity $c7
endchannel
; eac5c
Music_ChampionBattle_branch_eac5c: ; eac5c
Music_ChampionBattle_branch_eac5c:
intensity $c2
octave 3
note D#, 2
@ -536,9 +526,8 @@ Music_ChampionBattle_branch_eac5c: ; eac5c
note D#, 2
intensity $c7
endchannel
; eac79
Music_ChampionBattle_branch_eac79: ; eac79
Music_ChampionBattle_branch_eac79:
intensity $c1
note D#, 2
note D#, 4
@ -549,11 +538,10 @@ Music_ChampionBattle_branch_eac79: ; eac79
note D#, 2
intensity $c5
endchannel
; eac85
Music_ChampionBattle_Ch3: ; eac85
Music_ChampionBattle_Ch3:
notetype $c, $14
Music_ChampionBattle_branch_eac88: ; eac88
Music_ChampionBattle_branch_eac88:
octave 3
note D#, 1
note __, 7
@ -601,11 +589,11 @@ Music_ChampionBattle_branch_eac88: ; eac88
note A#, 2
note F_, 2
note A_, 2
Music_ChampionBattle_branch_eacc6: ; eacc6
Music_ChampionBattle_branch_eacc6:
note D#, 2
note A#, 2
loopchannel 8, Music_ChampionBattle_branch_eacc6
Music_ChampionBattle_branch_eaccc: ; eaccc
Music_ChampionBattle_branch_eaccc:
note E_, 2
note B_, 2
loopchannel 5, Music_ChampionBattle_branch_eaccc
@ -617,11 +605,11 @@ Music_ChampionBattle_branch_eaccc: ; eaccc
note B_, 2
note G_, 2
note A_, 2
Music_ChampionBattle_branch_eacda: ; eacda
Music_ChampionBattle_branch_eacda:
note D#, 2
note A#, 2
loopchannel 8, Music_ChampionBattle_branch_eacda
Music_ChampionBattle_branch_eace0: ; eace0
Music_ChampionBattle_branch_eace0:
note E_, 2
note B_, 2
loopchannel 8, Music_ChampionBattle_branch_eace0
@ -652,7 +640,7 @@ Music_ChampionBattle_branch_eace0: ; eace0
note D#, 8
note B_, 8
note D#, 8
Music_ChampionBattle_branch_ead05: ; ead05
Music_ChampionBattle_branch_ead05:
note D#, 2
note F#, 2
loopchannel 16, Music_ChampionBattle_branch_ead05
@ -670,12 +658,12 @@ Music_ChampionBattle_branch_ead05: ; ead05
note D#, 2
note E_, 2
callchannel Music_ChampionBattle_branch_ead8e
Music_ChampionBattle_branch_ead1d: ; ead1d
Music_ChampionBattle_branch_ead1d:
octave 3
note E_, 2
note B_, 2
loopchannel 4, Music_ChampionBattle_branch_ead1d
Music_ChampionBattle_branch_ead24: ; ead24
Music_ChampionBattle_branch_ead24:
note D#, 2
note A#, 2
loopchannel 5, Music_ChampionBattle_branch_ead24
@ -687,7 +675,7 @@ Music_ChampionBattle_branch_ead24: ; ead24
note __, 2
note D#, 2
note __, 2
Music_ChampionBattle_branch_ead32: ; ead32
Music_ChampionBattle_branch_ead32:
note E_, 2
note B_, 2
loopchannel 5, Music_ChampionBattle_branch_ead32
@ -699,17 +687,17 @@ Music_ChampionBattle_branch_ead32: ; ead32
note __, 2
note E_, 2
note __, 2
Music_ChampionBattle_branch_ead40: ; ead40
Music_ChampionBattle_branch_ead40:
note D#, 2
note G#, 2
loopchannel 8, Music_ChampionBattle_branch_ead40
Music_ChampionBattle_branch_ead46: ; ead46
Music_ChampionBattle_branch_ead46:
note D#, 2
note A#, 2
loopchannel 7, Music_ChampionBattle_branch_ead46
note B_, 2
note A#, 2
Music_ChampionBattle_branch_ead4e: ; ead4e
Music_ChampionBattle_branch_ead4e:
octave 3
note D#, 2
note A#, 2
@ -723,9 +711,8 @@ Music_ChampionBattle_branch_ead4e: ; ead4e
note A#, 2
note G#, 2
loopchannel 0, Music_ChampionBattle_branch_eacc6
; ead61
Music_ChampionBattle_branch_ead61: ; ead61
Music_ChampionBattle_branch_ead61:
note D#, 1
note __, 1
note D#, 1
@ -737,9 +724,8 @@ Music_ChampionBattle_branch_ead61: ; ead61
note __, 1
note B_, 4
endchannel
; ead6f
Music_ChampionBattle_branch_ead6f: ; ead6f
Music_ChampionBattle_branch_ead6f:
note D#, 1
note __, 1
note D#, 1
@ -760,9 +746,8 @@ Music_ChampionBattle_branch_ead6f: ; ead6f
note D#, 1
note __, 1
endchannel
; ead83
Music_ChampionBattle_branch_ead83: ; ead83
Music_ChampionBattle_branch_ead83:
octave 3
note D#, 2
note F#, 2
@ -774,9 +759,8 @@ Music_ChampionBattle_branch_ead83: ; ead83
note C#, 2
note C_, 2
endchannel
; ead8e
Music_ChampionBattle_branch_ead8e: ; ead8e
Music_ChampionBattle_branch_ead8e:
octave 3
note E_, 2
note B_, 2
@ -788,6 +772,3 @@ Music_ChampionBattle_branch_ead8e: ; ead8e
note D#, 2
note E_, 2
endchannel
; ead99