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

@@ -1,354 +1,354 @@
-Music_Cinnabar_Ch0::
+Music_Cinnabar_Ch1::
 	tempo 144
 	volume 7, 7
-	duty 3
+	duty_cycle 3
 	vibrato 12, 3, 4
-	toggleperfectpitch
+	toggle_perfect_pitch
 
 Music_Cinnabar_branch_b878::
-	notetype 12, 11, 5
+	note_type 12, 11, 5
 	rest 4
 	octave 3
-	D_ 4
-	E_ 6
-	C# 2
-	notetype 12, 11, 1
-	D_ 4
-	notetype 12, 11, 5
-	B_ 4
+	note D_, 4
+	note E_, 6
+	note C#, 2
+	note_type 12, 11, 1
+	note D_, 4
+	note_type 12, 11, 5
+	note B_, 4
 	octave 4
-	C_ 6
+	note C_, 6
 	octave 3
-	A_ 2
-	notetype 12, 11, 1
-	B_ 4
-	notetype 12, 11, 5
-	G_ 4
-	F# 4
-	E_ 2
-	F# 2
-	notetype 12, 11, 1
-	G_ 4
-	notetype 12, 11, 5
-	G_ 4
-	F# 4
-	E_ 4
-	D_ 4
-	E_ 4
-	F# 6
-	A_ 2
-	notetype 12, 11, 1
-	G_ 4
-	notetype 12, 11, 5
-	B_ 4
+	note A_, 2
+	note_type 12, 11, 1
+	note B_, 4
+	note_type 12, 11, 5
+	note G_, 4
+	note F#, 4
+	note E_, 2
+	note F#, 2
+	note_type 12, 11, 1
+	note G_, 4
+	note_type 12, 11, 5
+	note G_, 4
+	note F#, 4
+	note E_, 4
+	note D_, 4
+	note E_, 4
+	note F#, 6
+	note A_, 2
+	note_type 12, 11, 1
+	note G_, 4
+	note_type 12, 11, 5
+	note B_, 4
 	octave 4
-	C_ 6
+	note C_, 6
 	octave 3
-	A_ 2
-	B_ 4
-	G_ 4
-	F# 3
-	E_ 1
-	F# 2
-	A_ 2
-	notetype 12, 10, 2
-	G_ 4
+	note A_, 2
+	note B_, 4
+	note G_, 4
+	note F#, 3
+	note E_, 1
+	note F#, 2
+	note A_, 2
+	note_type 12, 10, 2
+	note G_, 4
 	octave 4
-	D_ 1
-	E_ 1
-	D_ 4
-	notetype 12, 7, 2
-	D_ 1
-	E_ 1
-	D_ 4
-	notetype 12, 10, 7
+	note D_, 1
+	note E_, 1
+	note D_, 4
+	note_type 12, 7, 2
+	note D_, 1
+	note E_, 1
+	note D_, 4
+	note_type 12, 10, 7
 	octave 3
-	B_ 6
-	G_ 2
-	E_ 8
+	note B_, 6
+	note G_, 2
+	note E_, 8
 	octave 4
-	C_ 6
+	note C_, 6
 	octave 3
-	A_ 2
-	F# 8
+	note A_, 2
+	note F#, 8
 	octave 4
-	F# 6
-	D_ 2
+	note F#, 6
+	note D_, 2
 	octave 3
-	B_ 2
-	A_ 2
-	G_ 2
-	F# 2
-	G_ 8
-	F# 4
-	E_ 4
-	loopchannel 0, Music_Cinnabar_branch_b878
-
-
-Music_Cinnabar_Ch1::
-	duty 3
-	vibrato 10, 2, 3
-
-Music_Cinnabar_branch_b8d9::
-	notetype 12, 12, 7
-	octave 3
-	G_ 6
-	A_ 1
-	B_ 1
-	octave 4
-	C_ 6
-	D_ 1
-	E_ 1
-	notetype 12, 12, 1
-	D_ 4
-	notetype 12, 12, 7
-	G_ 4
-	A_ 6
-	G_ 1
-	F# 1
-	E_ 4
-	D_ 4
-	C_ 3
-	octave 3
-	B_ 1
-	octave 4
-	C_ 2
-	D_ 1
-	E_ 1
-	notetype 12, 12, 1
-	D_ 4
-	notetype 12, 12, 7
-	octave 3
-	B_ 8
-	A_ 4
-	G_ 6
-	A_ 1
-	B_ 1
-	octave 4
-	C_ 6
-	D_ 1
-	E_ 1
-	notetype 12, 12, 1
-	D_ 4
-	notetype 12, 12, 7
-	G_ 4
-	A_ 6
-	G_ 1
-	F# 1
-	E_ 4
-	D_ 4
-	C_ 3
-	octave 3
-	B_ 1
-	octave 4
-	C_ 2
-	D_ 1
-	E_ 1
-	notetype 12, 12, 1
-	D_ 4
-	notetype 12, 12, 7
-	octave 3
-	A_ 4
-	G_ 4
-	F# 4
-	notetype 12, 11, 0
-	octave 4
-	D_ 6
-	octave 3
-	B_ 2
-	G_ 8
-	octave 4
-	E_ 6
-	C_ 2
-	octave 3
-	A_ 8
-	octave 4
-	A_ 6
-	F# 2
-	D_ 2
-	C_ 2
-	octave 3
-	B_ 2
-	A_ 2
-	B_ 4
-	octave 4
-	D_ 4
-	octave 3
-	B_ 2
-	A_ 6
-	loopchannel 0, Music_Cinnabar_branch_b8d9
+	note B_, 2
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	note G_, 8
+	note F#, 4
+	note E_, 4
+	sound_loop 0, Music_Cinnabar_branch_b878
 
 
 Music_Cinnabar_Ch2::
-	notetype 12, 1, 0
+	duty_cycle 3
+	vibrato 10, 2, 3
+
+Music_Cinnabar_branch_b8d9::
+	note_type 12, 12, 7
+	octave 3
+	note G_, 6
+	note A_, 1
+	note B_, 1
+	octave 4
+	note C_, 6
+	note D_, 1
+	note E_, 1
+	note_type 12, 12, 1
+	note D_, 4
+	note_type 12, 12, 7
+	note G_, 4
+	note A_, 6
+	note G_, 1
+	note F#, 1
+	note E_, 4
+	note D_, 4
+	note C_, 3
+	octave 3
+	note B_, 1
+	octave 4
+	note C_, 2
+	note D_, 1
+	note E_, 1
+	note_type 12, 12, 1
+	note D_, 4
+	note_type 12, 12, 7
+	octave 3
+	note B_, 8
+	note A_, 4
+	note G_, 6
+	note A_, 1
+	note B_, 1
+	octave 4
+	note C_, 6
+	note D_, 1
+	note E_, 1
+	note_type 12, 12, 1
+	note D_, 4
+	note_type 12, 12, 7
+	note G_, 4
+	note A_, 6
+	note G_, 1
+	note F#, 1
+	note E_, 4
+	note D_, 4
+	note C_, 3
+	octave 3
+	note B_, 1
+	octave 4
+	note C_, 2
+	note D_, 1
+	note E_, 1
+	note_type 12, 12, 1
+	note D_, 4
+	note_type 12, 12, 7
+	octave 3
+	note A_, 4
+	note G_, 4
+	note F#, 4
+	note_type 12, 11, 0
+	octave 4
+	note D_, 6
+	octave 3
+	note B_, 2
+	note G_, 8
+	octave 4
+	note E_, 6
+	note C_, 2
+	octave 3
+	note A_, 8
+	octave 4
+	note A_, 6
+	note F#, 2
+	note D_, 2
+	note C_, 2
+	octave 3
+	note B_, 2
+	note A_, 2
+	note B_, 4
+	octave 4
+	note D_, 4
+	octave 3
+	note B_, 2
+	note A_, 6
+	sound_loop 0, Music_Cinnabar_branch_b8d9
+
+
+Music_Cinnabar_Ch3::
+	note_type 12, 1, 0
 
 Music_Cinnabar_branch_b93f::
 	octave 4
-	G_ 1
+	note G_, 1
 	rest 3
-	B_ 2
-	G_ 1
-	G_ 1
-	A_ 1
+	note B_, 2
+	note G_, 1
+	note G_, 1
+	note A_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
 	octave 5
-	C_ 2
+	note C_, 2
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 3
-	B_ 2
-	G_ 1
-	G_ 1
-	A_ 1
+	note B_, 2
+	note G_, 1
+	note G_, 1
+	note A_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
 	octave 5
-	C_ 2
+	note C_, 2
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 3
-	B_ 2
-	G_ 1
-	G_ 1
-	A_ 1
+	note B_, 2
+	note G_, 1
+	note G_, 1
+	note A_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
 	octave 5
-	C_ 2
+	note C_, 2
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 3
-	B_ 2
-	G_ 1
-	G_ 1
-	A_ 1
+	note B_, 2
+	note G_, 1
+	note G_, 1
+	note A_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
 	octave 5
-	C_ 2
+	note C_, 2
 	octave 4
-	A_ 1
+	note A_, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 3
-	B_ 2
-	G_ 1
-	G_ 1
-	A_ 1
+	note B_, 2
+	note G_, 1
+	note G_, 1
+	note A_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
 	octave 5
-	C_ 2
+	note C_, 2
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 3
-	B_ 2
-	G_ 1
-	G_ 1
-	A_ 1
+	note B_, 2
+	note G_, 1
+	note G_, 1
+	note A_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
 	octave 5
-	C_ 2
+	note C_, 2
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 3
-	B_ 2
-	G_ 1
-	G_ 1
-	A_ 1
+	note B_, 2
+	note G_, 1
+	note G_, 1
+	note A_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
 	octave 5
-	C_ 2
+	note C_, 2
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 3
-	B_ 4
-	A_ 1
+	note B_, 4
+	note A_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
 	octave 5
-	C_ 4
+	note C_, 4
 	octave 4
-	B_ 1
+	note B_, 1
 	rest 3
 	octave 5
-	D_ 2
+	note D_, 2
 	octave 4
-	B_ 1
-	B_ 1
-	B_ 1
+	note B_, 1
+	note B_, 1
+	note B_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 5
-	C_ 2
+	note C_, 2
 	octave 4
-	B_ 1
+	note B_, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 3
 	octave 5
-	E_ 2
-	C_ 1
-	C_ 1
-	C_ 1
+	note E_, 2
+	note C_, 1
+	note C_, 1
+	note C_, 1
 	rest 1
-	C_ 1
+	note C_, 1
 	rest 1
-	E_ 2
-	C_ 1
+	note E_, 2
+	note C_, 1
 	rest 1
 	octave 4
-	A_ 1
+	note A_, 1
 	rest 3
 	octave 5
-	A_ 2
-	F# 1
-	F# 1
-	D_ 1
+	note A_, 2
+	note F#, 1
+	note F#, 1
+	note D_, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
-	D_ 2
-	C_ 1
+	note D_, 2
+	note C_, 1
 	rest 1
 	octave 4
-	B_ 1
+	note B_, 1
 	rest 3
 	octave 5
-	D_ 2
-	C_ 1
-	C_ 1
+	note D_, 2
+	note C_, 1
+	note C_, 1
 	octave 4
-	B_ 1
+	note B_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	A_ 2
+	note A_, 2
 	octave 5
-	C_ 1
+	note C_, 1
 	rest 1
-	loopchannel 0, Music_Cinnabar_branch_b93f
+	sound_loop 0, Music_Cinnabar_branch_b93f