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

@@ -1,411 +1,411 @@
-Music_Celadon_Ch0::
+Music_Celadon_Ch1::
 	tempo 144
 	volume 7, 7
-	duty 3
-	toggleperfectpitch
-	notetype 12, 2, 15
+	duty_cycle 3
+	toggle_perfect_pitch
+	note_type 12, 2, 15
 	rest 8
 	octave 3
-	D_ 8
+	note D_, 8
 
 Music_Celadon_branch_b6d4::
-	duty 2
-	notetype 12, 11, 2
-	G_ 4
-	B_ 4
-	G_ 2
-	B_ 4
-	G_ 2
-	E_ 1
-	E_ 1
-	G_ 1
-	E_ 1
-	B_ 2
+	duty_cycle 2
+	note_type 12, 11, 2
+	note G_, 4
+	note B_, 4
+	note G_, 2
+	note B_, 4
+	note G_, 2
+	note E_, 1
+	note E_, 1
+	note G_, 1
+	note E_, 1
+	note B_, 2
 	octave 4
-	C_ 2
+	note C_, 2
 	octave 3
-	A_ 8
-	F# 4
-	A_ 4
-	F# 2
-	A_ 6
-	A_ 1
-	B_ 1
+	note A_, 8
+	note F#, 4
+	note A_, 4
+	note F#, 2
+	note A_, 6
+	note A_, 1
+	note B_, 1
 	octave 4
-	C_ 1
+	note C_, 1
 	octave 3
-	B_ 1
-	A_ 2
-	B_ 2
-	G_ 4
+	note B_, 1
+	note A_, 2
+	note B_, 2
+	note G_, 4
 	octave 4
-	G_ 4
+	note G_, 4
 	octave 3
-	G_ 4
-	B_ 4
-	G_ 2
-	B_ 4
-	G_ 2
-	E_ 1
-	F# 1
-	G_ 1
-	A_ 1
-	B_ 2
+	note G_, 4
+	note B_, 4
+	note G_, 2
+	note B_, 4
+	note G_, 2
+	note E_, 1
+	note F#, 1
+	note G_, 1
+	note A_, 1
+	note B_, 2
 	octave 4
-	C_ 2
+	note C_, 2
 	octave 3
-	A_ 8
-	A_ 2
-	B_ 2
+	note A_, 8
+	note A_, 2
+	note B_, 2
 	octave 4
-	C_ 2
+	note C_, 2
 	octave 3
-	B_ 2
-	A_ 2
-	G_ 2
-	F# 2
-	G_ 2
-	F# 4
-	D_ 1
-	E_ 1
-	F# 1
-	G_ 1
-	A_ 8
-	notetype 12, 9, 4
-	B_ 8
-	G_ 4
-	D_ 4
-	G_ 4
-	A_ 2
+	note B_, 2
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	note G_, 2
+	note F#, 4
+	note D_, 1
+	note E_, 1
+	note F#, 1
+	note G_, 1
+	note A_, 8
+	note_type 12, 9, 4
+	note B_, 8
+	note G_, 4
+	note D_, 4
+	note G_, 4
+	note A_, 2
 	octave 4
-	C_ 2
+	note C_, 2
 	octave 3
-	B_ 8
-	A_ 8
-	F# 4
-	G_ 4
-	A_ 4
-	G_ 4
-	F# 4
-	A_ 4
-	B_ 8
-	G_ 4
-	D_ 4
-	G_ 4
-	A_ 2
+	note B_, 8
+	note A_, 8
+	note F#, 4
+	note G_, 4
+	note A_, 4
+	note G_, 4
+	note F#, 4
+	note A_, 4
+	note B_, 8
+	note G_, 4
+	note D_, 4
+	note G_, 4
+	note A_, 2
 	octave 4
-	C_ 2
+	note C_, 2
 	octave 3
-	B_ 8
-	A_ 8
-	F# 4
-	G_ 4
-	A_ 4
-	G_ 4
-	F# 4
-	A_ 4
-	loopchannel 0, Music_Celadon_branch_b6d4
-
-
-Music_Celadon_Ch1::
-	duty 3
-	notetype 12, 12, 2
-	octave 4
-	D_ 1
-	C# 1
-	D_ 1
-	E_ 1
-	F# 1
-	E_ 1
-	F# 1
-	G_ 1
-	notetype 12, 10, 0
-	A_ 8
-
-Music_Celadon_branch_b74a::
-	duty 2
-	notetype 12, 12, 2
-	octave 4
-	B_ 4
-	G_ 4
-	B_ 2
-	G_ 6
-	B_ 1
-	G_ 1
-	A_ 1
-	B_ 1
-	octave 5
-	C_ 2
-	octave 4
-	B_ 2
-	A_ 8
-	A_ 4
-	F# 4
-	A_ 2
-	F# 6
-	A_ 1
-	G_ 1
-	F# 1
-	G_ 1
-	A_ 2
-	B_ 2
-	G_ 4
-	B_ 4
-	B_ 4
-	G_ 4
-	B_ 2
-	G_ 4
-	octave 3
-	B_ 2
-	octave 4
-	B_ 1
-	G_ 1
-	A_ 1
-	B_ 1
-	octave 5
-	C_ 2
-	octave 4
-	B_ 2
-	A_ 8
-	A_ 2
-	G_ 2
-	F# 2
-	G_ 2
-	F# 2
-	E_ 2
-	D_ 2
-	C# 2
-	D_ 8
-	octave 5
-	D_ 8
-	notetype 12, 11, 4
-	octave 4
-	D_ 8
-	C_ 2
-	octave 3
-	B_ 2
-	A_ 2
-	B_ 2
-	octave 4
-	E_ 4
-	F# 4
-	D_ 8
-	C_ 8
-	octave 3
-	A_ 2
-	B_ 2
-	octave 4
-	C_ 2
-	D_ 2
-	E_ 2
-	C_ 2
-	D_ 2
-	E_ 2
-	D_ 8
-	D_ 8
-	C_ 2
-	octave 3
-	B_ 2
-	A_ 2
-	B_ 2
-	octave 4
-	E_ 4
-	D_ 2
-	E_ 2
-	D_ 8
-	C_ 8
-	A_ 2
-	G_ 2
-	F# 2
-	E_ 2
-	F# 2
-	E_ 2
-	D_ 2
-	E_ 2
-	D_ 8
-	loopchannel 0, Music_Celadon_branch_b74a
+	note B_, 8
+	note A_, 8
+	note F#, 4
+	note G_, 4
+	note A_, 4
+	note G_, 4
+	note F#, 4
+	note A_, 4
+	sound_loop 0, Music_Celadon_branch_b6d4
 
 
 Music_Celadon_Ch2::
-	notetype 12, 1, 3
+	duty_cycle 3
+	note_type 12, 12, 2
+	octave 4
+	note D_, 1
+	note C#, 1
+	note D_, 1
+	note E_, 1
+	note F#, 1
+	note E_, 1
+	note F#, 1
+	note G_, 1
+	note_type 12, 10, 0
+	note A_, 8
+
+Music_Celadon_branch_b74a::
+	duty_cycle 2
+	note_type 12, 12, 2
+	octave 4
+	note B_, 4
+	note G_, 4
+	note B_, 2
+	note G_, 6
+	note B_, 1
+	note G_, 1
+	note A_, 1
+	note B_, 1
+	octave 5
+	note C_, 2
+	octave 4
+	note B_, 2
+	note A_, 8
+	note A_, 4
+	note F#, 4
+	note A_, 2
+	note F#, 6
+	note A_, 1
+	note G_, 1
+	note F#, 1
+	note G_, 1
+	note A_, 2
+	note B_, 2
+	note G_, 4
+	note B_, 4
+	note B_, 4
+	note G_, 4
+	note B_, 2
+	note G_, 4
+	octave 3
+	note B_, 2
+	octave 4
+	note B_, 1
+	note G_, 1
+	note A_, 1
+	note B_, 1
+	octave 5
+	note C_, 2
+	octave 4
+	note B_, 2
+	note A_, 8
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	note G_, 2
+	note F#, 2
+	note E_, 2
+	note D_, 2
+	note C#, 2
+	note D_, 8
+	octave 5
+	note D_, 8
+	note_type 12, 11, 4
+	octave 4
+	note D_, 8
+	note C_, 2
+	octave 3
+	note B_, 2
+	note A_, 2
+	note B_, 2
+	octave 4
+	note E_, 4
+	note F#, 4
+	note D_, 8
+	note C_, 8
+	octave 3
+	note A_, 2
+	note B_, 2
+	octave 4
+	note C_, 2
+	note D_, 2
+	note E_, 2
+	note C_, 2
+	note D_, 2
+	note E_, 2
+	note D_, 8
+	note D_, 8
+	note C_, 2
+	octave 3
+	note B_, 2
+	note A_, 2
+	note B_, 2
+	octave 4
+	note E_, 4
+	note D_, 2
+	note E_, 2
+	note D_, 8
+	note C_, 8
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	note E_, 2
+	note F#, 2
+	note E_, 2
+	note D_, 2
+	note E_, 2
+	note D_, 8
+	sound_loop 0, Music_Celadon_branch_b74a
+
+
+Music_Celadon_Ch3::
+	note_type 12, 1, 3
 	rest 8
 	octave 5
-	D_ 1
-	C# 1
-	D_ 1
-	E_ 1
-	F# 1
-	E_ 1
-	F# 1
-	G_ 1
+	note D_, 1
+	note C#, 1
+	note D_, 1
+	note E_, 1
+	note F#, 1
+	note E_, 1
+	note F#, 1
+	note G_, 1
 
 Music_Celadon_branch_b7c1::
 	octave 4
-	D_ 2
-	B_ 2
-	D_ 2
-	B_ 2
-	D_ 2
-	B_ 2
-	D_ 2
-	B_ 2
-	D_ 2
-	B_ 2
-	D_ 2
-	B_ 2
-	D_ 2
-	A_ 2
-	D_ 2
-	A_ 2
-	D_ 2
-	A_ 2
-	D_ 2
-	A_ 2
-	D_ 2
-	A_ 2
-	D_ 2
-	A_ 2
-	D_ 2
-	A_ 2
-	D_ 2
-	A_ 2
-	D_ 2
-	B_ 2
-	D_ 2
-	B_ 2
-	D_ 2
-	B_ 2
-	D_ 2
-	B_ 2
-	D_ 2
-	B_ 2
-	D_ 2
-	B_ 2
-	D_ 2
-	B_ 2
-	D_ 2
-	B_ 2
-	D_ 2
-	A_ 2
-	D_ 2
-	A_ 2
-	D_ 2
-	A_ 2
-	G_ 2
-	A_ 2
-	G_ 2
-	F# 2
-	E_ 2
-	C# 2
-	D_ 2
+	note D_, 2
+	note B_, 2
+	note D_, 2
+	note B_, 2
+	note D_, 2
+	note B_, 2
+	note D_, 2
+	note B_, 2
+	note D_, 2
+	note B_, 2
+	note D_, 2
+	note B_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note B_, 2
+	note D_, 2
+	note B_, 2
+	note D_, 2
+	note B_, 2
+	note D_, 2
+	note B_, 2
+	note D_, 2
+	note B_, 2
+	note D_, 2
+	note B_, 2
+	note D_, 2
+	note B_, 2
+	note D_, 2
+	note B_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note D_, 2
+	note A_, 2
+	note G_, 2
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	note E_, 2
+	note C#, 2
+	note D_, 2
 	rest 6
-	F# 2
+	note F#, 2
 	rest 4
-	F# 2
-	G_ 2
+	note F#, 2
+	note G_, 2
 	octave 5
-	D_ 2
+	note D_, 2
 	octave 4
-	G_ 2
+	note G_, 2
 	octave 5
-	D_ 2
+	note D_, 2
 	octave 4
-	G_ 2
+	note G_, 2
 	octave 5
-	D_ 2
+	note D_, 2
 	octave 4
-	G_ 2
-	B_ 2
-	G_ 2
+	note G_, 2
+	note B_, 2
+	note G_, 2
 	octave 5
-	E_ 2
-	D_ 2
-	C_ 2
-	D_ 2
+	note E_, 2
+	note D_, 2
+	note C_, 2
+	note D_, 2
 	octave 4
-	B_ 2
-	G_ 2
+	note B_, 2
+	note G_, 2
 	octave 5
-	C_ 2
+	note C_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 5
-	D_ 2
+	note D_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 5
-	D_ 2
+	note D_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 5
-	D_ 2
+	note D_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 5
-	D_ 2
+	note D_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 5
-	E_ 2
-	D_ 2
-	C_ 2
-	D_ 2
+	note E_, 2
+	note D_, 2
+	note C_, 2
+	note D_, 2
 	octave 4
-	B_ 2
-	A_ 2
+	note B_, 2
+	note A_, 2
 	octave 5
-	C_ 2
+	note C_, 2
 	octave 4
-	G_ 2
+	note G_, 2
 	octave 5
-	D_ 2
+	note D_, 2
 	octave 4
-	G_ 2
+	note G_, 2
 	octave 5
-	D_ 2
+	note D_, 2
 	octave 4
-	G_ 2
+	note G_, 2
 	octave 5
-	D_ 2
+	note D_, 2
 	octave 4
-	G_ 2
-	B_ 2
-	G_ 2
+	note G_, 2
+	note B_, 2
+	note G_, 2
 	octave 5
-	E_ 2
-	D_ 2
-	C_ 2
-	D_ 2
+	note E_, 2
+	note D_, 2
+	note C_, 2
+	note D_, 2
 	octave 4
-	B_ 2
-	G_ 2
+	note B_, 2
+	note G_, 2
 	octave 5
-	C_ 2
+	note C_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 5
-	D_ 2
+	note D_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 5
-	D_ 2
+	note D_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 5
-	D_ 2
+	note D_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 5
-	D_ 2
+	note D_, 2
 	octave 4
-	F# 2
+	note F#, 2
 	octave 5
-	D_ 2
-	C_ 2
+	note D_, 2
+	note C_, 2
 	octave 4
-	B_ 2
-	A_ 2
-	G_ 2
-	F# 2
-	E_ 2
-	loopchannel 0, Music_Celadon_branch_b7c1
+	note B_, 2
+	note A_, 2
+	note G_, 2
+	note F#, 2
+	note E_, 2
+	sound_loop 0, Music_Celadon_branch_b7c1