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

@@ -1,396 +1,396 @@
 Music_MeetRival_branch_b119::
 	tempo 100
-	loopchannel 0, Music_MeetRival_branch_b123
+	sound_loop 0, Music_MeetRival_branch_b123
 
-Music_MeetRival_Ch0::
+Music_MeetRival_Ch1::
 	tempo 112
 
 Music_MeetRival_branch_b123::
 	volume 7, 7
-	duty 3
+	duty_cycle 3
 	vibrato 6, 3, 4
-	toggleperfectpitch
-	notetype 12, 11, 3
+	toggle_perfect_pitch
+	note_type 12, 11, 3
 	octave 4
-	D_ 1
-	C# 1
-	C_ 1
+	note D_, 1
+	note C#, 1
+	note C_, 1
 	octave 3
-	B_ 1
-	A# 2
-	A_ 1
-	G# 1
-	G_ 1
-	F# 1
-	F_ 6
-	D_ 1
+	note B_, 1
+	note A#, 2
+	note A_, 1
+	note G#, 1
+	note G_, 1
+	note F#, 1
+	note F_, 6
+	note D_, 1
 	rest 3
-	D_ 1
+	note D_, 1
 	rest 5
-	A_ 2
-	G_ 2
-	A_ 2
+	note A_, 2
+	note G_, 2
+	note A_, 2
 
 Music_MeetRival_branch_b140::
-	B_ 4
-	A# 2
-	A_ 4
-	G_ 2
+	note B_, 4
+	note A#, 2
+	note A_, 4
+	note G_, 2
 	octave 4
-	C_ 4
-	D_ 2
+	note C_, 4
+	note D_, 2
 	rest 4
-	D_ 4
-	C# 2
-	C_ 2
+	note D_, 4
+	note C#, 2
+	note C_, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	C_ 4
-	E_ 2
-	D_ 4
-	C_ 2
+	note C_, 4
+	note E_, 2
+	note D_, 4
+	note C_, 2
 	octave 3
-	B_ 4
+	note B_, 4
 	octave 4
-	C_ 2
+	note C_, 2
 	rest 4
-	G_ 4
-	G_ 2
-	F# 2
-	E_ 2
-	D_ 2
-	F# 2
+	note G_, 4
+	note G_, 2
+	note F#, 2
+	note E_, 2
+	note D_, 2
+	note F#, 2
 	octave 3
-	A_ 2
+	note A_, 2
 	octave 4
-	D_ 2
-	F# 2
+	note D_, 2
+	note F#, 2
 	octave 3
-	A_ 2
+	note A_, 2
 	octave 4
-	D_ 2
+	note D_, 2
 	octave 3
-	D_ 2
+	note D_, 2
 	octave 4
-	D_ 2
+	note D_, 2
 	rest 2
 	octave 3
-	D_ 2
+	note D_, 2
 	octave 4
-	C_ 4
+	note C_, 4
 	octave 3
-	B_ 2
-	A# 2
-	B_ 2
+	note B_, 2
+	note A#, 2
+	note B_, 2
 	octave 4
-	C_ 2
-	F_ 2
+	note C_, 2
+	note F_, 2
 	octave 3
-	G_ 2
+	note G_, 2
 	octave 4
-	C_ 2
-	F_ 2
-	D# 2
-	C_ 2
+	note C_, 2
+	note F_, 2
+	note D#, 2
+	note C_, 2
 	octave 3
-	A# 2
-	G_ 2
+	note A#, 2
+	note G_, 2
 	rest 4
-	A# 4
+	note A#, 4
 	octave 4
-	C_ 2
+	note C_, 2
 	octave 3
-	A# 2
+	note A#, 2
 	octave 4
-	C_ 2
-	notetype 12, 11, 7
+	note C_, 2
+	note_type 12, 11, 7
 	octave 3
-	G_ 4
-	D_ 2
-	F_ 6
-	F# 4
-	D_ 2
+	note G_, 4
+	note D_, 2
+	note F_, 6
+	note F#, 4
+	note D_, 2
 	rest 4
-	D_ 4
-	notetype 12, 11, 3
-	A_ 2
-	G_ 2
-	A_ 2
-	loopchannel 0, Music_MeetRival_branch_b140
+	note D_, 4
+	note_type 12, 11, 3
+	note A_, 2
+	note G_, 2
+	note A_, 2
+	sound_loop 0, Music_MeetRival_branch_b140
 
 Music_MeetRival_branch_b19b::
 	tempo 100
-	loopchannel 0, Music_MeetRival_branch_b1a5
+	sound_loop 0, Music_MeetRival_branch_b1a5
 
 Music_MeetRival_branch_b1a2::
 	tempo 112
 
 Music_MeetRival_branch_b1a5::
 	volume 7, 7
-	duty 3
+	duty_cycle 3
 	vibrato 6, 3, 4
-	toggleperfectpitch
-	notetype 12, 11, 3
+	toggle_perfect_pitch
+	note_type 12, 11, 3
 	octave 3
-	D_ 1
+	note D_, 1
 	rest 3
-	D_ 1
+	note D_, 1
 	rest 5
-	A_ 2
-	G_ 2
-	A_ 2
-	loopchannel 0, Music_MeetRival_branch_b140
-
-
-Music_MeetRival_Ch1::
-	duty 3
-	vibrato 10, 2, 6
-	notetype 12, 12, 7
-	octave 4
-	B_ 1
-	A# 1
-	A_ 1
-	G# 1
-	G_ 2
-	F# 1
-	F_ 1
-	E_ 1
-	D# 1
-	D_ 6
-	octave 3
-	G_ 1
-	rest 3
-	G_ 1
-	rest 3
-	D_ 1
-	rest 1
-	octave 4
-	D_ 2
-	F_ 2
-	F# 2
-
-Music_MeetRival_branch_b1d8::
-	notetype 12, 12, 7
-	G_ 4
-	D_ 2
-	F_ 6
-	F# 4
-	G_ 2
-	rest 4
-	G_ 4
-	G_ 2
-	A# 2
-	B_ 2
-	octave 5
-	C_ 4
-	octave 4
-	G_ 2
-	A# 6
-	B_ 4
-	octave 5
-	C_ 2
-	rest 4
-	C_ 4
-	C_ 2
-	octave 4
-	B_ 2
-	octave 5
-	C_ 2
-	notetype 12, 11, 0
-	D_ 16
-	notetype 12, 11, 5
-	D_ 6
-	notetype 12, 12, 7
-	F_ 4
-	D_ 2
-	C_ 2
-	D_ 2
-	notetype 12, 11, 0
-	C_ 8
-	notetype 12, 12, 7
-	C_ 8
-	octave 4
-	C_ 2
-	rest 4
-	A# 4
-	G_ 2
-	F_ 2
-	notetype 12, 11, 0
-	G_ 16
-	notetype 12, 11, 3
-	G_ 2
-	octave 3
-	G_ 2
-	rest 4
-	G_ 4
-	octave 4
-	D_ 2
-	F_ 2
-	F# 2
-	loopchannel 0, Music_MeetRival_branch_b1d8
-
-Music_MeetRival_branch_b21d::
-	duty 3
-	vibrato 10, 2, 6
-	notetype 12, 12, 7
-	octave 3
-	G_ 1
-	rest 3
-	G_ 1
-	rest 3
-	D_ 1
-	rest 1
-	octave 4
-	D_ 2
-	F_ 2
-	F# 2
-	loopchannel 0, Music_MeetRival_branch_b1d8
+	note A_, 2
+	note G_, 2
+	note A_, 2
+	sound_loop 0, Music_MeetRival_branch_b140
 
 
 Music_MeetRival_Ch2::
-	notetype 12, 1, 4
+	duty_cycle 3
+	vibrato 10, 2, 6
+	note_type 12, 12, 7
+	octave 4
+	note B_, 1
+	note A#, 1
+	note A_, 1
+	note G#, 1
+	note G_, 2
+	note F#, 1
+	note F_, 1
+	note E_, 1
+	note D#, 1
+	note D_, 6
+	octave 3
+	note G_, 1
+	rest 3
+	note G_, 1
+	rest 3
+	note D_, 1
+	rest 1
+	octave 4
+	note D_, 2
+	note F_, 2
+	note F#, 2
+
+Music_MeetRival_branch_b1d8::
+	note_type 12, 12, 7
+	note G_, 4
+	note D_, 2
+	note F_, 6
+	note F#, 4
+	note G_, 2
+	rest 4
+	note G_, 4
+	note G_, 2
+	note A#, 2
+	note B_, 2
 	octave 5
-	D_ 2
+	note C_, 4
+	octave 4
+	note G_, 2
+	note A#, 6
+	note B_, 4
+	octave 5
+	note C_, 2
+	rest 4
+	note C_, 4
+	note C_, 2
+	octave 4
+	note B_, 2
+	octave 5
+	note C_, 2
+	note_type 12, 11, 0
+	note D_, 16
+	note_type 12, 11, 5
+	note D_, 6
+	note_type 12, 12, 7
+	note F_, 4
+	note D_, 2
+	note C_, 2
+	note D_, 2
+	note_type 12, 11, 0
+	note C_, 8
+	note_type 12, 12, 7
+	note C_, 8
+	octave 4
+	note C_, 2
+	rest 4
+	note A#, 4
+	note G_, 2
+	note F_, 2
+	note_type 12, 11, 0
+	note G_, 16
+	note_type 12, 11, 3
+	note G_, 2
+	octave 3
+	note G_, 2
+	rest 4
+	note G_, 4
+	octave 4
+	note D_, 2
+	note F_, 2
+	note F#, 2
+	sound_loop 0, Music_MeetRival_branch_b1d8
+
+Music_MeetRival_branch_b21d::
+	duty_cycle 3
+	vibrato 10, 2, 6
+	note_type 12, 12, 7
+	octave 3
+	note G_, 1
+	rest 3
+	note G_, 1
+	rest 3
+	note D_, 1
+	rest 1
+	octave 4
+	note D_, 2
+	note F_, 2
+	note F#, 2
+	sound_loop 0, Music_MeetRival_branch_b1d8
+
+
+Music_MeetRival_Ch3::
+	note_type 12, 1, 4
+	octave 5
+	note D_, 2
 	rest 2
-	C# 2
+	note C#, 2
 	rest 2
-	C_ 2
+	note C_, 2
 	rest 2
 	octave 4
-	B_ 2
+	note B_, 2
 	rest 2
-	G_ 1
+	note G_, 1
 	rest 3
-	G_ 1
+	note G_, 1
 	rest 3
-	G_ 1
+	note G_, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 1
 
 Music_MeetRival_branch_b24b::
-	G_ 2
+	note G_, 2
 	octave 5
-	D_ 2
+	note D_, 2
 	octave 4
-	G_ 2
+	note G_, 2
 	rest 2
 	octave 5
-	D_ 2
+	note D_, 2
 	octave 4
-	G_ 2
+	note G_, 2
 	rest 2
 	octave 5
-	D_ 2
+	note D_, 2
 	octave 4
-	G_ 2
+	note G_, 2
 	rest 4
 	octave 5
-	D_ 4
+	note D_, 4
 	octave 4
-	G_ 2
-	A# 2
-	B_ 2
-	G_ 2
+	note G_, 2
+	note A#, 2
+	note B_, 2
+	note G_, 2
 	octave 5
-	C_ 2
+	note C_, 2
 	octave 4
-	G_ 2
+	note G_, 2
 	rest 2
 	octave 5
-	C_ 2
+	note C_, 2
 	octave 4
-	G_ 2
+	note G_, 2
 	rest 2
-	B_ 2
+	note B_, 2
 	octave 5
-	C_ 2
+	note C_, 2
 	rest 4
-	C_ 4
-	C_ 2
+	note C_, 4
+	note C_, 2
 	octave 4
-	B_ 2
-	A_ 2
-	F# 2
-	A_ 2
+	note B_, 2
+	note A_, 2
+	note F#, 2
+	note A_, 2
 	rest 2
-	F# 2
-	A_ 2
-	F# 2
+	note F#, 2
+	note A_, 2
+	note F#, 2
 	rest 2
-	A_ 2
-	F# 2
-	A_ 2
+	note A_, 2
+	note F#, 2
+	note A_, 2
 	rest 2
-	F# 2
-	A_ 2
-	F# 2
+	note F#, 2
+	note A_, 2
+	note F#, 2
 	octave 5
-	D_ 2
+	note D_, 2
 	octave 4
-	A_ 2
-	E_ 2
+	note A_, 2
+	note E_, 2
 	octave 5
-	C_ 2
+	note C_, 2
 	rest 2
 	octave 4
-	E_ 2
+	note E_, 2
 	octave 5
-	C_ 2
+	note C_, 2
 	octave 4
-	E_ 2
-	F_ 2
-	G_ 2
-	E_ 2
+	note E_, 2
+	note F_, 2
+	note G_, 2
+	note E_, 2
 	rest 4
-	E_ 2
+	note E_, 2
 	octave 5
-	C_ 2
+	note C_, 2
 	octave 4
-	B_ 2
-	A# 2
-	A_ 2
-	G_ 2
-	A# 2
+	note B_, 2
+	note A#, 2
+	note A_, 2
+	note G_, 2
+	note A#, 2
 	rest 2
-	G_ 2
-	A# 2
-	G_ 2
+	note G_, 2
+	note A#, 2
+	note G_, 2
 	rest 2
-	A# 2
-	G_ 2
+	note A#, 2
+	note G_, 2
 	octave 5
-	D_ 2
+	note D_, 2
 	octave 4
-	G_ 2
+	note G_, 2
 	rest 2
 	octave 5
-	D_ 2
+	note D_, 2
 	octave 4
-	G_ 2
+	note G_, 2
 	rest 2
 	octave 5
-	D_ 2
-	loopchannel 0, Music_MeetRival_branch_b24b
+	note D_, 2
+	sound_loop 0, Music_MeetRival_branch_b24b
 
 Music_MeetRival_branch_b2b5::
-	notetype 12, 1, 4
+	note_type 12, 1, 4
 	octave 4
-	G_ 1
+	note G_, 1
 	rest 3
-	G_ 1
+	note G_, 1
 	rest 3
-	G_ 1
+	note G_, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 1
-	G_ 1
+	note G_, 1
 	rest 1
-	loopchannel 0, Music_MeetRival_branch_b24b
+	sound_loop 0, Music_MeetRival_branch_b24b