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

@@ -1,149 +1,149 @@
-Music_CinnabarMansion_Ch0::
+Music_CinnabarMansion_Ch1::
 	tempo 144
 	volume 7, 7
 	vibrato 11, 2, 5
-	duty 2
+	duty_cycle 2
 
 Music_CinnabarMansion_branch_7ed19::
-	notetype 12, 6, 2
+	note_type 12, 6, 2
 	octave 5
-	E_ 1
-	E_ 1
+	note E_, 1
+	note E_, 1
 	octave 4
-	B_ 1
-	B_ 1
-	C_ 1
+	note B_, 1
+	note B_, 1
+	note C_, 1
 	rest 2
 	octave 5
-	B_ 2
-	E_ 2
+	note B_, 2
+	note E_, 2
 	octave 4
-	C_ 2
-	B_ 2
-	E_ 2
-	C_ 1
+	note C_, 2
+	note B_, 2
+	note E_, 2
+	note C_, 1
 	octave 5
-	B_ 1
+	note B_, 1
 	rest 2
-	loopchannel 14, Music_CinnabarMansion_branch_7ed19
-	notetype 12, 10, 5
+	sound_loop 14, Music_CinnabarMansion_branch_7ed19
+	note_type 12, 10, 5
 	rest 16
 	rest 16
 	rest 15
 	octave 4
-	C_ 1
+	note C_, 1
 	octave 5
-	B_ 1
-	B_ 2
-	loopchannel 0, Music_CinnabarMansion_branch_7ed19
+	note B_, 1
+	note B_, 2
+	sound_loop 0, Music_CinnabarMansion_branch_7ed19
 
 
-Music_CinnabarMansion_Ch1::
-	duty 2
-	toggleperfectpitch
+Music_CinnabarMansion_Ch2::
+	duty_cycle 2
+	toggle_perfect_pitch
 	vibrato 10, 2, 4
-	notetype 12, 12, 2
+	note_type 12, 12, 2
 
 Music_CinnabarMansion_branch_7ed48::
 	rest 16
 	rest 16
-	loopchannel 4, Music_CinnabarMansion_branch_7ed48
+	sound_loop 4, Music_CinnabarMansion_branch_7ed48
 
 Music_CinnabarMansion_branch_7ed4e::
-	notetype 12, 12, 2
+	note_type 12, 12, 2
 
 Music_CinnabarMansion_branch_7ed50::
-	callchannel Music_CinnabarMansion_branch_7ed6c
-	loopchannel 3, Music_CinnabarMansion_branch_7ed50
+	sound_call Music_CinnabarMansion_branch_7ed6c
+	sound_loop 3, Music_CinnabarMansion_branch_7ed50
 	octave 3
-	E_ 4
-	D# 4
-	B_ 4
-	A# 4
-	G_ 4
-	G# 4
+	note E_, 4
+	note D#, 4
+	note B_, 4
+	note A#, 4
+	note G_, 4
+	note G#, 4
 	rest 4
-	A# 4
-	E_ 4
-	D# 4
-	B_ 4
-	A# 4
-	G_ 4
-	G# 4
-	G_ 4
-	D# 4
-	loopchannel 0, Music_CinnabarMansion_branch_7ed4e
+	note A#, 4
+	note E_, 4
+	note D#, 4
+	note B_, 4
+	note A#, 4
+	note G_, 4
+	note G#, 4
+	note G_, 4
+	note D#, 4
+	sound_loop 0, Music_CinnabarMansion_branch_7ed4e
 
 Music_CinnabarMansion_branch_7ed6c::
 	octave 3
-	E_ 4
-	D# 4
-	B_ 4
-	A# 4
-	G_ 4
-	G# 4
-	A_ 4
-	A# 4
-	E_ 4
-	D# 4
-	B_ 4
-	A# 4
-	G_ 4
-	G# 4
+	note E_, 4
+	note D#, 4
+	note B_, 4
+	note A#, 4
+	note G_, 4
+	note G#, 4
+	note A_, 4
+	note A#, 4
+	note E_, 4
+	note D#, 4
+	note B_, 4
+	note A#, 4
+	note G_, 4
+	note G#, 4
 	rest 4
-	A# 4
-	endchannel
-
-
-Music_CinnabarMansion_Ch2::
-	notetype 12, 1, 1
-
-Music_CinnabarMansion_branch_7ed80::
-	octave 2
-	B_ 2
-	rest 2
-	octave 3
-	E_ 2
-	rest 2
-	E_ 2
-	rest 2
-	E_ 2
-	rest 2
-	E_ 2
-	rest 2
-	E_ 2
-	rest 2
-	E_ 2
-	rest 2
-	E_ 2
-	rest 2
-	C_ 2
-	rest 2
-	octave 3
-	D# 2
-	rest 2
-	D# 2
-	rest 2
-	D# 2
-	rest 2
-	D# 2
-	rest 2
-	D# 2
-	rest 2
-	D# 2
-	rest 2
-	D# 2
-	rest 2
-	loopchannel 8, Music_CinnabarMansion_branch_7ed80
-	E_ 16
-	D# 16
-	G_ 16
-	G# 8
-	D# 8
-	loopchannel 0, Music_CinnabarMansion_branch_7ed80
+	note A#, 4
+	sound_ret
 
 
 Music_CinnabarMansion_Ch3::
+	note_type 12, 1, 1
+
+Music_CinnabarMansion_branch_7ed80::
+	octave 2
+	note B_, 2
+	rest 2
+	octave 3
+	note E_, 2
+	rest 2
+	note E_, 2
+	rest 2
+	note E_, 2
+	rest 2
+	note E_, 2
+	rest 2
+	note E_, 2
+	rest 2
+	note E_, 2
+	rest 2
+	note E_, 2
+	rest 2
+	note C_, 2
+	rest 2
+	octave 3
+	note D#, 2
+	rest 2
+	note D#, 2
+	rest 2
+	note D#, 2
+	rest 2
+	note D#, 2
+	rest 2
+	note D#, 2
+	rest 2
+	note D#, 2
+	rest 2
+	note D#, 2
+	rest 2
+	sound_loop 8, Music_CinnabarMansion_branch_7ed80
+	note E_, 16
+	note D#, 16
+	note G_, 16
+	note G#, 8
+	note D#, 8
+	sound_loop 0, Music_CinnabarMansion_branch_7ed80
+
+
+Music_CinnabarMansion_Ch4::
 	dspeed 6
 	rest 16
 	rest 16
@@ -169,4 +169,4 @@ Music_CinnabarMansion_branch_7edb5::
 	rest 10
 	rest 8
 	cymbal3 8
-	loopchannel 0, Music_CinnabarMansion_branch_7edb5
+	sound_loop 0, Music_CinnabarMansion_branch_7edb5