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

@@ -1,458 +1,458 @@
-Music_PokemonTower_Ch0::
+Music_PokemonTower_Ch1::
 	tempo 152
 	volume 7, 7
-	duty 3
-	toggleperfectpitch
+	duty_cycle 3
+	toggle_perfect_pitch
 	vibrato 12, 2, 3
-	notetype 12, 8, 0
+	note_type 12, 8, 0
 	rest 4
 	octave 4
-	B_ 12
+	note B_, 12
 
 Music_PokemonTower_branch_7f05a::
-	notetype 12, 11, 4
+	note_type 12, 11, 4
 	octave 4
-	G_ 1
+	note G_, 1
 	rest 7
-	G_ 1
+	note G_, 1
 	rest 7
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 7
-	B_ 1
+	note B_, 1
 	rest 3
-	B_ 1
+	note B_, 1
 	rest 3
-	B_ 1
+	note B_, 1
 	rest 7
-	B_ 1
+	note B_, 1
 	rest 7
-	B_ 1
+	note B_, 1
 	rest 7
 	octave 4
-	F# 1
+	note F#, 1
 	rest 7
-	C_ 1
+	note C_, 1
 	octave 3
-	B_ 1
-	G_ 1
+	note B_, 1
+	note G_, 1
 	rest 5
-	E_ 1
+	note E_, 1
 	rest 7
-	E_ 1
+	note E_, 1
 	rest 7
-	F# 1
+	note F#, 1
 	rest 7
-	E_ 1
+	note E_, 1
 	rest 7
-	G_ 1
+	note G_, 1
 	rest 7
-	G_ 1
+	note G_, 1
 	rest 7
-	F# 1
+	note F#, 1
 	rest 7
-	F# 1
+	note F#, 1
 	rest 7
-	G_ 1
+	note G_, 1
 	rest 7
-	E_ 1
+	note E_, 1
 	rest 7
-	D_ 1
+	note D_, 1
 	rest 7
-	E_ 1
+	note E_, 1
 	rest 7
-	G_ 1
+	note G_, 1
 	rest 7
-	G_ 1
+	note G_, 1
 	rest 7
-	F# 1
+	note F#, 1
 	rest 7
-	B_ 1
+	note B_, 1
 	rest 7
-	B_ 1
+	note B_, 1
 	rest 7
 	octave 4
-	C_ 1
+	note C_, 1
 	rest 7
-	C_ 1
+	note C_, 1
 	rest 7
-	C# 1
+	note C#, 1
 	rest 7
-	C# 1
+	note C#, 1
 	rest 7
-	C_ 1
+	note C_, 1
 	rest 7
-	C_ 1
+	note C_, 1
 	rest 3
-	notetype 12, 8, 4
-	C_ 1
+	note_type 12, 8, 4
+	note C_, 1
 	rest 3
-	notetype 12, 11, 4
-	D_ 1
+	note_type 12, 11, 4
+	note D_, 1
 	rest 7
-	D_ 1
+	note D_, 1
 	rest 7
 	octave 3
-	A_ 1
+	note A_, 1
 	rest 7
-	A_ 1
+	note A_, 1
 	rest 7
-	notetype 12, 10, 7
-	B_ 8
-	B_ 8
+	note_type 12, 10, 7
+	note B_, 8
+	note B_, 8
 	octave 4
-	C_ 8
-	C_ 8
-	C# 8
-	C# 8
-	notetype 12, 10, 6
-	D_ 16
+	note C_, 8
+	note C_, 8
+	note C#, 8
+	note C#, 8
+	note_type 12, 10, 6
+	note D_, 16
 	rest 16
 	rest 16
 	rest 16
 	rest 16
-	notetype 12, 9, 2
-	B_ 4
+	note_type 12, 9, 2
+	note B_, 4
 	octave 5
-	E_ 4
-	D_ 4
-	C_ 4
+	note E_, 4
+	note D_, 4
+	note C_, 4
 	octave 4
-	B_ 4
+	note B_, 4
 	octave 5
-	E_ 4
-	D_ 4
-	C_ 4
+	note E_, 4
+	note D_, 4
+	note C_, 4
 	octave 4
-	B_ 4
+	note B_, 4
 	octave 5
-	E_ 4
-	D_ 4
-	C_ 4
+	note E_, 4
+	note D_, 4
+	note C_, 4
 	octave 4
-	B_ 4
-	G_ 4
-	F# 4
-	E_ 4
+	note B_, 4
+	note G_, 4
+	note F#, 4
+	note E_, 4
 	octave 5
-	C_ 16
-	C_ 16
-	loopchannel 0, Music_PokemonTower_branch_7f05a
-
-
-Music_PokemonTower_Ch1::
-	vibrato 20, 3, 4
-	duty 3
-	notetype 12, 10, 0
-	octave 5
-	C_ 12
-	octave 4
-	E_ 4
-
-Music_PokemonTower_branch_7f0ee::
-	notetype 12, 12, 1
-	octave 5
-	C_ 8
-	octave 4
-	B_ 4
-	notetype 12, 12, 4
-	G_ 1
-	F# 1
-	E_ 1
-	D# 1
-	notetype 12, 11, 0
-	G_ 8
-	octave 5
-	C_ 8
-	octave 4
-	B_ 4
-	G_ 4
-	E_ 4
-	G_ 4
-	octave 5
-	C_ 8
-	notetype 12, 11, 7
-	C_ 8
-	notetype 12, 12, 2
-	octave 4
-	G_ 1
-	F# 1
-	E_ 1
-	rest 1
-	notetype 12, 9, 6
-	octave 3
-	G_ 4
-	notetype 12, 12, 7
-	G_ 4
-	B_ 4
-	G_ 4
-	B_ 4
-	octave 4
-	C_ 4
-	octave 3
-	B_ 4
-	notetype 12, 11, 0
-	octave 4
-	C_ 16
-	E_ 8
-	notetype 12, 11, 7
-	E_ 12
-	notetype 12, 12, 5
-	octave 5
-	C_ 4
-	octave 4
-	B_ 4
-	G_ 4
-	B_ 4
-	G_ 4
-	F# 4
-	E_ 4
-	notetype 12, 11, 0
-	F# 12
-	G_ 4
-	notetype 12, 11, 0
-	F# 8
-	notetype 12, 11, 7
-	F# 8
-	notetype 12, 11, 0
-	B_ 4
-	G_ 4
-	F# 4
-	E_ 4
-	B_ 16
-	notetype 12, 11, 0
-	octave 5
-	C_ 4
-	octave 4
-	G_ 4
-	F# 4
-	E_ 4
-	notetype 12, 9, 0
-	octave 5
-	C_ 16
-	notetype 12, 11, 0
-	D_ 4
-	octave 4
-	A_ 4
-	G# 4
-	F# 4
-	notetype 12, 2, 15
-	octave 5
-	D_ 16
-	notetype 12, 12, 0
-	E_ 4
-	octave 4
-	B_ 4
-	A_ 4
-	G_ 4
-	octave 5
-	F_ 4
-	C_ 4
-	octave 4
-	A# 4
-	G# 4
-	octave 5
-	F# 4
-	D_ 4
-	C_ 4
-	octave 4
-	A# 4
-	G# 4
-	F# 4
-	E_ 4
-	D_ 4
-	notetype 12, 11, 0
-	C_ 8
-	notetype 12, 9, 0
-	C_ 8
-	notetype 12, 8, 0
-	C_ 8
-	notetype 12, 7, 0
-	C_ 8
-	notetype 12, 6, 0
-	C_ 8
-	notetype 12, 6, 7
-	C_ 8
-	rest 16
-	notetype 12, 10, 0
-	octave 5
-	G_ 16
-	octave 6
-	C_ 16
-	octave 5
-	B_ 8
-	G_ 8
-	E_ 8
-	G_ 8
-	octave 6
-	C_ 16
-	vibrato 0, 3, 4
-	notetype 12, 10, 7
-	C_ 16
-	loopchannel 0, Music_PokemonTower_branch_7f0ee
+	note C_, 16
+	note C_, 16
+	sound_loop 0, Music_PokemonTower_branch_7f05a
 
 
 Music_PokemonTower_Ch2::
+	vibrato 20, 3, 4
+	duty_cycle 3
+	note_type 12, 10, 0
+	octave 5
+	note C_, 12
+	octave 4
+	note E_, 4
+
+Music_PokemonTower_branch_7f0ee::
+	note_type 12, 12, 1
+	octave 5
+	note C_, 8
+	octave 4
+	note B_, 4
+	note_type 12, 12, 4
+	note G_, 1
+	note F#, 1
+	note E_, 1
+	note D#, 1
+	note_type 12, 11, 0
+	note G_, 8
+	octave 5
+	note C_, 8
+	octave 4
+	note B_, 4
+	note G_, 4
+	note E_, 4
+	note G_, 4
+	octave 5
+	note C_, 8
+	note_type 12, 11, 7
+	note C_, 8
+	note_type 12, 12, 2
+	octave 4
+	note G_, 1
+	note F#, 1
+	note E_, 1
+	rest 1
+	note_type 12, 9, 6
+	octave 3
+	note G_, 4
+	note_type 12, 12, 7
+	note G_, 4
+	note B_, 4
+	note G_, 4
+	note B_, 4
+	octave 4
+	note C_, 4
+	octave 3
+	note B_, 4
+	note_type 12, 11, 0
+	octave 4
+	note C_, 16
+	note E_, 8
+	note_type 12, 11, 7
+	note E_, 12
+	note_type 12, 12, 5
+	octave 5
+	note C_, 4
+	octave 4
+	note B_, 4
+	note G_, 4
+	note B_, 4
+	note G_, 4
+	note F#, 4
+	note E_, 4
+	note_type 12, 11, 0
+	note F#, 12
+	note G_, 4
+	note_type 12, 11, 0
+	note F#, 8
+	note_type 12, 11, 7
+	note F#, 8
+	note_type 12, 11, 0
+	note B_, 4
+	note G_, 4
+	note F#, 4
+	note E_, 4
+	note B_, 16
+	note_type 12, 11, 0
+	octave 5
+	note C_, 4
+	octave 4
+	note G_, 4
+	note F#, 4
+	note E_, 4
+	note_type 12, 9, 0
+	octave 5
+	note C_, 16
+	note_type 12, 11, 0
+	note D_, 4
+	octave 4
+	note A_, 4
+	note G#, 4
+	note F#, 4
+	note_type 12, 2, 15
+	octave 5
+	note D_, 16
+	note_type 12, 12, 0
+	note E_, 4
+	octave 4
+	note B_, 4
+	note A_, 4
+	note G_, 4
+	octave 5
+	note F_, 4
+	note C_, 4
+	octave 4
+	note A#, 4
+	note G#, 4
+	octave 5
+	note F#, 4
+	note D_, 4
+	note C_, 4
+	octave 4
+	note A#, 4
+	note G#, 4
+	note F#, 4
+	note E_, 4
+	note D_, 4
+	note_type 12, 11, 0
+	note C_, 8
+	note_type 12, 9, 0
+	note C_, 8
+	note_type 12, 8, 0
+	note C_, 8
+	note_type 12, 7, 0
+	note C_, 8
+	note_type 12, 6, 0
+	note C_, 8
+	note_type 12, 6, 7
+	note C_, 8
+	rest 16
+	note_type 12, 10, 0
+	octave 5
+	note G_, 16
+	octave 6
+	note C_, 16
+	octave 5
+	note B_, 8
+	note G_, 8
+	note E_, 8
+	note G_, 8
+	octave 6
+	note C_, 16
+	vibrato 0, 3, 4
+	note_type 12, 10, 7
+	note C_, 16
+	sound_loop 0, Music_PokemonTower_branch_7f0ee
+
+
+Music_PokemonTower_Ch3::
 	vibrato 4, 1, 1
-	notetype 12, 1, 3
+	note_type 12, 1, 3
 	rest 8
 	octave 5
-	G_ 8
+	note G_, 8
 
 Music_PokemonTower_branch_7f1a2::
-	E_ 1
+	note E_, 1
 	rest 7
-	E_ 1
+	note E_, 1
 	rest 7
-	E_ 1
+	note E_, 1
 	rest 7
-	E_ 1
+	note E_, 1
 	rest 3
-	E_ 1
-	D# 1
-	F# 1
-	D# 1
-	E_ 1
+	note E_, 1
+	note D#, 1
+	note F#, 1
+	note D#, 1
+	note E_, 1
 	rest 7
-	G_ 1
+	note G_, 1
 	rest 7
-	E_ 1
+	note E_, 1
 	rest 7
-	B_ 1
+	note B_, 1
 	rest 7
-	E_ 1
-	D# 1
+	note E_, 1
+	note D#, 1
 	octave 4
-	B_ 1
+	note B_, 1
 	rest 5
-	B_ 1
+	note B_, 1
 	rest 7
-	B_ 1
+	note B_, 1
 	rest 7
-	B_ 1
+	note B_, 1
 	rest 7
 	octave 5
-	C_ 1
+	note C_, 1
 	rest 7
-	C_ 1
+	note C_, 1
 	rest 7
-	C_ 1
+	note C_, 1
 	rest 7
-	C_ 1
+	note C_, 1
 	rest 7
 	octave 4
-	B_ 1
+	note B_, 1
 	rest 7
-	B_ 1
+	note B_, 1
 	rest 7
-	B_ 1
+	note B_, 1
 	rest 7
-	B_ 1
+	note B_, 1
 	rest 7
 	octave 5
-	C_ 1
+	note C_, 1
 	rest 7
-	C_ 1
+	note C_, 1
 	rest 7
-	C_ 1
+	note C_, 1
 	rest 7
-	C_ 1
+	note C_, 1
 	rest 7
-	E_ 1
+	note E_, 1
 	rest 7
-	E_ 1
+	note E_, 1
 	rest 7
-	E_ 1
+	note E_, 1
 	rest 7
-	E_ 1
+	note E_, 1
 	rest 7
-	E_ 1
+	note E_, 1
 	rest 7
-	E_ 1
+	note E_, 1
 	rest 7
-	E_ 1
+	note E_, 1
 	rest 7
-	E_ 1
+	note E_, 1
 	rest 3
-	G_ 1
+	note G_, 1
 	rest 3
-	F# 1
+	note F#, 1
 	rest 7
-	F# 1
+	note F#, 1
 	rest 7
-	D_ 1
+	note D_, 1
 	rest 7
-	D_ 1
+	note D_, 1
 	rest 3
-	D_ 1
+	note D_, 1
 	rest 1
-	D# 1
+	note D#, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 7
-	E_ 1
+	note E_, 1
 	rest 7
-	F_ 1
+	note F_, 1
 	rest 7
-	F_ 1
+	note F_, 1
 	rest 7
-	F# 1
+	note F#, 1
 	rest 7
-	F# 1
+	note F#, 1
 	rest 7
-	G_ 1
+	note G_, 1
 	rest 15
-	notetype 12, 1, 5
+	note_type 12, 1, 5
 	octave 4
-	F# 1
+	note F#, 1
 	rest 3
-	F# 1
+	note F#, 1
 	rest 3
-	G_ 1
+	note G_, 1
 	rest 3
-	F# 1
+	note F#, 1
 	rest 3
-	F# 1
+	note F#, 1
 	rest 15
-	F# 1
+	note F#, 1
 	rest 3
-	F# 1
+	note F#, 1
 	rest 3
-	G_ 1
+	note G_, 1
 	rest 3
-	F# 1
+	note F#, 1
 	rest 3
-	F# 1
+	note F#, 1
 	rest 7
-	notetype 12, 1, 3
+	note_type 12, 1, 3
 	octave 6
-	E_ 1
+	note E_, 1
 	rest 1
-	D# 1
+	note D#, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	D# 1
+	note D#, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 15
-	E_ 1
+	note E_, 1
 	rest 15
-	E_ 1
+	note E_, 1
 	rest 15
-	E_ 1
+	note E_, 1
 	rest 15
-	E_ 1
+	note E_, 1
 	rest 15
-	E_ 1
+	note E_, 1
 	rest 7
 	octave 5
-	E_ 1
+	note E_, 1
 	rest 1
-	D# 1
+	note D#, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	D# 1
+	note D#, 1
 	rest 1
-	loopchannel 0, Music_PokemonTower_branch_7f1a2
+	sound_loop 0, Music_PokemonTower_branch_7f1a2