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,12 +1,11 @@
Music_GymLeaderVictory: ; f462c
dbw $c0, Music_GymLeaderVictory_Ch1
dbw $01, Music_GymLeaderVictory_Ch2
dbw $02, Music_GymLeaderVictory_Ch3
dbw $03, Music_GymLeaderVictory_Ch4
; f4638
Music_GymLeaderVictory:
musicheader 4, 1, Music_GymLeaderVictory_Ch1
musicheader 1, 2, Music_GymLeaderVictory_Ch2
musicheader 1, 3, Music_GymLeaderVictory_Ch3
musicheader 1, 4, Music_GymLeaderVictory_Ch4
Music_GymLeaderVictory_Ch1: ; f4638
ftempo 116
Music_GymLeaderVictory_Ch1:
tempo 116
volume $77
vibrato $12, $34
dutycycle $3
@ -27,7 +26,7 @@ Music_GymLeaderVictory_Ch1: ; f4638
octave 5
note D_, 8
stereopanning $f
Music_GymLeaderVictory_branch_f4658: ; f4658
Music_GymLeaderVictory_branch_f4658:
dutycycle $1
callchannel Music_GymLeaderVictory_branch_f4689
octave 4
@ -59,9 +58,8 @@ Music_GymLeaderVictory_branch_f4658: ; f4658
intensity $87
note F#, 16
loopchannel 0, Music_GymLeaderVictory_branch_f4658
; f4689
Music_GymLeaderVictory_branch_f4689: ; f4689
Music_GymLeaderVictory_branch_f4689:
intensity $91
octave 3
note F#, 2
@ -84,9 +82,8 @@ Music_GymLeaderVictory_branch_f4689: ; f4689
note G_, 1
note D_, 1
endchannel
; f46a0
Music_GymLeaderVictory_branch_f46a0: ; f46a0
Music_GymLeaderVictory_branch_f46a0:
intensity $87
octave 3
note F#, 14
@ -115,9 +112,8 @@ Music_GymLeaderVictory_branch_f46a0: ; f46a0
note C#, 1
note E_, 8
endchannel
; f46bd
Music_GymLeaderVictory_Ch2: ; f46bd
Music_GymLeaderVictory_Ch2:
vibrato $12, $34
dutycycle $3
notetype $c, $d7
@ -132,7 +128,7 @@ Music_GymLeaderVictory_Ch2: ; f46bd
octave 5
note D_, 1
note F#, 16
Music_GymLeaderVictory_branch_f46d0: ; f46d0
Music_GymLeaderVictory_branch_f46d0:
dutycycle $3
intensity $a1
callchannel Music_GymLeaderVictory_branch_f4711
@ -175,9 +171,8 @@ Music_GymLeaderVictory_branch_f46d0: ; f46d0
octave 5
note C#, 1
loopchannel 0, Music_GymLeaderVictory_branch_f46d0
; f4711
Music_GymLeaderVictory_branch_f4711: ; f4711
Music_GymLeaderVictory_branch_f4711:
octave 5
note D_, 2
note C#, 2
@ -193,9 +188,8 @@ Music_GymLeaderVictory_branch_f4711: ; f4711
note G_, 2
note F#, 2
endchannel
; f4720
Music_GymLeaderVictory_branch_f4720: ; f4720
Music_GymLeaderVictory_branch_f4720:
intensity $98
note A_, 6
note F#, 1
@ -218,9 +212,8 @@ Music_GymLeaderVictory_branch_f4720: ; f4720
note C#, 8
note C#, 8
endchannel
; f4737
Music_GymLeaderVictory_Ch3: ; f4737
Music_GymLeaderVictory_Ch3:
notetype $c, $25
octave 3
note F#, 16
@ -231,7 +224,7 @@ Music_GymLeaderVictory_Ch3: ; f4737
octave 3
note C#, 2
stereopanning $f0
Music_GymLeaderVictory_branch_f4744: ; f4744
Music_GymLeaderVictory_branch_f4744:
note D_, 2
note __, 4
octave 2
@ -312,9 +305,8 @@ Music_GymLeaderVictory_branch_f4744: ; f4744
octave 3
note C#, 2
loopchannel 0, Music_GymLeaderVictory_branch_f4744
; f479e
Music_GymLeaderVictory_branch_f479e: ; f479e
Music_GymLeaderVictory_branch_f479e:
octave 3
note D_, 2
note __, 2
@ -386,14 +378,13 @@ Music_GymLeaderVictory_branch_f479e: ; f479e
octave 2
note A_, 2
endchannel
; f47e5
Music_GymLeaderVictory_Ch4: ; f47e5
Music_GymLeaderVictory_Ch4:
togglenoise $4
notetype $c
note B_, 16
note B_, 16
Music_GymLeaderVictory_branch_f47eb: ; f47eb
Music_GymLeaderVictory_branch_f47eb:
callchannel Music_GymLeaderVictory_branch_f480b
note D#, 6
note D#, 2
@ -406,7 +397,7 @@ Music_GymLeaderVictory_branch_f47eb: ; f47eb
note C#, 1
note C#, 1
note C#, 1
Music_GymLeaderVictory_branch_f47fb: ; f47fb
Music_GymLeaderVictory_branch_f47fb:
note D#, 2
note G_, 2
note D_, 2
@ -417,9 +408,8 @@ Music_GymLeaderVictory_branch_f47fb: ; f47fb
note G_, 2
loopchannel 16, Music_GymLeaderVictory_branch_f47fb
loopchannel 0, Music_GymLeaderVictory_branch_f47eb
; f480b
Music_GymLeaderVictory_branch_f480b: ; f480b
Music_GymLeaderVictory_branch_f480b:
note D#, 6
note D#, 2
note D#, 4
@ -427,6 +417,3 @@ Music_GymLeaderVictory_branch_f480b: ; f480b
note D#, 2
loopchannel 3, Music_GymLeaderVictory_branch_f480b
endchannel
; f4815