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/routes1.asm

@@ -1,315 +1,315 @@
-Music_Routes1_Ch0::
+Music_Routes1_Ch1::
 	tempo 152
 	volume 7, 7
 	vibrato 4, 2, 3
-	duty 2
-	toggleperfectpitch
+	duty_cycle 2
+	toggle_perfect_pitch
 
 Music_Routes1_branch_9be9::
-	notetype 12, 10, 1
+	note_type 12, 10, 1
 	rest 4
 	octave 4
-	D_ 2
-	D_ 6
-	D_ 2
-	D_ 6
-	D_ 2
-	D_ 1
-	C# 1
+	note D_, 2
+	note D_, 6
+	note D_, 2
+	note D_, 6
+	note D_, 2
+	note D_, 1
+	note C#, 1
 	octave 3
-	B_ 1
+	note B_, 1
 	octave 4
-	C# 1
+	note C#, 1
 	octave 3
-	A_ 2
-	A_ 2
-	A_ 6
+	note A_, 2
+	note A_, 2
+	note A_, 6
 	octave 4
-	C# 2
-	C# 6
-	C# 2
-	C# 4
+	note C#, 2
+	note C#, 6
+	note C#, 2
+	note C#, 4
 	octave 3
-	A_ 2
+	note A_, 2
 	octave 4
-	C# 2
+	note C#, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	C# 4
+	note C#, 4
 	octave 3
-	A_ 2
-	A_ 6
+	note A_, 2
+	note A_, 6
 	octave 4
-	D_ 2
-	D_ 6
-	D_ 2
-	D_ 6
-	D_ 2
-	D_ 1
-	E_ 1
-	D_ 1
-	C# 1
+	note D_, 2
+	note D_, 6
+	note D_, 2
+	note D_, 6
+	note D_, 2
+	note D_, 1
+	note E_, 1
+	note D_, 1
+	note C#, 1
 	octave 3
-	B_ 2
-	A_ 2
-	A_ 6
+	note B_, 2
+	note A_, 2
+	note A_, 6
 	octave 4
-	C# 2
-	C# 6
+	note C#, 2
+	note C#, 6
 	octave 3
-	A_ 2
+	note A_, 2
 	octave 4
-	E_ 2
+	note E_, 2
 	octave 3
-	A_ 2
-	notetype 12, 10, 2
+	note A_, 2
+	note_type 12, 10, 2
 	octave 4
-	G_ 4
-	E_ 4
-	F# 2
-	notetype 12, 10, 1
+	note G_, 4
+	note E_, 4
+	note F#, 2
+	note_type 12, 10, 1
 	octave 3
-	A_ 2
-	A_ 6
-	A_ 2
-	F# 2
-	A_ 4
-	B_ 2
+	note A_, 2
+	note A_, 6
+	note A_, 2
+	note F#, 2
+	note A_, 4
+	note B_, 2
 	octave 4
-	C# 2
+	note C#, 2
 	octave 3
-	B_ 4
-	A_ 2
-	F# 2
-	A_ 4
-	G_ 2
-	E_ 2
-	C# 4
-	A_ 2
+	note B_, 4
+	note A_, 2
+	note F#, 2
+	note A_, 4
+	note G_, 2
+	note E_, 2
+	note C#, 4
+	note A_, 2
 	octave 4
-	D_ 2
+	note D_, 2
 	octave 3
-	A_ 4
-	B_ 2
-	G_ 2
-	B_ 4
+	note A_, 4
+	note B_, 2
+	note G_, 2
+	note B_, 4
 	octave 4
-	D_ 2
-	E_ 2
-	C# 2
-	D_ 2
+	note D_, 2
+	note E_, 2
+	note C#, 2
+	note D_, 2
 	octave 3
-	A_ 2
-	A_ 2
-	loopchannel 0, Music_Routes1_branch_9be9
-	endchannel
-
-
-Music_Routes1_Ch1::
-	duty 2
-
-Music_Routes1_branch_9c53::
-	notetype 12, 13, 1
-	callchannel Music_Routes1_branch_9c65
-	callchannel Music_Routes1_branch_9c78
-	callchannel Music_Routes1_branch_9c65
-	callchannel Music_Routes1_branch_9c8d
-	loopchannel 0, Music_Routes1_branch_9c53
-
-Music_Routes1_branch_9c65::
-	octave 4
-	D_ 1
-	E_ 1
-	F# 2
-	F# 2
-	F# 2
-	D_ 1
-	E_ 1
-	F# 2
-	F# 2
-	F# 2
-	D_ 1
-	E_ 1
-	F# 2
-	F# 2
-	G_ 3
-	F# 1
-	E_ 6
-	endchannel
-
-Music_Routes1_branch_9c78::
-	C# 1
-	D_ 1
-	E_ 2
-	E_ 2
-	E_ 2
-	C# 1
-	D_ 1
-	E_ 2
-	E_ 2
-	E_ 2
-	C# 1
-	D_ 1
-	E_ 2
-	E_ 2
-	F# 1
-	E_ 1
-	E_ 1
-	F# 1
-	D_ 4
-	F# 2
-	endchannel
-
-Music_Routes1_branch_9c8d::
-	C# 1
-	D_ 1
-	E_ 2
-	G_ 2
-	F# 2
-	E_ 2
-	D_ 2
-	C# 2
-	octave 3
-	B_ 2
-	octave 4
-	C# 2
-	notetype 12, 13, 2
-	B_ 4
-	notetype 6, 13, 1
-	octave 3
-	B_ 1
-	octave 4
-	C# 1
-	notetype 12, 13, 1
-	octave 3
-	B_ 1
-	A_ 1
-	octave 4
-	C# 1
-	D_ 6
-	notetype 12, 13, 2
-	F# 1
-	G_ 1
-	A_ 2
-	A_ 2
-	F# 2
-	D_ 2
-	octave 5
-	D_ 2
-	C# 2
-	octave 4
-	B_ 2
-	octave 5
-	C# 2
-	octave 4
-	A_ 2
-	F# 2
-	D_ 3
-	F# 1
-	E_ 6
-	F# 1
-	G_ 1
-	A_ 2
-	A_ 2
-	F# 2
-	A_ 2
-	octave 5
-	D_ 2
-	C# 2
-	octave 4
-	B_ 3
-	G_ 1
-	A_ 2
-	octave 5
-	D_ 2
-	C# 2
-	E_ 2
-	D_ 2
-	notetype 12, 13, 1
-	octave 4
-	D_ 2
-	D_ 2
-	endchannel
-	endchannel
+	note A_, 2
+	note A_, 2
+	sound_loop 0, Music_Routes1_branch_9be9
+	sound_ret
 
 
 Music_Routes1_Ch2::
+	duty_cycle 2
+
+Music_Routes1_branch_9c53::
+	note_type 12, 13, 1
+	sound_call Music_Routes1_branch_9c65
+	sound_call Music_Routes1_branch_9c78
+	sound_call Music_Routes1_branch_9c65
+	sound_call Music_Routes1_branch_9c8d
+	sound_loop 0, Music_Routes1_branch_9c53
+
+Music_Routes1_branch_9c65::
+	octave 4
+	note D_, 1
+	note E_, 1
+	note F#, 2
+	note F#, 2
+	note F#, 2
+	note D_, 1
+	note E_, 1
+	note F#, 2
+	note F#, 2
+	note F#, 2
+	note D_, 1
+	note E_, 1
+	note F#, 2
+	note F#, 2
+	note G_, 3
+	note F#, 1
+	note E_, 6
+	sound_ret
+
+Music_Routes1_branch_9c78::
+	note C#, 1
+	note D_, 1
+	note E_, 2
+	note E_, 2
+	note E_, 2
+	note C#, 1
+	note D_, 1
+	note E_, 2
+	note E_, 2
+	note E_, 2
+	note C#, 1
+	note D_, 1
+	note E_, 2
+	note E_, 2
+	note F#, 1
+	note E_, 1
+	note E_, 1
+	note F#, 1
+	note D_, 4
+	note F#, 2
+	sound_ret
+
+Music_Routes1_branch_9c8d::
+	note C#, 1
+	note D_, 1
+	note E_, 2
+	note G_, 2
+	note F#, 2
+	note E_, 2
+	note D_, 2
+	note C#, 2
+	octave 3
+	note B_, 2
+	octave 4
+	note C#, 2
+	note_type 12, 13, 2
+	note B_, 4
+	note_type 6, 13, 1
+	octave 3
+	note B_, 1
+	octave 4
+	note C#, 1
+	note_type 12, 13, 1
+	octave 3
+	note B_, 1
+	note A_, 1
+	octave 4
+	note C#, 1
+	note D_, 6
+	note_type 12, 13, 2
+	note F#, 1
+	note G_, 1
+	note A_, 2
+	note A_, 2
+	note F#, 2
+	note D_, 2
+	octave 5
+	note D_, 2
+	note C#, 2
+	octave 4
+	note B_, 2
+	octave 5
+	note C#, 2
+	octave 4
+	note A_, 2
+	note F#, 2
+	note D_, 3
+	note F#, 1
+	note E_, 6
+	note F#, 1
+	note G_, 1
+	note A_, 2
+	note A_, 2
+	note F#, 2
+	note A_, 2
+	octave 5
+	note D_, 2
+	note C#, 2
+	octave 4
+	note B_, 3
+	note G_, 1
+	note A_, 2
+	octave 5
+	note D_, 2
+	note C#, 2
+	note E_, 2
+	note D_, 2
+	note_type 12, 13, 1
+	octave 4
+	note D_, 2
+	note D_, 2
+	sound_ret
+	sound_ret
+
+
+Music_Routes1_Ch3::
 	vibrato 8, 2, 5
-	notetype 12, 1, 3
+	note_type 12, 1, 3
 
 Music_Routes1_branch_9cdd::
 	rest 2
 	octave 4
-	D_ 4
-	C# 4
+	note D_, 4
+	note C#, 4
 	octave 3
-	B_ 4
-	A_ 4
+	note B_, 4
+	note A_, 4
 	octave 4
-	D_ 4
+	note D_, 4
 	octave 3
-	A_ 4
-	B_ 4
-	A_ 4
+	note A_, 4
+	note B_, 4
+	note A_, 4
 	octave 4
-	C# 4
+	note C#, 4
 	octave 3
-	A_ 4
-	B_ 4
+	note A_, 4
+	note B_, 4
 	octave 4
-	C_ 4
-	C# 4
+	note C_, 4
+	note C#, 4
 	octave 3
-	A_ 4
+	note A_, 4
 	octave 4
-	D_ 4
+	note D_, 4
 	octave 3
-	A_ 4
+	note A_, 4
 	octave 4
-	D_ 4
-	C# 4
+	note D_, 4
+	note C#, 4
 	octave 3
-	B_ 4
-	A_ 4
+	note B_, 4
+	note A_, 4
 	octave 4
-	D_ 4
+	note D_, 4
 	octave 3
-	A_ 4
-	B_ 4
-	A_ 4
+	note A_, 4
+	note B_, 4
+	note A_, 4
 	octave 4
-	C# 4
+	note C#, 4
 	octave 3
-	B_ 4
-	A_ 4
-	B_ 4
+	note B_, 4
+	note A_, 4
+	note B_, 4
 	octave 4
-	C# 4
+	note C#, 4
 	octave 3
-	A_ 4
+	note A_, 4
 	octave 4
-	D_ 4
+	note D_, 4
 	octave 3
-	A_ 4
+	note A_, 4
 	octave 4
-	D_ 8
+	note D_, 8
 	octave 3
-	G_ 8
-	A_ 8
+	note G_, 8
+	note A_, 8
 	octave 4
-	C# 8
-	D_ 8
+	note C#, 8
+	note D_, 8
 	octave 3
-	G_ 8
-	A_ 8
+	note G_, 8
+	note A_, 8
 	octave 4
-	D_ 6
-	loopchannel 0, Music_Routes1_branch_9cdd
-	endchannel
+	note D_, 6
+	sound_loop 0, Music_Routes1_branch_9cdd
+	sound_ret
 
 
-Music_Routes1_Ch3::
+Music_Routes1_Ch4::
 	dspeed 12
 	rest 4
 	mutedsnare1 2
@@ -400,5 +400,5 @@ Music_Routes1_Ch3::
 	rest 2
 	mutedsnare1 2
 	mutedsnare1 2
-	loopchannel 0, Music_Routes1_Ch3
-	endchannel
+	sound_loop 0, Music_Routes1_Ch4
+	sound_ret