aboutsummaryrefslogtreecommitdiffstats
path: root/audio/music/cities1.asm
diff options
context:
space:
mode:
authorU-Fish-PC\Daniel <corrnondacqb@yahoo.com>2014-06-10 11:42:56 -0400
committerU-Fish-PC\Daniel <corrnondacqb@yahoo.com>2014-06-10 11:42:56 -0400
commitfee52c53a40f8e36dfccfbe73668bfc2858c2a95 (patch)
treefa97722414873b5203cd650ff02a66868766837c /audio/music/cities1.asm
parentMore music bank references (diff)
downloadpokeyellow-fee52c53a40f8e36dfccfbe73668bfc2858c2a95.tar.gz
pokeyellow-fee52c53a40f8e36dfccfbe73668bfc2858c2a95.tar.xz
pokeyellow-fee52c53a40f8e36dfccfbe73668bfc2858c2a95.zip
Make each pitch/instrument its own macro
Diffstat (limited to 'audio/music/cities1.asm')
-rw-r--r--audio/music/cities1.asm878
1 files changed, 439 insertions, 439 deletions
diff --git a/audio/music/cities1.asm b/audio/music/cities1.asm
index 03ac21e0..82754e0e 100644
--- a/audio/music/cities1.asm
+++ b/audio/music/cities1.asm
@@ -13,258 +13,258 @@ Music_Cities1_branch_aa79::
Music_Cities1_branch_aa80::
notetype 12, 12, 5
octave 3
- note G#, 4
- note F#, 4
- note E_, 2
- note E_, 2
- note F#, 2
- note D#, 2
- note E_, 2
- note E_, 2
- note D#, 2
- note C#, 4
- note D#, 4
- note E_, 2
- note D#, 4
- note C#, 2
- note E_, 2
- note E_, 4
+ G# 4
+ F# 4
+ E_ 2
+ E_ 2
+ F# 2
+ D# 2
+ E_ 2
+ E_ 2
+ D# 2
+ C# 4
+ D# 4
+ E_ 2
+ D# 4
+ C# 2
+ E_ 2
+ E_ 4
notetype 12, 10, 5
- note C#, 4
+ C# 4
octave 2
- note B_, 6
+ B_ 6
octave 3
- note C#, 2
- note C#, 4
+ C# 2
+ C# 4
octave 2
- note B_, 4
+ B_ 4
notetype 12, 12, 5
callchannel Music_Cities1_branch_ab7d
octave 3
- note D#, 6
- note E_, 2
+ D# 6
+ E_ 2
octave 2
- note B_, 4
+ B_ 4
notetype 12, 10, 5
octave 3
- note C#, 2
+ C# 2
octave 2
- note B_, 2
- note A_, 4
- note B_, 4
- note B_, 2
+ B_ 2
+ A_ 4
+ B_ 4
+ B_ 2
octave 3
- note C#, 2
- note D#, 2
- note E_, 2
- note D#, 2
- note C#, 2
- note D#, 2
+ C# 2
+ D# 2
+ E_ 2
+ D# 2
+ C# 2
+ D# 2
notetype 12, 12, 5
- note G#, 2
- note E_, 2
- note F#, 2
- note E_, 2
- note E_, 4
- note F#, 2
- note D#, 2
- note E_, 4
- note D#, 2
- note C#, 4
- note D#, 4
- note E_, 2
- note D#, 2
- note C#, 2
- note C#, 2
- note E_, 2
- note E_, 4
+ G# 2
+ E_ 2
+ F# 2
+ E_ 2
+ E_ 4
+ F# 2
+ D# 2
+ E_ 4
+ D# 2
+ C# 4
+ D# 4
+ E_ 2
+ D# 2
+ C# 2
+ C# 2
+ E_ 2
+ E_ 4
notetype 12, 10, 5
- note C#, 2
+ C# 2
octave 2
- note A_, 2
- note B_, 6
+ A_ 2
+ B_ 6
octave 3
- note C#, 2
- note C#, 2
+ C# 2
+ C# 2
octave 2
- note B_, 2
- note B_, 4
+ B_ 2
+ B_ 4
notetype 12, 12, 5
callchannel Music_Cities1_branch_ab7d
octave 3
- note D#, 4
- note D#, 2
- note E_, 2
+ D# 4
+ D# 2
+ E_ 2
octave 2
- note B_, 2
+ B_ 2
octave 3
- note C#, 2
- note G#, 2
- note E_, 4
+ C# 2
+ G# 2
+ E_ 4
octave 2
- note B_, 2
+ B_ 2
octave 3
- note E_, 2
+ E_ 2
notetype 12, 10, 5
- note C#, 4
+ C# 4
octave 2
- note B_, 2
+ B_ 2
octave 3
- note D#, 4
- note C#, 2
- note E_, 4
+ D# 4
+ C# 2
+ E_ 4
notetype 12, 11, 3
callchannel Music_Cities1_branch_ab8a
- note A_, 2
- note B_, 2
- note A_, 2
- note G#, 2
- note A_, 4
- note F#, 4
- note G#, 2
- note E_, 2
+ A_ 2
+ B_ 2
+ A_ 2
+ G# 2
+ A_ 4
+ F# 4
+ G# 2
+ E_ 2
octave 2
- note B_, 2
+ B_ 2
octave 3
- note E_, 4
- note G#, 2
+ E_ 4
+ G# 2
octave 2
- note B_, 2
+ B_ 2
octave 3
- note E_, 2
- note E_, 2
- note F#, 2
- note E_, 2
- note D#, 2
- note E_, 2
- note D#, 2
- note C#, 2
+ E_ 2
+ E_ 2
+ F# 2
+ E_ 2
+ D# 2
+ E_ 2
+ D# 2
+ C# 2
octave 2
- note B_, 2
+ B_ 2
octave 3
Music_Cities1_branch_ab12::
- note C#, 2
- note D#, 2
- note C#, 2
+ C# 2
+ D# 2
+ C# 2
octave 2
- note B_, 4
- note B_, 2
+ B_ 4
+ B_ 2
octave 3
- note C#, 2
- note D#, 2
+ C# 2
+ D# 2
loopchannel 2, Music_Cities1_branch_ab12
- note E_, 2
+ E_ 2
octave 2
- note B_, 4
+ B_ 4
octave 3
- note E_, 4
+ E_ 4
octave 2
- note B_, 2
+ B_ 2
octave 3
- note C#, 2
- note G#, 2
- note G#, 2
+ C# 2
+ G# 2
+ G# 2
octave 2
- note B_, 2
+ B_ 2
octave 3
- note F#, 2
+ F# 2
octave 2
- note B_, 2
+ B_ 2
octave 3
- note E_, 2
+ E_ 2
octave 2
- note B_, 2
+ B_ 2
octave 3
- note D#, 2
+ D# 2
octave 2
- note B_, 2
+ B_ 2
octave 3
callchannel Music_Cities1_branch_ab8a
- note A_, 2
- note E_, 2
- note A_, 2
- note B_, 2
- note A_, 2
- note G#, 2
- note A_, 2
- note F#, 2
- note G#, 2
- note E_, 2
+ A_ 2
+ E_ 2
+ A_ 2
+ B_ 2
+ A_ 2
+ G# 2
+ A_ 2
+ F# 2
+ G# 2
+ E_ 2
octave 2
- note B_, 2
+ B_ 2
octave 3
- note E_, 2
- note C#, 2
- note G#, 2
- note C#, 2
- note D#, 2
- note B_, 2
- note E_, 2
- note G#, 2
- note E_, 2
- note F#, 2
- note E_, 4
- note G#, 2
- note F#, 2
- note D#, 2
+ E_ 2
+ C# 2
+ G# 2
+ C# 2
+ D# 2
+ B_ 2
+ E_ 2
+ G# 2
+ E_ 2
+ F# 2
+ E_ 4
+ G# 2
+ F# 2
+ D# 2
octave 2
- note B_, 2
+ B_ 2
octave 3
- note D#, 4
- note F#, 2
- note D#, 2
- note D#, 2
- note F#, 2
+ D# 4
+ F# 2
+ D# 2
+ D# 2
+ F# 2
octave 2
- note B_, 2
+ B_ 2
octave 3
- note E_, 2
+ E_ 2
octave 2
- note B_, 2
+ B_ 2
octave 3
- note D#, 2
+ D# 2
octave 2
- note B_, 2
- note B_, 2
+ B_ 2
+ B_ 2
octave 3
- note D#, 2
+ D# 2
notetype 12, 11, 6
- note F#, 8
- note F#, 4
- note D#, 4
- note E_, 8
+ F# 8
+ F# 4
+ D# 4
+ E_ 8
notetype 12, 8, 4
octave 2
- note B_, 4
+ B_ 4
octave 3
- note E_, 2
- note F#, 2
+ E_ 2
+ F# 2
loopchannel 0, Music_Cities1_branch_aa80
Music_Cities1_branch_ab7d::
octave 3
- note F#, 2
- note D#, 4
- note E_, 2
- note D#, 4
- note C#, 4
+ F# 2
+ D# 4
+ E_ 2
+ D# 4
+ C# 4
octave 2
- note B_, 4
+ B_ 4
octave 3
- note C#, 2
- note D#, 2
- note C#, 2
+ C# 2
+ D# 2
+ C# 2
endchannel
Music_Cities1_branch_ab8a::
- note A_, 2
- note E_, 2
- note C#, 2
- note E_, 4
- note A_, 2
- note C#, 2
- note E_, 2
+ A_ 2
+ E_ 2
+ C# 2
+ E_ 4
+ A_ 2
+ C# 2
+ E_ 2
endchannel
@@ -272,132 +272,132 @@ Music_Cities1_Ch2:: ; ab92 (2:6b92)
vibrato 5, 1, 5
callchannel Music_Cities1_branch_ac00
octave 4
- note G#, 2
+ G# 2
notetype 12, 12, 4
- note E_, 6
+ E_ 6
notetype 12, 12, 5
duty 3
octave 3
- note C#, 4
- note D#, 4
- note E_, 6
- note F#, 6
- note G#, 4
+ C# 4
+ D# 4
+ E_ 6
+ F# 6
+ G# 4
callchannel Music_Cities1_branch_ac00
octave 4
- note G#, 2
+ G# 2
notetype 12, 12, 4
- note E_, 14
+ E_ 14
duty 3
octave 3
- note E_, 6
- note F#, 6
- note G#, 4
+ E_ 6
+ F# 6
+ G# 4
notetype 12, 11, 7
duty 2
vibrato 8, 1, 7
octave 5
- note C#, 12
+ C# 12
octave 4
- note A_, 4
+ A_ 4
octave 5
- note E_, 8
- note F#, 2
- note E_, 2
- note D#, 2
- note C#, 2
+ E_ 8
+ F# 2
+ E_ 2
+ D# 2
+ C# 2
octave 4
- note B_, 12
- note G#, 4
- note B_, 16
- note F#, 12
- note G#, 2
- note A_, 2
- note B_, 4
- note A_, 4
- note G#, 4
- note F#, 4
- note G#, 12
- note E_, 4
- note B_, 16
+ B_ 12
+ G# 4
+ B_ 16
+ F# 12
+ G# 2
+ A_ 2
+ B_ 4
+ A_ 4
+ G# 4
+ F# 4
+ G# 12
+ E_ 4
+ B_ 16
octave 5
- note C#, 12
- note D#, 2
- note E_, 2
- note F#, 4
- note E_, 4
- note D#, 4
- note C#, 4
+ C# 12
+ D# 2
+ E_ 2
+ F# 4
+ E_ 4
+ D# 4
+ C# 4
octave 4
- note B_, 12
+ B_ 12
octave 5
- note C#, 2
- note D#, 2
- note C#, 4
+ C# 2
+ D# 2
+ C# 4
octave 4
- note B_, 4
- note A_, 4
- note G#, 4
- note A_, 12
- note B_, 2
+ B_ 4
+ A_ 4
+ G# 4
+ A_ 12
+ B_ 2
octave 5
- note C_, 2
- note C_, 4
+ C_ 2
+ C_ 4
octave 4
- note B_, 4
- note A_, 4
- note F#, 4
+ B_ 4
+ A_ 4
+ F# 4
notetype 12, 11, 7
- note A_, 8
+ A_ 8
octave 5
- note C_, 8
+ C_ 8
octave 4
- note B_, 14
+ B_ 14
notetype 12, 8, 4
- note G#, 1
+ G# 1
notetype 12, 10, 4
- note A_, 1
+ A_ 1
loopchannel 0, Music_Cities1_Ch2
Music_Cities1_branch_ac00::
duty 2
notetype 12, 12, 3
octave 4
- note B_, 4
- note A_, 4
+ B_ 4
+ A_ 4
notetype 12, 12, 4
- note G#, 10
+ G# 10
notetype 12, 12, 3
- note G#, 2
- note A_, 2
- note B_, 4
- note B_, 2
- note A_, 2
- note G#, 2
- note A_, 2
+ G# 2
+ A_ 2
+ B_ 4
+ B_ 2
+ A_ 2
+ G# 2
+ A_ 2
notetype 12, 12, 4
- note F#, 10
+ F# 10
notetype 12, 12, 5
duty 3
octave 3
- note E_, 4
- note D#, 8
- note E_, 4
- note F#, 4
+ E_ 4
+ D# 8
+ E_ 4
+ F# 4
notetype 12, 12, 3
duty 2
octave 4
- note A_, 4
- note G#, 4
+ A_ 4
+ G# 4
notetype 12, 12, 4
- note F#, 10
+ F# 10
notetype 12, 12, 3
- note F#, 2
- note G#, 2
- note A_, 4
- note A_, 2
- note G#, 2
- note F#, 2
+ F# 2
+ G# 2
+ A_ 4
+ A_ 2
+ G# 2
+ F# 2
endchannel
@@ -411,171 +411,171 @@ Music_Cities1_branch_ac35::
callchannel Music_Cities1_branch_acc5
callchannel Music_Cities1_branch_acc5
callchannel Music_Cities1_branch_acce
- note G#, 2
- note E_, 2
- note F#, 2
- note G#, 2
+ G# 2
+ E_ 2
+ F# 2
+ G# 2
rest 2
- note E_, 2
- note F#, 2
- note G#, 2
+ E_ 2
+ F# 2
+ G# 2
callchannel Music_Cities1_branch_acc5
- note B_, 2
- note E_, 2
- note F#, 2
- note G#, 2
+ B_ 2
+ E_ 2
+ F# 2
+ G# 2
rest 2
- note E_, 2
- note F#, 2
- note G#, 2
+ E_ 2
+ F# 2
+ G# 2
callchannel Music_Cities1_branch_acc5
callchannel Music_Cities1_branch_acce
- note G#, 2
- note E_, 2
- note F#, 2
- note G#, 2
+ G# 2
+ E_ 2
+ F# 2
+ G# 2
rest 2
- note G#, 2
- note E_, 2
- note B_, 2
+ G# 2
+ E_ 2
+ B_ 2
rest 2
- note E_, 2
- note F#, 2
- note E_, 2
- note G#, 2
- note E_, 2
- note B_, 2
- note E_, 2
+ E_ 2
+ F# 2
+ E_ 2
+ G# 2
+ E_ 2
+ B_ 2
+ E_ 2
vibrato 8, 2, 5
- note A_, 8
- note E_, 8
- note A_, 8
- note F#, 8
- note G#, 8
- note E_, 8
- note G#, 12
- note E_, 4
- note F#, 2
- note F#, 2
- note D#, 2
- note E_, 4
- note F#, 2
- note D#, 2
- note E_, 2
- note F#, 2
- note F#, 2
- note B_, 2
- note A_, 2
- note G#, 2
- note A_, 2
- note G#, 2
- note F#, 2
- note G#, 2
- note G#, 2
- note E_, 2
- note G#, 2
+ A_ 8
+ E_ 8
+ A_ 8
+ F# 8
+ G# 8
+ E_ 8
+ G# 12
+ E_ 4
+ F# 2
+ F# 2
+ D# 2
+ E_ 4
+ F# 2
+ D# 2
+ E_ 2
+ F# 2
+ F# 2
+ B_ 2
+ A_ 2
+ G# 2
+ A_ 2
+ G# 2
+ F# 2
+ G# 2
+ G# 2
+ E_ 2
+ G# 2
rest 2
- note E_, 2
- note F#, 2
- note G#, 2
+ E_ 2
+ F# 2
+ G# 2
rest 2
- note E_, 2
- note F#, 2
- note G#, 2
- note B_, 2
- note A_, 2
- note G#, 2
- note F#, 2
- note A_, 8
- note E_, 8
- note A_, 8
- note B_, 2
- note A_, 2
- note G#, 2
- note F#, 2
- note G#, 8
- note E_, 8
- note B_, 4
- note E_, 4
- note F#, 4
- note G#, 4
+ E_ 2
+ F# 2
+ G# 2
+ B_ 2
+ A_ 2
+ G# 2
+ F# 2
+ A_ 8
+ E_ 8
+ A_ 8
+ B_ 2
+ A_ 2
+ G# 2
+ F# 2
+ G# 8
+ E_ 8
+ B_ 4
+ E_ 4
+ F# 4
+ G# 4
rest 2
- note D#, 2
- note E_, 2
- note F#, 2
+ D# 2
+ E_ 2
+ F# 2
rest 2
- note F#, 2
- note B_, 2
- note A_, 2
- note A_, 4
- note G#, 4
- note F#, 2
- note D#, 2
- note A_, 2
- note F#, 2
+ F# 2
+ B_ 2
+ A_ 2
+ A_ 4
+ G# 4
+ F# 2
+ D# 2
+ A_ 2
+ F# 2
rest 2
- note E_, 2
- note F#, 2
- note G#, 2
+ E_ 2
+ F# 2
+ G# 2
rest 2
- note E_, 2
- note F#, 1
- note G#, 1
- note E_, 1
- note F#, 1
- note G#, 4
- note B_, 2
- note A_, 2
- note G#, 2
- note A_, 2
- note G#, 2
- note F#, 2
+ E_ 2
+ F# 1
+ G# 1
+ E_ 1
+ F# 1
+ G# 4
+ B_ 2
+ A_ 2
+ G# 2
+ A_ 2
+ G# 2
+ F# 2
loopchannel 0, Music_Cities1_branch_ac35
Music_Cities1_branch_acc5::
rest 2
- note E_, 2
- note F#, 2
- note G#, 2
+ E_ 2
+ F# 2
+ G# 2
rest 2
- note E_, 2
- note F#, 2
- note G#, 2
+ E_ 2
+ F# 2
+ G# 2
endchannel
Music_Cities1_branch_acce::
- note A_, 2
- note F#, 2
- note G#, 2
- note A_, 2
+ A_ 2
+ F# 2
+ G# 2
+ A_ 2
rest 2
- note A_, 2
- note G#, 2
- note F#, 2
+ A_ 2
+ G# 2
+ F# 2
rest 2
- note F#, 2
- note G#, 2
- note A_, 2
+ F# 2
+ G# 2
+ A_ 2
rest 2
- note A_, 2
- note G#, 2
- note F#, 2
- note D#, 2
- note D#, 2
- note E_, 2
- note F#, 2
+ A_ 2
+ G# 2
+ F# 2
+ D# 2
+ D# 2
+ E_ 2
+ F# 2
rest 2
- note D#, 2
- note E_, 2
- note F#, 2
+ D# 2
+ E_ 2
+ F# 2
rest 2
- note D#, 2
- note E_, 2
- note F#, 2
+ D# 2
+ E_ 2
+ F# 2
rest 2
- note D#, 2
- note E_, 2
- note F#, 2
+ D# 2
+ E_ 2
+ F# 2
endchannel
@@ -591,68 +591,68 @@ Music_Cities1_branch_acf3::
callchannel Music_Cities1_branch_ad36
callchannel Music_Cities1_branch_ad5f
callchannel Music_Cities1_branch_ad52
- dnote 6, triangle1
- dnote 6, triangle1
- dnote 4, triangle2
+ triangle1 6
+ triangle1 6
+ triangle2 4
callchannel Music_Cities1_branch_ad6e
callchannel Music_Cities1_branch_ad5f
callchannel Music_Cities1_branch_ad52
callchannel Music_Cities1_branch_ad6e
callchannel Music_Cities1_branch_ad52
- dnote 6, triangle1
- dnote 6, triangle1
- dnote 2, triangle2
- dnote 2, triangle1
- dnote 6, triangle1
- dnote 6, triangle1
- dnote 4, triangle1
- dnote 6, triangle1
- dnote 6, snare6
- dnote 4, snare6
+ triangle1 6
+ triangle1 6
+ triangle2 2
+ triangle1 2
+ triangle1 6
+ triangle1 6
+ triangle1 4
+ triangle1 6
+ snare6 6
+ snare6 4
loopchannel 0, Music_Cities1_Ch4
Music_Cities1_branch_ad36::
- dnote 6, snare6
- dnote 6, snare6
- dnote 4, snare6
- dnote 6, snare6
- dnote 6, snare6
- dnote 2, snare6
- dnote 2, snare6
+ snare6 6
+ snare6 6
+ snare6 4
+ snare6 6
+ snare6 6
+ snare6 2
+ snare6 2
endchannel
Music_Cities1_branch_ad45::
- dnote 6, snare6
- dnote 6, snare6
- dnote 4, snare6
- dnote 6, snare6
- dnote 6, snare6
- dnote 4, snare6
+ snare6 6
+ snare6 6
+ snare6 4
+ snare6 6
+ snare6 6
+ snare6 4
endchannel
Music_Cities1_branch_ad52::
- dnote 6, triangle1
- dnote 6, triangle1
- dnote 4, triangle2
- dnote 6, triangle1
- dnote 6, triangle1
- dnote 4, triangle2
+ triangle1 6
+ triangle1 6
+ triangle2 4
+ triangle1 6
+ triangle1 6
+ triangle2 4
endchannel
Music_Cities1_branch_ad5f::
- dnote 6, triangle1
- dnote 6, triangle1
- dnote 4, triangle2
- dnote 6, triangle1
- dnote 6, triangle1
- dnote 2, triangle2
- dnote 2, triangle1
+ triangle1 6
+ triangle1 6
+ triangle2 4
+ triangle1 6
+ triangle1 6
+ triangle2 2
+ triangle1 2
endchannel
Music_Cities1_branch_ad6e::
- dnote 6, triangle1
- dnote 6, triangle1
- dnote 2, triangle2
- dnote 2, triangle2
+ triangle1 6
+ triangle1 6
+ triangle2 2
+ triangle2 2
endchannel
-; 0xad77 \ No newline at end of file
+; 0xad77