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

@@ -1,360 +1,360 @@
-Music_Routes3_Ch0::
+Music_Routes3_Ch1::
 	tempo 148
 	volume 7, 7
-	duty 3
+	duty_cycle 3
 	vibrato 6, 3, 4
-	toggleperfectpitch
-	notetype 12, 11, 5
+	toggle_perfect_pitch
+	note_type 12, 11, 5
 	octave 3
-	E_ 1
-	F# 1
-	G_ 6
-	F_ 1
-	G_ 1
-	E_ 1
+	note E_, 1
+	note F#, 1
+	note G_, 6
+	note F_, 1
+	note G_, 1
+	note E_, 1
 	rest 16
 	rest 15
 
 Music_Routes3_branch_9fc3::
-	notetype 12, 11, 5
-	E_ 6
-	D_ 1
-	E_ 1
-	C_ 4
-	E_ 4
-	C_ 6
-	D_ 1
-	E_ 1
-	F_ 2
-	G_ 2
-	G_ 2
-	A_ 2
-	notetype 12, 10, 7
-	A# 8
-	F_ 8
-	D_ 8
-	F_ 8
-	notetype 12, 11, 5
-	E_ 6
-	D_ 1
-	E_ 1
-	C_ 4
-	E_ 4
-	C_ 6
-	D_ 1
-	E_ 1
-	F_ 2
-	G_ 2
-	G_ 2
-	A_ 2
-	notetype 12, 10, 7
-	A# 8
-	A# 8
-	D_ 8
-	F_ 8
-	notetype 12, 11, 5
-	E_ 4
-	E_ 2
-	F_ 2
-	G_ 4
-	F_ 2
-	E_ 2
-	B_ 2
+	note_type 12, 11, 5
+	note E_, 6
+	note D_, 1
+	note E_, 1
+	note C_, 4
+	note E_, 4
+	note C_, 6
+	note D_, 1
+	note E_, 1
+	note F_, 2
+	note G_, 2
+	note G_, 2
+	note A_, 2
+	note_type 12, 10, 7
+	note A#, 8
+	note F_, 8
+	note D_, 8
+	note F_, 8
+	note_type 12, 11, 5
+	note E_, 6
+	note D_, 1
+	note E_, 1
+	note C_, 4
+	note E_, 4
+	note C_, 6
+	note D_, 1
+	note E_, 1
+	note F_, 2
+	note G_, 2
+	note G_, 2
+	note A_, 2
+	note_type 12, 10, 7
+	note A#, 8
+	note A#, 8
+	note D_, 8
+	note F_, 8
+	note_type 12, 11, 5
+	note E_, 4
+	note E_, 2
+	note F_, 2
+	note G_, 4
+	note F_, 2
+	note E_, 2
+	note B_, 2
 	octave 2
-	G_ 4
+	note G_, 4
 	octave 3
-	B_ 8
-	A_ 2
-	notetype 8, 12, 3
-	A_ 4
-	F_ 4
-	A_ 4
-	notetype 8, 4, 15
-	A_ 12
-	notetype 8, 9, 0
-	F_ 12
-	G_ 12
-	loopchannel 0, Music_Routes3_branch_9fc3
+	note B_, 8
+	note A_, 2
+	note_type 8, 12, 3
+	note A_, 4
+	note F_, 4
+	note A_, 4
+	note_type 8, 4, 15
+	note A_, 12
+	note_type 8, 9, 0
+	note F_, 12
+	note G_, 12
+	sound_loop 0, Music_Routes3_branch_9fc3
 
 
-Music_Routes3_Ch1::
+Music_Routes3_Ch2::
 	vibrato 8, 2, 3
-	duty 2
-	notetype 12, 12, 7
+	duty_cycle 2
+	note_type 12, 12, 7
 	octave 3
-	G_ 1
-	A# 1
-	B_ 6
-	A_ 1
-	B_ 1
+	note G_, 1
+	note A#, 1
+	note B_, 6
+	note A_, 1
+	note B_, 1
 	octave 4
-	C_ 1
+	note C_, 1
 	rest 15
 	rest 16
 
 Music_Routes3_branch_a01a::
-	notetype 12, 12, 7
-	duty 2
+	note_type 12, 12, 7
+	duty_cycle 2
 	octave 4
-	C_ 6
+	note C_, 6
 	octave 3
-	G_ 1
+	note G_, 1
 	octave 4
-	C_ 1
-	E_ 10
+	note C_, 1
+	note E_, 10
 	octave 3
-	G_ 2
+	note G_, 2
 	octave 4
-	C_ 2
-	G_ 2
-	F_ 2
-	E_ 2
-	D_ 2
-	C_ 2
-	D_ 8
-	F_ 8
-	notetype 12, 12, 5
-	duty 3
+	note C_, 2
+	note G_, 2
+	note F_, 2
+	note E_, 2
+	note D_, 2
+	note C_, 2
+	note D_, 8
+	note F_, 8
+	note_type 12, 12, 5
+	duty_cycle 3
 	octave 3
-	A# 8
-	A_ 8
-	notetype 12, 12, 7
-	duty 2
+	note A#, 8
+	note A_, 8
+	note_type 12, 12, 7
+	duty_cycle 2
 	octave 4
-	C_ 6
+	note C_, 6
 	octave 3
-	G_ 1
+	note G_, 1
 	octave 4
-	C_ 1
-	E_ 10
+	note C_, 1
+	note E_, 10
 	octave 3
-	G_ 2
+	note G_, 2
 	octave 4
-	C_ 2
-	G_ 2
-	F_ 2
-	E_ 2
-	D_ 2
-	C_ 2
-	D_ 8
-	F_ 8
-	notetype 12, 12, 5
-	duty 3
+	note C_, 2
+	note G_, 2
+	note F_, 2
+	note E_, 2
+	note D_, 2
+	note C_, 2
+	note D_, 8
+	note F_, 8
+	note_type 12, 12, 5
+	duty_cycle 3
 	octave 3
-	A# 8
+	note A#, 8
 	octave 4
-	D_ 6
-	notetype 12, 12, 7
-	duty 2
-	C_ 1
-	D_ 1
-	E_ 2
-	D_ 2
-	E_ 2
-	C_ 8
+	note D_, 6
+	note_type 12, 12, 7
+	duty_cycle 2
+	note C_, 1
+	note D_, 1
+	note E_, 2
+	note D_, 2
+	note E_, 2
+	note C_, 8
 	octave 3
-	B_ 1
+	note B_, 1
 	octave 4
-	C_ 1
-	D_ 2
+	note C_, 1
+	note D_, 2
 	octave 3
-	G_ 4
+	note G_, 4
 	octave 4
-	G_ 8
-	F_ 1
-	E_ 1
-	notetype 8, 13, 3
-	F_ 4
-	E_ 4
-	notetype 8, 12, 4
-	C_ 4
-	notetype 8, 12, 5
-	C_ 12
-	notetype 12, 10, 0
-	duty 3
+	note G_, 8
+	note F_, 1
+	note E_, 1
+	note_type 8, 13, 3
+	note F_, 4
+	note E_, 4
+	note_type 8, 12, 4
+	note C_, 4
+	note_type 8, 12, 5
+	note C_, 12
+	note_type 12, 10, 0
+	duty_cycle 3
 	octave 3
-	A_ 8
-	B_ 8
-	loopchannel 0, Music_Routes3_branch_a01a
-
-
-Music_Routes3_Ch2::
-	vibrato 4, 1, 0
-	notetype 6, 1, 2
-	octave 4
-	G_ 2
-	A# 2
-	B_ 8
-	A_ 8
-	G_ 2
-	rest 2
-	G_ 7
-	rest 1
-	G_ 1
-	rest 1
-	G_ 1
-	rest 1
-	G_ 2
-	rest 2
-	G_ 2
-	rest 2
-	G_ 8
-	G_ 2
-	rest 2
-	G_ 7
-	rest 1
-	G_ 1
-	rest 1
-	G_ 1
-	rest 1
-	G_ 2
-	rest 2
-	G_ 2
-	rest 2
-	G_ 8
-
-Music_Routes3_branch_a0a3::
-	notetype 12, 1, 2
-	E_ 1
-	rest 1
-	G_ 4
-	E_ 1
-	E_ 1
-	E_ 1
-	rest 1
-	E_ 1
-	rest 1
-	G_ 4
-	E_ 1
-	rest 1
-	G_ 4
-	E_ 1
-	E_ 1
-	E_ 1
-	rest 1
-	E_ 1
-	rest 1
-	G_ 2
-	A_ 2
-	F_ 1
-	rest 1
-	A# 4
-	F_ 1
-	F_ 1
-	F_ 1
-	rest 1
-	F_ 1
-	rest 1
-	A# 4
-	F_ 1
-	rest 1
-	A# 4
-	F_ 1
-	F_ 1
-	F_ 1
-	rest 1
-	F_ 1
-	rest 1
-	A# 2
-	F_ 2
-	E_ 1
-	rest 1
-	G_ 4
-	E_ 1
-	E_ 1
-	E_ 1
-	rest 1
-	E_ 1
-	rest 1
-	G_ 4
-	E_ 1
-	rest 1
-	G_ 4
-	E_ 1
-	E_ 1
-	E_ 1
-	rest 1
-	E_ 1
-	rest 1
-	G_ 2
-	A_ 2
-	F_ 1
-	rest 1
-	A# 4
-	F_ 1
-	F_ 1
-	F_ 1
-	rest 1
-	F_ 1
-	rest 1
-	A# 4
-	F_ 1
-	rest 1
-	A# 4
-	F_ 1
-	F_ 1
-	F_ 1
-	rest 1
-	F_ 1
-	rest 1
-	A# 2
-	A_ 2
-	G_ 1
-	rest 1
-	octave 5
-	C_ 4
-	octave 4
-	G_ 1
-	G_ 1
-	G_ 1
-	rest 1
-	G_ 1
-	rest 1
-	octave 5
-	C_ 4
-	octave 4
-	G_ 1
-	rest 1
-	octave 5
-	D_ 4
-	octave 4
-	G_ 1
-	G_ 1
-	G_ 1
-	rest 1
-	G_ 1
-	rest 1
-	octave 5
-	D_ 4
-	octave 4
-	F_ 1
-	rest 1
-	octave 5
-	C_ 4
-	octave 4
-	F_ 1
-	F_ 1
-	F_ 1
-	rest 1
-	F_ 1
-	rest 1
-	octave 5
-	C_ 4
-	octave 4
-	F_ 1
-	rest 1
-	A_ 4
-	F_ 1
-	F_ 1
-	F_ 1
-	rest 1
-	F_ 1
-	rest 1
-	A_ 4
-	loopchannel 0, Music_Routes3_branch_a0a3
+	note A_, 8
+	note B_, 8
+	sound_loop 0, Music_Routes3_branch_a01a
 
 
 Music_Routes3_Ch3::
+	vibrato 4, 1, 0
+	note_type 6, 1, 2
+	octave 4
+	note G_, 2
+	note A#, 2
+	note B_, 8
+	note A_, 8
+	note G_, 2
+	rest 2
+	note G_, 7
+	rest 1
+	note G_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	note G_, 2
+	rest 2
+	note G_, 2
+	rest 2
+	note G_, 8
+	note G_, 2
+	rest 2
+	note G_, 7
+	rest 1
+	note G_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	note G_, 2
+	rest 2
+	note G_, 2
+	rest 2
+	note G_, 8
+
+Music_Routes3_branch_a0a3::
+	note_type 12, 1, 2
+	note E_, 1
+	rest 1
+	note G_, 4
+	note E_, 1
+	note E_, 1
+	note E_, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note G_, 4
+	note E_, 1
+	rest 1
+	note G_, 4
+	note E_, 1
+	note E_, 1
+	note E_, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note G_, 2
+	note A_, 2
+	note F_, 1
+	rest 1
+	note A#, 4
+	note F_, 1
+	note F_, 1
+	note F_, 1
+	rest 1
+	note F_, 1
+	rest 1
+	note A#, 4
+	note F_, 1
+	rest 1
+	note A#, 4
+	note F_, 1
+	note F_, 1
+	note F_, 1
+	rest 1
+	note F_, 1
+	rest 1
+	note A#, 2
+	note F_, 2
+	note E_, 1
+	rest 1
+	note G_, 4
+	note E_, 1
+	note E_, 1
+	note E_, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note G_, 4
+	note E_, 1
+	rest 1
+	note G_, 4
+	note E_, 1
+	note E_, 1
+	note E_, 1
+	rest 1
+	note E_, 1
+	rest 1
+	note G_, 2
+	note A_, 2
+	note F_, 1
+	rest 1
+	note A#, 4
+	note F_, 1
+	note F_, 1
+	note F_, 1
+	rest 1
+	note F_, 1
+	rest 1
+	note A#, 4
+	note F_, 1
+	rest 1
+	note A#, 4
+	note F_, 1
+	note F_, 1
+	note F_, 1
+	rest 1
+	note F_, 1
+	rest 1
+	note A#, 2
+	note A_, 2
+	note G_, 1
+	rest 1
+	octave 5
+	note C_, 4
+	octave 4
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	octave 5
+	note C_, 4
+	octave 4
+	note G_, 1
+	rest 1
+	octave 5
+	note D_, 4
+	octave 4
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	rest 1
+	note G_, 1
+	rest 1
+	octave 5
+	note D_, 4
+	octave 4
+	note F_, 1
+	rest 1
+	octave 5
+	note C_, 4
+	octave 4
+	note F_, 1
+	note F_, 1
+	note F_, 1
+	rest 1
+	note F_, 1
+	rest 1
+	octave 5
+	note C_, 4
+	octave 4
+	note F_, 1
+	rest 1
+	note A_, 4
+	note F_, 1
+	note F_, 1
+	note F_, 1
+	rest 1
+	note F_, 1
+	rest 1
+	note A_, 4
+	sound_loop 0, Music_Routes3_branch_a0a3
+
+
+Music_Routes3_Ch4::
 	dspeed 6
 	mutedsnare4 1
 	mutedsnare4 1
@@ -512,4 +512,4 @@ Music_Routes3_branch_a17a::
 	mutedsnare3 1
 	mutedsnare3 1
 	mutedsnare3 1
-	loopchannel 0, Music_Routes3_branch_a17a
+	sound_loop 0, Music_Routes3_branch_a17a