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

@@ -1,357 +1,357 @@
-Music_Gym_Ch0::
+Music_Gym_Ch1::
 	tempo 138
 	volume 7, 7
-	duty 3
+	duty_cycle 3
 	vibrato 8, 2, 2
-	toggleperfectpitch
-	notetype 12, 11, 5
+	toggle_perfect_pitch
+	note_type 12, 11, 5
 	octave 3
-	G_ 6
-	C_ 1
-	G_ 1
-	F_ 6
+	note G_, 6
+	note C_, 1
+	note G_, 1
+	note F_, 6
 	octave 2
-	A# 1
+	note A#, 1
 	octave 3
-	F_ 1
-	E_ 6
+	note F_, 1
+	note E_, 6
 	octave 2
-	A_ 1
+	note A_, 1
 	octave 3
-	E_ 1
-	F_ 4
-	G_ 4
+	note E_, 1
+	note F_, 4
+	note G_, 4
 
 Music_Gym_branch_bcd8::
-	E_ 4
-	F_ 2
-	G_ 2
-	F_ 2
-	E_ 2
-	D_ 2
-	C_ 2
-	notetype 12, 11, 1
-	D_ 3
-	notetype 12, 11, 5
-	E_ 1
-	F_ 4
-	E_ 2
-	D_ 2
-	E_ 2
-	F_ 2
-	E_ 4
-	F_ 2
-	G_ 2
-	F_ 2
-	E_ 2
-	D_ 2
-	C_ 2
-	D_ 2
-	D_ 1
-	E_ 1
-	F_ 4
-	E_ 2
-	D_ 2
-	E_ 2
-	F_ 2
+	note E_, 4
+	note F_, 2
+	note G_, 2
+	note F_, 2
+	note E_, 2
+	note D_, 2
+	note C_, 2
+	note_type 12, 11, 1
+	note D_, 3
+	note_type 12, 11, 5
+	note E_, 1
+	note F_, 4
+	note E_, 2
+	note D_, 2
+	note E_, 2
+	note F_, 2
+	note E_, 4
+	note F_, 2
+	note G_, 2
+	note F_, 2
+	note E_, 2
+	note D_, 2
+	note C_, 2
+	note D_, 2
+	note D_, 1
+	note E_, 1
+	note F_, 4
+	note E_, 2
+	note D_, 2
+	note E_, 2
+	note F_, 2
 	octave 4
-	C_ 4
+	note C_, 4
 	octave 3
-	A# 2
+	note A#, 2
 	octave 4
-	C_ 2
+	note C_, 2
 	octave 3
-	A# 2
-	A_ 2
-	G_ 2
-	F_ 2
-	notetype 12, 11, 1
-	A# 3
-	notetype 12, 11, 5
-	F_ 1
-	F_ 4
-	E_ 2
-	D_ 2
-	E_ 2
-	F_ 2
+	note A#, 2
+	note A_, 2
+	note G_, 2
+	note F_, 2
+	note_type 12, 11, 1
+	note A#, 3
+	note_type 12, 11, 5
+	note F_, 1
+	note F_, 4
+	note E_, 2
+	note D_, 2
+	note E_, 2
+	note F_, 2
 	octave 4
-	C_ 4
+	note C_, 4
 	octave 3
-	A# 2
+	note A#, 2
 	octave 4
-	C_ 2
+	note C_, 2
 	octave 3
-	A# 2
-	A_ 2
-	G_ 2
-	F_ 2
-	D_ 2
-	D_ 1
-	E_ 1
-	F_ 4
-	A# 2
-	F_ 1
-	A# 1
+	note A#, 2
+	note A_, 2
+	note G_, 2
+	note F_, 2
+	note D_, 2
+	note D_, 1
+	note E_, 1
+	note F_, 4
+	note A#, 2
+	note F_, 1
+	note A#, 1
 	octave 4
-	D_ 4
+	note D_, 4
 	octave 3
-	E_ 2
-	C_ 2
-	E_ 2
-	G_ 2
-	F_ 2
-	E_ 2
-	D_ 2
-	E_ 2
-	F_ 2
-	D_ 2
-	E_ 2
-	C_ 2
-	D_ 2
-	E_ 2
-	C_ 2
-	D_ 2
-	C_ 2
-	C_ 1
-	D_ 1
-	E_ 4
-	C_ 2
-	E_ 2
-	D_ 2
-	C_ 2
-	E_ 2
-	C_ 1
-	E_ 1
-	F_ 4
-	E_ 2
-	D_ 2
-	E_ 2
-	F_ 2
-	E_ 2
-	C_ 2
-	E_ 2
-	G_ 2
-	F_ 2
-	E_ 2
-	D_ 2
-	E_ 2
-	D_ 2
-	F_ 2
-	D_ 2
-	E_ 2
-	C_ 2
-	D_ 2
-	C_ 2
-	D_ 2
-	C_ 2
-	C_ 1
-	D_ 1
-	E_ 4
-	D_ 2
-	E_ 2
-	F_ 2
-	F_ 2
-	G_ 2
-	E_ 1
-	G_ 1
-	A# 2
+	note E_, 2
+	note C_, 2
+	note E_, 2
+	note G_, 2
+	note F_, 2
+	note E_, 2
+	note D_, 2
+	note E_, 2
+	note F_, 2
+	note D_, 2
+	note E_, 2
+	note C_, 2
+	note D_, 2
+	note E_, 2
+	note C_, 2
+	note D_, 2
+	note C_, 2
+	note C_, 1
+	note D_, 1
+	note E_, 4
+	note C_, 2
+	note E_, 2
+	note D_, 2
+	note C_, 2
+	note E_, 2
+	note C_, 1
+	note E_, 1
+	note F_, 4
+	note E_, 2
+	note D_, 2
+	note E_, 2
+	note F_, 2
+	note E_, 2
+	note C_, 2
+	note E_, 2
+	note G_, 2
+	note F_, 2
+	note E_, 2
+	note D_, 2
+	note E_, 2
+	note D_, 2
+	note F_, 2
+	note D_, 2
+	note E_, 2
+	note C_, 2
+	note D_, 2
+	note C_, 2
+	note D_, 2
+	note C_, 2
+	note C_, 1
+	note D_, 1
+	note E_, 4
+	note D_, 2
+	note E_, 2
+	note F_, 2
+	note F_, 2
+	note G_, 2
+	note E_, 1
+	note G_, 1
+	note A#, 2
 	octave 4
-	C_ 2
+	note C_, 2
 	octave 3
-	A# 2
-	A_ 2
-	G_ 2
-	A_ 2
-	loopchannel 0, Music_Gym_branch_bcd8
-
-
-Music_Gym_Ch1::
-	duty 3
-	vibrato 10, 2, 5
-	notetype 12, 12, 7
-	octave 4
-	C_ 6
-	octave 3
-	G_ 1
-	octave 4
-	C_ 1
-	octave 3
-	A# 6
-	F_ 1
-	A# 1
-	notetype 12, 10, 0
-	A_ 12
-	notetype 12, 12, 7
-	B_ 4
-
-Music_Gym_branch_bd82::
-	octave 4
-	C_ 12
-	octave 3
-	G_ 2
-	octave 4
-	C_ 2
-	notetype 12, 12, 2
-	D_ 3
-	octave 3
-	A# 1
-	notetype 12, 12, 7
-	A# 12
-	octave 4
-	C_ 12
-	octave 3
-	G_ 2
-	octave 4
-	C_ 2
-	notetype 12, 12, 4
-	octave 3
-	A# 2
-	notetype 12, 12, 7
-	A# 1
-	octave 4
-	C_ 1
-	D_ 12
-	E_ 12
-	D_ 2
-	E_ 2
-	notetype 12, 12, 2
-	F_ 3
-	D_ 1
-	notetype 12, 12, 7
-	D_ 4
-	notetype 12, 12, 2
-	A# 3
-	F_ 1
-	notetype 12, 12, 7
-	F_ 4
-	E_ 12
-	D_ 2
-	E_ 2
-	F_ 2
-	D_ 1
-	F_ 1
-	A# 12
-	octave 3
-	G_ 6
-	octave 4
-	C_ 6
-	octave 3
-	G_ 4
-	A# 4
-	A_ 4
-	G_ 4
-	F_ 4
-	notetype 12, 12, 3
-	E_ 2
-	notetype 12, 12, 7
-	E_ 1
-	F_ 1
-	G_ 6
-	G_ 2
-	octave 4
-	C_ 2
-	octave 3
-	G_ 2
-	A# 4
-	A_ 4
-	G_ 4
-	C_ 2
-	D_ 2
-	G_ 6
-	octave 4
-	C_ 6
-	octave 3
-	G_ 4
-	A# 4
-	A_ 4
-	G_ 4
-	F_ 4
-	notetype 12, 12, 3
-	E_ 2
-	notetype 12, 12, 7
-	E_ 1
-	F_ 1
-	G_ 4
-	notetype 12, 12, 3
-	G_ 2
-	notetype 12, 12, 7
-	G_ 1
-	A_ 1
-	A# 4
-	notetype 12, 12, 4
-	octave 4
-	C_ 2
-	notetype 12, 12, 7
-	C_ 1
-	D_ 1
-	E_ 12
-	loopchannel 0, Music_Gym_branch_bd82
+	note A#, 2
+	note A_, 2
+	note G_, 2
+	note A_, 2
+	sound_loop 0, Music_Gym_branch_bcd8
 
 
 Music_Gym_Ch2::
-	notetype 12, 1, 1
+	duty_cycle 3
+	vibrato 10, 2, 5
+	note_type 12, 12, 7
+	octave 4
+	note C_, 6
+	octave 3
+	note G_, 1
+	octave 4
+	note C_, 1
+	octave 3
+	note A#, 6
+	note F_, 1
+	note A#, 1
+	note_type 12, 10, 0
+	note A_, 12
+	note_type 12, 12, 7
+	note B_, 4
+
+Music_Gym_branch_bd82::
+	octave 4
+	note C_, 12
+	octave 3
+	note G_, 2
+	octave 4
+	note C_, 2
+	note_type 12, 12, 2
+	note D_, 3
+	octave 3
+	note A#, 1
+	note_type 12, 12, 7
+	note A#, 12
+	octave 4
+	note C_, 12
+	octave 3
+	note G_, 2
+	octave 4
+	note C_, 2
+	note_type 12, 12, 4
+	octave 3
+	note A#, 2
+	note_type 12, 12, 7
+	note A#, 1
+	octave 4
+	note C_, 1
+	note D_, 12
+	note E_, 12
+	note D_, 2
+	note E_, 2
+	note_type 12, 12, 2
+	note F_, 3
+	note D_, 1
+	note_type 12, 12, 7
+	note D_, 4
+	note_type 12, 12, 2
+	note A#, 3
+	note F_, 1
+	note_type 12, 12, 7
+	note F_, 4
+	note E_, 12
+	note D_, 2
+	note E_, 2
+	note F_, 2
+	note D_, 1
+	note F_, 1
+	note A#, 12
+	octave 3
+	note G_, 6
+	octave 4
+	note C_, 6
+	octave 3
+	note G_, 4
+	note A#, 4
+	note A_, 4
+	note G_, 4
+	note F_, 4
+	note_type 12, 12, 3
+	note E_, 2
+	note_type 12, 12, 7
+	note E_, 1
+	note F_, 1
+	note G_, 6
+	note G_, 2
+	octave 4
+	note C_, 2
+	octave 3
+	note G_, 2
+	note A#, 4
+	note A_, 4
+	note G_, 4
+	note C_, 2
+	note D_, 2
+	note G_, 6
+	octave 4
+	note C_, 6
+	octave 3
+	note G_, 4
+	note A#, 4
+	note A_, 4
+	note G_, 4
+	note F_, 4
+	note_type 12, 12, 3
+	note E_, 2
+	note_type 12, 12, 7
+	note E_, 1
+	note F_, 1
+	note G_, 4
+	note_type 12, 12, 3
+	note G_, 2
+	note_type 12, 12, 7
+	note G_, 1
+	note A_, 1
+	note A#, 4
+	note_type 12, 12, 4
+	octave 4
+	note C_, 2
+	note_type 12, 12, 7
+	note C_, 1
+	note D_, 1
+	note E_, 12
+	sound_loop 0, Music_Gym_branch_bd82
+
+
+Music_Gym_Ch3::
+	note_type 12, 1, 1
 	rest 16
 	rest 10
 	octave 4
-	G_ 2
-	F_ 2
-	D_ 2
+	note G_, 2
+	note F_, 2
+	note D_, 2
 
 Music_Gym_branch_be02::
-	callchannel Music_Gym_branch_be3b
-	callchannel Music_Gym_branch_be44
-	callchannel Music_Gym_branch_be3b
-	callchannel Music_Gym_branch_be44
-	callchannel Music_Gym_branch_be3b
-	callchannel Music_Gym_branch_be44
-	callchannel Music_Gym_branch_be3b
-	callchannel Music_Gym_branch_be44
-	callchannel Music_Gym_branch_be3b
-	callchannel Music_Gym_branch_be4d
-	callchannel Music_Gym_branch_be3b
-	callchannel Music_Gym_branch_be4d
-	callchannel Music_Gym_branch_be3b
-	callchannel Music_Gym_branch_be4d
-	callchannel Music_Gym_branch_be3b
-	F_ 2
-	A# 2
-	F_ 2
-	A# 2
-	F_ 2
-	A# 2
-	A_ 2
-	F_ 2
-	loopchannel 0, Music_Gym_branch_be02
+	sound_call Music_Gym_branch_be3b
+	sound_call Music_Gym_branch_be44
+	sound_call Music_Gym_branch_be3b
+	sound_call Music_Gym_branch_be44
+	sound_call Music_Gym_branch_be3b
+	sound_call Music_Gym_branch_be44
+	sound_call Music_Gym_branch_be3b
+	sound_call Music_Gym_branch_be44
+	sound_call Music_Gym_branch_be3b
+	sound_call Music_Gym_branch_be4d
+	sound_call Music_Gym_branch_be3b
+	sound_call Music_Gym_branch_be4d
+	sound_call Music_Gym_branch_be3b
+	sound_call Music_Gym_branch_be4d
+	sound_call Music_Gym_branch_be3b
+	note F_, 2
+	note A#, 2
+	note F_, 2
+	note A#, 2
+	note F_, 2
+	note A#, 2
+	note A_, 2
+	note F_, 2
+	sound_loop 0, Music_Gym_branch_be02
 
 Music_Gym_branch_be3b::
-	E_ 2
-	G_ 2
-	E_ 2
-	G_ 2
-	E_ 2
-	G_ 2
-	E_ 2
-	G_ 2
-	endchannel
+	note E_, 2
+	note G_, 2
+	note E_, 2
+	note G_, 2
+	note E_, 2
+	note G_, 2
+	note E_, 2
+	note G_, 2
+	sound_ret
 
 Music_Gym_branch_be44::
-	D_ 2
-	F_ 2
-	D_ 2
-	F_ 2
-	D_ 2
-	F_ 2
-	D_ 2
-	F_ 2
-	endchannel
+	note D_, 2
+	note F_, 2
+	note D_, 2
+	note F_, 2
+	note D_, 2
+	note F_, 2
+	note D_, 2
+	note F_, 2
+	sound_ret
 
 Music_Gym_branch_be4d::
-	F_ 2
-	A# 2
-	F_ 2
-	A# 2
-	F_ 2
-	A# 2
-	F_ 2
-	A# 2
-	endchannel
+	note F_, 2
+	note A#, 2
+	note F_, 2
+	note A#, 2
+	note F_, 2
+	note A#, 2
+	note F_, 2
+	note A#, 2
+	sound_ret