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

@@ -1,302 +1,302 @@
-Music_DefeatedWildMon_Ch0::
+Music_DefeatedWildMon_Ch1::
 	tempo 112
 	volume 7, 7
-	executemusic
-	duty 3
+	execute_music
+	duty_cycle 3
 	vibrato 6, 3, 4
-	toggleperfectpitch
+	toggle_perfect_pitch
 	tempo 112
-	notetype 12, 11, 7
+	note_type 12, 11, 7
 	octave 3
-	B_ 1
-	A_ 1
-	G# 1
-	F# 1
-	E_ 12
+	note B_, 1
+	note A_, 1
+	note G#, 1
+	note F#, 1
+	note E_, 12
 
 Music_DefeatedWildMon_branch_23b8b::
-	notetype 12, 6, 2
-	E_ 2
-	F# 2
-	E_ 2
-	F# 2
-	G# 2
-	G# 2
-	G# 4
-	A_ 2
-	A_ 2
-	A_ 4
-	G# 2
-	G# 2
-	G# 4
-	E_ 2
-	F# 2
-	E_ 2
-	F# 2
-	G# 2
-	G# 2
-	G# 4
-	A_ 2
-	A_ 2
-	A_ 4
-	G# 8
-	F_ 2
-	G_ 2
-	F_ 2
-	G_ 2
-	A_ 2
-	A_ 2
-	A_ 4
-	A# 2
-	A# 2
-	A# 4
-	A_ 2
-	A_ 2
-	A_ 4
-	F_ 2
-	G_ 2
-	F_ 2
-	G_ 2
-	A_ 2
-	A_ 2
-	A_ 4
-	A# 2
-	A# 2
-	A# 4
-	A_ 8
-	loopchannel 0, Music_DefeatedWildMon_branch_23b8b
-
-
-Music_DefeatedWildMon_Ch1::
-	executemusic
-	duty 2
-	notetype 12, 12, 3
-	octave 4
-	E_ 1
-	F# 1
-	G# 1
-	A_ 1
-	notetype 12, 12, 7
-	B_ 12
-
-Music_DefeatedWildMon_branch_23bce::
-	notetype 12, 8, 2
-	octave 3
-	B_ 2
-	A_ 2
-	G# 2
-	A_ 2
-	B_ 2
-	B_ 2
-	B_ 4
-	octave 4
-	C# 2
-	C# 2
-	C# 4
-	octave 3
-	B_ 2
-	B_ 2
-	B_ 4
-	B_ 2
-	A_ 2
-	G# 2
-	A_ 2
-	B_ 2
-	B_ 2
-	B_ 4
-	octave 4
-	C# 2
-	C# 2
-	C# 4
-	octave 3
-	B_ 8
-	octave 4
-	C_ 2
-	octave 3
-	A# 2
-	A_ 2
-	A# 2
-	octave 4
-	C_ 2
-	C_ 2
-	C_ 4
-	D_ 2
-	D_ 2
-	D_ 4
-	C_ 2
-	C_ 2
-	C_ 4
-	C_ 2
-	octave 3
-	A# 2
-	A_ 2
-	A# 2
-	octave 4
-	C_ 2
-	C_ 2
-	C_ 4
-	D_ 2
-	D_ 2
-	D_ 4
-	C_ 8
-	loopchannel 0, Music_DefeatedWildMon_branch_23bce
+	note_type 12, 6, 2
+	note E_, 2
+	note F#, 2
+	note E_, 2
+	note F#, 2
+	note G#, 2
+	note G#, 2
+	note G#, 4
+	note A_, 2
+	note A_, 2
+	note A_, 4
+	note G#, 2
+	note G#, 2
+	note G#, 4
+	note E_, 2
+	note F#, 2
+	note E_, 2
+	note F#, 2
+	note G#, 2
+	note G#, 2
+	note G#, 4
+	note A_, 2
+	note A_, 2
+	note A_, 4
+	note G#, 8
+	note F_, 2
+	note G_, 2
+	note F_, 2
+	note G_, 2
+	note A_, 2
+	note A_, 2
+	note A_, 4
+	note A#, 2
+	note A#, 2
+	note A#, 4
+	note A_, 2
+	note A_, 2
+	note A_, 4
+	note F_, 2
+	note G_, 2
+	note F_, 2
+	note G_, 2
+	note A_, 2
+	note A_, 2
+	note A_, 4
+	note A#, 2
+	note A#, 2
+	note A#, 4
+	note A_, 8
+	sound_loop 0, Music_DefeatedWildMon_branch_23b8b
 
 
 Music_DefeatedWildMon_Ch2::
-	executemusic
-	notetype 12, 2, 0
+	execute_music
+	duty_cycle 2
+	note_type 12, 12, 3
+	octave 4
+	note E_, 1
+	note F#, 1
+	note G#, 1
+	note A_, 1
+	note_type 12, 12, 7
+	note B_, 12
+
+Music_DefeatedWildMon_branch_23bce::
+	note_type 12, 8, 2
+	octave 3
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note A_, 2
+	note B_, 2
+	note B_, 2
+	note B_, 4
+	octave 4
+	note C#, 2
+	note C#, 2
+	note C#, 4
+	octave 3
+	note B_, 2
+	note B_, 2
+	note B_, 4
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note A_, 2
+	note B_, 2
+	note B_, 2
+	note B_, 4
+	octave 4
+	note C#, 2
+	note C#, 2
+	note C#, 4
+	octave 3
+	note B_, 8
+	octave 4
+	note C_, 2
+	octave 3
+	note A#, 2
+	note A_, 2
+	note A#, 2
+	octave 4
+	note C_, 2
+	note C_, 2
+	note C_, 4
+	note D_, 2
+	note D_, 2
+	note D_, 4
+	note C_, 2
+	note C_, 2
+	note C_, 4
+	note C_, 2
+	octave 3
+	note A#, 2
+	note A_, 2
+	note A#, 2
+	octave 4
+	note C_, 2
+	note C_, 2
+	note C_, 4
+	note D_, 2
+	note D_, 2
+	note D_, 4
+	note C_, 8
+	sound_loop 0, Music_DefeatedWildMon_branch_23bce
+
+
+Music_DefeatedWildMon_Ch3::
+	execute_music
+	note_type 12, 2, 0
 	octave 5
-	E_ 1
+	note E_, 1
 	rest 1
 	octave 6
-	C# 1
+	note C#, 1
 	rest 1
 	octave 5
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 6
-	D# 1
+	note D#, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 3
-	E_ 1
+	note E_, 1
 	rest 3
 
 Music_DefeatedWildMon_branch_23c21::
 	octave 4
-	E_ 1
+	note E_, 1
 	rest 1
 	octave 5
-	E_ 1
+	note E_, 1
 	rest 1
 	octave 4
-	E_ 1
+	note E_, 1
 	rest 1
 	octave 5
-	E_ 1
+	note E_, 1
 	rest 1
 	octave 4
-	E_ 1
+	note E_, 1
 	rest 3
 	octave 5
-	E_ 1
+	note E_, 1
 	rest 3
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
 	octave 5
-	F# 1
+	note F#, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 3
-	F# 1
+	note F#, 1
 	rest 1
 	octave 5
-	D# 1
+	note D#, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
 	octave 5
-	E_ 1
+	note E_, 1
 	rest 1
 	octave 4
-	E_ 1
+	note E_, 1
 	rest 1
 	octave 5
-	E_ 1
+	note E_, 1
 	rest 1
 	octave 4
-	E_ 1
+	note E_, 1
 	rest 3
 	octave 5
-	E_ 1
+	note E_, 1
 	rest 3
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
 	octave 5
-	F# 1
+	note F#, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 3
 	octave 5
-	E_ 1
+	note E_, 1
 	rest 3
 	octave 4
-	D# 4
+	note D#, 4
 	octave 4
-	F_ 1
+	note F_, 1
 	rest 1
 	octave 5
-	F_ 1
+	note F_, 1
 	rest 1
 	octave 4
-	F_ 1
+	note F_, 1
 	rest 1
 	octave 5
-	F_ 1
+	note F_, 1
 	rest 1
 	octave 4
-	F_ 1
+	note F_, 1
 	rest 3
 	octave 5
-	F_ 1
+	note F_, 1
 	rest 3
 	octave 4
-	G_ 1
+	note G_, 1
 	rest 1
 	octave 5
-	G_ 1
+	note G_, 1
 	rest 1
 	octave 4
-	G_ 1
+	note G_, 1
 	rest 3
-	F_ 1
+	note F_, 1
 	rest 1
 	octave 5
-	F_ 1
+	note F_, 1
 	rest 1
 	octave 4
-	F_ 1
+	note F_, 1
 	rest 1
-	F_ 1
+	note F_, 1
 	rest 1
-	F_ 1
+	note F_, 1
 	rest 1
 	octave 5
-	F_ 1
+	note F_, 1
 	rest 1
 	octave 4
-	F_ 1
+	note F_, 1
 	rest 1
 	octave 5
-	F_ 1
+	note F_, 1
 	rest 1
 	octave 4
-	F_ 1
+	note F_, 1
 	rest 3
 	octave 5
-	F_ 1
+	note F_, 1
 	rest 3
 	octave 4
-	G_ 1
+	note G_, 1
 	rest 1
 	octave 5
-	G_ 1
+	note G_, 1
 	rest 1
 	octave 4
-	G_ 1
+	note G_, 1
 	rest 3
 	octave 5
-	F_ 1
+	note F_, 1
 	rest 3
 	octave 4
-	D# 4
-	loopchannel 0, Music_DefeatedWildMon_branch_23c21
+	note D#, 4
+	sound_loop 0, Music_DefeatedWildMon_branch_23c21