Update audio macro names

change audio channel numbers from 0-7 back to 1-8
change all note macros back to single note macro
todo: fix comments with old macro names, update noise macros/instrument names

audio/music/routes2.asm

@@ -1,330 +1,330 @@
-Music_Routes2_Ch0::
+Music_Routes2_Ch1::
 	tempo 152
 	volume 7, 7
 	vibrato 9, 2, 5
-	duty 1
+	duty_cycle 1
 
 Music_Routes2_branch_9dc3::
-	notetype 12, 11, 2
+	note_type 12, 11, 2
 	octave 2
-	B_ 4
+	note B_, 4
 	octave 3
-	G# 6
-	F# 2
-	E_ 2
-	D# 1
-	F# 1
-	E_ 2
+	note G#, 6
+	note F#, 2
+	note E_, 2
+	note D#, 1
+	note F#, 1
+	note E_, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	E_ 2
-	A_ 2
-	G# 4
-	F# 4
+	note E_, 2
+	note A_, 2
+	note G#, 4
+	note F#, 4
 	octave 2
-	B_ 4
+	note B_, 4
 	octave 3
-	G# 6
-	F# 2
-	E_ 2
-	D# 1
-	F# 1
-	B_ 2
+	note G#, 6
+	note F#, 2
+	note E_, 2
+	note D#, 1
+	note F#, 1
+	note B_, 2
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	E_ 2
-	A_ 2
-	G# 4
-	B_ 4
-	notetype 8, 11, 2
+	note E_, 2
+	note A_, 2
+	note G#, 4
+	note B_, 4
+	note_type 8, 11, 2
 	octave 4
-	E_ 2
+	note E_, 2
 	octave 3
-	A_ 2
+	note A_, 2
 	octave 4
-	E_ 2
-	E_ 2
+	note E_, 2
+	note E_, 2
 	octave 3
-	A_ 2
+	note A_, 2
 	octave 4
-	E_ 2
-	D# 2
+	note E_, 2
+	note D#, 2
 	octave 3
-	G# 2
+	note G#, 2
 	octave 4
-	D# 2
-	D# 2
+	note D#, 2
+	note D#, 2
 	octave 3
-	G# 2
+	note G#, 2
 	octave 4
-	D# 2
-	C# 2
+	note D#, 2
+	note C#, 2
 	octave 3
-	F# 2
+	note F#, 2
 	octave 4
-	C# 2
-	C# 2
+	note C#, 2
+	note C#, 2
 	octave 3
-	F# 2
+	note F#, 2
 	octave 4
-	C# 2
+	note C#, 2
 	octave 3
-	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
+	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
 	octave 4
-	C# 2
+	note C#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	C# 2
-	D_ 2
+	note C#, 2
+	note D_, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	D_ 2
-	F# 2
-	E_ 2
-	D# 2
-	E_ 2
+	note D_, 2
+	note F#, 2
+	note E_, 2
+	note D#, 2
+	note E_, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	E_ 2
-	E_ 2
+	note E_, 2
+	note E_, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	E_ 2
-	E_ 2
+	note E_, 2
+	note E_, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	E_ 2
-	E_ 2
+	note E_, 2
+	note E_, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	E_ 2
-	loopchannel 0, Music_Routes2_branch_9dc3
-	endchannel
-
-
-Music_Routes2_Ch1::
-	vibrato 8, 2, 6
-	duty 3
-
-Music_Routes2_branch_9e54::
-	notetype 12, 13, 4
-	octave 4
-	E_ 6
-	octave 3
-	B_ 1
-	octave 4
-	E_ 1
-	F# 6
-	A_ 2
-	G# 3
-	E_ 1
-	F# 8
-	octave 3
-	D# 4
-	octave 4
-	E_ 6
-	octave 3
-	B_ 1
-	octave 4
-	E_ 1
-	F# 6
-	A_ 2
-	G# 3
-	E_ 1
-	B_ 8
-	octave 3
-	G# 4
-	octave 5
-	C# 6
-	octave 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
-	C# 4
-	octave 4
-	B_ 3
-	A_ 1
-	G# 8
-	rest 4
-	loopchannel 0, Music_Routes2_branch_9e54
-	endchannel
+	note E_, 2
+	sound_loop 0, Music_Routes2_branch_9dc3
+	sound_ret
 
 
 Music_Routes2_Ch2::
-	vibrato 9, 2, 8
+	vibrato 8, 2, 6
+	duty_cycle 3
 
-Music_Routes2_branch_9e9e::
-	notetype 12, 1, 1
+Music_Routes2_branch_9e54::
+	note_type 12, 13, 4
+	octave 4
+	note E_, 6
 	octave 3
-	E_ 2
-	rest 2
-	octave 2
-	B_ 6
+	note B_, 1
+	octave 4
+	note E_, 1
+	note F#, 6
+	note A_, 2
+	note G#, 3
+	note E_, 1
+	note F#, 8
 	octave 3
-	D_ 1
-	C# 1
-	D_ 2
-	D# 2
-	E_ 2
-	rest 2
-	octave 2
-	B_ 6
+	note D#, 4
+	octave 4
+	note E_, 6
 	octave 3
-	D_ 1
-	C# 1
-	octave 2
-	A_ 2
+	note B_, 1
+	octave 4
+	note E_, 1
+	note F#, 6
+	note A_, 2
+	note G#, 3
+	note E_, 1
+	note B_, 8
 	octave 3
-	C# 2
-	E_ 2
-	rest 2
-	octave 2
-	B_ 6
-	octave 3
-	D_ 1
-	C# 1
-	D_ 2
-	D# 2
-	E_ 2
-	rest 2
-	octave 2
-	B_ 4
-	octave 3
-	C# 2
-	octave 2
-	B_ 2
-	octave 3
-	D_ 2
-	F# 2
-	E_ 2
-	rest 2
-	octave 2
-	A_ 2
-	rest 2
-	octave 3
-	D# 2
-	rest 2
-	octave 2
-	G# 2
-	rest 2
-	octave 3
-	C# 2
-	rest 2
-	octave 2
-	F# 2
-	rest 2
-	B_ 2
-	rest 2
-	E_ 2
-	G# 2
-	F# 2
-	rest 2
-	A_ 2
-	rest 2
-	F# 2
-	rest 2
-	A_ 2
-	rest 2
-	G# 2
-	rest 2
-	B_ 2
-	rest 2
-	G# 2
-	rest 2
-	B_ 2
-	rest 2
-	F# 2
-	rest 2
-	A_ 2
-	rest 2
-	octave 3
-	C# 2
-	rest 2
-	octave 2
-	A_ 2
-	octave 3
-	C# 2
-	octave 2
-	B_ 2
-	rest 2
-	octave 3
-	E_ 2
-	rest 2
-	G# 2
-	rest 2
-	E_ 2
-	rest 2
-	loopchannel 0, Music_Routes2_branch_9e9e
-	endchannel
+	note G#, 4
+	octave 5
+	note 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
+	octave 5
+	note C#, 4
+	octave 4
+	note B_, 3
+	note A_, 1
+	note G#, 8
+	rest 4
+	sound_loop 0, Music_Routes2_branch_9e54
+	sound_ret
 
 
 Music_Routes2_Ch3::
+	vibrato 9, 2, 8
+
+Music_Routes2_branch_9e9e::
+	note_type 12, 1, 1
+	octave 3
+	note E_, 2
+	rest 2
+	octave 2
+	note B_, 6
+	octave 3
+	note D_, 1
+	note C#, 1
+	note D_, 2
+	note D#, 2
+	note E_, 2
+	rest 2
+	octave 2
+	note B_, 6
+	octave 3
+	note D_, 1
+	note C#, 1
+	octave 2
+	note A_, 2
+	octave 3
+	note C#, 2
+	note E_, 2
+	rest 2
+	octave 2
+	note B_, 6
+	octave 3
+	note D_, 1
+	note C#, 1
+	note D_, 2
+	note D#, 2
+	note E_, 2
+	rest 2
+	octave 2
+	note B_, 4
+	octave 3
+	note C#, 2
+	octave 2
+	note B_, 2
+	octave 3
+	note D_, 2
+	note F#, 2
+	note E_, 2
+	rest 2
+	octave 2
+	note A_, 2
+	rest 2
+	octave 3
+	note D#, 2
+	rest 2
+	octave 2
+	note G#, 2
+	rest 2
+	octave 3
+	note C#, 2
+	rest 2
+	octave 2
+	note F#, 2
+	rest 2
+	note B_, 2
+	rest 2
+	note E_, 2
+	note G#, 2
+	note F#, 2
+	rest 2
+	note A_, 2
+	rest 2
+	note F#, 2
+	rest 2
+	note A_, 2
+	rest 2
+	note G#, 2
+	rest 2
+	note B_, 2
+	rest 2
+	note G#, 2
+	rest 2
+	note B_, 2
+	rest 2
+	note F#, 2
+	rest 2
+	note A_, 2
+	rest 2
+	octave 3
+	note C#, 2
+	rest 2
+	octave 2
+	note A_, 2
+	octave 3
+	note C#, 2
+	octave 2
+	note B_, 2
+	rest 2
+	octave 3
+	note E_, 2
+	rest 2
+	note G#, 2
+	rest 2
+	note E_, 2
+	rest 2
+	sound_loop 0, Music_Routes2_branch_9e9e
+	sound_ret
+
+
+Music_Routes2_Ch4::
 	dspeed 12
 	snare3 2
 	rest 2
@@ -421,5 +421,5 @@ Music_Routes2_Ch3::
 	rest 3
 	snare3 3
 	rest 3
-	loopchannel 0, Music_Routes2_Ch3
-	endchannel
+	sound_loop 0, Music_Routes2_Ch4
+	sound_ret