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,16 +1,15 @@
Music_JohtoWildBattle: ; f5dc5
dbw $80, Music_JohtoWildBattle_Ch1
dbw $01, Music_JohtoWildBattle_Ch2
dbw $02, Music_JohtoWildBattle_Ch3
; f5dce
Music_JohtoWildBattle:
musicheader 3, 1, Music_JohtoWildBattle_Ch1
musicheader 1, 2, Music_JohtoWildBattle_Ch2
musicheader 1, 3, Music_JohtoWildBattle_Ch3
Music_JohtoWildBattle_Ch1: ; f5dce
ftempo 104
Music_JohtoWildBattle_Ch1:
tempo 104
volume $77
dutycycle $3
tone $0002
vibrato $12, $15
Music_JohtoWildBattleNight_branch_f5ddb: ; f5ddb
Music_JohtoWildBattleNight_branch_f5ddb:
notetype $c, $b2
octave 4
note C_, 1
@ -87,7 +86,7 @@ Music_JohtoWildBattleNight_branch_f5ddb: ; f5ddb
note D_, 4
intensity $6f
note D#, 8
Music_JohtoWildBattle_branch_f5e2d: ; f5e2d
Music_JohtoWildBattle_branch_f5e2d:
intensity $b6
octave 3
note D_, 6
@ -200,9 +199,8 @@ Music_JohtoWildBattle_branch_f5e2d: ; f5e2d
note F#, 4
note G_, 16
loopchannel 0, Music_JohtoWildBattle_branch_f5e2d
; f5ea2
Music_JohtoWildBattle_Ch2: ; f5ea2
Music_JohtoWildBattle_Ch2:
dutycycle $3
vibrato $8, $36
tone $0001
@ -210,7 +208,7 @@ Music_JohtoWildBattle_Ch2: ; f5ea2
notetype $c, $c2
octave 4
note G_, 6
Music_JohtoWildBattleNight_branch_f5eb2: ; f5eb2
Music_JohtoWildBattleNight_branch_f5eb2:
octave 3
note D_, 6
note G_, 4
@ -239,7 +237,7 @@ Music_JohtoWildBattleNight_branch_f5eb2: ; f5eb2
note G_, 4
intensity $6f
note G#, 8
Music_JohtoWildBattle_branch_f5ed1: ; f5ed1
Music_JohtoWildBattle_branch_f5ed1:
intensity $c4
octave 3
note G_, 6
@ -363,10 +361,9 @@ Music_JohtoWildBattle_branch_f5ed1: ; f5ed1
note A#, 4
note B_, 16
loopchannel 0, Music_JohtoWildBattle_branch_f5ed1
; f5f5d
Music_JohtoWildBattleNight_branch_f5f5d: ; f5f5d
Music_JohtoWildBattle_branch_f5f5d: ; f5f5d
Music_JohtoWildBattleNight_branch_f5f5d:
Music_JohtoWildBattle_branch_f5f5d:
notetype $c, $c2
octave 4
note F_, 1
@ -417,11 +414,10 @@ Music_JohtoWildBattle_branch_f5f5d: ; f5f5d
octave 5
note G_, 1
endchannel
; f5f91
Music_JohtoWildBattle_Ch3: ; f5f91
Music_JohtoWildBattle_Ch3:
notetype $c, $14
Music_JohtoWildBattleNight_branch_f5f94: ; f5f94
Music_JohtoWildBattleNight_branch_f5f94:
octave 4
note G_, 2
octave 5
@ -470,7 +466,7 @@ Music_JohtoWildBattleNight_branch_f5f94: ; f5f94
note D#, 2
note G_, 2
note F_, 2
Music_JohtoWildBattle_branch_f5fc6: ; f5fc6
Music_JohtoWildBattle_branch_f5fc6:
note D_, 2
note G_, 2
loopchannel 6, Music_JohtoWildBattle_branch_f5fc6
@ -487,20 +483,20 @@ Music_JohtoWildBattle_branch_f5fc6: ; f5fc6
note G_, 2
note F_, 2
note D#, 2
Music_JohtoWildBattle_branch_f5fdb: ; f5fdb
Music_JohtoWildBattle_branch_f5fdb:
note D_, 2
note G_, 2
loopchannel 7, Music_JohtoWildBattle_branch_f5fdb
note F#, 4
callchannel Music_JohtoWildBattle_branch_f6055
callchannel Music_JohtoWildBattle_branch_f6055
Music_JohtoWildBattle_branch_f5fe8: ; f5fe8
Music_JohtoWildBattle_branch_f5fe8:
note D_, 2
note G_, 2
loopchannel 7, Music_JohtoWildBattle_branch_f5fe8
note D_, 2
note A_, 2
Music_JohtoWildBattle_branch_f5ff0: ; f5ff0
Music_JohtoWildBattle_branch_f5ff0:
note C_, 2
note F_, 2
loopchannel 5, Music_JohtoWildBattle_branch_f5ff0
@ -518,7 +514,7 @@ Music_JohtoWildBattle_branch_f5ff0: ; f5ff0
note D#, 2
note G#, 2
note G_, 4
Music_JohtoWildBattle_branch_f6006: ; f6006
Music_JohtoWildBattle_branch_f6006:
note E_, 2
note A_, 2
loopchannel 8, Music_JohtoWildBattle_branch_f6006
@ -547,11 +543,11 @@ Music_JohtoWildBattle_branch_f6006: ; f6006
note F#, 2
note F_, 2
note D#, 2
Music_JohtoWildBattle_branch_f6027: ; f6027
Music_JohtoWildBattle_branch_f6027:
note D_, 2
note G_, 2
loopchannel 8, Music_JohtoWildBattle_branch_f6027
Music_JohtoWildBattle_branch_f602d: ; f602d
Music_JohtoWildBattle_branch_f602d:
note C_, 2
note F_, 2
loopchannel 7, Music_JohtoWildBattle_branch_f602d
@ -561,17 +557,17 @@ Music_JohtoWildBattle_branch_f602d: ; f602d
note G_, 4
note D_, 4
note G_, 4
Music_JohtoWildBattle_branch_f6039: ; f6039
Music_JohtoWildBattle_branch_f6039:
note D_, 2
note G_, 2
loopchannel 12, Music_JohtoWildBattle_branch_f6039
Music_JohtoWildBattle_branch_f603f: ; f603f
Music_JohtoWildBattle_branch_f603f:
note C_, 2
note E_, 2
loopchannel 7, Music_JohtoWildBattle_branch_f603f
note F_, 2
note F#, 2
Music_JohtoWildBattle_branch_f6047: ; f6047
Music_JohtoWildBattle_branch_f6047:
note D_, 2
note G_, 2
loopchannel 6, Music_JohtoWildBattle_branch_f6047
@ -580,13 +576,9 @@ Music_JohtoWildBattle_branch_f6047: ; f6047
note F#, 2
note E_, 2
loopchannel 0, Music_JohtoWildBattle_branch_f5fdb
; f6055
Music_JohtoWildBattle_branch_f6055: ; f6055
Music_JohtoWildBattle_branch_f6055:
note D#, 2
note G#, 2
loopchannel 4, Music_JohtoWildBattle_branch_f6055
endchannel
; f605c