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

@@ -1,375 +1,375 @@
-Music_Pokecenter_Ch0::
+Music_Pokecenter_Ch1::
 	tempo 144
 	volume 7, 7
-	duty 3
+	duty_cycle 3
 	vibrato 10, 2, 2
-	toggleperfectpitch
+	toggle_perfect_pitch
 
 Music_Pokecenter_branch_be61::
-	notetype 12, 10, 3
+	note_type 12, 10, 3
 	octave 3
-	F# 2
-	F_ 2
-	F# 2
-	notetype 12, 11, 5
+	note F#, 2
+	note F_, 2
+	note F#, 2
+	note_type 12, 11, 5
 	octave 4
-	D_ 4
-	C# 2
+	note D_, 4
+	note C#, 2
 	octave 3
-	B_ 2
-	A_ 2
-	B_ 2
-	A_ 2
-	G_ 2
-	F# 2
-	E_ 2
-	F# 2
-	G_ 2
-	A_ 2
-	notetype 12, 10, 3
-	A_ 2
-	E_ 2
-	A_ 2
-	notetype 12, 11, 5
+	note B_, 2
+	note A_, 2
+	note B_, 2
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	note E_, 2
+	note F#, 2
+	note G_, 2
+	note A_, 2
+	note_type 12, 10, 3
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	note_type 12, 11, 5
 	octave 4
-	C# 4
+	note C#, 4
 	octave 3
-	B_ 2
-	A_ 2
-	G_ 2
-	F# 2
-	A_ 2
-	B_ 2
+	note B_, 2
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	note A_, 2
+	note B_, 2
 	octave 4
-	C# 2
-	D_ 2
-	C# 2
+	note C#, 2
+	note D_, 2
+	note C#, 2
 	octave 3
-	B_ 2
-	A_ 2
-	notetype 12, 10, 3
-	F# 2
-	F_ 2
-	F# 2
-	notetype 12, 11, 5
+	note B_, 2
+	note A_, 2
+	note_type 12, 10, 3
+	note F#, 2
+	note F_, 2
+	note F#, 2
+	note_type 12, 11, 5
 	octave 4
-	D_ 4
-	C# 2
+	note D_, 4
+	note C#, 2
 	octave 3
-	B_ 2
-	A_ 2
-	B_ 2
-	A_ 2
-	G_ 2
-	F# 2
-	E_ 2
-	F# 2
-	G_ 2
-	A_ 2
-	notetype 12, 10, 3
-	A_ 2
-	E_ 2
-	A_ 2
-	notetype 12, 11, 5
+	note B_, 2
+	note A_, 2
+	note B_, 2
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	note E_, 2
+	note F#, 2
+	note G_, 2
+	note A_, 2
+	note_type 12, 10, 3
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	note_type 12, 11, 5
 	octave 4
-	C# 4
+	note C#, 4
 	octave 3
-	B_ 2
-	A_ 2
-	G_ 2
-	F# 2
-	E_ 2
-	D_ 2
-	E_ 2
-	F# 2
-	G_ 2
-	A_ 2
-	B_ 2
-	F# 2
-	E_ 2
-	D_ 4
-	E_ 2
-	F# 2
-	G_ 2
-	A_ 2
-	B_ 2
-	A_ 2
-	G_ 4
-	E_ 2
-	F# 2
-	G_ 2
-	A_ 2
-	G_ 2
-	F# 2
-	E_ 4
-	C# 2
-	D_ 2
-	E_ 2
-	G_ 2
-	F# 2
-	G_ 2
-	A_ 2
-	B_ 2
-	A_ 8
+	note B_, 2
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	note E_, 2
+	note D_, 2
+	note E_, 2
+	note F#, 2
+	note G_, 2
+	note A_, 2
+	note B_, 2
+	note F#, 2
+	note E_, 2
+	note D_, 4
+	note E_, 2
+	note F#, 2
+	note G_, 2
+	note A_, 2
+	note B_, 2
+	note A_, 2
+	note G_, 4
+	note E_, 2
+	note F#, 2
+	note G_, 2
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	note E_, 4
+	note C#, 2
+	note D_, 2
+	note E_, 2
+	note G_, 2
+	note F#, 2
+	note G_, 2
+	note A_, 2
+	note B_, 2
+	note A_, 8
 	octave 4
-	D_ 2
-	C# 2
+	note D_, 2
+	note C#, 2
 	octave 3
-	B_ 4
-	A_ 2
-	B_ 2
+	note B_, 4
+	note A_, 2
+	note B_, 2
 	octave 4
-	C# 2
-	D_ 2
-	E_ 2
-	D_ 2
-	C# 4
+	note C#, 2
+	note D_, 2
+	note E_, 2
+	note D_, 2
+	note C#, 4
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	C# 2
-	D_ 2
-	E_ 2
-	C# 2
+	note C#, 2
+	note D_, 2
+	note E_, 2
+	note C#, 2
 	octave 3
-	B_ 2
-	A_ 4
-	G_ 2
-	A_ 2
-	B_ 2
-	G_ 2
-	A_ 2
-	G_ 2
-	F# 2
-	E_ 2
-	D_ 2
-	E_ 2
-	F# 2
-	G_ 2
-	loopchannel 0, Music_Pokecenter_branch_be61
-
-
-Music_Pokecenter_Ch1::
-	vibrato 8, 2, 5
-
-Music_Pokecenter_branch_befc::
-	callchannel Music_Pokecenter_branch_bf4e
-	duty 3
-	notetype 12, 10, 5
-	octave 3
-	A_ 4
-	E_ 4
-	callchannel Music_Pokecenter_branch_bf60
-	D_ 2
-	F# 6
-	duty 3
-	notetype 12, 10, 5
-	octave 3
-	A_ 4
-	E_ 4
-	callchannel Music_Pokecenter_branch_bf4e
-	duty 3
-	notetype 12, 10, 5
-	octave 3
-	A_ 4
-	E_ 4
-	callchannel Music_Pokecenter_branch_bf60
-	D_ 8
-	duty 3
-	notetype 12, 10, 5
-	octave 3
-	D_ 4
-	E_ 4
-	duty 2
-	notetype 12, 12, 6
-	octave 4
-	F# 8
-	A_ 8
-	G_ 2
-	A_ 2
-	G_ 2
-	F# 2
-	E_ 8
-	C# 8
-	E_ 8
-	F# 2
-	G_ 2
-	F# 2
-	E_ 2
-	D_ 8
-	F# 8
-	A_ 8
-	G_ 2
-	F# 2
-	G_ 2
-	A_ 2
-	B_ 8
-	A_ 4
-	G_ 2
-	F# 2
-	G_ 8
-	F# 2
-	G_ 2
-	F# 2
-	E_ 2
-	D_ 8
-	loopchannel 0, Music_Pokecenter_branch_befc
-
-Music_Pokecenter_branch_bf4e::
-	duty 2
-	notetype 12, 12, 2
-	octave 4
-	D_ 2
-	octave 3
-	A_ 2
-	octave 4
-	D_ 2
-	notetype 12, 12, 3
-	A_ 4
-	G_ 4
-	F# 2
-	E_ 2
-	C# 6
-	endchannel
-
-Music_Pokecenter_branch_bf60::
-	duty 2
-	notetype 12, 12, 2
-	octave 4
-	C# 2
-	octave 3
-	A_ 2
-	octave 4
-	C# 2
-	notetype 12, 12, 3
-	F# 4
-	E_ 4
-	C# 2
-	endchannel
+	note B_, 2
+	note A_, 4
+	note G_, 2
+	note A_, 2
+	note B_, 2
+	note G_, 2
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	note E_, 2
+	note D_, 2
+	note E_, 2
+	note F#, 2
+	note G_, 2
+	sound_loop 0, Music_Pokecenter_branch_be61
 
 
 Music_Pokecenter_Ch2::
-	notetype 12, 1, 0
+	vibrato 8, 2, 5
+
+Music_Pokecenter_branch_befc::
+	sound_call Music_Pokecenter_branch_bf4e
+	duty_cycle 3
+	note_type 12, 10, 5
+	octave 3
+	note A_, 4
+	note E_, 4
+	sound_call Music_Pokecenter_branch_bf60
+	note D_, 2
+	note F#, 6
+	duty_cycle 3
+	note_type 12, 10, 5
+	octave 3
+	note A_, 4
+	note E_, 4
+	sound_call Music_Pokecenter_branch_bf4e
+	duty_cycle 3
+	note_type 12, 10, 5
+	octave 3
+	note A_, 4
+	note E_, 4
+	sound_call Music_Pokecenter_branch_bf60
+	note D_, 8
+	duty_cycle 3
+	note_type 12, 10, 5
+	octave 3
+	note D_, 4
+	note E_, 4
+	duty_cycle 2
+	note_type 12, 12, 6
+	octave 4
+	note F#, 8
+	note A_, 8
+	note G_, 2
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	note E_, 8
+	note C#, 8
+	note E_, 8
+	note F#, 2
+	note G_, 2
+	note F#, 2
+	note E_, 2
+	note D_, 8
+	note F#, 8
+	note A_, 8
+	note G_, 2
+	note F#, 2
+	note G_, 2
+	note A_, 2
+	note B_, 8
+	note A_, 4
+	note G_, 2
+	note F#, 2
+	note G_, 8
+	note F#, 2
+	note G_, 2
+	note F#, 2
+	note E_, 2
+	note D_, 8
+	sound_loop 0, Music_Pokecenter_branch_befc
+
+Music_Pokecenter_branch_bf4e::
+	duty_cycle 2
+	note_type 12, 12, 2
+	octave 4
+	note D_, 2
+	octave 3
+	note A_, 2
+	octave 4
+	note D_, 2
+	note_type 12, 12, 3
+	note A_, 4
+	note G_, 4
+	note F#, 2
+	note E_, 2
+	note C#, 6
+	sound_ret
+
+Music_Pokecenter_branch_bf60::
+	duty_cycle 2
+	note_type 12, 12, 2
+	octave 4
+	note C#, 2
+	octave 3
+	note A_, 2
+	octave 4
+	note C#, 2
+	note_type 12, 12, 3
+	note F#, 4
+	note E_, 4
+	note C#, 2
+	sound_ret
+
+
+Music_Pokecenter_Ch3::
+	note_type 12, 1, 0
 
 Music_Pokecenter_branch_bf72::
 	octave 4
-	D_ 2
-	F# 2
-	D_ 2
-	F# 2
-	D_ 2
-	F# 2
-	G_ 2
-	F# 2
-	callchannel Music_Pokecenter_branch_bfd9
-	callchannel Music_Pokecenter_branch_bfe2
-	F# 2
-	A_ 2
-	F# 2
-	A_ 2
-	F# 2
-	A_ 2
-	G_ 2
-	A_ 2
-	D_ 2
-	F# 2
-	D_ 2
-	F# 2
-	D_ 2
-	F# 2
-	G_ 2
-	F# 2
-	callchannel Music_Pokecenter_branch_bfd9
-	callchannel Music_Pokecenter_branch_bfe2
-	D_ 2
-	F# 2
-	D_ 2
-	F# 2
-	D_ 2
-	B_ 2
-	A_ 2
-	G_ 2
-	callchannel Music_Pokecenter_branch_bfeb
-	G_ 2
-	B_ 2
-	G_ 2
-	B_ 2
-	G_ 2
-	B_ 2
-	G_ 2
-	B_ 2
-	E_ 2
-	G_ 2
-	E_ 2
-	G_ 2
-	E_ 2
-	G_ 2
-	E_ 2
-	G_ 2
-	F# 2
-	A_ 2
-	F# 2
-	A_ 2
-	F# 2
-	A_ 2
-	G# 2
-	A_ 2
-	callchannel Music_Pokecenter_branch_bfeb
-	G_ 2
-	B_ 2
-	G_ 2
-	B_ 2
-	G_ 2
-	B_ 2
-	G_ 2
-	B_ 2
-	E_ 2
-	G_ 2
-	E_ 2
-	G_ 2
-	E_ 2
-	G_ 2
-	E_ 2
-	G_ 2
-	F# 2
-	A_ 2
-	F# 2
-	A_ 2
-	F# 2
-	G_ 2
-	F# 2
-	E_ 2
-	loopchannel 0, Music_Pokecenter_branch_bf72
+	note D_, 2
+	note F#, 2
+	note D_, 2
+	note F#, 2
+	note D_, 2
+	note F#, 2
+	note G_, 2
+	note F#, 2
+	sound_call Music_Pokecenter_branch_bfd9
+	sound_call Music_Pokecenter_branch_bfe2
+	note F#, 2
+	note A_, 2
+	note F#, 2
+	note A_, 2
+	note F#, 2
+	note A_, 2
+	note G_, 2
+	note A_, 2
+	note D_, 2
+	note F#, 2
+	note D_, 2
+	note F#, 2
+	note D_, 2
+	note F#, 2
+	note G_, 2
+	note F#, 2
+	sound_call Music_Pokecenter_branch_bfd9
+	sound_call Music_Pokecenter_branch_bfe2
+	note D_, 2
+	note F#, 2
+	note D_, 2
+	note F#, 2
+	note D_, 2
+	note B_, 2
+	note A_, 2
+	note G_, 2
+	sound_call Music_Pokecenter_branch_bfeb
+	note G_, 2
+	note B_, 2
+	note G_, 2
+	note B_, 2
+	note G_, 2
+	note B_, 2
+	note G_, 2
+	note B_, 2
+	note E_, 2
+	note G_, 2
+	note E_, 2
+	note G_, 2
+	note E_, 2
+	note G_, 2
+	note E_, 2
+	note G_, 2
+	note F#, 2
+	note A_, 2
+	note F#, 2
+	note A_, 2
+	note F#, 2
+	note A_, 2
+	note G#, 2
+	note A_, 2
+	sound_call Music_Pokecenter_branch_bfeb
+	note G_, 2
+	note B_, 2
+	note G_, 2
+	note B_, 2
+	note G_, 2
+	note B_, 2
+	note G_, 2
+	note B_, 2
+	note E_, 2
+	note G_, 2
+	note E_, 2
+	note G_, 2
+	note E_, 2
+	note G_, 2
+	note E_, 2
+	note G_, 2
+	note F#, 2
+	note A_, 2
+	note F#, 2
+	note A_, 2
+	note F#, 2
+	note G_, 2
+	note F#, 2
+	note E_, 2
+	sound_loop 0, Music_Pokecenter_branch_bf72
 
 Music_Pokecenter_branch_bfd9::
-	E_ 2
-	A_ 2
-	E_ 2
-	A_ 2
-	E_ 2
-	A_ 2
-	E_ 2
-	A_ 2
-	endchannel
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	sound_ret
 
 Music_Pokecenter_branch_bfe2::
-	E_ 2
-	A_ 2
-	E_ 2
-	A_ 2
-	E_ 2
-	A_ 2
-	G_ 2
-	A_ 2
-	endchannel
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note A_, 2
+	note G_, 2
+	note A_, 2
+	sound_ret
 
 Music_Pokecenter_branch_bfeb::
-	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