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

@@ -1,465 +1,465 @@
-Music_TitleScreen_Ch0::
+Music_TitleScreen_Ch1::
 	tempo 144
 	volume 7, 7
 	vibrato 9, 3, 4
-	duty 3
-	notetype 12, 12, 1
+	duty_cycle 3
+	note_type 12, 12, 1
 	octave 2
-	E_ 1
-	G_ 1
-	B_ 1
+	note E_, 1
+	note G_, 1
+	note B_, 1
 	octave 3
-	D_ 1
+	note D_, 1
 	octave 2
-	G_ 4
-	G_ 6
-	G_ 1
-	G_ 1
-	G_ 4
-	G_ 4
-	G_ 4
-	notetype 8, 12, 1
-	A_ 2
-	A_ 2
-	A_ 2
-	A_ 2
-	A_ 2
-	F# 2
+	note G_, 4
+	note G_, 6
+	note G_, 1
+	note G_, 1
+	note G_, 4
+	note G_, 4
+	note G_, 4
+	note_type 8, 12, 1
+	note A_, 2
+	note A_, 2
+	note A_, 2
+	note A_, 2
+	note A_, 2
+	note F#, 2
 
 Music_TitleScreen_branch_7e4e2::
-	callchannel Music_TitleScreen_branch_7e541
-	callchannel Music_TitleScreen_branch_7e54a
-	callchannel Music_TitleScreen_branch_7e541
+	sound_call Music_TitleScreen_branch_7e541
+	sound_call Music_TitleScreen_branch_7e54a
+	sound_call Music_TitleScreen_branch_7e541
 	octave 3
-	C_ 8
-	notetype 8, 12, 6
-	E_ 4
-	E_ 4
-	C_ 4
-	notetype 12, 12, 6
+	note C_, 8
+	note_type 8, 12, 6
+	note E_, 4
+	note E_, 4
+	note C_, 4
+	note_type 12, 12, 6
 	octave 2
-	B_ 8
-	notetype 8, 14, 7
+	note B_, 8
+	note_type 8, 14, 7
 	octave 3
-	F_ 4
-	E_ 4
-	C_ 4
-	notetype 12, 14, 7
-	D_ 10
-	notetype 12, 12, 6
+	note F_, 4
+	note E_, 4
+	note C_, 4
+	note_type 12, 14, 7
+	note D_, 10
+	note_type 12, 12, 6
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	C_ 2
-	D_ 2
-	callchannel Music_TitleScreen_branch_7e541
-	callchannel Music_TitleScreen_branch_7e54a
-	callchannel Music_TitleScreen_branch_7e541
-	C_ 6
-	C_ 6
-	E_ 4
-	D_ 6
-	F_ 2
-	G_ 2
-	D_ 4
-	G_ 2
-	G_ 6
-	A_ 4
-	F_ 2
-	A_ 2
+	note C_, 2
+	note D_, 2
+	sound_call Music_TitleScreen_branch_7e541
+	sound_call Music_TitleScreen_branch_7e54a
+	sound_call Music_TitleScreen_branch_7e541
+	note C_, 6
+	note C_, 6
+	note E_, 4
+	note D_, 6
+	note F_, 2
+	note G_, 2
+	note D_, 4
+	note G_, 2
+	note G_, 6
+	note A_, 4
+	note F_, 2
+	note A_, 2
 	octave 4
-	C_ 2
+	note C_, 2
 	octave 3
-	D_ 12
-	E_ 4
-	F_ 8
-	G_ 4
-	F_ 4
-	E_ 12
-	F_ 4
-	G_ 8
-	notetype 12, 11, 6
+	note D_, 12
+	note E_, 4
+	note F_, 8
+	note G_, 4
+	note F_, 4
+	note E_, 12
+	note F_, 4
+	note G_, 8
+	note_type 12, 11, 6
 	octave 4
-	C_ 4
-	C# 4
-	callchannel Music_TitleScreen_branch_7e55c
-	notetype 8, 11, 4
+	note C_, 4
+	note C#, 4
+	sound_call Music_TitleScreen_branch_7e55c
+	note_type 8, 11, 4
 	octave 4
-	C_ 4
-	C_ 4
-	C# 4
-	callchannel Music_TitleScreen_branch_7e55c
-	notetype 8, 11, 2
+	note C_, 4
+	note C_, 4
+	note C#, 4
+	sound_call Music_TitleScreen_branch_7e55c
+	note_type 8, 11, 2
 	octave 3
-	E_ 4
-	E_ 4
-	C# 4
-	loopchannel 0, Music_TitleScreen_branch_7e4e2
+	note E_, 4
+	note E_, 4
+	note C#, 4
+	sound_loop 0, Music_TitleScreen_branch_7e4e2
 
 Music_TitleScreen_branch_7e541::
-	notetype 12, 12, 6
+	note_type 12, 12, 6
 	octave 3
-	D_ 6
+	note D_, 6
 	octave 2
-	B_ 2
+	note B_, 2
 	octave 3
-	D_ 8
-	endchannel
+	note D_, 8
+	sound_ret
 
 Music_TitleScreen_branch_7e54a::
-	C_ 6
-	F_ 6
-	C_ 4
-	D_ 8
-	notetype 12, 14, 7
-	F_ 6
-	E_ 1
-	D# 1
-	D_ 8
-	notetype 8, 12, 6
-	C_ 4
+	note C_, 6
+	note F_, 6
+	note C_, 4
+	note D_, 8
+	note_type 12, 14, 7
+	note F_, 6
+	note E_, 1
+	note D#, 1
+	note D_, 8
+	note_type 8, 12, 6
+	note C_, 4
 	octave 2
-	B_ 4
+	note B_, 4
 	octave 3
-	C_ 4
-	endchannel
+	note C_, 4
+	sound_ret
 
 Music_TitleScreen_branch_7e55c::
-	notetype 12, 12, 1
-	D_ 1
+	note_type 12, 12, 1
+	note D_, 1
 	rest 1
 	octave 2
-	D_ 1
-	D_ 1
-	D_ 1
+	note D_, 1
+	note D_, 1
+	note D_, 1
 	rest 1
-	D_ 1
-	D_ 1
-	D_ 1
+	note D_, 1
+	note D_, 1
+	note D_, 1
 	rest 1
-	D_ 1
-	D_ 1
-	D_ 1
+	note D_, 1
+	note D_, 1
+	note D_, 1
 	rest 1
-	D_ 1
-	D_ 1
-	D_ 1
+	note D_, 1
+	note D_, 1
+	note D_, 1
 	rest 1
-	D_ 1
-	D_ 1
-	D_ 1
+	note D_, 1
+	note D_, 1
+	note D_, 1
 	rest 1
-	D_ 1
-	D_ 1
-	endchannel
-
-
-Music_TitleScreen_Ch1::
-	vibrato 16, 4, 6
-	duty 1
-	notetype 12, 14, 1
-	octave 2
-	G_ 1
-	B_ 1
-	octave 3
-	D_ 1
-	F# 1
-	G_ 4
-	G_ 6
-	G_ 1
-	G_ 1
-	G_ 4
-	G_ 4
-	G_ 4
-	notetype 8, 14, 1
-	F_ 2
-	F_ 2
-	F_ 2
-	F_ 2
-	F_ 2
-	F# 2
-
-Music_TitleScreen_branch_7e594::
-	vibrato 16, 4, 6
-	callchannel Music_TitleScreen_branch_7e622
-	octave 2
-	A_ 4
-	F_ 4
-	callchannel Music_TitleScreen_branch_7e62c
-	octave 2
-	A_ 8
-	B_ 16
-	callchannel Music_TitleScreen_branch_7e622
-	octave 2
-	A_ 6
-	F_ 2
-	notetype 8, 14, 7
-	octave 4
-	C_ 4
-	octave 3
-	B_ 4
-	octave 4
-	C_ 4
-	notetype 12, 14, 7
-	D_ 8
-	notetype 12, 9, 5
-	octave 2
-	D_ 6
-	D_ 1
-	F# 1
-	G_ 16
-	callchannel Music_TitleScreen_branch_7e622
-	octave 2
-	A_ 2
-	F_ 6
-	callchannel Music_TitleScreen_branch_7e62c
-	octave 3
-	C_ 2
-	octave 2
-	A_ 6
-	B_ 6
-	G_ 2
-	F_ 8
-	callchannel Music_TitleScreen_branch_7e622
-	notetype 8, 9, 5
-	octave 2
-	G_ 4
-	F_ 5
-	A_ 3
-	notetype 8, 14, 6
-	octave 4
-	F_ 4
-	E_ 4
-	F_ 4
-	notetype 12, 14, 7
-	G_ 6
-	A# 2
-	G_ 8
-	vibrato 16, 2, 6
-	duty 3
-	notetype 12, 0, 11
-	G_ 8
-	notetype 12, 14, 7
-	A_ 8
-	duty 1
-	notetype 12, 14, 7
-	A# 6
-	F_ 2
-	F_ 8
-	octave 3
-	D_ 8
-	octave 4
-	A# 4
-	B_ 4
-	octave 5
-	C_ 6
-	octave 4
-	G_ 2
-	G_ 8
-	octave 3
-	E_ 8
-	notetype 12, 13, 7
-	octave 5
-	C_ 4
-	C# 4
-	callchannel Music_TitleScreen_branch_7e636
-	rest 3
-	D_ 1
-	rest 3
-	D_ 1
-	notetype 8, 14, 5
-	octave 5
-	C_ 4
-	C_ 4
-	C# 4
-	callchannel Music_TitleScreen_branch_7e636
-	D_ 1
-	rest 2
-	D_ 1
-	rest 3
-	D_ 1
-	notetype 8, 14, 3
-	octave 5
-	C_ 4
-	C_ 4
-	octave 4
-	B_ 4
-	loopchannel 0, Music_TitleScreen_branch_7e594
-
-Music_TitleScreen_branch_7e622::
-	notetype 12, 14, 7
-	octave 3
-	G_ 6
-	B_ 2
-	octave 4
-	D_ 8
-	notetype 12, 9, 5
-	endchannel
-
-Music_TitleScreen_branch_7e62c::
-	notetype 12, 14, 7
-	octave 4
-	F_ 6
-	E_ 1
-	D# 1
-	D_ 8
-	notetype 12, 9, 5
-	endchannel
-
-Music_TitleScreen_branch_7e636::
-	notetype 12, 14, 1
-	D_ 1
-	rest 2
-	octave 4
-	D_ 1
-	rest 3
-	D_ 1
-	rest 3
-	D_ 1
-	rest 3
-	D_ 1
-	endchannel
+	note D_, 1
+	note D_, 1
+	sound_ret
 
 
 Music_TitleScreen_Ch2::
-	notetype 12, 1, 0
+	vibrato 16, 4, 6
+	duty_cycle 1
+	note_type 12, 14, 1
+	octave 2
+	note G_, 1
+	note B_, 1
 	octave 3
-	G_ 1
-	rest 1
-	D_ 1
-	rest 1
-	G_ 1
-	rest 3
-	G_ 1
-	rest 5
-	G_ 1
-	G_ 1
-	G_ 1
-	rest 3
-	G_ 1
-	rest 3
-	G_ 1
-	rest 3
-	notetype 8, 1, 0
-	F_ 2
-	F_ 2
-	F_ 2
-	F_ 2
-	F_ 2
-	A_ 2
+	note D_, 1
+	note F#, 1
+	note G_, 4
+	note G_, 6
+	note G_, 1
+	note G_, 1
+	note G_, 4
+	note G_, 4
+	note G_, 4
+	note_type 8, 14, 1
+	note F_, 2
+	note F_, 2
+	note F_, 2
+	note F_, 2
+	note F_, 2
+	note F#, 2
 
-Music_TitleScreen_branch_7e65e::
-	callchannel Music_TitleScreen_branch_7e6c9
-	callchannel Music_TitleScreen_branch_7e6d0
-
-Music_TitleScreen_branch_7e664::
-	callchannel Music_TitleScreen_branch_7e6c9
-	callchannel Music_TitleScreen_branch_7e6c9
-	callchannel Music_TitleScreen_branch_7e6c9
-	callchannel Music_TitleScreen_branch_7e6d0
-	loopchannel 3, Music_TitleScreen_branch_7e664
-	callchannel Music_TitleScreen_branch_7e6c9
-	G_ 6
-	D_ 3
-	A_ 6
-	F_ 3
-	A_ 3
-	F_ 3
-	callchannel Music_TitleScreen_branch_7e6d7
-	A# 3
-	F_ 3
-	callchannel Music_TitleScreen_branch_7e6d7
-	B_ 3
-	G_ 3
-	callchannel Music_TitleScreen_branch_7e6dc
+Music_TitleScreen_branch_7e594::
+	vibrato 16, 4, 6
+	sound_call Music_TitleScreen_branch_7e622
+	octave 2
+	note A_, 4
+	note F_, 4
+	sound_call Music_TitleScreen_branch_7e62c
+	octave 2
+	note A_, 8
+	note B_, 16
+	sound_call Music_TitleScreen_branch_7e622
+	octave 2
+	note A_, 6
+	note F_, 2
+	note_type 8, 14, 7
 	octave 4
-	C_ 3
+	note C_, 4
 	octave 3
-	G_ 3
-	callchannel Music_TitleScreen_branch_7e6dc
+	note B_, 4
 	octave 4
-	C# 3
+	note C_, 4
+	note_type 12, 14, 7
+	note D_, 8
+	note_type 12, 9, 5
+	octave 2
+	note D_, 6
+	note D_, 1
+	note F#, 1
+	note G_, 16
+	sound_call Music_TitleScreen_branch_7e622
+	octave 2
+	note A_, 2
+	note F_, 6
+	sound_call Music_TitleScreen_branch_7e62c
 	octave 3
-	A_ 3
-	callchannel Music_TitleScreen_branch_7e6e5
+	note C_, 2
+	octave 2
+	note A_, 6
+	note B_, 6
+	note G_, 2
+	note F_, 8
+	sound_call Music_TitleScreen_branch_7e622
+	note_type 8, 9, 5
+	octave 2
+	note G_, 4
+	note F_, 5
+	note A_, 3
+	note_type 8, 14, 6
+	octave 4
+	note F_, 4
+	note E_, 4
+	note F_, 4
+	note_type 12, 14, 7
+	note G_, 6
+	note A#, 2
+	note G_, 8
+	vibrato 16, 2, 6
+	duty_cycle 3
+	note_type 12, 0, 11
+	note G_, 8
+	note_type 12, 14, 7
+	note A_, 8
+	duty_cycle 1
+	note_type 12, 14, 7
+	note A#, 6
+	note F_, 2
+	note F_, 8
+	octave 3
+	note D_, 8
+	octave 4
+	note A#, 4
+	note B_, 4
 	octave 5
-	pitchbend 0, 66
-	D_ 4
-	rest 4
-	octave 6
-	pitchbend 0, 50
-	D_ 4
+	note C_, 6
+	octave 4
+	note G_, 2
+	note G_, 8
+	octave 3
+	note E_, 8
+	note_type 12, 13, 7
 	octave 5
-	pitchbend 0, 66
-	D_ 4
+	note C_, 4
+	note C#, 4
+	sound_call Music_TitleScreen_branch_7e636
+	rest 3
+	note D_, 1
+	rest 3
+	note D_, 1
+	note_type 8, 14, 5
+	octave 5
+	note C_, 4
+	note C_, 4
+	note C#, 4
+	sound_call Music_TitleScreen_branch_7e636
+	note D_, 1
 	rest 2
-	notetype 8, 1, 0
-	octave 4
-	C_ 4
-	C_ 4
-	C# 4
-	callchannel Music_TitleScreen_branch_7e6e5
-	octave 6
-	pitchbend 0, 50
-	D_ 4
-	rest 4
+	note D_, 1
+	rest 3
+	note D_, 1
+	note_type 8, 14, 3
 	octave 5
-	pitchbend 0, 66
-	D_ 4
-	rest 6
-	notetype 8, 1, 0
+	note C_, 4
+	note C_, 4
 	octave 4
-	C_ 4
-	C_ 4
+	note B_, 4
+	sound_loop 0, Music_TitleScreen_branch_7e594
+
+Music_TitleScreen_branch_7e622::
+	note_type 12, 14, 7
 	octave 3
-	B_ 4
-	loopchannel 0, Music_TitleScreen_branch_7e65e
-
-Music_TitleScreen_branch_7e6c9::
-	G_ 6
-	D_ 3
-	G_ 6
-	D_ 3
-	G_ 3
-	D_ 3
-	endchannel
-
-Music_TitleScreen_branch_7e6d0::
-	F_ 6
-	C_ 3
-	F_ 6
-	C_ 3
-	F_ 3
-	C_ 3
-	endchannel
-
-Music_TitleScreen_branch_7e6d7::
-	A# 6
-	F_ 3
-	A# 6
-	F_ 3
-	endchannel
-
-Music_TitleScreen_branch_7e6dc::
+	note G_, 6
+	note B_, 2
 	octave 4
-	C_ 6
-	octave 3
-	G_ 3
-	octave 4
-	C_ 6
-	octave 3
-	G_ 3
-	endchannel
+	note D_, 8
+	note_type 12, 9, 5
+	sound_ret
 
-Music_TitleScreen_branch_7e6e5::
-	notetype 12, 1, 0
+Music_TitleScreen_branch_7e62c::
+	note_type 12, 14, 7
 	octave 4
-	D_ 1
-	rest 5
-	endchannel
+	note F_, 6
+	note E_, 1
+	note D#, 1
+	note D_, 8
+	note_type 12, 9, 5
+	sound_ret
+
+Music_TitleScreen_branch_7e636::
+	note_type 12, 14, 1
+	note D_, 1
+	rest 2
+	octave 4
+	note D_, 1
+	rest 3
+	note D_, 1
+	rest 3
+	note D_, 1
+	rest 3
+	note D_, 1
+	sound_ret
 
 
 Music_TitleScreen_Ch3::
+	note_type 12, 1, 0
+	octave 3
+	note G_, 1
+	rest 1
+	note D_, 1
+	rest 1
+	note G_, 1
+	rest 3
+	note G_, 1
+	rest 5
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	rest 3
+	note G_, 1
+	rest 3
+	note G_, 1
+	rest 3
+	note_type 8, 1, 0
+	note F_, 2
+	note F_, 2
+	note F_, 2
+	note F_, 2
+	note F_, 2
+	note A_, 2
+
+Music_TitleScreen_branch_7e65e::
+	sound_call Music_TitleScreen_branch_7e6c9
+	sound_call Music_TitleScreen_branch_7e6d0
+
+Music_TitleScreen_branch_7e664::
+	sound_call Music_TitleScreen_branch_7e6c9
+	sound_call Music_TitleScreen_branch_7e6c9
+	sound_call Music_TitleScreen_branch_7e6c9
+	sound_call Music_TitleScreen_branch_7e6d0
+	sound_loop 3, Music_TitleScreen_branch_7e664
+	sound_call Music_TitleScreen_branch_7e6c9
+	note G_, 6
+	note D_, 3
+	note A_, 6
+	note F_, 3
+	note A_, 3
+	note F_, 3
+	sound_call Music_TitleScreen_branch_7e6d7
+	note A#, 3
+	note F_, 3
+	sound_call Music_TitleScreen_branch_7e6d7
+	note B_, 3
+	note G_, 3
+	sound_call Music_TitleScreen_branch_7e6dc
+	octave 4
+	note C_, 3
+	octave 3
+	note G_, 3
+	sound_call Music_TitleScreen_branch_7e6dc
+	octave 4
+	note C#, 3
+	octave 3
+	note A_, 3
+	sound_call Music_TitleScreen_branch_7e6e5
+	octave 5
+	pitch_slide 0, 66
+	note D_, 4
+	rest 4
+	octave 6
+	pitch_slide 0, 50
+	note D_, 4
+	octave 5
+	pitch_slide 0, 66
+	note D_, 4
+	rest 2
+	note_type 8, 1, 0
+	octave 4
+	note C_, 4
+	note C_, 4
+	note C#, 4
+	sound_call Music_TitleScreen_branch_7e6e5
+	octave 6
+	pitch_slide 0, 50
+	note D_, 4
+	rest 4
+	octave 5
+	pitch_slide 0, 66
+	note D_, 4
+	rest 6
+	note_type 8, 1, 0
+	octave 4
+	note C_, 4
+	note C_, 4
+	octave 3
+	note B_, 4
+	sound_loop 0, Music_TitleScreen_branch_7e65e
+
+Music_TitleScreen_branch_7e6c9::
+	note G_, 6
+	note D_, 3
+	note G_, 6
+	note D_, 3
+	note G_, 3
+	note D_, 3
+	sound_ret
+
+Music_TitleScreen_branch_7e6d0::
+	note F_, 6
+	note C_, 3
+	note F_, 6
+	note C_, 3
+	note F_, 3
+	note C_, 3
+	sound_ret
+
+Music_TitleScreen_branch_7e6d7::
+	note A#, 6
+	note F_, 3
+	note A#, 6
+	note F_, 3
+	sound_ret
+
+Music_TitleScreen_branch_7e6dc::
+	octave 4
+	note C_, 6
+	octave 3
+	note G_, 3
+	octave 4
+	note C_, 6
+	octave 3
+	note G_, 3
+	sound_ret
+
+Music_TitleScreen_branch_7e6e5::
+	note_type 12, 1, 0
+	octave 4
+	note D_, 1
+	rest 5
+	sound_ret
+
+
+Music_TitleScreen_Ch4::
 	dspeed 6
 	rest 4
 	snare3 1
@@ -497,8 +497,8 @@ Music_TitleScreen_branch_7e716::
 	snare2 1
 	snare3 1
 	rest 3
-	callchannel Music_TitleScreen_branch_7e834
-	callchannel Music_TitleScreen_branch_7e834
+	sound_call Music_TitleScreen_branch_7e834
+	sound_call Music_TitleScreen_branch_7e834
 	snare2 1
 	rest 3
 	snare2 1
@@ -509,7 +509,7 @@ Music_TitleScreen_branch_7e716::
 	rest 1
 	snare3 1
 	snare2 1
-	callchannel Music_TitleScreen_branch_7e842
+	sound_call Music_TitleScreen_branch_7e842
 	snare2 1
 	rest 3
 	snare2 1
@@ -520,7 +520,7 @@ Music_TitleScreen_branch_7e716::
 	rest 1
 	snare2 1
 	rest 1
-	callchannel Music_TitleScreen_branch_7e842
+	sound_call Music_TitleScreen_branch_7e842
 	snare2 1
 	rest 3
 	snare2 1
@@ -535,8 +535,8 @@ Music_TitleScreen_branch_7e716::
 	snare4 1
 	snare4 1
 	dspeed 12
-	callchannel Music_TitleScreen_branch_7e834
-	callchannel Music_TitleScreen_branch_7e842
+	sound_call Music_TitleScreen_branch_7e834
+	sound_call Music_TitleScreen_branch_7e842
 	snare2 1
 	rest 3
 	snare2 1
@@ -555,8 +555,8 @@ Music_TitleScreen_branch_7e716::
 	rest 1
 	snare3 1
 	snare2 1
-	callchannel Music_TitleScreen_branch_7e834
-	callchannel Music_TitleScreen_branch_7e842
+	sound_call Music_TitleScreen_branch_7e834
+	sound_call Music_TitleScreen_branch_7e842
 	snare2 1
 	rest 3
 	snare2 1
@@ -652,7 +652,7 @@ Music_TitleScreen_branch_7e716::
 	snare2 4
 	snare3 4
 	snare2 4
-	loopchannel 0, Music_TitleScreen_branch_7e716
+	sound_loop 0, Music_TitleScreen_branch_7e716
 
 Music_TitleScreen_branch_7e834::
 	snare2 1
@@ -663,7 +663,7 @@ Music_TitleScreen_branch_7e834::
 	snare3 1
 	snare2 1
 	rest 3
-	endchannel
+	sound_ret
 
 Music_TitleScreen_branch_7e842::
 	snare2 1
@@ -674,4 +674,4 @@ Music_TitleScreen_branch_7e842::
 	snare2 1
 	snare2 1
 	rest 3
-	endchannel
+	sound_ret