Make each pitch/instrument its own macro

audio/music/routes2.asm

@@ -7,137 +7,137 @@ Music_Routes2_Ch1:: ; 9db9 (2:5db9)
 Music_Routes2_branch_9dc3::
 	notetype 12, 11, 2
 	octave 2
-	note B_, 4
+	B_ 4
 	octave 3
-	note G#, 6
-	note F#, 2
-	note E_, 2
-	note D#, 1
-	note F#, 1
-	note E_, 2
+	G# 6
+	F# 2
+	E_ 2
+	D# 1
+	F# 1
+	E_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note E_, 2
-	note A_, 2
-	note G#, 4
-	note F#, 4
+	E_ 2
+	A_ 2
+	G# 4
+	F# 4
 	octave 2
-	note B_, 4
+	B_ 4
 	octave 3
-	note G#, 6
-	note F#, 2
-	note E_, 2
-	note D#, 1
-	note F#, 1
-	note B_, 2
+	G# 6
+	F# 2
+	E_ 2
+	D# 1
+	F# 1
+	B_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note E_, 2
-	note A_, 2
-	note G#, 4
-	note B_, 4
+	E_ 2
+	A_ 2
+	G# 4
+	B_ 4
 	notetype 8, 11, 2
 	octave 4
-	note E_, 2
+	E_ 2
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note E_, 2
-	note E_, 2
+	E_ 2
+	E_ 2
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note E_, 2
-	note D#, 2
+	E_ 2
+	D# 2
 	octave 3
-	note G#, 2
+	G# 2
 	octave 4
-	note D#, 2
-	note D#, 2
+	D# 2
+	D# 2
 	octave 3
-	note G#, 2
+	G# 2
 	octave 4
-	note D#, 2
-	note C#, 2
+	D# 2
+	C# 2
 	octave 3
-	note F#, 2
+	F# 2
 	octave 4
-	note C#, 2
-	note C#, 2
+	C# 2
+	C# 2
 	octave 3
-	note F#, 2
+	F# 2
 	octave 4
-	note C#, 2
+	C# 2
 	octave 3
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note B_, 2
-	note E_, 2
-	note G#, 2
-	note F#, 2
-	note G#, 2
-	note A_, 2
-	note A_, 2
-	note F#, 2
-	note A_, 2
-	note F#, 2
-	note G#, 2
-	note A_, 2
-	note A_, 2
-	note F#, 2
-	note A_, 2
-	note G#, 2
-	note E_, 2
-	note B_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note A_, 2
-	note B_, 2
-	note A_, 2
+	B_ 2
+	E_ 2
+	B_ 2
+	B_ 2
+	E_ 2
+	G# 2
+	F# 2
+	G# 2
+	A_ 2
+	A_ 2
+	F# 2
+	A_ 2
+	F# 2
+	G# 2
+	A_ 2
+	A_ 2
+	F# 2
+	A_ 2
+	G# 2
+	E_ 2
+	B_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	A_ 2
+	B_ 2
+	A_ 2
 	octave 4
-	note C#, 2
+	C# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note C#, 2
-	note D_, 2
+	C# 2
+	D_ 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note D_, 2
-	note F#, 2
-	note E_, 2
-	note D#, 2
-	note E_, 2
+	D_ 2
+	F# 2
+	E_ 2
+	D# 2
+	E_ 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note E_, 2
-	note E_, 2
+	E_ 2
+	E_ 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note E_, 2
-	note E_, 2
+	E_ 2
+	E_ 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note E_, 2
-	note E_, 2
+	E_ 2
+	E_ 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note E_, 2
+	E_ 2
 	loopchannel 0, Music_Routes2_branch_9dc3
 	endchannel
 
@@ -149,68 +149,68 @@ Music_Routes2_Ch2:: ; 9e4f (2:5e4f)
 Music_Routes2_branch_9e54::
 	notetype 12, 13, 4
 	octave 4
-	note E_, 6
+	E_ 6
 	octave 3
-	note B_, 1
+	B_ 1
 	octave 4
-	note E_, 1
-	note F#, 6
-	note A_, 2
-	note G#, 3
-	note E_, 1
-	note F#, 8
+	E_ 1
+	F# 6
+	A_ 2
+	G# 3
+	E_ 1
+	F# 8
 	octave 3
-	note D#, 4
+	D# 4
 	octave 4
-	note E_, 6
+	E_ 6
 	octave 3
-	note B_, 1
+	B_ 1
 	octave 4
-	note E_, 1
-	note F#, 6
-	note A_, 2
-	note G#, 3
-	note E_, 1
-	note B_, 8
+	E_ 1
+	F# 6
+	A_ 2
+	G# 3
+	E_ 1
+	B_ 8
 	octave 3
-	note G#, 4
+	G# 4
 	octave 5
-	note C#, 6
+	C# 6
 	octave 4
-	note B_, 1
-	note A_, 1
-	note B_, 6
-	note A_, 1
-	note G#, 1
-	note A_, 6
-	note G#, 1
-	note F#, 1
-	note G#, 4
-	note F#, 2
-	note E_, 2
-	note D_, 2
-	note D_, 1
-	note E_, 1
-	note F#, 8
-	note A_, 4
-	note G#, 3
-	note F#, 1
-	note E_, 8
-	note F#, 2
-	note E_, 2
-	note D_, 2
-	note D_, 1
-	note E_, 1
-	note F#, 2
-	note F#, 1
-	note G#, 1
-	note A_, 4
+	B_ 1
+	A_ 1
+	B_ 6
+	A_ 1
+	G# 1
+	A_ 6
+	G# 1
+	F# 1
+	G# 4
+	F# 2
+	E_ 2
+	D_ 2
+	D_ 1
+	E_ 1
+	F# 8
+	A_ 4
+	G# 3
+	F# 1
+	E_ 8
+	F# 2
+	E_ 2
+	D_ 2
+	D_ 1
+	E_ 1
+	F# 2
+	F# 1
+	G# 1
+	A_ 4
 	octave 5
-	note C#, 4
+	C# 4
 	octave 4
-	note B_, 3
-	note A_, 1
-	note G#, 8
+	B_ 3
+	A_ 1
+	G# 8
 	rest 4
 	loopchannel 0, Music_Routes2_branch_9e54
 	endchannel
@@ -222,103 +222,103 @@ Music_Routes2_Ch3:: ; 9e9b (2:5e9b)
 Music_Routes2_branch_9e9e::
 	notetype 12, 1, 1
 	octave 3
-	note E_, 2
+	E_ 2
 	rest 2
 	octave 2
-	note B_, 6
+	B_ 6
 	octave 3
-	note D_, 1
-	note C#, 1
-	note D_, 2
-	note D#, 2
-	note E_, 2
+	D_ 1
+	C# 1
+	D_ 2
+	D# 2
+	E_ 2
 	rest 2
 	octave 2
-	note B_, 6
+	B_ 6
 	octave 3
-	note D_, 1
-	note C#, 1
+	D_ 1
+	C# 1
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note C#, 2
-	note E_, 2
+	C# 2
+	E_ 2
 	rest 2
 	octave 2
-	note B_, 6
+	B_ 6
 	octave 3
-	note D_, 1
-	note C#, 1
-	note D_, 2
-	note D#, 2
-	note E_, 2
+	D_ 1
+	C# 1
+	D_ 2
+	D# 2
+	E_ 2
 	rest 2
 	octave 2
-	note B_, 4
+	B_ 4
 	octave 3
-	note C#, 2
+	C# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note D_, 2
-	note F#, 2
-	note E_, 2
+	D_ 2
+	F# 2
+	E_ 2
 	rest 2
 	octave 2
-	note A_, 2
+	A_ 2
 	rest 2
 	octave 3
-	note D#, 2
+	D# 2
 	rest 2
 	octave 2
-	note G#, 2
+	G# 2
 	rest 2
 	octave 3
-	note C#, 2
+	C# 2
 	rest 2
 	octave 2
-	note F#, 2
+	F# 2
 	rest 2
-	note B_, 2
+	B_ 2
 	rest 2
-	note E_, 2
-	note G#, 2
-	note F#, 2
+	E_ 2
+	G# 2
+	F# 2
 	rest 2
-	note A_, 2
+	A_ 2
 	rest 2
-	note F#, 2
+	F# 2
 	rest 2
-	note A_, 2
+	A_ 2
 	rest 2
-	note G#, 2
+	G# 2
 	rest 2
-	note B_, 2
+	B_ 2
 	rest 2
-	note G#, 2
+	G# 2
 	rest 2
-	note B_, 2
+	B_ 2
 	rest 2
-	note F#, 2
+	F# 2
 	rest 2
-	note A_, 2
+	A_ 2
 	rest 2
 	octave 3
-	note C#, 2
+	C# 2
 	rest 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note C#, 2
+	C# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	rest 2
 	octave 3
-	note E_, 2
+	E_ 2
 	rest 2
-	note G#, 2
+	G# 2
 	rest 2
-	note E_, 2
+	E_ 2
 	rest 2
 	loopchannel 0, Music_Routes2_branch_9e9e
 	endchannel
@@ -326,101 +326,101 @@ Music_Routes2_branch_9e9e::
 
 Music_Routes2_Ch4:: ; 9f08 (2:5f08)
 	dspeed 12
-	dnote 2, snare3
+	snare3 2
 	rest 2
-	dnote 1, snare3
+	snare3 1
 	rest 5
-	dnote 1, snare3
-	dnote 1, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
+	snare3 1
+	snare3 1
+	snare3 2
+	snare3 2
+	snare3 2
 	rest 2
 	dspeed 8
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 3, snare3
-	dnote 3, snare3
+	snare3 2
+	snare3 2
+	snare3 2
+	snare3 3
+	snare3 3
 	dspeed 12
-	dnote 1, snare3
+	snare3 1
 	rest 3
-	dnote 2, snare3
+	snare3 2
 	rest 2
-	dnote 2, snare3
+	snare3 2
 	rest 4
-	dnote 1, snare3
-	dnote 1, snare3
-	dnote 2, snare3
+	snare3 1
+	snare3 1
+	snare3 2
 	rest 2
-	dnote 2, snare3
+	snare3 2
 	rest 2
 	dspeed 8
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 3, snare3
-	dnote 3, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 3, snare3
+	snare3 2
+	snare3 2
+	snare3 2
+	snare3 3
+	snare3 3
+	snare3 2
+	snare3 2
+	snare3 2
+	snare3 3
 	rest 3
 	dspeed 12
-	dnote 1, snare3
+	snare3 1
 	rest 5
-	dnote 1, snare3
-	dnote 1, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
+	snare3 1
+	snare3 1
+	snare3 2
+	snare3 2
+	snare3 2
 	rest 2
 	dspeed 8
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 3, snare3
+	snare3 2
+	snare3 2
+	snare3 2
+	snare3 3
 	rest 3
 	dspeed 12
-	dnote 1, snare3
+	snare3 1
 	rest 3
-	dnote 2, snare3
+	snare3 2
 	rest 2
-	dnote 2, snare3
+	snare3 2
 	rest 4
-	dnote 1, snare3
-	dnote 1, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
+	snare3 1
+	snare3 1
+	snare3 2
+	snare3 2
+	snare3 2
 	rest 2
 	dspeed 8
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 3, snare3
+	snare3 2
+	snare3 2
+	snare3 2
+	snare3 3
 	rest 3
-	dnote 3, snare3
-	dnote 3, snare3
-	dnote 3, snare3
+	snare3 3
+	snare3 3
+	snare3 3
 	rest 3
 	dspeed 12
-	dnote 1, snare3
+	snare3 1
 	rest 5
-	dnote 1, snare3
-	dnote 1, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
+	snare3 1
+	snare3 1
+	snare3 2
+	snare3 2
+	snare3 2
 	rest 2
 	dspeed 8
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 3, snare3
+	snare3 2
+	snare3 2
+	snare3 2
+	snare3 3
 	rest 3
-	dnote 3, snare3
+	snare3 3
 	rest 3
 	loopchannel 0, Music_Routes2_Ch4
 	endchannel
-; 0x9fad
+; 0x9fad