mirror of
https://github.com/thornAvery/kep-hack.git
synced 2026-02-21 22:52:15 +13:00
Manually merge pokecrystal audio files
and remove more CrystalComplete leftovers
This commit is contained in:
parent
094594bffb
commit
735d5bd4c2
189 changed files with 9015 additions and 41631 deletions
|
|
@ -1,11 +1,10 @@
|
|||
Music_RivalBattle: ; e974f
|
||||
dbw $80, Music_RivalBattle_Ch1
|
||||
dbw $01, Music_RivalBattle_Ch2
|
||||
dbw $02, Music_RivalBattle_Ch3
|
||||
; e9758
|
||||
Music_RivalBattle:
|
||||
musicheader 3, 1, Music_RivalBattle_Ch1
|
||||
musicheader 1, 2, Music_RivalBattle_Ch2
|
||||
musicheader 1, 3, Music_RivalBattle_Ch3
|
||||
|
||||
Music_RivalBattle_Ch1: ; e9758
|
||||
ftempo 102
|
||||
Music_RivalBattle_Ch1:
|
||||
tempo 102
|
||||
volume $77
|
||||
dutycycle $3
|
||||
tone $0002
|
||||
|
|
@ -23,7 +22,7 @@ Music_RivalBattle_Ch1: ; e9758
|
|||
intensity $b7
|
||||
note C#, 6
|
||||
note E_, 4
|
||||
Music_RivalBattle_branch_e9777: ; e9777
|
||||
Music_RivalBattle_branch_e9777:
|
||||
intensity $b2
|
||||
octave 2
|
||||
note A#, 6
|
||||
|
|
@ -40,7 +39,7 @@ Music_RivalBattle_branch_e9777: ; e9777
|
|||
note C#, 4
|
||||
intensity $b7
|
||||
note C#, 10
|
||||
Music_RivalBattle_branch_e978f: ; e978f
|
||||
Music_RivalBattle_branch_e978f:
|
||||
intensity $b2
|
||||
octave 3
|
||||
note G#, 6
|
||||
|
|
@ -56,7 +55,7 @@ Music_RivalBattle_branch_e978f: ; e978f
|
|||
note B_, 4
|
||||
intensity $4d
|
||||
note B_, 10
|
||||
Music_RivalBattle_branch_e97a6: ; e97a6
|
||||
Music_RivalBattle_branch_e97a6:
|
||||
intensity $b7
|
||||
note A#, 6
|
||||
note F#, 6
|
||||
|
|
@ -179,7 +178,7 @@ Music_RivalBattle_branch_e97a6: ; e97a6
|
|||
note E_, 2
|
||||
note D#, 2
|
||||
note C#, 2
|
||||
Music_RivalBattle_branch_e9837: ; e9837
|
||||
Music_RivalBattle_branch_e9837:
|
||||
octave 3
|
||||
note A#, 2
|
||||
note E_, 2
|
||||
|
|
@ -285,9 +284,8 @@ Music_RivalBattle_branch_e9837: ; e9837
|
|||
octave 3
|
||||
note C#, 10
|
||||
loopchannel 0, Music_RivalBattle_branch_e97a6
|
||||
; e98af
|
||||
|
||||
Music_RivalBattle_Ch2: ; e98af
|
||||
Music_RivalBattle_Ch2:
|
||||
dutycycle $3
|
||||
vibrato $8, $36
|
||||
tone $0001
|
||||
|
|
@ -337,7 +335,7 @@ Music_RivalBattle_Ch2: ; e98af
|
|||
note F#, 6
|
||||
intensity $c2
|
||||
note G#, 4
|
||||
Music_RivalBattle_branch_e98ea: ; e98ea
|
||||
Music_RivalBattle_branch_e98ea:
|
||||
intensity $c2
|
||||
note D#, 6
|
||||
intensity $c7
|
||||
|
|
@ -354,7 +352,7 @@ Music_RivalBattle_branch_e98ea: ; e98ea
|
|||
note B_, 1
|
||||
octave 4
|
||||
note C_, 1
|
||||
Music_RivalBattle_branch_e9903: ; e9903
|
||||
Music_RivalBattle_branch_e9903:
|
||||
intensity $c2
|
||||
note C#, 6
|
||||
intensity $c7
|
||||
|
|
@ -369,7 +367,7 @@ Music_RivalBattle_branch_e9903: ; e9903
|
|||
note E_, 4
|
||||
intensity $b7
|
||||
note E_, 6
|
||||
Music_RivalBattle_branch_e991a: ; e991a
|
||||
Music_RivalBattle_branch_e991a:
|
||||
callchannel Music_RivalBattle_branch_e99e0
|
||||
intensity $b0
|
||||
note G#, 8
|
||||
|
|
@ -474,7 +472,7 @@ Music_RivalBattle_branch_e991a: ; e991a
|
|||
note G#, 8
|
||||
intensity $c7
|
||||
note F_, 8
|
||||
Music_RivalBattle_branch_e99a6: ; e99a6
|
||||
Music_RivalBattle_branch_e99a6:
|
||||
intensity $c2
|
||||
octave 3
|
||||
note A#, 6
|
||||
|
|
@ -493,7 +491,7 @@ Music_RivalBattle_branch_e99a6: ; e99a6
|
|||
note C#, 6
|
||||
intensity $9a
|
||||
note C#, 4
|
||||
Music_RivalBattle_branch_e99c1: ; e99c1
|
||||
Music_RivalBattle_branch_e99c1:
|
||||
intensity $c2
|
||||
octave 3
|
||||
note G#, 6
|
||||
|
|
@ -513,9 +511,8 @@ Music_RivalBattle_branch_e99c1: ; e99c1
|
|||
octave 4
|
||||
note D_, 4
|
||||
loopchannel 0, Music_RivalBattle_branch_e991a
|
||||
; e99e0
|
||||
|
||||
Music_RivalBattle_branch_e99e0: ; e99e0
|
||||
Music_RivalBattle_branch_e99e0:
|
||||
intensity $c7
|
||||
note D#, 10
|
||||
intensity $c4
|
||||
|
|
@ -536,9 +533,8 @@ Music_RivalBattle_branch_e99e0: ; e99e0
|
|||
intensity $b7
|
||||
note F_, 8
|
||||
endchannel
|
||||
; e99fb
|
||||
|
||||
Music_RivalBattle_Ch3: ; e99fb
|
||||
Music_RivalBattle_Ch3:
|
||||
notetype $c, $19
|
||||
octave 3
|
||||
note F#, 2
|
||||
|
|
@ -554,7 +550,7 @@ Music_RivalBattle_Ch3: ; e99fb
|
|||
octave 3
|
||||
note C#, 2
|
||||
note D_, 2
|
||||
Music_RivalBattle_branch_e9a0c: ; e9a0c
|
||||
Music_RivalBattle_branch_e9a0c:
|
||||
note D#, 2
|
||||
note C#, 2
|
||||
note D#, 2
|
||||
|
|
@ -563,7 +559,7 @@ Music_RivalBattle_branch_e9a0c: ; e9a0c
|
|||
note D#, 2
|
||||
note C#, 2
|
||||
loopchannel 4, Music_RivalBattle_branch_e9a0c
|
||||
Music_RivalBattle_branch_e9a17: ; e9a17
|
||||
Music_RivalBattle_branch_e9a17:
|
||||
octave 3
|
||||
note C#, 2
|
||||
octave 2
|
||||
|
|
@ -586,7 +582,7 @@ Music_RivalBattle_branch_e9a17: ; e9a17
|
|||
note C_, 2
|
||||
note C#, 2
|
||||
note D_, 2
|
||||
Music_RivalBattle_branch_e9a30: ; e9a30
|
||||
Music_RivalBattle_branch_e9a30:
|
||||
callchannel Music_RivalBattle_branch_e9b47
|
||||
octave 2
|
||||
note A#, 2
|
||||
|
|
@ -633,14 +629,14 @@ Music_RivalBattle_branch_e9a30: ; e9a30
|
|||
octave 3
|
||||
note F_, 2
|
||||
callchannel Music_RivalBattle_branch_e9b50
|
||||
Music_RivalBattle_branch_e9a66: ; e9a66
|
||||
Music_RivalBattle_branch_e9a66:
|
||||
note C#, 2
|
||||
note G#, 2
|
||||
loopchannel 4, Music_RivalBattle_branch_e9a66
|
||||
callchannel Music_RivalBattle_branch_e9b5c
|
||||
note G#, 2
|
||||
note F#, 2
|
||||
Music_RivalBattle_branch_e9a71: ; e9a71
|
||||
Music_RivalBattle_branch_e9a71:
|
||||
octave 2
|
||||
note A#, 2
|
||||
octave 3
|
||||
|
|
@ -698,29 +694,29 @@ Music_RivalBattle_branch_e9a71: ; e9a71
|
|||
note F#, 2
|
||||
note G_, 2
|
||||
note G#, 2
|
||||
Music_RivalBattle_branch_e9ab3: ; e9ab3
|
||||
Music_RivalBattle_branch_e9ab3:
|
||||
note D#, 2
|
||||
note A#, 2
|
||||
loopchannel 4, Music_RivalBattle_branch_e9ab3
|
||||
Music_RivalBattle_branch_e9ab9: ; e9ab9
|
||||
Music_RivalBattle_branch_e9ab9:
|
||||
note D#, 2
|
||||
note A_, 2
|
||||
loopchannel 4, Music_RivalBattle_branch_e9ab9
|
||||
Music_RivalBattle_branch_e9abf: ; e9abf
|
||||
Music_RivalBattle_branch_e9abf:
|
||||
note D#, 2
|
||||
note G#, 2
|
||||
loopchannel 4, Music_RivalBattle_branch_e9abf
|
||||
Music_RivalBattle_branch_e9ac5: ; e9ac5
|
||||
Music_RivalBattle_branch_e9ac5:
|
||||
note D#, 2
|
||||
note G_, 2
|
||||
loopchannel 12, Music_RivalBattle_branch_e9ac5
|
||||
Music_RivalBattle_branch_e9acb: ; e9acb
|
||||
Music_RivalBattle_branch_e9acb:
|
||||
octave 2
|
||||
note B_, 2
|
||||
octave 3
|
||||
note D#, 2
|
||||
loopchannel 4, Music_RivalBattle_branch_e9acb
|
||||
Music_RivalBattle_branch_e9ad3: ; e9ad3
|
||||
Music_RivalBattle_branch_e9ad3:
|
||||
octave 2
|
||||
note B_, 2
|
||||
octave 3
|
||||
|
|
@ -779,7 +775,7 @@ Music_RivalBattle_branch_e9ad3: ; e9ad3
|
|||
note C#, 8
|
||||
note D#, 8
|
||||
note F_, 8
|
||||
Music_RivalBattle_branch_e9b10: ; e9b10
|
||||
Music_RivalBattle_branch_e9b10:
|
||||
octave 2
|
||||
note A#, 2
|
||||
octave 3
|
||||
|
|
@ -787,7 +783,7 @@ Music_RivalBattle_branch_e9b10: ; e9b10
|
|||
loopchannel 7, Music_RivalBattle_branch_e9b10
|
||||
note E_, 2
|
||||
note D#, 2
|
||||
Music_RivalBattle_branch_e9b1a: ; e9b1a
|
||||
Music_RivalBattle_branch_e9b1a:
|
||||
octave 2
|
||||
note A#, 2
|
||||
octave 3
|
||||
|
|
@ -799,7 +795,7 @@ Music_RivalBattle_branch_e9b1a: ; e9b1a
|
|||
note F#, 2
|
||||
note F_, 2
|
||||
note E_, 2
|
||||
Music_RivalBattle_branch_e9b28: ; e9b28
|
||||
Music_RivalBattle_branch_e9b28:
|
||||
octave 2
|
||||
note G#, 2
|
||||
octave 3
|
||||
|
|
@ -807,7 +803,7 @@ Music_RivalBattle_branch_e9b28: ; e9b28
|
|||
loopchannel 7, Music_RivalBattle_branch_e9b28
|
||||
note D_, 2
|
||||
note C#, 2
|
||||
Music_RivalBattle_branch_e9b32: ; e9b32
|
||||
Music_RivalBattle_branch_e9b32:
|
||||
octave 2
|
||||
note G#, 2
|
||||
octave 3
|
||||
|
|
@ -823,18 +819,16 @@ Music_RivalBattle_branch_e9b32: ; e9b32
|
|||
note D#, 2
|
||||
note D_, 2
|
||||
loopchannel 0, Music_RivalBattle_branch_e9a30
|
||||
; e9b47
|
||||
|
||||
Music_RivalBattle_branch_e9b47: ; e9b47
|
||||
Music_RivalBattle_branch_e9b47:
|
||||
octave 2
|
||||
note A#, 2
|
||||
octave 3
|
||||
note D#, 2
|
||||
loopchannel 4, Music_RivalBattle_branch_e9b47
|
||||
endchannel
|
||||
; e9b50
|
||||
|
||||
Music_RivalBattle_branch_e9b50: ; e9b50
|
||||
Music_RivalBattle_branch_e9b50:
|
||||
note C#, 2
|
||||
note G#, 2
|
||||
octave 4
|
||||
|
|
@ -847,18 +841,16 @@ Music_RivalBattle_branch_e9b50: ; e9b50
|
|||
note C#, 2
|
||||
note G#, 2
|
||||
endchannel
|
||||
; e9b5c
|
||||
|
||||
Music_RivalBattle_branch_e9b5c: ; e9b5c
|
||||
Music_RivalBattle_branch_e9b5c:
|
||||
octave 2
|
||||
note B_, 2
|
||||
octave 3
|
||||
note F#, 2
|
||||
loopchannel 7, Music_RivalBattle_branch_e9b5c
|
||||
endchannel
|
||||
; e9b65
|
||||
|
||||
Music_RivalBattle_branch_e9b65: ; e9b65
|
||||
Music_RivalBattle_branch_e9b65:
|
||||
octave 3
|
||||
note D#, 2
|
||||
note A#, 2
|
||||
|
|
@ -866,6 +858,3 @@ Music_RivalBattle_branch_e9b65: ; e9b65
|
|||
note D#, 2
|
||||
loopchannel 2, Music_RivalBattle_branch_e9b65
|
||||
endchannel
|
||||
; e9b6f
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue