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

@@ -1,314 +1,314 @@
-Music_PalletTown_Ch0::
+Music_PalletTown_Ch1::
 	tempo 160
 	volume 7, 7
-	duty 2
-	notetype 12, 12, 3
+	duty_cycle 2
+	note_type 12, 12, 3
 
 Music_PalletTown_branch_a7ce::
 	octave 3
-	B_ 4
+	note B_, 4
 	octave 4
-	C_ 2
-	D_ 4
-	G_ 2
-	D_ 2
-	C_ 2
+	note C_, 2
+	note D_, 4
+	note G_, 2
+	note D_, 2
+	note C_, 2
 	octave 3
-	B_ 4
-	G_ 2
+	note B_, 4
+	note G_, 2
 	octave 4
-	D_ 4
-	D_ 2
-	C_ 2
+	note D_, 4
+	note D_, 2
+	note C_, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	rest 2
-	B_ 2
+	note B_, 2
 	octave 4
-	C_ 2
+	note C_, 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	C_ 8
+	note C_, 8
 	rest 2
 	octave 3
-	B_ 2
+	note B_, 2
 	octave 4
-	C_ 2
+	note C_, 2
 	octave 3
-	A_ 2
-	B_ 2
-	G_ 2
-	A_ 2
-	F# 2
-	B_ 4
+	note A_, 2
+	note B_, 2
+	note G_, 2
+	note A_, 2
+	note F#, 2
+	note B_, 4
 	octave 4
-	C_ 2
-	D_ 4
-	G_ 2
-	D_ 2
-	C_ 2
+	note C_, 2
+	note D_, 4
+	note G_, 2
+	note D_, 2
+	note C_, 2
 	octave 3
-	B_ 4
-	G_ 2
+	note B_, 4
+	note G_, 2
 	octave 4
-	D_ 4
-	D_ 2
-	G_ 2
-	F# 2
-	E_ 4
-	D_ 2
-	C_ 4
+	note D_, 4
+	note D_, 2
+	note G_, 2
+	note F#, 2
+	note E_, 4
+	note D_, 2
+	note C_, 4
 	octave 3
-	A_ 2
-	B_ 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
-	G_ 4
-	F# 4
+	note B_, 2
+	note A_, 2
+	note G_, 4
+	note F#, 4
 	octave 4
-	C_ 2
+	note C_, 2
 	octave 3
-	G_ 2
-	E_ 2
-	G_ 2
+	note G_, 2
+	note E_, 2
+	note G_, 2
 	octave 4
-	D_ 2
+	note D_, 2
 	octave 3
-	A_ 2
-	F# 2
-	A_ 2
-	notetype 12, 11, 3
-	B_ 2
-	G_ 2
-	D_ 2
-	G_ 2
-	B_ 2
-	G_ 2
-	D_ 2
-	G_ 2
+	note A_, 2
+	note F#, 2
+	note A_, 2
+	note_type 12, 11, 3
+	note B_, 2
+	note G_, 2
+	note D_, 2
+	note G_, 2
+	note B_, 2
+	note G_, 2
+	note D_, 2
+	note G_, 2
 	octave 4
-	C_ 2
+	note C_, 2
 	octave 3
-	G_ 2
-	E_ 2
-	G_ 2
+	note G_, 2
+	note E_, 2
+	note G_, 2
 	octave 4
-	D_ 2
+	note D_, 2
 	octave 3
-	A_ 2
-	F# 2
-	A_ 2
-	B_ 2
-	G_ 2
-	D_ 2
-	G_ 2
-	B_ 2
-	G_ 2
-	D_ 2
-	G_ 2
-	A_ 2
-	E_ 2
-	C_ 2
-	E_ 2
-	A_ 2
-	E_ 2
-	C_ 2
-	E_ 2
-	A_ 2
-	E_ 2
-	C_ 2
-	E_ 2
-	A_ 2
-	E_ 2
-	C_ 2
-	E_ 2
-	F# 2
-	D_ 2
-	C_ 2
-	D_ 2
-	G_ 2
-	E_ 2
-	C_ 2
-	E_ 2
-	G_ 2
-	E_ 2
-	C_ 2
-	E_ 2
-	F# 2
-	D_ 2
-	C_ 2
-	D_ 2
-	loopchannel 0, Music_PalletTown_branch_a7ce
-	endchannel
-
-
-Music_PalletTown_Ch1::
-	duty 2
-
-Music_PalletTown_branch_a861::
-	notetype 12, 13, 3
-	octave 5
-	D_ 2
-	notetype 12, 10, 3
-	C_ 2
-	notetype 12, 13, 3
-	octave 4
-	B_ 2
-	notetype 12, 11, 3
-	A_ 2
-	notetype 12, 13, 3
-	octave 5
-	G_ 2
-	notetype 12, 11, 3
-	E_ 2
-	notetype 12, 13, 3
-	F# 2
-	E_ 2
-	D_ 6
-	octave 4
-	B_ 2
-	G_ 2
-	G_ 2
-	A_ 2
-	B_ 2
-	octave 5
-	C_ 10
-	octave 4
-	F# 2
-	G_ 2
-	A_ 2
-	B_ 6
-	octave 5
-	C_ 1
-	octave 4
-	B_ 1
-	A_ 8
-	octave 5
-	D_ 2
-	notetype 12, 10, 3
-	C_ 2
-	notetype 12, 13, 3
-	octave 4
-	B_ 2
-	notetype 12, 11, 3
-	octave 5
-	D_ 2
-	notetype 12, 13, 3
-	G_ 2
-	notetype 12, 10, 3
-	F# 2
-	notetype 12, 11, 3
-	F# 2
-	notetype 12, 13, 3
-	G_ 2
-	E_ 6
-	D_ 2
-	D_ 8
-	C_ 2
-	octave 4
-	B_ 2
-	A_ 2
-	G_ 2
-	octave 5
-	D_ 2
-	C_ 2
-	octave 4
-	B_ 2
-	A_ 2
-	G_ 10
-	G_ 2
-	A_ 2
-	B_ 2
-	octave 5
-	C_ 8
-	D_ 6
-	C_ 2
-	octave 4
-	B_ 8
-	rest 2
-	G_ 2
-	A_ 2
-	B_ 2
-	octave 5
-	C_ 4
-	C_ 4
-	D_ 6
-	C_ 1
-	D_ 1
-	octave 4
-	B_ 8
-	rest 2
-	B_ 2
-	A_ 2
-	G_ 2
-	A_ 8
-	E_ 4
-	B_ 4
-	A_ 8
-	G_ 4
-	E_ 4
-	F# 8
-	G_ 4
-	B_ 4
-	B_ 8
-	A_ 8
-	loopchannel 0, Music_PalletTown_branch_a861
-	endchannel
+	note A_, 2
+	note F#, 2
+	note A_, 2
+	note B_, 2
+	note G_, 2
+	note D_, 2
+	note G_, 2
+	note B_, 2
+	note G_, 2
+	note D_, 2
+	note G_, 2
+	note A_, 2
+	note E_, 2
+	note C_, 2
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note C_, 2
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note C_, 2
+	note E_, 2
+	note A_, 2
+	note E_, 2
+	note C_, 2
+	note E_, 2
+	note F#, 2
+	note D_, 2
+	note C_, 2
+	note D_, 2
+	note G_, 2
+	note E_, 2
+	note C_, 2
+	note E_, 2
+	note G_, 2
+	note E_, 2
+	note C_, 2
+	note E_, 2
+	note F#, 2
+	note D_, 2
+	note C_, 2
+	note D_, 2
+	sound_loop 0, Music_PalletTown_branch_a7ce
+	sound_ret
 
 
 Music_PalletTown_Ch2::
+	duty_cycle 2
+
+Music_PalletTown_branch_a861::
+	note_type 12, 13, 3
+	octave 5
+	note D_, 2
+	note_type 12, 10, 3
+	note C_, 2
+	note_type 12, 13, 3
+	octave 4
+	note B_, 2
+	note_type 12, 11, 3
+	note A_, 2
+	note_type 12, 13, 3
+	octave 5
+	note G_, 2
+	note_type 12, 11, 3
+	note E_, 2
+	note_type 12, 13, 3
+	note F#, 2
+	note E_, 2
+	note D_, 6
+	octave 4
+	note B_, 2
+	note G_, 2
+	note G_, 2
+	note A_, 2
+	note B_, 2
+	octave 5
+	note C_, 10
+	octave 4
+	note F#, 2
+	note G_, 2
+	note A_, 2
+	note B_, 6
+	octave 5
+	note C_, 1
+	octave 4
+	note B_, 1
+	note A_, 8
+	octave 5
+	note D_, 2
+	note_type 12, 10, 3
+	note C_, 2
+	note_type 12, 13, 3
+	octave 4
+	note B_, 2
+	note_type 12, 11, 3
+	octave 5
+	note D_, 2
+	note_type 12, 13, 3
+	note G_, 2
+	note_type 12, 10, 3
+	note F#, 2
+	note_type 12, 11, 3
+	note F#, 2
+	note_type 12, 13, 3
+	note G_, 2
+	note E_, 6
+	note D_, 2
+	note D_, 8
+	note C_, 2
+	octave 4
+	note B_, 2
+	note A_, 2
+	note G_, 2
+	octave 5
+	note D_, 2
+	note C_, 2
+	octave 4
+	note B_, 2
+	note A_, 2
+	note G_, 10
+	note G_, 2
+	note A_, 2
+	note B_, 2
+	octave 5
+	note C_, 8
+	note D_, 6
+	note C_, 2
+	octave 4
+	note B_, 8
+	rest 2
+	note G_, 2
+	note A_, 2
+	note B_, 2
+	octave 5
+	note C_, 4
+	note C_, 4
+	note D_, 6
+	note C_, 1
+	note D_, 1
+	octave 4
+	note B_, 8
+	rest 2
+	note B_, 2
+	note A_, 2
+	note G_, 2
+	note A_, 8
+	note E_, 4
+	note B_, 4
+	note A_, 8
+	note G_, 4
+	note E_, 4
+	note F#, 8
+	note G_, 4
+	note B_, 4
+	note B_, 8
+	note A_, 8
+	sound_loop 0, Music_PalletTown_branch_a861
+	sound_ret
+
+
+Music_PalletTown_Ch3::
 	vibrato 24, 2, 8
-	notetype 12, 1, 2
+	note_type 12, 1, 2
 
 Music_PalletTown_branch_a8e3::
 	octave 4
-	G_ 6
-	E_ 6
-	F# 4
-	G_ 6
-	A_ 6
-	G_ 4
-	E_ 6
-	F# 6
-	E_ 4
-	G_ 6
-	E_ 6
-	D_ 4
-	G_ 6
-	E_ 6
-	F# 4
-	G_ 6
-	A_ 6
-	G_ 4
-	E_ 6
-	F# 6
-	A_ 4
-	G_ 6
-	E_ 6
-	D_ 4
-	C_ 8
-	D_ 8
-	G_ 8
-	E_ 4
-	D_ 4
-	C_ 8
-	D_ 8
-	G_ 8
-	A_ 4
-	G_ 4
-	E_ 8
-	A_ 8
-	E_ 8
-	G_ 8
-	F# 8
-	E_ 8
-	E_ 8
-	F# 8
-	loopchannel 0, Music_PalletTown_branch_a8e3
-	endchannel
+	note G_, 6
+	note E_, 6
+	note F#, 4
+	note G_, 6
+	note A_, 6
+	note G_, 4
+	note E_, 6
+	note F#, 6
+	note E_, 4
+	note G_, 6
+	note E_, 6
+	note D_, 4
+	note G_, 6
+	note E_, 6
+	note F#, 4
+	note G_, 6
+	note A_, 6
+	note G_, 4
+	note E_, 6
+	note F#, 6
+	note A_, 4
+	note G_, 6
+	note E_, 6
+	note D_, 4
+	note C_, 8
+	note D_, 8
+	note G_, 8
+	note E_, 4
+	note D_, 4
+	note C_, 8
+	note D_, 8
+	note G_, 8
+	note A_, 4
+	note G_, 4
+	note E_, 8
+	note A_, 8
+	note E_, 8
+	note G_, 8
+	note F#, 8
+	note E_, 8
+	note E_, 8
+	note F#, 8
+	sound_loop 0, Music_PalletTown_branch_a8e3
+	sound_ret