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

@ -854,7 +854,7 @@ Music_Pinballbluefield_branch_40e75: ; 40e75
; 4111e
Music_Pinballbluefield_Ch3: ; 4111e
forceoctave $10
pitchoffset 1, C_
notetype $8, $22
octave 3
note F_, 4

View file

@ -121,12 +121,12 @@ Music_Pinballdiglettstage_dugtrio_branch_450c4: ; 450c4
callchannel Music_Pinballdiglettstage_dugtrio_branch_45245
panning $ff
callchannel Music_Pinballdiglettstage_dugtrio_branch_4529e
forceoctave $4
pitchoffset 0, E_
panning $f0
callchannel Music_Pinballdiglettstage_dugtrio_branch_452cb
panning $f
callchannel Music_Pinballdiglettstage_dugtrio_branch_452e4
forceoctave $0
pitchoffset 0, C_
callchannel Music_Pinballdiglettstage_dugtrio_branch_45245
panning $ff
callchannel Music_Pinballdiglettstage_dugtrio_branch_452cb
@ -158,11 +158,11 @@ Music_Pinballdiglettstage_dugtrio_branch_450c4: ; 450c4
callchannel Music_Pinballdiglettstage_dugtrio_branch_45245
panning $f
callchannel Music_Pinballdiglettstage_dugtrio_branch_4529e
forceoctave $4
pitchoffset 0, E_
panning $f0
callchannel Music_Pinballdiglettstage_dugtrio_branch_452cb
callchannel Music_Pinballdiglettstage_dugtrio_branch_452e4
forceoctave $0
pitchoffset 0, C_
callchannel Music_Pinballdiglettstage_dugtrio_branch_45245
panning $ff
intensity $83
@ -198,19 +198,19 @@ Music_Pinballdiglettstage_dugtrio_branch_450c4: ; 450c4
note D#, 1
intensity $53
note D#, 1
forceoctave $1
pitchoffset 0, C#
callchannel Music_Pinballdiglettstage_dugtrio_branch_45221
forceoctave $0
pitchoffset 0, C_
callchannel Music_Pinballdiglettstage_dugtrio_branch_452fd
panning $f0
callchannel Music_Pinballdiglettstage_dugtrio_branch_4532e
forceoctave $e
pitchoffset 0, $e + 1
panning $f
callchannel Music_Pinballdiglettstage_dugtrio_branch_45213
forceoctave $a
pitchoffset 0, A#
callchannel Music_Pinballdiglettstage_dugtrio_branch_45213
panning $ff
forceoctave $0
pitchoffset 0, C_
callchannel Music_Pinballdiglettstage_dugtrio_branch_45345
panning $f0
octave 3
@ -251,15 +251,15 @@ Music_Pinballdiglettstage_dugtrio_branch_450c4: ; 450c4
note __, 1
note G_, 1
note __, 1
forceoctave $0
pitchoffset 0, C_
callchannel Music_Pinballdiglettstage_dugtrio_branch_452fd
callchannel Music_Pinballdiglettstage_dugtrio_branch_4532e
panning $f
forceoctave $e
pitchoffset 0, $e + 1
callchannel Music_Pinballdiglettstage_dugtrio_branch_45213
forceoctave $a
pitchoffset 0, A#
callchannel Music_Pinballdiglettstage_dugtrio_branch_45213
forceoctave $0
pitchoffset 0, C_
callchannel Music_Pinballdiglettstage_dugtrio_branch_45345
panning $ff
intensity $83
@ -703,25 +703,25 @@ Music_Pinballdiglettstage_dugtrio_Ch3: ; 45375
intensity $32
note E_, 1
Music_Pinballdiglettstage_dugtrio_branch_453c5: ; 453c5
forceoctave $2
pitchoffset 0, D_
callchannel Music_Pinballdiglettstage_dugtrio_branch_454d5
forceoctave $0
pitchoffset 0, C_
callchannel Music_Pinballdiglettstage_dugtrio_branch_454d5
forceoctave $2
pitchoffset 0, D_
callchannel Music_Pinballdiglettstage_dugtrio_branch_454fe
forceoctave $0
pitchoffset 0, C_
callchannel Music_Pinballdiglettstage_dugtrio_branch_45556
callchannel Music_Pinballdiglettstage_dugtrio_branch_454fe
callchannel Music_Pinballdiglettstage_dugtrio_branch_45556
forceoctave $2
pitchoffset 0, D_
callchannel Music_Pinballdiglettstage_dugtrio_branch_454fe
forceoctave $0
pitchoffset 0, C_
callchannel Music_Pinballdiglettstage_dugtrio_branch_45556
callchannel Music_Pinballdiglettstage_dugtrio_branch_454fe
callchannel Music_Pinballdiglettstage_dugtrio_branch_45556
forceoctave $2
pitchoffset 0, D_
callchannel Music_Pinballdiglettstage_dugtrio_branch_454fe
forceoctave $0
pitchoffset 0, C_
callchannel Music_Pinballdiglettstage_dugtrio_branch_45556
intensity $12
octave 1
@ -781,15 +781,15 @@ Music_Pinballdiglettstage_dugtrio_branch_453c5: ; 453c5
note B_, 1
octave 2
note C_, 1
forceoctave $2
pitchoffset 0, D_
callchannel Music_Pinballdiglettstage_dugtrio_branch_454fe
forceoctave $0
pitchoffset 0, C_
callchannel Music_Pinballdiglettstage_dugtrio_branch_45556
callchannel Music_Pinballdiglettstage_dugtrio_branch_454fe
callchannel Music_Pinballdiglettstage_dugtrio_branch_45556
forceoctave $2
pitchoffset 0, D_
callchannel Music_Pinballdiglettstage_dugtrio_branch_454fe
forceoctave $0
pitchoffset 0, C_
callchannel Music_Pinballdiglettstage_dugtrio_branch_45556
intensity $22
octave 4
@ -828,13 +828,13 @@ Music_Pinballdiglettstage_dugtrio_branch_453c5: ; 453c5
note C#, 1
note G_, 1
callchannel Music_Pinballdiglettstage_dugtrio_branch_45565
forceoctave $4
pitchoffset 0, E_
callchannel Music_Pinballdiglettstage_dugtrio_branch_4559a
forceoctave $0
pitchoffset 0, C_
callchannel Music_Pinballdiglettstage_dugtrio_branch_4559a
forceoctave $4
pitchoffset 0, E_
callchannel Music_Pinballdiglettstage_dugtrio_branch_4559a
forceoctave $0
pitchoffset 0, C_
intensity $12
note F#, 1
note G_, 1
@ -877,7 +877,7 @@ Music_Pinballdiglettstage_dugtrio_branch_453c5: ; 453c5
octave 2
note A#, 1
note __, 1
forceoctave $4
pitchoffset 0, E_
callchannel Music_Pinballdiglettstage_dugtrio_branch_4559a
loopchannel 0, Music_Pinballdiglettstage_dugtrio_branch_453c5
; 454d5

View file

@ -78,11 +78,11 @@ Music_Pinballendcredits_branch_4cd04: ; 4cd04
intensity $98
callchannel Music_Pinballendcredits_branch_4cef5
Music_Pinballendcredits_branch_4cd2e: ; 4cd2e
forceoctave $1
pitchoffset 0, C#
callchannel Music_Pinballendcredits_branch_4cef5
forceoctave $5
pitchoffset 0, F_
callchannel Music_Pinballendcredits_branch_4cef5
forceoctave $0
pitchoffset 0, C_
note D_, 2
note __, 2
note D_, 4
@ -511,7 +511,7 @@ Music_Pinballendcredits_Ch2: ; 4cf03
note G_, 2
callchannel Music_Pinballendcredits_branch_4d1f2
Music_Pinballendcredits_branch_4cf36: ; 4cf36
forceoctave $2
pitchoffset 0, D_
callchannel Music_Pinballendcredits_branch_4d21e
note A_, 2
intensity $28
@ -535,7 +535,7 @@ Music_Pinballendcredits_branch_4cf36: ; 4cf36
note G_, 1
intensity $28
note G_, 1
forceoctave $5
pitchoffset 0, F_
callchannel Music_Pinballendcredits_branch_4d21e
octave 5
note C_, 2
@ -553,7 +553,7 @@ Music_Pinballendcredits_branch_4cf36: ; 4cf36
note D_, 1
note C#, 1
note C_, 1
forceoctave $4
pitchoffset 0, E_
callchannel Music_Pinballendcredits_branch_4d21e
note G_, 1
intensity $28
@ -1009,7 +1009,7 @@ Music_Pinballendcredits_branch_4d1f2: ; 4d1f2
intensity $28
note G_, 1
intensity $a8
forceoctave $0
pitchoffset 0, C_
note G_, 2
intensity $28
note G_, 2
@ -1047,7 +1047,7 @@ Music_Pinballendcredits_branch_4d21e: ; 4d21e
intensity $28
note G_, 1
intensity $a8
forceoctave $0
pitchoffset 0, C_
endchannel
; 4d23e

View file

@ -5,13 +5,13 @@ Music_Pinballgengarstage_haunter: ; 3dffc
; 3e005
Music_Pinballgengarstage_haunter_Ch1: ; 3e005
forceoctave $2
pitchoffset 0, D_
callchannel Music_Pinballgengarstage_haunter_branch_3ddf3
Music_Pinballgengarstage_haunter_Ch2: ; 3e00a
forceoctave $2
pitchoffset 0, D_
callchannel Music_Pinballgengarstage_haunter_branch_3de4c
Music_Pinballgengarstage_haunter_Ch3: ; 3e00f
forceoctave $2
pitchoffset 0, D_
callchannel Music_Pinballgengarstage_haunter_branch_3df1f
Music_Pinballgengarstage_gengar: ; 3e014
@ -138,11 +138,11 @@ Music_Pinballgengarstage_haunter_branch_3e081: ; 3e081
note __, 2
loopchannel 2, Music_Pinballgengarstage_haunter_branch_3e081
callchannel Music_Pinballgengarstage_haunter_branch_3e12f
forceoctave $3
pitchoffset 0, D#
callchannel Music_Pinballgengarstage_haunter_branch_3e12f
forceoctave $8
pitchoffset 0, G#
callchannel Music_Pinballgengarstage_haunter_branch_3e12f
forceoctave $0
pitchoffset 0, C_
intensity $88
octave 4
note C#, 4
@ -377,11 +377,11 @@ Music_Pinballgengarstage_gengar_branch_3e1a8: ; 3e1a8
note F#, 2
loopchannel 2, Music_Pinballgengarstage_gengar_branch_3e1a8
callchannel Music_Pinballgengarstage_gengar_branch_3e25f
forceoctave $3
pitchoffset 0, D#
callchannel Music_Pinballgengarstage_gengar_branch_3e25f
forceoctave $8
pitchoffset 0, G#
callchannel Music_Pinballgengarstage_gengar_branch_3e25f
forceoctave $0
pitchoffset 0, C_
intensity $b8
octave 4
note E_, 4
@ -572,7 +572,7 @@ Music_Pinballgengarstage_gengar_Ch3: ; 3e299
notetype $6, $22
note D#, 16
notetype $6, $12
forceoctave $28
pitchoffset 2, G#
octave 3
note G#, 1
note G_, 1
@ -582,7 +582,7 @@ Music_Pinballgengarstage_gengar_Ch3: ; 3e299
note D#, 1
note D_, 1
note C#, 1
forceoctave $0
pitchoffset 0, C_
Music_Pinballgengarstage_gengar_branch_3e2db: ; 3e2db
notetype $6, $22
octave 1
@ -624,11 +624,11 @@ Music_Pinballgengarstage_gengar_branch_3e2db: ; 3e2db
note __, 2
loopchannel 2, Music_Pinballgengarstage_gengar_branch_3e2db
callchannel Music_Pinballgengarstage_gengar_branch_3e36d
forceoctave $3
pitchoffset 0, D#
callchannel Music_Pinballgengarstage_gengar_branch_3e36d
forceoctave $8
pitchoffset 0, G#
callchannel Music_Pinballgengarstage_gengar_branch_3e36d
forceoctave $0
pitchoffset 0, C_
note E_, 4
octave 2
note F#, 1

View file

@ -260,9 +260,9 @@ Music_Pinballhiscorescreen_branch_41e5d: ; 41e5d
notetype $8, $a2
callchannel Music_Pinballhiscorescreen_branch_41fd5
callchannel Music_Pinballhiscorescreen_branch_41fd5
forceoctave $2
pitchoffset 0, D_
callchannel Music_Pinballhiscorescreen_branch_41fd5
forceoctave $0
pitchoffset 0, C_
intensity $a2
note E_, 4
note E_, 1
@ -643,9 +643,9 @@ Music_Pinballhiscorescreen_Ch3: ; 4206b
note __, 16
notetype $8, $22
Music_Pinballhiscorescreen_branch_42072: ; 42072
forceoctave $2
pitchoffset 0, D_
callchannel Music_Pinballhiscorescreen_branch_42153
forceoctave $0
pitchoffset 0, C_
callchannel Music_Pinballhiscorescreen_branch_42153
callchannel Music_Pinballhiscorescreen_branch_4219a
octave 2
@ -692,9 +692,9 @@ Music_Pinballhiscorescreen_branch_42072: ; 42072
note __, 1
note D_, 1
note __, 1
forceoctave $2
pitchoffset 0, D_
callchannel Music_Pinballhiscorescreen_branch_42153
forceoctave $0
pitchoffset 0, C_
callchannel Music_Pinballhiscorescreen_branch_42153
callchannel Music_Pinballhiscorescreen_branch_4219a
callchannel Music_Pinballhiscorescreen_branch_421e1
@ -708,9 +708,9 @@ Music_Pinballhiscorescreen_branch_42072: ; 42072
note E_, 1
note __, 1
notetype $8, $22
forceoctave $2
pitchoffset 0, D_
callchannel Music_Pinballhiscorescreen_branch_42153
forceoctave $0
pitchoffset 0, C_
callchannel Music_Pinballhiscorescreen_branch_42153
callchannel Music_Pinballhiscorescreen_branch_4219a
callchannel Music_Pinballhiscorescreen_branch_421e1

View file

@ -168,9 +168,9 @@ Music_Pinballmeowthstage_branch_4971a: ; 4971a
octave 5
note C#, 10
note __, 4
forceoctave $c
pitchoffset 0, CC
callchannel Music_Pinballmeowthstage_branch_497e7
forceoctave $0
pitchoffset 0, C_
loopchannel 0, Music_Pinballmeowthstage_branch_4971a
; 497e7
@ -431,9 +431,9 @@ Music_Pinballmeowthstage_branch_4984c: ; 4984c
intensity $18
note F#, 2
note __, 2
forceoctave $c
pitchoffset 0, CC
callchannel Music_Pinballmeowthstage_branch_4993c
forceoctave $0
pitchoffset 0, C_
loopchannel 0, Music_Pinballmeowthstage_branch_4984c
; 4993c
@ -798,9 +798,9 @@ Music_Pinballmeowthstage_branch_49a21: ; 49a21
octave 2
note C#, 4
note __, 2
forceoctave $c
pitchoffset 0, CC
callchannel Music_Pinballmeowthstage_branch_49add
forceoctave $0
pitchoffset 0, C_
loopchannel 0, Music_Pinballmeowthstage_branch_49a21
; 49add

View file

@ -33,16 +33,16 @@ Music_Pinballnameentry_Ch1: ; 4d538
Music_Pinballnameentry_branch_4d55c: ; 4d55c
dutycycle $2
intensity $68
forceoctave $7
pitchoffset 0, G_
callchannel Music_Pinballnameentry_branch_4d80d
forceoctave $5
pitchoffset 0, F_
callchannel Music_Pinballnameentry_branch_4d80d
callchannel Music_Pinballnameentry_branch_4d80d
Music_Pinballnameentry_branch_4d56d: ; 4d56d
forceoctave $3
pitchoffset 0, D#
callchannel Music_Pinballnameentry_branch_4d80d
loopchannel 3, Music_Pinballnameentry_branch_4d56d
forceoctave $0
pitchoffset 0, C_
callchannel Music_Pinballnameentry_branch_4d80d
octave 3
note C#, 4
@ -911,19 +911,19 @@ Music_Pinballnameentry_branch_4d854: ; 4d854
intensity $78
note G_, 1
vibrato $18, $24
forceoctave $c
pitchoffset 0, CC
callchannel Music_Pinballnameentry_branch_4da64
forceoctave $0
pitchoffset 0, C_
octave 5
note F_, 1
note F#, 5
forceoctave $c
pitchoffset 0, CC
callchannel Music_Pinballnameentry_branch_4da8d
intensity $28
note A_, 2
octave 5
note __, 2
forceoctave $0
pitchoffset 0, C_
intensity $a8
note A_, 2
note G#, 2

View file

@ -77,29 +77,29 @@ Music_Pinballseelstage_branch_45615: ; 45615
note __, 16
note __, 1
dutycycle $2
forceoctave $7
pitchoffset 0, G_
callchannel Music_Pinballseelstage_branch_4570a
forceoctave $0
pitchoffset 0, C_
callchannel Music_Pinballseelstage_branch_456f0
forceoctave $4
pitchoffset 0, E_
callchannel Music_Pinballseelstage_branch_4570a
forceoctave $0
pitchoffset 0, C_
callchannel Music_Pinballseelstage_branch_4570a
forceoctave $7
pitchoffset 0, G_
callchannel Music_Pinballseelstage_branch_4570a
notetype $8, $b3
note __, 12
note __, 12
note __, 12
forceoctave $7
pitchoffset 0, G_
callchannel Music_Pinballseelstage_branch_4570a
forceoctave $0
pitchoffset 0, C_
callchannel Music_Pinballseelstage_branch_456f0
forceoctave $c
pitchoffset 0, CC
callchannel Music_Pinballseelstage_branch_4570a
forceoctave $4
pitchoffset 0, E_
callchannel Music_Pinballseelstage_branch_4570a
forceoctave $0
pitchoffset 0, C_
notetype $c, $b3
note __, 16
note __, 9
@ -241,28 +241,28 @@ Music_Pinballseelstage_branch_4573f: ; 4573f
note G#, 1
note __, 15
note __, 2
forceoctave $5
pitchoffset 0, F_
callchannel Music_Pinballseelstage_branch_4594f
forceoctave $0
pitchoffset 0, C_
callchannel Music_Pinballseelstage_branch_45935
forceoctave $3
pitchoffset 0, D#
callchannel Music_Pinballseelstage_branch_4594f
forceoctave $0
pitchoffset 0, C_
callchannel Music_Pinballseelstage_branch_4594f
forceoctave $0
pitchoffset 0, C_
callchannel Music_Pinballseelstage_branch_45969
intensity $b2
octave 3
note C_, 2
intensity $43
callchannel Music_Pinballseelstage_branch_45980
forceoctave $5
pitchoffset 0, F_
callchannel Music_Pinballseelstage_branch_4594f
forceoctave $0
pitchoffset 0, C_
callchannel Music_Pinballseelstage_branch_45935
forceoctave $7
pitchoffset 0, G_
callchannel Music_Pinballseelstage_branch_4594f
forceoctave $0
pitchoffset 0, C_
callchannel Music_Pinballseelstage_branch_45969
intensity $42
octave 3
@ -291,35 +291,35 @@ Music_Pinballseelstage_branch_4573f: ; 4573f
note __, 15
note __, 2
intensity $b1
forceoctave $5
pitchoffset 0, F_
callchannel Music_Pinballseelstage_branch_4594f
forceoctave $0
pitchoffset 0, C_
callchannel Music_Pinballseelstage_branch_45935
forceoctave $3
pitchoffset 0, D#
callchannel Music_Pinballseelstage_branch_4594f
forceoctave $0
pitchoffset 0, C_
callchannel Music_Pinballseelstage_branch_4594f
forceoctave $0
pitchoffset 0, C_
callchannel Music_Pinballseelstage_branch_45969
forceoctave $c
pitchoffset 0, CC
intensity $a3
octave 3
note C_, 2
callchannel Music_Pinballseelstage_branch_45980
forceoctave $5
pitchoffset 0, F_
callchannel Music_Pinballseelstage_branch_4594f
forceoctave $0
pitchoffset 0, C_
callchannel Music_Pinballseelstage_branch_45935
forceoctave $7
pitchoffset 0, G_
callchannel Music_Pinballseelstage_branch_4594f
forceoctave $0
pitchoffset 0, C_
callchannel Music_Pinballseelstage_branch_45969
intensity $32
forceoctave $c
pitchoffset 0, CC
octave 2
note G_, 2
callchannel Music_Pinballseelstage_branch_459b6
forceoctave $0
pitchoffset 0, C_
intensity $b1
octave 2
note B_, 1