Make each pitch/instrument its own macro

audio/music/cities2.asm

@@ -7,89 +7,89 @@ Music_Cities2_Ch1:: ; b504 (2:7504)
 	notetype 12, 11, 6
 	rest 8
 	octave 3
-	note E_, 2
-	note D#, 2
-	note C#, 2
-	note C_, 2
+	E_ 2
+	D# 2
+	C# 2
+	C_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	rest 14
 
 Music_Cities2_branch_b51a::
 	octave 3
-	note B_, 4
+	B_ 4
 	octave 4
-	note C#, 2
-	note D#, 1
-	note D_, 1
-	note C#, 4
+	C# 2
+	D# 1
+	D_ 1
+	C# 4
 	octave 3
-	note B_, 4
-	note G#, 8
-	note E_, 8
-	note A_, 4
-	note G#, 2
-	note F#, 2
-	note G#, 2
-	note A_, 2
-	note B_, 2
+	B_ 4
+	G# 8
+	E_ 8
+	A_ 4
+	G# 2
+	F# 2
+	G# 2
+	A_ 2
+	B_ 2
 	octave 4
-	note C#, 2
+	C# 2
 	rest 16
-	note C#, 4
+	C# 4
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note C#, 1
-	note D#, 1
-	note C#, 4
+	C# 1
+	D# 1
+	C# 4
 	octave 3
-	note B_, 4
-	note E_, 1
-	note E_, 1
-	note E_, 1
-	note E_, 1
-	note E_, 1
+	B_ 4
+	E_ 1
+	E_ 1
+	E_ 1
+	E_ 1
+	E_ 1
 	rest 3
-	note G#, 8
-	note B_, 4
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note G#, 2
-	note A_, 2
-	note B_, 2
-	note E_, 2
-	note F#, 2
-	note G#, 2
+	G# 8
+	B_ 4
+	A_ 2
+	G# 2
+	F# 2
+	G# 2
+	A_ 2
+	B_ 2
+	E_ 2
+	F# 2
+	G# 2
 	rest 2
 	octave 4
-	note E_, 4
+	E_ 4
 	octave 3
-	note B_, 4
-	note F#, 2
-	note G#, 2
-	note A_, 2
+	B_ 4
+	F# 2
+	G# 2
+	A_ 2
 	rest 2
 	octave 4
-	note F#, 4
-	note D#, 4
+	F# 4
+	D# 4
 	octave 3
-	note E_, 2
+	E_ 2
 	rest 4
-	note F#, 2
+	F# 2
 	rest 4
-	note A_, 2
+	A_ 2
 	rest 2
-	note B_, 2
+	B_ 2
 	rest 16
 	rest 16
 	rest 14
-	note E_, 16
-	note F#, 8
-	note G#, 4
-	note F#, 4
-	note E_, 2
+	E_ 16
+	F# 8
+	G# 4
+	F# 4
+	E_ 2
 	rest 14
 	loopchannel 0, Music_Cities2_branch_b51a
 
@@ -99,184 +99,184 @@ Music_Cities2_Ch2:: ; b569 (2:7569)
 	vibrato 8, 2, 3
 	notetype 12, 12, 2
 	octave 4
-	note E_, 2
-	note D#, 2
-	note C#, 2
+	E_ 2
+	D# 2
+	C# 2
 	octave 3
-	note B_, 2
-	note A_, 2
-	note B_, 2
+	B_ 2
+	A_ 2
+	B_ 2
 	octave 4
-	note C#, 2
-	note D#, 2
-	note E_, 6
+	C# 2
+	D# 2
+	E_ 6
 	notetype 12, 12, 2
 	duty 2
 	octave 4
-	note E_, 1
+	E_ 1
 	octave 3
-	note B_, 1
+	B_ 1
 	octave 4
-	note C#, 2
-	note D#, 2
-	note E_, 1
-	note F#, 1
-	note G#, 1
-	note A_, 1
+	C# 2
+	D# 2
+	E_ 1
+	F# 1
+	G# 1
+	A_ 1
 
 Music_Cities2_branch_b58b::
 	notetype 12, 10, 6
-	note G#, 6
+	G# 6
 	notetype 12, 12, 2
-	note A_, 1
-	note G#, 1
+	A_ 1
+	G# 1
 	notetype 12, 12, 4
-	note F#, 14
+	F# 14
 	notetype 12, 12, 2
-	note E_, 1
+	E_ 1
 	octave 3
-	note B_, 1
+	B_ 1
 	octave 4
-	note C#, 2
-	note D#, 2
-	note E_, 1
-	note F#, 1
-	note G#, 1
-	note A_, 1
+	C# 2
+	D# 2
+	E_ 1
+	F# 1
+	G# 1
+	A_ 1
 	notetype 12, 12, 4
-	note G#, 6
+	G# 6
 	notetype 12, 12, 2
-	note E_, 1
-	note G#, 1
+	E_ 1
+	G# 1
 	notetype 12, 12, 5
-	note B_, 14
+	B_ 14
 	notetype 12, 12, 2
-	note E_, 1
+	E_ 1
 	octave 3
-	note B_, 1
+	B_ 1
 	octave 4
-	note C#, 2
-	note D#, 2
-	note E_, 1
-	note F#, 1
-	note G#, 1
-	note A_, 1
+	C# 2
+	D# 2
+	E_ 1
+	F# 1
+	G# 1
+	A_ 1
 	notetype 12, 10, 6
-	note G#, 6
+	G# 6
 	notetype 12, 12, 2
-	note A_, 1
-	note G#, 1
+	A_ 1
+	G# 1
 	notetype 12, 12, 4
-	note F#, 8
+	F# 8
 	notetype 12, 10, 1
 	duty 1
 	octave 3
-	note G#, 1
-	note G#, 1
-	note G#, 1
-	note G#, 1
-	note G#, 1
+	G# 1
+	G# 1
+	G# 1
+	G# 1
+	G# 1
 	rest 1
 	notetype 12, 12, 2
 	duty 2
 	octave 4
-	note E_, 1
+	E_ 1
 	octave 3
-	note B_, 1
+	B_ 1
 	octave 4
-	note C#, 2
-	note D#, 2
-	note E_, 1
-	note F#, 1
-	note G#, 1
-	note A_, 1
+	C# 2
+	D# 2
+	E_ 1
+	F# 1
+	G# 1
+	A_ 1
 	notetype 12, 12, 4
-	note G#, 6
-	note E_, 1
-	note G#, 1
+	G# 6
+	E_ 1
+	G# 1
 	notetype 12, 12, 6
-	note B_, 8
+	B_ 8
 	notetype 12, 12, 2
-	note C#, 1
+	C# 1
 	octave 3
-	note B_, 1
+	B_ 1
 	octave 4
-	note C#, 1
-	note D#, 1
-	note E_, 4
+	C# 1
+	D# 1
+	E_ 4
 	notetype 12, 12, 7
-	note G#, 4
-	note E_, 4
+	G# 4
+	E_ 4
 	notetype 12, 12, 2
-	note D#, 1
-	note C#, 1
-	note D#, 1
-	note E_, 1
-	note F#, 4
+	D# 1
+	C# 1
+	D# 1
+	E_ 1
+	F# 4
 	notetype 12, 12, 7
-	note B_, 4
-	note F#, 4
+	B_ 4
+	F# 4
 	notetype 12, 12, 2
-	note C#, 1
+	C# 1
 	octave 3
-	note B_, 1
+	B_ 1
 	octave 4
-	note C#, 1
-	note D#, 1
-	note E_, 2
-	note E_, 1
-	note D#, 1
-	note E_, 1
-	note F#, 1
-	note G#, 2
-	note G#, 1
-	note A_, 1
-	note G#, 1
-	note A_, 1
-	note B_, 1
-	note F#, 1
-	note D#, 1
-	note C#, 1
+	C# 1
+	D# 1
+	E_ 2
+	E_ 1
+	D# 1
+	E_ 1
+	F# 1
+	G# 2
+	G# 1
+	A_ 1
+	G# 1
+	A_ 1
+	B_ 1
+	F# 1
+	D# 1
+	C# 1
 	octave 3
-	note B_, 1
+	B_ 1
 	octave 4
-	note C#, 1
-	note D#, 1
-	note F#, 1
+	C# 1
+	D# 1
+	F# 1
 	notetype 12, 12, 2
-	note B_, 8
+	B_ 8
 	notetype 12, 11, 7
 	octave 3
-	note E_, 8
+	E_ 8
 	octave 2
-	note B_, 4
+	B_ 4
 	octave 3
-	note F#, 4
-	note G#, 4
-	note A_, 4
-	note B_, 8
-	note B_, 8
-	note G#, 4
+	F# 4
+	G# 4
+	A_ 4
+	B_ 8
+	B_ 8
+	G# 4
 	octave 4
-	note D#, 4
-	note C#, 4
-	note D#, 4
-	note E_, 2
-	note D#, 2
-	note C#, 2
-	note D#, 2
+	D# 4
+	C# 4
+	D# 4
+	E_ 2
+	D# 2
+	C# 2
+	D# 2
 	notetype 12, 12, 2
-	note E_, 6
-	note E_, 1
+	E_ 6
+	E_ 1
 	octave 3
-	note B_, 1
+	B_ 1
 	octave 4
-	note C#, 2
-	note D#, 2
-	note E_, 1
-	note F#, 1
-	note G#, 1
-	note A_, 1
+	C# 2
+	D# 2
+	E_ 1
+	F# 1
+	G# 1
+	A_ 1
 	loopchannel 0, Music_Cities2_branch_b58b
 
 
@@ -284,134 +284,134 @@ Music_Cities2_Ch3:: ; b640 (2:7640)
 	notetype 12, 1, 1
 	rest 16
 	octave 4
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
+	E_ 2
+	G# 2
+	E_ 2
+	G# 2
+	E_ 2
+	G# 2
+	E_ 2
+	G# 2
 
 Music_Cities2_branch_b64c::
-	note F#, 2
-	note A_, 2
-	note F#, 2
-	note A_, 2
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
-	note F#, 2
-	note A_, 2
-	note F#, 2
-	note A_, 2
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
-	note F#, 2
-	note A_, 2
-	note F#, 2
-	note A_, 2
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
-	note F#, 2
-	note A_, 2
-	note F#, 2
-	note A_, 2
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
+	F# 2
+	A_ 2
+	F# 2
+	A_ 2
+	B_ 2
+	A_ 2
+	G# 2
+	F# 2
+	E_ 2
+	G# 2
+	E_ 2
+	G# 2
+	E_ 2
+	G# 2
+	E_ 2
+	G# 2
+	F# 2
+	A_ 2
+	F# 2
+	A_ 2
+	B_ 2
+	A_ 2
+	G# 2
+	F# 2
+	E_ 2
+	G# 2
+	E_ 2
+	G# 2
+	E_ 2
+	G# 2
+	E_ 2
+	G# 2
+	F# 2
+	A_ 2
+	F# 2
+	A_ 2
+	B_ 2
+	A_ 2
+	G# 2
+	F# 2
+	E_ 2
+	G# 2
+	E_ 2
+	G# 2
+	E_ 2
+	G# 2
+	E_ 2
+	G# 2
+	F# 2
+	A_ 2
+	F# 2
+	A_ 2
+	B_ 2
+	A_ 2
+	G# 2
+	F# 2
+	E_ 2
+	G# 2
+	E_ 2
 	rest 2
-	note E_, 4
-	note G#, 4
-	note F#, 2
-	note A_, 2
-	note F#, 2
+	E_ 4
+	G# 4
+	F# 2
+	A_ 2
+	F# 2
 	rest 2
-	note F#, 4
-	note A_, 4
-	note C#, 2
+	F# 4
+	A_ 4
+	C# 2
 	rest 4
-	note E_, 2
+	E_ 2
 	rest 4
-	note G#, 2
-	note A_, 2
-	note B_, 2
+	G# 2
+	A_ 2
+	B_ 2
 	rest 8
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
-	note F#, 2
-	note A_, 2
-	note F#, 2
-	note A_, 2
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
-	note F#, 2
-	note A_, 2
-	note F#, 2
-	note A_, 2
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
+	A_ 2
+	G# 2
+	F# 2
+	E_ 2
+	G# 2
+	E_ 2
+	G# 2
+	E_ 2
+	G# 2
+	E_ 2
+	G# 2
+	F# 2
+	A_ 2
+	F# 2
+	A_ 2
+	B_ 2
+	A_ 2
+	G# 2
+	F# 2
+	E_ 2
+	G# 2
+	E_ 2
+	G# 2
+	E_ 2
+	G# 2
+	E_ 2
+	G# 2
+	F# 2
+	A_ 2
+	F# 2
+	A_ 2
+	B_ 2
+	A_ 2
+	G# 2
+	F# 2
+	E_ 2
+	G# 2
+	E_ 2
+	G# 2
+	E_ 2
+	G# 2
+	E_ 2
+	G# 2
 	loopchannel 0, Music_Cities2_branch_b64c
-; 0xb6c7
+; 0xb6c7