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

@@ -1,338 +1,338 @@
-Music_UnusedSong_Ch0::
+Music_UnusedSong_Ch1::
 	tempo 144
 	volume 7, 7
 	vibrato 5, 1, 6
 
 Music_UnusedSong_branch_a91b::
-	notetype 12, 1, 0
+	note_type 12, 1, 0
 	octave 6
-	E_ 1
+	note E_, 1
 	rest 1
 	octave 5
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 6
-	C# 1
+	note C#, 1
 	rest 1
 	octave 5
-	B_ 1
+	note B_, 1
 	octave 6
-	E_ 1
+	note E_, 1
 	rest 4
-	E_ 2
+	note E_, 2
 	rest 2
-	D# 1
+	note D#, 1
 	rest 1
 	octave 5
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 6
-	C# 1
+	note C#, 1
 	rest 1
 	octave 5
-	B_ 1
+	note B_, 1
 	octave 6
-	D# 1
+	note D#, 1
 	rest 8
-	C# 1
+	note C#, 1
 	rest 1
-	D# 1
+	note D#, 1
 	rest 1
-	C# 1
+	note C#, 1
 	octave 5
-	B_ 1
+	note B_, 1
 	rest 2
 	octave 6
-	C# 1
+	note C#, 1
 	rest 1
-	D# 1
+	note D#, 1
 	rest 1
-	C# 1
+	note C#, 1
 	octave 5
-	B_ 1
+	note B_, 1
 	rest 2
 	octave 6
-	D# 4
-	C# 4
-	D# 1
-	E_ 1
+	note D#, 4
+	note C#, 4
+	note D#, 1
+	note E_, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
 	octave 5
-	B_ 2
+	note B_, 2
 	rest 1
 	octave 6
-	E_ 1
+	note E_, 1
 	rest 1
 	octave 5
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 6
-	C# 1
+	note C#, 1
 	rest 1
 	octave 5
-	B_ 1
+	note B_, 1
 	octave 6
-	E_ 1
+	note E_, 1
 	rest 8
-	D# 1
+	note D#, 1
 	rest 1
 	octave 5
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 6
-	C# 1
+	note C#, 1
 	rest 1
 	octave 5
-	B_ 1
+	note B_, 1
 	octave 6
-	D# 1
+	note D#, 1
 	rest 4
 	octave 5
-	B_ 2
+	note B_, 2
 	rest 2
 	octave 6
-	C# 1
+	note C#, 1
 	rest 1
-	D# 1
+	note D#, 1
 	rest 1
-	C# 1
+	note C#, 1
 	octave 5
-	B_ 1
+	note B_, 1
 	rest 2
 	octave 6
-	C# 1
+	note C#, 1
 	rest 1
-	D# 1
+	note D#, 1
 	rest 1
-	E_ 1
-	F# 1
+	note E_, 1
+	note F#, 1
 	rest 2
-	F# 4
-	E_ 4
-	F# 1
-	G# 1
+	note F#, 4
+	note E_, 4
+	note F#, 1
+	note G#, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	D# 2
+	note D#, 2
 	rest 3
 	octave 5
-	A_ 2
+	note A_, 2
 	rest 2
-	B_ 2
+	note B_, 2
 	rest 2
 	octave 6
-	C# 2
+	note C#, 2
 	rest 2
-	E_ 2
-	F# 8
+	note E_, 2
+	note F#, 8
 	rest 2
-	E_ 2
-	D# 2
-	C# 2
+	note E_, 2
+	note D#, 2
+	note C#, 2
 	rest 2
 	octave 5
-	G# 2
+	note G#, 2
 	rest 2
-	A_ 2
+	note A_, 2
 	rest 2
-	B_ 2
+	note B_, 2
 	rest 2
 	octave 6
-	D# 2
-	E_ 8
+	note D#, 2
+	note E_, 8
 	rest 2
-	D# 2
-	C# 2
-	D# 2
+	note D#, 2
+	note C#, 2
+	note D#, 2
 	octave 5
-	A_ 2
-	G# 2
-	A_ 2
-	A# 1
-	B_ 1
+	note A_, 2
+	note G#, 2
+	note A_, 2
+	note A#, 1
+	note B_, 1
 	rest 4
-	F# 2
+	note F#, 2
 	rest 2
-	B_ 2
-	A# 2
-	B_ 2
+	note B_, 2
+	note A#, 2
+	note B_, 2
 	octave 6
-	C_ 1
-	C# 1
+	note C_, 1
+	note C#, 1
 	rest 8
 	octave 5
-	F# 2
-	F_ 2
-	F# 2
-	G# 2
-	A_ 2
+	note F#, 2
+	note F_, 2
+	note F#, 2
+	note G#, 2
+	note A_, 2
 	octave 6
-	E_ 2
-	D# 2
-	C# 2
+	note E_, 2
+	note D#, 2
+	note C#, 2
 	octave 5
-	B_ 2
+	note B_, 2
 	rest 6
-	B_ 2
+	note B_, 2
 	rest 6
-	loopchannel 0, Music_UnusedSong_branch_a91b
-	endchannel
+	sound_loop 0, Music_UnusedSong_branch_a91b
+	sound_ret
 
 
-Music_UnusedSong_Ch1::
+Music_UnusedSong_Ch2::
 	tempo 144
 	volume 7, 7
-	toggleperfectpitch
+	toggle_perfect_pitch
 	vibrato 6, 1, 5
 
 Music_UnusedSong_branch_a9d8::
-	notetype 12, 1, 0
+	note_type 12, 1, 0
 	octave 6
-	E_ 1
+	note E_, 1
 	rest 1
-	G# 1
+	note G#, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	A_ 1
-	G# 1
+	note A_, 1
+	note G#, 1
 	rest 8
-	D# 1
+	note D#, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	G# 1
-	F# 1
+	note G#, 1
+	note F#, 1
 	rest 4
 	octave 5
-	B_ 2
+	note B_, 2
 	rest 2
 	octave 6
-	C# 1
+	note C#, 1
 	rest 1
-	D# 1
+	note D#, 1
 	rest 1
-	E_ 1
-	F# 1
+	note E_, 1
+	note F#, 1
 	rest 2
-	C# 1
+	note C#, 1
 	rest 1
-	D# 1
+	note D#, 1
 	rest 1
-	E_ 1
-	F# 1
+	note E_, 1
+	note F#, 1
 	rest 2
-	F# 4
-	E_ 4
-	F# 1
-	G# 1
+	note F#, 4
+	note E_, 4
+	note F#, 1
+	note G#, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	D# 2
+	note D#, 2
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	G# 1
+	note G#, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	A_ 1
-	G# 1
+	note A_, 1
+	note G#, 1
 	rest 4
-	E_ 2
+	note E_, 2
 	rest 2
-	D# 1
+	note D#, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	G# 1
-	F# 1
+	note G#, 1
+	note F#, 1
 	rest 8
-	C# 1
+	note C#, 1
 	rest 1
-	D# 1
+	note D#, 1
 	rest 1
-	E_ 1
-	F# 1
+	note E_, 1
+	note F#, 1
 	rest 2
-	C# 1
+	note C#, 1
 	rest 1
-	D# 1
+	note D#, 1
 	rest 1
-	E_ 1
-	F# 1
+	note E_, 1
+	note F#, 1
 	rest 2
-	F# 4
-	E_ 4
-	F# 1
-	G# 1
+	note F#, 4
+	note E_, 4
+	note F#, 1
+	note G#, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	F# 2
+	note F#, 2
 	rest 1
-	C# 2
+	note C#, 2
 	rest 2
-	D# 2
+	note D#, 2
 	rest 2
-	E_ 2
+	note E_, 2
 	rest 2
-	G# 2
+	note G#, 2
 	rest 2
-	D# 8
+	note D#, 8
 	rest 2
-	E_ 2
-	D# 2
-	C# 2
+	note E_, 2
+	note D#, 2
+	note C#, 2
 	octave 5
-	B_ 2
+	note B_, 2
 	rest 2
 	octave 6
-	C# 2
+	note C#, 2
 	rest 2
-	D# 2
+	note D#, 2
 	rest 2
-	F# 2
+	note F#, 2
 	rest 2
-	C# 8
+	note C#, 8
 	rest 2
-	D# 2
-	C# 2
+	note D#, 2
+	note C#, 2
 	octave 5
-	B_ 2
-	A_ 2
-	G# 2
-	A_ 2
-	G# 1
-	F# 1
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note A_, 2
+	note G#, 1
+	note F#, 1
 	rest 8
-	B_ 2
-	A# 2
-	B_ 2
-	A_ 1
-	G# 1
+	note B_, 2
+	note A#, 2
+	note B_, 2
+	note A_, 1
+	note G#, 1
 	rest 4
-	G# 2
+	note G#, 2
 	rest 2
-	F# 2
-	F_ 2
-	F# 2
-	G# 2
-	A_ 2
-	E_ 2
-	C# 2
-	E_ 2
-	F# 2
+	note F#, 2
+	note F_, 2
+	note F#, 2
+	note G#, 2
+	note A_, 2
+	note E_, 2
+	note C#, 2
+	note E_, 2
+	note F#, 2
 	rest 6
-	D# 2
+	note D#, 2
 	rest 6
-	loopchannel 0, Music_UnusedSong_branch_a9d8
-	endchannel
+	sound_loop 0, Music_UnusedSong_branch_a9d8
+	sound_ret