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

@@ -1,111 +1,111 @@
-Music_SafariZone_Ch0::
+Music_SafariZone_Ch1::
 	tempo 132
 	volume 7, 7
 	vibrato 6, 3, 4
-	toggleperfectpitch
-	duty 2
-	notetype 12, 9, 2
+	toggle_perfect_pitch
+	duty_cycle 2
+	note_type 12, 9, 2
 	octave 3
-	pitchbend 0, 73
-	C_ 1
-	pitchbend 0, 73
-	G_ 1
-	pitchbend 0, 73
-	C_ 1
-	pitchbend 0, 73
-	G_ 1
+	pitch_slide 0, 73
+	note C_, 1
+	pitch_slide 0, 73
+	note G_, 1
+	pitch_slide 0, 73
+	note C_, 1
+	pitch_slide 0, 73
+	note G_, 1
 	rest 4
-	duty 3
+	duty_cycle 3
 
 Music_SafariZone_branch_bc4f::
-	callchannel Music_SafariZone_branch_bc5f
-	notetype 12, 10, 4
-	F# 4
-	callchannel Music_SafariZone_branch_bc5f
-	notetype 12, 10, 4
-	F# 4
-	loopchannel 0, Music_SafariZone_branch_bc4f
+	sound_call Music_SafariZone_branch_bc5f
+	note_type 12, 10, 4
+	note F#, 4
+	sound_call Music_SafariZone_branch_bc5f
+	note_type 12, 10, 4
+	note F#, 4
+	sound_loop 0, Music_SafariZone_branch_bc4f
 
 Music_SafariZone_branch_bc5f::
-	notetype 12, 10, 2
+	note_type 12, 10, 2
 	octave 3
-	C_ 4
-	G_ 4
-	C_ 4
-	G_ 4
-	C_ 4
-	G_ 4
-	C_ 4
-	endchannel
-
-
-Music_SafariZone_Ch1::
-	duty 2
-	vibrato 8, 2, 5
-	notetype 12, 10, 2
-	octave 4
-	G_ 1
-	D_ 1
-	G_ 1
-	D_ 1
-	rest 4
-	duty 3
-
-Music_SafariZone_branch_bc79::
-	callchannel Music_SafariZone_branch_bc89
-	notetype 12, 11, 5
-	A_ 4
-	callchannel Music_SafariZone_branch_bc89
-	notetype 12, 11, 5
-	B_ 4
-	loopchannel 0, Music_SafariZone_branch_bc79
-
-Music_SafariZone_branch_bc89::
-	notetype 12, 11, 2
-	octave 3
-	G_ 4
-	D_ 4
-	G_ 4
-	D_ 4
-	G_ 4
-	D_ 4
-	G_ 4
-	endchannel
+	note C_, 4
+	note G_, 4
+	note C_, 4
+	note G_, 4
+	note C_, 4
+	note G_, 4
+	note C_, 4
+	sound_ret
 
 
 Music_SafariZone_Ch2::
-	notetype 12, 1, 0
+	duty_cycle 2
+	vibrato 8, 2, 5
+	note_type 12, 10, 2
+	octave 4
+	note G_, 1
+	note D_, 1
+	note G_, 1
+	note D_, 1
+	rest 4
+	duty_cycle 3
+
+Music_SafariZone_branch_bc79::
+	sound_call Music_SafariZone_branch_bc89
+	note_type 12, 11, 5
+	note A_, 4
+	sound_call Music_SafariZone_branch_bc89
+	note_type 12, 11, 5
+	note B_, 4
+	sound_loop 0, Music_SafariZone_branch_bc79
+
+Music_SafariZone_branch_bc89::
+	note_type 12, 11, 2
+	octave 3
+	note G_, 4
+	note D_, 4
+	note G_, 4
+	note D_, 4
+	note G_, 4
+	note D_, 4
+	note G_, 4
+	sound_ret
+
+
+Music_SafariZone_Ch3::
+	note_type 12, 1, 0
 	rest 8
 
 Music_SafariZone_branch_bc97::
-	callchannel Music_SafariZone_branch_bca5
+	sound_call Music_SafariZone_branch_bca5
 	octave 4
-	A_ 4
-	callchannel Music_SafariZone_branch_bca5
+	note A_, 4
+	sound_call Music_SafariZone_branch_bca5
 	octave 4
-	B_ 4
-	loopchannel 0, Music_SafariZone_branch_bc97
+	note B_, 4
+	sound_loop 0, Music_SafariZone_branch_bc97
 
 Music_SafariZone_branch_bca5::
 	octave 3
-	A_ 2
+	note A_, 2
 	rest 2
 	octave 4
-	D_ 2
+	note D_, 2
 	rest 2
 	octave 3
-	A_ 2
+	note A_, 2
 	rest 2
 	octave 4
-	D_ 2
+	note D_, 2
 	rest 2
 	octave 3
-	A_ 2
+	note A_, 2
 	rest 2
 	octave 4
-	D_ 2
+	note D_, 2
 	rest 2
 	octave 3
-	A_ 2
+	note A_, 2
 	rest 2
-	endchannel
+	sound_ret