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

@@ -1,118 +1,118 @@
-Music_MeetFemaleTrainer_Ch0::
+Music_MeetFemaleTrainer_Ch1::
 	tempo 124
 	volume 7, 7
-	duty 1
-	toggleperfectpitch
-	notetype 12, 11, 2
+	duty_cycle 1
+	toggle_perfect_pitch
+	note_type 12, 11, 2
 	octave 3
-	G# 6
+	note G#, 6
 	octave 4
-	E_ 2
-	D# 2
-	C# 2
-	C_ 2
-	notetype 12, 8, 1
+	note E_, 2
+	note D#, 2
+	note C#, 2
+	note C_, 2
+	note_type 12, 8, 1
 
 Music_MeetFemaleTrainer_branch_7f70c::
 	octave 3
-	E_ 4
-	loopchannel 12, Music_MeetFemaleTrainer_branch_7f70c
-	E_ 4
+	note E_, 4
+	sound_loop 12, Music_MeetFemaleTrainer_branch_7f70c
+	note E_, 4
 	octave 2
-	B_ 4
-	B_ 4
+	note B_, 4
+	note B_, 4
 	octave 3
-	E_ 4
-	loopchannel 0, Music_MeetFemaleTrainer_branch_7f70c
-
-
-Music_MeetFemaleTrainer_Ch1::
-	duty 2
-	notetype 12, 12, 2
-	octave 3
-	B_ 2
-	notetype 12, 12, 7
-	octave 4
-	B_ 12
-
-Music_MeetFemaleTrainer_branch_7f726::
-	notetype 12, 12, 2
-	octave 3
-	B_ 4
-	octave 4
-	D# 4
-	E_ 4
-	D# 4
-	C# 2
-	C_ 2
-	octave 3
-	B_ 2
-	A_ 2
-	G# 2
-	A_ 2
-	A# 2
-	octave 4
-	C# 2
-	octave 3
-	B_ 4
-	octave 4
-	C# 4
-	octave 3
-	B_ 4
-	A_ 4
-	G# 2
-	F# 2
-	E_ 2
-	D# 2
-	E_ 2
-	F# 2
-	G# 2
-	A_ 2
-	loopchannel 0, Music_MeetFemaleTrainer_branch_7f726
+	note E_, 4
+	sound_loop 0, Music_MeetFemaleTrainer_branch_7f70c
 
 
 Music_MeetFemaleTrainer_Ch2::
-	notetype 12, 1, 0
+	duty_cycle 2
+	note_type 12, 12, 2
+	octave 3
+	note B_, 2
+	note_type 12, 12, 7
+	octave 4
+	note B_, 12
+
+Music_MeetFemaleTrainer_branch_7f726::
+	note_type 12, 12, 2
+	octave 3
+	note B_, 4
+	octave 4
+	note D#, 4
+	note E_, 4
+	note D#, 4
+	note C#, 2
+	note C_, 2
+	octave 3
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note A_, 2
+	note A#, 2
+	octave 4
+	note C#, 2
+	octave 3
+	note B_, 4
+	octave 4
+	note C#, 4
+	octave 3
+	note B_, 4
+	note A_, 4
+	note G#, 2
+	note F#, 2
+	note E_, 2
+	note D#, 2
+	note E_, 2
+	note F#, 2
+	note G#, 2
+	note A_, 2
+	sound_loop 0, Music_MeetFemaleTrainer_branch_7f726
+
+
+Music_MeetFemaleTrainer_Ch3::
+	note_type 12, 1, 0
 	rest 8
 	octave 5
-	C# 1
+	note C#, 1
 	rest 1
 	octave 4
-	B_ 1
+	note B_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
 
 Music_MeetFemaleTrainer_branch_7f756::
-	callchannel Music_MeetFemaleTrainer_branch_7f770
-	G# 1
+	sound_call Music_MeetFemaleTrainer_branch_7f770
+	note G#, 1
 	rest 3
-	E_ 1
+	note E_, 1
 	rest 3
-	G# 1
+	note G#, 1
 	rest 3
-	E_ 1
+	note E_, 1
 	rest 3
-	callchannel Music_MeetFemaleTrainer_branch_7f770
-	G# 1
+	sound_call Music_MeetFemaleTrainer_branch_7f770
+	note G#, 1
 	rest 3
-	E_ 1
+	note E_, 1
 	rest 3
-	G# 1
+	note G#, 1
 	rest 3
-	B_ 1
+	note B_, 1
 	rest 3
-	loopchannel 0, Music_MeetFemaleTrainer_branch_7f756
+	sound_loop 0, Music_MeetFemaleTrainer_branch_7f756
 
 Music_MeetFemaleTrainer_branch_7f770::
-	G# 1
+	note G#, 1
 	rest 3
-	E_ 1
+	note E_, 1
 	rest 3
-	G# 1
+	note G#, 1
 	rest 3
-	E_ 1
+	note E_, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	endchannel
+	sound_ret