shithub: pokered

Download patch

ref: fee52c53a40f8e36dfccfbe73668bfc2858c2a95
parent: f4e2814381364f295367d1b8da0ad9f73fc565d1
author: U-Fish-PC\Daniel <corrnondacqb@yahoo.com>
date: Tue Jun 10 07:42:56 EDT 2014 

Make each pitch/instrument its own macro


--- a/audio/music/bikeriding.asm
+++ b/audio/music/bikeriding.asm
@@ -5,149 +5,149 @@
 	vibrato 8, 1, 4
 	notetype 12, 11, 5
 	octave 3
-	note G_, 2
+	G_ 2
 
 Music_BikeRiding_branch_7dbc9::
 	octave 4
-	note C_, 4
-	note D_, 4
-	note E_, 2
-	note C_, 2
-	note E_, 2
-	note G_, 2
-	note G_, 2
-	note F_, 2
-	note E_, 2
-	note F_, 4
-	note E_, 2
-	note D_, 2
-	note F_, 4
-	note D_, 4
+	C_ 4
+	D_ 4
+	E_ 2
+	C_ 2
+	E_ 2
+	G_ 2
+	G_ 2
+	F_ 2
+	E_ 2
+	F_ 4
+	E_ 2
+	D_ 2
+	F_ 4
+	D_ 4
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F_, 4
-	note D_, 4
-	note E_, 2
-	note F_, 2
-	note G_, 2
-	note C_, 2
-	note E_, 2
-	note C_, 2
-	note D_, 2
-	note E_, 2
+	F_ 4
+	D_ 4
+	E_ 2
+	F_ 2
+	G_ 2
+	C_ 2
+	E_ 2
+	C_ 2
+	D_ 2
+	E_ 2
 	notetype 12, 11, 6
-	note F_, 10
+	F_ 10
 	notetype 12, 10, 6
-	note F_, 2
-	note E_, 2
-	note F_, 2
-	note G_, 10
-	note E_, 2
-	note D_, 2
-	note E_, 2
-	note F_, 6
+	F_ 2
+	E_ 2
+	F_ 2
+	G_ 10
+	E_ 2
+	D_ 2
+	E_ 2
+	F_ 6
 	toggleperfectpitch
 	notetype 12, 11, 3
-	note E_, 2
-	note D_, 2
-	note D_, 1
-	note E_, 1
-	note F_, 2
-	note E_, 1
-	note F_, 1
+	E_ 2
+	D_ 2
+	D_ 1
+	E_ 1
+	F_ 2
+	E_ 1
+	F_ 1
 	toggleperfectpitch
 	notetype 12, 11, 5
-	note G_, 6
-	note G_, 6
-	note A_, 2
-	note F_, 2
-	note G_, 6
+	G_ 6
+	G_ 6
+	A_ 2
+	F_ 2
+	G_ 6
 	notetype 12, 11, 4
-	note G_, 2
-	note F_, 4
+	G_ 2
+	F_ 4
 	notetype 12, 10, 4
-	note E_, 2
-	note D_, 2
+	E_ 2
+	D_ 2
 	notetype 12, 9, 3
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note C_, 4
-	note C_, 2
+	C_ 4
+	C_ 2
 	octave 3
-	note B_, 2
-	note A_, 1
-	note B_, 1
-	note A_, 2
-	note B_, 2
+	B_ 2
+	A_ 1
+	B_ 1
+	A_ 2
+	B_ 2
 	octave 4
-	note C_, 2
-	note C_, 4
-	note C_, 2
+	C_ 2
+	C_ 4
+	C_ 2
 	octave 3
-	note A_, 2
-	note B_, 2
-	note B_, 2
-	note A_, 2
+	A_ 2
+	B_ 2
+	B_ 2
+	A_ 2
 	octave 4
-	note C_, 4
+	C_ 4
 	octave 3
-	note A_, 2
-	note B_, 1
+	A_ 2
+	B_ 1
 	octave 4
-	note C_, 1
+	C_ 1
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note D_, 4
+	D_ 4
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note C_, 4
+	C_ 4
 	octave 3
-	note B_, 1
+	B_ 1
 	octave 4
-	note C_, 1
-	note D_, 1
+	C_ 1
+	D_ 1
 	octave 3
-	note B_, 1
+	B_ 1
 	octave 4
-	note C_, 4
+	C_ 4
 	notetype 12, 3, 13
-	note C_, 4
+	C_ 4
 	notetype 12, 11, 4
-	note F_, 6
-	note G_, 4
-	note F_, 1
-	note G_, 1
-	note F_, 4
-	note E_, 6
-	note F_, 2
-	note E_, 2
-	note D_, 1
-	note E_, 1
-	note D_, 2
-	note C_, 2
+	F_ 6
+	G_ 4
+	F_ 1
+	G_ 1
+	F_ 4
+	E_ 6
+	F_ 2
+	E_ 2
+	D_ 1
+	E_ 1
+	D_ 2
+	C_ 2
 	notetype 12, 11, 5
 	octave 3
-	note A_, 4
+	A_ 4
 	octave 4
-	note D_, 4
+	D_ 4
 	octave 3
-	note B_, 4
+	B_ 4
 	octave 4
-	note E_, 4
-	note C_, 4
-	note F_, 4
-	note D_, 4
-	note F#, 4
+	E_ 4
+	C_ 4
+	F_ 4
+	D_ 4
+	F# 4
 	vibrato 10, 2, 6
 	notetype 12, 8, 0
-	note G_, 16
-	note G_, 4
+	G_ 16
+	G_ 4
 	notetype 12, 8, 7
-	note G_, 12
+	G_ 12
 	notetype 12, 11, 5
 	vibrato 8, 1, 4
 	loopchannel 0, Music_BikeRiding_branch_7dbc9
@@ -158,146 +158,146 @@
 	vibrato 6, 1, 5
 	notetype 12, 12, 3
 	octave 4
-	note C_, 2
+	C_ 2
 
 Music_BikeRiding_branch_7dc75::
-	note E_, 4
-	note F_, 4
-	note G_, 4
+	E_ 4
+	F_ 4
+	G_ 4
 	octave 5
-	note C_, 4
+	C_ 4
 	octave 4
-	note B_, 6
-	note A_, 1
-	note B_, 1
-	note A_, 10
-	note F_, 2
-	note G_, 2
-	note A_, 2
+	B_ 6
+	A_ 1
+	B_ 1
+	A_ 10
+	F_ 2
+	G_ 2
+	A_ 2
 	octave 5
-	note D_, 2
-	note C_, 2
+	D_ 2
+	C_ 2
 	octave 4
-	note B_, 2
-	note A_, 1
-	note B_, 1
+	B_ 2
+	A_ 1
+	B_ 1
 	octave 5
-	note C_, 6
+	C_ 6
 	octave 4
-	note A_, 2
-	note G_, 4
+	A_ 2
+	G_ 4
 	duty 3
 	notetype 12, 8, 4
-	note A#, 6
+	A# 6
 	duty 2
 	notetype 12, 12, 5
 	octave 5
-	note C_, 2
+	C_ 2
 	octave 4
-	note B_, 2
+	B_ 2
 	octave 5
-	note C_, 2
+	C_ 2
 	octave 4
-	note A_, 10
+	A_ 10
 	octave 5
-	note C_, 2
+	C_ 2
 	octave 4
-	note B_, 2
+	B_ 2
 	octave 5
-	note C_, 2
+	C_ 2
 	octave 4
-	note G_, 10
+	G_ 10
 	notetype 12, 12, 3
 	octave 5
-	note C_, 4
-	note E_, 2
-	note D_, 2
-	note C_, 2
+	C_ 4
+	E_ 2
+	D_ 2
+	C_ 2
 	octave 4
-	note B_, 2
+	B_ 2
 	octave 5
-	note C_, 2
+	C_ 2
 	notetype 12, 11, 0
-	note D_, 4
+	D_ 4
 	notetype 12, 12, 7
-	note D_, 10
-	note D_, 1
-	note C_, 1
+	D_ 10
+	D_ 1
+	C_ 1
 	notetype 12, 11, 0
 	octave 4
-	note B_, 4
+	B_ 4
 	notetype 12, 12, 7
-	note B_, 12
+	B_ 12
 	notetype 12, 12, 4
-	note F_, 6
-	note F_, 2
-	note G_, 2
-	note F_, 2
-	note E_, 2
-	note D_, 2
-	note E_, 6
-	note E_, 2
-	note F_, 2
-	note E_, 2
-	note D_, 2
-	note C_, 2
-	note F_, 2
-	note E_, 2
-	note D_, 2
-	note F_, 2
-	note G_, 4
-	note A_, 2
-	note F_, 2
-	note E_, 2
-	note G_, 4
-	note F_, 2
-	note E_, 6
+	F_ 6
+	F_ 2
+	G_ 2
+	F_ 2
+	E_ 2
+	D_ 2
+	E_ 6
+	E_ 2
+	F_ 2
+	E_ 2
+	D_ 2
+	C_ 2
+	F_ 2
+	E_ 2
+	D_ 2
+	F_ 2
+	G_ 4
+	A_ 2
+	F_ 2
+	E_ 2
+	G_ 4
+	F_ 2
+	E_ 6
 	notetype 6, 12, 2
-	note F_, 1
-	note G_, 1
-	note A_, 1
-	note B_, 1
+	F_ 1
+	G_ 1
+	A_ 1
+	B_ 1
 	notetype 12, 12, 3
 	octave 5
-	note C_, 2
+	C_ 2
 	octave 4
-	note B_, 2
-	note A_, 2
+	B_ 2
+	A_ 2
 	octave 5
-	note C_, 2
+	C_ 2
 	octave 4
-	note B_, 4
-	note A_, 4
-	note G_, 2
-	note A#, 4
-	note A_, 2
-	note G_, 4
-	note F_, 2
-	note E_, 2
+	B_ 4
+	A_ 4
+	G_ 2
+	A# 4
+	A_ 2
+	G_ 4
+	F_ 2
+	E_ 2
 	notetype 8, 12, 4
-	note A_, 4
-	note G_, 4
-	note F_, 4
-	note B_, 4
-	note A_, 4
-	note G_, 4
+	A_ 4
+	G_ 4
+	F_ 4
+	B_ 4
+	A_ 4
+	G_ 4
 	octave 5
-	note C_, 4
+	C_ 4
 	octave 4
-	note B_, 4
-	note A_, 4
+	B_ 4
+	A_ 4
 	octave 5
-	note D_, 4
-	note E_, 4
-	note C_, 4
+	D_ 4
+	E_ 4
+	C_ 4
 	notetype 12, 12, 7
-	note D_, 12
-	note C_, 4
+	D_ 12
+	C_ 4
 	notetype 12, 11, 0
 	octave 4
-	note B_, 4
+	B_ 4
 	notetype 12, 12, 7
-	note B_, 12
+	B_ 12
 	notetype 12, 12, 3
 	loopchannel 0, Music_BikeRiding_branch_7dc75
 
@@ -308,337 +308,337 @@
 
 Music_BikeRiding_branch_7dd17::
 	octave 4
-	note C_, 1
+	C_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
 	octave 3
-	note G_, 1
+	G_ 1
 	rest 1
 	octave 4
-	note E_, 1
+	E_ 1
 	rest 1
-	note C_, 1
+	C_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note C_, 1
+	C_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note C_, 1
+	C_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
 	octave 3
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 4
-	note F_, 1
+	F_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note C_, 1
+	C_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note C_, 1
+	C_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note C_, 1
+	C_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
 	octave 3
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 4
-	note F_, 1
+	F_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note C_, 1
+	C_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note D_, 1
+	D_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note G_, 1
+	G_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
 	octave 3
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 4
-	note F_, 1
+	F_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note C_, 1
+	C_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
 	octave 3
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 4
-	note F_, 1
+	F_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note C_, 1
+	C_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note C_, 1
+	C_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note C_, 1
+	C_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note A#, 1
+	A# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note A#, 1
+	A# 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note A#, 1
+	A# 1
 	rest 1
-	note A#, 1
+	A# 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 5
-	note C_, 1
+	C_ 1
 	rest 1
 	octave 4
-	note B_, 1
+	B_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 5
-	note C_, 1
+	C_ 1
 	rest 1
 	octave 4
-	note A_, 1
+	A_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
 	octave 5
-	note C_, 1
+	C_ 1
 	rest 1
 	octave 4
-	note G_, 1
+	G_ 1
 	rest 1
 	octave 5
-	note C_, 1
+	C_ 1
 	rest 1
 	octave 4
-	note G_, 1
+	G_ 1
 	rest 1
 	octave 5
-	note C_, 1
+	C_ 1
 	rest 1
 	octave 4
-	note G_, 1
+	G_ 1
 	rest 1
 	octave 5
-	note C_, 1
+	C_ 1
 	rest 1
 	octave 4
-	note G_, 1
+	G_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note F_, 1
+	F_ 1
 	rest 1
 	loopchannel 0, Music_BikeRiding_branch_7dd17
 
@@ -671,35 +671,35 @@
 
 Music_BikeRiding_branch_7dea7::
 	rest 2
-	dnote 2, triangle3
+	triangle3 2
 	rest 2
-	dnote 2, triangle3
+	triangle3 2
 	rest 2
-	dnote 2, triangle3
+	triangle3 2
 	rest 2
-	dnote 2, triangle3
+	triangle3 2
 	endchannel
 
 Music_BikeRiding_branch_7deb4::
 	rest 2
-	dnote 2, triangle3
+	triangle3 2
 	rest 2
-	dnote 2, triangle3
+	triangle3 2
 	rest 2
-	dnote 2, triangle3
-	dnote 2, triangle3
-	dnote 2, triangle3
+	triangle3 2
+	triangle3 2
+	triangle3 2
 	endchannel
 
 Music_BikeRiding_branch_7dec2::
 	rest 2
-	dnote 2, triangle3
+	triangle3 2
 	rest 2
-	dnote 2, triangle3
+	triangle3 2
 	rest 2
-	dnote 2, triangle3
+	triangle3 2
 	rest 2
-	dnote 1, triangle3
-	dnote 1, triangle3
+	triangle3 1
+	triangle3 1
 	endchannel
-; 0x7ded1
\ No newline at end of file
+; 0x7ded1
--- a/audio/music/celadon.asm
+++ b/audio/music/celadon.asm
@@ -6,104 +6,104 @@
 	notetype 12, 2, 15
 	rest 8
 	octave 3
-	note D_, 8
+	D_ 8
 
 Music_Celadon_branch_b6d4::
 	duty 2
 	notetype 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
+	G_ 4
+	B_ 4
+	G_ 2
+	B_ 4
+	G_ 2
+	E_ 1
+	E_ 1
+	G_ 1
+	E_ 1
+	B_ 2
 	octave 4
-	note C_, 2
+	C_ 2
 	octave 3
-	note A_, 8
-	note F#, 4
-	note A_, 4
-	note F#, 2
-	note A_, 6
-	note A_, 1
-	note B_, 1
+	A_ 8
+	F# 4
+	A_ 4
+	F# 2
+	A_ 6
+	A_ 1
+	B_ 1
 	octave 4
-	note C_, 1
+	C_ 1
 	octave 3
-	note B_, 1
-	note A_, 2
-	note B_, 2
-	note G_, 4
+	B_ 1
+	A_ 2
+	B_ 2
+	G_ 4
 	octave 4
-	note G_, 4
+	G_ 4
 	octave 3
-	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
+	G_ 4
+	B_ 4
+	G_ 2
+	B_ 4
+	G_ 2
+	E_ 1
+	F# 1
+	G_ 1
+	A_ 1
+	B_ 2
 	octave 4
-	note C_, 2
+	C_ 2
 	octave 3
-	note A_, 8
-	note A_, 2
-	note B_, 2
+	A_ 8
+	A_ 2
+	B_ 2
 	octave 4
-	note C_, 2
+	C_ 2
 	octave 3
-	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
+	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
-	note B_, 8
-	note G_, 4
-	note D_, 4
-	note G_, 4
-	note A_, 2
+	B_ 8
+	G_ 4
+	D_ 4
+	G_ 4
+	A_ 2
 	octave 4
-	note C_, 2
+	C_ 2
 	octave 3
-	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
+	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
 	octave 4
-	note C_, 2
+	C_ 2
 	octave 3
-	note B_, 8
-	note A_, 8
-	note F#, 4
-	note G_, 4
-	note A_, 4
-	note G_, 4
-	note F#, 4
-	note A_, 4
+	B_ 8
+	A_ 8
+	F# 4
+	G_ 4
+	A_ 4
+	G_ 4
+	F# 4
+	A_ 4
 	loopchannel 0, Music_Celadon_branch_b6d4
 
 
@@ -111,118 +111,118 @@
 	duty 3
 	notetype 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
+	D_ 1
+	C# 1
+	D_ 1
+	E_ 1
+	F# 1
+	E_ 1
+	F# 1
+	G_ 1
 	notetype 12, 10, 0
-	note A_, 8
+	A_ 8
 
 Music_Celadon_branch_b74a::
 	duty 2
 	notetype 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
+	B_ 4
+	G_ 4
+	B_ 2
+	G_ 6
+	B_ 1
+	G_ 1
+	A_ 1
+	B_ 1
 	octave 5
-	note C_, 2
+	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
+	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
-	note B_, 2
+	B_ 2
 	octave 4
-	note B_, 1
-	note G_, 1
-	note A_, 1
-	note B_, 1
+	B_ 1
+	G_ 1
+	A_ 1
+	B_ 1
 	octave 5
-	note C_, 2
+	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
+	B_ 2
+	A_ 8
+	A_ 2
+	G_ 2
+	F# 2
+	G_ 2
+	F# 2
+	E_ 2
+	D_ 2
+	C# 2
+	D_ 8
 	octave 5
-	note D_, 8
+	D_ 8
 	notetype 12, 11, 4
 	octave 4
-	note D_, 8
-	note C_, 2
+	D_ 8
+	C_ 2
 	octave 3
-	note B_, 2
-	note A_, 2
-	note B_, 2
+	B_ 2
+	A_ 2
+	B_ 2
 	octave 4
-	note E_, 4
-	note F#, 4
-	note D_, 8
-	note C_, 8
+	E_ 4
+	F# 4
+	D_ 8
+	C_ 8
 	octave 3
-	note A_, 2
-	note B_, 2
+	A_ 2
+	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
+	C_ 2
+	D_ 2
+	E_ 2
+	C_ 2
+	D_ 2
+	E_ 2
+	D_ 8
+	D_ 8
+	C_ 2
 	octave 3
-	note B_, 2
-	note A_, 2
-	note B_, 2
+	B_ 2
+	A_ 2
+	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
+	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
 
 
@@ -230,183 +230,183 @@
 	notetype 12, 1, 3
 	rest 8
 	octave 5
-	note D_, 1
-	note C#, 1
-	note D_, 1
-	note E_, 1
-	note F#, 1
-	note E_, 1
-	note F#, 1
-	note G_, 1
+	D_ 1
+	C# 1
+	D_ 1
+	E_ 1
+	F# 1
+	E_ 1
+	F# 1
+	G_ 1
 
 Music_Celadon_branch_b7c1::
 	octave 4
-	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
+	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
 	rest 6
-	note F#, 2
+	F# 2
 	rest 4
-	note F#, 2
-	note G_, 2
+	F# 2
+	G_ 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note G_, 2
+	G_ 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note G_, 2
+	G_ 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note G_, 2
-	note B_, 2
-	note G_, 2
+	G_ 2
+	B_ 2
+	G_ 2
 	octave 5
-	note E_, 2
-	note D_, 2
-	note C_, 2
-	note D_, 2
+	E_ 2
+	D_ 2
+	C_ 2
+	D_ 2
 	octave 4
-	note B_, 2
-	note G_, 2
+	B_ 2
+	G_ 2
 	octave 5
-	note C_, 2
+	C_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 5
-	note E_, 2
-	note D_, 2
-	note C_, 2
-	note D_, 2
+	E_ 2
+	D_ 2
+	C_ 2
+	D_ 2
 	octave 4
-	note B_, 2
-	note A_, 2
+	B_ 2
+	A_ 2
 	octave 5
-	note C_, 2
+	C_ 2
 	octave 4
-	note G_, 2
+	G_ 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note G_, 2
+	G_ 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note G_, 2
+	G_ 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note G_, 2
-	note B_, 2
-	note G_, 2
+	G_ 2
+	B_ 2
+	G_ 2
 	octave 5
-	note E_, 2
-	note D_, 2
-	note C_, 2
-	note D_, 2
+	E_ 2
+	D_ 2
+	C_ 2
+	D_ 2
 	octave 4
-	note B_, 2
-	note G_, 2
+	B_ 2
+	G_ 2
 	octave 5
-	note C_, 2
+	C_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 5
-	note D_, 2
-	note C_, 2
+	D_ 2
+	C_ 2
 	octave 4
-	note B_, 2
-	note A_, 2
-	note G_, 2
-	note F#, 2
-	note E_, 2
+	B_ 2
+	A_ 2
+	G_ 2
+	F# 2
+	E_ 2
 	loopchannel 0, Music_Celadon_branch_b7c1
-; 0xb86d
\ No newline at end of file
+; 0xb86d
--- a/audio/music/cinnabar.asm
+++ b/audio/music/cinnabar.asm
@@ -9,79 +9,79 @@
 	notetype 12, 11, 5
 	rest 4
 	octave 3
-	note D_, 4
-	note E_, 6
-	note C#, 2
+	D_ 4
+	E_ 6
+	C# 2
 	notetype 12, 11, 1
-	note D_, 4
+	D_ 4
 	notetype 12, 11, 5
-	note B_, 4
+	B_ 4
 	octave 4
-	note C_, 6
+	C_ 6
 	octave 3
-	note A_, 2
+	A_ 2
 	notetype 12, 11, 1
-	note B_, 4
+	B_ 4
 	notetype 12, 11, 5
-	note G_, 4
-	note F#, 4
-	note E_, 2
-	note F#, 2
+	G_ 4
+	F# 4
+	E_ 2
+	F# 2
 	notetype 12, 11, 1
-	note G_, 4
+	G_ 4
 	notetype 12, 11, 5
-	note G_, 4
-	note F#, 4
-	note E_, 4
-	note D_, 4
-	note E_, 4
-	note F#, 6
-	note A_, 2
+	G_ 4
+	F# 4
+	E_ 4
+	D_ 4
+	E_ 4
+	F# 6
+	A_ 2
 	notetype 12, 11, 1
-	note G_, 4
+	G_ 4
 	notetype 12, 11, 5
-	note B_, 4
+	B_ 4
 	octave 4
-	note C_, 6
+	C_ 6
 	octave 3
-	note A_, 2
-	note B_, 4
-	note G_, 4
-	note F#, 3
-	note E_, 1
-	note F#, 2
-	note A_, 2
+	A_ 2
+	B_ 4
+	G_ 4
+	F# 3
+	E_ 1
+	F# 2
+	A_ 2
 	notetype 12, 10, 2
-	note G_, 4
+	G_ 4
 	octave 4
-	note D_, 1
-	note E_, 1
-	note D_, 4
+	D_ 1
+	E_ 1
+	D_ 4
 	notetype 12, 7, 2
-	note D_, 1
-	note E_, 1
-	note D_, 4
+	D_ 1
+	E_ 1
+	D_ 4
 	notetype 12, 10, 7
 	octave 3
-	note B_, 6
-	note G_, 2
-	note E_, 8
+	B_ 6
+	G_ 2
+	E_ 8
 	octave 4
-	note C_, 6
+	C_ 6
 	octave 3
-	note A_, 2
-	note F#, 8
+	A_ 2
+	F# 8
 	octave 4
-	note F#, 6
-	note D_, 2
+	F# 6
+	D_ 2
 	octave 3
-	note B_, 2
-	note A_, 2
-	note G_, 2
-	note F#, 2
-	note G_, 8
-	note F#, 4
-	note E_, 4
+	B_ 2
+	A_ 2
+	G_ 2
+	F# 2
+	G_ 8
+	F# 4
+	E_ 4
 	loopchannel 0, Music_Cinnabar_branch_b878
 
 
@@ -92,90 +92,90 @@
 Music_Cinnabar_branch_b8d9::
 	notetype 12, 12, 7
 	octave 3
-	note G_, 6
-	note A_, 1
-	note B_, 1
+	G_ 6
+	A_ 1
+	B_ 1
 	octave 4
-	note C_, 6
-	note D_, 1
-	note E_, 1
+	C_ 6
+	D_ 1
+	E_ 1
 	notetype 12, 12, 1
-	note D_, 4
+	D_ 4
 	notetype 12, 12, 7
-	note G_, 4
-	note A_, 6
-	note G_, 1
-	note F#, 1
-	note E_, 4
-	note D_, 4
-	note C_, 3
+	G_ 4
+	A_ 6
+	G_ 1
+	F# 1
+	E_ 4
+	D_ 4
+	C_ 3
 	octave 3
-	note B_, 1
+	B_ 1
 	octave 4
-	note C_, 2
-	note D_, 1
-	note E_, 1
+	C_ 2
+	D_ 1
+	E_ 1
 	notetype 12, 12, 1
-	note D_, 4
+	D_ 4
 	notetype 12, 12, 7
 	octave 3
-	note B_, 8
-	note A_, 4
-	note G_, 6
-	note A_, 1
-	note B_, 1
+	B_ 8
+	A_ 4
+	G_ 6
+	A_ 1
+	B_ 1
 	octave 4
-	note C_, 6
-	note D_, 1
-	note E_, 1
+	C_ 6
+	D_ 1
+	E_ 1
 	notetype 12, 12, 1
-	note D_, 4
+	D_ 4
 	notetype 12, 12, 7
-	note G_, 4
-	note A_, 6
-	note G_, 1
-	note F#, 1
-	note E_, 4
-	note D_, 4
-	note C_, 3
+	G_ 4
+	A_ 6
+	G_ 1
+	F# 1
+	E_ 4
+	D_ 4
+	C_ 3
 	octave 3
-	note B_, 1
+	B_ 1
 	octave 4
-	note C_, 2
-	note D_, 1
-	note E_, 1
+	C_ 2
+	D_ 1
+	E_ 1
 	notetype 12, 12, 1
-	note D_, 4
+	D_ 4
 	notetype 12, 12, 7
 	octave 3
-	note A_, 4
-	note G_, 4
-	note F#, 4
+	A_ 4
+	G_ 4
+	F# 4
 	notetype 12, 11, 0
 	octave 4
-	note D_, 6
+	D_ 6
 	octave 3
-	note B_, 2
-	note G_, 8
+	B_ 2
+	G_ 8
 	octave 4
-	note E_, 6
-	note C_, 2
+	E_ 6
+	C_ 2
 	octave 3
-	note A_, 8
+	A_ 8
 	octave 4
-	note A_, 6
-	note F#, 2
-	note D_, 2
-	note C_, 2
+	A_ 6
+	F# 2
+	D_ 2
+	C_ 2
 	octave 3
-	note B_, 2
-	note A_, 2
-	note B_, 4
+	B_ 2
+	A_ 2
+	B_ 4
 	octave 4
-	note D_, 4
+	D_ 4
 	octave 3
-	note B_, 2
-	note A_, 6
+	B_ 2
+	A_ 6
 	loopchannel 0, Music_Cinnabar_branch_b8d9
 
 
@@ -184,172 +184,172 @@
 
 Music_Cinnabar_branch_b93f::
 	octave 4
-	note G_, 1
+	G_ 1
 	rest 3
-	note B_, 2
-	note G_, 1
-	note G_, 1
-	note A_, 1
+	B_ 2
+	G_ 1
+	G_ 1
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 5
-	note C_, 2
+	C_ 2
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 3
-	note B_, 2
-	note G_, 1
-	note G_, 1
-	note A_, 1
+	B_ 2
+	G_ 1
+	G_ 1
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 5
-	note C_, 2
+	C_ 2
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 3
-	note B_, 2
-	note G_, 1
-	note G_, 1
-	note A_, 1
+	B_ 2
+	G_ 1
+	G_ 1
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 5
-	note C_, 2
+	C_ 2
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 3
-	note B_, 2
-	note G_, 1
-	note G_, 1
-	note A_, 1
+	B_ 2
+	G_ 1
+	G_ 1
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 5
-	note C_, 2
+	C_ 2
 	octave 4
-	note A_, 1
+	A_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 3
-	note B_, 2
-	note G_, 1
-	note G_, 1
-	note A_, 1
+	B_ 2
+	G_ 1
+	G_ 1
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 5
-	note C_, 2
+	C_ 2
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 3
-	note B_, 2
-	note G_, 1
-	note G_, 1
-	note A_, 1
+	B_ 2
+	G_ 1
+	G_ 1
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 5
-	note C_, 2
+	C_ 2
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 3
-	note B_, 2
-	note G_, 1
-	note G_, 1
-	note A_, 1
+	B_ 2
+	G_ 1
+	G_ 1
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 5
-	note C_, 2
+	C_ 2
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 3
-	note B_, 4
-	note A_, 1
+	B_ 4
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 5
-	note C_, 4
+	C_ 4
 	octave 4
-	note B_, 1
+	B_ 1
 	rest 3
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note B_, 1
-	note B_, 1
-	note B_, 1
+	B_ 1
+	B_ 1
+	B_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 5
-	note C_, 2
+	C_ 2
 	octave 4
-	note B_, 1
+	B_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 3
 	octave 5
-	note E_, 2
-	note C_, 1
-	note C_, 1
-	note C_, 1
+	E_ 2
+	C_ 1
+	C_ 1
+	C_ 1
 	rest 1
-	note C_, 1
+	C_ 1
 	rest 1
-	note E_, 2
-	note C_, 1
+	E_ 2
+	C_ 1
 	rest 1
 	octave 4
-	note A_, 1
+	A_ 1
 	rest 3
 	octave 5
-	note A_, 2
-	note F#, 1
-	note F#, 1
-	note D_, 1
+	A_ 2
+	F# 1
+	F# 1
+	D_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note D_, 2
-	note C_, 1
+	D_ 2
+	C_ 1
 	rest 1
 	octave 4
-	note B_, 1
+	B_ 1
 	rest 3
 	octave 5
-	note D_, 2
-	note C_, 1
-	note C_, 1
+	D_ 2
+	C_ 1
+	C_ 1
 	octave 4
-	note B_, 1
+	B_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note A_, 2
+	A_ 2
 	octave 5
-	note C_, 1
+	C_ 1
 	rest 1
 	loopchannel 0, Music_Cinnabar_branch_b93f
-; 0xb9eb
\ No newline at end of file
+; 0xb9eb
--- a/audio/music/cinnabarmansion.asm
+++ b/audio/music/cinnabarmansion.asm
@@ -7,23 +7,23 @@
 Music_CinnabarMansion_branch_7ed19::
 	notetype 12, 6, 2
 	octave 5
-	note E_, 1
-	note E_, 1
+	E_ 1
+	E_ 1
 	octave 4
-	note B_, 1
-	note B_, 1
-	note C_, 1
+	B_ 1
+	B_ 1
+	C_ 1
 	rest 2
 	octave 5
-	note B_, 2
-	note E_, 2
+	B_ 2
+	E_ 2
 	octave 4
-	note C_, 2
-	note B_, 2
-	note E_, 2
-	note C_, 1
+	C_ 2
+	B_ 2
+	E_ 2
+	C_ 1
 	octave 5
-	note B_, 1
+	B_ 1
 	rest 2
 	loopchannel 14, Music_CinnabarMansion_branch_7ed19
 	notetype 12, 10, 5
@@ -31,10 +31,10 @@
 	rest 16
 	rest 15
 	octave 4
-	note C_, 1
+	C_ 1
 	octave 5
-	note B_, 1
-	note B_, 2
+	B_ 1
+	B_ 2
 	loopchannel 0, Music_CinnabarMansion_branch_7ed19
 
 
@@ -56,42 +56,42 @@
 	callchannel Music_CinnabarMansion_branch_7ed6c
 	loopchannel 3, Music_CinnabarMansion_branch_7ed50
 	octave 3
-	note E_, 4
-	note D#, 4
-	note B_, 4
-	note A#, 4
-	note G_, 4
-	note G#, 4
+	E_ 4
+	D# 4
+	B_ 4
+	A# 4
+	G_ 4
+	G# 4
 	rest 4
-	note A#, 4
-	note E_, 4
-	note D#, 4
-	note B_, 4
-	note A#, 4
-	note G_, 4
-	note G#, 4
-	note G_, 4
-	note D#, 4
+	A# 4
+	E_ 4
+	D# 4
+	B_ 4
+	A# 4
+	G_ 4
+	G# 4
+	G_ 4
+	D# 4
 	loopchannel 0, Music_CinnabarMansion_branch_7ed4e
 
 Music_CinnabarMansion_branch_7ed6c::
 	octave 3
-	note E_, 4
-	note D#, 4
-	note B_, 4
-	note A#, 4
-	note G_, 4
-	note G#, 4
-	note A_, 4
-	note A#, 4
-	note E_, 4
-	note D#, 4
-	note B_, 4
-	note A#, 4
-	note G_, 4
-	note G#, 4
+	E_ 4
+	D# 4
+	B_ 4
+	A# 4
+	G_ 4
+	G# 4
+	A_ 4
+	A# 4
+	E_ 4
+	D# 4
+	B_ 4
+	A# 4
+	G_ 4
+	G# 4
 	rest 4
-	note A#, 4
+	A# 4
 	endchannel
 
 
@@ -100,46 +100,46 @@
 
 Music_CinnabarMansion_branch_7ed80::
 	octave 2
-	note B_, 2
+	B_ 2
 	rest 2
 	octave 3
-	note E_, 2
+	E_ 2
 	rest 2
-	note E_, 2
+	E_ 2
 	rest 2
-	note E_, 2
+	E_ 2
 	rest 2
-	note E_, 2
+	E_ 2
 	rest 2
-	note E_, 2
+	E_ 2
 	rest 2
-	note E_, 2
+	E_ 2
 	rest 2
-	note E_, 2
+	E_ 2
 	rest 2
-	note C_, 2
+	C_ 2
 	rest 2
 	octave 3
-	note D#, 2
+	D# 2
 	rest 2
-	note D#, 2
+	D# 2
 	rest 2
-	note D#, 2
+	D# 2
 	rest 2
-	note D#, 2
+	D# 2
 	rest 2
-	note D#, 2
+	D# 2
 	rest 2
-	note D#, 2
+	D# 2
 	rest 2
-	note D#, 2
+	D# 2
 	rest 2
 	loopchannel 8, Music_CinnabarMansion_branch_7ed80
-	note E_, 16
-	note D#, 16
-	note G_, 16
-	note G#, 8
-	note D#, 8
+	E_ 16
+	D# 16
+	G_ 16
+	G# 8
+	D# 8
 	loopchannel 0, Music_CinnabarMansion_branch_7ed80
 
 
@@ -151,23 +151,23 @@
 	rest 16
 
 Music_CinnabarMansion_branch_7edb5::
-	dnote 2, cymbal1
-	dnote 2, cymbal1
-	dnote 4, cymbal2
-	dnote 2, cymbal1
-	dnote 2, cymbal1
-	dnote 4, cymbal2
-	dnote 2, cymbal1
-	dnote 2, cymbal1
-	dnote 4, cymbal2
-	dnote 2, cymbal1
-	dnote 2, cymbal1
-	dnote 4, cymbal3
-	dnote 2, cymbal1
-	dnote 2, cymbal1
+	cymbal1 2
+	cymbal1 2
+	cymbal2 4
+	cymbal1 2
+	cymbal1 2
+	cymbal2 4
+	cymbal1 2
+	cymbal1 2
+	cymbal2 4
+	cymbal1 2
+	cymbal1 2
+	cymbal3 4
+	cymbal1 2
+	cymbal1 2
 	rest 2
 	rest 10
 	rest 8
-	dnote 8, cymbal3
+	cymbal3 8
 	loopchannel 0, Music_CinnabarMansion_branch_7edb5
-; 0x7edda
\ No newline at end of file
+; 0x7edda
--- a/audio/music/cities1.asm
+++ b/audio/music/cities1.asm
@@ -13,258 +13,258 @@
 Music_Cities1_branch_aa80::
 	notetype 12, 12, 5
 	octave 3
-	note G#, 4
-	note F#, 4
-	note E_, 2
-	note E_, 2
-	note F#, 2
-	note D#, 2
-	note E_, 2
-	note E_, 2
-	note D#, 2
-	note C#, 4
-	note D#, 4
-	note E_, 2
-	note D#, 4
-	note C#, 2
-	note E_, 2
-	note E_, 4
+	G# 4
+	F# 4
+	E_ 2
+	E_ 2
+	F# 2
+	D# 2
+	E_ 2
+	E_ 2
+	D# 2
+	C# 4
+	D# 4
+	E_ 2
+	D# 4
+	C# 2
+	E_ 2
+	E_ 4
 	notetype 12, 10, 5
-	note C#, 4
+	C# 4
 	octave 2
-	note B_, 6
+	B_ 6
 	octave 3
-	note C#, 2
-	note C#, 4
+	C# 2
+	C# 4
 	octave 2
-	note B_, 4
+	B_ 4
 	notetype 12, 12, 5
 	callchannel Music_Cities1_branch_ab7d
 	octave 3
-	note D#, 6
-	note E_, 2
+	D# 6
+	E_ 2
 	octave 2
-	note B_, 4
+	B_ 4
 	notetype 12, 10, 5
 	octave 3
-	note C#, 2
+	C# 2
 	octave 2
-	note B_, 2
-	note A_, 4
-	note B_, 4
-	note B_, 2
+	B_ 2
+	A_ 4
+	B_ 4
+	B_ 2
 	octave 3
-	note C#, 2
-	note D#, 2
-	note E_, 2
-	note D#, 2
-	note C#, 2
-	note D#, 2
+	C# 2
+	D# 2
+	E_ 2
+	D# 2
+	C# 2
+	D# 2
 	notetype 12, 12, 5
-	note G#, 2
-	note E_, 2
-	note F#, 2
-	note E_, 2
-	note E_, 4
-	note F#, 2
-	note D#, 2
-	note E_, 4
-	note D#, 2
-	note C#, 4
-	note D#, 4
-	note E_, 2
-	note D#, 2
-	note C#, 2
-	note C#, 2
-	note E_, 2
-	note E_, 4
+	G# 2
+	E_ 2
+	F# 2
+	E_ 2
+	E_ 4
+	F# 2
+	D# 2
+	E_ 4
+	D# 2
+	C# 4
+	D# 4
+	E_ 2
+	D# 2
+	C# 2
+	C# 2
+	E_ 2
+	E_ 4
 	notetype 12, 10, 5
-	note C#, 2
+	C# 2
 	octave 2
-	note A_, 2
-	note B_, 6
+	A_ 2
+	B_ 6
 	octave 3
-	note C#, 2
-	note C#, 2
+	C# 2
+	C# 2
 	octave 2
-	note B_, 2
-	note B_, 4
+	B_ 2
+	B_ 4
 	notetype 12, 12, 5
 	callchannel Music_Cities1_branch_ab7d
 	octave 3
-	note D#, 4
-	note D#, 2
-	note E_, 2
+	D# 4
+	D# 2
+	E_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note C#, 2
-	note G#, 2
-	note E_, 4
+	C# 2
+	G# 2
+	E_ 4
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	notetype 12, 10, 5
-	note C#, 4
+	C# 4
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note D#, 4
-	note C#, 2
-	note E_, 4
+	D# 4
+	C# 2
+	E_ 4
 	notetype 12, 11, 3
 	callchannel Music_Cities1_branch_ab8a
-	note A_, 2
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note A_, 4
-	note F#, 4
-	note G#, 2
-	note E_, 2
+	A_ 2
+	B_ 2
+	A_ 2
+	G# 2
+	A_ 4
+	F# 4
+	G# 2
+	E_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note E_, 4
-	note G#, 2
+	E_ 4
+	G# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note E_, 2
-	note E_, 2
-	note F#, 2
-	note E_, 2
-	note D#, 2
-	note E_, 2
-	note D#, 2
-	note C#, 2
+	E_ 2
+	E_ 2
+	F# 2
+	E_ 2
+	D# 2
+	E_ 2
+	D# 2
+	C# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
 
 Music_Cities1_branch_ab12::
-	note C#, 2
-	note D#, 2
-	note C#, 2
+	C# 2
+	D# 2
+	C# 2
 	octave 2
-	note B_, 4
-	note B_, 2
+	B_ 4
+	B_ 2
 	octave 3
-	note C#, 2
-	note D#, 2
+	C# 2
+	D# 2
 	loopchannel 2, Music_Cities1_branch_ab12
-	note E_, 2
+	E_ 2
 	octave 2
-	note B_, 4
+	B_ 4
 	octave 3
-	note E_, 4
+	E_ 4
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note C#, 2
-	note G#, 2
-	note G#, 2
+	C# 2
+	G# 2
+	G# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note F#, 2
+	F# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note D#, 2
+	D# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
 	callchannel Music_Cities1_branch_ab8a
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note A_, 2
-	note F#, 2
-	note G#, 2
-	note E_, 2
+	A_ 2
+	E_ 2
+	A_ 2
+	B_ 2
+	A_ 2
+	G# 2
+	A_ 2
+	F# 2
+	G# 2
+	E_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note E_, 2
-	note C#, 2
-	note G#, 2
-	note C#, 2
-	note D#, 2
-	note B_, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note F#, 2
-	note E_, 4
-	note G#, 2
-	note F#, 2
-	note D#, 2
+	E_ 2
+	C# 2
+	G# 2
+	C# 2
+	D# 2
+	B_ 2
+	E_ 2
+	G# 2
+	E_ 2
+	F# 2
+	E_ 4
+	G# 2
+	F# 2
+	D# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note D#, 4
-	note F#, 2
-	note D#, 2
-	note D#, 2
-	note F#, 2
+	D# 4
+	F# 2
+	D# 2
+	D# 2
+	F# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note D#, 2
+	D# 2
 	octave 2
-	note B_, 2
-	note B_, 2
+	B_ 2
+	B_ 2
 	octave 3
-	note D#, 2
+	D# 2
 	notetype 12, 11, 6
-	note F#, 8
-	note F#, 4
-	note D#, 4
-	note E_, 8
+	F# 8
+	F# 4
+	D# 4
+	E_ 8
 	notetype 12, 8, 4
 	octave 2
-	note B_, 4
+	B_ 4
 	octave 3
-	note E_, 2
-	note F#, 2
+	E_ 2
+	F# 2
 	loopchannel 0, Music_Cities1_branch_aa80
 
 Music_Cities1_branch_ab7d::
 	octave 3
-	note F#, 2
-	note D#, 4
-	note E_, 2
-	note D#, 4
-	note C#, 4
+	F# 2
+	D# 4
+	E_ 2
+	D# 4
+	C# 4
 	octave 2
-	note B_, 4
+	B_ 4
 	octave 3
-	note C#, 2
-	note D#, 2
-	note C#, 2
+	C# 2
+	D# 2
+	C# 2
 	endchannel
 
 Music_Cities1_branch_ab8a::
-	note A_, 2
-	note E_, 2
-	note C#, 2
-	note E_, 4
-	note A_, 2
-	note C#, 2
-	note E_, 2
+	A_ 2
+	E_ 2
+	C# 2
+	E_ 4
+	A_ 2
+	C# 2
+	E_ 2
 	endchannel
 
 
@@ -272,91 +272,91 @@
 	vibrato 5, 1, 5
 	callchannel Music_Cities1_branch_ac00
 	octave 4
-	note G#, 2
+	G# 2
 	notetype 12, 12, 4
-	note E_, 6
+	E_ 6
 	notetype 12, 12, 5
 	duty 3
 	octave 3
-	note C#, 4
-	note D#, 4
-	note E_, 6
-	note F#, 6
-	note G#, 4
+	C# 4
+	D# 4
+	E_ 6
+	F# 6
+	G# 4
 	callchannel Music_Cities1_branch_ac00
 	octave 4
-	note G#, 2
+	G# 2
 	notetype 12, 12, 4
-	note E_, 14
+	E_ 14
 	duty 3
 	octave 3
-	note E_, 6
-	note F#, 6
-	note G#, 4
+	E_ 6
+	F# 6
+	G# 4
 	notetype 12, 11, 7
 	duty 2
 	vibrato 8, 1, 7
 	octave 5
-	note C#, 12
+	C# 12
 	octave 4
-	note A_, 4
+	A_ 4
 	octave 5
-	note E_, 8
-	note F#, 2
-	note E_, 2
-	note D#, 2
-	note C#, 2
+	E_ 8
+	F# 2
+	E_ 2
+	D# 2
+	C# 2
 	octave 4
-	note B_, 12
-	note G#, 4
-	note B_, 16
-	note F#, 12
-	note G#, 2
-	note A_, 2
-	note B_, 4
-	note A_, 4
-	note G#, 4
-	note F#, 4
-	note G#, 12
-	note E_, 4
-	note B_, 16
+	B_ 12
+	G# 4
+	B_ 16
+	F# 12
+	G# 2
+	A_ 2
+	B_ 4
+	A_ 4
+	G# 4
+	F# 4
+	G# 12
+	E_ 4
+	B_ 16
 	octave 5
-	note C#, 12
-	note D#, 2
-	note E_, 2
-	note F#, 4
-	note E_, 4
-	note D#, 4
-	note C#, 4
+	C# 12
+	D# 2
+	E_ 2
+	F# 4
+	E_ 4
+	D# 4
+	C# 4
 	octave 4
-	note B_, 12
+	B_ 12
 	octave 5
-	note C#, 2
-	note D#, 2
-	note C#, 4
+	C# 2
+	D# 2
+	C# 4
 	octave 4
-	note B_, 4
-	note A_, 4
-	note G#, 4
-	note A_, 12
-	note B_, 2
+	B_ 4
+	A_ 4
+	G# 4
+	A_ 12
+	B_ 2
 	octave 5
-	note C_, 2
-	note C_, 4
+	C_ 2
+	C_ 4
 	octave 4
-	note B_, 4
-	note A_, 4
-	note F#, 4
+	B_ 4
+	A_ 4
+	F# 4
 	notetype 12, 11, 7
-	note A_, 8
+	A_ 8
 	octave 5
-	note C_, 8
+	C_ 8
 	octave 4
-	note B_, 14
+	B_ 14
 	notetype 12, 8, 4
-	note G#, 1
+	G# 1
 	notetype 12, 10, 4
-	note A_, 1
+	A_ 1
 	loopchannel 0, Music_Cities1_Ch2
 
 Music_Cities1_branch_ac00::
@@ -363,41 +363,41 @@
 	duty 2
 	notetype 12, 12, 3
 	octave 4
-	note B_, 4
-	note A_, 4
+	B_ 4
+	A_ 4
 	notetype 12, 12, 4
-	note G#, 10
+	G# 10
 	notetype 12, 12, 3
-	note G#, 2
-	note A_, 2
-	note B_, 4
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note A_, 2
+	G# 2
+	A_ 2
+	B_ 4
+	B_ 2
+	A_ 2
+	G# 2
+	A_ 2
 	notetype 12, 12, 4
-	note F#, 10
+	F# 10
 	notetype 12, 12, 5
 	duty 3
 	octave 3
-	note E_, 4
-	note D#, 8
-	note E_, 4
-	note F#, 4
+	E_ 4
+	D# 8
+	E_ 4
+	F# 4
 	notetype 12, 12, 3
 	duty 2
 	octave 4
-	note A_, 4
-	note G#, 4
+	A_ 4
+	G# 4
 	notetype 12, 12, 4
-	note F#, 10
+	F# 10
 	notetype 12, 12, 3
-	note F#, 2
-	note G#, 2
-	note A_, 4
-	note A_, 2
-	note G#, 2
-	note F#, 2
+	F# 2
+	G# 2
+	A_ 4
+	A_ 2
+	G# 2
+	F# 2
 	endchannel
 
 
@@ -411,171 +411,171 @@
 	callchannel Music_Cities1_branch_acc5
 	callchannel Music_Cities1_branch_acc5
 	callchannel Music_Cities1_branch_acce
-	note G#, 2
-	note E_, 2
-	note F#, 2
-	note G#, 2
+	G# 2
+	E_ 2
+	F# 2
+	G# 2
 	rest 2
-	note E_, 2
-	note F#, 2
-	note G#, 2
+	E_ 2
+	F# 2
+	G# 2
 	callchannel Music_Cities1_branch_acc5
-	note B_, 2
-	note E_, 2
-	note F#, 2
-	note G#, 2
+	B_ 2
+	E_ 2
+	F# 2
+	G# 2
 	rest 2
-	note E_, 2
-	note F#, 2
-	note G#, 2
+	E_ 2
+	F# 2
+	G# 2
 	callchannel Music_Cities1_branch_acc5
 	callchannel Music_Cities1_branch_acce
-	note G#, 2
-	note E_, 2
-	note F#, 2
-	note G#, 2
+	G# 2
+	E_ 2
+	F# 2
+	G# 2
 	rest 2
-	note G#, 2
-	note E_, 2
-	note B_, 2
+	G# 2
+	E_ 2
+	B_ 2
 	rest 2
-	note E_, 2
-	note F#, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
+	E_ 2
+	F# 2
+	E_ 2
+	G# 2
+	E_ 2
+	B_ 2
+	E_ 2
 	vibrato 8, 2, 5
-	note A_, 8
-	note E_, 8
-	note A_, 8
-	note F#, 8
-	note G#, 8
-	note E_, 8
-	note G#, 12
-	note E_, 4
-	note F#, 2
-	note F#, 2
-	note D#, 2
-	note E_, 4
-	note F#, 2
-	note D#, 2
-	note E_, 2
-	note F#, 2
-	note F#, 2
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note G#, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
+	A_ 8
+	E_ 8
+	A_ 8
+	F# 8
+	G# 8
+	E_ 8
+	G# 12
+	E_ 4
+	F# 2
+	F# 2
+	D# 2
+	E_ 4
+	F# 2
+	D# 2
+	E_ 2
+	F# 2
+	F# 2
+	B_ 2
+	A_ 2
+	G# 2
+	A_ 2
+	G# 2
+	F# 2
+	G# 2
+	G# 2
+	E_ 2
+	G# 2
 	rest 2
-	note E_, 2
-	note F#, 2
-	note G#, 2
+	E_ 2
+	F# 2
+	G# 2
 	rest 2
-	note E_, 2
-	note F#, 2
-	note G#, 2
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note A_, 8
-	note E_, 8
-	note A_, 8
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note G#, 8
-	note E_, 8
-	note B_, 4
-	note E_, 4
-	note F#, 4
-	note G#, 4
+	E_ 2
+	F# 2
+	G# 2
+	B_ 2
+	A_ 2
+	G# 2
+	F# 2
+	A_ 8
+	E_ 8
+	A_ 8
+	B_ 2
+	A_ 2
+	G# 2
+	F# 2
+	G# 8
+	E_ 8
+	B_ 4
+	E_ 4
+	F# 4
+	G# 4
 	rest 2
-	note D#, 2
-	note E_, 2
-	note F#, 2
+	D# 2
+	E_ 2
+	F# 2
 	rest 2
-	note F#, 2
-	note B_, 2
-	note A_, 2
-	note A_, 4
-	note G#, 4
-	note F#, 2
-	note D#, 2
-	note A_, 2
-	note F#, 2
+	F# 2
+	B_ 2
+	A_ 2
+	A_ 4
+	G# 4
+	F# 2
+	D# 2
+	A_ 2
+	F# 2
 	rest 2
-	note E_, 2
-	note F#, 2
-	note G#, 2
+	E_ 2
+	F# 2
+	G# 2
 	rest 2
-	note E_, 2
-	note F#, 1
-	note G#, 1
-	note E_, 1
-	note F#, 1
-	note G#, 4
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
+	E_ 2
+	F# 1
+	G# 1
+	E_ 1
+	F# 1
+	G# 4
+	B_ 2
+	A_ 2
+	G# 2
+	A_ 2
+	G# 2
+	F# 2
 	loopchannel 0, Music_Cities1_branch_ac35
 
 Music_Cities1_branch_acc5::
 	rest 2
-	note E_, 2
-	note F#, 2
-	note G#, 2
+	E_ 2
+	F# 2
+	G# 2
 	rest 2
-	note E_, 2
-	note F#, 2
-	note G#, 2
+	E_ 2
+	F# 2
+	G# 2
 	endchannel
 
 Music_Cities1_branch_acce::
-	note A_, 2
-	note F#, 2
-	note G#, 2
-	note A_, 2
+	A_ 2
+	F# 2
+	G# 2
+	A_ 2
 	rest 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
+	A_ 2
+	G# 2
+	F# 2
 	rest 2
-	note F#, 2
-	note G#, 2
-	note A_, 2
+	F# 2
+	G# 2
+	A_ 2
 	rest 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note D#, 2
-	note D#, 2
-	note E_, 2
-	note F#, 2
+	A_ 2
+	G# 2
+	F# 2
+	D# 2
+	D# 2
+	E_ 2
+	F# 2
 	rest 2
-	note D#, 2
-	note E_, 2
-	note F#, 2
+	D# 2
+	E_ 2
+	F# 2
 	rest 2
-	note D#, 2
-	note E_, 2
-	note F#, 2
+	D# 2
+	E_ 2
+	F# 2
 	rest 2
-	note D#, 2
-	note E_, 2
-	note F#, 2
+	D# 2
+	E_ 2
+	F# 2
 	endchannel
 
 
@@ -591,68 +591,68 @@
 	callchannel Music_Cities1_branch_ad36
 	callchannel Music_Cities1_branch_ad5f
 	callchannel Music_Cities1_branch_ad52
-	dnote 6, triangle1
-	dnote 6, triangle1
-	dnote 4, triangle2
+	triangle1 6
+	triangle1 6
+	triangle2 4
 	callchannel Music_Cities1_branch_ad6e
 	callchannel Music_Cities1_branch_ad5f
 	callchannel Music_Cities1_branch_ad52
 	callchannel Music_Cities1_branch_ad6e
 	callchannel Music_Cities1_branch_ad52
-	dnote 6, triangle1
-	dnote 6, triangle1
-	dnote 2, triangle2
-	dnote 2, triangle1
-	dnote 6, triangle1
-	dnote 6, triangle1
-	dnote 4, triangle1
-	dnote 6, triangle1
-	dnote 6, snare6
-	dnote 4, snare6
+	triangle1 6
+	triangle1 6
+	triangle2 2
+	triangle1 2
+	triangle1 6
+	triangle1 6
+	triangle1 4
+	triangle1 6
+	snare6 6
+	snare6 4
 	loopchannel 0, Music_Cities1_Ch4
 
 Music_Cities1_branch_ad36::
-	dnote 6, snare6
-	dnote 6, snare6
-	dnote 4, snare6
-	dnote 6, snare6
-	dnote 6, snare6
-	dnote 2, snare6
-	dnote 2, snare6
+	snare6 6
+	snare6 6
+	snare6 4
+	snare6 6
+	snare6 6
+	snare6 2
+	snare6 2
 	endchannel
 
 Music_Cities1_branch_ad45::
-	dnote 6, snare6
-	dnote 6, snare6
-	dnote 4, snare6
-	dnote 6, snare6
-	dnote 6, snare6
-	dnote 4, snare6
+	snare6 6
+	snare6 6
+	snare6 4
+	snare6 6
+	snare6 6
+	snare6 4
 	endchannel
 
 Music_Cities1_branch_ad52::
-	dnote 6, triangle1
-	dnote 6, triangle1
-	dnote 4, triangle2
-	dnote 6, triangle1
-	dnote 6, triangle1
-	dnote 4, triangle2
+	triangle1 6
+	triangle1 6
+	triangle2 4
+	triangle1 6
+	triangle1 6
+	triangle2 4
 	endchannel
 
 Music_Cities1_branch_ad5f::
-	dnote 6, triangle1
-	dnote 6, triangle1
-	dnote 4, triangle2
-	dnote 6, triangle1
-	dnote 6, triangle1
-	dnote 2, triangle2
-	dnote 2, triangle1
+	triangle1 6
+	triangle1 6
+	triangle2 4
+	triangle1 6
+	triangle1 6
+	triangle2 2
+	triangle1 2
 	endchannel
 
 Music_Cities1_branch_ad6e::
-	dnote 6, triangle1
-	dnote 6, triangle1
-	dnote 2, triangle2
-	dnote 2, triangle2
+	triangle1 6
+	triangle1 6
+	triangle2 2
+	triangle2 2
 	endchannel
-; 0xad77
\ No newline at end of file
+; 0xad77
--- a/audio/music/cities2.asm
+++ b/audio/music/cities2.asm
@@ -7,89 +7,89 @@
 	notetype 12, 11, 6
 	rest 8
 	octave 3
-	note E_, 2
-	note D#, 2
-	note C#, 2
-	note C_, 2
+	E_ 2
+	D# 2
+	C# 2
+	C_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	rest 14
 
 Music_Cities2_branch_b51a::
 	octave 3
-	note B_, 4
+	B_ 4
 	octave 4
-	note C#, 2
-	note D#, 1
-	note D_, 1
-	note C#, 4
+	C# 2
+	D# 1
+	D_ 1
+	C# 4
 	octave 3
-	note B_, 4
-	note G#, 8
-	note E_, 8
-	note A_, 4
-	note G#, 2
-	note F#, 2
-	note G#, 2
-	note A_, 2
-	note B_, 2
+	B_ 4
+	G# 8
+	E_ 8
+	A_ 4
+	G# 2
+	F# 2
+	G# 2
+	A_ 2
+	B_ 2
 	octave 4
-	note C#, 2
+	C# 2
 	rest 16
-	note C#, 4
+	C# 4
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note C#, 1
-	note D#, 1
-	note C#, 4
+	C# 1
+	D# 1
+	C# 4
 	octave 3
-	note B_, 4
-	note E_, 1
-	note E_, 1
-	note E_, 1
-	note E_, 1
-	note E_, 1
+	B_ 4
+	E_ 1
+	E_ 1
+	E_ 1
+	E_ 1
+	E_ 1
 	rest 3
-	note G#, 8
-	note B_, 4
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note G#, 2
-	note A_, 2
-	note B_, 2
-	note E_, 2
-	note F#, 2
-	note G#, 2
+	G# 8
+	B_ 4
+	A_ 2
+	G# 2
+	F# 2
+	G# 2
+	A_ 2
+	B_ 2
+	E_ 2
+	F# 2
+	G# 2
 	rest 2
 	octave 4
-	note E_, 4
+	E_ 4
 	octave 3
-	note B_, 4
-	note F#, 2
-	note G#, 2
-	note A_, 2
+	B_ 4
+	F# 2
+	G# 2
+	A_ 2
 	rest 2
 	octave 4
-	note F#, 4
-	note D#, 4
+	F# 4
+	D# 4
 	octave 3
-	note E_, 2
+	E_ 2
 	rest 4
-	note F#, 2
+	F# 2
 	rest 4
-	note A_, 2
+	A_ 2
 	rest 2
-	note B_, 2
+	B_ 2
 	rest 16
 	rest 16
 	rest 14
-	note E_, 16
-	note F#, 8
-	note G#, 4
-	note F#, 4
-	note E_, 2
+	E_ 16
+	F# 8
+	G# 4
+	F# 4
+	E_ 2
 	rest 14
 	loopchannel 0, Music_Cities2_branch_b51a
 
@@ -99,184 +99,184 @@
 	vibrato 8, 2, 3
 	notetype 12, 12, 2
 	octave 4
-	note E_, 2
-	note D#, 2
-	note C#, 2
+	E_ 2
+	D# 2
+	C# 2
 	octave 3
-	note B_, 2
-	note A_, 2
-	note B_, 2
+	B_ 2
+	A_ 2
+	B_ 2
 	octave 4
-	note C#, 2
-	note D#, 2
-	note E_, 6
+	C# 2
+	D# 2
+	E_ 6
 	notetype 12, 12, 2
 	duty 2
 	octave 4
-	note E_, 1
+	E_ 1
 	octave 3
-	note B_, 1
+	B_ 1
 	octave 4
-	note C#, 2
-	note D#, 2
-	note E_, 1
-	note F#, 1
-	note G#, 1
-	note A_, 1
+	C# 2
+	D# 2
+	E_ 1
+	F# 1
+	G# 1
+	A_ 1
 
 Music_Cities2_branch_b58b::
 	notetype 12, 10, 6
-	note G#, 6
+	G# 6
 	notetype 12, 12, 2
-	note A_, 1
-	note G#, 1
+	A_ 1
+	G# 1
 	notetype 12, 12, 4
-	note F#, 14
+	F# 14
 	notetype 12, 12, 2
-	note E_, 1
+	E_ 1
 	octave 3
-	note B_, 1
+	B_ 1
 	octave 4
-	note C#, 2
-	note D#, 2
-	note E_, 1
-	note F#, 1
-	note G#, 1
-	note A_, 1
+	C# 2
+	D# 2
+	E_ 1
+	F# 1
+	G# 1
+	A_ 1
 	notetype 12, 12, 4
-	note G#, 6
+	G# 6
 	notetype 12, 12, 2
-	note E_, 1
-	note G#, 1
+	E_ 1
+	G# 1
 	notetype 12, 12, 5
-	note B_, 14
+	B_ 14
 	notetype 12, 12, 2
-	note E_, 1
+	E_ 1
 	octave 3
-	note B_, 1
+	B_ 1
 	octave 4
-	note C#, 2
-	note D#, 2
-	note E_, 1
-	note F#, 1
-	note G#, 1
-	note A_, 1
+	C# 2
+	D# 2
+	E_ 1
+	F# 1
+	G# 1
+	A_ 1
 	notetype 12, 10, 6
-	note G#, 6
+	G# 6
 	notetype 12, 12, 2
-	note A_, 1
-	note G#, 1
+	A_ 1
+	G# 1
 	notetype 12, 12, 4
-	note F#, 8
+	F# 8
 	notetype 12, 10, 1
 	duty 1
 	octave 3
-	note G#, 1
-	note G#, 1
-	note G#, 1
-	note G#, 1
-	note G#, 1
+	G# 1
+	G# 1
+	G# 1
+	G# 1
+	G# 1
 	rest 1
 	notetype 12, 12, 2
 	duty 2
 	octave 4
-	note E_, 1
+	E_ 1
 	octave 3
-	note B_, 1
+	B_ 1
 	octave 4
-	note C#, 2
-	note D#, 2
-	note E_, 1
-	note F#, 1
-	note G#, 1
-	note A_, 1
+	C# 2
+	D# 2
+	E_ 1
+	F# 1
+	G# 1
+	A_ 1
 	notetype 12, 12, 4
-	note G#, 6
-	note E_, 1
-	note G#, 1
+	G# 6
+	E_ 1
+	G# 1
 	notetype 12, 12, 6
-	note B_, 8
+	B_ 8
 	notetype 12, 12, 2
-	note C#, 1
+	C# 1
 	octave 3
-	note B_, 1
+	B_ 1
 	octave 4
-	note C#, 1
-	note D#, 1
-	note E_, 4
+	C# 1
+	D# 1
+	E_ 4
 	notetype 12, 12, 7
-	note G#, 4
-	note E_, 4
+	G# 4
+	E_ 4
 	notetype 12, 12, 2
-	note D#, 1
-	note C#, 1
-	note D#, 1
-	note E_, 1
-	note F#, 4
+	D# 1
+	C# 1
+	D# 1
+	E_ 1
+	F# 4
 	notetype 12, 12, 7
-	note B_, 4
-	note F#, 4
+	B_ 4
+	F# 4
 	notetype 12, 12, 2
-	note C#, 1
+	C# 1
 	octave 3
-	note B_, 1
+	B_ 1
 	octave 4
-	note C#, 1
-	note D#, 1
-	note E_, 2
-	note E_, 1
-	note D#, 1
-	note E_, 1
-	note F#, 1
-	note G#, 2
-	note G#, 1
-	note A_, 1
-	note G#, 1
-	note A_, 1
-	note B_, 1
-	note F#, 1
-	note D#, 1
-	note C#, 1
+	C# 1
+	D# 1
+	E_ 2
+	E_ 1
+	D# 1
+	E_ 1
+	F# 1
+	G# 2
+	G# 1
+	A_ 1
+	G# 1
+	A_ 1
+	B_ 1
+	F# 1
+	D# 1
+	C# 1
 	octave 3
-	note B_, 1
+	B_ 1
 	octave 4
-	note C#, 1
-	note D#, 1
-	note F#, 1
+	C# 1
+	D# 1
+	F# 1
 	notetype 12, 12, 2
-	note B_, 8
+	B_ 8
 	notetype 12, 11, 7
 	octave 3
-	note E_, 8
+	E_ 8
 	octave 2
-	note B_, 4
+	B_ 4
 	octave 3
-	note F#, 4
-	note G#, 4
-	note A_, 4
-	note B_, 8
-	note B_, 8
-	note G#, 4
+	F# 4
+	G# 4
+	A_ 4
+	B_ 8
+	B_ 8
+	G# 4
 	octave 4
-	note D#, 4
-	note C#, 4
-	note D#, 4
-	note E_, 2
-	note D#, 2
-	note C#, 2
-	note D#, 2
+	D# 4
+	C# 4
+	D# 4
+	E_ 2
+	D# 2
+	C# 2
+	D# 2
 	notetype 12, 12, 2
-	note E_, 6
-	note E_, 1
+	E_ 6
+	E_ 1
 	octave 3
-	note B_, 1
+	B_ 1
 	octave 4
-	note C#, 2
-	note D#, 2
-	note E_, 1
-	note F#, 1
-	note G#, 1
-	note A_, 1
+	C# 2
+	D# 2
+	E_ 1
+	F# 1
+	G# 1
+	A_ 1
 	loopchannel 0, Music_Cities2_branch_b58b
 
 
@@ -284,134 +284,134 @@
 	notetype 12, 1, 1
 	rest 16
 	octave 4
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
+	E_ 2
+	G# 2
+	E_ 2
+	G# 2
+	E_ 2
+	G# 2
+	E_ 2
+	G# 2
 
 Music_Cities2_branch_b64c::
-	note F#, 2
-	note A_, 2
-	note F#, 2
-	note A_, 2
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note F#, 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 B_, 2
-	note A_, 2
-	note G#, 2
-	note F#, 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 B_, 2
-	note A_, 2
-	note G#, 2
-	note F#, 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 B_, 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
+	F# 2
+	A_ 2
+	F# 2
+	A_ 2
+	B_ 2
+	A_ 2
+	G# 2
+	F# 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
+	B_ 2
+	A_ 2
+	G# 2
+	F# 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
+	B_ 2
+	A_ 2
+	G# 2
+	F# 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
+	B_ 2
+	A_ 2
+	G# 2
+	F# 2
+	E_ 2
+	G# 2
+	E_ 2
 	rest 2
-	note E_, 4
-	note G#, 4
-	note F#, 2
-	note A_, 2
-	note F#, 2
+	E_ 4
+	G# 4
+	F# 2
+	A_ 2
+	F# 2
 	rest 2
-	note F#, 4
-	note A_, 4
-	note C#, 2
+	F# 4
+	A_ 4
+	C# 2
 	rest 4
-	note E_, 2
+	E_ 2
 	rest 4
-	note G#, 2
-	note A_, 2
-	note B_, 2
+	G# 2
+	A_ 2
+	B_ 2
 	rest 8
-	note A_, 2
-	note G#, 2
-	note F#, 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 B_, 2
-	note A_, 2
-	note G#, 2
-	note F#, 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 B_, 2
-	note A_, 2
-	note G#, 2
-	note F#, 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
+	A_ 2
+	G# 2
+	F# 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
+	B_ 2
+	A_ 2
+	G# 2
+	F# 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
+	B_ 2
+	A_ 2
+	G# 2
+	F# 2
+	E_ 2
+	G# 2
+	E_ 2
+	G# 2
+	E_ 2
+	G# 2
+	E_ 2
+	G# 2
 	loopchannel 0, Music_Cities2_branch_b64c
-; 0xb6c7
\ No newline at end of file
+; 0xb6c7
--- a/audio/music/credits.asm
+++ b/audio/music/credits.asm
@@ -6,281 +6,281 @@
 	toggleperfectpitch
 	notetype 12, 11, 5
 	octave 4
-	note E_, 6
+	E_ 6
 	octave 3
-	note A_, 1
+	A_ 1
 	octave 4
-	note E_, 1
-	note D_, 6
+	E_ 1
+	D_ 6
 	octave 3
-	note G_, 1
+	G_ 1
 	octave 4
-	note D_, 1
-	note C#, 6
+	D_ 1
+	C# 6
 	octave 3
-	note F#, 1
+	F# 1
 	octave 4
-	note C#, 1
-	note D_, 4
-	note E_, 2
-	note C#, 1
-	note E_, 1
-	note C#, 1
+	C# 1
+	D_ 4
+	E_ 2
+	C# 1
+	E_ 1
+	C# 1
 	rest 1
 	octave 3
-	note E_, 1
+	E_ 1
 	rest 3
-	note E_, 1
-	note E_, 1
-	note E_, 1
+	E_ 1
+	E_ 1
+	E_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 3
-	note E_, 1
-	note E_, 1
-	note E_, 1
+	E_ 1
+	E_ 1
+	E_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note E_, 1
-	note E_, 1
-	note F#, 1
-	note G_, 1
+	E_ 1
+	E_ 1
+	F# 1
+	G_ 1
 	notetype 12, 11, 6
-	note A_, 4
-	note E_, 2
-	note A_, 2
-	note G_, 4
-	note A_, 2
-	note G_, 2
-	note B_, 4
-	note A_, 4
-	note G_, 2
-	note F#, 2
-	note E_, 2
-	note D_, 2
-	note C#, 6
-	note E_, 2
-	note A_, 4
-	note C#, 4
-	note E_, 4
-	note D_, 2
-	note C#, 2
-	note E_, 2
-	note F#, 2
-	note G_, 2
-	note F#, 2
-	note A_, 4
-	note E_, 2
-	note A_, 2
-	note G_, 4
-	note A_, 2
-	note G_, 2
-	note B_, 4
-	note A_, 4
-	note G_, 2
-	note A_, 2
-	note F#, 2
-	note D_, 2
-	note E_, 6
-	note C#, 2
-	note A_, 4
-	note C#, 4
-	note E_, 4
-	note D_, 2
-	note C#, 2
-	note E_, 2
-	note F#, 2
-	note G_, 2
-	note F#, 2
-	note G_, 4
-	note D_, 2
-	note G_, 2
-	note B_, 2
-	note A_, 2
-	note G_, 2
-	note A_, 2
-	note D_, 4
-	note E_, 2
-	note F#, 2
-	note G_, 2
-	note F#, 2
-	note E_, 2
-	note D_, 2
-	note E_, 6
-	note A_, 2
-	note G_, 4
-	note F#, 4
-	note G_, 4
-	note F#, 4
-	note E_, 4
-	note D_, 4
-	note G_, 4
-	note D_, 2
-	note G_, 2
-	note B_, 2
+	A_ 4
+	E_ 2
+	A_ 2
+	G_ 4
+	A_ 2
+	G_ 2
+	B_ 4
+	A_ 4
+	G_ 2
+	F# 2
+	E_ 2
+	D_ 2
+	C# 6
+	E_ 2
+	A_ 4
+	C# 4
+	E_ 4
+	D_ 2
+	C# 2
+	E_ 2
+	F# 2
+	G_ 2
+	F# 2
+	A_ 4
+	E_ 2
+	A_ 2
+	G_ 4
+	A_ 2
+	G_ 2
+	B_ 4
+	A_ 4
+	G_ 2
+	A_ 2
+	F# 2
+	D_ 2
+	E_ 6
+	C# 2
+	A_ 4
+	C# 4
+	E_ 4
+	D_ 2
+	C# 2
+	E_ 2
+	F# 2
+	G_ 2
+	F# 2
+	G_ 4
+	D_ 2
+	G_ 2
+	B_ 2
+	A_ 2
+	G_ 2
+	A_ 2
+	D_ 4
+	E_ 2
+	F# 2
+	G_ 2
+	F# 2
+	E_ 2
+	D_ 2
+	E_ 6
+	A_ 2
+	G_ 4
+	F# 4
+	G_ 4
+	F# 4
+	E_ 4
+	D_ 4
+	G_ 4
+	D_ 2
+	G_ 2
+	B_ 2
 	octave 4
-	note C#, 2
+	C# 2
 	octave 3
-	note B_, 2
-	note A_, 2
-	note D_, 4
-	note E_, 2
-	note F#, 2
-	note G_, 2
-	note F#, 2
-	note E_, 2
-	note D_, 2
+	B_ 2
+	A_ 2
+	D_ 4
+	E_ 2
+	F# 2
+	G_ 2
+	F# 2
+	E_ 2
+	D_ 2
 	notetype 12, 11, 7
-	note E_, 6
-	note A_, 2
-	note G_, 4
-	note F#, 4
+	E_ 6
+	A_ 2
+	G_ 4
+	F# 4
 	notetype 12, 12, 7
-	note A_, 4
-	note B_, 4
+	A_ 4
+	B_ 4
 	octave 4
-	note C#, 4
-	note D_, 4
+	C# 4
+	D_ 4
 	octave 3
-	note B_, 2
-	note A_, 2
-	note G_, 2
-	note F#, 2
-	note E_, 2
-	note F#, 2
-	note G_, 2
-	note A_, 2
+	B_ 2
+	A_ 2
+	G_ 2
+	F# 2
+	E_ 2
+	F# 2
+	G_ 2
+	A_ 2
 	notetype 12, 9, 0
-	note G_, 8
-	note F#, 8
-	note E_, 8
-	note D_, 8
+	G_ 8
+	F# 8
+	E_ 8
+	D_ 8
 	rest 16
 	rest 16
 	rest 8
 	notetype 12, 11, 6
-	note E_, 6
-	note D#, 1
-	note D_, 1
+	E_ 6
+	D# 1
+	D_ 1
 	notetype 12, 10, 0
-	note C#, 8
+	C# 8
 	notetype 12, 10, 7
-	note C#, 8
+	C# 8
 	rest 16
 	rest 16
 	rest 8
-	note E_, 6
-	note C#, 1
-	note E_, 1
+	E_ 6
+	C# 1
+	E_ 1
 	notetype 12, 10, 0
-	note A_, 8
+	A_ 8
 	notetype 12, 10, 7
-	note A_, 8
+	A_ 8
 	notetype 12, 11, 6
-	note G_, 6
-	note D_, 4
-	note G_, 2
-	note B_, 4
+	G_ 6
+	D_ 4
+	G_ 2
+	B_ 4
 	notetype 12, 11, 7
-	note G_, 8
-	note F#, 4
-	note G#, 4
+	G_ 8
+	F# 4
+	G# 4
 	notetype 12, 9, 0
-	note A_, 8
-	note F#, 8
-	note E_, 8
-	note C#, 8
+	A_ 8
+	F# 8
+	E_ 8
+	C# 8
 	notetype 12, 11, 7
-	note D_, 8
-	note C#, 8
+	D_ 8
+	C# 8
 	octave 2
-	note B_, 8
+	B_ 8
 	octave 3
-	note D_, 8
+	D_ 8
 	notetype 12, 9, 0
-	note E_, 8
-	note D_, 8
-	note F#, 8
-	note E_, 8
+	E_ 8
+	D_ 8
+	F# 8
+	E_ 8
 	notetype 12, 10, 0
-	note D_, 8
-	note E_, 8
-	note D_, 8
-	note C_, 8
-	note G_, 8
-	note F_, 8
-	note E_, 8
-	note D_, 8
+	D_ 8
+	E_ 8
+	D_ 8
+	C_ 8
+	G_ 8
+	F_ 8
+	E_ 8
+	D_ 8
 	notetype 12, 10, 0
-	note C#, 6
+	C# 6
 	notetype 12, 10, 7
-	note C#, 6
+	C# 6
 	notetype 12, 11, 7
-	note D_, 4
-	note E_, 8
-	note G_, 6
-	note F#, 1
-	note F_, 1
+	D_ 4
+	E_ 8
+	G_ 6
+	F# 1
+	F_ 1
 	notetype 12, 10, 0
-	note E_, 6
+	E_ 6
 	notetype 12, 10, 7
-	note E_, 6
+	E_ 6
 	notetype 12, 11, 7
-	note D_, 4
+	D_ 4
 	notetype 12, 10, 0
-	note C#, 8
+	C# 8
 	notetype 12, 10, 7
-	note C#, 8
+	C# 8
 	notetype 12, 11, 7
-	note E_, 6
-	note D_, 2
-	note G_, 4
-	note F#, 4
-	note E_, 4
-	note F#, 4
-	note E_, 4
-	note D_, 4
-	note E_, 4
-	note D_, 4
-	note C#, 4
-	note D_, 4
-	note C#, 4
-	note C#, 4
-	note E_, 4
-	note F#, 4
+	E_ 6
+	D_ 2
+	G_ 4
+	F# 4
+	E_ 4
+	F# 4
+	E_ 4
+	D_ 4
+	E_ 4
+	D_ 4
+	C# 4
+	D_ 4
+	C# 4
+	C# 4
+	E_ 4
+	F# 4
 	notetype 12, 10, 0
-	note E_, 6
+	E_ 6
 	notetype 12, 11, 7
-	note D_, 2
-	note G_, 4
-	note F#, 4
-	note E_, 4
-	note F#, 4
-	note A_, 4
-	note B_, 4
+	D_ 2
+	G_ 4
+	F# 4
+	E_ 4
+	F# 4
+	A_ 4
+	B_ 4
 	notetype 12, 10, 0
 	octave 4
-	note C#, 16
-	note C#, 8
+	C# 16
+	C# 8
 	notetype 12, 10, 7
-	note C#, 8
+	C# 8
 	notetype 12, 11, 5
 	octave 3
-	note A_, 1
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 3
-	note A_, 1
-	note A_, 1
+	A_ 1
+	A_ 1
 	notetype 12, 11, 1
-	note A_, 8
+	A_ 8
 	endchannel
 
 
@@ -289,288 +289,288 @@
 	vibrato 10, 2, 5
 	notetype 12, 12, 5
 	octave 4
-	note A_, 6
-	note E_, 1
-	note A_, 1
-	note G_, 6
-	note D_, 1
-	note G_, 1
+	A_ 6
+	E_ 1
+	A_ 1
+	G_ 6
+	D_ 1
+	G_ 1
 	notetype 12, 12, 7
-	note F#, 12
-	note G#, 2
-	note E_, 1
-	note G#, 1
+	F# 12
+	G# 2
+	E_ 1
+	G# 1
 	notetype 12, 12, 2
-	note A_, 2
+	A_ 2
 	notetype 12, 12, 1
 	octave 3
-	note A_, 4
-	note A_, 1
-	note A_, 1
-	note A_, 2
-	note A_, 2
-	note A_, 4
-	note A_, 2
-	note A_, 4
-	note A_, 1
-	note A_, 1
-	note A_, 2
-	note A_, 2
+	A_ 4
+	A_ 1
+	A_ 1
+	A_ 2
+	A_ 2
+	A_ 4
+	A_ 2
+	A_ 4
+	A_ 1
+	A_ 1
+	A_ 2
+	A_ 2
 	notetype 12, 12, 4
-	note A_, 1
-	note F#, 1
-	note A_, 1
-	note B_, 1
+	A_ 1
+	F# 1
+	A_ 1
+	B_ 1
 	notetype 12, 12, 7
 	octave 4
-	note C#, 6
-	note C#, 1
-	note D_, 1
-	note E_, 4
-	note C#, 4
-	note G_, 4
-	note F#, 4
-	note E_, 4
-	note D_, 4
-	note C#, 6
+	C# 6
+	C# 1
+	D_ 1
+	E_ 4
+	C# 4
+	G_ 4
+	F# 4
+	E_ 4
+	D_ 4
+	C# 6
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note E_, 8
+	E_ 8
 	octave 3
-	note A_, 6
-	note E_, 2
+	A_ 6
+	E_ 2
 	octave 4
-	note C#, 8
-	note C#, 6
-	note C#, 1
-	note D_, 1
-	note E_, 4
-	note C#, 4
-	note G_, 4
-	note F#, 4
-	note E_, 4
-	note D_, 4
-	note C#, 6
+	C# 8
+	C# 6
+	C# 1
+	D_ 1
+	E_ 4
+	C# 4
+	G_ 4
+	F# 4
+	E_ 4
+	D_ 4
+	C# 6
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note E_, 8
+	E_ 8
 	octave 3
-	note A_, 6
-	note E_, 2
+	A_ 6
+	E_ 2
 	notetype 12, 11, 0
 	octave 4
-	note C#, 8
+	C# 8
 	notetype 12, 12, 7
-	note D_, 6
+	D_ 6
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note G_, 8
+	G_ 8
 	octave 3
-	note G_, 6
-	note D_, 2
-	note B_, 8
+	G_ 6
+	D_ 2
+	B_ 8
 	notetype 12, 11, 0
 	octave 4
-	note C#, 6
+	C# 6
 	notetype 12, 11, 7
-	note C#, 6
-	note D_, 4
+	C# 6
+	D_ 4
 	notetype 12, 10, 0
-	note E_, 8
+	E_ 8
 	notetype 12, 10, 7
-	note E_, 8
+	E_ 8
 	notetype 12, 12, 7
-	note D_, 6
+	D_ 6
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note G_, 8
+	G_ 8
 	octave 3
-	note G_, 6
-	note D_, 2
-	note B_, 8
+	G_ 6
+	D_ 2
+	B_ 8
 	notetype 12, 11, 0
 	octave 4
-	note E_, 7
+	E_ 7
 	notetype 12, 11, 7
-	note E_, 7
+	E_ 7
 	notetype 12, 12, 3
-	note E_, 1
-	note G#, 1
+	E_ 1
+	G# 1
 	notetype 12, 11, 0
-	note A_, 8
+	A_ 8
 	notetype 12, 11, 7
-	note A_, 8
+	A_ 8
 	notetype 12, 12, 6
-	note G_, 4
-	note F#, 4
-	note E_, 4
-	note D_, 4
+	G_ 4
+	F# 4
+	E_ 4
+	D_ 4
 	notetype 12, 10, 0
-	note C#, 8
+	C# 8
 	notetype 12, 10, 7
-	note C#, 8
+	C# 8
 	notetype 12, 9, 0
 	octave 3
-	note A_, 8
+	A_ 8
 	notetype 12, 9, 7
-	note A_, 8
+	A_ 8
 	notetype 12, 11, 0
-	note E_, 8
+	E_ 8
 	notetype 12, 11, 7
-	note E_, 8
+	E_ 8
 	notetype 12, 12, 7
-	note D_, 8
-	note G_, 6
-	note F#, 1
-	note F_, 1
-	note E_, 8
+	D_ 8
+	G_ 6
+	F# 1
+	F_ 1
+	E_ 8
 	notetype 12, 11, 7
-	note G_, 6
-	note F#, 1
-	note F_, 1
+	G_ 6
+	F# 1
+	F_ 1
 	notetype 12, 11, 0
-	note E_, 8
+	E_ 8
 	notetype 12, 11, 7
-	note E_, 8
+	E_ 8
 	notetype 12, 11, 0
-	note D_, 8
+	D_ 8
 	notetype 12, 11, 7
-	note D_, 8
+	D_ 8
 	notetype 12, 12, 7
 	octave 2
-	note B_, 8
+	B_ 8
 	octave 3
-	note F#, 6
-	note D_, 1
-	note F#, 1
-	note E_, 8
-	note B_, 6
-	note G_, 1
-	note B_, 1
+	F# 6
+	D_ 1
+	F# 1
+	E_ 8
+	B_ 6
+	G_ 1
+	B_ 1
 	notetype 12, 11, 0
 	octave 4
-	note C#, 8
+	C# 8
 	notetype 12, 11, 7
-	note C#, 8
+	C# 8
 	notetype 12, 11, 0
-	note D_, 8
+	D_ 8
 	notetype 12, 11, 7
-	note D_, 8
+	D_ 8
 	notetype 12, 12, 7
 	octave 3
-	note B_, 8
+	B_ 8
 	octave 4
-	note D_, 6
+	D_ 6
 	octave 3
-	note B_, 1
+	B_ 1
 	octave 4
-	note D_, 1
+	D_ 1
 	notetype 12, 11, 0
-	note C#, 6
+	C# 6
 	notetype 12, 11, 7
-	note C#, 6
+	C# 6
 	notetype 12, 12, 7
 	octave 3
-	note B_, 4
+	B_ 4
 	notetype 12, 11, 0
-	note A_, 8
+	A_ 8
 	notetype 12, 11, 7
-	note A_, 8
+	A_ 8
 	notetype 12, 11, 0
-	note F#, 6
+	F# 6
 	notetype 12, 11, 7
-	note F#, 6
+	F# 6
 	notetype 12, 12, 7
-	note G#, 4
-	note A_, 8
-	note F#, 8
+	G# 4
+	A_ 8
+	F# 8
 	notetype 12, 11, 0
-	note G#, 6
+	G# 6
 	notetype 12, 11, 7
-	note G#, 6
+	G# 6
 	notetype 12, 12, 7
-	note A_, 4
-	note B_, 8
-	note G#, 8
+	A_ 4
+	B_ 8
+	G# 8
 	notetype 12, 11, 0
-	note A_, 6
+	A_ 6
 	notetype 12, 11, 7
-	note A_, 6
+	A_ 6
 	notetype 12, 12, 7
-	note B_, 4
+	B_ 4
 	octave 4
-	note C_, 8
+	C_ 8
 	octave 3
-	note A_, 8
+	A_ 8
 	notetype 12, 11, 0
-	note B_, 6
+	B_ 6
 	notetype 12, 11, 7
-	note B_, 6
+	B_ 6
 	notetype 12, 12, 7
 	octave 4
-	note C_, 4
+	C_ 4
 	notetype 12, 11, 0
-	note D_, 8
+	D_ 8
 	octave 3
-	note B_, 8
+	B_ 8
 	notetype 12, 11, 0
 	octave 4
-	note C#, 16
-	note C#, 8
+	C# 16
+	C# 8
 	notetype 12, 11, 7
-	note C#, 8
+	C# 8
 	notetype 12, 11, 0
 	octave 3
-	note A_, 16
-	note A_, 8
+	A_ 16
+	A_ 8
 	notetype 12, 11, 7
-	note A_, 8
+	A_ 8
 	notetype 12, 12, 7
-	note G_, 6
-	note B_, 2
+	G_ 6
+	B_ 2
 	octave 4
-	note D_, 8
+	D_ 8
 	octave 3
-	note B_, 6
+	B_ 6
 	octave 4
-	note D_, 2
-	note G_, 6
-	note F#, 1
-	note F_, 1
-	note E_, 8
+	D_ 2
+	G_ 6
+	F# 1
+	F_ 1
+	E_ 8
 	octave 3
-	note G_, 6
-	note F#, 1
-	note F_, 1
-	note E_, 8
-	note C#, 4
-	note D_, 4
-	note G_, 6
-	note B_, 2
+	G_ 6
+	F# 1
+	F_ 1
+	E_ 8
+	C# 4
+	D_ 4
+	G_ 6
+	B_ 2
 	octave 4
-	note D_, 8
+	D_ 8
 	octave 3
-	note B_, 6
+	B_ 6
 	octave 4
-	note D_, 2
-	note G_, 8
+	D_ 2
+	G_ 8
 	notetype 12, 11, 0
-	note A_, 16
+	A_ 16
 	notetype 12, 10, 0
-	note A_, 8
+	A_ 8
 	notetype 12, 10, 7
-	note A_, 8
+	A_ 8
 	notetype 12, 12, 1
-	note A_, 2
-	note A_, 4
-	note A_, 1
-	note A_, 1
+	A_ 2
+	A_ 4
+	A_ 1
+	A_ 1
 	notetype 12, 12, 1
-	note A_, 8
+	A_ 8
 	endchannel
 
 
@@ -577,24 +577,24 @@
 Music_Credits_Ch3:: ; 7fec2 (1f:7ec2)
 	notetype 12, 1, 0
 	octave 5
-	note C#, 6
+	C# 6
 	octave 4
-	note A_, 1
+	A_ 1
 	octave 5
-	note C#, 1
-	note D_, 6
+	C# 1
+	D_ 6
 	octave 4
-	note B_, 1
+	B_ 1
 	octave 5
-	note D_, 1
-	note F#, 6
-	note D_, 1
-	note F#, 1
-	note A_, 4
-	note G#, 2
-	note E_, 1
-	note G#, 1
-	note A_, 1
+	D_ 1
+	F# 6
+	D_ 1
+	F# 1
+	A_ 4
+	G# 2
+	E_ 1
+	G# 1
+	A_ 1
 	rest 15
 	rest 16
 	callchannel Music_Credits_branch_7ffa4
@@ -601,14 +601,14 @@
 	callchannel Music_Credits_branch_7ffae
 	callchannel Music_Credits_branch_7ffa4
 	octave 4
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note F#, 2
-	note G_, 2
-	note A_, 2
+	E_ 2
+	A_ 2
+	E_ 2
+	A_ 2
+	E_ 2
+	F# 2
+	G_ 2
+	A_ 2
 	callchannel Music_Credits_branch_7ffa4
 	callchannel Music_Credits_branch_7ffae
 	callchannel Music_Credits_branch_7ffa4
@@ -617,30 +617,30 @@
 	callchannel Music_Credits_branch_7ffb8
 	callchannel Music_Credits_branch_7ffc1
 	octave 4
-	note A_, 2
+	A_ 2
 	octave 5
-	note C#, 2
+	C# 2
 	octave 4
-	note A_, 2
+	A_ 2
 	octave 5
-	note C#, 2
+	C# 2
 	octave 4
-	note A_, 2
+	A_ 2
 	octave 5
-	note C#, 2
+	C# 2
 	octave 4
-	note B_, 2
-	note A_, 2
+	B_ 2
+	A_ 2
 	callchannel Music_Credits_branch_7ffb8
 	callchannel Music_Credits_branch_7ffb8
 	callchannel Music_Credits_branch_7ffc1
 	callchannel Music_Credits_branch_7ffc1
 	octave 4
-	note G_, 4
-	note A_, 4
-	note B_, 4
+	G_ 4
+	A_ 4
+	B_ 4
 	octave 5
-	note D_, 4
+	D_ 4
 	callchannel Music_Credits_branch_7ffa4
 	callchannel Music_Credits_branch_7ffa4
 	callchannel Music_Credits_branch_7ffa4
@@ -650,53 +650,53 @@
 	callchannel Music_Credits_branch_7ffae
 	callchannel Music_Credits_branch_7ffae
 	callchannel Music_Credits_branch_7ffa4
-	note E_, 4
-	note A_, 2
-	note E_, 4
-	note A_, 2
-	note E_, 2
-	note A_, 2
+	E_ 4
+	A_ 2
+	E_ 4
+	A_ 2
+	E_ 2
+	A_ 2
 	callchannel Music_Credits_branch_7ffae
 	callchannel Music_Credits_branch_7ffae
 	callchannel Music_Credits_branch_7ffa4
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note G#, 2
-	note A_, 2
+	E_ 2
+	A_ 2
+	E_ 2
+	A_ 2
+	E_ 2
+	A_ 2
+	G# 2
+	A_ 2
 	callchannel Music_Credits_branch_7ffd2
 	callchannel Music_Credits_branch_7ffd2
 	callchannel Music_Credits_branch_7ffdb
 	callchannel Music_Credits_branch_7ffdb
-	note F_, 2
-	note A_, 2
-	note F_, 2
-	note A_, 2
-	note F_, 2
-	note A_, 2
-	note F_, 2
-	note A_, 2
-	note F_, 2
-	note A_, 2
-	note G_, 2
-	note F_, 2
-	note E_, 2
-	note D_, 2
-	note E_, 2
-	note F_, 2
+	F_ 2
+	A_ 2
+	F_ 2
+	A_ 2
+	F_ 2
+	A_ 2
+	F_ 2
+	A_ 2
+	F_ 2
+	A_ 2
+	G_ 2
+	F_ 2
+	E_ 2
+	D_ 2
+	E_ 2
+	F_ 2
 	callchannel Music_Credits_branch_7ffb8
 	callchannel Music_Credits_branch_7ffb8
-	note E_, 4
-	note A_, 4
-	note E_, 4
-	note A_, 4
-	note E_, 4
-	note A_, 4
-	note E_, 4
-	note A_, 4
+	E_ 4
+	A_ 4
+	E_ 4
+	A_ 4
+	E_ 4
+	A_ 4
+	E_ 4
+	A_ 4
 	callchannel Music_Credits_branch_7ffa4
 	callchannel Music_Credits_branch_7ffa4
 	callchannel Music_Credits_branch_7ffe4
@@ -707,115 +707,115 @@
 	callchannel Music_Credits_branch_7ffb8
 	callchannel Music_Credits_branch_7ffed
 	callchannel Music_Credits_branch_7ffed
-	note A_, 1
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 3
-	note A_, 1
-	note A_, 1
-	note A_, 1
+	A_ 1
+	A_ 1
+	A_ 1
 	rest 7
 	endchannel
 
 Music_Credits_branch_7ffa4::
 	octave 4
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
+	E_ 2
+	A_ 2
+	E_ 2
+	A_ 2
+	E_ 2
+	A_ 2
+	E_ 2
+	A_ 2
 	endchannel
 
 Music_Credits_branch_7ffae::
 	octave 4
-	note D_, 2
-	note G_, 2
-	note D_, 2
-	note G_, 2
-	note D_, 2
-	note G_, 2
-	note D_, 2
-	note G_, 2
+	D_ 2
+	G_ 2
+	D_ 2
+	G_ 2
+	D_ 2
+	G_ 2
+	D_ 2
+	G_ 2
 	endchannel
 
 Music_Credits_branch_7ffb8::
-	note G_, 2
-	note B_, 2
-	note G_, 2
-	note B_, 2
-	note G_, 2
-	note B_, 2
-	note G_, 2
-	note B_, 2
+	G_ 2
+	B_ 2
+	G_ 2
+	B_ 2
+	G_ 2
+	B_ 2
+	G_ 2
+	B_ 2
 	endchannel
 
 Music_Credits_branch_7ffc1::
 	octave 4
-	note A_, 2
+	A_ 2
 	octave 5
-	note C#, 2
+	C# 2
 	octave 4
-	note A_, 2
+	A_ 2
 	octave 5
-	note C#, 2
+	C# 2
 	octave 4
-	note A_, 2
+	A_ 2
 	octave 5
-	note C#, 2
+	C# 2
 	octave 4
-	note A_, 2
+	A_ 2
 	octave 5
-	note C#, 2
+	C# 2
 	endchannel
 
 Music_Credits_branch_7ffd2::
-	note D_, 2
-	note A_, 2
-	note D_, 2
-	note A_, 2
-	note D_, 2
-	note A_, 2
-	note D_, 2
-	note A_, 2
+	D_ 2
+	A_ 2
+	D_ 2
+	A_ 2
+	D_ 2
+	A_ 2
+	D_ 2
+	A_ 2
 	endchannel
 
 Music_Credits_branch_7ffdb::
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
+	E_ 2
+	G# 2
+	E_ 2
+	G# 2
+	E_ 2
+	G# 2
+	E_ 2
+	G# 2
 	endchannel
 
 Music_Credits_branch_7ffe4::
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
+	E_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	E_ 2
+	B_ 2
 	endchannel
 
 Music_Credits_branch_7ffed::
-	note A_, 1
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 3
-	note A_, 1
-	note A_, 1
-	note A_, 1
+	A_ 1
+	A_ 1
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 3
 	endchannel
-; 0x7fffa
\ No newline at end of file
+; 0x7fffa
--- a/audio/music/defeatedgymleader.asm
+++ b/audio/music/defeatedgymleader.asm
@@ -7,158 +7,158 @@
 	tempo 112
 	notetype 12, 10, 6
 	octave 4
-	note D_, 6
+	D_ 6
 	octave 3
-	note A_, 1
+	A_ 1
 	octave 4
-	note D_, 1
-	note F#, 6
-	note D_, 1
-	note F#, 1
+	D_ 1
+	F# 6
+	D_ 1
+	F# 1
 	notetype 12, 10, 0
-	note A_, 8
+	A_ 8
 	notetype 12, 10, 7
-	note A_, 8
+	A_ 8
 
 Music_DefeatedGymLeader_branch_23ccc::
 	notetype 12, 11, 2
 	octave 3
-	note A_, 2
-	note A_, 2
-	note F#, 4
-	note G_, 2
-	note G_, 2
-	note E_, 4
-	note D_, 2
-	note E_, 2
-	note D_, 2
-	note E_, 2
-	note D_, 4
-	note D_, 4
-	note A_, 2
-	note A_, 2
-	note F#, 4
-	note G_, 2
-	note G_, 2
-	note E_, 4
-	note D_, 2
-	note E_, 2
-	note D_, 2
-	note C#, 2
+	A_ 2
+	A_ 2
+	F# 4
+	G_ 2
+	G_ 2
+	E_ 4
+	D_ 2
+	E_ 2
+	D_ 2
+	E_ 2
+	D_ 4
+	D_ 4
+	A_ 2
+	A_ 2
+	F# 4
+	G_ 2
+	G_ 2
+	E_ 4
+	D_ 2
+	E_ 2
+	D_ 2
+	C# 2
 	notetype 12, 11, 1
 	octave 2
-	note B_, 8
+	B_ 8
 	notetype 12, 11, 2
 	octave 3
-	note A_, 2
-	note A_, 2
-	note F#, 4
-	note G_, 2
-	note G_, 2
-	note E_, 4
-	note D_, 2
-	note E_, 2
-	note D_, 2
-	note E_, 2
-	note D_, 4
-	note D_, 4
-	note A_, 2
-	note A_, 2
-	note F#, 4
-	note G_, 2
-	note G_, 2
-	note E_, 4
-	note D_, 2
-	note E_, 2
-	note D_, 2
-	note C#, 2
+	A_ 2
+	A_ 2
+	F# 4
+	G_ 2
+	G_ 2
+	E_ 4
+	D_ 2
+	E_ 2
+	D_ 2
+	E_ 2
+	D_ 4
+	D_ 4
+	A_ 2
+	A_ 2
+	F# 4
+	G_ 2
+	G_ 2
+	E_ 4
+	D_ 2
+	E_ 2
+	D_ 2
+	C# 2
 	notetype 12, 11, 1
 	octave 2
-	note B_, 8
+	B_ 8
 	notetype 12, 9, 7
 	octave 3
-	note D_, 6
+	D_ 6
 	octave 2
-	note A_, 1
+	A_ 1
 	octave 3
-	note D_, 1
-	note F#, 8
+	D_ 1
+	F# 8
 	notetype 12, 11, 0
-	note F#, 6
-	note E_, 1
-	note F#, 1
-	note A_, 8
+	F# 6
+	E_ 1
+	F# 1
+	A_ 8
 	notetype 12, 9, 7
-	note E_, 6
-	note C#, 1
-	note E_, 1
-	note G#, 8
+	E_ 6
+	C# 1
+	E_ 1
+	G# 8
 	notetype 12, 11, 0
-	note G#, 6
-	note E_, 1
-	note G#, 1
-	note B_, 8
+	G# 6
+	E_ 1
+	G# 1
+	B_ 8
 	notetype 12, 9, 7
-	note C#, 6
+	C# 6
 	octave 2
-	note A_, 1
+	A_ 1
 	octave 3
-	note C#, 1
-	note E_, 8
+	C# 1
+	E_ 8
 	notetype 12, 11, 0
-	note E_, 6
-	note C#, 1
-	note E_, 1
-	note E_, 4
-	note G_, 4
+	E_ 6
+	C# 1
+	E_ 1
+	E_ 4
+	G_ 4
 	notetype 12, 9, 0
-	note F#, 8
-	note E_, 8
-	note D_, 8
-	note C#, 8
+	F# 8
+	E_ 8
+	D_ 8
+	C# 8
 	notetype 12, 9, 7
-	note D_, 6
+	D_ 6
 	octave 2
-	note A_, 1
+	A_ 1
 	octave 3
-	note D_, 1
-	note F#, 8
+	D_ 1
+	F# 8
 	notetype 12, 11, 0
-	note F#, 6
-	note E_, 1
-	note F#, 1
-	note A_, 8
+	F# 6
+	E_ 1
+	F# 1
+	A_ 8
 	notetype 12, 9, 7
-	note E_, 6
-	note C#, 1
-	note E_, 1
-	note G#, 8
+	E_ 6
+	C# 1
+	E_ 1
+	G# 8
 	notetype 12, 11, 0
-	note G#, 6
-	note E_, 1
-	note G#, 1
-	note B_, 8
+	G# 6
+	E_ 1
+	G# 1
+	B_ 8
 	notetype 12, 9, 7
-	note C#, 6
+	C# 6
 	octave 2
-	note A_, 1
+	A_ 1
 	octave 3
-	note C#, 1
-	note E_, 8
+	C# 1
+	E_ 8
 	notetype 12, 11, 0
-	note E_, 6
-	note C#, 1
-	note E_, 1
-	note E_, 4
-	note G_, 4
+	E_ 6
+	C# 1
+	E_ 1
+	E_ 4
+	G_ 4
 	notetype 12, 9, 7
-	note F#, 6
-	note E_, 1
-	note F#, 1
-	note A_, 8
+	F# 6
+	E_ 1
+	F# 1
+	A_ 8
 	notetype 12, 10, 7
-	note G_, 8
-	note E_, 8
+	G_ 8
+	E_ 8
 	loopchannel 0, Music_DefeatedGymLeader_branch_23ccc
 
 
@@ -167,188 +167,188 @@
 	vibrato 24, 2, 4
 	notetype 12, 12, 4
 	octave 4
-	note A_, 6
-	note F#, 1
-	note A_, 1
+	A_ 6
+	F# 1
+	A_ 1
 	octave 5
-	note D_, 6
+	D_ 6
 	octave 4
-	note A_, 1
+	A_ 1
 	octave 5
-	note D_, 1
+	D_ 1
 	notetype 12, 11, 0
-	note F#, 8
+	F# 8
 	notetype 12, 11, 7
-	note F#, 8
+	F# 8
 
 Music_DefeatedGymLeader_branch_23d84::
 	notetype 12, 12, 2
 	octave 4
-	note D_, 2
-	note C#, 2
+	D_ 2
+	C# 2
 	octave 3
-	note B_, 4
+	B_ 4
 	octave 4
-	note C#, 2
+	C# 2
 	octave 3
-	note B_, 2
-	note A_, 4
-	note B_, 2
-	note A_, 2
-	note G_, 2
-	note F#, 2
+	B_ 2
+	A_ 4
+	B_ 2
+	A_ 2
+	G_ 2
+	F# 2
 	notetype 12, 12, 4
-	note A_, 4
-	note A_, 4
+	A_ 4
+	A_ 4
 	notetype 12, 12, 2
 	octave 4
-	note D_, 2
-	note C#, 2
+	D_ 2
+	C# 2
 	octave 3
-	note B_, 4
+	B_ 4
 	octave 4
-	note C#, 2
+	C# 2
 	octave 3
-	note B_, 2
-	note A_, 4
-	note B_, 2
-	note A_, 2
-	note G_, 2
-	note F#, 2
+	B_ 2
+	A_ 4
+	B_ 2
+	A_ 2
+	G_ 2
+	F# 2
 	notetype 12, 12, 1
-	note D_, 6
+	D_ 6
 	notetype 6, 12, 2
-	note G_, 1
-	note A_, 1
-	note B_, 1
+	G_ 1
+	A_ 1
+	B_ 1
 	octave 4
-	note C#, 1
+	C# 1
 	notetype 12, 12, 2
-	note D_, 2
-	note C#, 2
+	D_ 2
+	C# 2
 	octave 3
-	note B_, 4
+	B_ 4
 	octave 4
-	note C#, 2
+	C# 2
 	octave 3
-	note B_, 2
-	note A_, 4
-	note B_, 2
-	note A_, 2
-	note G_, 2
-	note F#, 2
+	B_ 2
+	A_ 4
+	B_ 2
+	A_ 2
+	G_ 2
+	F# 2
 	notetype 12, 12, 4
-	note A_, 4
-	note A_, 3
+	A_ 4
+	A_ 3
 	notetype 6, 12, 2
-	note B_, 1
+	B_ 1
 	octave 4
-	note C#, 1
+	C# 1
 	notetype 12, 12, 2
-	note D_, 2
-	note C#, 2
+	D_ 2
+	C# 2
 	octave 3
-	note B_, 4
+	B_ 4
 	octave 4
-	note C#, 2
+	C# 2
 	octave 3
-	note B_, 2
-	note A_, 4
-	note B_, 2
-	note A_, 2
-	note G_, 2
-	note F#, 2
+	B_ 2
+	A_ 4
+	B_ 2
+	A_ 2
+	G_ 2
+	F# 2
 	notetype 12, 12, 1
-	note D_, 8
+	D_ 8
 	notetype 12, 12, 7
-	note A_, 6
-	note F#, 1
-	note A_, 1
+	A_ 6
+	F# 1
+	A_ 1
 	notetype 12, 11, 0
 	octave 4
-	note D_, 8
+	D_ 8
 	notetype 12, 10, 0
-	note D_, 8
+	D_ 8
 	notetype 12, 9, 7
-	note D_, 8
+	D_ 8
 	notetype 12, 12, 7
 	octave 3
-	note B_, 6
-	note G#, 1
-	note B_, 1
+	B_ 6
+	G# 1
+	B_ 1
 	notetype 12, 8, 0
 	octave 4
-	note E_, 8
+	E_ 8
 	notetype 12, 10, 0
-	note E_, 8
+	E_ 8
 	notetype 12, 12, 7
-	note E_, 8
+	E_ 8
 	octave 3
-	note G_, 6
-	note E_, 1
-	note G_, 1
+	G_ 6
+	E_ 1
+	G_ 1
 	notetype 12, 6, 15
 	octave 4
-	note C#, 8
+	C# 8
 	notetype 12, 12, 7
-	note C#, 8
-	note F#, 4
-	note E_, 4
+	C# 8
+	F# 4
+	E_ 4
 	notetype 12, 11, 0
-	note D_, 14
+	D_ 14
 	octave 3
-	note B_, 2
+	B_ 2
 	notetype 12, 10, 0
-	note A_, 8
+	A_ 8
 	notetype 12, 11, 7
-	note A_, 8
+	A_ 8
 	notetype 12, 12, 7
-	note A_, 6
-	note F#, 1
-	note A_, 1
+	A_ 6
+	F# 1
+	A_ 1
 	notetype 12, 11, 0
 	octave 4
-	note D_, 8
+	D_ 8
 	notetype 12, 10, 0
-	note D_, 8
+	D_ 8
 	notetype 12, 9, 7
-	note D_, 8
+	D_ 8
 	notetype 12, 12, 7
 	octave 3
-	note B_, 6
-	note G#, 1
-	note B_, 1
+	B_ 6
+	G# 1
+	B_ 1
 	notetype 12, 4, 15
 	octave 4
-	note E_, 8
+	E_ 8
 	notetype 12, 11, 0
-	note E_, 8
+	E_ 8
 	notetype 12, 12, 7
-	note E_, 8
+	E_ 8
 	octave 3
-	note G_, 6
-	note E_, 1
-	note G_, 1
+	G_ 6
+	E_ 1
+	G_ 1
 	notetype 12, 11, 0
 	octave 4
-	note C#, 8
+	C# 8
 	notetype 12, 11, 7
-	note C#, 8
+	C# 8
 	octave 3
-	note A_, 4
+	A_ 4
 	octave 4
-	note C#, 4
+	C# 4
 	notetype 12, 11, 0
-	note D_, 14
-	note E_, 2
-	note D_, 12
+	D_ 14
+	E_ 2
+	D_ 12
 	notetype 12, 12, 2
 	octave 3
-	note G_, 1
-	note A_, 1
-	note B_, 1
+	G_ 1
+	A_ 1
+	B_ 1
 	octave 4
-	note C#, 1
+	C# 1
 	loopchannel 0, Music_DefeatedGymLeader_branch_23d84
 
 
@@ -356,253 +356,253 @@
 	notetype 12, 1, 0
 	vibrato 16, 1, 2
 	octave 4
-	note F#, 6
-	note D_, 1
-	note F#, 1
-	note A_, 6
-	note F#, 1
-	note A_, 1
+	F# 6
+	D_ 1
+	F# 1
+	A_ 6
+	F# 1
+	A_ 1
 	octave 5
-	note D_, 6
+	D_ 6
 	octave 4
-	note A_, 1
+	A_ 1
 	octave 5
-	note D_, 1
-	note F#, 8
+	D_ 1
+	F# 8
 
 Music_DefeatedGymLeader_branch_23e65::
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 3
-	note G_, 1
+	G_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 3
-	note A_, 1
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note F#, 3
+	F# 3
 	rest 1
-	note F#, 3
+	F# 3
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 3
-	note G_, 1
+	G_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 5
-	note D_, 1
+	D_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note G_, 3
+	G_ 3
 	rest 1
-	note D_, 3
+	D_ 3
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 7
-	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 G#, 2
-	note F#, 2
-	note E_, 2
-	note D#, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note C#, 2
-	note A_, 2
-	note C#, 2
-	note A_, 2
-	note C#, 2
-	note A_, 2
-	note C#, 2
-	note A_, 2
-	note C#, 2
-	note A_, 2
-	note C#, 2
-	note A_, 2
-	note C#, 2
-	note A_, 2
-	note C#, 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 C#, 2
-	note D_, 2
-	note E_, 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 G#, 2
-	note F#, 2
-	note E_, 2
-	note D#, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note C#, 2
-	note A_, 2
-	note C#, 2
-	note A_, 2
-	note C#, 2
-	note A_, 2
-	note C#, 2
-	note A_, 2
-	note C#, 2
-	note A_, 2
-	note C#, 2
-	note A_, 2
-	note C#, 2
-	note A_, 2
-	note C#, 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 G_, 2
-	note A_, 2
-	note G_, 2
-	note E_, 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
+	G# 2
+	F# 2
+	E_ 2
+	D# 2
+	E_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	C# 2
+	A_ 2
+	C# 2
+	A_ 2
+	C# 2
+	A_ 2
+	C# 2
+	A_ 2
+	C# 2
+	A_ 2
+	C# 2
+	A_ 2
+	C# 2
+	A_ 2
+	C# 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
+	C# 2
+	D_ 2
+	E_ 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
+	G# 2
+	F# 2
+	E_ 2
+	D# 2
+	E_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	C# 2
+	A_ 2
+	C# 2
+	A_ 2
+	C# 2
+	A_ 2
+	C# 2
+	A_ 2
+	C# 2
+	A_ 2
+	C# 2
+	A_ 2
+	C# 2
+	A_ 2
+	C# 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
+	G_ 2
+	A_ 2
+	G_ 2
+	E_ 2
 	loopchannel 0, Music_DefeatedGymLeader_branch_23e65
-; 0x23f52
\ No newline at end of file
+; 0x23f52
--- a/audio/music/defeatedtrainer.asm
+++ b/audio/music/defeatedtrainer.asm
@@ -6,18 +6,18 @@
 	tempo 224
 	notetype 4, 10, 2
 	octave 4
-	note D_, 2
+	D_ 2
 	tempo 224
 	notetype 4, 10, 2
-	note D_, 2
-	note D_, 2
-	note D_, 2
+	D_ 2
+	D_ 2
+	D_ 2
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note D_, 2
+	D_ 2
 	notetype 4, 11, 3
-	note F#, 12
+	F# 12
 	duty 1
 	tempo 224
 
@@ -24,74 +24,74 @@
 Music_DefeatedTrainer_branch_23a76::
 	notetype 4, 6, 3
 	octave 3
-	note A_, 6
-	note F#, 3
-	note A_, 3
-	note B_, 6
-	note G#, 3
-	note B_, 3
+	A_ 6
+	F# 3
+	A_ 3
+	B_ 6
+	G# 3
+	B_ 3
 	octave 4
-	note C#, 3
+	C# 3
 	octave 3
-	note B_, 3
-	note A_, 3
-	note G_, 3
-	note A_, 3
-	note B_, 3
-	note A_, 3
-	note G_, 3
-	note A_, 6
-	note F#, 3
-	note A_, 3
-	note B_, 6
-	note G#, 3
-	note B_, 3
+	B_ 3
+	A_ 3
+	G_ 3
+	A_ 3
+	B_ 3
+	A_ 3
+	G_ 3
+	A_ 6
+	F# 3
+	A_ 3
+	B_ 6
+	G# 3
+	B_ 3
 	octave 4
-	note C#, 3
-	note D_, 3
-	note E_, 3
-	note F#, 3
-	note C#, 3
+	C# 3
+	D_ 3
+	E_ 3
+	F# 3
+	C# 3
 	octave 3
-	note B_, 3
-	note A_, 3
+	B_ 3
+	A_ 3
 	octave 4
-	note C#, 3
+	C# 3
 	octave 3
-	note A_, 6
-	note F#, 3
-	note A_, 3
-	note B_, 6
-	note G#, 3
-	note B_, 3
+	A_ 6
+	F# 3
+	A_ 3
+	B_ 6
+	G# 3
+	B_ 3
 	octave 4
-	note C_, 6
+	C_ 6
 	octave 3
-	note A_, 3
+	A_ 3
 	octave 4
-	note C_, 3
-	note D_, 3
+	C_ 3
+	D_ 3
 	octave 3
-	note B_, 3
+	B_ 3
 	octave 4
-	note D_, 6
-	note C#, 3
+	D_ 6
+	C# 3
 	octave 3
-	note B_, 3
-	note A_, 3
-	note G_, 3
-	note F#, 3
-	note G_, 3
-	note A_, 3
-	note B_, 3
-	note A_, 3
-	note G_, 3
-	note F#, 3
-	note E_, 3
-	note F#, 3
-	note G_, 3
-	note A_, 3
-	note B_, 3
+	B_ 3
+	A_ 3
+	G_ 3
+	F# 3
+	G_ 3
+	A_ 3
+	B_ 3
+	A_ 3
+	G_ 3
+	F# 3
+	E_ 3
+	F# 3
+	G_ 3
+	A_ 3
+	B_ 3
 	loopchannel 0, Music_DefeatedTrainer_branch_23a76
 
 
@@ -99,76 +99,76 @@
 	duty 2
 	notetype 4, 12, 3
 	octave 4
-	note A_, 2
+	A_ 2
 	notetype 4, 12, 3
-	note A_, 2
-	note A_, 2
-	note A_, 2
-	note B_, 2
+	A_ 2
+	A_ 2
+	A_ 2
+	B_ 2
 	octave 5
-	note C#, 2
+	C# 2
 	notetype 4, 12, 4
-	note D_, 12
+	D_ 12
 
 Music_DefeatedTrainer_branch_23ad2::
 	notetype 4, 8, 5
 	octave 4
-	note D_, 6
+	D_ 6
 	octave 3
-	note A_, 3
+	A_ 3
 	octave 4
-	note D_, 3
-	note E_, 6
+	D_ 3
+	E_ 6
 	octave 3
-	note B_, 3
+	B_ 3
 	octave 4
-	note E_, 3
-	note F#, 3
-	note G_, 3
-	note A_, 6
-	note E_, 3
-	note F#, 3
-	note G_, 6
-	note D_, 6
+	E_ 3
+	F# 3
+	G_ 3
+	A_ 6
+	E_ 3
+	F# 3
+	G_ 6
+	D_ 6
 	octave 3
-	note A_, 3
+	A_ 3
 	octave 4
-	note D_, 3
-	note E_, 6
+	D_ 3
+	E_ 6
 	octave 3
-	note B_, 3
+	B_ 3
 	octave 4
-	note E_, 3
-	note F#, 3
-	note G_, 3
-	note A_, 6
-	note F#, 3
-	note G_, 3
-	note A_, 6
-	note D_, 6
+	E_ 3
+	F# 3
+	G_ 3
+	A_ 6
+	F# 3
+	G_ 3
+	A_ 6
+	D_ 6
 	octave 3
-	note A_, 3
+	A_ 3
 	octave 4
-	note D_, 3
-	note E_, 6
+	D_ 3
+	E_ 6
 	octave 3
-	note B_, 3
+	B_ 3
 	octave 4
-	note E_, 3
-	note F_, 6
-	note C_, 3
-	note F_, 3
-	note G_, 3
-	note D_, 3
-	note G_, 6
+	E_ 3
+	F_ 6
+	C_ 3
+	F_ 3
+	G_ 3
+	D_ 3
+	G_ 6
 	notetype 4, 7, 0
-	note F#, 12
+	F# 12
 	notetype 4, 7, 7
-	note F#, 12
+	F# 12
 	notetype 4, 6, 0
-	note E_, 12
+	E_ 12
 	notetype 4, 6, 7
-	note E_, 12
+	E_ 12
 	loopchannel 0, Music_DefeatedTrainer_branch_23ad2
 
 
@@ -175,93 +175,93 @@
 Music_DefeatedTrainer_Ch3:: ; 23b15 (8:7b15)
 	notetype 4, 1, 0
 	octave 5
-	note D_, 2
+	D_ 2
 	notetype 4, 1, 0
-	note D_, 2
-	note D_, 2
+	D_ 2
+	D_ 2
 	octave 4
-	note B_, 2
-	note A_, 2
-	note G_, 2
-	note A_, 12
+	B_ 2
+	A_ 2
+	G_ 2
+	A_ 12
 	notetype 4, 2, 1
 
 Music_DefeatedTrainer_branch_23b24::
-	note F#, 3
+	F# 3
 	rest 3
-	note F#, 3
+	F# 3
 	rest 3
-	note G#, 3
+	G# 3
 	rest 3
-	note G#, 3
+	G# 3
 	rest 3
-	note A_, 3
+	A_ 3
 	rest 3
-	note A_, 3
+	A_ 3
 	rest 3
-	note B_, 3
+	B_ 3
 	rest 3
-	note B_, 3
+	B_ 3
 	rest 3
-	note F#, 3
+	F# 3
 	rest 3
-	note F#, 3
+	F# 3
 	rest 3
-	note G#, 3
+	G# 3
 	rest 3
-	note G#, 3
+	G# 3
 	rest 3
-	note A_, 3
+	A_ 3
 	rest 3
-	note A_, 3
+	A_ 3
 	rest 3
 	octave 5
-	note C#, 3
+	C# 3
 	rest 3
-	note C#, 3
+	C# 3
 	octave 4
-	note A_, 3
-	note F#, 3
+	A_ 3
+	F# 3
 	octave 5
-	note D_, 3
+	D_ 3
 	octave 4
-	note F#, 3
+	F# 3
 	rest 3
-	note G#, 3
+	G# 3
 	octave 5
-	note E_, 3
+	E_ 3
 	octave 4
-	note G#, 3
+	G# 3
 	rest 3
-	note A_, 3
+	A_ 3
 	octave 5
-	note F_, 3
+	F_ 3
 	octave 4
-	note A_, 3
+	A_ 3
 	rest 3
-	note B_, 3
+	B_ 3
 	octave 5
-	note G_, 3
+	G_ 3
 	octave 4
-	note B_, 3
-	note A#, 3
-	note A_, 3
+	B_ 3
+	A# 3
+	A_ 3
 	rest 3
-	note A_, 3
+	A_ 3
 	rest 3
-	note A_, 3
+	A_ 3
 	rest 3
-	note A_, 3
+	A_ 3
 	octave 5
-	note C_, 3
-	note C#, 3
+	C_ 3
+	C# 3
 	rest 3
-	note C#, 3
+	C# 3
 	rest 3
-	note C#, 3
+	C# 3
 	rest 3
-	note C#, 3
+	C# 3
 	octave 4
-	note A_, 3
+	A_ 3
 	loopchannel 0, Music_DefeatedTrainer_branch_23b24
-; 0x23b74
\ No newline at end of file
+; 0x23b74
--- a/audio/music/defeatedwildmon.asm
+++ b/audio/music/defeatedwildmon.asm
@@ -8,62 +8,62 @@
 	tempo 112
 	notetype 12, 11, 7
 	octave 3
-	note B_, 1
-	note A_, 1
-	note G#, 1
-	note F#, 1
-	note E_, 12
+	B_ 1
+	A_ 1
+	G# 1
+	F# 1
+	E_ 12
 
 Music_DefeatedWildMon_branch_23b8b::
 	notetype 12, 6, 2
-	note E_, 2
-	note F#, 2
-	note E_, 2
-	note F#, 2
-	note G#, 2
-	note G#, 2
-	note G#, 4
-	note A_, 2
-	note A_, 2
-	note A_, 4
-	note G#, 2
-	note G#, 2
-	note G#, 4
-	note E_, 2
-	note F#, 2
-	note E_, 2
-	note F#, 2
-	note G#, 2
-	note G#, 2
-	note G#, 4
-	note A_, 2
-	note A_, 2
-	note A_, 4
-	note G#, 8
-	note F_, 2
-	note G_, 2
-	note F_, 2
-	note G_, 2
-	note A_, 2
-	note A_, 2
-	note A_, 4
-	note A#, 2
-	note A#, 2
-	note A#, 4
-	note A_, 2
-	note A_, 2
-	note A_, 4
-	note F_, 2
-	note G_, 2
-	note F_, 2
-	note G_, 2
-	note A_, 2
-	note A_, 2
-	note A_, 4
-	note A#, 2
-	note A#, 2
-	note A#, 4
-	note A_, 8
+	E_ 2
+	F# 2
+	E_ 2
+	F# 2
+	G# 2
+	G# 2
+	G# 4
+	A_ 2
+	A_ 2
+	A_ 4
+	G# 2
+	G# 2
+	G# 4
+	E_ 2
+	F# 2
+	E_ 2
+	F# 2
+	G# 2
+	G# 2
+	G# 4
+	A_ 2
+	A_ 2
+	A_ 4
+	G# 8
+	F_ 2
+	G_ 2
+	F_ 2
+	G_ 2
+	A_ 2
+	A_ 2
+	A_ 4
+	A# 2
+	A# 2
+	A# 4
+	A_ 2
+	A_ 2
+	A_ 4
+	F_ 2
+	G_ 2
+	F_ 2
+	G_ 2
+	A_ 2
+	A_ 2
+	A_ 4
+	A# 2
+	A# 2
+	A# 4
+	A_ 8
 	loopchannel 0, Music_DefeatedWildMon_branch_23b8b
 
 
@@ -72,73 +72,73 @@
 	duty 2
 	notetype 12, 12, 3
 	octave 4
-	note E_, 1
-	note F#, 1
-	note G#, 1
-	note A_, 1
+	E_ 1
+	F# 1
+	G# 1
+	A_ 1
 	notetype 12, 12, 7
-	note B_, 12
+	B_ 12
 
 Music_DefeatedWildMon_branch_23bce::
 	notetype 12, 8, 2
 	octave 3
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note A_, 2
-	note B_, 2
-	note B_, 2
-	note B_, 4
+	B_ 2
+	A_ 2
+	G# 2
+	A_ 2
+	B_ 2
+	B_ 2
+	B_ 4
 	octave 4
-	note C#, 2
-	note C#, 2
-	note C#, 4
+	C# 2
+	C# 2
+	C# 4
 	octave 3
-	note B_, 2
-	note B_, 2
-	note B_, 4
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note A_, 2
-	note B_, 2
-	note B_, 2
-	note B_, 4
+	B_ 2
+	B_ 2
+	B_ 4
+	B_ 2
+	A_ 2
+	G# 2
+	A_ 2
+	B_ 2
+	B_ 2
+	B_ 4
 	octave 4
-	note C#, 2
-	note C#, 2
-	note C#, 4
+	C# 2
+	C# 2
+	C# 4
 	octave 3
-	note B_, 8
+	B_ 8
 	octave 4
-	note C_, 2
+	C_ 2
 	octave 3
-	note A#, 2
-	note A_, 2
-	note A#, 2
+	A# 2
+	A_ 2
+	A# 2
 	octave 4
-	note C_, 2
-	note C_, 2
-	note C_, 4
-	note D_, 2
-	note D_, 2
-	note D_, 4
-	note C_, 2
-	note C_, 2
-	note C_, 4
-	note C_, 2
+	C_ 2
+	C_ 2
+	C_ 4
+	D_ 2
+	D_ 2
+	D_ 4
+	C_ 2
+	C_ 2
+	C_ 4
+	C_ 2
 	octave 3
-	note A#, 2
-	note A_, 2
-	note A#, 2
+	A# 2
+	A_ 2
+	A# 2
 	octave 4
-	note C_, 2
-	note C_, 2
-	note C_, 4
-	note D_, 2
-	note D_, 2
-	note D_, 4
-	note C_, 8
+	C_ 2
+	C_ 2
+	C_ 4
+	D_ 2
+	D_ 2
+	D_ 4
+	C_ 8
 	loopchannel 0, Music_DefeatedWildMon_branch_23bce
 
 
@@ -146,158 +146,158 @@
 	executemusic
 	notetype 12, 2, 0
 	octave 5
-	note E_, 1
+	E_ 1
 	rest 1
 	octave 6
-	note C#, 1
+	C# 1
 	rest 1
 	octave 5
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 6
-	note D#, 1
+	D# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 3
 
 Music_DefeatedWildMon_branch_23c21::
 	octave 4
-	note E_, 1
+	E_ 1
 	rest 1
 	octave 5
-	note E_, 1
+	E_ 1
 	rest 1
 	octave 4
-	note E_, 1
+	E_ 1
 	rest 1
 	octave 5
-	note E_, 1
+	E_ 1
 	rest 1
 	octave 4
-	note E_, 1
+	E_ 1
 	rest 3
 	octave 5
-	note E_, 1
+	E_ 1
 	rest 3
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 5
-	note F#, 1
+	F# 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 3
-	note F#, 1
+	F# 1
 	rest 1
 	octave 5
-	note D#, 1
+	D# 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
 	octave 5
-	note E_, 1
+	E_ 1
 	rest 1
 	octave 4
-	note E_, 1
+	E_ 1
 	rest 1
 	octave 5
-	note E_, 1
+	E_ 1
 	rest 1
 	octave 4
-	note E_, 1
+	E_ 1
 	rest 3
 	octave 5
-	note E_, 1
+	E_ 1
 	rest 3
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 5
-	note F#, 1
+	F# 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 3
 	octave 5
-	note E_, 1
+	E_ 1
 	rest 3
 	octave 4
-	note D#, 4
+	D# 4
 	octave 4
-	note F_, 1
+	F_ 1
 	rest 1
 	octave 5
-	note F_, 1
+	F_ 1
 	rest 1
 	octave 4
-	note F_, 1
+	F_ 1
 	rest 1
 	octave 5
-	note F_, 1
+	F_ 1
 	rest 1
 	octave 4
-	note F_, 1
+	F_ 1
 	rest 3
 	octave 5
-	note F_, 1
+	F_ 1
 	rest 3
 	octave 4
-	note G_, 1
+	G_ 1
 	rest 1
 	octave 5
-	note G_, 1
+	G_ 1
 	rest 1
 	octave 4
-	note G_, 1
+	G_ 1
 	rest 3
-	note F_, 1
+	F_ 1
 	rest 1
 	octave 5
-	note F_, 1
+	F_ 1
 	rest 1
 	octave 4
-	note F_, 1
+	F_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
 	octave 5
-	note F_, 1
+	F_ 1
 	rest 1
 	octave 4
-	note F_, 1
+	F_ 1
 	rest 1
 	octave 5
-	note F_, 1
+	F_ 1
 	rest 1
 	octave 4
-	note F_, 1
+	F_ 1
 	rest 3
 	octave 5
-	note F_, 1
+	F_ 1
 	rest 3
 	octave 4
-	note G_, 1
+	G_ 1
 	rest 1
 	octave 5
-	note G_, 1
+	G_ 1
 	rest 1
 	octave 4
-	note G_, 1
+	G_ 1
 	rest 3
 	octave 5
-	note F_, 1
+	F_ 1
 	rest 3
 	octave 4
-	note D#, 4
+	D# 4
 	loopchannel 0, Music_DefeatedWildMon_branch_23c21
-; 0x23cad
\ No newline at end of file
+; 0x23cad
--- a/audio/music/dungeon1.asm
+++ b/audio/music/dungeon1.asm
@@ -8,7 +8,7 @@
 	rest 8
 	stereopanning 237
 	octave 4
-	note F#, 8
+	F# 8
 	stereopanning 255
 
 Music_Dungeon1_branch_7dee5::
@@ -18,22 +18,22 @@
 Music_Dungeon1_branch_7dee8::
 	callchannel Music_Dungeon1_branch_7dfaa
 	loopchannel 3, Music_Dungeon1_branch_7dee8
-	note E_, 1
-	note D#, 1
-	note B_, 1
-	note A#, 1
-	note G_, 1
-	note G#, 1
+	E_ 1
+	D# 1
+	B_ 1
+	A# 1
+	G_ 1
+	G# 1
 	rest 1
-	note A#, 1
-	note E_, 1
-	note D#, 1
-	note B_, 1
-	note A#, 1
-	note G_, 1
-	note G#, 1
-	note A_, 1
-	note A#, 1
+	A# 1
+	E_ 1
+	D# 1
+	B_ 1
+	A# 1
+	G_ 1
+	G# 1
+	A_ 1
+	A# 1
 
 Music_Dungeon1_branch_7deff::
 	callchannel Music_Dungeon1_branch_7dfaa
@@ -40,92 +40,92 @@
 	loopchannel 4, Music_Dungeon1_branch_7deff
 	callchannel Music_Dungeon1_branch_7dfd5
 	octave 3
-	note G_, 1
-	note F#, 1
-	note E_, 1
-	note G_, 1
+	G_ 1
+	F# 1
+	E_ 1
+	G_ 1
 	callchannel Music_Dungeon1_branch_7dfd5
 	octave 3
-	note A_, 1
-	note G_, 1
-	note E_, 1
-	note A_, 1
+	A_ 1
+	G_ 1
+	E_ 1
+	A_ 1
 	callchannel Music_Dungeon1_branch_7dfd5
 	octave 3
-	note B_, 1
-	note A_, 1
-	note G_, 1
-	note F#, 1
+	B_ 1
+	A_ 1
+	G_ 1
+	F# 1
 	notetype 12, 12, 3
-	note G_, 4
-	note F#, 4
-	note E_, 4
-	note D#, 4
+	G_ 4
+	F# 4
+	E_ 4
+	D# 4
 	notetype 12, 12, 2
 	callchannel Music_Dungeon1_branch_7dfc5
 	octave 3
-	note B_, 3
+	B_ 3
 	callchannel Music_Dungeon1_branch_7dfc5
-	note C_, 3
+	C_ 3
 	callchannel Music_Dungeon1_branch_7dfc5
-	note C#, 3
+	C# 3
 	notetype 12, 12, 3
 	octave 3
-	note G_, 4
-	note F#, 4
-	note E_, 4
-	note D#, 4
-	note E_, 4
-	note D#, 4
-	note C_, 4
+	G_ 4
+	F# 4
+	E_ 4
+	D# 4
+	E_ 4
+	D# 4
+	C_ 4
 	octave 2
-	note B_, 4
+	B_ 4
 	notetype 12, 12, 2
-	note B_, 1
-	note A#, 1
-	note G_, 1
-	note A#, 1
-	note B_, 1
-	note A#, 1
-	note G_, 1
-	note A#, 1
+	B_ 1
+	A# 1
+	G_ 1
+	A# 1
+	B_ 1
+	A# 1
+	G_ 1
+	A# 1
 	octave 3
-	note C_, 1
+	C_ 1
 	octave 2
-	note B_, 1
-	note G#, 1
-	note B_, 1
+	B_ 1
+	G# 1
+	B_ 1
 	octave 3
-	note C_, 1
+	C_ 1
 	octave 2
-	note B_, 1
-	note G#, 1
-	note B_, 1
+	B_ 1
+	G# 1
+	B_ 1
 	octave 3
-	note C#, 1
-	note C_, 1
+	C# 1
+	C_ 1
 	octave 2
-	note A_, 1
+	A_ 1
 	octave 3
-	note C_, 1
-	note C#, 1
-	note C_, 1
+	C_ 1
+	C# 1
+	C_ 1
 	octave 2
-	note A_, 1
+	A_ 1
 	octave 3
-	note C_, 1
-	note D_, 1
-	note C#, 1
+	C_ 1
+	D_ 1
+	C# 1
 	octave 2
-	note A#, 1
+	A# 1
 	octave 3
-	note C#, 1
-	note D_, 1
-	note C#, 1
+	C# 1
+	D_ 1
+	C# 1
 	octave 2
-	note A#, 1
+	A# 1
 	octave 3
-	note C#, 1
+	C# 1
 
 Music_Dungeon1_branch_7df6e::
 	rest 16
@@ -132,34 +132,34 @@
 	loopchannel 8, Music_Dungeon1_branch_7df6e
 	notetype 12, 12, 3
 	callchannel Music_Dungeon1_branch_7dfbb
-	note B_, 2
-	note G_, 2
+	B_ 2
+	G_ 2
 	octave 3
-	note C#, 4
+	C# 4
 	octave 2
-	note G_, 2
-	note A_, 4
-	note F#, 2
+	G_ 2
+	A_ 4
+	F# 2
 	callchannel Music_Dungeon1_branch_7dfbb
-	note A#, 2
-	note G_, 2
-	note B_, 4
-	note G_, 2
-	note F#, 2
-	note G_, 2
-	note D#, 2
+	A# 2
+	G_ 2
+	B_ 4
+	G_ 2
+	F# 2
+	G_ 2
+	D# 2
 	notetype 12, 12, 2
 	callchannel Music_Dungeon1_branch_7dfc5
 	octave 3
-	note B_, 3
+	B_ 3
 	callchannel Music_Dungeon1_branch_7dfc5
-	note C_, 3
+	C_ 3
 	callchannel Music_Dungeon1_branch_7dfc5
-	note C#, 3
+	C# 3
 	notetype 12, 12, 7
 	octave 3
-	note F#, 8
-	note D#, 8
+	F# 8
+	D# 8
 	notetype 12, 12, 2
 	callchannel Music_Dungeon1_branch_7dfaa
 	callchannel Music_Dungeon1_branch_7dfaa
@@ -166,62 +166,62 @@
 	loopchannel 0, Music_Dungeon1_branch_7dee5
 
 Music_Dungeon1_branch_7dfaa::
-	note E_, 1
-	note D#, 1
-	note B_, 1
-	note A#, 1
-	note G_, 1
-	note G#, 1
+	E_ 1
+	D# 1
+	B_ 1
+	A# 1
+	G_ 1
+	G# 1
 	rest 1
-	note A#, 1
-	note E_, 1
-	note D#, 1
-	note B_, 1
-	note A#, 1
-	note G_, 1
-	note G#, 1
+	A# 1
+	E_ 1
+	D# 1
+	B_ 1
+	A# 1
+	G_ 1
+	G# 1
 	rest 1
-	note A#, 1
+	A# 1
 	endchannel
 
 Music_Dungeon1_branch_7dfbb::
 	octave 2
-	note G_, 2
-	note A#, 4
-	note G_, 2
+	G_ 2
+	A# 4
+	G_ 2
 	octave 3
-	note C#, 4
+	C# 4
 	octave 2
-	note G_, 2
-	note A#, 2
+	G_ 2
+	A# 2
 	endchannel
 
 Music_Dungeon1_branch_7dfc5::
 	octave 3
-	note E_, 1
-	note E_, 1
-	note F_, 1
-	note E_, 1
-	note G_, 1
-	note E_, 1
-	note A_, 1
-	note E_, 1
-	note A#, 1
-	note E_, 1
-	note B_, 1
-	note E_, 1
+	E_ 1
+	E_ 1
+	F_ 1
+	E_ 1
+	G_ 1
+	E_ 1
+	A_ 1
+	E_ 1
+	A# 1
+	E_ 1
+	B_ 1
+	E_ 1
 	octave 4
-	note C_, 1
+	C_ 1
 	endchannel
 
 Music_Dungeon1_branch_7dfd5::
-	note E_, 1
-	note E_, 1
+	E_ 1
+	E_ 1
 	rest 4
 	octave 1
-	note E_, 1
+	E_ 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 1
 	endchannel
 
@@ -231,10 +231,10 @@
 	duty 3
 	notetype 12, 0, 15
 	octave 4
-	note G#, 8
+	G# 8
 	notetype 12, 4, 13
 	octave 5
-	note D_, 8
+	D_ 8
 
 Music_Dungeon1_branch_7dfeb::
 	notetype 12, 12, 2
@@ -243,23 +243,23 @@
 	callchannel Music_Dungeon1_branch_7e097
 	loopchannel 3, Music_Dungeon1_branch_7dfed
 	octave 2
-	note E_, 1
-	note E_, 1
-	note B_, 1
+	E_ 1
+	E_ 1
+	B_ 1
 	octave 3
-	note C_, 1
+	C_ 1
 	rest 2
-	note C_, 1
+	C_ 1
 	octave 2
-	note B_, 1
-	note E_, 1
-	note E_, 1
-	note A_, 1
-	note G_, 1
-	note F_, 1
-	note F#, 1
-	note G_, 1
-	note D#, 1
+	B_ 1
+	E_ 1
+	E_ 1
+	A_ 1
+	G_ 1
+	F_ 1
+	F# 1
+	G_ 1
+	D# 1
 
 Music_Dungeon1_branch_7e006::
 	callchannel Music_Dungeon1_branch_7e097
@@ -267,52 +267,52 @@
 	rest 2
 	callchannel Music_Dungeon1_branch_7e0ab
 	octave 3
-	note C_, 4
+	C_ 4
 	callchannel Music_Dungeon1_branch_7e0ab
 	octave 3
-	note C#, 4
+	C# 4
 	callchannel Music_Dungeon1_branch_7e0ab
 	octave 3
-	note D#, 4
+	D# 4
 	notetype 12, 13, 3
 	octave 4
-	note E_, 4
-	note D#, 4
-	note C_, 4
+	E_ 4
+	D# 4
+	C_ 4
 	octave 3
-	note B_, 4
+	B_ 4
 	notetype 12, 13, 2
 	callchannel Music_Dungeon1_branch_7e0b5
 	octave 3
-	note F#, 4
+	F# 4
 	callchannel Music_Dungeon1_branch_7e0b5
 	octave 3
-	note G_, 4
+	G_ 4
 	callchannel Music_Dungeon1_branch_7e0b5
 	octave 3
-	note A#, 4
+	A# 4
 	notetype 12, 13, 3
 	octave 4
-	note E_, 4
-	note D#, 4
-	note C_, 4
+	E_ 4
+	D# 4
+	C_ 4
 	octave 3
-	note B_, 4
+	B_ 4
 	octave 4
-	note C_, 4
+	C_ 4
 	octave 3
-	note B_, 4
-	note G_, 4
-	note F#, 2
+	B_ 4
+	G_ 4
+	F# 2
 	notetype 12, 13, 6
-	note E_, 8
-	note F_, 8
-	note F#, 8
-	note G_, 8
+	E_ 8
+	F_ 8
+	F# 8
+	G_ 8
 	notetype 12, 13, 2
 	callchannel Music_Dungeon1_branch_7e0ba
 	rest 10
-	note E_, 1
+	E_ 1
 	rest 1
 	callchannel Music_Dungeon1_branch_7e0ba
 	rest 12
@@ -322,38 +322,38 @@
 	rest 14
 	notetype 12, 13, 3
 	callchannel Music_Dungeon1_branch_7e0cd
-	note D#, 4
+	D# 4
 	callchannel Music_Dungeon1_branch_7e0cd
-	note D#, 2
+	D# 2
 	rest 2
 	notetype 12, 13, 2
 	callchannel Music_Dungeon1_branch_7e0c0
 	rest 2
 	octave 3
-	note F#, 4
+	F# 4
 	octave 2
-	note E_, 1
-	note E_, 1
+	E_ 1
+	E_ 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note C_, 1
+	C_ 1
 	rest 1
-	note C#, 1
+	C# 1
 	rest 1
-	note D_, 1
-	note C#, 1
+	D_ 1
+	C# 1
 	rest 2
 	octave 3
-	note G_, 4
+	G_ 4
 	callchannel Music_Dungeon1_branch_7e0c0
 	octave 3
-	note A#, 4
+	A# 4
 	notetype 12, 13, 6
-	note B_, 8
+	B_ 8
 	octave 4
-	note D#, 8
+	D# 8
 	notetype 12, 13, 2
 	callchannel Music_Dungeon1_branch_7e097
 	callchannel Music_Dungeon1_branch_7e097
@@ -361,83 +361,83 @@
 
 Music_Dungeon1_branch_7e097::
 	octave 2
-	note E_, 1
-	note E_, 1
-	note B_, 1
+	E_ 1
+	E_ 1
+	B_ 1
 	octave 3
-	note C_, 1
+	C_ 1
 	rest 2
-	note C_, 1
+	C_ 1
 	octave 2
-	note B_, 1
-	note E_, 1
-	note E_, 1
-	note B_, 1
+	B_ 1
+	E_ 1
+	E_ 1
+	B_ 1
 	octave 3
-	note C_, 1
+	C_ 1
 	rest 2
-	note C_, 1
+	C_ 1
 	octave 2
-	note B_, 1
+	B_ 1
 	endchannel
 
 Music_Dungeon1_branch_7e0ab::
 	octave 2
-	note E_, 1
-	note E_, 1
+	E_ 1
+	E_ 1
 	rest 2
 	octave 1
-	note E_, 1
+	E_ 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 3
 	endchannel
 
 Music_Dungeon1_branch_7e0b5::
 	octave 2
-	note E_, 1
-	note E_, 1
+	E_ 1
+	E_ 1
 	rest 10
 	endchannel
 
 Music_Dungeon1_branch_7e0ba::
 	octave 1
-	note E_, 1
-	note G_, 1
-	note E_, 1
-	note D#, 1
+	E_ 1
+	G_ 1
+	E_ 1
+	D# 1
 	endchannel
 
 Music_Dungeon1_branch_7e0c0::
 	octave 2
-	note E_, 1
-	note E_, 1
+	E_ 1
+	E_ 1
 	octave 4
-	note E_, 1
+	E_ 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note C#, 1
-	note C_, 1
+	C# 1
+	C_ 1
 	endchannel
 
 Music_Dungeon1_branch_7e0cd::
 	octave 3
-	note E_, 6
-	note G_, 6
-	note E_, 4
-	note A_, 6
+	E_ 6
+	G_ 6
+	E_ 4
+	A_ 6
 	octave 4
-	note C_, 6
+	C_ 6
 	octave 3
-	note B_, 4
-	note G_, 6
-	note A#, 6
-	note F#, 4
-	note E_, 6
-	note F#, 6
+	B_ 4
+	G_ 6
+	A# 6
+	F# 4
+	E_ 6
+	F# 6
 	endchannel
 
 
@@ -446,42 +446,42 @@
 	vibrato 8, 2, 6
 	rest 14
 	octave 4
-	note D_, 1
-	note D#, 1
+	D_ 1
+	D# 1
 
 Music_Dungeon1_branch_7e0e5::
 	callchannel Music_Dungeon1_branch_7e140
 	callchannel Music_Dungeon1_branch_7e140
 	octave 5
-	note E_, 2
+	E_ 2
 	rest 4
 	octave 3
-	note E_, 1
+	E_ 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 1
 	octave 4
-	note F#, 4
+	F# 4
 	callchannel Music_Dungeon1_branch_7e154
 	octave 4
-	note G_, 4
+	G_ 4
 	callchannel Music_Dungeon1_branch_7e154
 	octave 4
-	note A_, 4
-	note B_, 4
-	note A#, 4
-	note G_, 4
-	note F#, 4
+	A_ 4
+	B_ 4
+	A# 4
+	G_ 4
+	F# 4
 	rest 6
 	callchannel Music_Dungeon1_branch_7e177
-	note B_, 4
-	note A#, 4
-	note G_, 4
-	note F#, 4
-	note G_, 4
-	note F#, 4
-	note E_, 4
-	note D#, 4
+	B_ 4
+	A# 4
+	G_ 4
+	F# 4
+	G_ 4
+	F# 4
+	E_ 4
+	D# 4
 	callchannel Music_Dungeon1_branch_7e15e
 	rest 12
 	callchannel Music_Dungeon1_branch_7e15e
@@ -488,7 +488,7 @@
 	rest 12
 	callchannel Music_Dungeon1_branch_7e15e
 	rest 10
-	note E_, 1
+	E_ 1
 	rest 1
 	callchannel Music_Dungeon1_branch_7e15e
 	rest 12
@@ -496,17 +496,17 @@
 	rest 12
 	callchannel Music_Dungeon1_branch_7e15e
 	rest 10
-	note D_, 1
-	note D#, 1
+	D_ 1
+	D# 1
 	callchannel Music_Dungeon1_branch_7e164
 	callchannel Music_Dungeon1_branch_7e164
-	note E_, 2
+	E_ 2
 	rest 4
 	callchannel Music_Dungeon1_branch_7e177
-	note B_, 8
-	note F#, 6
-	note D_, 1
-	note D#, 1
+	B_ 8
+	F# 6
+	D_ 1
+	D# 1
 	rest 16
 	rest 16
 	loopchannel 0, Music_Dungeon1_branch_7e0e5
@@ -513,86 +513,86 @@
 
 Music_Dungeon1_branch_7e140::
 	octave 5
-	note E_, 4
-	note B_, 4
-	note A#, 4
+	E_ 4
+	B_ 4
+	A# 4
 	octave 6
-	note D_, 4
-	note C#, 4
+	D_ 4
+	C# 4
 	octave 5
-	note G#, 4
-	note G_, 4
-	note B_, 4
-	note A#, 4
-	note E_, 4
-	note D#, 4
-	note A_, 4
-	note G#, 4
-	note E_, 4
-	note F#, 4
-	note D#, 4
+	G# 4
+	G_ 4
+	B_ 4
+	A# 4
+	E_ 4
+	D# 4
+	A_ 4
+	G# 4
+	E_ 4
+	F# 4
+	D# 4
 	endchannel
 
 Music_Dungeon1_branch_7e154::
 	octave 6
-	note E_, 1
-	note E_, 1
+	E_ 1
+	E_ 1
 	rest 4
 	octave 3
-	note E_, 1
+	E_ 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 1
 	endchannel
 
 Music_Dungeon1_branch_7e15e::
 	octave 3
-	note E_, 1
-	note G_, 1
-	note E_, 1
-	note D#, 1
+	E_ 1
+	G_ 1
+	E_ 1
+	D# 1
 	endchannel
 
 Music_Dungeon1_branch_7e164::
-	note E_, 4
-	note B_, 4
-	note A#, 4
+	E_ 4
+	B_ 4
+	A# 4
 	octave 4
-	note D_, 4
-	note C#, 4
+	D_ 4
+	C# 4
 	octave 3
-	note G#, 4
-	note G_, 4
-	note B_, 4
-	note A#, 4
-	note E_, 4
-	note D#, 4
-	note A_, 4
-	note G#, 4
-	note E_, 4
-	note F#, 4
-	note D#, 4
+	G# 4
+	G_ 4
+	B_ 4
+	A# 4
+	E_ 4
+	D# 4
+	A_ 4
+	G# 4
+	E_ 4
+	F# 4
+	D# 4
 	endchannel
 
 Music_Dungeon1_branch_7e177::
 	octave 4
-	note E_, 1
+	E_ 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 1
-	note F#, 4
+	F# 4
 	rest 6
-	note E_, 1
+	E_ 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 1
-	note G_, 4
+	G_ 4
 	rest 6
-	note E_, 1
+	E_ 1
 	rest 3
-	note E_, 1
-	note E_, 1
-	note A#, 4
+	E_ 1
+	E_ 1
+	A# 4
 	endchannel
 
 
@@ -599,25 +599,25 @@
 Music_Dungeon1_Ch4:: ; 7e18a (1f:618a)
 	dspeed 12
 	rest 14
-	dnote 1, cymbal1
-	dnote 1, cymbal1
+	cymbal1 1
+	cymbal1 1
 
 Music_Dungeon1_branch_7e190::
 	callchannel Music_Dungeon1_branch_7e1f1
 	loopchannel 3, Music_Dungeon1_branch_7e190
-	dnote 4, cymbal2
-	dnote 4, cymbal1
-	dnote 4, cymbal2
-	dnote 2, cymbal1
-	dnote 2, cymbal1
+	cymbal2 4
+	cymbal1 4
+	cymbal2 4
+	cymbal1 2
+	cymbal1 2
 
 Music_Dungeon1_branch_7e1a1::
 	callchannel Music_Dungeon1_branch_7e1f1
 	loopchannel 3, Music_Dungeon1_branch_7e1a1
-	dnote 4, cymbal2
-	dnote 4, cymbal1
-	dnote 4, cymbal2
-	dnote 4, cymbal2
+	cymbal2 4
+	cymbal1 4
+	cymbal2 4
+	cymbal2 4
 
 Music_Dungeon1_branch_7e1b0::
 	callchannel Music_Dungeon1_branch_7e1fa
@@ -628,12 +628,12 @@
 	callchannel Music_Dungeon1_branch_7e1fa
 	loopchannel 3, Music_Dungeon1_branch_7e1ba
 	callchannel Music_Dungeon1_branch_7e202
-	dnote 4, snare7
-	dnote 4, snare8
-	dnote 4, snare8
+	snare7 4
+	snare8 4
+	snare8 4
 	rest 2
-	dnote 2, snare7
-	dnote 4, cymbal2
+	snare7 2
+	cymbal2 4
 
 Music_Dungeon1_branch_7e1cf::
 	rest 16
@@ -643,34 +643,34 @@
 Music_Dungeon1_branch_7e1d5::
 	callchannel Music_Dungeon1_branch_7e1fa
 	loopchannel 3, Music_Dungeon1_branch_7e1d5
-	dnote 4, cymbal1
-	dnote 4, cymbal1
-	dnote 4, cymbal1
+	cymbal1 4
+	cymbal1 4
+	cymbal1 4
 	rest 2
-	dnote 1, cymbal1
-	dnote 1, cymbal1
+	cymbal1 1
+	cymbal1 1
 	callchannel Music_Dungeon1_branch_7e1f1
 	callchannel Music_Dungeon1_branch_7e1f1
 	loopchannel 0, Music_Dungeon1_branch_7e190
 
 Music_Dungeon1_branch_7e1f1::
-	dnote 4, cymbal2
-	dnote 4, cymbal1
-	dnote 4, cymbal2
-	dnote 4, cymbal1
+	cymbal2 4
+	cymbal1 4
+	cymbal2 4
+	cymbal1 4
 	endchannel
 
 Music_Dungeon1_branch_7e1fa::
-	dnote 1, cymbal1
-	dnote 1, cymbal1
+	cymbal1 1
+	cymbal1 1
 	rest 10
-	dnote 4, cymbal3
+	cymbal3 4
 	endchannel
 
 Music_Dungeon1_branch_7e202::
-	dnote 4, snare7
-	dnote 4, snare8
-	dnote 4, snare8
-	dnote 4, snare9
+	snare7 4
+	snare8 4
+	snare8 4
+	snare9 4
 	endchannel
-; 0x7e20b
\ No newline at end of file
+; 0x7e20b
--- a/audio/music/dungeon2.asm
+++ b/audio/music/dungeon2.asm
@@ -8,57 +8,57 @@
 Music_Dungeon2_branch_7e892::
 	notetype 12, 11, 2
 	octave 4
-	note E_, 4
-	note E_, 4
-	note E_, 4
-	note E_, 4
-	note A#, 4
-	note A#, 4
-	note A#, 4
-	note A#, 4
-	note E_, 4
-	note E_, 4
-	note E_, 4
-	note E_, 4
+	E_ 4
+	E_ 4
+	E_ 4
+	E_ 4
+	A# 4
+	A# 4
+	A# 4
+	A# 4
+	E_ 4
+	E_ 4
+	E_ 4
+	E_ 4
 	octave 5
-	note C#, 4
-	note C#, 4
-	note C#, 4
-	note C#, 4
+	C# 4
+	C# 4
+	C# 4
+	C# 4
 	octave 3
-	note E_, 4
-	note E_, 4
-	note E_, 4
-	note E_, 4
-	note A#, 4
-	note A#, 4
-	note A#, 4
-	note A#, 4
+	E_ 4
+	E_ 4
+	E_ 4
+	E_ 4
+	A# 4
+	A# 4
+	A# 4
+	A# 4
 	octave 2
-	note G_, 2
-	note A#, 4
-	note G_, 2
+	G_ 2
+	A# 4
+	G_ 2
 	octave 3
-	note C#, 4
+	C# 4
 	octave 2
-	note G_, 2
-	note A#, 2
-	note B_, 2
-	note G_, 2
+	G_ 2
+	A# 2
+	B_ 2
+	G_ 2
 	octave 3
-	note C#, 4
+	C# 4
 	octave 2
-	note G_, 2
-	note A_, 4
-	note F#, 2
+	G_ 2
+	A_ 4
+	F# 2
 	loopchannel 2, Music_Dungeon2_branch_7e892
 	notetype 12, 1, 15
 	octave 3
-	note E_, 16
-	note C_, 16
-	note D_, 16
+	E_ 16
+	C_ 16
+	D_ 16
 	octave 2
-	note A#, 16
+	A# 16
 	rest 16
 	rest 16
 	rest 16
@@ -77,77 +77,77 @@
 	duty 3
 	notetype 12, 12, 2
 	octave 3
-	note E_, 4
-	note E_, 4
-	note E_, 4
-	note E_, 4
-	note C_, 4
-	note C_, 4
-	note C_, 4
-	note C_, 4
-	note E_, 4
-	note E_, 4
-	note E_, 4
-	note E_, 4
-	note C_, 4
-	note C_, 4
-	note C_, 4
-	note C_, 4
-	note B_, 4
-	note B_, 4
-	note B_, 4
-	note B_, 4
+	E_ 4
+	E_ 4
+	E_ 4
+	E_ 4
+	C_ 4
+	C_ 4
+	C_ 4
+	C_ 4
+	E_ 4
+	E_ 4
+	E_ 4
+	E_ 4
+	C_ 4
+	C_ 4
+	C_ 4
+	C_ 4
+	B_ 4
+	B_ 4
+	B_ 4
+	B_ 4
 	octave 4
-	note F#, 4
-	note F#, 4
-	note F#, 4
-	note F#, 4
-	note D_, 4
-	note D_, 4
-	note D_, 4
-	note D_, 4
-	note G_, 4
-	note G_, 4
-	note G_, 4
-	note F#, 4
+	F# 4
+	F# 4
+	F# 4
+	F# 4
+	D_ 4
+	D_ 4
+	D_ 4
+	D_ 4
+	G_ 4
+	G_ 4
+	G_ 4
+	F# 4
 	loopchannel 2, Music_Dungeon2_branch_7e8db
 	octave 3
-	note E_, 2
-	note G_, 2
-	note E_, 2
-	note D#, 2
-	note E_, 2
-	note E_, 2
+	E_ 2
+	G_ 2
+	E_ 2
+	D# 2
+	E_ 2
+	E_ 2
 	octave 5
-	note E_, 2
+	E_ 2
 	rest 2
-	note D#, 2
+	D# 2
 	rest 2
-	note D_, 2
+	D_ 2
 	rest 2
-	note C#, 2
-	note C_, 2
+	C# 2
+	C_ 2
 	octave 4
-	note E_, 2
-	note G_, 2
+	E_ 2
+	G_ 2
 	octave 3
-	note A#, 2
-	note C#, 2
-	note A#, 2
-	note A_, 2
-	note A#, 2
-	note G_, 2
+	A# 2
+	C# 2
+	A# 2
+	A_ 2
+	A# 2
+	G_ 2
 	octave 5
-	note G_, 2
+	G_ 2
 	rest 2
-	note F#, 2
+	F# 2
 	rest 2
-	note F_, 2
+	F_ 2
 	rest 2
-	note E_, 2
-	note D#, 2
-	note D_, 2
-	note C#, 2
+	E_ 2
+	D# 2
+	D_ 2
+	C# 2
 	rest 16
 	rest 16
 	rest 16
@@ -155,10 +155,10 @@
 	notetype 12, 12, 7
 	duty 1
 	octave 4
-	note E_, 16
-	note D_, 16
-	note C_, 16
-	note D_, 16
+	E_ 16
+	D_ 16
+	C_ 16
+	D_ 16
 	loopchannel 0, Music_Dungeon2_branch_7e8db
 
 
@@ -169,92 +169,92 @@
 Music_Dungeon2_branch_7e940::
 	callchannel Music_Dungeon2_branch_7e9d1
 	loopchannel 16, Music_Dungeon2_branch_7e940
-	note E_, 4
+	E_ 4
 	rest 4
 	rest 4
-	note E_, 4
-	note C_, 4
+	E_ 4
+	C_ 4
 	rest 4
 	rest 4
-	note C_, 4
-	note D_, 4
+	C_ 4
+	D_ 4
 	rest 4
 	rest 4
-	note D_, 4
+	D_ 4
 	octave 3
-	note A#, 4
+	A# 4
 	rest 4
 	rest 4
-	note A#, 4
+	A# 4
 
 Music_Dungeon2_branch_7e958::
 	octave 5
-	note E_, 2
+	E_ 2
 	rest 2
-	note B_, 2
+	B_ 2
 	rest 2
-	note A#, 2
+	A# 2
 	rest 2
 	octave 6
-	note D_, 2
+	D_ 2
 	rest 2
-	note C#, 2
+	C# 2
 	rest 2
 	octave 5
-	note G#, 2
+	G# 2
 	rest 2
-	note G_, 2
+	G_ 2
 	rest 2
-	note B_, 2
+	B_ 2
 	rest 2
-	note A#, 2
+	A# 2
 	rest 2
-	note E_, 2
+	E_ 2
 	rest 2
-	note D#, 2
+	D# 2
 	rest 2
-	note A_, 2
+	A_ 2
 	rest 2
-	note G#, 2
+	G# 2
 	rest 2
-	note E_, 2
+	E_ 2
 	rest 2
-	note F#, 2
+	F# 2
 	rest 2
-	note D#, 2
+	D# 2
 	rest 2
 	loopchannel 3, Music_Dungeon2_branch_7e958
 	octave 4
-	note E_, 4
-	note B_, 4
-	note A#, 4
+	E_ 4
+	B_ 4
+	A# 4
 	octave 5
-	note D_, 4
-	note C#, 4
+	D_ 4
+	C# 4
 	octave 4
-	note G#, 4
-	note G_, 4
-	note B_, 4
-	note A#, 4
-	note E_, 4
-	note D#, 4
-	note A_, 4
-	note G#, 4
-	note E_, 4
-	note F#, 4
-	note D#, 4
+	G# 4
+	G_ 4
+	B_ 4
+	A# 4
+	E_ 4
+	D# 4
+	A_ 4
+	G# 4
+	E_ 4
+	F# 4
+	D# 4
 	octave 3
-	note E_, 16
-	note C_, 16
-	note D_, 16
+	E_ 16
+	C_ 16
+	D_ 16
 	octave 2
-	note A#, 16
+	A# 16
 	octave 3
-	note E_, 16
-	note F_, 16
-	note G_, 16
+	E_ 16
+	F_ 16
+	G_ 16
 	octave 3
-	note B_, 16
+	B_ 16
 	rest 16
 	rest 16
 	rest 16
@@ -269,36 +269,36 @@
 	callchannel Music_Dungeon2_branch_7e9d1
 	loopchannel 0, Music_Dungeon2_branch_7e940
 	octave 2
-	note G_, 2
-	note A#, 4
-	note G_, 2
+	G_ 2
+	A# 4
+	G_ 2
 	octave 3
-	note C#, 4
+	C# 4
 	octave 2
-	note G_, 2
-	note A_, 2
-	note A#, 2
-	note G_, 2
+	G_ 2
+	A_ 2
+	A# 2
+	G_ 2
 	octave 3
-	note C#, 4
+	C# 4
 	octave 2
-	note G_, 2
-	note A#, 2
-	note G_, 2
+	G_ 2
+	A# 2
+	G_ 2
 	rest 2
 	endchannel
 
 Music_Dungeon2_branch_7e9d1::
 	octave 4
-	note E_, 2
+	E_ 2
 	rest 4
 	octave 3
-	note E_, 1
+	E_ 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 1
 	octave 4
-	note F#, 4
+	F# 4
 	endchannel
 
 
@@ -306,13 +306,13 @@
 	dspeed 12
 
 Music_Dungeon2_branch_7e9dd::
-	dnote 4, cymbal1
-	dnote 4, cymbal2
-	dnote 4, cymbal1
-	dnote 4, snare8
-	dnote 4, cymbal1
-	dnote 4, cymbal2
-	dnote 4, snare9
-	dnote 4, snare7
+	cymbal1 4
+	cymbal2 4
+	cymbal1 4
+	snare8 4
+	cymbal1 4
+	cymbal2 4
+	snare9 4
+	snare7 4
 	loopchannel 0, Music_Dungeon2_branch_7e9dd
-; 0x7e9f1
\ No newline at end of file
+; 0x7e9f1
--- a/audio/music/dungeon3.asm
+++ b/audio/music/dungeon3.asm
@@ -12,17 +12,17 @@
 	callchannel Music_Dungeon3_branch_7eab2
 	loopchannel 3, Music_Dungeon3_branch_7e9fe
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note D#, 2
-	note G_, 2
+	D# 2
+	G_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note D#, 2
-	note G_, 2
-	note D#, 2
-	note E_, 2
+	D# 2
+	G_ 2
+	D# 2
+	E_ 2
 
 Music_Dungeon3_branch_7ea11::
 	callchannel Music_Dungeon3_branch_7eac1
@@ -32,32 +32,32 @@
 	callchannel Music_Dungeon3_branch_7eab2
 	loopchannel 4, Music_Dungeon3_branch_7ea18
 	octave 4
-	note F_, 2
-	note F_, 2
+	F_ 2
+	F_ 2
 	rest 2
-	note F_, 2
-	note E_, 2
-	note E_, 2
-	note D#, 2
-	note D#, 2
+	F_ 2
+	E_ 2
+	E_ 2
+	D# 2
+	D# 2
 	rest 2
-	note D#, 2
-	note D_, 2
-	note D_, 2
+	D# 2
+	D_ 2
+	D_ 2
 	callchannel Music_Dungeon3_branch_7eafc
 	octave 4
-	note D_, 2
-	note D_, 2
+	D_ 2
+	D_ 2
 	rest 2
-	note D_, 2
-	note D#, 2
-	note D#, 2
-	note E_, 2
-	note E_, 2
+	D_ 2
+	D# 2
+	D# 2
+	E_ 2
+	E_ 2
 	rest 2
-	note E_, 2
-	note F_, 2
-	note F_, 2
+	E_ 2
+	F_ 2
+	F_ 2
 
 Music_Dungeon3_branch_7ea3c::
 	callchannel Music_Dungeon3_branch_7eace
@@ -67,84 +67,84 @@
 	callchannel Music_Dungeon3_branch_7eadd
 	loopchannel 3, Music_Dungeon3_branch_7ea43
 	octave 3
-	note C#, 2
+	C# 2
 	octave 2
-	note A_, 2
-	note F_, 2
+	A_ 2
+	F_ 2
 	octave 3
-	note C#, 2
+	C# 2
 	octave 2
-	note A_, 2
-	note F_, 2
+	A_ 2
+	F_ 2
 	octave 3
-	note A_, 2
-	note F_, 2
+	A_ 2
+	F_ 2
 	octave 4
-	note C#, 2
+	C# 2
 	octave 3
-	note A_, 2
-	note F_, 2
+	A_ 2
+	F_ 2
 	octave 4
-	note C#, 2
+	C# 2
 	octave 3
-	note A_, 2
-	note F_, 2
-	note A_, 2
-	note F_, 2
+	A_ 2
+	F_ 2
+	A_ 2
+	F_ 2
 	octave 4
-	note C#, 2
+	C# 2
 	octave 3
-	note A_, 2
-	note F_, 2
+	A_ 2
+	F_ 2
 	octave 4
-	note C#, 2
+	C# 2
 	octave 3
-	note A_, 2
-	note F_, 2
+	A_ 2
+	F_ 2
 	octave 4
-	note C#, 2
+	C# 2
 	octave 3
-	note A_, 2
-	note F_, 2
+	A_ 2
+	F_ 2
 	octave 4
-	note C#, 2
+	C# 2
 	octave 3
-	note A_, 2
-	note F_, 2
+	A_ 2
+	F_ 2
 	octave 4
-	note C#, 2
+	C# 2
 	octave 3
-	note A_, 2
-	note F_, 2
+	A_ 2
+	F_ 2
 	octave 4
-	note C#, 2
+	C# 2
 	octave 3
-	note A_, 2
-	note F_, 2
-	note G#, 2
-	note E_, 2
+	A_ 2
+	F_ 2
+	G# 2
+	E_ 2
 	octave 4
-	note C_, 2
+	C_ 2
 	octave 3
-	note G#, 2
-	note E_, 2
+	G# 2
+	E_ 2
 	octave 4
-	note C_, 2
+	C_ 2
 	callchannel Music_Dungeon3_branch_7eaea
 	callchannel Music_Dungeon3_branch_7eaea
 	octave 3
-	note G#, 2
-	note E_, 2
+	G# 2
+	E_ 2
 	octave 4
-	note C_, 2
+	C_ 2
 	octave 3
-	note G#, 2
-	note E_, 2
+	G# 2
+	E_ 2
 	octave 4
-	note C_, 2
+	C_ 2
 	octave 3
-	note G#, 2
-	note E_, 2
+	G# 2
+	E_ 2
 	rest 16
 	rest 8
 	callchannel Music_Dungeon3_branch_7eaf7
@@ -151,7 +151,7 @@
 	callchannel Music_Dungeon3_branch_7eaf7
 	callchannel Music_Dungeon3_branch_7eaf7
 	callchannel Music_Dungeon3_branch_7eaf7
-	note D#, 2
+	D# 2
 	rest 16
 	rest 16
 	loopchannel 0, Music_Dungeon3_branch_7e9fc
@@ -158,179 +158,179 @@
 
 Music_Dungeon3_branch_7eab2::
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note D#, 2
-	note G_, 2
+	D# 2
+	G_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note D#, 2
-	note G_, 2
+	D# 2
+	G_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note D#, 2
+	D# 2
 	endchannel
 
 Music_Dungeon3_branch_7eac1::
-	note E_, 2
-	note G#, 2
+	E_ 2
+	G# 2
 	octave 4
-	note C_, 2
+	C_ 2
 	octave 3
-	note E_, 2
-	note G#, 2
+	E_ 2
+	G# 2
 	octave 4
-	note C_, 2
+	C_ 2
 	octave 3
-	note E_, 2
-	note G#, 2
+	E_ 2
+	G# 2
 	endchannel
 
 Music_Dungeon3_branch_7eace::
 	octave 3
-	note D#, 2
+	D# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note G_, 2
-	note D#, 2
+	G_ 2
+	D# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note G_, 2
-	note D#, 2
+	G_ 2
+	D# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	endchannel
 
 Music_Dungeon3_branch_7eadd::
-	note A_, 2
-	note F_, 2
+	A_ 2
+	F_ 2
 	octave 3
-	note C#, 2
+	C# 2
 	octave 2
-	note A_, 2
-	note F_, 2
+	A_ 2
+	F_ 2
 	octave 3
-	note C#, 2
+	C# 2
 	octave 2
-	note A_, 2
-	note F_, 2
+	A_ 2
+	F_ 2
 	endchannel
 
 Music_Dungeon3_branch_7eaea::
 	octave 3
-	note G#, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
+	G# 2
+	E_ 2
+	G# 2
+	E_ 2
 	octave 4
-	note C_, 2
+	C_ 2
 	octave 3
-	note G#, 2
-	note E_, 2
+	G# 2
+	E_ 2
 	octave 4
-	note C_, 2
+	C_ 2
 	endchannel
 
 Music_Dungeon3_branch_7eaf7::
-	note D#, 2
-	note G_, 2
-	note D#, 2
-	note C#, 6
+	D# 2
+	G_ 2
+	D# 2
+	C# 6
 	endchannel
 
 Music_Dungeon3_branch_7eafc::
 	tempo 168
 	octave 1
-	note A#, 1
-	note B_, 1
+	A# 1
+	B_ 1
 	octave 2
-	note C_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note F_, 1
+	C_ 1
+	C# 1
+	D_ 1
+	D# 1
+	E_ 1
+	F_ 1
 	tempo 176
 	octave 1
-	note A#, 1
-	note B_, 1
+	A# 1
+	B_ 1
 	octave 2
-	note C_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note F_, 1
+	C_ 1
+	C# 1
+	D_ 1
+	D# 1
+	E_ 1
+	F_ 1
 	tempo 184
 	octave 1
-	note A#, 1
-	note B_, 1
+	A# 1
+	B_ 1
 	octave 2
-	note C_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note F_, 1
+	C_ 1
+	C# 1
+	D_ 1
+	D# 1
+	E_ 1
+	F_ 1
 	tempo 192
 	octave 1
-	note A_, 1
-	note A#, 1
-	note B_, 1
+	A_ 1
+	A# 1
+	B_ 1
 	octave 2
-	note C_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
+	C_ 1
+	C# 1
+	D_ 1
+	D# 1
+	E_ 1
 	tempo 200
 	octave 1
-	note G#, 1
-	note A_, 1
-	note A#, 1
-	note B_, 1
+	G# 1
+	A_ 1
+	A# 1
+	B_ 1
 	octave 2
-	note C_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
+	C_ 1
+	C# 1
+	D_ 1
+	D# 1
 	tempo 208
 	octave 1
-	note G_, 1
-	note G#, 1
-	note A_, 1
-	note A#, 1
-	note B_, 1
+	G_ 1
+	G# 1
+	A_ 1
+	A# 1
+	B_ 1
 	octave 2
-	note C_, 1
-	note C#, 1
-	note D_, 1
+	C_ 1
+	C# 1
+	D_ 1
 	tempo 216
 	octave 1
-	note F#, 1
-	note G_, 1
-	note G#, 1
-	note A_, 1
-	note A#, 1
-	note B_, 1
+	F# 1
+	G_ 1
+	G# 1
+	A_ 1
+	A# 1
+	B_ 1
 	octave 2
-	note C_, 1
-	note C#, 1
+	C_ 1
+	C# 1
 	tempo 224
 	octave 1
-	note F_, 1
-	note F#, 1
-	note G_, 1
-	note G#, 1
-	note A_, 1
-	note A#, 1
-	note B_, 1
+	F_ 1
+	F# 1
+	G_ 1
+	G# 1
+	A_ 1
+	A# 1
+	B_ 1
 	octave 2
-	note C_, 1
+	C_ 1
 	tempo 160
 	endchannel
 
@@ -342,91 +342,91 @@
 Music_Dungeon3_branch_7eb6d::
 	notetype 12, 13, 3
 	octave 4
-	note D#, 6
-	note C#, 6
+	D# 6
+	C# 6
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note C#, 2
-	note D#, 2
-	note G_, 2
-	note D#, 2
-	note C#, 6
+	C# 2
+	D# 2
+	G_ 2
+	D# 2
+	C# 6
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note C#, 2
-	note D#, 2
-	note G_, 2
-	note D#, 2
-	note C#, 6
+	C# 2
+	D# 2
+	G_ 2
+	D# 2
+	C# 6
 	octave 3
-	note B_, 2
-	note A#, 2
-	note B_, 6
+	B_ 2
+	A# 2
+	B_ 6
 	octave 4
-	note C#, 8
+	C# 8
 	rest 2
-	note G#, 6
-	note F#, 6
-	note E_, 2
-	note F#, 2
-	note G#, 2
+	G# 6
+	F# 6
+	E_ 2
+	F# 2
+	G# 2
 	octave 5
-	note C_, 2
+	C_ 2
 	octave 4
-	note G#, 2
-	note F#, 6
-	note E_, 2
-	note F#, 2
-	note G#, 2
+	G# 2
+	F# 6
+	E_ 2
+	F# 2
+	G# 2
 	octave 5
-	note C_, 2
+	C_ 2
 	octave 4
-	note G#, 2
-	note F#, 6
-	note E_, 2
-	note D#, 2
-	note E_, 6
-	note F#, 6
-	note E_, 4
-	note D#, 6
-	note C#, 6
+	G# 2
+	F# 6
+	E_ 2
+	D# 2
+	E_ 6
+	F# 6
+	E_ 4
+	D# 6
+	C# 6
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note C#, 2
-	note D#, 2
-	note G_, 2
-	note D#, 2
-	note C#, 6
+	C# 2
+	D# 2
+	G_ 2
+	D# 2
+	C# 6
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note C#, 2
-	note D#, 2
-	note G_, 2
-	note D#, 2
-	note C#, 6
+	C# 2
+	D# 2
+	G_ 2
+	D# 2
+	C# 6
 	octave 3
-	note B_, 2
-	note A#, 2
-	note B_, 6
+	B_ 2
+	A# 2
+	B_ 6
 	octave 4
-	note C#, 8
+	C# 8
 	rest 2
-	note G#, 2
-	note G#, 2
+	G# 2
+	G# 2
 	rest 2
-	note G#, 2
-	note A_, 2
-	note A_, 2
-	note A#, 2
-	note A#, 2
+	G# 2
+	A_ 2
+	A_ 2
+	A# 2
+	A# 2
 	rest 2
-	note A#, 2
-	note B_, 2
-	note B_, 2
+	A# 2
+	B_ 2
+	B_ 2
 	rest 8
 	rest 8
 	rest 8
@@ -436,174 +436,174 @@
 	rest 8
 	rest 8
 	octave 4
-	note B_, 2
-	note B_, 2
+	B_ 2
+	B_ 2
 	rest 2
-	note B_, 2
-	note A#, 2
-	note A#, 2
-	note A_, 2
-	note A_, 2
+	B_ 2
+	A# 2
+	A# 2
+	A_ 2
+	A_ 2
 	rest 2
-	note A_, 2
-	note G#, 2
-	note G#, 2
-	note C#, 8
+	A_ 2
+	G# 2
+	G# 2
+	C# 8
 	rest 2
 	octave 3
-	note B_, 6
-	note A#, 2
-	note B_, 2
+	B_ 6
+	A# 2
+	B_ 2
 	octave 4
-	note D#, 2
-	note G_, 2
-	note D#, 2
-	note C#, 6
+	D# 2
+	G_ 2
+	D# 2
+	C# 6
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note C#, 2
-	note D#, 2
-	note G_, 2
-	note D#, 2
-	note C#, 6
+	C# 2
+	D# 2
+	G_ 2
+	D# 2
+	C# 6
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note C#, 2
-	note D#, 6
-	note G_, 6
+	C# 2
+	D# 6
+	G_ 6
 	octave 3
-	note G_, 8
+	G_ 8
 	rest 2
-	note F_, 6
-	note E_, 2
-	note F_, 2
-	note A_, 2
+	F_ 6
+	E_ 2
+	F_ 2
+	A_ 2
 	octave 4
-	note C#, 2
+	C# 2
 	octave 3
-	note A_, 2
-	note G_, 6
-	note F_, 2
-	note G_, 2
-	note A_, 2
+	A_ 2
+	G_ 6
+	F_ 2
+	G_ 2
+	A_ 2
 	octave 4
-	note C#, 2
+	C# 2
 	octave 3
-	note A_, 2
-	note G_, 6
-	note A_, 6
+	A_ 2
+	G_ 6
+	A_ 6
 	octave 4
-	note C#, 6
-	note G_, 8
+	C# 6
+	G_ 8
 	rest 2
-	note F_, 6
-	note E_, 2
-	note F_, 2
-	note A_, 2
+	F_ 6
+	E_ 2
+	F_ 2
+	A_ 2
 	octave 5
-	note C#, 2
+	C# 2
 	octave 4
-	note A_, 2
-	note G_, 6
-	note A_, 2
+	A_ 2
+	G_ 6
+	A_ 2
 	octave 5
-	note C#, 2
+	C# 2
 	octave 4
-	note A_, 2
-	note G_, 6
-	note A_, 6
+	A_ 2
+	G_ 6
+	A_ 6
 	octave 5
-	note C#, 6
+	C# 6
 	octave 4
-	note F#, 8
+	F# 8
 	rest 2
-	note E_, 6
-	note D#, 2
-	note E_, 2
-	note G#, 2
+	E_ 6
+	D# 2
+	E_ 2
+	G# 2
 	octave 5
-	note C_, 2
+	C_ 2
 	octave 4
-	note G#, 2
-	note F#, 6
-	note E_, 2
-	note F#, 2
-	note G#, 2
+	G# 2
+	F# 6
+	E_ 2
+	F# 2
+	G# 2
 	octave 5
-	note C_, 2
+	C_ 2
 	octave 4
-	note G#, 2
-	note F#, 6
-	note G#, 6
+	G# 2
+	F# 6
+	G# 6
 	octave 5
-	note C_, 6
+	C_ 6
 	octave 3
-	note D#, 2
-	note G_, 2
-	note D#, 2
-	note C#, 6
-	note D#, 2
-	note G_, 2
-	note D#, 2
-	note C#, 6
+	D# 2
+	G_ 2
+	D# 2
+	C# 6
+	D# 2
+	G_ 2
+	D# 2
+	C# 6
 	octave 2
-	note E_, 2
-	note G#, 2
+	E_ 2
+	G# 2
 	octave 3
-	note C_, 2
-	note E_, 2
-	note G#, 2
+	C_ 2
+	E_ 2
+	G# 2
 	octave 4
-	note C_, 2
-	note E_, 2
-	note G#, 2
-	note C_, 2
-	note E_, 2
-	note G#, 2
-	note C_, 2
-	note E_, 2
-	note G#, 2
-	note C_, 2
-	note E_, 2
-	note G#, 2
-	note C_, 2
-	note E_, 2
-	note G#, 2
-	note C_, 2
-	note E_, 2
-	note G#, 2
-	note C_, 2
-	note D#, 2
+	C_ 2
+	E_ 2
+	G# 2
+	C_ 2
+	E_ 2
+	G# 2
+	C_ 2
+	E_ 2
+	G# 2
+	C_ 2
+	E_ 2
+	G# 2
+	C_ 2
+	E_ 2
+	G# 2
+	C_ 2
+	E_ 2
+	G# 2
+	C_ 2
+	D# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note D#, 2
-	note G_, 2
+	D# 2
+	G_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note D#, 2
-	note G_, 2
+	D# 2
+	G_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note D#, 2
+	D# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note D#, 2
-	note G_, 2
+	D# 2
+	G_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note D#, 2
-	note G_, 2
+	D# 2
+	G_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note D#, 2
+	D# 2
 	loopchannel 0, Music_Dungeon3_branch_7eb6d
 
 
@@ -623,66 +623,66 @@
 	rest 12
 	notetype 6, 1, 0
 	octave 3
-	note B_, 1
+	B_ 1
 	octave 4
-	note C_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
+	C_ 1
+	C# 1
+	D_ 1
+	D# 1
+	E_ 1
 	rest 2
-	note C_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note F_, 1
+	C_ 1
+	C# 1
+	D_ 1
+	D# 1
+	E_ 1
+	F_ 1
 	rest 16
 	rest 16
 	rest 10
 	octave 5
-	note E_, 8
+	E_ 8
 	octave 4
-	note B_, 8
+	B_ 8
 	octave 5
-	note D#, 8
+	D# 8
 	octave 4
-	note A#, 8
+	A# 8
 	octave 5
-	note D_, 8
+	D_ 8
 	octave 4
-	note A_, 8
+	A_ 8
 	octave 5
-	note C#, 8
+	C# 8
 	octave 4
-	note G#, 8
+	G# 8
 	octave 5
-	note C_, 8
+	C_ 8
 	octave 4
-	note G_, 8
-	note B_, 8
-	note F#, 8
-	note A#, 8
-	note F_, 8
-	note A_, 8
-	note E_, 8
+	G_ 8
+	B_ 8
+	F# 8
+	A# 8
+	F_ 8
+	A_ 8
+	E_ 8
 	rest 16
 	rest 16
 	rest 8
-	note F_, 1
-	note E_, 1
-	note D#, 1
-	note D_, 1
-	note C#, 1
-	note C_, 1
+	F_ 1
+	E_ 1
+	D# 1
+	D_ 1
+	C# 1
+	C_ 1
 	rest 2
-	note E_, 1
-	note D#, 1
-	note D_, 1
-	note C#, 1
-	note C_, 1
+	E_ 1
+	D# 1
+	D_ 1
+	C# 1
+	C_ 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 10
 	rest 16
 	notetype 12, 1, 0
@@ -754,4 +754,4 @@
 	rest 16
 	rest 10
 	endchannel
-; 0x7ed0f
\ No newline at end of file
+; 0x7ed0f
--- a/audio/music/finalbattle.asm
+++ b/audio/music/finalbattle.asm
@@ -6,378 +6,378 @@
 	toggleperfectpitch
 	notetype 12, 11, 2
 	octave 3
-	note F#, 1
-	note F_, 1
-	note F#, 1
-	note G_, 1
-	note F#, 1
-	note G_, 1
-	note G#, 1
-	note G_, 1
+	F# 1
+	F_ 1
+	F# 1
+	G_ 1
+	F# 1
+	G_ 1
+	G# 1
+	G_ 1
 	notetype 12, 10, 2
-	note G#, 1
-	note A_, 1
-	note G#, 1
-	note A_, 1
-	note A#, 1
-	note A_, 1
-	note A#, 1
-	note B_, 1
+	G# 1
+	A_ 1
+	G# 1
+	A_ 1
+	A# 1
+	A_ 1
+	A# 1
+	B_ 1
 	notetype 12, 9, 2
-	note A#, 1
-	note B_, 1
+	A# 1
+	B_ 1
 	octave 4
-	note C_, 1
+	C_ 1
 	octave 3
-	note B_, 1
+	B_ 1
 	octave 4
-	note C_, 1
-	note C#, 1
-	note C_, 1
-	note C#, 1
+	C_ 1
+	C# 1
+	C_ 1
+	C# 1
 	notetype 12, 8, 2
-	note D_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note D#, 1
+	D_ 1
+	C# 1
+	D_ 1
+	D# 1
+	D_ 1
+	D# 1
+	E_ 1
+	D# 1
 	notetype 12, 12, 1
 	octave 3
-	note E_, 1
-	note E_, 7
-	note F_, 1
-	note F_, 7
-	note G_, 1
-	note G_, 7
-	note F_, 1
-	note F_, 7
-	note E_, 1
-	note E_, 7
-	note F_, 1
-	note F_, 7
-	note G_, 1
-	note G_, 7
-	note G#, 1
-	note G#, 3
-	note D#, 4
+	E_ 1
+	E_ 7
+	F_ 1
+	F_ 7
+	G_ 1
+	G_ 7
+	F_ 1
+	F_ 7
+	E_ 1
+	E_ 7
+	F_ 1
+	F_ 7
+	G_ 1
+	G_ 7
+	G# 1
+	G# 3
+	D# 4
 	notetype 12, 12, 1
-	note E_, 1
-	note E_, 3
+	E_ 1
+	E_ 3
 	notetype 12, 11, 3
-	note E_, 4
+	E_ 4
 	notetype 12, 12, 1
-	note F_, 1
-	note F_, 3
+	F_ 1
+	F_ 3
 	notetype 12, 11, 3
-	note F_, 4
+	F_ 4
 	notetype 12, 12, 1
-	note G_, 1
-	note G_, 3
+	G_ 1
+	G_ 3
 	notetype 12, 11, 3
-	note G_, 4
+	G_ 4
 	notetype 12, 12, 1
-	note F_, 1
-	note F_, 3
+	F_ 1
+	F_ 3
 	notetype 12, 11, 3
-	note F_, 4
+	F_ 4
 	notetype 12, 12, 1
-	note E_, 1
-	note E_, 3
+	E_ 1
+	E_ 3
 	notetype 12, 11, 3
-	note E_, 4
+	E_ 4
 	notetype 12, 12, 1
-	note F_, 1
-	note F_, 3
+	F_ 1
+	F_ 3
 	notetype 12, 11, 3
-	note F_, 4
+	F_ 4
 	notetype 12, 12, 1
-	note G_, 1
-	note G_, 3
+	G_ 1
+	G_ 3
 	notetype 12, 11, 3
-	note G_, 4
+	G_ 4
 	notetype 12, 12, 1
-	note G#, 1
-	note G#, 3
+	G# 1
+	G# 3
 	notetype 12, 11, 7
-	note D#, 4
+	D# 4
 
 Music_FinalBattle_branch_23429::
 	notetype 12, 11, 7
 	octave 3
-	note E_, 4
-	note B_, 4
-	note D#, 4
-	note A#, 4
-	note D_, 4
-	note A_, 4
+	E_ 4
+	B_ 4
+	D# 4
+	A# 4
+	D_ 4
+	A_ 4
 	octave 2
-	note B_, 4
+	B_ 4
 	octave 3
-	note F#, 4
-	note F_, 4
-	note F#, 4
+	F# 4
+	F_ 4
+	F# 4
 	notetype 12, 11, 1
-	note F#, 2
-	note F_, 1
-	note F#, 1
-	note A_, 1
-	note F#, 2
-	note F#, 1
+	F# 2
+	F_ 1
+	F# 1
+	A_ 1
+	F# 2
+	F# 1
 	notetype 12, 11, 7
 	octave 2
-	note B_, 6
+	B_ 6
 	notetype 12, 10, 0
 	octave 3
-	note D_, 6
+	D_ 6
 	notetype 12, 11, 7
-	note F#, 4
-	note E_, 4
-	note B_, 4
-	note D#, 4
-	note A#, 4
-	note D_, 4
-	note A_, 4
+	F# 4
+	E_ 4
+	B_ 4
+	D# 4
+	A# 4
+	D_ 4
+	A_ 4
 	octave 2
-	note B_, 4
+	B_ 4
 	octave 3
-	note F#, 4
-	note F_, 4
-	note F#, 12
-	note A#, 4
+	F# 4
+	F_ 4
+	F# 12
+	A# 4
 	notetype 12, 5, 14
-	note B_, 12
+	B_ 12
 	notetype 12, 11, 2
-	note E_, 3
-	note E_, 3
-	note E_, 2
-	note E_, 1
-	note F#, 1
-	note E_, 1
-	note B_, 1
-	note F#, 1
-	note E_, 1
-	note F#, 1
-	note B_, 1
-	note F#, 1
-	note E_, 1
-	note F#, 1
-	note B_, 1
-	note F#, 1
-	note E_, 1
-	note F#, 1
-	note B_, 1
-	note F#, 1
+	E_ 3
+	E_ 3
+	E_ 2
+	E_ 1
+	F# 1
+	E_ 1
+	B_ 1
+	F# 1
+	E_ 1
+	F# 1
+	B_ 1
+	F# 1
+	E_ 1
+	F# 1
+	B_ 1
+	F# 1
+	E_ 1
+	F# 1
+	B_ 1
+	F# 1
 	notetype 12, 12, 2
-	note E_, 1
-	note F#, 1
-	note B_, 1
-	note F#, 1
+	E_ 1
+	F# 1
+	B_ 1
+	F# 1
 	notetype 12, 13, 2
-	note E_, 1
-	note F#, 1
-	note B_, 1
+	E_ 1
+	F# 1
+	B_ 1
 	notetype 12, 12, 1
-	note E_, 1
-	note E_, 7
-	note E_, 1
-	note E_, 7
-	note E_, 1
-	note E_, 7
-	note E_, 1
-	note E_, 7
-	note E_, 1
-	note E_, 3
+	E_ 1
+	E_ 7
+	E_ 1
+	E_ 7
+	E_ 1
+	E_ 7
+	E_ 1
+	E_ 7
+	E_ 1
+	E_ 3
 	notetype 12, 11, 5
-	note D_, 4
+	D_ 4
 	notetype 12, 12, 1
-	note E_, 1
-	note E_, 3
+	E_ 1
+	E_ 3
 	notetype 12, 11, 5
-	note F_, 4
+	F_ 4
 	notetype 12, 12, 1
-	note E_, 1
-	note E_, 3
+	E_ 1
+	E_ 3
 	notetype 12, 11, 5
-	note D_, 4
+	D_ 4
 	notetype 12, 12, 1
-	note E_, 1
+	E_ 1
 	notetype 12, 11, 7
-	note E_, 7
+	E_ 7
 	notetype 12, 12, 1
-	note E_, 2
-	note B_, 1
-	note A_, 1
-	note E_, 2
-	note B_, 1
-	note A_, 1
-	note E_, 2
-	note B_, 1
-	note A_, 1
-	note E_, 2
-	note B_, 1
-	note A_, 3
-	note E_, 1
-	note D_, 3
-	note E_, 1
-	note D_, 3
-	note E_, 1
-	note D_, 3
-	note E_, 1
-	note D_, 1
-	note F_, 2
+	E_ 2
+	B_ 1
+	A_ 1
+	E_ 2
+	B_ 1
+	A_ 1
+	E_ 2
+	B_ 1
+	A_ 1
+	E_ 2
+	B_ 1
+	A_ 3
+	E_ 1
+	D_ 3
+	E_ 1
+	D_ 3
+	E_ 1
+	D_ 3
+	E_ 1
+	D_ 1
+	F_ 2
 	octave 4
-	note C_, 1
+	C_ 1
 	octave 3
-	note B_, 1
-	note F_, 2
+	B_ 1
+	F_ 2
 	octave 4
-	note C_, 1
+	C_ 1
 	octave 3
-	note B_, 1
-	note F_, 2
+	B_ 1
+	F_ 2
 	octave 4
-	note C_, 1
+	C_ 1
 	octave 3
-	note B_, 1
-	note F_, 2
+	B_ 1
+	F_ 2
 	octave 4
-	note C_, 1
+	C_ 1
 	octave 3
-	note B_, 3
-	note F_, 1
-	note E_, 3
-	note F_, 1
-	note E_, 3
-	note F_, 1
-	note E_, 3
-	note F_, 1
-	note E_, 1
-	note F#, 2
+	B_ 3
+	F_ 1
+	E_ 3
+	F_ 1
+	E_ 3
+	F_ 1
+	E_ 3
+	F_ 1
+	E_ 1
+	F# 2
 	octave 4
-	note C#, 1
-	note C_, 1
+	C# 1
+	C_ 1
 	octave 3
-	note F#, 2
+	F# 2
 	octave 4
-	note C#, 1
-	note C_, 1
+	C# 1
+	C_ 1
 	octave 3
-	note F#, 2
+	F# 2
 	octave 4
-	note C#, 1
-	note C_, 1
+	C# 1
+	C_ 1
 	octave 3
-	note F#, 2
+	F# 2
 	octave 4
-	note C#, 1
-	note C_, 3
+	C# 1
+	C_ 3
 	octave 3
-	note F#, 1
-	note F_, 3
-	note F#, 1
-	note F_, 3
-	note F#, 1
-	note F_, 3
-	note F#, 1
-	note F_, 3
-	note F#, 1
-	note F_, 3
-	note F#, 1
-	note F_, 3
-	note F#, 1
-	note F_, 3
+	F# 1
+	F_ 3
+	F# 1
+	F_ 3
+	F# 1
+	F_ 3
+	F# 1
+	F_ 3
+	F# 1
+	F_ 3
+	F# 1
+	F_ 3
+	F# 1
+	F_ 3
 	notetype 12, 11, 7
 	octave 4
-	note C_, 2
+	C_ 2
 	notetype 12, 11, 0
-	note C#, 8
+	C# 8
 	notetype 12, 11, 7
-	note C#, 8
+	C# 8
 	notetype 12, 10, 0
 	octave 3
-	note F#, 8
-	note F#, 8
+	F# 8
+	F# 8
 	notetype 12, 11, 0
 	octave 3
-	note A_, 8
+	A_ 8
 	notetype 12, 11, 7
-	note A_, 8
-	note G_, 4
-	note B_, 12
+	A_ 8
+	G_ 4
+	B_ 12
 	notetype 12, 11, 0
-	note A_, 8
+	A_ 8
 	notetype 12, 11, 7
-	note A_, 8
+	A_ 8
 	notetype 12, 11, 0
-	note E_, 8
+	E_ 8
 	notetype 12, 11, 7
-	note E_, 8
+	E_ 8
 	notetype 12, 11, 0
-	note A#, 8
+	A# 8
 	notetype 12, 11, 7
-	note A#, 8
+	A# 8
 	octave 4
-	note F_, 8
+	F_ 8
 	octave 3
-	note A#, 8
+	A# 8
 	octave 4
-	note C#, 4
-	note E_, 12
+	C# 4
+	E_ 12
 	octave 3
-	note A_, 4
+	A_ 4
 	octave 4
-	note C#, 12
+	C# 12
 	notetype 12, 4, 0
 	callchannel Music_FinalBattle_branch_23710
 	callchannel Music_FinalBattle_branch_23710
 	notetype 12, 11, 7
 	octave 3
-	note E_, 4
-	note B_, 4
-	note D#, 4
-	note A#, 4
-	note D_, 4
-	note A_, 4
+	E_ 4
+	B_ 4
+	D# 4
+	A# 4
+	D_ 4
+	A_ 4
 	octave 2
-	note B_, 4
+	B_ 4
 	octave 3
-	note F#, 4
-	note F_, 4
-	note F#, 12
+	F# 4
+	F_ 4
+	F# 12
 	notetype 12, 11, 0
-	note A_, 8
-	note G_, 8
+	A_ 8
+	G_ 8
 	notetype 12, 11, 7
-	note E_, 4
-	note B_, 4
-	note D#, 4
-	note A#, 4
-	note D_, 4
-	note A_, 4
+	E_ 4
+	B_ 4
+	D# 4
+	A# 4
+	D_ 4
+	A_ 4
 	octave 2
-	note B_, 4
+	B_ 4
 	octave 3
-	note F#, 4
-	note F_, 4
-	note F#, 12
+	F# 4
+	F_ 4
+	F# 12
 	notetype 12, 11, 0
-	note A_, 8
+	A_ 8
 	notetype 12, 11, 7
 	octave 4
-	note C_, 8
+	C_ 8
 	notetype 12, 11, 0
 	octave 3
-	note B_, 8
+	B_ 8
 	notetype 12, 11, 7
-	note B_, 8
+	B_ 8
 	notetype 12, 11, 0
 	octave 4
-	note E_, 8
+	E_ 8
 	notetype 12, 11, 7
-	note E_, 8
+	E_ 8
 	loopchannel 0, Music_FinalBattle_branch_23429
 
 
@@ -386,84 +386,84 @@
 	vibrato 8, 2, 5
 	notetype 12, 12, 2
 	octave 5
-	note C_, 1
+	C_ 1
 	octave 4
-	note G#, 1
-	note B_, 1
-	note F#, 1
-	note A_, 1
-	note E_, 1
-	note G_, 1
+	G# 1
+	B_ 1
+	F# 1
+	A_ 1
+	E_ 1
+	G_ 1
 	octave 5
-	note C_, 1
+	C_ 1
 	octave 4
-	note F_, 1
-	note C#, 1
-	note E_, 1
-	note C_, 1
-	note D#, 1
+	F_ 1
+	C# 1
+	E_ 1
+	C_ 1
+	D# 1
 	octave 3
-	note B_, 1
+	B_ 1
 	octave 4
-	note D_, 1
+	D_ 1
 	octave 5
-	note C_, 1
+	C_ 1
 	octave 4
-	note C_, 1
+	C_ 1
 	octave 3
-	note G#, 1
-	note B_, 1
-	note F#, 1
-	note A#, 1
-	note F_, 1
-	note A_, 1
+	G# 1
+	B_ 1
+	F# 1
+	A# 1
+	F_ 1
+	A_ 1
 	octave 5
-	note C_, 1
+	C_ 1
 	octave 3
-	note G#, 1
-	note D#, 1
-	note G_, 1
-	note D_, 1
-	note F_, 1
-	note C#, 1
-	note E_, 1
+	G# 1
+	D# 1
+	G_ 1
+	D_ 1
+	F_ 1
+	C# 1
+	E_ 1
 	octave 5
-	note C_, 1
+	C_ 1
 	notetype 12, 12, 1
 	octave 4
-	note E_, 1
-	note E_, 7
-	note E_, 1
-	note E_, 7
-	note E_, 1
-	note E_, 7
-	note E_, 1
-	note E_, 7
-	note E_, 1
-	note E_, 3
+	E_ 1
+	E_ 7
+	E_ 1
+	E_ 7
+	E_ 1
+	E_ 7
+	E_ 1
+	E_ 7
+	E_ 1
+	E_ 3
 	notetype 12, 12, 2
 	octave 5
-	note E_, 4
+	E_ 4
 	notetype 12, 12, 1
 	octave 4
-	note E_, 1
-	note E_, 3
+	E_ 1
+	E_ 3
 	notetype 12, 12, 2
 	octave 5
-	note E_, 4
+	E_ 4
 	notetype 12, 12, 1
 	octave 4
-	note E_, 1
-	note E_, 3
+	E_ 1
+	E_ 3
 	notetype 12, 12, 2
 	octave 5
-	note E_, 4
+	E_ 4
 	notetype 12, 12, 1
 	octave 4
-	note E_, 1
-	note E_, 3
+	E_ 1
+	E_ 3
 	notetype 12, 12, 2
-	note D#, 4
+	D# 4
 	callchannel Music_FinalBattle_branch_23704
 	callchannel Music_FinalBattle_branch_23704
 	callchannel Music_FinalBattle_branch_23704
@@ -473,203 +473,203 @@
 	callchannel Music_FinalBattle_branch_23704
 	notetype 12, 12, 1
 	octave 4
-	note E_, 1
-	note E_, 3
+	E_ 1
+	E_ 3
 	notetype 12, 4, 10
 	octave 3
-	note G#, 4
+	G# 4
 
 Music_FinalBattle_branch_235e6::
 	notetype 12, 13, 7
 	octave 4
-	note E_, 8
-	note D#, 8
-	note D_, 8
+	E_ 8
+	D# 8
+	D_ 8
 	octave 3
-	note B_, 8
+	B_ 8
 	notetype 12, 13, 7
-	note A#, 4
-	note B_, 12
+	A# 4
+	B_ 12
 	notetype 12, 11, 1
-	note F_, 2
-	note F#, 3
-	note A_, 1
-	note B_, 1
-	note A_, 1
+	F_ 2
+	F# 3
+	A_ 1
+	B_ 1
+	A_ 1
 	octave 4
-	note C_, 1
+	C_ 1
 	octave 3
-	note B_, 2
-	note A_, 1
-	note B_, 1
-	note B_, 1
-	note A_, 1
-	note A#, 1
+	B_ 2
+	A_ 1
+	B_ 1
+	B_ 1
+	A_ 1
+	A# 1
 	notetype 12, 13, 7
 	octave 4
-	note E_, 8
-	note D#, 8
-	note D_, 8
+	E_ 8
+	D# 8
+	D_ 8
 	octave 3
-	note B_, 8
+	B_ 8
 	notetype 12, 13, 7
-	note A#, 4
-	note B_, 12
+	A# 4
+	B_ 12
 	octave 4
-	note D#, 4
-	note E_, 12
+	D# 4
+	E_ 12
 	notetype 12, 10, 0
 	octave 3
-	note B_, 8
+	B_ 8
 	octave 4
-	note D_, 8
-	note F_, 8
-	note D_, 8
+	D_ 8
+	F_ 8
+	D_ 8
 	notetype 12, 13, 1
-	note E_, 1
-	note E_, 3
+	E_ 1
+	E_ 3
 	notetype 12, 12, 4
 	octave 3
-	note D_, 4
+	D_ 4
 	notetype 12, 13, 1
 	octave 4
-	note E_, 1
-	note E_, 3
+	E_ 1
+	E_ 3
 	notetype 12, 12, 4
 	octave 3
-	note F_, 4
+	F_ 4
 	notetype 12, 13, 1
 	octave 4
-	note E_, 1
-	note E_, 3
+	E_ 1
+	E_ 3
 	notetype 12, 12, 4
 	octave 3
-	note D_, 4
+	D_ 4
 	notetype 12, 13, 1
 	octave 4
-	note E_, 1
-	note E_, 1
+	E_ 1
+	E_ 1
 	notetype 12, 12, 4
 	octave 2
-	note B_, 4
+	B_ 4
 	octave 3
-	note D_, 2
+	D_ 2
 	notetype 12, 12, 2
 	octave 4
-	note E_, 1
-	note E_, 1
-	note D_, 1
-	note E_, 1
-	note F_, 1
-	note E_, 1
-	note D_, 1
-	note F_, 1
-	note E_, 1
-	note E_, 1
-	note F#, 1
-	note F_, 1
-	note E_, 1
-	note D#, 1
-	note E_, 1
-	note F#, 1
-	note E_, 1
-	note E_, 1
-	note F_, 1
-	note E_, 1
-	note D_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note E_, 1
+	E_ 1
+	E_ 1
+	D_ 1
+	E_ 1
+	F_ 1
+	E_ 1
+	D_ 1
+	F_ 1
+	E_ 1
+	E_ 1
+	F# 1
+	F_ 1
+	E_ 1
+	D# 1
+	E_ 1
+	F# 1
+	E_ 1
+	E_ 1
+	F_ 1
+	E_ 1
+	D_ 1
+	C# 1
+	D_ 1
+	D# 1
+	E_ 1
+	E_ 1
 	notetype 12, 12, 4
 	octave 2
-	note B_, 4
+	B_ 4
 	octave 3
-	note D_, 2
+	D_ 2
 	notetype 12, 13, 7
 	octave 4
-	note E_, 4
-	note F_, 2
-	note F#, 12
+	E_ 4
+	F_ 2
+	F# 12
 	notetype 12, 12, 2
 	octave 3
-	note B_, 2
-	note B_, 4
-	note B_, 2
-	note B_, 4
-	note B_, 2
+	B_ 2
+	B_ 4
+	B_ 2
+	B_ 4
+	B_ 2
 	notetype 12, 13, 7
 	octave 4
-	note F_, 4
-	note F#, 2
-	note G_, 12
+	F_ 4
+	F# 2
+	G_ 12
 	notetype 12, 12, 2
-	note C_, 2
-	note C_, 4
-	note C_, 2
-	note C_, 4
-	note C_, 2
+	C_ 2
+	C_ 4
+	C_ 2
+	C_ 4
+	C_ 2
 	notetype 12, 13, 7
-	note F#, 4
-	note G_, 2
-	note G#, 12
+	F# 4
+	G_ 2
+	G# 12
 	notetype 12, 8, 2
-	note C#, 2
-	note C#, 4
+	C# 2
+	C# 4
 	notetype 12, 10, 2
-	note C#, 2
-	note C#, 4
-	note C#, 4
+	C# 2
+	C# 4
+	C# 4
 	notetype 12, 13, 2
-	note C#, 2
-	note C#, 4
+	C# 2
+	C# 4
 	notetype 12, 15, 2
-	note C#, 2
-	note C#, 4
+	C# 2
+	C# 4
 	notetype 12, 12, 4
-	note E_, 1
-	note F_, 1
+	E_ 1
+	F_ 1
 	notetype 12, 12, 0
-	note F#, 12
+	F# 12
 	notetype 12, 12, 7
-	note F#, 4
+	F# 4
 	notetype 12, 1, 15
 	octave 3
-	note F#, 8
+	F# 8
 	notetype 12, 9, 0
-	note F#, 8
+	F# 8
 	notetype 12, 12, 7
 	octave 4
-	note C#, 4
+	C# 4
 	notetype 12, 12, 0
-	note D_, 12
-	note D_, 8
+	D_ 12
+	D_ 8
 	notetype 12, 12, 7
-	note D_, 8
+	D_ 8
 	notetype 12, 12, 0
-	note E_, 8
+	E_ 8
 	notetype 12, 12, 7
-	note E_, 8
+	E_ 8
 	notetype 12, 12, 0
 	octave 3
-	note A_, 8
+	A_ 8
 	notetype 12, 12, 7
-	note A_, 8
+	A_ 8
 	notetype 12, 12, 0
 	octave 4
-	note F_, 8
+	F_ 8
 	notetype 12, 12, 7
-	note F_, 8
+	F_ 8
 	octave 5
-	note C_, 8
+	C_ 8
 	octave 4
-	note A#, 8
+	A# 8
 	notetype 12, 12, 0
-	note A_, 16
-	note A_, 8
+	A_ 16
+	A_ 8
 	notetype 12, 12, 7
-	note A_, 8
+	A_ 8
 	notetype 12, 12, 5
 	callchannel Music_FinalBattle_branch_23710
 	notetype 12, 11, 1
@@ -676,65 +676,65 @@
 	callchannel Music_FinalBattle_branch_23710
 	notetype 12, 13, 7
 	octave 4
-	note E_, 8
-	note D#, 8
-	note D_, 8
+	E_ 8
+	D# 8
+	D_ 8
 	octave 3
-	note B_, 8
-	note A#, 4
-	note B_, 12
+	B_ 8
+	A# 4
+	B_ 12
 	notetype 12, 12, 7
 	octave 4
-	note D_, 8
+	D_ 8
 	notetype 12, 4, 12
-	note C_, 8
+	C_ 8
 	notetype 12, 13, 7
-	note E_, 8
-	note D#, 8
-	note D_, 8
+	E_ 8
+	D# 8
+	D_ 8
 	octave 3
-	note B_, 8
-	note A#, 4
-	note B_, 12
+	B_ 8
+	A# 4
+	B_ 12
 	notetype 12, 5, 13
 	octave 4
-	note D_, 8
+	D_ 8
 	notetype 12, 12, 0
-	note F_, 8
+	F_ 8
 	notetype 12, 12, 0
-	note E_, 8
+	E_ 8
 	notetype 12, 12, 7
-	note E_, 8
-	note A#, 4
-	note B_, 12
+	E_ 8
+	A# 4
+	B_ 12
 	loopchannel 0, Music_FinalBattle_branch_235e6
 
 Music_FinalBattle_branch_23704::
 	octave 4
-	note E_, 1
-	note E_, 1
-	note G_, 1
+	E_ 1
+	E_ 1
+	G_ 1
 	octave 5
-	note C_, 1
-	note E_, 1
-	note C_, 1
+	C_ 1
+	E_ 1
+	C_ 1
 	octave 4
-	note G_, 1
-	note F_, 1
+	G_ 1
+	F_ 1
 	endchannel
 
 Music_FinalBattle_branch_23710::
 	octave 4
-	note D_, 2
-	note C#, 2
+	D_ 2
+	C# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note C#, 2
-	note D_, 2
-	note C#, 2
-	note F#, 2
-	note D_, 2
+	C# 2
+	D_ 2
+	C# 2
+	F# 2
+	D_ 2
 	endchannel
 
 
@@ -741,605 +741,605 @@
 Music_FinalBattle_Ch3:: ; 2371c (8:771c)
 	notetype 12, 1, 1
 	octave 4
-	note E_, 4
+	E_ 4
 	octave 5
-	note E_, 4
+	E_ 4
 	octave 4
-	note F_, 4
+	F_ 4
 	octave 5
-	note D#, 4
+	D# 4
 	octave 4
-	note G_, 4
+	G_ 4
 	octave 5
-	note D_, 4
+	D_ 4
 	octave 4
-	note G#, 4
-	note B_, 4
-	note E_, 1
-	note E_, 1
+	G# 4
+	B_ 4
+	E_ 1
+	E_ 1
 	rest 6
-	note E_, 1
-	note E_, 1
+	E_ 1
+	E_ 1
 	rest 6
-	note E_, 1
-	note E_, 1
+	E_ 1
+	E_ 1
 	rest 6
-	note E_, 1
-	note E_, 1
+	E_ 1
+	E_ 1
 	rest 2
-	note D#, 4
-	note E_, 1
-	note E_, 1
+	D# 4
+	E_ 1
+	E_ 1
 	rest 2
-	note B_, 4
-	note E_, 1
-	note E_, 1
+	B_ 4
+	E_ 1
+	E_ 1
 	rest 2
 	octave 5
-	note C_, 4
+	C_ 4
 	octave 4
-	note E_, 1
-	note E_, 1
+	E_ 1
+	E_ 1
 	rest 2
 	octave 5
-	note D_, 4
+	D_ 4
 	octave 4
-	note E_, 1
-	note E_, 1
+	E_ 1
+	E_ 1
 	octave 5
-	note C_, 4
+	C_ 4
 	octave 4
-	note A#, 2
-	note E_, 1
-	note E_, 1
+	A# 2
+	E_ 1
+	E_ 1
 	rest 2
-	note B_, 4
-	note E_, 1
-	note E_, 1
+	B_ 4
+	E_ 1
+	E_ 1
 	rest 2
 	octave 5
-	note C_, 4
+	C_ 4
 	octave 4
-	note E_, 1
-	note E_, 1
+	E_ 1
+	E_ 1
 	rest 2
 	octave 5
-	note D_, 4
+	D_ 4
 	octave 4
-	note E_, 1
-	note E_, 1
+	E_ 1
+	E_ 1
 	octave 5
-	note C_, 4
-	note D_, 2
+	C_ 4
+	D_ 2
 	octave 4
-	note E_, 1
-	note E_, 1
+	E_ 1
+	E_ 1
 	rest 2
-	note B_, 4
-	note E_, 1
-	note E_, 1
+	B_ 4
+	E_ 1
+	E_ 1
 	rest 2
 	octave 5
-	note C_, 4
+	C_ 4
 	octave 4
-	note E_, 1
-	note E_, 1
+	E_ 1
+	E_ 1
 	rest 2
 	octave 5
-	note D_, 4
+	D_ 4
 	octave 4
-	note E_, 1
-	note E_, 1
+	E_ 1
+	E_ 1
 	rest 2
-	note E_, 1
-	note D#, 1
-	note E_, 1
-	note G_, 1
+	E_ 1
+	D# 1
+	E_ 1
+	G_ 1
 
 Music_FinalBattle_branch_2377d::
 	octave 4
-	note E_, 1
+	E_ 1
 	octave 3
-	note E_, 1
+	E_ 1
 	rest 2
 	octave 4
-	note F#, 4
-	note D#, 1
+	F# 4
+	D# 1
 	octave 3
-	note D#, 1
+	D# 1
 	rest 2
 	octave 4
-	note F_, 4
-	note D_, 1
+	F_ 4
+	D_ 1
 	octave 3
-	note D_, 1
+	D_ 1
 	rest 2
 	octave 4
-	note E_, 4
-	note F#, 1
+	E_ 4
+	F# 1
 	octave 3
-	note F#, 1
+	F# 1
 	rest 2
 	octave 4
-	note F#, 4
-	note F_, 4
+	F# 4
+	F_ 4
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
-	note E_, 1
+	F# 2
+	E_ 1
 	octave 3
-	note E_, 1
+	E_ 1
 	rest 2
 	octave 4
-	note F#, 4
-	note D#, 1
+	F# 4
+	D# 1
 	octave 3
-	note D#, 1
+	D# 1
 	rest 2
 	octave 4
-	note F_, 4
-	note D_, 1
+	F_ 4
+	D_ 1
 	octave 3
-	note D_, 1
+	D_ 1
 	rest 2
 	octave 4
-	note E_, 4
-	note F#, 1
+	E_ 4
+	F# 1
 	octave 3
-	note F#, 1
+	F# 1
 	rest 2
 	octave 4
-	note F#, 4
-	note F_, 4
+	F# 4
+	F_ 4
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
-	note E_, 1
-	note D#, 1
-	note E_, 1
-	note F#, 1
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note E_, 1
-	note E_, 1
+	F# 2
+	E_ 1
+	D# 1
+	E_ 1
+	F# 1
+	E_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	E_ 1
+	E_ 1
 	rest 2
-	note D_, 4
-	note E_, 1
-	note E_, 1
+	D_ 4
+	E_ 1
+	E_ 1
 	rest 2
-	note F_, 4
-	note E_, 1
-	note E_, 1
+	F_ 4
+	E_ 1
+	E_ 1
 	rest 2
-	note D_, 4
-	note E_, 1
-	note E_, 1
+	D_ 4
+	E_ 1
+	E_ 1
 	octave 3
-	note B_, 6
+	B_ 6
 	octave 4
-	note E_, 1
-	note E_, 1
+	E_ 1
+	E_ 1
 	rest 2
-	note D_, 4
-	note E_, 1
-	note E_, 1
+	D_ 4
+	E_ 1
+	E_ 1
 	rest 2
-	note F_, 4
-	note E_, 1
-	note E_, 1
+	F_ 4
+	E_ 1
+	E_ 1
 	rest 2
-	note D_, 4
-	note E_, 1
-	note E_, 1
+	D_ 4
+	E_ 1
+	E_ 1
 	octave 3
-	note B_, 6
+	B_ 6
 	octave 4
-	note E_, 2
+	E_ 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note E_, 2
+	E_ 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note E_, 2
+	E_ 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note E_, 2
+	E_ 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note E_, 2
-	note B_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note B_, 2
+	E_ 2
+	B_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	B_ 2
 	octave 5
-	note C#, 2
+	C# 2
 	octave 4
-	note B_, 2
-	note F_, 2
+	B_ 2
+	F_ 2
 	octave 5
-	note D#, 2
+	D# 2
 	octave 4
-	note F_, 2
+	F_ 2
 	octave 5
-	note D#, 2
+	D# 2
 	octave 4
-	note F_, 2
+	F_ 2
 	octave 5
-	note D#, 2
+	D# 2
 	octave 4
-	note F_, 2
+	F_ 2
 	octave 5
-	note D#, 2
+	D# 2
 	octave 4
-	note F_, 2
+	F_ 2
 	octave 5
-	note C_, 2
-	note C_, 2
+	C_ 2
+	C_ 2
 	octave 4
-	note F_, 2
+	F_ 2
 	octave 5
-	note C_, 2
-	note C_, 2
-	note D_, 2
-	note C_, 2
+	C_ 2
+	C_ 2
+	D_ 2
+	C_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 5
-	note E_, 2
+	E_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 5
-	note E_, 2
+	E_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 5
-	note E_, 2
+	E_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 5
-	note E_, 2
+	E_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 5
-	note C#, 2
-	note C#, 2
+	C# 2
+	C# 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 5
-	note C#, 2
-	note C#, 2
-	note E_, 2
-	note C#, 2
+	C# 2
+	C# 2
+	E_ 2
+	C# 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 5
-	note C#, 2
-	note C#, 2
+	C# 2
+	C# 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 5
-	note C#, 2
-	note C#, 2
-	note E_, 2
-	note C#, 2
+	C# 2
+	C# 2
+	E_ 2
+	C# 2
 	callchannel Music_FinalBattle_branch_2395b
 	callchannel Music_FinalBattle_branch_2395b
 	octave 4
-	note G_, 2
+	G_ 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note G_, 2
+	G_ 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note G_, 2
+	G_ 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note G_, 2
+	G_ 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note G_, 2
+	G_ 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note G_, 2
+	G_ 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note G_, 2
+	G_ 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note G_, 1
-	note F#, 1
-	note G_, 1
-	note G#, 1
+	G_ 1
+	F# 1
+	G_ 1
+	G# 1
 	callchannel Music_FinalBattle_branch_2396c
 	callchannel Music_FinalBattle_branch_2396c
 	octave 4
-	note A#, 2
+	A# 2
 	octave 5
-	note F_, 2
+	F_ 2
 	octave 4
-	note A#, 2
+	A# 2
 	octave 5
-	note F_, 2
+	F_ 2
 	octave 4
-	note A#, 2
+	A# 2
 	octave 5
-	note F_, 2
+	F_ 2
 	octave 4
-	note A#, 2
+	A# 2
 	octave 5
-	note F_, 2
+	F_ 2
 	octave 4
-	note A#, 2
+	A# 2
 	octave 5
-	note F_, 2
-	note G_, 2
-	note F_, 2
-	note E_, 2
-	note D_, 2
-	note C#, 2
+	F_ 2
+	G_ 2
+	F_ 2
+	E_ 2
+	D_ 2
+	C# 2
 	octave 4
-	note A#, 2
-	note A_, 2
+	A# 2
+	A_ 2
 	octave 5
-	note C#, 2
+	C# 2
 	octave 4
-	note A_, 2
+	A_ 2
 	octave 5
-	note C#, 2
+	C# 2
 	octave 4
-	note A_, 2
+	A_ 2
 	octave 5
-	note C#, 2
+	C# 2
 	octave 4
-	note A_, 2
+	A_ 2
 	octave 5
-	note C#, 2
+	C# 2
 	octave 4
-	note A_, 2
+	A_ 2
 	octave 5
-	note C#, 2
+	C# 2
 	octave 4
-	note A_, 2
+	A_ 2
 	octave 5
-	note C#, 2
+	C# 2
 	octave 4
-	note A_, 2
+	A_ 2
 	octave 5
-	note C#, 2
+	C# 2
 	octave 4
-	note A_, 2
-	note G#, 2
-	note G_, 2
+	A_ 2
+	G# 2
+	G_ 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note G_, 2
+	G_ 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note G_, 2
+	G_ 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note G_, 2
+	G_ 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note G_, 2
+	G_ 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note G_, 2
+	G_ 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note G_, 2
+	G_ 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note G_, 1
-	note F#, 1
-	note G_, 1
-	note G#, 1
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note F_, 2
-	note F#, 2
-	note G_, 2
-	note F#, 2
-	note B_, 2
-	note F#, 2
-	note B_, 2
-	note F#, 2
-	note B_, 2
-	note F#, 2
-	note B_, 2
-	note F#, 2
-	note B_, 2
-	note F#, 2
-	note B_, 2
-	note F#, 2
-	note B_, 2
-	note F#, 2
-	note D#, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note F_, 2
-	note F#, 2
-	note G_, 2
-	note F#, 2
+	G_ 1
+	F# 1
+	G_ 1
+	G# 1
+	E_ 2
+	A_ 2
+	E_ 2
+	A_ 2
+	E_ 2
+	A_ 2
+	E_ 2
+	A_ 2
+	E_ 2
+	A_ 2
+	E_ 2
+	A_ 2
+	E_ 2
+	F_ 2
+	F# 2
+	G_ 2
+	F# 2
+	B_ 2
+	F# 2
+	B_ 2
+	F# 2
+	B_ 2
+	F# 2
+	B_ 2
+	F# 2
+	B_ 2
+	F# 2
+	B_ 2
+	F# 2
+	B_ 2
+	F# 2
+	D# 2
+	E_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	E_ 2
+	F_ 2
+	F# 2
+	G_ 2
+	F# 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note F#, 2
-	note F_, 2
-	note E_, 2
-	note B_, 2
+	F# 2
+	F_ 2
+	E_ 2
+	B_ 2
 	octave 5
-	note E_, 4
+	E_ 4
 	octave 4
-	note E_, 2
-	note B_, 2
+	E_ 2
+	B_ 2
 	octave 5
-	note D#, 4
+	D# 4
 	octave 4
-	note E_, 2
-	note B_, 2
+	E_ 2
+	B_ 2
 	octave 5
-	note D_, 4
+	D_ 4
 	octave 4
-	note E_, 2
-	note A_, 2
-	note B_, 4
+	E_ 2
+	A_ 2
+	B_ 4
 	loopchannel 0, Music_FinalBattle_branch_2377d
 
 Music_FinalBattle_branch_2395b::
 	octave 4
-	note F#, 2
+	F# 2
 	octave 5
-	note C#, 2
+	C# 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 5
-	note C#, 2
+	C# 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 5
-	note C#, 2
+	C# 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 5
-	note C#, 2
+	C# 2
 	endchannel
 
 Music_FinalBattle_branch_2396c::
 	octave 4
-	note A_, 2
+	A_ 2
 	octave 5
-	note E_, 2
+	E_ 2
 	octave 4
-	note A_, 2
+	A_ 2
 	octave 5
-	note E_, 2
+	E_ 2
 	octave 4
-	note A_, 2
+	A_ 2
 	octave 5
-	note E_, 2
+	E_ 2
 	octave 4
-	note A_, 2
+	A_ 2
 	octave 5
-	note E_, 2
+	E_ 2
 	endchannel
-; 0x2397d
\ No newline at end of file
+; 0x2397d
--- a/audio/music/gamecorner.asm
+++ b/audio/music/gamecorner.asm
@@ -6,180 +6,180 @@
 	toggleperfectpitch
 	notetype 12, 11, 5
 	octave 3
-	note A_, 6
+	A_ 6
 	notetype 12, 11, 1
-	note G#, 2
-	note F#, 2
-	note E_, 2
-	note D#, 2
-	note C#, 2
-	note D#, 16
+	G# 2
+	F# 2
+	E_ 2
+	D# 2
+	C# 2
+	D# 16
 
 Music_GameCorner_branch_7e222::
 	notetype 12, 11, 5
 	octave 3
-	note C#, 4
+	C# 4
 	octave 2
-	note G#, 4
+	G# 4
 	octave 3
-	note E_, 4
+	E_ 4
 	octave 2
-	note B_, 4
+	B_ 4
 	octave 3
-	note A_, 2
-	note G#, 8
+	A_ 2
+	G# 8
 	notetype 12, 10, 7
-	note G#, 2
-	note A_, 2
-	note B_, 2
+	G# 2
+	A_ 2
+	B_ 2
 	notetype 12, 11, 5
-	note G#, 6
-	note E_, 2
-	note F#, 2
-	note E_, 2
-	note D#, 2
-	note E_, 2
+	G# 6
+	E_ 2
+	F# 2
+	E_ 2
+	D# 2
+	E_ 2
 	notetype 12, 10, 7
-	note F#, 8
-	note D#, 8
+	F# 8
+	D# 8
 	notetype 12, 11, 5
-	note D#, 4
+	D# 4
 	octave 2
-	note B_, 4
+	B_ 4
 	octave 3
-	note F#, 4
-	note D#, 4
-	note B_, 2
-	note A_, 8
+	F# 4
+	D# 4
+	B_ 2
+	A_ 8
 	notetype 12, 11, 7
 	octave 4
-	note E_, 2
-	note D#, 2
-	note E_, 2
-	note D#, 6
-	note C#, 2
+	E_ 2
+	D# 2
+	E_ 2
+	D# 6
+	C# 2
 	octave 3
-	note D#, 2
-	note E_, 2
-	note F#, 2
-	note G_, 2
-	note G#, 2
+	D# 2
+	E_ 2
+	F# 2
+	G_ 2
+	G# 2
 	notetype 12, 9, 7
-	note G#, 1
-	note G_, 1
-	note G#, 1
-	note G_, 1
-	note G#, 2
+	G# 1
+	G_ 1
+	G# 1
+	G_ 1
+	G# 2
 	notetype 12, 11, 7
-	note F#, 8
+	F# 8
 	notetype 12, 11, 5
-	note C#, 4
+	C# 4
 	octave 2
-	note G#, 4
+	G# 4
 	octave 3
-	note E_, 4
+	E_ 4
 	octave 2
-	note B_, 4
+	B_ 4
 	octave 3
-	note A_, 2
-	note G#, 8
+	A_ 2
+	G# 8
 	notetype 12, 11, 7
-	note G#, 2
-	note A_, 2
-	note B_, 2
-	note G#, 6
-	note E_, 2
-	note F#, 2
-	note E_, 2
-	note D#, 2
-	note E_, 2
-	note F#, 8
+	G# 2
+	A_ 2
+	B_ 2
+	G# 6
+	E_ 2
+	F# 2
+	E_ 2
+	D# 2
+	E_ 2
+	F# 8
 	notetype 12, 9, 7
-	note D#, 4
-	note C#, 4
+	D# 4
+	C# 4
 	notetype 12, 11, 5
-	note D#, 4
+	D# 4
 	octave 2
-	note B_, 4
+	B_ 4
 	octave 3
-	note F#, 4
-	note D#, 4
-	note B_, 2
-	note A_, 8
+	F# 4
+	D# 4
+	B_ 2
+	A_ 8
 	notetype 12, 11, 7
-	note F#, 2
-	note G#, 2
-	note A_, 2
-	note B_, 4
-	note A_, 4
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
+	F# 2
+	G# 2
+	A_ 2
+	B_ 4
+	A_ 4
+	B_ 2
+	A_ 2
+	G# 2
+	F# 2
 	notetype 12, 12, 2
-	note E_, 4
+	E_ 4
 	octave 2
-	note B_, 4
+	B_ 4
 	octave 3
-	note E_, 2
-	note E_, 4
-	note E_, 4
+	E_ 2
+	E_ 4
+	E_ 4
 	notetype 12, 11, 7
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note C#, 2
-	note D_, 2
-	note D#, 10
+	C# 2
+	D_ 2
+	D# 10
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note C#, 2
-	note D#, 2
-	note E_, 8
+	C# 2
+	D# 2
+	E_ 8
 	notetype 12, 11, 5
 	octave 4
-	note D#, 4
+	D# 4
 	octave 3
-	note B_, 4
-	note F#, 4
-	note D#, 4
+	B_ 4
+	F# 4
+	D# 4
 	notetype 12, 11, 7
-	note E_, 3
-	note D#, 1
+	E_ 3
+	D# 1
 	notetype 12, 11, 2
-	note C#, 2
-	note D#, 2
-	note E_, 10
+	C# 2
+	D# 2
+	E_ 10
 	notetype 12, 11, 7
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note C#, 2
-	note D_, 2
-	note D#, 10
+	C# 2
+	D_ 2
+	D# 10
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note C#, 2
-	note D#, 2
-	note E_, 8
+	C# 2
+	D# 2
+	E_ 8
 	notetype 12, 11, 5
 	octave 4
-	note D#, 4
+	D# 4
 	octave 3
-	note B_, 4
-	note F#, 4
-	note A_, 4
+	B_ 4
+	F# 4
+	A_ 4
 	notetype 12, 11, 7
-	note G#, 2
-	note G#, 1
-	note G_, 1
-	note G#, 1
-	note G_, 1
-	note G#, 1
-	note G_, 1
-	note G#, 8
+	G# 2
+	G# 1
+	G_ 1
+	G# 1
+	G_ 1
+	G# 1
+	G_ 1
+	G# 8
 	loopchannel 0, Music_GameCorner_branch_7e222
 
 
@@ -188,158 +188,158 @@
 	vibrato 10, 2, 3
 	notetype 12, 12, 6
 	octave 4
-	note C#, 6
+	C# 6
 	notetype 12, 12, 1
 	octave 3
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note E_, 2
-	note F#, 2
+	B_ 2
+	A_ 2
+	G# 2
+	F# 2
+	E_ 2
+	F# 2
 	duty 3
-	note B_, 1
-	note A#, 1
-	note B_, 1
-	note A#, 1
-	note B_, 1
-	note A#, 1
-	note B_, 8
+	B_ 1
+	A# 1
+	B_ 1
+	A# 1
+	B_ 1
+	A# 1
+	B_ 8
 
 Music_GameCorner_branch_7e2fa::
 	duty 2
 	notetype 12, 12, 7
 	octave 3
-	note E_, 4
+	E_ 4
 	octave 2
-	note B_, 4
+	B_ 4
 	octave 3
-	note G#, 4
-	note E_, 4
+	G# 4
+	E_ 4
 	octave 4
-	note C#, 2
+	C# 2
 	octave 3
-	note B_, 14
+	B_ 14
 	octave 4
-	note E_, 6
-	note D#, 2
-	note C#, 2
+	E_ 6
+	D# 2
+	C# 2
 	octave 3
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note A_, 16
-	note F#, 4
-	note D#, 4
-	note A_, 4
-	note F#, 4
+	B_ 2
+	A_ 2
+	G# 2
+	A_ 16
+	F# 4
+	D# 4
+	A_ 4
+	F# 4
 	octave 4
-	note D#, 2
-	note C#, 14
-	note F#, 6
-	note E_, 2
-	note D#, 2
-	note C#, 2
+	D# 2
+	C# 14
+	F# 6
+	E_ 2
+	D# 2
+	C# 2
 	octave 3
-	note B_, 2
-	note A#, 2
-	note B_, 16
-	note E_, 4
+	B_ 2
+	A# 2
+	B_ 16
+	E_ 4
 	octave 2
-	note B_, 4
+	B_ 4
 	octave 3
-	note G#, 4
-	note E_, 4
+	G# 4
+	E_ 4
 	octave 4
-	note C#, 2
+	C# 2
 	octave 3
-	note B_, 14
+	B_ 14
 	octave 4
-	note E_, 6
-	note D#, 2
-	note C#, 2
+	E_ 6
+	D# 2
+	C# 2
 	octave 3
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note A_, 16
-	note F#, 4
-	note D#, 4
-	note A_, 4
-	note F#, 4
+	B_ 2
+	A_ 2
+	G# 2
+	A_ 16
+	F# 4
+	D# 4
+	A_ 4
+	F# 4
 	octave 4
-	note D#, 2
-	note C#, 14
-	note F#, 6
-	note E_, 2
-	note D#, 2
-	note E_, 2
-	note F#, 2
-	note G#, 2
+	D# 2
+	C# 14
+	F# 6
+	E_ 2
+	D# 2
+	E_ 2
+	F# 2
+	G# 2
 	notetype 12, 12, 1
-	note E_, 2
+	E_ 2
 	notetype 12, 10, 1
-	note E_, 1
-	note D#, 1
-	note E_, 1
-	note D#, 1
-	note E_, 1
-	note D#, 1
-	note E_, 2
+	E_ 1
+	D# 1
+	E_ 1
+	D# 1
+	E_ 1
+	D# 1
+	E_ 2
 	notetype 12, 12, 7
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note C#, 2
-	note D_, 2
-	note D#, 10
+	C# 2
+	D_ 2
+	D# 10
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note C#, 2
-	note D#, 2
-	note E_, 10
+	C# 2
+	D# 2
+	E_ 10
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note C#, 2
-	note D#, 2
+	C# 2
+	D# 2
 	notetype 12, 12, 5
-	note F#, 4
-	note D#, 4
+	F# 4
+	D# 4
 	octave 3
-	note B_, 4
+	B_ 4
 	octave 4
-	note A_, 4
-	note G#, 3
-	note A_, 1
+	A_ 4
+	G# 3
+	A_ 1
 	notetype 12, 12, 2
-	note G#, 2
-	note F#, 2
-	note E_, 2
+	G# 2
+	F# 2
+	E_ 2
 	notetype 12, 12, 7
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note C#, 2
-	note D_, 2
-	note D#, 10
+	C# 2
+	D_ 2
+	D# 10
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note C#, 2
-	note D#, 2
-	note E_, 10
+	C# 2
+	D# 2
+	E_ 10
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note C#, 2
-	note D#, 2
-	note F#, 4
-	note D#, 4
-	note A_, 4
-	note F#, 4
-	note B_, 16
+	C# 2
+	D# 2
+	F# 4
+	D# 4
+	A_ 4
+	F# 4
+	B_ 16
 	loopchannel 0, Music_GameCorner_branch_7e2fa
 
 
@@ -346,28 +346,28 @@
 Music_GameCorner_Ch3:: ; 7e38b (1f:638b)
 	notetype 12, 1, 3
 	octave 5
-	note C#, 1
+	C# 1
 	rest 5
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note A#, 1
+	A# 1
 	rest 1
-	note A#, 1
+	A# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 9
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note C#, 1
+	C# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
 
 Music_GameCorner_branch_7e3a5::
@@ -378,23 +378,23 @@
 	callchannel Music_GameCorner_branch_7e46c
 	callchannel Music_GameCorner_branch_7e481
 	callchannel Music_GameCorner_branch_7e496
-	note D#, 1
+	D# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note A_, 1
+	A_ 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
 	callchannel Music_GameCorner_branch_7e418
 	callchannel Music_GameCorner_branch_7e42d
@@ -403,38 +403,38 @@
 	callchannel Music_GameCorner_branch_7e46c
 	callchannel Music_GameCorner_branch_7e481
 	callchannel Music_GameCorner_branch_7e496
-	note E_, 1
+	E_ 1
 	rest 3
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 3
 	octave 4
-	note E_, 1
+	E_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 3
-	note B_, 1
+	B_ 1
 	rest 1
 	callchannel Music_GameCorner_branch_7e46c
 	callchannel Music_GameCorner_branch_7e418
 	callchannel Music_GameCorner_branch_7e4ab
-	note E_, 1
+	E_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note G#, 1
+	G# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
 	callchannel Music_GameCorner_branch_7e46c
 	callchannel Music_GameCorner_branch_7e418
@@ -443,186 +443,186 @@
 	loopchannel 0, Music_GameCorner_branch_7e3a5
 
 Music_GameCorner_branch_7e418::
-	note E_, 1
+	E_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note G#, 1
+	G# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note G#, 1
+	G# 1
 	rest 1
 	endchannel
 
 Music_GameCorner_branch_7e42d::
-	note E_, 1
+	E_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note G#, 1
+	G# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note C#, 1
+	C# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
 	endchannel
 
 Music_GameCorner_branch_7e442::
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note B_, 1
+	B_ 1
 	rest 1
 	endchannel
 
 Music_GameCorner_branch_7e457::
-	note D#, 1
+	D# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note A_, 1
+	A_ 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note A_, 1
+	A_ 1
 	rest 1
 	endchannel
 
 Music_GameCorner_branch_7e46c::
-	note D#, 1
+	D# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	endchannel
 
 Music_GameCorner_branch_7e481::
-	note D#, 1
+	D# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note C#, 1
+	C# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
 	endchannel
 
 Music_GameCorner_branch_7e496::
-	note F#, 1
+	F# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note B_, 1
+	B_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note B_, 1
+	B_ 1
 	rest 1
 	endchannel
 
 Music_GameCorner_branch_7e4ab::
-	note F#, 1
+	F# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note A_, 1
+	A_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note A_, 1
+	A_ 1
 	rest 1
 	endchannel
-; 0x7e4c0
\ No newline at end of file
+; 0x7e4c0
--- a/audio/music/gym.asm
+++ b/audio/music/gym.asm
@@ -6,162 +6,162 @@
 	toggleperfectpitch
 	notetype 12, 11, 5
 	octave 3
-	note G_, 6
-	note C_, 1
-	note G_, 1
-	note F_, 6
+	G_ 6
+	C_ 1
+	G_ 1
+	F_ 6
 	octave 2
-	note A#, 1
+	A# 1
 	octave 3
-	note F_, 1
-	note E_, 6
+	F_ 1
+	E_ 6
 	octave 2
-	note A_, 1
+	A_ 1
 	octave 3
-	note E_, 1
-	note F_, 4
-	note G_, 4
+	E_ 1
+	F_ 4
+	G_ 4
 
 Music_Gym_branch_bcd8::
-	note E_, 4
-	note F_, 2
-	note G_, 2
-	note F_, 2
-	note E_, 2
-	note D_, 2
-	note C_, 2
+	E_ 4
+	F_ 2
+	G_ 2
+	F_ 2
+	E_ 2
+	D_ 2
+	C_ 2
 	notetype 12, 11, 1
-	note D_, 3
+	D_ 3
 	notetype 12, 11, 5
-	note E_, 1
-	note F_, 4
-	note E_, 2
-	note D_, 2
-	note E_, 2
-	note F_, 2
-	note E_, 4
-	note F_, 2
-	note G_, 2
-	note F_, 2
-	note E_, 2
-	note D_, 2
-	note C_, 2
-	note D_, 2
-	note D_, 1
-	note E_, 1
-	note F_, 4
-	note E_, 2
-	note D_, 2
-	note E_, 2
-	note F_, 2
+	E_ 1
+	F_ 4
+	E_ 2
+	D_ 2
+	E_ 2
+	F_ 2
+	E_ 4
+	F_ 2
+	G_ 2
+	F_ 2
+	E_ 2
+	D_ 2
+	C_ 2
+	D_ 2
+	D_ 1
+	E_ 1
+	F_ 4
+	E_ 2
+	D_ 2
+	E_ 2
+	F_ 2
 	octave 4
-	note C_, 4
+	C_ 4
 	octave 3
-	note A#, 2
+	A# 2
 	octave 4
-	note C_, 2
+	C_ 2
 	octave 3
-	note A#, 2
-	note A_, 2
-	note G_, 2
-	note F_, 2
+	A# 2
+	A_ 2
+	G_ 2
+	F_ 2
 	notetype 12, 11, 1
-	note A#, 3
+	A# 3
 	notetype 12, 11, 5
-	note F_, 1
-	note F_, 4
-	note E_, 2
-	note D_, 2
-	note E_, 2
-	note F_, 2
+	F_ 1
+	F_ 4
+	E_ 2
+	D_ 2
+	E_ 2
+	F_ 2
 	octave 4
-	note C_, 4
+	C_ 4
 	octave 3
-	note A#, 2
+	A# 2
 	octave 4
-	note C_, 2
+	C_ 2
 	octave 3
-	note A#, 2
-	note A_, 2
-	note G_, 2
-	note F_, 2
-	note D_, 2
-	note D_, 1
-	note E_, 1
-	note F_, 4
-	note A#, 2
-	note F_, 1
-	note A#, 1
+	A# 2
+	A_ 2
+	G_ 2
+	F_ 2
+	D_ 2
+	D_ 1
+	E_ 1
+	F_ 4
+	A# 2
+	F_ 1
+	A# 1
 	octave 4
-	note D_, 4
+	D_ 4
 	octave 3
-	note E_, 2
-	note C_, 2
-	note E_, 2
-	note G_, 2
-	note F_, 2
-	note E_, 2
-	note D_, 2
-	note E_, 2
-	note F_, 2
-	note D_, 2
-	note E_, 2
-	note C_, 2
-	note D_, 2
-	note E_, 2
-	note C_, 2
-	note D_, 2
-	note C_, 2
-	note C_, 1
-	note D_, 1
-	note E_, 4
-	note C_, 2
-	note E_, 2
-	note D_, 2
-	note C_, 2
-	note E_, 2
-	note C_, 1
-	note E_, 1
-	note F_, 4
-	note E_, 2
-	note D_, 2
-	note E_, 2
-	note F_, 2
-	note E_, 2
-	note C_, 2
-	note E_, 2
-	note G_, 2
-	note F_, 2
-	note E_, 2
-	note D_, 2
-	note E_, 2
-	note D_, 2
-	note F_, 2
-	note D_, 2
-	note E_, 2
-	note C_, 2
-	note D_, 2
-	note C_, 2
-	note D_, 2
-	note C_, 2
-	note C_, 1
-	note D_, 1
-	note E_, 4
-	note D_, 2
-	note E_, 2
-	note F_, 2
-	note F_, 2
-	note G_, 2
-	note E_, 1
-	note G_, 1
-	note A#, 2
+	E_ 2
+	C_ 2
+	E_ 2
+	G_ 2
+	F_ 2
+	E_ 2
+	D_ 2
+	E_ 2
+	F_ 2
+	D_ 2
+	E_ 2
+	C_ 2
+	D_ 2
+	E_ 2
+	C_ 2
+	D_ 2
+	C_ 2
+	C_ 1
+	D_ 1
+	E_ 4
+	C_ 2
+	E_ 2
+	D_ 2
+	C_ 2
+	E_ 2
+	C_ 1
+	E_ 1
+	F_ 4
+	E_ 2
+	D_ 2
+	E_ 2
+	F_ 2
+	E_ 2
+	C_ 2
+	E_ 2
+	G_ 2
+	F_ 2
+	E_ 2
+	D_ 2
+	E_ 2
+	D_ 2
+	F_ 2
+	D_ 2
+	E_ 2
+	C_ 2
+	D_ 2
+	C_ 2
+	D_ 2
+	C_ 2
+	C_ 1
+	D_ 1
+	E_ 4
+	D_ 2
+	E_ 2
+	F_ 2
+	F_ 2
+	G_ 2
+	E_ 1
+	G_ 1
+	A# 2
 	octave 4
-	note C_, 2
+	C_ 2
 	octave 3
-	note A#, 2
-	note A_, 2
-	note G_, 2
-	note A_, 2
+	A# 2
+	A_ 2
+	G_ 2
+	A_ 2
 	loopchannel 0, Music_Gym_branch_bcd8
 
 
@@ -170,121 +170,121 @@
 	vibrato 10, 2, 5
 	notetype 12, 12, 7
 	octave 4
-	note C_, 6
+	C_ 6
 	octave 3
-	note G_, 1
+	G_ 1
 	octave 4
-	note C_, 1
+	C_ 1
 	octave 3
-	note A#, 6
-	note F_, 1
-	note A#, 1
+	A# 6
+	F_ 1
+	A# 1
 	notetype 12, 10, 0
-	note A_, 12
+	A_ 12
 	notetype 12, 12, 7
-	note B_, 4
+	B_ 4
 
 Music_Gym_branch_bd82::
 	octave 4
-	note C_, 12
+	C_ 12
 	octave 3
-	note G_, 2
+	G_ 2
 	octave 4
-	note C_, 2
+	C_ 2
 	notetype 12, 12, 2
-	note D_, 3
+	D_ 3
 	octave 3
-	note A#, 1
+	A# 1
 	notetype 12, 12, 7
-	note A#, 12
+	A# 12
 	octave 4
-	note C_, 12
+	C_ 12
 	octave 3
-	note G_, 2
+	G_ 2
 	octave 4
-	note C_, 2
+	C_ 2
 	notetype 12, 12, 4
 	octave 3
-	note A#, 2
+	A# 2
 	notetype 12, 12, 7
-	note A#, 1
+	A# 1
 	octave 4
-	note C_, 1
-	note D_, 12
-	note E_, 12
-	note D_, 2
-	note E_, 2
+	C_ 1
+	D_ 12
+	E_ 12
+	D_ 2
+	E_ 2
 	notetype 12, 12, 2
-	note F_, 3
-	note D_, 1
+	F_ 3
+	D_ 1
 	notetype 12, 12, 7
-	note D_, 4
+	D_ 4
 	notetype 12, 12, 2
-	note A#, 3
-	note F_, 1
+	A# 3
+	F_ 1
 	notetype 12, 12, 7
-	note F_, 4
-	note E_, 12
-	note D_, 2
-	note E_, 2
-	note F_, 2
-	note D_, 1
-	note F_, 1
-	note A#, 12
+	F_ 4
+	E_ 12
+	D_ 2
+	E_ 2
+	F_ 2
+	D_ 1
+	F_ 1
+	A# 12
 	octave 3
-	note G_, 6
+	G_ 6
 	octave 4
-	note C_, 6
+	C_ 6
 	octave 3
-	note G_, 4
-	note A#, 4
-	note A_, 4
-	note G_, 4
-	note F_, 4
+	G_ 4
+	A# 4
+	A_ 4
+	G_ 4
+	F_ 4
 	notetype 12, 12, 3
-	note E_, 2
+	E_ 2
 	notetype 12, 12, 7
-	note E_, 1
-	note F_, 1
-	note G_, 6
-	note G_, 2
+	E_ 1
+	F_ 1
+	G_ 6
+	G_ 2
 	octave 4
-	note C_, 2
+	C_ 2
 	octave 3
-	note G_, 2
-	note A#, 4
-	note A_, 4
-	note G_, 4
-	note C_, 2
-	note D_, 2
-	note G_, 6
+	G_ 2
+	A# 4
+	A_ 4
+	G_ 4
+	C_ 2
+	D_ 2
+	G_ 6
 	octave 4
-	note C_, 6
+	C_ 6
 	octave 3
-	note G_, 4
-	note A#, 4
-	note A_, 4
-	note G_, 4
-	note F_, 4
+	G_ 4
+	A# 4
+	A_ 4
+	G_ 4
+	F_ 4
 	notetype 12, 12, 3
-	note E_, 2
+	E_ 2
 	notetype 12, 12, 7
-	note E_, 1
-	note F_, 1
-	note G_, 4
+	E_ 1
+	F_ 1
+	G_ 4
 	notetype 12, 12, 3
-	note G_, 2
+	G_ 2
 	notetype 12, 12, 7
-	note G_, 1
-	note A_, 1
-	note A#, 4
+	G_ 1
+	A_ 1
+	A# 4
 	notetype 12, 12, 4
 	octave 4
-	note C_, 2
+	C_ 2
 	notetype 12, 12, 7
-	note C_, 1
-	note D_, 1
-	note E_, 12
+	C_ 1
+	D_ 1
+	E_ 12
 	loopchannel 0, Music_Gym_branch_bd82
 
 
@@ -293,9 +293,9 @@
 	rest 16
 	rest 10
 	octave 4
-	note G_, 2
-	note F_, 2
-	note D_, 2
+	G_ 2
+	F_ 2
+	D_ 2
 
 Music_Gym_branch_be02::
 	callchannel Music_Gym_branch_be3b
@@ -313,46 +313,46 @@
 	callchannel Music_Gym_branch_be3b
 	callchannel Music_Gym_branch_be4d
 	callchannel Music_Gym_branch_be3b
-	note F_, 2
-	note A#, 2
-	note F_, 2
-	note A#, 2
-	note F_, 2
-	note A#, 2
-	note A_, 2
-	note F_, 2
+	F_ 2
+	A# 2
+	F_ 2
+	A# 2
+	F_ 2
+	A# 2
+	A_ 2
+	F_ 2
 	loopchannel 0, Music_Gym_branch_be02
 
 Music_Gym_branch_be3b::
-	note E_, 2
-	note G_, 2
-	note E_, 2
-	note G_, 2
-	note E_, 2
-	note G_, 2
-	note E_, 2
-	note G_, 2
+	E_ 2
+	G_ 2
+	E_ 2
+	G_ 2
+	E_ 2
+	G_ 2
+	E_ 2
+	G_ 2
 	endchannel
 
 Music_Gym_branch_be44::
-	note D_, 2
-	note F_, 2
-	note D_, 2
-	note F_, 2
-	note D_, 2
-	note F_, 2
-	note D_, 2
-	note F_, 2
+	D_ 2
+	F_ 2
+	D_ 2
+	F_ 2
+	D_ 2
+	F_ 2
+	D_ 2
+	F_ 2
 	endchannel
 
 Music_Gym_branch_be4d::
-	note F_, 2
-	note A#, 2
-	note F_, 2
-	note A#, 2
-	note F_, 2
-	note A#, 2
-	note F_, 2
-	note A#, 2
+	F_ 2
+	A# 2
+	F_ 2
+	A# 2
+	F_ 2
+	A# 2
+	F_ 2
+	A# 2
 	endchannel
-; 0xbe56
\ No newline at end of file
+; 0xbe56
--- a/audio/music/gymleaderbattle.asm
+++ b/audio/music/gymleaderbattle.asm
@@ -7,543 +7,543 @@
 	notetype 12, 11, 3
 	rest 6
 	octave 3
-	note F#, 1
-	note F_, 1
-	note E_, 1
-	note F_, 1
-	note E_, 1
-	note D#, 1
-	note E_, 1
-	note D#, 1
-	note D_, 1
-	note D#, 1
-	note D_, 1
-	note C#, 1
-	note D_, 1
-	note C#, 1
-	note C_, 1
-	note C#, 1
-	note C_, 1
+	F# 1
+	F_ 1
+	E_ 1
+	F_ 1
+	E_ 1
+	D# 1
+	E_ 1
+	D# 1
+	D_ 1
+	D# 1
+	D_ 1
+	C# 1
+	D_ 1
+	C# 1
+	C_ 1
+	C# 1
+	C_ 1
 	octave 2
-	note B_, 1
+	B_ 1
 	octave 1
-	note G#, 1
-	note A_, 1
-	note A#, 1
-	note A_, 1
-	note A#, 1
-	note B_, 1
-	note A#, 1
-	note B_, 1
+	G# 1
+	A_ 1
+	A# 1
+	A_ 1
+	A# 1
+	B_ 1
+	A# 1
+	B_ 1
 	octave 2
-	note F#, 1
+	F# 1
 	rest 15
-	note F#, 1
+	F# 1
 	rest 9
-	note G_, 6
-	note F#, 1
+	G_ 6
+	F# 1
 	rest 15
-	note F#, 1
+	F# 1
 	rest 9
-	note F_, 6
-	note F#, 1
+	F_ 6
+	F# 1
 	rest 15
-	note F#, 1
+	F# 1
 	rest 9
-	note G_, 6
-	note F#, 1
+	G_ 6
+	F# 1
 	rest 15
-	note F#, 1
+	F# 1
 	rest 9
-	note A_, 6
+	A_ 6
 
 Music_GymLeaderBattle_branch_223b0::
-	note F#, 1
+	F# 1
 	octave 3
-	note C#, 1
-	note F#, 1
-	note E_, 1
-	note C#, 1
-	note F#, 1
-	note E_, 1
-	note C#, 1
-	note F#, 1
-	note E_, 1
-	note C#, 1
-	note F#, 1
-	note E_, 1
-	note C#, 1
-	note F#, 1
-	note E_, 1
-	note C#, 1
-	note F#, 1
-	note E_, 1
-	note C#, 1
-	note F#, 1
-	note E_, 1
-	note C#, 1
-	note F#, 1
-	note E_, 1
-	note C#, 1
-	note F#, 1
-	note E_, 1
-	note C#, 1
-	note F#, 1
-	note E_, 1
-	note C#, 1
+	C# 1
+	F# 1
+	E_ 1
+	C# 1
+	F# 1
+	E_ 1
+	C# 1
+	F# 1
+	E_ 1
+	C# 1
+	F# 1
+	E_ 1
+	C# 1
+	F# 1
+	E_ 1
+	C# 1
+	F# 1
+	E_ 1
+	C# 1
+	F# 1
+	E_ 1
+	C# 1
+	F# 1
+	E_ 1
+	C# 1
+	F# 1
+	E_ 1
+	C# 1
+	F# 1
+	E_ 1
+	C# 1
 	octave 2
-	note E_, 1
-	note A_, 1
+	E_ 1
+	A_ 1
 	octave 3
-	note C#, 1
+	C# 1
 	octave 2
-	note B_, 1
-	note A_, 1
+	B_ 1
+	A_ 1
 	octave 3
-	note C#, 1
+	C# 1
 	octave 2
-	note B_, 1
-	note A_, 1
+	B_ 1
+	A_ 1
 	octave 3
-	note C#, 1
+	C# 1
 	octave 2
-	note B_, 1
-	note A_, 1
+	B_ 1
+	A_ 1
 	octave 3
-	note C#, 1
+	C# 1
 	octave 2
-	note B_, 1
-	note A_, 1
+	B_ 1
+	A_ 1
 	octave 3
-	note C#, 1
+	C# 1
 	octave 2
-	note B_, 1
-	note A_, 1
+	B_ 1
+	A_ 1
 	octave 3
-	note C#, 1
+	C# 1
 	octave 2
-	note B_, 1
-	note A_, 1
+	B_ 1
+	A_ 1
 	octave 3
-	note C#, 1
+	C# 1
 	octave 2
-	note B_, 1
-	note A_, 1
+	B_ 1
+	A_ 1
 	octave 3
-	note C#, 1
+	C# 1
 	octave 2
-	note B_, 1
-	note A_, 1
+	B_ 1
+	A_ 1
 	octave 3
-	note C#, 1
+	C# 1
 	octave 2
-	note B_, 1
-	note A_, 1
+	B_ 1
+	A_ 1
 	octave 3
-	note C#, 1
+	C# 1
 	octave 2
-	note B_, 1
-	note A_, 1
-	note F#, 1
+	B_ 1
+	A_ 1
+	F# 1
 	octave 3
-	note C#, 1
-	note F#, 1
-	note E_, 1
-	note C#, 1
-	note F#, 1
-	note E_, 1
-	note C#, 1
-	note F#, 1
-	note E_, 1
-	note C#, 1
-	note F#, 1
-	note E_, 1
-	note C#, 1
-	note F#, 1
-	note E_, 1
-	note C#, 1
-	note F#, 1
-	note E_, 1
-	note C#, 1
-	note F#, 1
-	note E_, 1
-	note C#, 1
-	note F#, 1
-	note E_, 1
-	note C#, 1
-	note F#, 1
-	note E_, 1
-	note C#, 1
-	note F#, 1
-	note E_, 1
-	note C#, 1
+	C# 1
+	F# 1
+	E_ 1
+	C# 1
+	F# 1
+	E_ 1
+	C# 1
+	F# 1
+	E_ 1
+	C# 1
+	F# 1
+	E_ 1
+	C# 1
+	F# 1
+	E_ 1
+	C# 1
+	F# 1
+	E_ 1
+	C# 1
+	F# 1
+	E_ 1
+	C# 1
+	F# 1
+	E_ 1
+	C# 1
+	F# 1
+	E_ 1
+	C# 1
+	F# 1
+	E_ 1
+	C# 1
 	octave 2
-	note E_, 1
-	note A_, 1
+	E_ 1
+	A_ 1
 	octave 3
-	note C#, 1
+	C# 1
 	octave 2
-	note B_, 1
-	note A_, 1
+	B_ 1
+	A_ 1
 	octave 3
-	note C#, 1
+	C# 1
 	octave 2
-	note B_, 1
-	note A_, 1
+	B_ 1
+	A_ 1
 	octave 3
-	note C#, 1
+	C# 1
 	octave 2
-	note B_, 1
-	note A_, 1
+	B_ 1
+	A_ 1
 	octave 3
-	note C#, 1
+	C# 1
 	octave 2
-	note B_, 1
-	note A_, 1
+	B_ 1
+	A_ 1
 	octave 3
-	note C#, 1
+	C# 1
 	octave 2
-	note B_, 1
-	note A_, 1
+	B_ 1
+	A_ 1
 	octave 3
-	note C#, 1
+	C# 1
 	octave 2
-	note B_, 1
-	note A_, 1
+	B_ 1
+	A_ 1
 	octave 3
-	note C#, 1
+	C# 1
 	octave 2
-	note B_, 1
-	note A_, 1
+	B_ 1
+	A_ 1
 	octave 3
-	note C#, 1
+	C# 1
 	octave 2
-	note B_, 1
-	note A_, 1
+	B_ 1
+	A_ 1
 	octave 3
-	note C#, 1
+	C# 1
 	octave 2
-	note B_, 1
-	note A_, 1
+	B_ 1
+	A_ 1
 	octave 3
-	note C#, 1
+	C# 1
 	octave 2
-	note B_, 1
-	note A_, 1
+	B_ 1
+	A_ 1
 	rest 2
 	octave 1
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 2
-	note D_, 4
+	D_ 4
 	octave 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 2
-	note E_, 4
+	E_ 4
 	octave 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 2
-	note D_, 4
+	D_ 4
 	octave 1
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 2
-	note C#, 2
+	C# 2
 	octave 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 2
-	note D_, 4
+	D_ 4
 	octave 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 2
-	note E_, 4
+	E_ 4
 	octave 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 2
-	note D_, 4
+	D_ 4
 	octave 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 2
-	note C#, 2
+	C# 2
 	octave 1
-	note B_, 2
-	note A_, 2
+	B_ 2
+	A_ 2
 	octave 2
-	note C#, 2
+	C# 2
 	octave 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 3
-	note C_, 1
+	C_ 1
 	octave 2
-	note B_, 1
-	note A_, 1
-	note B_, 1
+	B_ 1
+	A_ 1
+	B_ 1
 	octave 3
-	note C_, 1
+	C_ 1
 	octave 2
-	note B_, 1
-	note A_, 1
-	note B_, 1
+	B_ 1
+	A_ 1
+	B_ 1
 	octave 3
-	note C_, 1
+	C_ 1
 	octave 2
-	note B_, 1
-	note A_, 1
-	note B_, 1
+	B_ 1
+	A_ 1
+	B_ 1
 	octave 3
-	note C_, 1
+	C_ 1
 	octave 2
-	note B_, 1
-	note A_, 1
-	note B_, 1
+	B_ 1
+	A_ 1
+	B_ 1
 	octave 3
-	note C_, 1
+	C_ 1
 	octave 2
-	note B_, 1
-	note A_, 1
-	note B_, 1
+	B_ 1
+	A_ 1
+	B_ 1
 	octave 3
-	note C_, 1
+	C_ 1
 	octave 2
-	note B_, 1
-	note A_, 1
-	note B_, 1
+	B_ 1
+	A_ 1
+	B_ 1
 	octave 3
-	note C_, 1
+	C_ 1
 	octave 2
-	note B_, 1
-	note A_, 1
-	note B_, 1
+	B_ 1
+	A_ 1
+	B_ 1
 	octave 3
-	note C_, 1
+	C_ 1
 	octave 2
-	note B_, 1
-	note A_, 1
-	note B_, 1
+	B_ 1
+	A_ 1
+	B_ 1
 	octave 3
-	note C_, 1
+	C_ 1
 	octave 2
-	note B_, 1
-	note A_, 1
-	note B_, 1
+	B_ 1
+	A_ 1
+	B_ 1
 	octave 3
-	note C_, 1
+	C_ 1
 	octave 2
-	note B_, 1
-	note A_, 1
-	note B_, 1
+	B_ 1
+	A_ 1
+	B_ 1
 	octave 3
-	note C_, 1
+	C_ 1
 	octave 2
-	note B_, 1
-	note A_, 1
-	note B_, 1
+	B_ 1
+	A_ 1
+	B_ 1
 	rest 16
 	octave 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 3
-	note C_, 1
+	C_ 1
 	octave 2
-	note B_, 1
-	note A_, 1
-	note B_, 1
+	B_ 1
+	A_ 1
+	B_ 1
 	octave 3
-	note C_, 1
+	C_ 1
 	octave 2
-	note B_, 1
-	note A_, 1
-	note B_, 1
+	B_ 1
+	A_ 1
+	B_ 1
 	octave 3
-	note C_, 1
+	C_ 1
 	octave 2
-	note B_, 1
-	note A_, 1
-	note B_, 1
+	B_ 1
+	A_ 1
+	B_ 1
 	octave 3
-	note C_, 1
+	C_ 1
 	octave 2
-	note B_, 1
-	note A_, 1
-	note B_, 1
+	B_ 1
+	A_ 1
+	B_ 1
 	octave 3
-	note C_, 1
+	C_ 1
 	octave 2
-	note B_, 1
-	note A_, 1
-	note B_, 1
+	B_ 1
+	A_ 1
+	B_ 1
 	octave 3
-	note C_, 1
+	C_ 1
 	octave 2
-	note B_, 1
-	note A_, 1
-	note B_, 1
+	B_ 1
+	A_ 1
+	B_ 1
 	octave 3
-	note C_, 1
+	C_ 1
 	octave 2
-	note B_, 1
-	note A_, 1
-	note B_, 1
+	B_ 1
+	A_ 1
+	B_ 1
 	octave 3
-	note C_, 1
+	C_ 1
 	octave 2
-	note B_, 1
-	note A_, 1
-	note B_, 1
+	B_ 1
+	A_ 1
+	B_ 1
 	octave 3
-	note C_, 1
+	C_ 1
 	octave 2
-	note B_, 1
-	note A_, 1
-	note B_, 1
+	B_ 1
+	A_ 1
+	B_ 1
 	octave 3
-	note C_, 1
+	C_ 1
 	octave 2
-	note B_, 1
-	note A_, 1
-	note B_, 1
+	B_ 1
+	A_ 1
+	B_ 1
 	octave 3
-	note C_, 1
+	C_ 1
 	octave 2
-	note B_, 1
-	note A_, 1
-	note B_, 1
+	B_ 1
+	A_ 1
+	B_ 1
 	octave 3
-	note C_, 1
+	C_ 1
 	octave 2
-	note B_, 1
-	note A_, 1
-	note B_, 1
+	B_ 1
+	A_ 1
+	B_ 1
 	octave 3
-	note C_, 1
+	C_ 1
 	octave 2
-	note B_, 1
-	note A_, 1
-	note B_, 1
+	B_ 1
+	A_ 1
+	B_ 1
 	octave 3
-	note C_, 1
+	C_ 1
 	octave 2
-	note B_, 1
-	note A_, 1
-	note B_, 1
+	B_ 1
+	A_ 1
+	B_ 1
 	octave 3
-	note C_, 1
+	C_ 1
 	octave 2
-	note B_, 1
-	note A_, 1
-	note B_, 1
+	B_ 1
+	A_ 1
+	B_ 1
 	octave 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	notetype 12, 11, 5
 	octave 3
-	note C#, 12
+	C# 12
 	notetype 12, 11, 3
 	octave 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	notetype 12, 11, 5
 	octave 3
-	note A_, 12
+	A_ 12
 	notetype 12, 11, 3
-	note D#, 4
-	note C#, 4
-	note D#, 4
-	note E_, 2
-	note F#, 4
+	D# 4
+	C# 4
+	D# 4
+	E_ 2
+	F# 4
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note C#, 2
-	note F#, 2
-	note B_, 2
-	note F#, 2
-	note D#, 2
-	note F#, 2
+	C# 2
+	F# 2
+	B_ 2
+	F# 2
+	D# 2
+	F# 2
 	octave 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	notetype 12, 11, 5
 	octave 3
-	note A_, 12
+	A_ 12
 	notetype 12, 11, 3
-	note C#, 1
+	C# 1
 	octave 2
-	note B_, 1
+	B_ 1
 	octave 3
-	note C#, 1
-	note D#, 1
-	note E_, 1
-	note D#, 1
-	note E_, 1
-	note F#, 1
-	note A_, 1
-	note G#, 1
-	note F#, 1
-	note E_, 1
-	note F#, 1
-	note E_, 1
-	note D#, 1
-	note C#, 1
+	C# 1
+	D# 1
+	E_ 1
+	D# 1
+	E_ 1
+	F# 1
+	A_ 1
+	G# 1
+	F# 1
+	E_ 1
+	F# 1
+	E_ 1
+	D# 1
+	C# 1
 	notetype 12, 11, 5
-	note D#, 4
-	note E_, 4
-	note C#, 2
-	note D#, 6
-	note F#, 4
-	note E_, 2
-	note D#, 4
-	note C#, 6
+	D# 4
+	E_ 4
+	C# 2
+	D# 6
+	F# 4
+	E_ 2
+	D# 4
+	C# 6
 	rest 16
 	rest 10
-	note E_, 6
-	note D#, 4
-	note E_, 4
-	note C#, 2
-	note D#, 6
-	note E_, 4
-	note D#, 2
-	note C#, 4
+	E_ 6
+	D# 4
+	E_ 4
+	C# 2
+	D# 6
+	E_ 4
+	D# 2
+	C# 4
 	octave 2
-	note B_, 6
+	B_ 6
 	octave 3
-	note D#, 4
-	note E_, 4
-	note C#, 2
-	note D#, 6
-	note F#, 4
-	note A_, 2
-	note G#, 4
-	note E_, 6
+	D# 4
+	E_ 4
+	C# 2
+	D# 6
+	F# 4
+	A_ 2
+	G# 4
+	E_ 6
 	loopchannel 0, Music_GymLeaderBattle_branch_223b0
 
 
@@ -552,299 +552,299 @@
 	vibrato 8, 2, 5
 	notetype 12, 12, 3
 	octave 4
-	note F_, 1
-	note E_, 1
-	note D#, 1
-	note E_, 1
-	note D#, 1
-	note D_, 1
-	note D#, 1
-	note D_, 1
-	note C#, 1
-	note D_, 1
-	note C#, 1
-	note C_, 1
+	F_ 1
+	E_ 1
+	D# 1
+	E_ 1
+	D# 1
+	D_ 1
+	D# 1
+	D_ 1
+	C# 1
+	D_ 1
+	C# 1
+	C_ 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 5
-	note F#, 1
-	note F_, 1
-	note E_, 1
-	note F_, 1
-	note E_, 1
-	note D#, 1
-	note E_, 1
-	note D#, 1
-	note D_, 1
-	note D#, 1
-	note D_, 1
-	note C#, 1
-	note D_, 1
-	note C#, 1
-	note B_, 1
+	F# 1
+	F_ 1
+	E_ 1
+	F_ 1
+	E_ 1
+	D# 1
+	E_ 1
+	D# 1
+	D_ 1
+	D# 1
+	D_ 1
+	C# 1
+	D_ 1
+	C# 1
+	B_ 1
 	rest 15
-	note B_, 1
+	B_ 1
 	rest 9
 	octave 4
-	note C_, 6
+	C_ 6
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 15
-	note B_, 1
+	B_ 1
 	rest 9
-	note A#, 6
+	A# 6
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 15
-	note B_, 1
+	B_ 1
 	rest 9
 	octave 4
-	note C_, 6
+	C_ 6
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 15
-	note B_, 1
+	B_ 1
 	rest 9
 	octave 4
-	note C#, 6
+	C# 6
 
 Music_GymLeaderBattle_branch_225e0::
 	notetype 12, 12, 5
-	note D#, 4
-	note C#, 4
-	note D#, 4
-	note E_, 2
-	note F#, 4
-	note E_, 4
-	note D#, 2
-	note C#, 2
+	D# 4
+	C# 4
+	D# 4
+	E_ 2
+	F# 4
+	E_ 4
+	D# 2
+	C# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note C#, 2
-	note D#, 2
+	C# 2
+	D# 2
 	notetype 12, 11, 7
 	duty 2
 	octave 3
-	note A_, 8
+	A_ 8
 	octave 4
-	note C#, 8
-	note E_, 8
-	note C#, 8
+	C# 8
+	E_ 8
+	C# 8
 	notetype 12, 12, 5
 	duty 3
-	note D#, 4
-	note C#, 4
-	note D#, 4
-	note E_, 2
-	note F#, 4
-	note E_, 4
-	note D#, 2
-	note C#, 2
+	D# 4
+	C# 4
+	D# 4
+	E_ 2
+	F# 4
+	E_ 4
+	D# 2
+	C# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note C#, 2
-	note D#, 2
+	C# 2
+	D# 2
 	notetype 12, 11, 7
 	duty 2
-	note C#, 8
+	C# 8
 	octave 3
-	note B_, 8
-	note A_, 8
+	B_ 8
+	A_ 8
 	notetype 12, 12, 3
 	octave 4
-	note E_, 4
-	note E_, 2
-	note C#, 2
+	E_ 4
+	E_ 2
+	C# 2
 	notetype 12, 12, 5
 	duty 3
 	octave 1
-	note B_, 1
+	B_ 1
 	rest 3
 	octave 3
-	note D_, 1
-	note C#, 1
+	D_ 1
+	C# 1
 	octave 2
-	note B_, 1
+	B_ 1
 	octave 3
-	note D_, 1
+	D_ 1
 	rest 4
-	note E_, 1
-	note D_, 1
+	E_ 1
+	D_ 1
 	octave 2
-	note B_, 1
+	B_ 1
 	octave 3
-	note E_, 1
+	E_ 1
 	rest 4
-	note F#, 1
-	note E_, 1
-	note C#, 1
-	note F#, 1
+	F# 1
+	E_ 1
+	C# 1
+	F# 1
 	rest 2
-	note E_, 1
-	note C#, 1
-	note E_, 1
+	E_ 1
+	C# 1
+	E_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note D_, 1
-	note C#, 1
+	D_ 1
+	C# 1
 	octave 2
-	note B_, 1
+	B_ 1
 	octave 3
-	note D_, 1
+	D_ 1
 	rest 4
-	note E_, 1
-	note D_, 1
+	E_ 1
+	D_ 1
 	octave 2
-	note B_, 1
+	B_ 1
 	octave 3
-	note E_, 1
+	E_ 1
 	rest 4
-	note F#, 1
-	note E_, 1
-	note C#, 1
-	note F#, 1
-	note E_, 1
+	F# 1
+	E_ 1
+	C# 1
+	F# 1
+	E_ 1
 	rest 1
-	note C#, 1
+	C# 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note C#, 1
+	C# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
 	octave 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
 	notetype 12, 11, 0
 	octave 3
-	note B_, 4
+	B_ 4
 	octave 4
-	note C_, 4
+	C_ 4
 	octave 3
-	note A_, 4
-	note B_, 4
+	A_ 4
+	B_ 4
 	octave 4
-	note C_, 4
+	C_ 4
 	octave 3
-	note A_, 4
-	note G_, 4
+	A_ 4
+	G_ 4
 	notetype 12, 11, 0
-	note F#, 8
+	F# 8
 	notetype 12, 11, 7
-	note F#, 8
+	F# 8
 	notetype 12, 12, 3
-	note C_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note D#, 1
-	note D_, 1
-	note C#, 1
-	note C_, 1
+	C_ 1
+	C# 1
+	D_ 1
+	D# 1
+	E_ 1
+	D# 1
+	D_ 1
+	C# 1
+	C_ 1
 	octave 2
-	note B_, 1
-	note A_, 1
-	note G_, 1
-	note F#, 1
-	note F_, 1
-	note E_, 1
-	note F_, 1
-	note F#, 1
-	note G_, 1
-	note A_, 1
-	note B_, 1
+	B_ 1
+	A_ 1
+	G_ 1
+	F# 1
+	F_ 1
+	E_ 1
+	F_ 1
+	F# 1
+	G_ 1
+	A_ 1
+	B_ 1
 	notetype 12, 11, 0
 	octave 3
-	note B_, 4
+	B_ 4
 	octave 4
-	note C_, 4
+	C_ 4
 	octave 3
-	note A_, 4
-	note B_, 4
+	A_ 4
+	B_ 4
 	octave 4
-	note C_, 4
+	C_ 4
 	octave 3
-	note A_, 4
+	A_ 4
 	octave 4
-	note C_, 4
+	C_ 4
 	notetype 12, 11, 0
 	octave 3
-	note B_, 16
+	B_ 16
 	notetype 12, 3, 15
 	octave 4
-	note F#, 16
+	F# 16
 	notetype 12, 12, 3
 	duty 3
 	octave 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	notetype 12, 12, 7
 	octave 3
-	note A_, 12
+	A_ 12
 	notetype 12, 12, 3
 	octave 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	notetype 12, 12, 7
 	octave 4
-	note C#, 12
+	C# 12
 	notetype 12, 11, 0
-	note D#, 16
+	D# 16
 	notetype 12, 11, 7
-	note D#, 16
+	D# 16
 	notetype 12, 12, 3
 	octave 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	notetype 12, 12, 7
 	octave 4
-	note C#, 12
+	C# 12
 	notetype 12, 12, 0
-	note A_, 8
-	note E_, 8
-	note B_, 16
+	A_ 8
+	E_ 8
+	B_ 16
 	notetype 12, 12, 7
-	note B_, 16
+	B_ 16
 	notetype 12, 12, 4
 	octave 3
-	note D#, 4
-	note E_, 4
-	note C#, 2
-	note D#, 6
-	note F#, 4
-	note A_, 2
-	note G#, 4
+	D# 4
+	E_ 4
+	C# 2
+	D# 6
+	F# 4
+	A_ 2
+	G# 4
 	rest 2
-	note B_, 1
+	B_ 1
 	octave 4
-	note D#, 1
-	note F#, 1
-	note A#, 1
+	D# 1
+	F# 1
+	A# 1
 	notetype 12, 12, 0
-	note B_, 16
-	note F#, 16
-	note A_, 16
+	B_ 16
+	F# 16
+	A_ 16
 	octave 5
-	note C#, 8
+	C# 8
 	rest 2
 	notetype 12, 12, 3
 	octave 4
-	note A_, 6
+	A_ 6
 	loopchannel 0, Music_GymLeaderBattle_branch_225e0
 
 
@@ -853,549 +853,549 @@
 	notetype 12, 1, 3
 	rest 12
 	octave 3
-	note B_, 1
+	B_ 1
 	octave 4
-	note C_, 1
-	note C#, 1
-	note C_, 1
-	note C#, 1
-	note D_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note D#, 1
-	note E_, 1
-	note F_, 1
-	note E_, 1
-	note F_, 1
-	note F#, 1
-	note F_, 1
-	note F#, 1
+	C_ 1
+	C# 1
+	C_ 1
+	C# 1
+	D_ 1
+	C# 1
+	D_ 1
+	D# 1
+	D_ 1
+	D# 1
+	E_ 1
+	D# 1
+	E_ 1
+	F_ 1
+	E_ 1
+	F_ 1
+	F# 1
+	F_ 1
+	F# 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note C_, 6
+	C_ 6
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note F_, 6
+	F_ 6
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note C_, 6
+	C_ 6
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note C#, 6
+	C# 6
 	notetype 12, 1, 4
 
 Music_GymLeaderBattle_branch_227b1::
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note E_, 2
+	E_ 2
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note E_, 2
+	E_ 2
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note E_, 2
+	E_ 2
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note E_, 2
+	E_ 2
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note E_, 2
+	E_ 2
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note E_, 2
+	E_ 2
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note E_, 2
+	E_ 2
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note E_, 2
+	E_ 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note E_, 2
+	E_ 2
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note E_, 2
+	E_ 2
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note E_, 2
+	E_ 2
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note E_, 2
+	E_ 2
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note E_, 2
+	E_ 2
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note E_, 2
+	E_ 2
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note E_, 2
+	E_ 2
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note E_, 2
+	E_ 2
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note D_, 4
+	D_ 4
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note E_, 4
+	E_ 4
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note D_, 4
+	D_ 4
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note C#, 2
+	C# 2
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note D_, 4
+	D_ 4
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note E_, 4
+	E_ 4
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note D_, 4
+	D_ 4
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note C#, 2
+	C# 2
 	octave 3
-	note B_, 2
-	note A_, 2
+	B_ 2
+	A_ 2
 	octave 4
-	note C#, 2
+	C# 2
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 13
-	note B_, 1
+	B_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 13
-	note B_, 1
+	B_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 13
-	note B_, 1
+	B_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 13
-	note B_, 1
+	B_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 13
-	note B_, 1
+	B_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 13
-	note B_, 1
+	B_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 13
-	note B_, 1
+	B_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 13
-	note A_, 1
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 4
-	note C#, 12
+	C# 12
 	octave 3
-	note A_, 1
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 4
-	note E_, 12
-	note D#, 16
+	E_ 12
+	D# 16
 	octave 3
-	note B_, 16
-	note A_, 1
+	B_ 16
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 4
-	note E_, 12
-	note C#, 8
-	note E_, 8
+	E_ 12
+	C# 8
+	E_ 8
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note E_, 6
+	E_ 6
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note G_, 6
+	G_ 6
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note C_, 6
+	C_ 6
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note G_, 6
+	G_ 6
 	loopchannel 0, Music_GymLeaderBattle_branch_227b1
-; 0x22919
\ No newline at end of file
+; 0x22919
--- a/audio/music/halloffame.asm
+++ b/audio/music/halloffame.asm
@@ -10,19 +10,19 @@
 	rest 16
 	rest 12
 	octave 3
-	note D_, 1
-	note E_, 1
-	note F_, 1
-	note F#, 1
+	D_ 1
+	E_ 1
+	F_ 1
+	F# 1
 
 Music_HallOfFame_branch_7fbc5::
 	notetype 12, 8, 0
 	octave 4
-	note C_, 16
-	note E_, 16
-	note F#, 16
+	C_ 16
+	E_ 16
+	F# 16
 	notetype 12, 6, 0
-	note F_, 16
+	F_ 16
 	loopchannel 3, Music_HallOfFame_branch_7fbc5
 	rest 16
 	rest 16
@@ -38,28 +38,28 @@
 Music_HallOfFame_branch_7fbdf::
 	notetype 12, 12, 4
 	octave 3
-	note G_, 2
-	note D_, 2
-	note G_, 2
-	note A_, 10
-	note G_, 2
-	note D_, 2
-	note G_, 2
+	G_ 2
+	D_ 2
+	G_ 2
+	A_ 10
+	G_ 2
+	D_ 2
+	G_ 2
 	octave 4
-	note C_, 4
+	C_ 4
 	octave 3
-	note B_, 4
-	note A_, 2
-	note G_, 2
-	note D_, 2
-	note G_, 2
-	note A_, 10
-	note F_, 2
-	note C_, 2
-	note F_, 2
-	note A#, 4
-	note A_, 4
-	note F_, 2
+	B_ 4
+	A_ 2
+	G_ 2
+	D_ 2
+	G_ 2
+	A_ 10
+	F_ 2
+	C_ 2
+	F_ 2
+	A# 4
+	A_ 4
+	F_ 2
 	loopchannel 0, Music_HallOfFame_branch_7fbdf
 
 
@@ -68,30 +68,30 @@
 
 Music_HallOfFame_branch_7fbfe::
 	octave 4
-	note D_, 2
-	note G_, 2
-	note D_, 2
-	note G_, 2
-	note D_, 2
-	note G_, 2
-	note D_, 2
-	note G_, 2
+	D_ 2
+	G_ 2
+	D_ 2
+	G_ 2
+	D_ 2
+	G_ 2
+	D_ 2
+	G_ 2
 	loopchannel 12, Music_HallOfFame_branch_7fbfe
-	note D_, 4
-	note G_, 4
-	note D_, 4
-	note G_, 4
-	note E_, 4
-	note G_, 4
-	note E_, 4
-	note G_, 4
-	note F#, 4
-	note A_, 4
-	note F#, 4
-	note A_, 4
-	note E_, 4
-	note G_, 4
-	note E_, 4
-	note G_, 4
+	D_ 4
+	G_ 4
+	D_ 4
+	G_ 4
+	E_ 4
+	G_ 4
+	E_ 4
+	G_ 4
+	F# 4
+	A_ 4
+	F# 4
+	A_ 4
+	E_ 4
+	G_ 4
+	E_ 4
+	G_ 4
 	loopchannel 0, Music_HallOfFame_Ch3
-; 0x7fc1f
\ No newline at end of file
+; 0x7fc1f
--- a/audio/music/indigoplateau.asm
+++ b/audio/music/indigoplateau.asm
@@ -6,83 +6,83 @@
 	toggleperfectpitch
 	notetype 12, 11, 2
 	octave 2
-	note A_, 8
-	note A_, 8
-	note A_, 8
-	note A_, 4
+	A_ 8
+	A_ 8
+	A_ 8
+	A_ 4
 	notetype 12, 10, 4
-	note A#, 4
+	A# 4
 
 Music_IndigoPlateau_branch_a605::
 	callchannel Music_IndigoPlateau_branch_a659
 	notetype 12, 11, 4
 	octave 3
-	note D_, 4
+	D_ 4
 	callchannel Music_IndigoPlateau_branch_a659
 	notetype 12, 11, 4
 	octave 3
-	note D#, 4
+	D# 4
 	callchannel Music_IndigoPlateau_branch_a659
 	notetype 12, 11, 4
 	octave 3
-	note D_, 4
+	D_ 4
 	callchannel Music_IndigoPlateau_branch_a659
 	notetype 12, 10, 0
 	octave 2
-	note A#, 4
+	A# 4
 	callchannel Music_IndigoPlateau_branch_a659
 	notetype 12, 11, 4
 	octave 3
-	note D_, 4
+	D_ 4
 	notetype 12, 13, 4
 	octave 3
-	note A_, 4
-	note A_, 4
-	note A_, 4
-	note A_, 4
-	note A_, 4
-	note A_, 4
-	note A_, 4
+	A_ 4
+	A_ 4
+	A_ 4
+	A_ 4
+	A_ 4
+	A_ 4
+	A_ 4
 	notetype 12, 11, 4
 	octave 3
-	note D#, 4
+	D# 4
 	notetype 12, 13, 4
 	octave 3
-	note A#, 4
-	note A#, 4
-	note A#, 4
-	note A#, 4
-	note A#, 4
-	note A#, 4
-	note A#, 4
+	A# 4
+	A# 4
+	A# 4
+	A# 4
+	A# 4
+	A# 4
+	A# 4
 	notetype 12, 11, 4
 	octave 3
-	note F_, 2
+	F_ 2
 	notetype 12, 11, 4
 	octave 3
-	note G_, 2
+	G_ 2
 	notetype 12, 11, 0
-	note A_, 8
+	A_ 8
 	octave 2
-	note A_, 8
+	A_ 8
 	notetype 12, 11, 7
 	octave 3
-	note F_, 8
+	F_ 8
 	notetype 12, 4, 14
 	octave 2
-	note A#, 8
+	A# 8
 	loopchannel 0, Music_IndigoPlateau_branch_a605
 
 Music_IndigoPlateau_branch_a659::
 	notetype 12, 11, 2
 	octave 2
-	note A_, 4
-	note A_, 4
-	note A_, 4
-	note A_, 4
-	note A_, 4
-	note A_, 4
-	note A_, 4
+	A_ 4
+	A_ 4
+	A_ 4
+	A_ 4
+	A_ 4
+	A_ 4
+	A_ 4
 	endchannel
 
 
@@ -91,59 +91,59 @@
 	vibrato 8, 2, 5
 	notetype 12, 12, 2
 	octave 3
-	note D_, 8
-	note D_, 8
-	note D_, 8
-	note D_, 4
+	D_ 8
+	D_ 8
+	D_ 8
+	D_ 4
 	notetype 12, 5, 10
-	note D#, 4
+	D# 4
 
 Music_IndigoPlateau_branch_a673::
 	callchannel Music_IndigoPlateau_branch_a6af
 	notetype 12, 12, 5
-	note A_, 4
+	A_ 4
 	callchannel Music_IndigoPlateau_branch_a6af
 	notetype 12, 12, 5
-	note A#, 4
+	A# 4
 	callchannel Music_IndigoPlateau_branch_a6af
 	notetype 12, 12, 5
-	note A_, 4
+	A_ 4
 	callchannel Music_IndigoPlateau_branch_a6af
 	notetype 12, 12, 7
-	note C#, 4
+	C# 4
 	callchannel Music_IndigoPlateau_branch_a6af
 	notetype 12, 12, 5
-	note A_, 4
+	A_ 4
 	callchannel Music_IndigoPlateau_branch_a6af
 	notetype 12, 12, 5
-	note A#, 4
+	A# 4
 	callchannel Music_IndigoPlateau_branch_a6af
 	notetype 12, 12, 5
 	octave 4
-	note C_, 2
+	C_ 2
 	notetype 12, 12, 7
 	octave 4
-	note C#, 2
-	note D_, 8
+	C# 2
+	D_ 8
 	octave 3
-	note D_, 8
+	D_ 8
 	octave 4
-	note C_, 8
+	C_ 8
 	notetype 12, 4, 13
 	octave 4
-	note D#, 8
+	D# 8
 	loopchannel 0, Music_IndigoPlateau_branch_a673
 
 Music_IndigoPlateau_branch_a6af::
 	notetype 12, 12, 2
 	octave 3
-	note D_, 4
-	note D_, 4
-	note D_, 4
-	note D_, 4
-	note D_, 4
-	note D_, 4
-	note D_, 4
+	D_ 4
+	D_ 4
+	D_ 4
+	D_ 4
+	D_ 4
+	D_ 4
+	D_ 4
 	endchannel
 
 
@@ -150,95 +150,95 @@
 Music_IndigoPlateau_Ch3:: ; a6ba (2:66ba)
 	notetype 12, 1, 0
 	octave 4
-	note D_, 2
+	D_ 2
 	rest 6
-	note D_, 2
+	D_ 2
 	rest 6
-	note D_, 2
+	D_ 2
 	rest 6
-	note D_, 2
+	D_ 2
 	rest 2
-	note D#, 4
+	D# 4
 
 Music_IndigoPlateau_branch_a6c6::
 	callchannel Music_IndigoPlateau_branch_a6fe
 	callchannel Music_IndigoPlateau_branch_a6fe
 	callchannel Music_IndigoPlateau_branch_a6fe
-	note D_, 2
+	D_ 2
 	rest 2
-	note D_, 2
+	D_ 2
 	rest 2
-	note D_, 2
+	D_ 2
 	rest 2
-	note D_, 2
+	D_ 2
 	rest 2
-	note D_, 2
+	D_ 2
 	rest 2
-	note D_, 2
+	D_ 2
 	rest 2
-	note D_, 2
+	D_ 2
 	rest 2
-	note F#, 4
+	F# 4
 	callchannel Music_IndigoPlateau_branch_a6fe
 	callchannel Music_IndigoPlateau_branch_a6fe
-	note D_, 2
+	D_ 2
 	rest 2
-	note D_, 2
+	D_ 2
 	rest 2
-	note D_, 2
+	D_ 2
 	rest 2
-	note D_, 2
+	D_ 2
 	rest 2
-	note D_, 2
+	D_ 2
 	rest 2
-	note D_, 2
+	D_ 2
 	rest 2
-	note D_, 2
+	D_ 2
 	rest 2
-	note A#, 1
+	A# 1
 	rest 1
-	note A#, 1
+	A# 1
 	rest 1
-	note A_, 8
-	note D_, 8
-	note A#, 8
-	note D#, 8
+	A_ 8
+	D_ 8
+	A# 8
+	D# 8
 	loopchannel 0, Music_IndigoPlateau_branch_a6c6
 
 Music_IndigoPlateau_branch_a6fe::
 	octave 4
-	note D_, 2
+	D_ 2
 	rest 2
-	note D_, 2
+	D_ 2
 	rest 2
-	note D_, 2
+	D_ 2
 	rest 2
-	note D_, 2
+	D_ 2
 	rest 2
-	note D_, 2
+	D_ 2
 	rest 2
-	note D_, 2
+	D_ 2
 	rest 2
-	note D_, 2
+	D_ 2
 	rest 2
-	note A_, 4
+	A_ 4
 	endchannel
 
 
 Music_IndigoPlateau_Ch4:: ; a70f (2:670f)
 	dspeed 6
-	dnote 16, mutedsnare2
-	dnote 16, mutedsnare2
-	dnote 16, mutedsnare2
-	dnote 8, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
+	mutedsnare2 16
+	mutedsnare2 16
+	mutedsnare2 16
+	mutedsnare2 8
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare3 1
 
 Music_IndigoPlateau_branch_a728::
 	callchannel Music_IndigoPlateau_branch_a791
@@ -255,68 +255,68 @@
 	callchannel Music_IndigoPlateau_branch_a7a8
 	callchannel Music_IndigoPlateau_branch_a77e
 	callchannel Music_IndigoPlateau_branch_a7a8
-	dnote 16, mutedsnare2
-	dnote 8, mutedsnare2
-	dnote 8, mutedsnare3
-	dnote 16, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare2
-	dnote 1, mutedsnare2
-	dnote 1, mutedsnare2
-	dnote 1, mutedsnare2
+	mutedsnare2 16
+	mutedsnare2 8
+	mutedsnare3 8
+	mutedsnare2 16
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 1
+	mutedsnare2 1
+	mutedsnare2 1
+	mutedsnare2 1
 	loopchannel 0, Music_IndigoPlateau_branch_a728
 
 Music_IndigoPlateau_branch_a77e::
-	dnote 4, mutedsnare2
-	dnote 4, mutedsnare3
-	dnote 4, mutedsnare4
-	dnote 4, mutedsnare3
-	dnote 4, mutedsnare2
-	dnote 4, mutedsnare3
-	dnote 4, mutedsnare4
-	dnote 2, mutedsnare4
-	dnote 2, mutedsnare3
+	mutedsnare2 4
+	mutedsnare3 4
+	mutedsnare4 4
+	mutedsnare3 4
+	mutedsnare2 4
+	mutedsnare3 4
+	mutedsnare4 4
+	mutedsnare4 2
+	mutedsnare3 2
 	endchannel
 
 Music_IndigoPlateau_branch_a791::
-	dnote 4, mutedsnare2
-	dnote 4, mutedsnare3
-	dnote 4, mutedsnare4
-	dnote 4, mutedsnare3
-	dnote 4, mutedsnare2
-	dnote 4, mutedsnare3
-	dnote 4, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
+	mutedsnare2 4
+	mutedsnare3 4
+	mutedsnare4 4
+	mutedsnare3 4
+	mutedsnare2 4
+	mutedsnare3 4
+	mutedsnare4 4
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
 	endchannel
 
 Music_IndigoPlateau_branch_a7a8::
-	dnote 4, mutedsnare2
-	dnote 4, mutedsnare3
-	dnote 4, mutedsnare2
-	dnote 4, mutedsnare3
-	dnote 4, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
+	mutedsnare2 4
+	mutedsnare3 4
+	mutedsnare2 4
+	mutedsnare3 4
+	mutedsnare2 4
+	mutedsnare2 4
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare3 1
 	endchannel
-; 0xa7c5
\ No newline at end of file
+; 0xa7c5
--- a/audio/music/introbattle.asm
+++ b/audio/music/introbattle.asm
@@ -7,86 +7,86 @@
 	notetype 12, 11, 1
 	rest 8
 	octave 2
-	note A_, 2
-	note A_, 2
+	A_ 2
+	A_ 2
 	notetype 12, 11, 4
 	octave 3
-	note D_, 4
+	D_ 4
 	notetype 12, 11, 1
 	octave 2
-	note A_, 2
-	note A_, 2
+	A_ 2
+	A_ 2
 	notetype 12, 11, 4
 	octave 3
-	note D#, 4
+	D# 4
 	notetype 12, 11, 1
 	octave 2
-	note A_, 2
-	note A_, 2
+	A_ 2
+	A_ 2
 	notetype 12, 11, 4
 	octave 3
-	note D_, 4
+	D_ 4
 	notetype 12, 11, 1
 	octave 2
-	note A_, 2
-	note A_, 2
+	A_ 2
+	A_ 2
 	notetype 12, 10, 0
-	note A#, 4
+	A# 4
 	notetype 12, 11, 1
-	note A_, 2
-	note A_, 2
+	A_ 2
+	A_ 2
 	notetype 12, 11, 4
 	octave 3
-	note D_, 4
+	D_ 4
 	notetype 12, 11, 1
 	octave 2
-	note A_, 2
-	note A_, 2
+	A_ 2
+	A_ 2
 	notetype 12, 2, 9
 	octave 3
-	note G_, 4
+	G_ 4
 	notetype 12, 11, 0
-	note A_, 8
+	A_ 8
 	octave 2
-	note A_, 8
+	A_ 8
 	notetype 12, 11, 7
 	octave 3
-	note F_, 8
+	F_ 8
 	notetype 12, 4, 15
 	octave 2
-	note F_, 8
+	F_ 8
 	notetype 12, 11, 1
-	note A_, 2
-	note A_, 2
+	A_ 2
+	A_ 2
 	notetype 12, 11, 4
 	octave 3
-	note D_, 4
+	D_ 4
 	notetype 12, 11, 1
 	octave 2
-	note A_, 2
-	note A_, 2
+	A_ 2
+	A_ 2
 	notetype 12, 11, 4
 	octave 3
-	note D#, 4
+	D# 4
 	notetype 12, 11, 1
 	octave 2
-	note A_, 2
-	note A_, 2
+	A_ 2
+	A_ 2
 	notetype 12, 11, 4
 	octave 3
-	note F_, 4
+	F_ 4
 	notetype 12, 11, 1
 	octave 2
-	note A_, 2
-	note A_, 2
+	A_ 2
+	A_ 2
 	notetype 12, 11, 4
 	octave 3
-	note G_, 4
+	G_ 4
 	notetype 12, 11, 0
-	note F#, 16
+	F# 16
 	notetype 12, 11, 1
 	octave 4
-	note D_, 16
+	D_ 16
 	endchannel
 
 
@@ -96,72 +96,72 @@
 	notetype 12, 12, 2
 	rest 8
 	octave 3
-	note D_, 2
-	note D_, 2
+	D_ 2
+	D_ 2
 	notetype 12, 12, 5
-	note A_, 4
+	A_ 4
 	notetype 12, 12, 2
-	note D_, 2
-	note D_, 2
+	D_ 2
+	D_ 2
 	notetype 12, 12, 5
-	note A#, 4
+	A# 4
 	notetype 12, 12, 2
-	note D_, 2
-	note D_, 2
+	D_ 2
+	D_ 2
 	notetype 12, 12, 5
-	note A_, 4
+	A_ 4
 	notetype 12, 12, 2
-	note D_, 2
-	note D_, 2
+	D_ 2
+	D_ 2
 	notetype 12, 11, 7
-	note C#, 4
+	C# 4
 	notetype 12, 12, 2
-	note D_, 2
-	note D_, 2
+	D_ 2
+	D_ 2
 	notetype 12, 12, 5
-	note A_, 4
+	A_ 4
 	notetype 12, 12, 2
 	octave 3
-	note D_, 2
-	note D_, 2
+	D_ 2
+	D_ 2
 	notetype 12, 12, 7
 	octave 4
-	note C#, 4
-	note D_, 8
+	C# 4
+	D_ 8
 	octave 3
-	note D_, 8
+	D_ 8
 	octave 4
-	note C_, 8
+	C_ 8
 	octave 3
-	note C_, 8
+	C_ 8
 	notetype 12, 12, 2
-	note D_, 2
-	note D_, 2
+	D_ 2
+	D_ 2
 	notetype 12, 12, 5
-	note A_, 4
+	A_ 4
 	notetype 12, 12, 2
-	note D_, 2
-	note D_, 2
+	D_ 2
+	D_ 2
 	notetype 12, 12, 5
-	note A#, 4
+	A# 4
 	notetype 12, 12, 2
-	note D_, 2
-	note D_, 2
+	D_ 2
+	D_ 2
 	notetype 12, 12, 5
 	octave 4
-	note C_, 4
+	C_ 4
 	notetype 12, 12, 2
 	octave 3
-	note D_, 2
-	note D_, 2
+	D_ 2
+	D_ 2
 	notetype 12, 12, 5
 	octave 4
-	note C#, 4
+	C# 4
 	notetype 12, 2, 15
-	note D_, 16
+	D_ 16
 	notetype 12, 12, 1
 	octave 5
-	note D_, 16
+	D_ 16
 	endchannel
 
 
@@ -169,62 +169,62 @@
 	notetype 12, 1, 0
 	rest 8
 	octave 4
-	note D_, 1
+	D_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note A_, 4
-	note D_, 1
+	A_ 4
+	D_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note A_, 4
-	note D_, 1
+	A_ 4
+	D_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note A_, 4
-	note D_, 1
+	A_ 4
+	D_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note F#, 4
-	note D_, 1
+	F# 4
+	D_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note A_, 4
-	note D_, 1
+	A_ 4
+	D_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note A#, 4
-	note A_, 8
-	note D_, 8
-	note A#, 8
-	note D_, 8
-	note D_, 1
+	A# 4
+	A_ 8
+	D_ 8
+	A# 8
+	D_ 8
+	D_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note A_, 4
-	note D_, 1
+	A_ 4
+	D_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note A_, 4
-	note D_, 1
+	A_ 4
+	D_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note A#, 4
-	note D_, 1
+	A# 4
+	D_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note A#, 4
-	note A_, 16
-	note D_, 1
+	A# 4
+	A_ 16
+	D_ 1
 	rest 15
 	endchannel
 
@@ -231,100 +231,100 @@
 
 Music_IntroBattle_Ch4:: ; 7f95b (1f:795b)
 	dspeed 6
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare2
-	dnote 1, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 4, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 8, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 8, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 4, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 8, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 16, mutedsnare2
-	dnote 16, mutedsnare2
-	dnote 16, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare2
-	dnote 1, mutedsnare2
-	dnote 1, mutedsnare2
-	dnote 1, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 8, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 4, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 8, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 8, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 16, mutedsnare2
-	dnote 16, mutedsnare2
-	dnote 2, mutedsnare2
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 1
+	mutedsnare2 1
+	mutedsnare2 4
+	mutedsnare2 4
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 4
+	mutedsnare2 4
+	mutedsnare2 8
+	mutedsnare2 4
+	mutedsnare2 4
+	mutedsnare2 8
+	mutedsnare2 4
+	mutedsnare2 4
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 4
+	mutedsnare2 4
+	mutedsnare2 8
+	mutedsnare2 4
+	mutedsnare2 4
+	mutedsnare2 4
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 16
+	mutedsnare2 16
+	mutedsnare2 16
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 1
+	mutedsnare2 1
+	mutedsnare2 1
+	mutedsnare2 1
+	mutedsnare2 4
+	mutedsnare2 4
+	mutedsnare2 8
+	mutedsnare2 4
+	mutedsnare2 4
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 4
+	mutedsnare2 4
+	mutedsnare2 8
+	mutedsnare2 4
+	mutedsnare2 8
+	mutedsnare2 4
+	mutedsnare2 16
+	mutedsnare2 16
+	mutedsnare2 2
 	rest 16
 	rest 14
 	endchannel
-; 0x7fa19
\ No newline at end of file
+; 0x7fa19
--- a/audio/music/jigglypuffsong.asm
+++ b/audio/music/jigglypuffsong.asm
@@ -7,17 +7,17 @@
 	toggleperfectpitch
 	notetype 13, 6, 7
 	octave 4
-	note E_, 8
+	E_ 8
 	notetype 12, 6, 7
-	note B_, 2
-	note G#, 6
-	note F#, 8
-	note G#, 2
-	note A_, 6
-	note G#, 8
-	note F#, 4
-	note G#, 4
-	note E_, 10
+	B_ 2
+	G# 6
+	F# 8
+	G# 2
+	A_ 6
+	G# 8
+	F# 4
+	G# 4
+	E_ 10
 	endchannel
 
 
@@ -27,15 +27,15 @@
 	dutycycle 10
 	notetype 12, 10, 7
 	octave 4
-	note E_, 8
-	note B_, 2
-	note G#, 6
-	note F#, 8
-	note G#, 2
-	note A_, 6
-	note G#, 8
-	note F#, 4
-	note G#, 4
-	note E_, 10
+	E_ 8
+	B_ 2
+	G# 6
+	F# 8
+	G# 2
+	A_ 6
+	G# 8
+	F# 4
+	G# 4
+	E_ 10
 	endchannel
-; 0x7fbaf
\ No newline at end of file
+; 0x7fbaf
--- a/audio/music/lavender.asm
+++ b/audio/music/lavender.asm
@@ -13,48 +13,48 @@
 
 Music_Lavender_branch_bb6b::
 	octave 3
-	note G_, 8
-	note G_, 8
-	note E_, 8
-	note E_, 8
-	note G_, 4
-	note F#, 4
-	note E_, 4
-	note B_, 4
-	note C#, 8
-	note C#, 8
-	note G_, 8
-	note G_, 8
-	note F#, 8
-	note F#, 8
-	note B_, 4
-	note G_, 4
-	note F#, 4
-	note B_, 4
+	G_ 8
+	G_ 8
+	E_ 8
+	E_ 8
+	G_ 4
+	F# 4
+	E_ 4
+	B_ 4
+	C# 8
+	C# 8
+	G_ 8
+	G_ 8
+	F# 8
+	F# 8
+	B_ 4
+	G_ 4
+	F# 4
+	B_ 4
 	octave 4
-	note C_, 8
-	note C_, 8
+	C_ 8
+	C_ 8
 	octave 3
-	note G_, 8
-	note G_, 8
-	note E_, 8
-	note E_, 8
-	note G_, 4
-	note F#, 4
-	note E_, 4
-	note B_, 4
-	note C#, 8
-	note C#, 8
-	note G_, 8
-	note G_, 8
-	note F#, 8
-	note F#, 8
-	note B_, 4
-	note G_, 4
-	note F#, 4
-	note B_, 4
-	note C_, 8
-	note C_, 8
+	G_ 8
+	G_ 8
+	E_ 8
+	E_ 8
+	G_ 4
+	F# 4
+	E_ 4
+	B_ 4
+	C# 8
+	C# 8
+	G_ 8
+	G_ 8
+	F# 8
+	F# 8
+	B_ 4
+	G_ 4
+	F# 4
+	B_ 4
+	C_ 8
+	C_ 8
 	rest 16
 	rest 16
 	rest 16
@@ -69,10 +69,10 @@
 
 Music_Lavender_branch_bba5::
 	octave 5
-	note C_, 4
-	note G_, 4
-	note B_, 4
-	note F#, 4
+	C_ 4
+	G_ 4
+	B_ 4
+	F# 4
 	loopchannel 0, Music_Lavender_branch_bba5
 
 
@@ -87,102 +87,102 @@
 
 Music_Lavender_branch_bbb9::
 	octave 4
-	note E_, 16
-	note D_, 16
-	note C_, 16
-	note E_, 4
-	note C_, 4
+	E_ 16
+	D_ 16
+	C_ 16
+	E_ 4
+	C_ 4
 	octave 3
-	note B_, 4
+	B_ 4
 	octave 4
-	note E_, 4
-	note E_, 16
-	note D_, 16
-	note C_, 16
-	note E_, 4
-	note C_, 4
+	E_ 4
+	E_ 16
+	D_ 16
+	C_ 16
+	E_ 4
+	C_ 4
 	octave 3
-	note B_, 4
+	B_ 4
 	octave 4
-	note E_, 4
-	note E_, 16
-	note D_, 16
-	note C_, 16
-	note E_, 4
-	note C_, 4
+	E_ 4
+	E_ 16
+	D_ 16
+	C_ 16
+	E_ 4
+	C_ 4
 	octave 3
-	note B_, 4
+	B_ 4
 	octave 4
-	note E_, 4
+	E_ 4
 	notetype 12, 3, 5
 	octave 6
-	note B_, 4
-	note G_, 4
-	note F#, 4
-	note B_, 4
+	B_ 4
+	G_ 4
+	F# 4
+	B_ 4
 	notetype 12, 2, 5
-	note B_, 4
-	note G_, 4
-	note F#, 4
-	note B_, 4
+	B_ 4
+	G_ 4
+	F# 4
+	B_ 4
 	octave 7
-	note B_, 4
-	note G_, 4
-	note F#, 4
-	note B_, 4
+	B_ 4
+	G_ 4
+	F# 4
+	B_ 4
 	octave 4
-	note E_, 4
-	note G_, 4
-	note F#, 4
-	note B_, 4
-	note E_, 16
-	note D_, 16
-	note C_, 16
-	note E_, 4
-	note C_, 4
+	E_ 4
+	G_ 4
+	F# 4
+	B_ 4
+	E_ 16
+	D_ 16
+	C_ 16
+	E_ 4
+	C_ 4
 	octave 3
-	note B_, 4
+	B_ 4
 	octave 4
-	note E_, 4
-	note E_, 16
-	note D_, 16
-	note C_, 16
-	note E_, 4
-	note C_, 4
+	E_ 4
+	E_ 16
+	D_ 16
+	C_ 16
+	E_ 4
+	C_ 4
 	octave 3
-	note B_, 4
+	B_ 4
 	octave 4
-	note E_, 4
-	note E_, 16
-	note D_, 16
-	note C_, 16
-	note E_, 4
-	note C_, 4
+	E_ 4
+	E_ 16
+	D_ 16
+	C_ 16
+	E_ 4
+	C_ 4
 	octave 3
-	note B_, 4
+	B_ 4
 	octave 4
-	note E_, 4
+	E_ 4
 	notetype 12, 2, 5
 	octave 6
-	note B_, 4
-	note G_, 4
-	note F#, 4
-	note B_, 4
+	B_ 4
+	G_ 4
+	F# 4
+	B_ 4
 	octave 7
-	note B_, 4
-	note G_, 4
-	note F#, 4
-	note B_, 4
+	B_ 4
+	G_ 4
+	F# 4
+	B_ 4
 	octave 8
-	note B_, 4
-	note G_, 4
-	note F#, 4
-	note B_, 4
+	B_ 4
+	G_ 4
+	F# 4
+	B_ 4
 	octave 4
-	note E_, 4
-	note G_, 4
-	note F#, 4
-	note B_, 4
+	E_ 4
+	G_ 4
+	F# 4
+	B_ 4
 	loopchannel 0, Music_Lavender_branch_bbb9
 
 
@@ -194,7 +194,7 @@
 	rest 16
 
 Music_Lavender_branch_bc26::
-	dnote 8, triangle2
-	dnote 8, triangle2
+	triangle2 8
+	triangle2 8
 	loopchannel 0, Music_Lavender_branch_bc26
-; 0xbc2e
\ No newline at end of file
+; 0xbc2e
--- a/audio/music/meeteviltrainer.asm
+++ b/audio/music/meeteviltrainer.asm
@@ -6,18 +6,18 @@
 	notetype 12, 11, 1
 	rest 4
 	octave 3
-	note D_, 2
-	note C#, 2
+	D_ 2
+	C# 2
 	notetype 12, 4, 15
-	note D_, 4
+	D_ 4
 
 Music_MeetEvilTrainer_branch_7f6ae::
 	notetype 12, 10, 1
-	note D_, 4
-	note D_, 4
-	note D_, 4
+	D_ 4
+	D_ 4
+	D_ 4
 	notetype 12, 7, 0
-	note D_, 4
+	D_ 4
 	loopchannel 0, Music_MeetEvilTrainer_branch_7f6ae
 
 
@@ -25,37 +25,37 @@
 	duty 1
 	notetype 12, 11, 6
 	octave 3
-	note B_, 2
-	note A#, 2
-	note B_, 8
+	B_ 2
+	A# 2
+	B_ 8
 
 Music_MeetEvilTrainer_branch_7f6c2::
 	notetype 12, 12, 2
 	octave 4
-	note D#, 2
-	note D_, 2
-	note C#, 2
-	note C_, 2
+	D# 2
+	D_ 2
+	C# 2
+	C_ 2
 	octave 3
-	note B_, 4
-	note B_, 4
-	note B_, 4
-	note B_, 4
-	note B_, 4
+	B_ 4
+	B_ 4
+	B_ 4
+	B_ 4
+	B_ 4
 	notetype 12, 4, 15
-	note A#, 4
+	A# 4
 	notetype 12, 12, 2
-	note G_, 2
-	note G#, 2
-	note A_, 2
-	note A#, 2
-	note B_, 4
-	note B_, 4
-	note B_, 4
-	note B_, 4
-	note B_, 4
+	G_ 2
+	G# 2
+	A_ 2
+	A# 2
+	B_ 4
+	B_ 4
+	B_ 4
+	B_ 4
+	B_ 4
 	notetype 12, 3, 15
-	note A#, 4
+	A# 4
 	notetype 12, 12, 2
 	loopchannel 0, Music_MeetEvilTrainer_branch_7f6c2
 
@@ -64,18 +64,18 @@
 	notetype 12, 1, 0
 	rest 8
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
 
 Music_MeetEvilTrainer_branch_7f6ee::
-	note F#, 1
+	F# 1
 	rest 3
-	note F#, 1
+	F# 1
 	rest 3
-	note F#, 1
+	F# 1
 	rest 3
-	note A#, 4
+	A# 4
 	loopchannel 0, Music_MeetEvilTrainer_branch_7f6ee
-; 0x7f6f9
\ No newline at end of file
+; 0x7f6f9
--- a/audio/music/meetfemaletrainer.asm
+++ b/audio/music/meetfemaletrainer.asm
@@ -5,24 +5,24 @@
 	toggleperfectpitch
 	notetype 12, 11, 2
 	octave 3
-	note G#, 6
+	G# 6
 	octave 4
-	note E_, 2
-	note D#, 2
-	note C#, 2
-	note C_, 2
+	E_ 2
+	D# 2
+	C# 2
+	C_ 2
 	notetype 12, 8, 1
 
 Music_MeetFemaleTrainer_branch_7f70c::
 	octave 3
-	note E_, 4
+	E_ 4
 	loopchannel 12, Music_MeetFemaleTrainer_branch_7f70c
-	note E_, 4
+	E_ 4
 	octave 2
-	note B_, 4
-	note B_, 4
+	B_ 4
+	B_ 4
 	octave 3
-	note E_, 4
+	E_ 4
 	loopchannel 0, Music_MeetFemaleTrainer_branch_7f70c
 
 
@@ -30,44 +30,44 @@
 	duty 2
 	notetype 12, 12, 2
 	octave 3
-	note B_, 2
+	B_ 2
 	notetype 12, 12, 7
 	octave 4
-	note B_, 12
+	B_ 12
 
 Music_MeetFemaleTrainer_branch_7f726::
 	notetype 12, 12, 2
 	octave 3
-	note B_, 4
+	B_ 4
 	octave 4
-	note D#, 4
-	note E_, 4
-	note D#, 4
-	note C#, 2
-	note C_, 2
+	D# 4
+	E_ 4
+	D# 4
+	C# 2
+	C_ 2
 	octave 3
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note A_, 2
-	note A#, 2
+	B_ 2
+	A_ 2
+	G# 2
+	A_ 2
+	A# 2
 	octave 4
-	note C#, 2
+	C# 2
 	octave 3
-	note B_, 4
+	B_ 4
 	octave 4
-	note C#, 4
+	C# 4
 	octave 3
-	note B_, 4
-	note A_, 4
-	note G#, 2
-	note F#, 2
-	note E_, 2
-	note D#, 2
-	note E_, 2
-	note F#, 2
-	note G#, 2
-	note A_, 2
+	B_ 4
+	A_ 4
+	G# 2
+	F# 2
+	E_ 2
+	D# 2
+	E_ 2
+	F# 2
+	G# 2
+	A_ 2
 	loopchannel 0, Music_MeetFemaleTrainer_branch_7f726
 
 
@@ -75,45 +75,45 @@
 	notetype 12, 1, 0
 	rest 8
 	octave 5
-	note C#, 1
+	C# 1
 	rest 1
 	octave 4
-	note B_, 1
+	B_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 
 Music_MeetFemaleTrainer_branch_7f756::
 	callchannel Music_MeetFemaleTrainer_branch_7f770
-	note G#, 1
+	G# 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 3
-	note G#, 1
+	G# 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 3
 	callchannel Music_MeetFemaleTrainer_branch_7f770
-	note G#, 1
+	G# 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 3
-	note G#, 1
+	G# 1
 	rest 3
-	note B_, 1
+	B_ 1
 	rest 3
 	loopchannel 0, Music_MeetFemaleTrainer_branch_7f756
 
 Music_MeetFemaleTrainer_branch_7f770::
-	note G#, 1
+	G# 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 3
-	note G#, 1
+	G# 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
 	endchannel
-; 0x7f77b
\ No newline at end of file
+; 0x7f77b
--- a/audio/music/meetmaletrainer.asm
+++ b/audio/music/meetmaletrainer.asm
@@ -6,29 +6,29 @@
 	toggleperfectpitch
 	notetype 12, 11, 4
 	octave 3
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note F_, 12
+	C# 1
+	D_ 1
+	D# 1
+	E_ 1
+	F_ 12
 	rest 16
 
 Music_MeetMaleTrainer_branch_7f78f::
 	octave 3
-	note B_, 4
-	note A_, 4
-	note G#, 2
-	note F#, 2
-	note E_, 2
-	note D#, 2
-	note F#, 4
-	note E_, 6
-	note F_, 2
-	note F#, 4
-	note G_, 8
+	B_ 4
+	A_ 4
+	G# 2
+	F# 2
+	E_ 2
+	D# 2
+	F# 4
+	E_ 6
+	F_ 2
+	F# 4
+	G_ 8
 	octave 4
-	note D_, 8
-	note E_, 16
+	D_ 8
+	E_ 16
 	loopchannel 0, Music_MeetMaleTrainer_branch_7f78f
 
 
@@ -37,41 +37,41 @@
 	vibrato 24, 2, 2
 	notetype 12, 12, 4
 	octave 4
-	note E_, 1
-	note D#, 1
-	note D_, 1
-	note C#, 1
+	E_ 1
+	D# 1
+	D_ 1
+	C# 1
 	octave 3
-	note B_, 12
+	B_ 12
 	rest 2
-	note E_, 1
+	E_ 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 9
 
 Music_MeetMaleTrainer_branch_7f7b5::
 	notetype 12, 12, 4
 	octave 4
-	note E_, 6
-	note D#, 6
-	note C#, 4
+	E_ 6
+	D# 6
+	C# 4
 	octave 3
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note G#, 2
-	note A_, 2
-	note B_, 2
+	B_ 2
+	A_ 2
+	G# 2
+	F# 2
+	G# 2
+	A_ 2
+	B_ 2
 	octave 4
-	note C#, 2
+	C# 2
 	notetype 12, 12, 7
-	note F_, 16
+	F_ 16
 	notetype 12, 12, 5
 	octave 3
-	note F#, 8
+	F# 8
 	octave 4
-	note C#, 8
+	C# 8
 	loopchannel 0, Music_MeetMaleTrainer_branch_7f7b5
 
 
@@ -79,113 +79,113 @@
 	notetype 12, 1, 0
 	rest 6
 	octave 4
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 3
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 3
-	note B_, 1
+	B_ 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
 
 Music_MeetMaleTrainer_branch_7f7ea::
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
 	octave 5
-	note C#, 1
+	C# 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 5
-	note C#, 1
+	C# 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 5
-	note C#, 1
+	C# 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 5
-	note C#, 1
+	C# 1
 	rest 1
 	octave 4
-	note G_, 1
+	G_ 1
 	rest 1
 	octave 5
-	note D_, 1
+	D_ 1
 	rest 1
 	octave 4
-	note G_, 1
+	G_ 1
 	rest 1
 	octave 5
-	note D_, 1
+	D_ 1
 	rest 1
 	octave 4
-	note G_, 1
+	G_ 1
 	rest 1
 	octave 5
-	note D_, 1
+	D_ 1
 	rest 1
 	octave 4
-	note G_, 1
+	G_ 1
 	rest 1
 	octave 5
-	note D_, 1
+	D_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 5
-	note C#, 1
+	C# 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 5
-	note C#, 1
+	C# 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 5
-	note C#, 1
+	C# 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
 	loopchannel 0, Music_MeetMaleTrainer_branch_7f7ea
-; 0x7f844
\ No newline at end of file
+; 0x7f844
--- a/audio/music/meetprofoak.asm
+++ b/audio/music/meetprofoak.asm
@@ -5,72 +5,72 @@
 	toggleperfectpitch
 	notetype 12, 11, 4
 	octave 3
-	note F#, 1
-	note B_, 1
+	F# 1
+	B_ 1
 	octave 4
-	note D#, 1
-	note E_, 1
-	note F#, 12
+	D# 1
+	E_ 1
+	F# 12
 	notetype 12, 10, 2
 	octave 3
-	note E_, 6
-	note B_, 10
-	note E_, 6
-	note B_, 10
-	note E_, 6
-	note D#, 4
-	note F#, 2
-	note F#, 4
-	note E_, 6
-	note D#, 4
-	note F#, 2
-	note F#, 4
-	note E_, 6
-	note B_, 10
-	note E_, 6
-	note B_, 10
-	note E_, 6
-	note D#, 4
-	note F#, 2
-	note F#, 4
-	note E_, 6
-	note D#, 4
-	note F#, 2
-	note F#, 4
+	E_ 6
+	B_ 10
+	E_ 6
+	B_ 10
+	E_ 6
+	D# 4
+	F# 2
+	F# 4
+	E_ 6
+	D# 4
+	F# 2
+	F# 4
+	E_ 6
+	B_ 10
+	E_ 6
+	B_ 10
+	E_ 6
+	D# 4
+	F# 2
+	F# 4
+	E_ 6
+	D# 4
+	F# 2
+	F# 4
 
 Music_MeetProfOak_branch_af85::
-	note F#, 6
-	note E_, 4
-	note A_, 2
-	note A_, 4
-	note F#, 6
-	note E_, 4
-	note A_, 2
-	note A_, 4
-	note F#, 6
-	note E_, 4
-	note G#, 2
-	note G#, 4
-	note F#, 6
-	note E_, 4
-	note G#, 2
-	note G#, 4
-	note E_, 6
-	note D#, 4
-	note F#, 2
-	note F#, 4
-	note E_, 6
-	note D#, 4
-	note F#, 2
-	note F#, 4
-	note F#, 6
-	note E_, 4
-	note G#, 2
-	note G#, 4
-	note F#, 6
-	note E_, 4
-	note G#, 2
-	note G#, 4
+	F# 6
+	E_ 4
+	A_ 2
+	A_ 4
+	F# 6
+	E_ 4
+	A_ 2
+	A_ 4
+	F# 6
+	E_ 4
+	G# 2
+	G# 4
+	F# 6
+	E_ 4
+	G# 2
+	G# 4
+	E_ 6
+	D# 4
+	F# 2
+	F# 4
+	E_ 6
+	D# 4
+	F# 2
+	F# 4
+	F# 6
+	E_ 4
+	G# 2
+	G# 4
+	F# 6
+	E_ 4
+	G# 2
+	G# 4
 	loopchannel 0, Music_MeetProfOak_branch_af85
 
 
@@ -79,132 +79,132 @@
 	duty 2
 	notetype 12, 12, 4
 	octave 3
-	note B_, 1
+	B_ 1
 	octave 4
-	note D#, 1
-	note F#, 1
-	note A#, 1
-	note B_, 12
+	D# 1
+	F# 1
+	A# 1
+	B_ 12
 	notetype 12, 11, 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note C#, 2
-	note D#, 2
-	note E_, 4
-	note D#, 2
-	note C#, 4
+	C# 2
+	D# 2
+	E_ 4
+	D# 2
+	C# 4
 	notetype 12, 6, 4
 	octave 4
-	note B_, 2
+	B_ 2
 	octave 5
-	note C#, 2
-	note D#, 2
-	note E_, 4
-	note D#, 2
-	note C#, 4
+	C# 2
+	D# 2
+	E_ 4
+	D# 2
+	C# 4
 	notetype 12, 11, 2
 	octave 3
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note A_, 4
-	note B_, 2
-	note B_, 4
+	B_ 2
+	A_ 2
+	G# 2
+	A_ 4
+	B_ 2
+	B_ 4
 	notetype 12, 8, 1
 	octave 4
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note A_, 4
-	note B_, 2
-	note B_, 4
+	B_ 2
+	A_ 2
+	G# 2
+	A_ 4
+	B_ 2
+	B_ 4
 	notetype 12, 11, 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note C#, 2
-	note D#, 2
-	note E_, 4
-	note D#, 2
-	note C#, 4
+	C# 2
+	D# 2
+	E_ 4
+	D# 2
+	C# 4
 	notetype 12, 6, 4
 	octave 4
-	note B_, 2
+	B_ 2
 	octave 5
-	note C#, 2
-	note D#, 2
-	note E_, 4
-	note D#, 2
-	note C#, 4
+	C# 2
+	D# 2
+	E_ 4
+	D# 2
+	C# 4
 	notetype 12, 11, 2
 	octave 3
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note A_, 4
-	note B_, 2
-	note B_, 4
+	B_ 2
+	A_ 2
+	G# 2
+	A_ 4
+	B_ 2
+	B_ 4
 	notetype 12, 8, 1
 	octave 4
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note A_, 4
-	note B_, 2
-	note B_, 4
+	B_ 2
+	A_ 2
+	G# 2
+	A_ 4
+	B_ 2
+	B_ 4
 	notetype 12, 11, 5
 
 Music_MeetProfOak_branch_b005::
 	octave 4
-	note C#, 6
+	C# 6
 	octave 3
-	note A_, 1
+	A_ 1
 	octave 4
-	note C#, 1
-	note E_, 6
-	note C#, 1
-	note E_, 1
-	note F#, 4
-	note E_, 4
-	note D#, 4
-	note C#, 4
+	C# 1
+	E_ 6
+	C# 1
+	E_ 1
+	F# 4
+	E_ 4
+	D# 4
+	C# 4
 	octave 3
-	note B_, 6
-	note G#, 1
-	note B_, 1
+	B_ 6
+	G# 1
+	B_ 1
 	octave 4
-	note E_, 8
+	E_ 8
 	notetype 12, 6, 5
 	octave 4
-	note B_, 6
-	note G#, 1
-	note B_, 1
+	B_ 6
+	G# 1
+	B_ 1
 	octave 5
-	note E_, 8
+	E_ 8
 	notetype 12, 11, 5
 	octave 3
-	note A_, 6
-	note F#, 1
-	note A_, 1
+	A_ 6
+	F# 1
+	A_ 1
 	octave 4
-	note D#, 8
-	note E_, 4
-	note D#, 4
-	note C#, 4
-	note C_, 4
+	D# 8
+	E_ 4
+	D# 4
+	C# 4
+	C_ 4
 	octave 3
-	note B_, 6
-	note G#, 1
-	note B_, 1
+	B_ 6
+	G# 1
+	B_ 1
 	octave 4
-	note E_, 6
+	E_ 6
 	octave 3
-	note B_, 1
+	B_ 1
 	octave 4
-	note E_, 1
+	E_ 1
 	notetype 12, 11, 7
-	note G#, 16
+	G# 16
 	loopchannel 0, Music_MeetProfOak_branch_b005
 
 
@@ -212,213 +212,213 @@
 	notetype 12, 1, 2
 	rest 10
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 5
-	note C#, 1
+	C# 1
 	rest 1
 	octave 4
-	note B_, 1
+	B_ 1
 	rest 5
 	octave 5
-	note E_, 4
+	E_ 4
 	rest 6
 	octave 4
-	note B_, 1
+	B_ 1
 	rest 5
 	octave 5
-	note E_, 4
+	E_ 4
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 5
-	note C#, 1
+	C# 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
 
 Music_MeetProfOak_branch_b0bc::
 	octave 4
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 5
-	note C#, 1
+	C# 1
 	rest 1
 	octave 4
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 5
-	note C#, 1
+	C# 1
 	rest 1
 	octave 4
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 5
-	note C#, 1
+	C# 1
 	rest 1
 	octave 4
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 5
-	note C#, 1
+	C# 1
 	rest 1
 	loopchannel 2, Music_MeetProfOak_branch_b0bc
 
 Music_MeetProfOak_branch_b0d8::
 	octave 4
-	note G#, 1
+	G# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
 	loopchannel 2, Music_MeetProfOak_branch_b0d8
 
 Music_MeetProfOak_branch_b0ed::
-	note F#, 1
+	F# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	loopchannel 2, Music_MeetProfOak_branch_b0ed
 
 Music_MeetProfOak_branch_b101::
-	note G#, 1
+	G# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
 	loopchannel 2, Music_MeetProfOak_branch_b101
 	loopchannel 0, Music_MeetProfOak_branch_b0bc
-; 0xb119
\ No newline at end of file
+; 0xb119
--- a/audio/music/meetrival.asm
+++ b/audio/music/meetrival.asm
@@ -12,111 +12,111 @@
 	toggleperfectpitch
 	notetype 12, 11, 3
 	octave 4
-	note D_, 1
-	note C#, 1
-	note C_, 1
+	D_ 1
+	C# 1
+	C_ 1
 	octave 3
-	note B_, 1
-	note A#, 2
-	note A_, 1
-	note G#, 1
-	note G_, 1
-	note F#, 1
-	note F_, 6
-	note D_, 1
+	B_ 1
+	A# 2
+	A_ 1
+	G# 1
+	G_ 1
+	F# 1
+	F_ 6
+	D_ 1
 	rest 3
-	note D_, 1
+	D_ 1
 	rest 5
-	note A_, 2
-	note G_, 2
-	note A_, 2
+	A_ 2
+	G_ 2
+	A_ 2
 
 Music_MeetRival_branch_b140::
-	note B_, 4
-	note A#, 2
-	note A_, 4
-	note G_, 2
+	B_ 4
+	A# 2
+	A_ 4
+	G_ 2
 	octave 4
-	note C_, 4
-	note D_, 2
+	C_ 4
+	D_ 2
 	rest 4
-	note D_, 4
-	note C#, 2
-	note C_, 2
+	D_ 4
+	C# 2
+	C_ 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note C_, 4
-	note E_, 2
-	note D_, 4
-	note C_, 2
+	C_ 4
+	E_ 2
+	D_ 4
+	C_ 2
 	octave 3
-	note B_, 4
+	B_ 4
 	octave 4
-	note C_, 2
+	C_ 2
 	rest 4
-	note G_, 4
-	note G_, 2
-	note F#, 2
-	note E_, 2
-	note D_, 2
-	note F#, 2
+	G_ 4
+	G_ 2
+	F# 2
+	E_ 2
+	D_ 2
+	F# 2
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note D_, 2
-	note F#, 2
+	D_ 2
+	F# 2
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note D_, 2
+	D_ 2
 	octave 3
-	note D_, 2
+	D_ 2
 	octave 4
-	note D_, 2
+	D_ 2
 	rest 2
 	octave 3
-	note D_, 2
+	D_ 2
 	octave 4
-	note C_, 4
+	C_ 4
 	octave 3
-	note B_, 2
-	note A#, 2
-	note B_, 2
+	B_ 2
+	A# 2
+	B_ 2
 	octave 4
-	note C_, 2
-	note F_, 2
+	C_ 2
+	F_ 2
 	octave 3
-	note G_, 2
+	G_ 2
 	octave 4
-	note C_, 2
-	note F_, 2
-	note D#, 2
-	note C_, 2
+	C_ 2
+	F_ 2
+	D# 2
+	C_ 2
 	octave 3
-	note A#, 2
-	note G_, 2
+	A# 2
+	G_ 2
 	rest 4
-	note A#, 4
+	A# 4
 	octave 4
-	note C_, 2
+	C_ 2
 	octave 3
-	note A#, 2
+	A# 2
 	octave 4
-	note C_, 2
+	C_ 2
 	notetype 12, 11, 7
 	octave 3
-	note G_, 4
-	note D_, 2
-	note F_, 6
-	note F#, 4
-	note D_, 2
+	G_ 4
+	D_ 2
+	F_ 6
+	F# 4
+	D_ 2
 	rest 4
-	note D_, 4
+	D_ 4
 	notetype 12, 11, 3
-	note A_, 2
-	note G_, 2
-	note A_, 2
+	A_ 2
+	G_ 2
+	A_ 2
 	loopchannel 0, Music_MeetRival_branch_b140
 
 Music_MeetRival_branch_b19b::
@@ -133,13 +133,13 @@
 	toggleperfectpitch
 	notetype 12, 11, 3
 	octave 3
-	note D_, 1
+	D_ 1
 	rest 3
-	note D_, 1
+	D_ 1
 	rest 5
-	note A_, 2
-	note G_, 2
-	note A_, 2
+	A_ 2
+	G_ 2
+	A_ 2
 	loopchannel 0, Music_MeetRival_branch_b140
 
 
@@ -148,86 +148,86 @@
 	vibrato 10, 2, 6
 	notetype 12, 12, 7
 	octave 4
-	note B_, 1
-	note A#, 1
-	note A_, 1
-	note G#, 1
-	note G_, 2
-	note F#, 1
-	note F_, 1
-	note E_, 1
-	note D#, 1
-	note D_, 6
+	B_ 1
+	A# 1
+	A_ 1
+	G# 1
+	G_ 2
+	F# 1
+	F_ 1
+	E_ 1
+	D# 1
+	D_ 6
 	octave 3
-	note G_, 1
+	G_ 1
 	rest 3
-	note G_, 1
+	G_ 1
 	rest 3
-	note D_, 1
+	D_ 1
 	rest 1
 	octave 4
-	note D_, 2
-	note F_, 2
-	note F#, 2
+	D_ 2
+	F_ 2
+	F# 2
 
 Music_MeetRival_branch_b1d8::
 	notetype 12, 12, 7
-	note G_, 4
-	note D_, 2
-	note F_, 6
-	note F#, 4
-	note G_, 2
+	G_ 4
+	D_ 2
+	F_ 6
+	F# 4
+	G_ 2
 	rest 4
-	note G_, 4
-	note G_, 2
-	note A#, 2
-	note B_, 2
+	G_ 4
+	G_ 2
+	A# 2
+	B_ 2
 	octave 5
-	note C_, 4
+	C_ 4
 	octave 4
-	note G_, 2
-	note A#, 6
-	note B_, 4
+	G_ 2
+	A# 6
+	B_ 4
 	octave 5
-	note C_, 2
+	C_ 2
 	rest 4
-	note C_, 4
-	note C_, 2
+	C_ 4
+	C_ 2
 	octave 4
-	note B_, 2
+	B_ 2
 	octave 5
-	note C_, 2
+	C_ 2
 	notetype 12, 11, 0
-	note D_, 16
+	D_ 16
 	notetype 12, 11, 5
-	note D_, 6
+	D_ 6
 	notetype 12, 12, 7
-	note F_, 4
-	note D_, 2
-	note C_, 2
-	note D_, 2
+	F_ 4
+	D_ 2
+	C_ 2
+	D_ 2
 	notetype 12, 11, 0
-	note C_, 8
+	C_ 8
 	notetype 12, 12, 7
-	note C_, 8
+	C_ 8
 	octave 4
-	note C_, 2
+	C_ 2
 	rest 4
-	note A#, 4
-	note G_, 2
-	note F_, 2
+	A# 4
+	G_ 2
+	F_ 2
 	notetype 12, 11, 0
-	note G_, 16
+	G_ 16
 	notetype 12, 11, 3
-	note G_, 2
+	G_ 2
 	octave 3
-	note G_, 2
+	G_ 2
 	rest 4
-	note G_, 4
+	G_ 4
 	octave 4
-	note D_, 2
-	note F_, 2
-	note F#, 2
+	D_ 2
+	F_ 2
+	F# 2
 	loopchannel 0, Music_MeetRival_branch_b1d8
 
 Music_MeetRival_branch_b21d::
@@ -235,16 +235,16 @@
 	vibrato 10, 2, 6
 	notetype 12, 12, 7
 	octave 3
-	note G_, 1
+	G_ 1
 	rest 3
-	note G_, 1
+	G_ 1
 	rest 3
-	note D_, 1
+	D_ 1
 	rest 1
 	octave 4
-	note D_, 2
-	note F_, 2
-	note F#, 2
+	D_ 2
+	F_ 2
+	F# 2
 	loopchannel 0, Music_MeetRival_branch_b1d8
 
 
@@ -251,147 +251,147 @@
 Music_MeetRival_Ch3:: ; b233 (2:7233)
 	notetype 12, 1, 4
 	octave 5
-	note D_, 2
+	D_ 2
 	rest 2
-	note C#, 2
+	C# 2
 	rest 2
-	note C_, 2
+	C_ 2
 	rest 2
 	octave 4
-	note B_, 2
+	B_ 2
 	rest 2
-	note G_, 1
+	G_ 1
 	rest 3
-	note G_, 1
+	G_ 1
 	rest 3
-	note G_, 1
+	G_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
 
 Music_MeetRival_branch_b24b::
-	note G_, 2
+	G_ 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note G_, 2
+	G_ 2
 	rest 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note G_, 2
+	G_ 2
 	rest 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note G_, 2
+	G_ 2
 	rest 4
 	octave 5
-	note D_, 4
+	D_ 4
 	octave 4
-	note G_, 2
-	note A#, 2
-	note B_, 2
-	note G_, 2
+	G_ 2
+	A# 2
+	B_ 2
+	G_ 2
 	octave 5
-	note C_, 2
+	C_ 2
 	octave 4
-	note G_, 2
+	G_ 2
 	rest 2
 	octave 5
-	note C_, 2
+	C_ 2
 	octave 4
-	note G_, 2
+	G_ 2
 	rest 2
-	note B_, 2
+	B_ 2
 	octave 5
-	note C_, 2
+	C_ 2
 	rest 4
-	note C_, 4
-	note C_, 2
+	C_ 4
+	C_ 2
 	octave 4
-	note B_, 2
-	note A_, 2
-	note F#, 2
-	note A_, 2
+	B_ 2
+	A_ 2
+	F# 2
+	A_ 2
 	rest 2
-	note F#, 2
-	note A_, 2
-	note F#, 2
+	F# 2
+	A_ 2
+	F# 2
 	rest 2
-	note A_, 2
-	note F#, 2
-	note A_, 2
+	A_ 2
+	F# 2
+	A_ 2
 	rest 2
-	note F#, 2
-	note A_, 2
-	note F#, 2
+	F# 2
+	A_ 2
+	F# 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note A_, 2
-	note E_, 2
+	A_ 2
+	E_ 2
 	octave 5
-	note C_, 2
+	C_ 2
 	rest 2
 	octave 4
-	note E_, 2
+	E_ 2
 	octave 5
-	note C_, 2
+	C_ 2
 	octave 4
-	note E_, 2
-	note F_, 2
-	note G_, 2
-	note E_, 2
+	E_ 2
+	F_ 2
+	G_ 2
+	E_ 2
 	rest 4
-	note E_, 2
+	E_ 2
 	octave 5
-	note C_, 2
+	C_ 2
 	octave 4
-	note B_, 2
-	note A#, 2
-	note A_, 2
-	note G_, 2
-	note A#, 2
+	B_ 2
+	A# 2
+	A_ 2
+	G_ 2
+	A# 2
 	rest 2
-	note G_, 2
-	note A#, 2
-	note G_, 2
+	G_ 2
+	A# 2
+	G_ 2
 	rest 2
-	note A#, 2
-	note G_, 2
+	A# 2
+	G_ 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note G_, 2
+	G_ 2
 	rest 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note G_, 2
+	G_ 2
 	rest 2
 	octave 5
-	note D_, 2
+	D_ 2
 	loopchannel 0, Music_MeetRival_branch_b24b
 
 Music_MeetRival_branch_b2b5::
 	notetype 12, 1, 4
 	octave 4
-	note G_, 1
+	G_ 1
 	rest 3
-	note G_, 1
+	G_ 1
 	rest 3
-	note G_, 1
+	G_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
 	loopchannel 0, Music_MeetRival_branch_b24b
-; 0xb2c8
\ No newline at end of file
+; 0xb2c8
--- a/audio/music/museumguy.asm
+++ b/audio/music/museumguy.asm
@@ -5,52 +5,52 @@
 	toggleperfectpitch
 	notetype 12, 11, 1
 	octave 3
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note E_, 2
-	note D#, 2
+	B_ 2
+	A_ 2
+	G# 2
+	A_ 2
+	G# 2
+	F# 2
+	E_ 2
+	D# 2
 	octave 2
-	note B_, 4
-	note B_, 1
+	B_ 4
+	B_ 1
 	octave 3
-	note D#, 1
-	note E_, 1
-	note G#, 1
-	note B_, 10
+	D# 1
+	E_ 1
+	G# 1
+	B_ 10
 	callchannel Music_MuseumGuy_branch_ade7
 	callchannel Music_MuseumGuy_branch_adec
 	callchannel Music_MuseumGuy_branch_ade7
-	note E_, 4
-	note E_, 4
-	note E_, 2
-	note E_, 6
+	E_ 4
+	E_ 4
+	E_ 2
+	E_ 6
 
 Music_MuseumGuy_branch_add6::
 	callchannel Music_MuseumGuy_branch_ade7
 	callchannel Music_MuseumGuy_branch_adec
 	callchannel Music_MuseumGuy_branch_ade7
-	note E_, 4
-	note E_, 4
-	note E_, 2
-	note E_, 6
+	E_ 4
+	E_ 4
+	E_ 2
+	E_ 6
 	loopchannel 0, Music_MuseumGuy_branch_add6
 
 Music_MuseumGuy_branch_ade7::
-	note E_, 2
-	note E_, 6
-	note F#, 2
-	note F#, 6
+	E_ 2
+	E_ 6
+	F# 2
+	F# 6
 	endchannel
 
 Music_MuseumGuy_branch_adec::
-	note E_, 2
-	note E_, 6
-	note D_, 2
-	note D_, 6
+	E_ 2
+	E_ 6
+	D_ 2
+	D_ 6
 	endchannel
 
 
@@ -58,110 +58,110 @@
 	duty 2
 	notetype 12, 12, 1
 	octave 4
-	note E_, 2
-	note D_, 2
-	note C#, 2
-	note D_, 2
-	note C#, 2
+	E_ 2
+	D_ 2
+	C# 2
+	D_ 2
+	C# 2
 	octave 3
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note E_, 4
-	note E_, 1
-	note G#, 1
-	note B_, 1
+	B_ 2
+	A_ 2
+	G# 2
+	E_ 4
+	E_ 1
+	G# 1
+	B_ 1
 	octave 4
-	note D#, 1
-	note E_, 8
+	D# 1
+	E_ 8
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note C#, 2
-	note E_, 4
-	note D_, 2
-	note F#, 2
-	note A_, 4
+	C# 2
+	E_ 4
+	D_ 2
+	F# 2
+	A_ 4
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note C#, 2
-	note E_, 4
-	note D_, 2
-	note C#, 2
+	C# 2
+	E_ 4
+	D_ 2
+	C# 2
 	octave 3
-	note B_, 4
-	note A_, 2
+	B_ 4
+	A_ 2
 	octave 4
-	note C#, 2
-	note E_, 4
-	note D_, 2
-	note F#, 2
-	note A_, 2
-	note A_, 2
-	note G#, 2
-	note E_, 2
-	note F#, 2
-	note G#, 2
-	note A_, 2
-	note A_, 2
-	note A_, 4
+	C# 2
+	E_ 4
+	D_ 2
+	F# 2
+	A_ 2
+	A_ 2
+	G# 2
+	E_ 2
+	F# 2
+	G# 2
+	A_ 2
+	A_ 2
+	A_ 4
 
 Music_MuseumGuy_branch_ae26::
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note C#, 2
-	note E_, 3
+	C# 2
+	E_ 3
 	notetype 12, 8, 1
-	note E_, 1
+	E_ 1
 	notetype 12, 12, 1
-	note D_, 2
-	note F#, 2
-	note A_, 3
+	D_ 2
+	F# 2
+	A_ 3
 	notetype 12, 9, 1
-	note A_, 1
+	A_ 1
 	notetype 12, 12, 1
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note C#, 2
-	note E_, 4
-	note D_, 1
-	note C#, 1
-	note C_, 1
+	C# 2
+	E_ 4
+	D_ 1
+	C# 1
+	C_ 1
 	octave 3
-	note B_, 1
-	note B_, 3
+	B_ 1
+	B_ 3
 	notetype 12, 10, 1
-	note G#, 1
+	G# 1
 	notetype 12, 12, 1
-	note A_, 2
+	A_ 2
 	octave 4
-	note C#, 2
-	note E_, 3
+	C# 2
+	E_ 3
 	notetype 12, 9, 1
-	note E_, 1
+	E_ 1
 	notetype 12, 12, 1
-	note D_, 2
-	note F#, 2
-	note A_, 3
+	D_ 2
+	F# 2
+	A_ 3
 	notetype 12, 8, 1
-	note A_, 1
+	A_ 1
 	notetype 12, 12, 1
-	note G#, 2
-	note E_, 1
+	G# 2
+	E_ 1
 	notetype 12, 8, 1
-	note E_, 1
+	E_ 1
 	notetype 12, 12, 1
-	note F#, 2
+	F# 2
 	notetype 12, 8, 1
-	note F#, 1
+	F# 1
 	notetype 12, 12, 1
-	note G#, 1
-	note A_, 2
-	note A_, 2
-	note A_, 4
+	G# 1
+	A_ 2
+	A_ 2
+	A_ 4
 	loopchannel 0, Music_MuseumGuy_branch_ae26
 
 
@@ -169,29 +169,29 @@
 	notetype 12, 1, 0
 	rest 16
 	octave 4
-	note E_, 1
+	E_ 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 9
 	callchannel Music_MuseumGuy_branch_aeb8
-	note A_, 1
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 5
-	note G#, 1
+	G# 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 5
 	callchannel Music_MuseumGuy_branch_aeb8
-	note B_, 1
+	B_ 1
 	rest 3
-	note G#, 1
+	G# 1
 	rest 3
-	note A_, 1
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 3
 
 Music_MuseumGuy_branch_ae8e::
@@ -198,66 +198,66 @@
 	callchannel Music_MuseumGuy_branch_aec1
 	rest 3
 	octave 6
-	note E_, 1
+	E_ 1
 	rest 1
 	octave 5
-	note A_, 1
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 3
-	note B_, 1
+	B_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 3
 	callchannel Music_MuseumGuy_branch_aec1
 	rest 1
 	octave 6
-	note E_, 1
+	E_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
 	octave 5
-	note B_, 1
+	B_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 3
-	note A_, 1
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 3
 	loopchannel 0, Music_MuseumGuy_branch_ae8e
 
 Music_MuseumGuy_branch_aeb8::
-	note A_, 1
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 5
-	note A_, 1
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 5
 	endchannel
 
 Music_MuseumGuy_branch_aec1::
 	octave 6
-	note C#, 1
+	C# 1
 	rest 1
 	octave 5
-	note A_, 1
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 3
 	octave 6
-	note F#, 1
+	F# 1
 	rest 1
 	octave 5
-	note A_, 1
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	endchannel
 
 
@@ -270,69 +270,69 @@
 	rest 16
 	rest 14
 	dspeed 6
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
 
 Music_MuseumGuy_branch_aee1::
-	dnote 4, mutedsnare2
-	dnote 6, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 6, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 4, mutedsnare2
-	dnote 6, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 6, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 2, mutedsnare2
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 2, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 6, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 4, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
+	mutedsnare2 4
+	mutedsnare2 6
+	mutedsnare2 2
+	mutedsnare2 2
+	mutedsnare2 2
+	mutedsnare2 4
+	mutedsnare2 2
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare2 6
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare2 4
+	mutedsnare2 6
+	mutedsnare2 2
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 2
+	mutedsnare2 2
+	mutedsnare2 2
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 6
+	mutedsnare2 2
+	mutedsnare2 4
+	mutedsnare2 4
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare2 2
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 2
+	mutedsnare2 4
+	mutedsnare2 4
+	mutedsnare2 2
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 2
+	mutedsnare2 2
+	mutedsnare2 4
+	mutedsnare2 2
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 6
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare2 4
+	mutedsnare2 4
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
 	loopchannel 0, Music_MuseumGuy_branch_aee1
-; 0xaf59
\ No newline at end of file
+; 0xaf59
--- a/audio/music/oakslab.asm
+++ b/audio/music/oakslab.asm
@@ -6,66 +6,66 @@
 	toggleperfectpitch
 	notetype 12, 11, 3
 	octave 2
-	note B_, 1
+	B_ 1
 	octave 3
-	note C#, 1
-	note D_, 1
-	note E_, 1
-	note F#, 1
-	note G#, 1
-	note A_, 1
-	note B_, 1
+	C# 1
+	D_ 1
+	E_ 1
+	F# 1
+	G# 1
+	A_ 1
+	B_ 1
 
 Music_OaksLab_branch_7eed0::
 	octave 4
-	note C#, 4
+	C# 4
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note C#, 2
+	C# 2
 	octave 3
-	note A_, 4
-	note G#, 2
-	note A_, 2
-	note B_, 1
+	A_ 4
+	G# 2
+	A_ 2
+	B_ 1
 	rest 3
-	note A_, 6
-	note G#, 1
-	note B_, 1
+	A_ 6
+	G# 1
+	B_ 1
 	octave 4
-	note C#, 4
+	C# 4
 	octave 3
-	note A_, 4
-	note G#, 2
-	note A_, 2
-	note F#, 4
-	note E_, 2
-	note F#, 2
-	note G#, 1
+	A_ 4
+	G# 2
+	A_ 2
+	F# 4
+	E_ 2
+	F# 2
+	G# 1
 	rest 3
-	note F#, 8
-	note E_, 4
-	note A_, 6
-	note E_, 1
-	note A_, 1
+	F# 8
+	E_ 4
+	A_ 6
+	E_ 1
+	A_ 1
 	octave 4
-	note D_, 8
-	note C#, 6
+	D_ 8
+	C# 6
 	octave 3
-	note A_, 1
+	A_ 1
 	octave 4
-	note C#, 1
-	note E_, 8
-	note D_, 4
-	note C#, 4
+	C# 1
+	E_ 8
+	D_ 4
+	C# 4
 	octave 3
-	note B_, 4
-	note A_, 4
-	note G#, 1
+	B_ 4
+	A_ 4
+	G# 1
 	rest 3
-	note E_, 4
-	note F#, 4
-	note G#, 4
+	E_ 4
+	F# 4
+	G# 4
 	loopchannel 0, Music_OaksLab_branch_7eed0
 
 
@@ -74,72 +74,72 @@
 	vibrato 10, 2, 5
 	notetype 12, 12, 4
 	octave 3
-	note G#, 1
-	note A_, 1
-	note B_, 1
+	G# 1
+	A_ 1
+	B_ 1
 	octave 4
-	note C#, 1
-	note D_, 1
-	note E_, 1
-	note F#, 1
-	note G#, 1
+	C# 1
+	D_ 1
+	E_ 1
+	F# 1
+	G# 1
 
 Music_OaksLab_branch_7ef16::
-	note A_, 6
-	note G#, 1
-	note F#, 1
-	note E_, 6
-	note D#, 1
-	note E_, 1
-	note F#, 1
+	A_ 6
+	G# 1
+	F# 1
+	E_ 6
+	D# 1
+	E_ 1
+	F# 1
 	rest 3
-	note E_, 8
-	note E_, 4
-	note F#, 6
-	note E_, 1
-	note D_, 1
-	note C#, 6
+	E_ 8
+	E_ 4
+	F# 6
+	E_ 1
+	D_ 1
+	C# 6
 	octave 3
-	note B_, 1
+	B_ 1
 	octave 4
-	note C#, 1
-	note D_, 1
+	C# 1
+	D_ 1
 	rest 3
-	note C#, 8
-	note C#, 4
-	note D_, 6
+	C# 8
+	C# 4
+	D_ 6
 	octave 3
-	note A_, 1
+	A_ 1
 	octave 4
-	note D_, 1
-	note F#, 8
-	note E_, 6
-	note C#, 1
-	note E_, 1
-	note A_, 8
-	note G#, 4
-	note A_, 2
-	note G#, 2
-	note F#, 4
-	note G#, 2
-	note F#, 2
-	note E_, 1
+	D_ 1
+	F# 8
+	E_ 6
+	C# 1
+	E_ 1
+	A_ 8
+	G# 4
+	A_ 2
+	G# 2
+	F# 4
+	G# 2
+	F# 2
+	E_ 1
 	rest 1
 	octave 3
-	note G#, 1
+	G# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note C#, 1
+	C# 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
 	loopchannel 0, Music_OaksLab_branch_7ef16
 
@@ -148,247 +148,247 @@
 	notetype 12, 1, 1
 	rest 2
 	octave 4
-	note G#, 1
+	G# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
 
 Music_OaksLab_branch_7ef5c::
-	note C#, 1
+	C# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 3
-	note A_, 1
+	A_ 1
 	rest 3
-	note A_, 1
+	A_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note C#, 1
+	C# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 3
-	note A_, 1
+	A_ 1
 	rest 3
-	note A_, 1
+	A_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 3
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 3
-	note F#, 1
+	F# 1
 	rest 3
-	note F#, 1
+	F# 1
 	rest 1
-	note C#, 1
+	C# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 3
-	note F#, 1
+	F# 1
 	rest 3
-	note F#, 1
+	F# 1
 	rest 1
-	note C#, 1
+	C# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 3
-	note F#, 1
+	F# 1
 	rest 3
-	note F#, 1
+	F# 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 3
-	note A_, 1
+	A_ 1
 	rest 3
-	note A_, 1
+	A_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note G#, 1
+	G# 1
 	rest 3
-	note G#, 1
+	G# 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 3
-	note F#, 1
+	F# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 5
-	note G#, 1
+	G# 1
 	rest 3
-	note F#, 1
+	F# 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 1
-	note C#, 1
+	C# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note C#, 1
+	C# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note C#, 1
+	C# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note C#, 1
+	C# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note C#, 1
+	C# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note C#, 1
+	C# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note C#, 1
+	C# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 3
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
-	note C#, 1
+	C# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
-	note C#, 1
+	C# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note G#, 1
+	G# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note G#, 1
+	G# 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 3
-	note G#, 1
+	G# 1
 	rest 3
-	note F#, 1
+	F# 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 3
 	loopchannel 0, Music_OaksLab_branch_7ef5c
-; 0x7f04a
\ No newline at end of file
+; 0x7f04a
--- a/audio/music/pallettown.asm
+++ b/audio/music/pallettown.asm
@@ -6,144 +6,144 @@
 
 Music_PalletTown_branch_a7ce::
 	octave 3
-	note B_, 4
+	B_ 4
 	octave 4
-	note C_, 2
-	note D_, 4
-	note G_, 2
-	note D_, 2
-	note C_, 2
+	C_ 2
+	D_ 4
+	G_ 2
+	D_ 2
+	C_ 2
 	octave 3
-	note B_, 4
-	note G_, 2
+	B_ 4
+	G_ 2
 	octave 4
-	note D_, 4
-	note D_, 2
-	note C_, 2
+	D_ 4
+	D_ 2
+	C_ 2
 	octave 3
-	note B_, 2
+	B_ 2
 	rest 2
-	note B_, 2
+	B_ 2
 	octave 4
-	note C_, 2
+	C_ 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note C_, 8
+	C_ 8
 	rest 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note C_, 2
+	C_ 2
 	octave 3
-	note A_, 2
-	note B_, 2
-	note G_, 2
-	note A_, 2
-	note F#, 2
-	note B_, 4
+	A_ 2
+	B_ 2
+	G_ 2
+	A_ 2
+	F# 2
+	B_ 4
 	octave 4
-	note C_, 2
-	note D_, 4
-	note G_, 2
-	note D_, 2
-	note C_, 2
+	C_ 2
+	D_ 4
+	G_ 2
+	D_ 2
+	C_ 2
 	octave 3
-	note B_, 4
-	note G_, 2
+	B_ 4
+	G_ 2
 	octave 4
-	note D_, 4
-	note D_, 2
-	note G_, 2
-	note F#, 2
-	note E_, 4
-	note D_, 2
-	note C_, 4
+	D_ 4
+	D_ 2
+	G_ 2
+	F# 2
+	E_ 4
+	D_ 2
+	C_ 4
 	octave 3
-	note A_, 2
-	note B_, 2
+	A_ 2
+	B_ 2
 	octave 4
-	note C_, 2
-	note D_, 2
-	note C_, 2
+	C_ 2
+	D_ 2
+	C_ 2
 	octave 3
-	note B_, 2
-	note A_, 2
-	note G_, 4
-	note F#, 4
+	B_ 2
+	A_ 2
+	G_ 4
+	F# 4
 	octave 4
-	note C_, 2
+	C_ 2
 	octave 3
-	note G_, 2
-	note E_, 2
-	note G_, 2
+	G_ 2
+	E_ 2
+	G_ 2
 	octave 4
-	note D_, 2
+	D_ 2
 	octave 3
-	note A_, 2
-	note F#, 2
-	note A_, 2
+	A_ 2
+	F# 2
+	A_ 2
 	notetype 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
+	B_ 2
+	G_ 2
+	D_ 2
+	G_ 2
+	B_ 2
+	G_ 2
+	D_ 2
+	G_ 2
 	octave 4
-	note C_, 2
+	C_ 2
 	octave 3
-	note G_, 2
-	note E_, 2
-	note G_, 2
+	G_ 2
+	E_ 2
+	G_ 2
 	octave 4
-	note D_, 2
+	D_ 2
 	octave 3
-	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
+	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
 
@@ -154,110 +154,110 @@
 Music_PalletTown_branch_a861::
 	notetype 12, 13, 3
 	octave 5
-	note D_, 2
+	D_ 2
 	notetype 12, 10, 3
-	note C_, 2
+	C_ 2
 	notetype 12, 13, 3
 	octave 4
-	note B_, 2
+	B_ 2
 	notetype 12, 11, 3
-	note A_, 2
+	A_ 2
 	notetype 12, 13, 3
 	octave 5
-	note G_, 2
+	G_ 2
 	notetype 12, 11, 3
-	note E_, 2
+	E_ 2
 	notetype 12, 13, 3
-	note F#, 2
-	note E_, 2
-	note D_, 6
+	F# 2
+	E_ 2
+	D_ 6
 	octave 4
-	note B_, 2
-	note G_, 2
-	note G_, 2
-	note A_, 2
-	note B_, 2
+	B_ 2
+	G_ 2
+	G_ 2
+	A_ 2
+	B_ 2
 	octave 5
-	note C_, 10
+	C_ 10
 	octave 4
-	note F#, 2
-	note G_, 2
-	note A_, 2
-	note B_, 6
+	F# 2
+	G_ 2
+	A_ 2
+	B_ 6
 	octave 5
-	note C_, 1
+	C_ 1
 	octave 4
-	note B_, 1
-	note A_, 8
+	B_ 1
+	A_ 8
 	octave 5
-	note D_, 2
+	D_ 2
 	notetype 12, 10, 3
-	note C_, 2
+	C_ 2
 	notetype 12, 13, 3
 	octave 4
-	note B_, 2
+	B_ 2
 	notetype 12, 11, 3
 	octave 5
-	note D_, 2
+	D_ 2
 	notetype 12, 13, 3
-	note G_, 2
+	G_ 2
 	notetype 12, 10, 3
-	note F#, 2
+	F# 2
 	notetype 12, 11, 3
-	note F#, 2
+	F# 2
 	notetype 12, 13, 3
-	note G_, 2
-	note E_, 6
-	note D_, 2
-	note D_, 8
-	note C_, 2
+	G_ 2
+	E_ 6
+	D_ 2
+	D_ 8
+	C_ 2
 	octave 4
-	note B_, 2
-	note A_, 2
-	note G_, 2
+	B_ 2
+	A_ 2
+	G_ 2
 	octave 5
-	note D_, 2
-	note C_, 2
+	D_ 2
+	C_ 2
 	octave 4
-	note B_, 2
-	note A_, 2
-	note G_, 10
-	note G_, 2
-	note A_, 2
-	note B_, 2
+	B_ 2
+	A_ 2
+	G_ 10
+	G_ 2
+	A_ 2
+	B_ 2
 	octave 5
-	note C_, 8
-	note D_, 6
-	note C_, 2
+	C_ 8
+	D_ 6
+	C_ 2
 	octave 4
-	note B_, 8
+	B_ 8
 	rest 2
-	note G_, 2
-	note A_, 2
-	note B_, 2
+	G_ 2
+	A_ 2
+	B_ 2
 	octave 5
-	note C_, 4
-	note C_, 4
-	note D_, 6
-	note C_, 1
-	note D_, 1
+	C_ 4
+	C_ 4
+	D_ 6
+	C_ 1
+	D_ 1
 	octave 4
-	note B_, 8
+	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
+	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
 
@@ -268,48 +268,48 @@
 
 Music_PalletTown_branch_a8e3::
 	octave 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 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
+	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
-; 0xa913
\ No newline at end of file
+; 0xa913
--- a/audio/music/pkmnhealed.asm
+++ b/audio/music/pkmnhealed.asm
@@ -6,16 +6,16 @@
 	notetype 12, 8, 1
 	rest 2
 	pitchbend 0, 75
-	note B_, 2
+	B_ 2
 	pitchbend 0, 84
-	note B_, 2
+	B_ 2
 	pitchbend 0, 68
-	note E_, 2
+	E_ 2
 	rest 4
 	pitchbend 0, 59
-	note E_, 4
+	E_ 4
 	pitchbend 0, 75
-	note B_, 4
+	B_ 4
 	endchannel
 
 
@@ -23,13 +23,13 @@
 	duty 2
 	notetype 12, 12, 3
 	octave 4
-	note B_, 4
-	note B_, 4
-	note B_, 2
-	note G#, 2
+	B_ 4
+	B_ 4
+	B_ 2
+	G# 2
 	notetype 12, 12, 4
 	octave 5
-	note E_, 8
+	E_ 8
 	endchannel
 
 
@@ -36,13 +36,13 @@
 Music_PkmnHealed_Ch3:: ; 9bd2 (2:5bd2)
 	notetype 12, 1, 0
 	octave 4
-	note E_, 2
+	E_ 2
 	rest 2
-	note E_, 2
+	E_ 2
 	rest 2
-	note E_, 2
-	note G#, 2
-	note E_, 6
+	E_ 2
+	G# 2
+	E_ 6
 	rest 2
 	endchannel
-; 0x9bde
\ No newline at end of file
+; 0x9bde
--- a/audio/music/pokecenter.asm
+++ b/audio/music/pokecenter.asm
@@ -8,144 +8,144 @@
 Music_Pokecenter_branch_be61::
 	notetype 12, 10, 3
 	octave 3
-	note F#, 2
-	note F_, 2
-	note F#, 2
+	F# 2
+	F_ 2
+	F# 2
 	notetype 12, 11, 5
 	octave 4
-	note D_, 4
-	note C#, 2
+	D_ 4
+	C# 2
 	octave 3
-	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
+	B_ 2
+	A_ 2
+	B_ 2
+	A_ 2
+	G_ 2
+	F# 2
+	E_ 2
+	F# 2
+	G_ 2
+	A_ 2
 	notetype 12, 10, 3
-	note A_, 2
-	note E_, 2
-	note A_, 2
+	A_ 2
+	E_ 2
+	A_ 2
 	notetype 12, 11, 5
 	octave 4
-	note C#, 4
+	C# 4
 	octave 3
-	note B_, 2
-	note A_, 2
-	note G_, 2
-	note F#, 2
-	note A_, 2
-	note B_, 2
+	B_ 2
+	A_ 2
+	G_ 2
+	F# 2
+	A_ 2
+	B_ 2
 	octave 4
-	note C#, 2
-	note D_, 2
-	note C#, 2
+	C# 2
+	D_ 2
+	C# 2
 	octave 3
-	note B_, 2
-	note A_, 2
+	B_ 2
+	A_ 2
 	notetype 12, 10, 3
-	note F#, 2
-	note F_, 2
-	note F#, 2
+	F# 2
+	F_ 2
+	F# 2
 	notetype 12, 11, 5
 	octave 4
-	note D_, 4
-	note C#, 2
+	D_ 4
+	C# 2
 	octave 3
-	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
+	B_ 2
+	A_ 2
+	B_ 2
+	A_ 2
+	G_ 2
+	F# 2
+	E_ 2
+	F# 2
+	G_ 2
+	A_ 2
 	notetype 12, 10, 3
-	note A_, 2
-	note E_, 2
-	note A_, 2
+	A_ 2
+	E_ 2
+	A_ 2
 	notetype 12, 11, 5
 	octave 4
-	note C#, 4
+	C# 4
 	octave 3
-	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
+	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
 	octave 4
-	note D_, 2
-	note C#, 2
+	D_ 2
+	C# 2
 	octave 3
-	note B_, 4
-	note A_, 2
-	note B_, 2
+	B_ 4
+	A_ 2
+	B_ 2
 	octave 4
-	note C#, 2
-	note D_, 2
-	note E_, 2
-	note D_, 2
-	note C#, 4
+	C# 2
+	D_ 2
+	E_ 2
+	D_ 2
+	C# 4
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note C#, 2
-	note D_, 2
-	note E_, 2
-	note C#, 2
+	C# 2
+	D_ 2
+	E_ 2
+	C# 2
 	octave 3
-	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
+	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
 
 
@@ -157,62 +157,62 @@
 	duty 3
 	notetype 12, 10, 5
 	octave 3
-	note A_, 4
-	note E_, 4
+	A_ 4
+	E_ 4
 	callchannel Music_Pokecenter_branch_bf60
-	note D_, 2
-	note F#, 6
+	D_ 2
+	F# 6
 	duty 3
 	notetype 12, 10, 5
 	octave 3
-	note A_, 4
-	note E_, 4
+	A_ 4
+	E_ 4
 	callchannel Music_Pokecenter_branch_bf4e
 	duty 3
 	notetype 12, 10, 5
 	octave 3
-	note A_, 4
-	note E_, 4
+	A_ 4
+	E_ 4
 	callchannel Music_Pokecenter_branch_bf60
-	note D_, 8
+	D_ 8
 	duty 3
 	notetype 12, 10, 5
 	octave 3
-	note D_, 4
-	note E_, 4
+	D_ 4
+	E_ 4
 	duty 2
 	notetype 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
+	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::
@@ -219,17 +219,17 @@
 	duty 2
 	notetype 12, 12, 2
 	octave 4
-	note D_, 2
+	D_ 2
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note D_, 2
+	D_ 2
 	notetype 12, 12, 3
-	note A_, 4
-	note G_, 4
-	note F#, 2
-	note E_, 2
-	note C#, 6
+	A_ 4
+	G_ 4
+	F# 2
+	E_ 2
+	C# 6
 	endchannel
 
 Music_Pokecenter_branch_bf60::
@@ -236,15 +236,15 @@
 	duty 2
 	notetype 12, 12, 2
 	octave 4
-	note C#, 2
+	C# 2
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note C#, 2
+	C# 2
 	notetype 12, 12, 3
-	note F#, 4
-	note E_, 4
-	note C#, 2
+	F# 4
+	E_ 4
+	C# 2
 	endchannel
 
 
@@ -253,124 +253,124 @@
 
 Music_Pokecenter_branch_bf72::
 	octave 4
-	note D_, 2
-	note F#, 2
-	note D_, 2
-	note F#, 2
-	note D_, 2
-	note F#, 2
-	note G_, 2
-	note F#, 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
-	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
+	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
-	note D_, 2
-	note F#, 2
-	note D_, 2
-	note F#, 2
-	note D_, 2
-	note B_, 2
-	note A_, 2
-	note G_, 2
+	D_ 2
+	F# 2
+	D_ 2
+	F# 2
+	D_ 2
+	B_ 2
+	A_ 2
+	G_ 2
 	callchannel 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
+	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
-	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
+	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
 
 Music_Pokecenter_branch_bfd9::
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
+	E_ 2
+	A_ 2
+	E_ 2
+	A_ 2
+	E_ 2
+	A_ 2
+	E_ 2
+	A_ 2
 	endchannel
 
 Music_Pokecenter_branch_bfe2::
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note G_, 2
-	note A_, 2
+	E_ 2
+	A_ 2
+	E_ 2
+	A_ 2
+	E_ 2
+	A_ 2
+	G_ 2
+	A_ 2
 	endchannel
 
 Music_Pokecenter_branch_bfeb::
-	note F#, 2
-	note A_, 2
-	note F#, 2
-	note A_, 2
-	note F#, 2
-	note A_, 2
-	note F#, 2
-	note A_, 2
+	F# 2
+	A_ 2
+	F# 2
+	A_ 2
+	F# 2
+	A_ 2
+	F# 2
+	A_ 2
 	endchannel
-; 0xbff4
\ No newline at end of file
+; 0xbff4
--- a/audio/music/pokemontower.asm
+++ b/audio/music/pokemontower.asm
@@ -7,136 +7,136 @@
 	notetype 12, 8, 0
 	rest 4
 	octave 4
-	note B_, 12
+	B_ 12
 
 Music_PokemonTower_branch_7f05a::
 	notetype 12, 11, 4
 	octave 4
-	note G_, 1
+	G_ 1
 	rest 7
-	note G_, 1
+	G_ 1
 	rest 7
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 7
-	note B_, 1
+	B_ 1
 	rest 3
-	note B_, 1
+	B_ 1
 	rest 3
-	note B_, 1
+	B_ 1
 	rest 7
-	note B_, 1
+	B_ 1
 	rest 7
-	note B_, 1
+	B_ 1
 	rest 7
 	octave 4
-	note F#, 1
+	F# 1
 	rest 7
-	note C_, 1
+	C_ 1
 	octave 3
-	note B_, 1
-	note G_, 1
+	B_ 1
+	G_ 1
 	rest 5
-	note E_, 1
+	E_ 1
 	rest 7
-	note E_, 1
+	E_ 1
 	rest 7
-	note F#, 1
+	F# 1
 	rest 7
-	note E_, 1
+	E_ 1
 	rest 7
-	note G_, 1
+	G_ 1
 	rest 7
-	note G_, 1
+	G_ 1
 	rest 7
-	note F#, 1
+	F# 1
 	rest 7
-	note F#, 1
+	F# 1
 	rest 7
-	note G_, 1
+	G_ 1
 	rest 7
-	note E_, 1
+	E_ 1
 	rest 7
-	note D_, 1
+	D_ 1
 	rest 7
-	note E_, 1
+	E_ 1
 	rest 7
-	note G_, 1
+	G_ 1
 	rest 7
-	note G_, 1
+	G_ 1
 	rest 7
-	note F#, 1
+	F# 1
 	rest 7
-	note B_, 1
+	B_ 1
 	rest 7
-	note B_, 1
+	B_ 1
 	rest 7
 	octave 4
-	note C_, 1
+	C_ 1
 	rest 7
-	note C_, 1
+	C_ 1
 	rest 7
-	note C#, 1
+	C# 1
 	rest 7
-	note C#, 1
+	C# 1
 	rest 7
-	note C_, 1
+	C_ 1
 	rest 7
-	note C_, 1
+	C_ 1
 	rest 3
 	notetype 12, 8, 4
-	note C_, 1
+	C_ 1
 	rest 3
 	notetype 12, 11, 4
-	note D_, 1
+	D_ 1
 	rest 7
-	note D_, 1
+	D_ 1
 	rest 7
 	octave 3
-	note A_, 1
+	A_ 1
 	rest 7
-	note A_, 1
+	A_ 1
 	rest 7
 	notetype 12, 10, 7
-	note B_, 8
-	note B_, 8
+	B_ 8
+	B_ 8
 	octave 4
-	note C_, 8
-	note C_, 8
-	note C#, 8
-	note C#, 8
+	C_ 8
+	C_ 8
+	C# 8
+	C# 8
 	notetype 12, 10, 6
-	note D_, 16
+	D_ 16
 	rest 16
 	rest 16
 	rest 16
 	rest 16
 	notetype 12, 9, 2
-	note B_, 4
+	B_ 4
 	octave 5
-	note E_, 4
-	note D_, 4
-	note C_, 4
+	E_ 4
+	D_ 4
+	C_ 4
 	octave 4
-	note B_, 4
+	B_ 4
 	octave 5
-	note E_, 4
-	note D_, 4
-	note C_, 4
+	E_ 4
+	D_ 4
+	C_ 4
 	octave 4
-	note B_, 4
+	B_ 4
 	octave 5
-	note E_, 4
-	note D_, 4
-	note C_, 4
+	E_ 4
+	D_ 4
+	C_ 4
 	octave 4
-	note B_, 4
-	note G_, 4
-	note F#, 4
-	note E_, 4
+	B_ 4
+	G_ 4
+	F# 4
+	E_ 4
 	octave 5
-	note C_, 16
-	note C_, 16
+	C_ 16
+	C_ 16
 	loopchannel 0, Music_PokemonTower_branch_7f05a
 
 
@@ -145,150 +145,150 @@
 	duty 3
 	notetype 12, 10, 0
 	octave 5
-	note C_, 12
+	C_ 12
 	octave 4
-	note E_, 4
+	E_ 4
 
 Music_PokemonTower_branch_7f0ee::
 	notetype 12, 12, 1
 	octave 5
-	note C_, 8
+	C_ 8
 	octave 4
-	note B_, 4
+	B_ 4
 	notetype 12, 12, 4
-	note G_, 1
-	note F#, 1
-	note E_, 1
-	note D#, 1
+	G_ 1
+	F# 1
+	E_ 1
+	D# 1
 	notetype 12, 11, 0
-	note G_, 8
+	G_ 8
 	octave 5
-	note C_, 8
+	C_ 8
 	octave 4
-	note B_, 4
-	note G_, 4
-	note E_, 4
-	note G_, 4
+	B_ 4
+	G_ 4
+	E_ 4
+	G_ 4
 	octave 5
-	note C_, 8
+	C_ 8
 	notetype 12, 11, 7
-	note C_, 8
+	C_ 8
 	notetype 12, 12, 2
 	octave 4
-	note G_, 1
-	note F#, 1
-	note E_, 1
+	G_ 1
+	F# 1
+	E_ 1
 	rest 1
 	notetype 12, 9, 6
 	octave 3
-	note G_, 4
+	G_ 4
 	notetype 12, 12, 7
-	note G_, 4
-	note B_, 4
-	note G_, 4
-	note B_, 4
+	G_ 4
+	B_ 4
+	G_ 4
+	B_ 4
 	octave 4
-	note C_, 4
+	C_ 4
 	octave 3
-	note B_, 4
+	B_ 4
 	notetype 12, 11, 0
 	octave 4
-	note C_, 16
-	note E_, 8
+	C_ 16
+	E_ 8
 	notetype 12, 11, 7
-	note E_, 12
+	E_ 12
 	notetype 12, 12, 5
 	octave 5
-	note C_, 4
+	C_ 4
 	octave 4
-	note B_, 4
-	note G_, 4
-	note B_, 4
-	note G_, 4
-	note F#, 4
-	note E_, 4
+	B_ 4
+	G_ 4
+	B_ 4
+	G_ 4
+	F# 4
+	E_ 4
 	notetype 12, 11, 0
-	note F#, 12
-	note G_, 4
+	F# 12
+	G_ 4
 	notetype 12, 11, 0
-	note F#, 8
+	F# 8
 	notetype 12, 11, 7
-	note F#, 8
+	F# 8
 	notetype 12, 11, 0
-	note B_, 4
-	note G_, 4
-	note F#, 4
-	note E_, 4
-	note B_, 16
+	B_ 4
+	G_ 4
+	F# 4
+	E_ 4
+	B_ 16
 	notetype 12, 11, 0
 	octave 5
-	note C_, 4
+	C_ 4
 	octave 4
-	note G_, 4
-	note F#, 4
-	note E_, 4
+	G_ 4
+	F# 4
+	E_ 4
 	notetype 12, 9, 0
 	octave 5
-	note C_, 16
+	C_ 16
 	notetype 12, 11, 0
-	note D_, 4
+	D_ 4
 	octave 4
-	note A_, 4
-	note G#, 4
-	note F#, 4
+	A_ 4
+	G# 4
+	F# 4
 	notetype 12, 2, 15
 	octave 5
-	note D_, 16
+	D_ 16
 	notetype 12, 12, 0
-	note E_, 4
+	E_ 4
 	octave 4
-	note B_, 4
-	note A_, 4
-	note G_, 4
+	B_ 4
+	A_ 4
+	G_ 4
 	octave 5
-	note F_, 4
-	note C_, 4
+	F_ 4
+	C_ 4
 	octave 4
-	note A#, 4
-	note G#, 4
+	A# 4
+	G# 4
 	octave 5
-	note F#, 4
-	note D_, 4
-	note C_, 4
+	F# 4
+	D_ 4
+	C_ 4
 	octave 4
-	note A#, 4
-	note G#, 4
-	note F#, 4
-	note E_, 4
-	note D_, 4
+	A# 4
+	G# 4
+	F# 4
+	E_ 4
+	D_ 4
 	notetype 12, 11, 0
-	note C_, 8
+	C_ 8
 	notetype 12, 9, 0
-	note C_, 8
+	C_ 8
 	notetype 12, 8, 0
-	note C_, 8
+	C_ 8
 	notetype 12, 7, 0
-	note C_, 8
+	C_ 8
 	notetype 12, 6, 0
-	note C_, 8
+	C_ 8
 	notetype 12, 6, 7
-	note C_, 8
+	C_ 8
 	rest 16
 	notetype 12, 10, 0
 	octave 5
-	note G_, 16
+	G_ 16
 	octave 6
-	note C_, 16
+	C_ 16
 	octave 5
-	note B_, 8
-	note G_, 8
-	note E_, 8
-	note G_, 8
+	B_ 8
+	G_ 8
+	E_ 8
+	G_ 8
 	octave 6
-	note C_, 16
+	C_ 16
 	vibrato 0, 3, 4
 	notetype 12, 10, 7
-	note C_, 16
+	C_ 16
 	loopchannel 0, Music_PokemonTower_branch_7f0ee
 
 
@@ -297,163 +297,163 @@
 	notetype 12, 1, 3
 	rest 8
 	octave 5
-	note G_, 8
+	G_ 8
 
 Music_PokemonTower_branch_7f1a2::
-	note E_, 1
+	E_ 1
 	rest 7
-	note E_, 1
+	E_ 1
 	rest 7
-	note E_, 1
+	E_ 1
 	rest 7
-	note E_, 1
+	E_ 1
 	rest 3
-	note E_, 1
-	note D#, 1
-	note F#, 1
-	note D#, 1
-	note E_, 1
+	E_ 1
+	D# 1
+	F# 1
+	D# 1
+	E_ 1
 	rest 7
-	note G_, 1
+	G_ 1
 	rest 7
-	note E_, 1
+	E_ 1
 	rest 7
-	note B_, 1
+	B_ 1
 	rest 7
-	note E_, 1
-	note D#, 1
+	E_ 1
+	D# 1
 	octave 4
-	note B_, 1
+	B_ 1
 	rest 5
-	note B_, 1
+	B_ 1
 	rest 7
-	note B_, 1
+	B_ 1
 	rest 7
-	note B_, 1
+	B_ 1
 	rest 7
 	octave 5
-	note C_, 1
+	C_ 1
 	rest 7
-	note C_, 1
+	C_ 1
 	rest 7
-	note C_, 1
+	C_ 1
 	rest 7
-	note C_, 1
+	C_ 1
 	rest 7
 	octave 4
-	note B_, 1
+	B_ 1
 	rest 7
-	note B_, 1
+	B_ 1
 	rest 7
-	note B_, 1
+	B_ 1
 	rest 7
-	note B_, 1
+	B_ 1
 	rest 7
 	octave 5
-	note C_, 1
+	C_ 1
 	rest 7
-	note C_, 1
+	C_ 1
 	rest 7
-	note C_, 1
+	C_ 1
 	rest 7
-	note C_, 1
+	C_ 1
 	rest 7
-	note E_, 1
+	E_ 1
 	rest 7
-	note E_, 1
+	E_ 1
 	rest 7
-	note E_, 1
+	E_ 1
 	rest 7
-	note E_, 1
+	E_ 1
 	rest 7
-	note E_, 1
+	E_ 1
 	rest 7
-	note E_, 1
+	E_ 1
 	rest 7
-	note E_, 1
+	E_ 1
 	rest 7
-	note E_, 1
+	E_ 1
 	rest 3
-	note G_, 1
+	G_ 1
 	rest 3
-	note F#, 1
+	F# 1
 	rest 7
-	note F#, 1
+	F# 1
 	rest 7
-	note D_, 1
+	D_ 1
 	rest 7
-	note D_, 1
+	D_ 1
 	rest 3
-	note D_, 1
+	D_ 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 7
-	note E_, 1
+	E_ 1
 	rest 7
-	note F_, 1
+	F_ 1
 	rest 7
-	note F_, 1
+	F_ 1
 	rest 7
-	note F#, 1
+	F# 1
 	rest 7
-	note F#, 1
+	F# 1
 	rest 7
-	note G_, 1
+	G_ 1
 	rest 15
 	notetype 12, 1, 5
 	octave 4
-	note F#, 1
+	F# 1
 	rest 3
-	note F#, 1
+	F# 1
 	rest 3
-	note G_, 1
+	G_ 1
 	rest 3
-	note F#, 1
+	F# 1
 	rest 3
-	note F#, 1
+	F# 1
 	rest 15
-	note F#, 1
+	F# 1
 	rest 3
-	note F#, 1
+	F# 1
 	rest 3
-	note G_, 1
+	G_ 1
 	rest 3
-	note F#, 1
+	F# 1
 	rest 3
-	note F#, 1
+	F# 1
 	rest 7
 	notetype 12, 1, 3
 	octave 6
-	note E_, 1
+	E_ 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 15
-	note E_, 1
+	E_ 1
 	rest 15
-	note E_, 1
+	E_ 1
 	rest 15
-	note E_, 1
+	E_ 1
 	rest 15
-	note E_, 1
+	E_ 1
 	rest 15
-	note E_, 1
+	E_ 1
 	rest 7
 	octave 5
-	note E_, 1
+	E_ 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
 	loopchannel 0, Music_PokemonTower_branch_7f1a2
-; 0x7f243
\ No newline at end of file
+; 0x7f243
--- a/audio/music/routes1.asm
+++ b/audio/music/routes1.asm
@@ -9,99 +9,99 @@
 	notetype 12, 10, 1
 	rest 4
 	octave 4
-	note D_, 2
-	note D_, 6
-	note D_, 2
-	note D_, 6
-	note D_, 2
-	note D_, 1
-	note C#, 1
+	D_ 2
+	D_ 6
+	D_ 2
+	D_ 6
+	D_ 2
+	D_ 1
+	C# 1
 	octave 3
-	note B_, 1
+	B_ 1
 	octave 4
-	note C#, 1
+	C# 1
 	octave 3
-	note A_, 2
-	note A_, 2
-	note A_, 6
+	A_ 2
+	A_ 2
+	A_ 6
 	octave 4
-	note C#, 2
-	note C#, 6
-	note C#, 2
-	note C#, 4
+	C# 2
+	C# 6
+	C# 2
+	C# 4
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note C#, 2
+	C# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note C#, 4
+	C# 4
 	octave 3
-	note A_, 2
-	note A_, 6
+	A_ 2
+	A_ 6
 	octave 4
-	note D_, 2
-	note D_, 6
-	note D_, 2
-	note D_, 6
-	note D_, 2
-	note D_, 1
-	note E_, 1
-	note D_, 1
-	note C#, 1
+	D_ 2
+	D_ 6
+	D_ 2
+	D_ 6
+	D_ 2
+	D_ 1
+	E_ 1
+	D_ 1
+	C# 1
 	octave 3
-	note B_, 2
-	note A_, 2
-	note A_, 6
+	B_ 2
+	A_ 2
+	A_ 6
 	octave 4
-	note C#, 2
-	note C#, 6
+	C# 2
+	C# 6
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note E_, 2
+	E_ 2
 	octave 3
-	note A_, 2
+	A_ 2
 	notetype 12, 10, 2
 	octave 4
-	note G_, 4
-	note E_, 4
-	note F#, 2
+	G_ 4
+	E_ 4
+	F# 2
 	notetype 12, 10, 1
 	octave 3
-	note A_, 2
-	note A_, 6
-	note A_, 2
-	note F#, 2
-	note A_, 4
-	note B_, 2
+	A_ 2
+	A_ 6
+	A_ 2
+	F# 2
+	A_ 4
+	B_ 2
 	octave 4
-	note C#, 2
+	C# 2
 	octave 3
-	note B_, 4
-	note A_, 2
-	note F#, 2
-	note A_, 4
-	note G_, 2
-	note E_, 2
-	note C#, 4
-	note A_, 2
+	B_ 4
+	A_ 2
+	F# 2
+	A_ 4
+	G_ 2
+	E_ 2
+	C# 4
+	A_ 2
 	octave 4
-	note D_, 2
+	D_ 2
 	octave 3
-	note A_, 4
-	note B_, 2
-	note G_, 2
-	note B_, 4
+	A_ 4
+	B_ 2
+	G_ 2
+	B_ 4
 	octave 4
-	note D_, 2
-	note E_, 2
-	note C#, 2
-	note D_, 2
+	D_ 2
+	E_ 2
+	C# 2
+	D_ 2
 	octave 3
-	note A_, 2
-	note A_, 2
+	A_ 2
+	A_ 2
 	loopchannel 0, Music_Routes1_branch_9be9
 	endchannel
 
@@ -119,117 +119,117 @@
 
 Music_Routes1_branch_9c65::
 	octave 4
-	note D_, 1
-	note E_, 1
-	note F#, 2
-	note F#, 2
-	note F#, 2
-	note D_, 1
-	note E_, 1
-	note F#, 2
-	note F#, 2
-	note F#, 2
-	note D_, 1
-	note E_, 1
-	note F#, 2
-	note F#, 2
-	note G_, 3
-	note F#, 1
-	note E_, 6
+	D_ 1
+	E_ 1
+	F# 2
+	F# 2
+	F# 2
+	D_ 1
+	E_ 1
+	F# 2
+	F# 2
+	F# 2
+	D_ 1
+	E_ 1
+	F# 2
+	F# 2
+	G_ 3
+	F# 1
+	E_ 6
 	endchannel
 
 Music_Routes1_branch_9c78::
-	note C#, 1
-	note D_, 1
-	note E_, 2
-	note E_, 2
-	note E_, 2
-	note C#, 1
-	note D_, 1
-	note E_, 2
-	note E_, 2
-	note E_, 2
-	note C#, 1
-	note D_, 1
-	note E_, 2
-	note E_, 2
-	note F#, 1
-	note E_, 1
-	note E_, 1
-	note F#, 1
-	note D_, 4
-	note F#, 2
+	C# 1
+	D_ 1
+	E_ 2
+	E_ 2
+	E_ 2
+	C# 1
+	D_ 1
+	E_ 2
+	E_ 2
+	E_ 2
+	C# 1
+	D_ 1
+	E_ 2
+	E_ 2
+	F# 1
+	E_ 1
+	E_ 1
+	F# 1
+	D_ 4
+	F# 2
 	endchannel
 
 Music_Routes1_branch_9c8d::
-	note C#, 1
-	note D_, 1
-	note E_, 2
-	note G_, 2
-	note F#, 2
-	note E_, 2
-	note D_, 2
-	note C#, 2
+	C# 1
+	D_ 1
+	E_ 2
+	G_ 2
+	F# 2
+	E_ 2
+	D_ 2
+	C# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note C#, 2
+	C# 2
 	notetype 12, 13, 2
-	note B_, 4
+	B_ 4
 	notetype 6, 13, 1
 	octave 3
-	note B_, 1
+	B_ 1
 	octave 4
-	note C#, 1
+	C# 1
 	notetype 12, 13, 1
 	octave 3
-	note B_, 1
-	note A_, 1
+	B_ 1
+	A_ 1
 	octave 4
-	note C#, 1
-	note D_, 6
+	C# 1
+	D_ 6
 	notetype 12, 13, 2
-	note F#, 1
-	note G_, 1
-	note A_, 2
-	note A_, 2
-	note F#, 2
-	note D_, 2
+	F# 1
+	G_ 1
+	A_ 2
+	A_ 2
+	F# 2
+	D_ 2
 	octave 5
-	note D_, 2
-	note C#, 2
+	D_ 2
+	C# 2
 	octave 4
-	note B_, 2
+	B_ 2
 	octave 5
-	note C#, 2
+	C# 2
 	octave 4
-	note A_, 2
-	note F#, 2
-	note D_, 3
-	note F#, 1
-	note E_, 6
-	note F#, 1
-	note G_, 1
-	note A_, 2
-	note A_, 2
-	note F#, 2
-	note A_, 2
+	A_ 2
+	F# 2
+	D_ 3
+	F# 1
+	E_ 6
+	F# 1
+	G_ 1
+	A_ 2
+	A_ 2
+	F# 2
+	A_ 2
 	octave 5
-	note D_, 2
-	note C#, 2
+	D_ 2
+	C# 2
 	octave 4
-	note B_, 3
-	note G_, 1
-	note A_, 2
+	B_ 3
+	G_ 1
+	A_ 2
 	octave 5
-	note D_, 2
-	note C#, 2
-	note E_, 2
-	note D_, 2
+	D_ 2
+	C# 2
+	E_ 2
+	D_ 2
 	notetype 12, 13, 1
 	octave 4
-	note D_, 2
-	note D_, 2
+	D_ 2
+	D_ 2
 	endchannel
 	endchannel
 
@@ -241,70 +241,70 @@
 Music_Routes1_branch_9cdd::
 	rest 2
 	octave 4
-	note D_, 4
-	note C#, 4
+	D_ 4
+	C# 4
 	octave 3
-	note B_, 4
-	note A_, 4
+	B_ 4
+	A_ 4
 	octave 4
-	note D_, 4
+	D_ 4
 	octave 3
-	note A_, 4
-	note B_, 4
-	note A_, 4
+	A_ 4
+	B_ 4
+	A_ 4
 	octave 4
-	note C#, 4
+	C# 4
 	octave 3
-	note A_, 4
-	note B_, 4
+	A_ 4
+	B_ 4
 	octave 4
-	note C_, 4
-	note C#, 4
+	C_ 4
+	C# 4
 	octave 3
-	note A_, 4
+	A_ 4
 	octave 4
-	note D_, 4
+	D_ 4
 	octave 3
-	note A_, 4
+	A_ 4
 	octave 4
-	note D_, 4
-	note C#, 4
+	D_ 4
+	C# 4
 	octave 3
-	note B_, 4
-	note A_, 4
+	B_ 4
+	A_ 4
 	octave 4
-	note D_, 4
+	D_ 4
 	octave 3
-	note A_, 4
-	note B_, 4
-	note A_, 4
+	A_ 4
+	B_ 4
+	A_ 4
 	octave 4
-	note C#, 4
+	C# 4
 	octave 3
-	note B_, 4
-	note A_, 4
-	note B_, 4
+	B_ 4
+	A_ 4
+	B_ 4
 	octave 4
-	note C#, 4
+	C# 4
 	octave 3
-	note A_, 4
+	A_ 4
 	octave 4
-	note D_, 4
+	D_ 4
 	octave 3
-	note A_, 4
+	A_ 4
 	octave 4
-	note D_, 8
+	D_ 8
 	octave 3
-	note G_, 8
-	note A_, 8
+	G_ 8
+	A_ 8
 	octave 4
-	note C#, 8
-	note D_, 8
+	C# 8
+	D_ 8
 	octave 3
-	note G_, 8
-	note A_, 8
+	G_ 8
+	A_ 8
 	octave 4
-	note D_, 6
+	D_ 6
 	loopchannel 0, Music_Routes1_branch_9cdd
 	endchannel
 
@@ -312,94 +312,94 @@
 Music_Routes1_Ch4:: ; 9d24 (2:5d24)
 	dspeed 12
 	rest 4
-	dnote 2, mutedsnare1
+	mutedsnare1 2
 	rest 2
-	dnote 2, mutedsnare1
+	mutedsnare1 2
 	rest 2
-	dnote 2, mutedsnare1
+	mutedsnare1 2
 	rest 2
-	dnote 2, mutedsnare1
+	mutedsnare1 2
 	rest 2
-	dnote 2, mutedsnare1
+	mutedsnare1 2
 	rest 2
-	dnote 2, mutedsnare1
+	mutedsnare1 2
 	rest 2
-	dnote 2, mutedsnare1
-	dnote 2, mutedsnare1
+	mutedsnare1 2
+	mutedsnare1 2
 	rest 4
-	dnote 2, mutedsnare1
+	mutedsnare1 2
 	rest 2
-	dnote 2, mutedsnare1
+	mutedsnare1 2
 	rest 2
-	dnote 2, mutedsnare1
+	mutedsnare1 2
 	rest 2
-	dnote 2, mutedsnare1
+	mutedsnare1 2
 	rest 2
-	dnote 2, mutedsnare1
+	mutedsnare1 2
 	rest 2
-	dnote 2, mutedsnare1
-	dnote 2, mutedsnare1
-	dnote 2, mutedsnare1
-	dnote 2, mutedsnare1
+	mutedsnare1 2
+	mutedsnare1 2
+	mutedsnare1 2
+	mutedsnare1 2
 	rest 4
-	dnote 2, mutedsnare1
+	mutedsnare1 2
 	rest 2
-	dnote 2, mutedsnare1
+	mutedsnare1 2
 	rest 2
-	dnote 2, mutedsnare1
+	mutedsnare1 2
 	rest 2
-	dnote 2, mutedsnare1
+	mutedsnare1 2
 	rest 2
-	dnote 2, mutedsnare1
+	mutedsnare1 2
 	rest 2
-	dnote 2, mutedsnare1
+	mutedsnare1 2
 	rest 2
-	dnote 2, mutedsnare1
-	dnote 2, mutedsnare1
+	mutedsnare1 2
+	mutedsnare1 2
 	rest 4
-	dnote 2, mutedsnare1
+	mutedsnare1 2
 	rest 2
-	dnote 2, mutedsnare1
+	mutedsnare1 2
 	rest 2
-	dnote 2, mutedsnare1
+	mutedsnare1 2
 	rest 2
-	dnote 2, mutedsnare1
+	mutedsnare1 2
 	rest 2
-	dnote 2, mutedsnare1
+	mutedsnare1 2
 	rest 2
-	dnote 2, mutedsnare1
+	mutedsnare1 2
 	rest 2
-	dnote 2, mutedsnare1
-	dnote 2, mutedsnare1
-	dnote 2, mutedsnare1
+	mutedsnare1 2
+	mutedsnare1 2
+	mutedsnare1 2
 	rest 2
-	dnote 2, mutedsnare1
-	dnote 2, mutedsnare1
+	mutedsnare1 2
+	mutedsnare1 2
 	rest 4
-	dnote 2, mutedsnare1
-	dnote 2, mutedsnare1
-	dnote 2, mutedsnare1
+	mutedsnare1 2
+	mutedsnare1 2
+	mutedsnare1 2
 	rest 2
-	dnote 2, mutedsnare1
-	dnote 2, mutedsnare1
+	mutedsnare1 2
+	mutedsnare1 2
 	rest 4
-	dnote 2, mutedsnare1
-	dnote 2, mutedsnare1
-	dnote 2, mutedsnare1
+	mutedsnare1 2
+	mutedsnare1 2
+	mutedsnare1 2
 	rest 2
-	dnote 2, mutedsnare1
-	dnote 2, mutedsnare1
+	mutedsnare1 2
+	mutedsnare1 2
 	rest 4
-	dnote 2, mutedsnare1
-	dnote 2, mutedsnare1
-	dnote 2, mutedsnare1
+	mutedsnare1 2
+	mutedsnare1 2
+	mutedsnare1 2
 	rest 2
-	dnote 2, mutedsnare1
-	dnote 2, mutedsnare1
-	dnote 2, mutedsnare1
+	mutedsnare1 2
+	mutedsnare1 2
+	mutedsnare1 2
 	rest 2
-	dnote 2, mutedsnare1
-	dnote 2, mutedsnare1
+	mutedsnare1 2
+	mutedsnare1 2
 	loopchannel 0, Music_Routes1_Ch4
 	endchannel
-; 0x9db9
\ No newline at end of file
+; 0x9db9
--- a/audio/music/routes2.asm
+++ b/audio/music/routes2.asm
@@ -7,137 +7,137 @@
 Music_Routes2_branch_9dc3::
 	notetype 12, 11, 2
 	octave 2
-	note B_, 4
+	B_ 4
 	octave 3
-	note G#, 6
-	note F#, 2
-	note E_, 2
-	note D#, 1
-	note F#, 1
-	note E_, 2
+	G# 6
+	F# 2
+	E_ 2
+	D# 1
+	F# 1
+	E_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note E_, 2
-	note A_, 2
-	note G#, 4
-	note F#, 4
+	E_ 2
+	A_ 2
+	G# 4
+	F# 4
 	octave 2
-	note B_, 4
+	B_ 4
 	octave 3
-	note G#, 6
-	note F#, 2
-	note E_, 2
-	note D#, 1
-	note F#, 1
-	note B_, 2
+	G# 6
+	F# 2
+	E_ 2
+	D# 1
+	F# 1
+	B_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note E_, 2
-	note A_, 2
-	note G#, 4
-	note B_, 4
+	E_ 2
+	A_ 2
+	G# 4
+	B_ 4
 	notetype 8, 11, 2
 	octave 4
-	note E_, 2
+	E_ 2
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note E_, 2
-	note E_, 2
+	E_ 2
+	E_ 2
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note E_, 2
-	note D#, 2
+	E_ 2
+	D# 2
 	octave 3
-	note G#, 2
+	G# 2
 	octave 4
-	note D#, 2
-	note D#, 2
+	D# 2
+	D# 2
 	octave 3
-	note G#, 2
+	G# 2
 	octave 4
-	note D#, 2
-	note C#, 2
+	D# 2
+	C# 2
 	octave 3
-	note F#, 2
+	F# 2
 	octave 4
-	note C#, 2
-	note C#, 2
+	C# 2
+	C# 2
 	octave 3
-	note F#, 2
+	F# 2
 	octave 4
-	note C#, 2
+	C# 2
 	octave 3
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note B_, 2
-	note E_, 2
-	note G#, 2
-	note F#, 2
-	note G#, 2
-	note A_, 2
-	note A_, 2
-	note F#, 2
-	note A_, 2
-	note F#, 2
-	note G#, 2
-	note A_, 2
-	note A_, 2
-	note F#, 2
-	note A_, 2
-	note G#, 2
-	note E_, 2
-	note B_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note A_, 2
-	note B_, 2
-	note A_, 2
+	B_ 2
+	E_ 2
+	B_ 2
+	B_ 2
+	E_ 2
+	G# 2
+	F# 2
+	G# 2
+	A_ 2
+	A_ 2
+	F# 2
+	A_ 2
+	F# 2
+	G# 2
+	A_ 2
+	A_ 2
+	F# 2
+	A_ 2
+	G# 2
+	E_ 2
+	B_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	A_ 2
+	B_ 2
+	A_ 2
 	octave 4
-	note C#, 2
+	C# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note C#, 2
-	note D_, 2
+	C# 2
+	D_ 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note D_, 2
-	note F#, 2
-	note E_, 2
-	note D#, 2
-	note E_, 2
+	D_ 2
+	F# 2
+	E_ 2
+	D# 2
+	E_ 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note E_, 2
-	note E_, 2
+	E_ 2
+	E_ 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note E_, 2
-	note E_, 2
+	E_ 2
+	E_ 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note E_, 2
-	note E_, 2
+	E_ 2
+	E_ 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note E_, 2
+	E_ 2
 	loopchannel 0, Music_Routes2_branch_9dc3
 	endchannel
 
@@ -149,68 +149,68 @@
 Music_Routes2_branch_9e54::
 	notetype 12, 13, 4
 	octave 4
-	note E_, 6
+	E_ 6
 	octave 3
-	note B_, 1
+	B_ 1
 	octave 4
-	note E_, 1
-	note F#, 6
-	note A_, 2
-	note G#, 3
-	note E_, 1
-	note F#, 8
+	E_ 1
+	F# 6
+	A_ 2
+	G# 3
+	E_ 1
+	F# 8
 	octave 3
-	note D#, 4
+	D# 4
 	octave 4
-	note E_, 6
+	E_ 6
 	octave 3
-	note B_, 1
+	B_ 1
 	octave 4
-	note E_, 1
-	note F#, 6
-	note A_, 2
-	note G#, 3
-	note E_, 1
-	note B_, 8
+	E_ 1
+	F# 6
+	A_ 2
+	G# 3
+	E_ 1
+	B_ 8
 	octave 3
-	note G#, 4
+	G# 4
 	octave 5
-	note C#, 6
+	C# 6
 	octave 4
-	note B_, 1
-	note A_, 1
-	note B_, 6
-	note A_, 1
-	note G#, 1
-	note A_, 6
-	note G#, 1
-	note F#, 1
-	note G#, 4
-	note F#, 2
-	note E_, 2
-	note D_, 2
-	note D_, 1
-	note E_, 1
-	note F#, 8
-	note A_, 4
-	note G#, 3
-	note F#, 1
-	note E_, 8
-	note F#, 2
-	note E_, 2
-	note D_, 2
-	note D_, 1
-	note E_, 1
-	note F#, 2
-	note F#, 1
-	note G#, 1
-	note A_, 4
+	B_ 1
+	A_ 1
+	B_ 6
+	A_ 1
+	G# 1
+	A_ 6
+	G# 1
+	F# 1
+	G# 4
+	F# 2
+	E_ 2
+	D_ 2
+	D_ 1
+	E_ 1
+	F# 8
+	A_ 4
+	G# 3
+	F# 1
+	E_ 8
+	F# 2
+	E_ 2
+	D_ 2
+	D_ 1
+	E_ 1
+	F# 2
+	F# 1
+	G# 1
+	A_ 4
 	octave 5
-	note C#, 4
+	C# 4
 	octave 4
-	note B_, 3
-	note A_, 1
-	note G#, 8
+	B_ 3
+	A_ 1
+	G# 8
 	rest 4
 	loopchannel 0, Music_Routes2_branch_9e54
 	endchannel
@@ -222,103 +222,103 @@
 Music_Routes2_branch_9e9e::
 	notetype 12, 1, 1
 	octave 3
-	note E_, 2
+	E_ 2
 	rest 2
 	octave 2
-	note B_, 6
+	B_ 6
 	octave 3
-	note D_, 1
-	note C#, 1
-	note D_, 2
-	note D#, 2
-	note E_, 2
+	D_ 1
+	C# 1
+	D_ 2
+	D# 2
+	E_ 2
 	rest 2
 	octave 2
-	note B_, 6
+	B_ 6
 	octave 3
-	note D_, 1
-	note C#, 1
+	D_ 1
+	C# 1
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note C#, 2
-	note E_, 2
+	C# 2
+	E_ 2
 	rest 2
 	octave 2
-	note B_, 6
+	B_ 6
 	octave 3
-	note D_, 1
-	note C#, 1
-	note D_, 2
-	note D#, 2
-	note E_, 2
+	D_ 1
+	C# 1
+	D_ 2
+	D# 2
+	E_ 2
 	rest 2
 	octave 2
-	note B_, 4
+	B_ 4
 	octave 3
-	note C#, 2
+	C# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note D_, 2
-	note F#, 2
-	note E_, 2
+	D_ 2
+	F# 2
+	E_ 2
 	rest 2
 	octave 2
-	note A_, 2
+	A_ 2
 	rest 2
 	octave 3
-	note D#, 2
+	D# 2
 	rest 2
 	octave 2
-	note G#, 2
+	G# 2
 	rest 2
 	octave 3
-	note C#, 2
+	C# 2
 	rest 2
 	octave 2
-	note F#, 2
+	F# 2
 	rest 2
-	note B_, 2
+	B_ 2
 	rest 2
-	note E_, 2
-	note G#, 2
-	note F#, 2
+	E_ 2
+	G# 2
+	F# 2
 	rest 2
-	note A_, 2
+	A_ 2
 	rest 2
-	note F#, 2
+	F# 2
 	rest 2
-	note A_, 2
+	A_ 2
 	rest 2
-	note G#, 2
+	G# 2
 	rest 2
-	note B_, 2
+	B_ 2
 	rest 2
-	note G#, 2
+	G# 2
 	rest 2
-	note B_, 2
+	B_ 2
 	rest 2
-	note F#, 2
+	F# 2
 	rest 2
-	note A_, 2
+	A_ 2
 	rest 2
 	octave 3
-	note C#, 2
+	C# 2
 	rest 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note C#, 2
+	C# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	rest 2
 	octave 3
-	note E_, 2
+	E_ 2
 	rest 2
-	note G#, 2
+	G# 2
 	rest 2
-	note E_, 2
+	E_ 2
 	rest 2
 	loopchannel 0, Music_Routes2_branch_9e9e
 	endchannel
@@ -326,101 +326,101 @@
 
 Music_Routes2_Ch4:: ; 9f08 (2:5f08)
 	dspeed 12
-	dnote 2, snare3
+	snare3 2
 	rest 2
-	dnote 1, snare3
+	snare3 1
 	rest 5
-	dnote 1, snare3
-	dnote 1, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
+	snare3 1
+	snare3 1
+	snare3 2
+	snare3 2
+	snare3 2
 	rest 2
 	dspeed 8
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 3, snare3
-	dnote 3, snare3
+	snare3 2
+	snare3 2
+	snare3 2
+	snare3 3
+	snare3 3
 	dspeed 12
-	dnote 1, snare3
+	snare3 1
 	rest 3
-	dnote 2, snare3
+	snare3 2
 	rest 2
-	dnote 2, snare3
+	snare3 2
 	rest 4
-	dnote 1, snare3
-	dnote 1, snare3
-	dnote 2, snare3
+	snare3 1
+	snare3 1
+	snare3 2
 	rest 2
-	dnote 2, snare3
+	snare3 2
 	rest 2
 	dspeed 8
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 3, snare3
-	dnote 3, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 3, snare3
+	snare3 2
+	snare3 2
+	snare3 2
+	snare3 3
+	snare3 3
+	snare3 2
+	snare3 2
+	snare3 2
+	snare3 3
 	rest 3
 	dspeed 12
-	dnote 1, snare3
+	snare3 1
 	rest 5
-	dnote 1, snare3
-	dnote 1, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
+	snare3 1
+	snare3 1
+	snare3 2
+	snare3 2
+	snare3 2
 	rest 2
 	dspeed 8
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 3, snare3
+	snare3 2
+	snare3 2
+	snare3 2
+	snare3 3
 	rest 3
 	dspeed 12
-	dnote 1, snare3
+	snare3 1
 	rest 3
-	dnote 2, snare3
+	snare3 2
 	rest 2
-	dnote 2, snare3
+	snare3 2
 	rest 4
-	dnote 1, snare3
-	dnote 1, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
+	snare3 1
+	snare3 1
+	snare3 2
+	snare3 2
+	snare3 2
 	rest 2
 	dspeed 8
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 3, snare3
+	snare3 2
+	snare3 2
+	snare3 2
+	snare3 3
 	rest 3
-	dnote 3, snare3
-	dnote 3, snare3
-	dnote 3, snare3
+	snare3 3
+	snare3 3
+	snare3 3
 	rest 3
 	dspeed 12
-	dnote 1, snare3
+	snare3 1
 	rest 5
-	dnote 1, snare3
-	dnote 1, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
+	snare3 1
+	snare3 1
+	snare3 2
+	snare3 2
+	snare3 2
 	rest 2
 	dspeed 8
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 3, snare3
+	snare3 2
+	snare3 2
+	snare3 2
+	snare3 3
 	rest 3
-	dnote 3, snare3
+	snare3 3
 	rest 3
 	loopchannel 0, Music_Routes2_Ch4
 	endchannel
-; 0x9fad
\ No newline at end of file
+; 0x9fad
--- a/audio/music/routes3.asm
+++ b/audio/music/routes3.asm
@@ -6,74 +6,74 @@
 	toggleperfectpitch
 	notetype 12, 11, 5
 	octave 3
-	note E_, 1
-	note F#, 1
-	note G_, 6
-	note F_, 1
-	note G_, 1
-	note E_, 1
+	E_ 1
+	F# 1
+	G_ 6
+	F_ 1
+	G_ 1
+	E_ 1
 	rest 16
 	rest 15
 
 Music_Routes3_branch_9fc3::
 	notetype 12, 11, 5
-	note E_, 6
-	note D_, 1
-	note E_, 1
-	note C_, 4
-	note E_, 4
-	note C_, 6
-	note D_, 1
-	note E_, 1
-	note F_, 2
-	note G_, 2
-	note G_, 2
-	note A_, 2
+	E_ 6
+	D_ 1
+	E_ 1
+	C_ 4
+	E_ 4
+	C_ 6
+	D_ 1
+	E_ 1
+	F_ 2
+	G_ 2
+	G_ 2
+	A_ 2
 	notetype 12, 10, 7
-	note A#, 8
-	note F_, 8
-	note D_, 8
-	note F_, 8
+	A# 8
+	F_ 8
+	D_ 8
+	F_ 8
 	notetype 12, 11, 5
-	note E_, 6
-	note D_, 1
-	note E_, 1
-	note C_, 4
-	note E_, 4
-	note C_, 6
-	note D_, 1
-	note E_, 1
-	note F_, 2
-	note G_, 2
-	note G_, 2
-	note A_, 2
+	E_ 6
+	D_ 1
+	E_ 1
+	C_ 4
+	E_ 4
+	C_ 6
+	D_ 1
+	E_ 1
+	F_ 2
+	G_ 2
+	G_ 2
+	A_ 2
 	notetype 12, 10, 7
-	note A#, 8
-	note A#, 8
-	note D_, 8
-	note F_, 8
+	A# 8
+	A# 8
+	D_ 8
+	F_ 8
 	notetype 12, 11, 5
-	note E_, 4
-	note E_, 2
-	note F_, 2
-	note G_, 4
-	note F_, 2
-	note E_, 2
-	note B_, 2
+	E_ 4
+	E_ 2
+	F_ 2
+	G_ 4
+	F_ 2
+	E_ 2
+	B_ 2
 	octave 2
-	note G_, 4
+	G_ 4
 	octave 3
-	note B_, 8
-	note A_, 2
+	B_ 8
+	A_ 2
 	notetype 8, 12, 3
-	note A_, 4
-	note F_, 4
-	note A_, 4
+	A_ 4
+	F_ 4
+	A_ 4
 	notetype 8, 4, 15
-	note A_, 12
+	A_ 12
 	notetype 8, 9, 0
-	note F_, 12
-	note G_, 12
+	F_ 12
+	G_ 12
 	loopchannel 0, Music_Routes3_branch_9fc3
 
 
@@ -82,13 +82,13 @@
 	duty 2
 	notetype 12, 12, 7
 	octave 3
-	note G_, 1
-	note A#, 1
-	note B_, 6
-	note A_, 1
-	note B_, 1
+	G_ 1
+	A# 1
+	B_ 6
+	A_ 1
+	B_ 1
 	octave 4
-	note C_, 1
+	C_ 1
 	rest 15
 	rest 16
 
@@ -96,85 +96,85 @@
 	notetype 12, 12, 7
 	duty 2
 	octave 4
-	note C_, 6
+	C_ 6
 	octave 3
-	note G_, 1
+	G_ 1
 	octave 4
-	note C_, 1
-	note E_, 10
+	C_ 1
+	E_ 10
 	octave 3
-	note G_, 2
+	G_ 2
 	octave 4
-	note C_, 2
-	note G_, 2
-	note F_, 2
-	note E_, 2
-	note D_, 2
-	note C_, 2
-	note D_, 8
-	note F_, 8
+	C_ 2
+	G_ 2
+	F_ 2
+	E_ 2
+	D_ 2
+	C_ 2
+	D_ 8
+	F_ 8
 	notetype 12, 12, 5
 	duty 3
 	octave 3
-	note A#, 8
-	note A_, 8
+	A# 8
+	A_ 8
 	notetype 12, 12, 7
 	duty 2
 	octave 4
-	note C_, 6
+	C_ 6
 	octave 3
-	note G_, 1
+	G_ 1
 	octave 4
-	note C_, 1
-	note E_, 10
+	C_ 1
+	E_ 10
 	octave 3
-	note G_, 2
+	G_ 2
 	octave 4
-	note C_, 2
-	note G_, 2
-	note F_, 2
-	note E_, 2
-	note D_, 2
-	note C_, 2
-	note D_, 8
-	note F_, 8
+	C_ 2
+	G_ 2
+	F_ 2
+	E_ 2
+	D_ 2
+	C_ 2
+	D_ 8
+	F_ 8
 	notetype 12, 12, 5
 	duty 3
 	octave 3
-	note A#, 8
+	A# 8
 	octave 4
-	note D_, 6
+	D_ 6
 	notetype 12, 12, 7
 	duty 2
-	note C_, 1
-	note D_, 1
-	note E_, 2
-	note D_, 2
-	note E_, 2
-	note C_, 8
+	C_ 1
+	D_ 1
+	E_ 2
+	D_ 2
+	E_ 2
+	C_ 8
 	octave 3
-	note B_, 1
+	B_ 1
 	octave 4
-	note C_, 1
-	note D_, 2
+	C_ 1
+	D_ 2
 	octave 3
-	note G_, 4
+	G_ 4
 	octave 4
-	note G_, 8
-	note F_, 1
-	note E_, 1
+	G_ 8
+	F_ 1
+	E_ 1
 	notetype 8, 13, 3
-	note F_, 4
-	note E_, 4
+	F_ 4
+	E_ 4
 	notetype 8, 12, 4
-	note C_, 4
+	C_ 4
 	notetype 8, 12, 5
-	note C_, 12
+	C_ 12
 	notetype 12, 10, 0
 	duty 3
 	octave 3
-	note A_, 8
-	note B_, 8
+	A_ 8
+	B_ 8
 	loopchannel 0, Music_Routes3_branch_a01a
 
 
@@ -182,335 +182,335 @@
 	vibrato 4, 1, 0
 	notetype 6, 1, 2
 	octave 4
-	note G_, 2
-	note A#, 2
-	note B_, 8
-	note A_, 8
-	note G_, 2
+	G_ 2
+	A# 2
+	B_ 8
+	A_ 8
+	G_ 2
 	rest 2
-	note G_, 7
+	G_ 7
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note G_, 2
+	G_ 2
 	rest 2
-	note G_, 2
+	G_ 2
 	rest 2
-	note G_, 8
-	note G_, 2
+	G_ 8
+	G_ 2
 	rest 2
-	note G_, 7
+	G_ 7
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note G_, 2
+	G_ 2
 	rest 2
-	note G_, 2
+	G_ 2
 	rest 2
-	note G_, 8
+	G_ 8
 
 Music_Routes3_branch_a0a3::
 	notetype 12, 1, 2
-	note E_, 1
+	E_ 1
 	rest 1
-	note G_, 4
-	note E_, 1
-	note E_, 1
-	note E_, 1
+	G_ 4
+	E_ 1
+	E_ 1
+	E_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note G_, 4
-	note E_, 1
+	G_ 4
+	E_ 1
 	rest 1
-	note G_, 4
-	note E_, 1
-	note E_, 1
-	note E_, 1
+	G_ 4
+	E_ 1
+	E_ 1
+	E_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note G_, 2
-	note A_, 2
-	note F_, 1
+	G_ 2
+	A_ 2
+	F_ 1
 	rest 1
-	note A#, 4
-	note F_, 1
-	note F_, 1
-	note F_, 1
+	A# 4
+	F_ 1
+	F_ 1
+	F_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note A#, 4
-	note F_, 1
+	A# 4
+	F_ 1
 	rest 1
-	note A#, 4
-	note F_, 1
-	note F_, 1
-	note F_, 1
+	A# 4
+	F_ 1
+	F_ 1
+	F_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note A#, 2
-	note F_, 2
-	note E_, 1
+	A# 2
+	F_ 2
+	E_ 1
 	rest 1
-	note G_, 4
-	note E_, 1
-	note E_, 1
-	note E_, 1
+	G_ 4
+	E_ 1
+	E_ 1
+	E_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note G_, 4
-	note E_, 1
+	G_ 4
+	E_ 1
 	rest 1
-	note G_, 4
-	note E_, 1
-	note E_, 1
-	note E_, 1
+	G_ 4
+	E_ 1
+	E_ 1
+	E_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note G_, 2
-	note A_, 2
-	note F_, 1
+	G_ 2
+	A_ 2
+	F_ 1
 	rest 1
-	note A#, 4
-	note F_, 1
-	note F_, 1
-	note F_, 1
+	A# 4
+	F_ 1
+	F_ 1
+	F_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note A#, 4
-	note F_, 1
+	A# 4
+	F_ 1
 	rest 1
-	note A#, 4
-	note F_, 1
-	note F_, 1
-	note F_, 1
+	A# 4
+	F_ 1
+	F_ 1
+	F_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note A#, 2
-	note A_, 2
-	note G_, 1
+	A# 2
+	A_ 2
+	G_ 1
 	rest 1
 	octave 5
-	note C_, 4
+	C_ 4
 	octave 4
-	note G_, 1
-	note G_, 1
-	note G_, 1
+	G_ 1
+	G_ 1
+	G_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
 	octave 5
-	note C_, 4
+	C_ 4
 	octave 4
-	note G_, 1
+	G_ 1
 	rest 1
 	octave 5
-	note D_, 4
+	D_ 4
 	octave 4
-	note G_, 1
-	note G_, 1
-	note G_, 1
+	G_ 1
+	G_ 1
+	G_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
 	octave 5
-	note D_, 4
+	D_ 4
 	octave 4
-	note F_, 1
+	F_ 1
 	rest 1
 	octave 5
-	note C_, 4
+	C_ 4
 	octave 4
-	note F_, 1
-	note F_, 1
-	note F_, 1
+	F_ 1
+	F_ 1
+	F_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
 	octave 5
-	note C_, 4
+	C_ 4
 	octave 4
-	note F_, 1
+	F_ 1
 	rest 1
-	note A_, 4
-	note F_, 1
-	note F_, 1
-	note F_, 1
+	A_ 4
+	F_ 1
+	F_ 1
+	F_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note A_, 4
+	A_ 4
 	loopchannel 0, Music_Routes3_branch_a0a3
 
 
 Music_Routes3_Ch4:: ; a131 (2:6131)
 	dspeed 6
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 8, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 12, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare3
-	dnote 4, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 12, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare3
-	dnote 4, mutedsnare2
-	dnote 4, mutedsnare3
-	dnote 4, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 8
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 12
+	mutedsnare2 2
+	mutedsnare3 2
+	mutedsnare2 4
+	mutedsnare2 4
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 12
+	mutedsnare2 2
+	mutedsnare3 2
+	mutedsnare2 4
+	mutedsnare3 4
+	mutedsnare2 4
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
 
 Music_Routes3_branch_a17a::
-	dnote 12, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare3
-	dnote 4, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 12, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 8, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 12, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare3
-	dnote 4, mutedsnare2
-	dnote 10, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 12, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare4
-	dnote 4, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 12, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 8, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 12, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 10, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 12, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 8, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 12, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 12, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 10, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 12, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 8, mutedsnare2
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare4
-	dnote 12, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 8, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 12, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
+	mutedsnare2 12
+	mutedsnare2 2
+	mutedsnare3 2
+	mutedsnare2 4
+	mutedsnare2 4
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 12
+	mutedsnare2 2
+	mutedsnare2 2
+	mutedsnare2 4
+	mutedsnare2 8
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 12
+	mutedsnare2 2
+	mutedsnare3 2
+	mutedsnare2 4
+	mutedsnare2 10
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare2 12
+	mutedsnare2 2
+	mutedsnare4 2
+	mutedsnare2 4
+	mutedsnare2 4
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 12
+	mutedsnare2 2
+	mutedsnare2 2
+	mutedsnare2 4
+	mutedsnare2 8
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 12
+	mutedsnare2 2
+	mutedsnare2 2
+	mutedsnare2 4
+	mutedsnare2 10
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare2 12
+	mutedsnare2 2
+	mutedsnare2 2
+	mutedsnare2 4
+	mutedsnare2 8
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 12
+	mutedsnare2 2
+	mutedsnare2 2
+	mutedsnare2 4
+	mutedsnare2 4
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 12
+	mutedsnare2 2
+	mutedsnare2 2
+	mutedsnare2 4
+	mutedsnare2 10
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare2 12
+	mutedsnare2 2
+	mutedsnare2 2
+	mutedsnare2 4
+	mutedsnare2 8
+	mutedsnare3 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare4 1
+	mutedsnare2 12
+	mutedsnare2 2
+	mutedsnare2 2
+	mutedsnare2 4
+	mutedsnare2 8
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 12
+	mutedsnare2 2
+	mutedsnare2 2
+	mutedsnare2 4
+	mutedsnare2 4
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare3 1
 	loopchannel 0, Music_Routes3_branch_a17a
-; 0xa26a
\ No newline at end of file
+; 0xa26a
--- a/audio/music/routes4.asm
+++ b/audio/music/routes4.asm
@@ -6,135 +6,135 @@
 	toggleperfectpitch
 	notetype 12, 10, 2
 	octave 2
-	note G#, 4
-	note G#, 4
-	note G#, 4
+	G# 4
+	G# 4
+	G# 4
 	notetype 12, 7, 15
-	note G#, 4
+	G# 4
 	notetype 12, 10, 2
-	note G#, 4
-	note G#, 4
-	note G#, 4
+	G# 4
+	G# 4
+	G# 4
 	notetype 12, 11, 7
-	note B_, 1
+	B_ 1
 	octave 3
-	note E_, 1
-	note F#, 1
-	note B_, 1
+	E_ 1
+	F# 1
+	B_ 1
 
 Music_Routes4_branch_a28a::
 	notetype 12, 11, 7
-	note B_, 6
-	note E_, 2
-	note E_, 4
+	B_ 6
+	E_ 2
+	E_ 4
 	octave 4
-	note E_, 4
-	note D_, 4
-	note C#, 4
+	E_ 4
+	D_ 4
+	C# 4
 	octave 3
-	note B_, 4
-	note A_, 4
+	B_ 4
+	A_ 4
 	notetype 12, 11, 1
-	note G#, 3
+	G# 3
 	notetype 12, 11, 7
-	note E_, 1
-	note F#, 12
-	note E_, 8
-	note D#, 4
-	note F#, 4
-	note B_, 6
-	note E_, 2
-	note E_, 4
+	E_ 1
+	F# 12
+	E_ 8
+	D# 4
+	F# 4
+	B_ 6
+	E_ 2
+	E_ 4
 	octave 4
-	note E_, 4
-	note D_, 4
-	note C#, 4
+	E_ 4
+	D_ 4
+	C# 4
 	octave 3
-	note B_, 4
+	B_ 4
 	octave 4
-	note C#, 4
+	C# 4
 	notetype 12, 11, 1
-	note E_, 3
+	E_ 3
 	notetype 12, 11, 7
-	note D#, 1
-	note E_, 12
+	D# 1
+	E_ 12
 	octave 3
-	note B_, 3
-	note A_, 1
-	note G#, 8
+	B_ 3
+	A_ 1
+	G# 8
 	octave 4
-	note E_, 4
+	E_ 4
 	octave 3
-	note D_, 2
-	note E_, 2
-	note F#, 2
-	note G#, 2
-	note A_, 2
-	note B_, 2
+	D_ 2
+	E_ 2
+	F# 2
+	G# 2
+	A_ 2
+	B_ 2
 	octave 4
-	note C#, 2
-	note D_, 2
-	note D_, 2
+	C# 2
+	D_ 2
+	D_ 2
 	octave 3
-	note A_, 2
-	note F#, 2
-	note E_, 2
-	note D_, 2
-	note E_, 2
-	note F#, 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note E_, 2
-	note F#, 2
-	note G#, 2
-	note A_, 2
-	note B_, 2
+	A_ 2
+	F# 2
+	E_ 2
+	D_ 2
+	E_ 2
+	F# 2
+	A_ 2
+	G# 2
+	F# 2
+	E_ 2
+	F# 2
+	G# 2
+	A_ 2
+	B_ 2
 	octave 4
-	note D#, 2
-	note E_, 2
+	D# 2
+	E_ 2
 	octave 3
-	note B_, 2
-	note G#, 2
-	note F#, 2
-	note E_, 2
-	note F#, 2
-	note G#, 2
-	note B_, 2
+	B_ 2
+	G# 2
+	F# 2
+	E_ 2
+	F# 2
+	G# 2
+	B_ 2
 	notetype 8, 11, 5
-	note A_, 4
-	note G#, 4
-	note F#, 4
+	A_ 4
+	G# 4
+	F# 4
 	octave 4
-	note E_, 4
-	note D#, 4
-	note C#, 4
-	note C#, 4
+	E_ 4
+	D# 4
+	C# 4
+	C# 4
 	octave 3
-	note B_, 4
-	note A_, 4
-	note B_, 4
+	B_ 4
+	A_ 4
+	B_ 4
 	octave 4
-	note C#, 4
-	note D#, 4
+	C# 4
+	D# 4
 	octave 3
-	note E_, 3
-	note F#, 3
-	note G#, 3
-	note A_, 3
-	note B_, 4
+	E_ 3
+	F# 3
+	G# 3
+	A_ 3
+	B_ 4
 	octave 4
-	note C#, 4
-	note D#, 4
-	note E_, 3
+	C# 4
+	D# 4
+	E_ 3
 	octave 3
-	note B_, 3
-	note G#, 3
-	note F#, 3
-	note E_, 3
-	note F#, 3
-	note G#, 3
-	note A_, 3
+	B_ 3
+	G# 3
+	F# 3
+	E_ 3
+	F# 3
+	G# 3
+	A_ 3
 	loopchannel 0, Music_Routes4_branch_a28a
 
 
@@ -143,148 +143,148 @@
 	duty 1
 	notetype 12, 9, 2
 	octave 3
-	note E_, 3
-	note F#, 1
+	E_ 3
+	F# 1
 	notetype 12, 9, 0
-	note E_, 12
+	E_ 12
 	notetype 12, 9, 2
 	octave 2
-	note B_, 3
+	B_ 3
 	octave 3
-	note C_, 1
+	C_ 1
 	notetype 12, 9, 0
 	octave 2
-	note B_, 8
+	B_ 8
 	duty 3
 	notetype 12, 12, 7
 	octave 3
-	note E_, 1
-	note F#, 1
-	note B_, 1
+	E_ 1
+	F# 1
+	B_ 1
 	octave 4
-	note D#, 1
+	D# 1
 
 Music_Routes4_branch_a325::
 	notetype 12, 12, 7
-	note E_, 6
+	E_ 6
 	octave 3
-	note B_, 2
-	note B_, 4
+	B_ 2
+	B_ 4
 	octave 4
-	note B_, 4
-	note A_, 4
-	note G#, 4
-	note F#, 4
-	note F#, 1
-	note A_, 1
-	note G#, 1
-	note F#, 1
+	B_ 4
+	A_ 4
+	G# 4
+	F# 4
+	F# 1
+	A_ 1
+	G# 1
+	F# 1
 	notetype 12, 12, 2
-	note G#, 3
-	note E_, 1
+	G# 3
+	E_ 1
 	notetype 12, 10, 0
 	octave 3
-	note B_, 12
+	B_ 12
 	duty 0
 	notetype 12, 12, 2
 	octave 2
-	note B_, 3
+	B_ 3
 	notetype 12, 12, 7
 	octave 3
-	note C_, 1
+	C_ 1
 	octave 2
-	note B_, 8
+	B_ 8
 	octave 3
-	note D#, 4
+	D# 4
 	duty 3
 	octave 4
-	note E_, 6
+	E_ 6
 	octave 3
-	note B_, 2
-	note B_, 4
+	B_ 2
+	B_ 4
 	octave 4
-	note B_, 4
-	note A_, 4
-	note G#, 4
-	note F#, 4
-	note A_, 1
+	B_ 4
+	A_ 4
+	G# 4
+	F# 4
+	A_ 1
 	octave 5
-	note C#, 1
+	C# 1
 	octave 4
-	note B_, 1
-	note A_, 1
+	B_ 1
+	A_ 1
 	notetype 12, 12, 2
-	note B_, 3
+	B_ 3
 	notetype 12, 12, 7
-	note A_, 1
+	A_ 1
 	notetype 12, 11, 0
-	note G#, 6
+	G# 6
 	notetype 12, 9, 0
-	note G#, 6
+	G# 6
 	notetype 12, 7, 0
-	note G#, 6
+	G# 6
 	notetype 12, 6, 15
-	note G#, 6
+	G# 6
 	notetype 12, 12, 7
-	note G#, 4
+	G# 4
 	notetype 8, 12, 3
-	note A_, 4
-	note G#, 4
-	note F#, 4
+	A_ 4
+	G# 4
+	F# 4
 	notetype 8, 9, 0
-	note F#, 6
+	F# 6
 	notetype 8, 7, 15
-	note F#, 6
+	F# 6
 	duty 0
 	notetype 8, 9, 0
 	octave 3
-	note F#, 4
-	note E_, 4
-	note F#, 4
-	note A_, 6
+	F# 4
+	E_ 4
+	F# 4
+	A_ 6
 	duty 3
 	notetype 8, 12, 7
 	octave 4
-	note F#, 6
-	note G#, 4
-	note F#, 4
+	F# 6
+	G# 4
+	F# 4
 	notetype 8, 12, 4
-	note E_, 4
+	E_ 4
 	notetype 8, 10, 0
-	note E_, 12
+	E_ 12
 	duty 0
 	notetype 8, 9, 0
 	octave 3
-	note E_, 4
-	note D#, 4
-	note E_, 4
-	note G#, 6
+	E_ 4
+	D# 4
+	E_ 4
+	G# 6
 	duty 3
 	notetype 8, 12, 7
 	octave 4
-	note E_, 6
-	note F#, 4
-	note D#, 4
+	E_ 6
+	F# 4
+	D# 4
 	octave 3
-	note B_, 4
+	B_ 4
 	notetype 8, 10, 0
 	octave 4
-	note B_, 16
+	B_ 16
 	notetype 8, 10, 7
-	note B_, 8
+	B_ 8
 	notetype 8, 11, 0
-	note A_, 6
+	A_ 6
 	notetype 8, 11, 7
-	note A_, 6
+	A_ 6
 	notetype 12, 10, 7
-	note G#, 1
-	note F#, 1
+	G# 1
+	F# 1
 	notetype 12, 11, 0
-	note E_, 12
+	E_ 12
 	notetype 12, 10, 0
-	note E_, 8
+	E_ 8
 	notetype 12, 10, 7
-	note E_, 10
+	E_ 10
 	loopchannel 0, Music_Routes4_branch_a325
 
 
@@ -291,217 +291,217 @@
 Music_Routes4_Ch3:: ; a3c4 (2:63c4)
 	notetype 12, 1, 0
 	octave 4
-	note E_, 1
+	E_ 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 3
-	note D#, 1
+	D# 1
 	rest 3
 
 Music_Routes4_branch_a3d7::
-	note E_, 1
+	E_ 1
 	rest 3
-	note E_, 1
-	note E_, 1
-	note E_, 1
-	note E_, 1
-	note E_, 1
+	E_ 1
+	E_ 1
+	E_ 1
+	E_ 1
+	E_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 3
-	note F#, 1
-	note F#, 1
-	note F#, 1
-	note F#, 1
-	note F#, 1
+	F# 1
+	F# 1
+	F# 1
+	F# 1
+	F# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 3
-	note A_, 1
+	A_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 3
-	note G#, 1
-	note G#, 1
-	note G#, 1
-	note G#, 1
-	note G#, 1
+	G# 1
+	G# 1
+	G# 1
+	G# 1
+	G# 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 3
-	note G#, 1
+	G# 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 3
-	note G#, 1
-	note G#, 1
-	note G#, 1
-	note G#, 1
-	note G#, 1
+	G# 1
+	G# 1
+	G# 1
+	G# 1
+	G# 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 3
-	note G#, 1
+	G# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 3
-	note E_, 1
-	note E_, 1
-	note E_, 1
-	note E_, 1
-	note E_, 1
+	E_ 1
+	E_ 1
+	E_ 1
+	E_ 1
+	E_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 3
-	note F#, 1
-	note F#, 1
-	note F#, 1
-	note F#, 1
-	note F#, 1
+	F# 1
+	F# 1
+	F# 1
+	F# 1
+	F# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 3
-	note A_, 1
+	A_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 3
-	note B_, 1
-	note B_, 1
-	note B_, 1
-	note B_, 1
-	note B_, 1
+	B_ 1
+	B_ 1
+	B_ 1
+	B_ 1
+	B_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 3
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 3
-	note E_, 1
-	note E_, 1
-	note E_, 1
-	note E_, 1
-	note E_, 1
+	E_ 1
+	E_ 1
+	E_ 1
+	E_ 1
+	E_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 3
-	note F#, 1
-	note F#, 1
-	note F#, 1
-	note F#, 1
-	note F#, 1
+	F# 1
+	F# 1
+	F# 1
+	F# 1
+	F# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 3
-	note F#, 1
+	F# 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 3
-	note D_, 1
-	note D_, 1
-	note D_, 1
-	note D_, 1
-	note D_, 1
+	D_ 1
+	D_ 1
+	D_ 1
+	D_ 1
+	D_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 3
-	note D_, 1
+	D_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 3
-	note E_, 1
-	note E_, 1
-	note E_, 1
-	note E_, 1
-	note E_, 1
+	E_ 1
+	E_ 1
+	E_ 1
+	E_ 1
+	E_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 3
-	note G#, 1
-	note G#, 1
-	note G#, 1
-	note G#, 1
-	note G#, 1
+	G# 1
+	G# 1
+	G# 1
+	G# 1
+	G# 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 3
-	note G#, 1
+	G# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 3
-	note F#, 1
-	note F#, 1
-	note F#, 1
-	note F#, 1
-	note F#, 1
+	F# 1
+	F# 1
+	F# 1
+	F# 1
+	F# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 3
-	note F#, 1
+	F# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 3
-	note B_, 1
-	note B_, 1
-	note B_, 1
-	note B_, 1
-	note B_, 1
+	B_ 1
+	B_ 1
+	B_ 1
+	B_ 1
+	B_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 3
-	note B_, 1
+	B_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 3
-	note G#, 1
-	note G#, 1
-	note G#, 1
-	note G#, 1
-	note G#, 1
+	G# 1
+	G# 1
+	G# 1
+	G# 1
+	G# 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 3
-	note G#, 1
+	G# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 3
-	note E_, 1
-	note E_, 1
-	note E_, 1
-	note E_, 1
-	note E_, 1
+	E_ 1
+	E_ 1
+	E_ 1
+	E_ 1
+	E_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 3
-	note D#, 1
+	D# 1
 	rest 1
 	loopchannel 0, Music_Routes4_branch_a3d7
 
@@ -510,173 +510,173 @@
 	dspeed 12
 	rest 16
 	rest 12
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
 
 Music_Routes4_branch_a4a8::
-	dnote 4, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare3
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 4, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 4, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 4, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 4, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 4, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 4, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 4, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 4, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 4, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 4, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 4, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 4, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 4, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 4, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 4, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare2
+	mutedsnare2 4
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 2
+	mutedsnare3 2
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 4
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 4
+	mutedsnare2 2
+	mutedsnare2 4
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 2
+	mutedsnare2 2
+	mutedsnare2 2
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare2 4
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 2
+	mutedsnare2 2
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare2 4
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 2
+	mutedsnare2 2
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 4
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 4
+	mutedsnare2 2
+	mutedsnare2 4
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 2
+	mutedsnare2 2
+	mutedsnare2 2
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare2 4
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 2
+	mutedsnare2 2
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 4
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 2
+	mutedsnare2 2
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 4
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 4
+	mutedsnare2 2
+	mutedsnare2 4
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 2
+	mutedsnare2 2
+	mutedsnare2 2
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare2 4
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 2
+	mutedsnare2 2
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 4
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 2
+	mutedsnare2 2
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 4
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 4
+	mutedsnare2 2
+	mutedsnare2 4
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 2
+	mutedsnare2 2
+	mutedsnare2 2
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare2 4
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 2
+	mutedsnare2 2
+	mutedsnare2 2
+	mutedsnare2 2
 	loopchannel 0, Music_Routes4_branch_a4a8
-; 0xa5f0
\ No newline at end of file
+; 0xa5f0
--- a/audio/music/safarizone.asm
+++ b/audio/music/safarizone.asm
@@ -7,13 +7,13 @@
 	notetype 12, 9, 2
 	octave 3
 	pitchbend 0, 73
-	note C_, 1
+	C_ 1
 	pitchbend 0, 73
-	note G_, 1
+	G_ 1
 	pitchbend 0, 73
-	note C_, 1
+	C_ 1
 	pitchbend 0, 73
-	note G_, 1
+	G_ 1
 	rest 4
 	duty 3
 
@@ -20,22 +20,22 @@
 Music_SafariZone_branch_bc4f::
 	callchannel Music_SafariZone_branch_bc5f
 	notetype 12, 10, 4
-	note F#, 4
+	F# 4
 	callchannel Music_SafariZone_branch_bc5f
 	notetype 12, 10, 4
-	note F#, 4
+	F# 4
 	loopchannel 0, Music_SafariZone_branch_bc4f
 
 Music_SafariZone_branch_bc5f::
 	notetype 12, 10, 2
 	octave 3
-	note C_, 4
-	note G_, 4
-	note C_, 4
-	note G_, 4
-	note C_, 4
-	note G_, 4
-	note C_, 4
+	C_ 4
+	G_ 4
+	C_ 4
+	G_ 4
+	C_ 4
+	G_ 4
+	C_ 4
 	endchannel
 
 
@@ -44,10 +44,10 @@
 	vibrato 8, 2, 5
 	notetype 12, 10, 2
 	octave 4
-	note G_, 1
-	note D_, 1
-	note G_, 1
-	note D_, 1
+	G_ 1
+	D_ 1
+	G_ 1
+	D_ 1
 	rest 4
 	duty 3
 
@@ -54,22 +54,22 @@
 Music_SafariZone_branch_bc79::
 	callchannel Music_SafariZone_branch_bc89
 	notetype 12, 11, 5
-	note A_, 4
+	A_ 4
 	callchannel Music_SafariZone_branch_bc89
 	notetype 12, 11, 5
-	note B_, 4
+	B_ 4
 	loopchannel 0, Music_SafariZone_branch_bc79
 
 Music_SafariZone_branch_bc89::
 	notetype 12, 11, 2
 	octave 3
-	note G_, 4
-	note D_, 4
-	note G_, 4
-	note D_, 4
-	note G_, 4
-	note D_, 4
-	note G_, 4
+	G_ 4
+	D_ 4
+	G_ 4
+	D_ 4
+	G_ 4
+	D_ 4
+	G_ 4
 	endchannel
 
 
@@ -80,33 +80,33 @@
 Music_SafariZone_branch_bc97::
 	callchannel Music_SafariZone_branch_bca5
 	octave 4
-	note A_, 4
+	A_ 4
 	callchannel Music_SafariZone_branch_bca5
 	octave 4
-	note B_, 4
+	B_ 4
 	loopchannel 0, Music_SafariZone_branch_bc97
 
 Music_SafariZone_branch_bca5::
 	octave 3
-	note A_, 2
+	A_ 2
 	rest 2
 	octave 4
-	note D_, 2
+	D_ 2
 	rest 2
 	octave 3
-	note A_, 2
+	A_ 2
 	rest 2
 	octave 4
-	note D_, 2
+	D_ 2
 	rest 2
 	octave 3
-	note A_, 2
+	A_ 2
 	rest 2
 	octave 4
-	note D_, 2
+	D_ 2
 	rest 2
 	octave 3
-	note A_, 2
+	A_ 2
 	rest 2
 	endchannel
-; 0xbcbb
\ No newline at end of file
+; 0xbcbb
--- a/audio/music/silphco.asm
+++ b/audio/music/silphco.asm
@@ -6,318 +6,318 @@
 	vibrato 8, 2, 2
 	notetype 6, 11, 3
 	octave 2
-	note E_, 1
-	note F#, 1
-	note G#, 1
-	note A#, 1
+	E_ 1
+	F# 1
+	G# 1
+	A# 1
 	octave 3
-	note C_, 1
+	C_ 1
 	notetype 6, 10, 0
-	note C_, 12
+	C_ 12
 	notetype 6, 11, 3
-	note C_, 2
+	C_ 2
 	octave 2
-	note B_, 1
-	note A#, 1
-	note G#, 1
-	note F#, 1
-	note E_, 1
-	note E_, 2
+	B_ 1
+	A# 1
+	G# 1
+	F# 1
+	E_ 1
+	E_ 2
 	rest 2
-	note B_, 2
+	B_ 2
 	rest 6
-	note B_, 2
+	B_ 2
 	rest 6
-	note B_, 2
+	B_ 2
 	rest 6
-	note B_, 2
+	B_ 2
 	rest 2
 
 Music_SilphCo_branch_7f26d::
-	note G_, 2
+	G_ 2
 	rest 2
-	note B_, 2
+	B_ 2
 	rest 6
-	note B_, 2
+	B_ 2
 	rest 6
-	note A#, 2
+	A# 2
 	rest 6
-	note B_, 2
+	B_ 2
 	rest 6
-	note B_, 2
+	B_ 2
 	rest 6
-	note B_, 2
+	B_ 2
 	rest 2
 	octave 3
-	note C_, 2
+	C_ 2
 	rest 2
-	note C_, 2
+	C_ 2
 	rest 6
-	note C_, 2
+	C_ 2
 	rest 6
-	note C_, 2
+	C_ 2
 	rest 6
-	note C_, 2
+	C_ 2
 	rest 6
 	octave 2
-	note A#, 2
+	A# 2
 	rest 6
-	note B_, 2
+	B_ 2
 	rest 2
-	note G_, 2
+	G_ 2
 	rest 10
-	note E_, 1
-	note F#, 1
-	note G#, 1
-	note A_, 1
+	E_ 1
+	F# 1
+	G# 1
+	A_ 1
 	notetype 6, 10, 0
-	note B_, 12
+	B_ 12
 	notetype 6, 11, 3
-	note B_, 1
-	note A_, 1
-	note G_, 1
-	note F_, 1
-	note E_, 1
+	B_ 1
+	A_ 1
+	G_ 1
+	F_ 1
+	E_ 1
 	rest 11
-	note F_, 1
-	note G#, 1
-	note A#, 1
-	note B_, 1
+	F_ 1
+	G# 1
+	A# 1
+	B_ 1
 	notetype 6, 10, 0
 	octave 3
-	note C_, 12
+	C_ 12
 	notetype 6, 11, 3
-	note C_, 1
+	C_ 1
 	octave 2
-	note B_, 1
-	note A_, 1
-	note G_, 1
-	note F_, 1
+	B_ 1
+	A_ 1
+	G_ 1
+	F_ 1
 	rest 11
-	note F#, 1
-	note B_, 1
+	F# 1
+	B_ 1
 	octave 3
-	note C_, 1
-	note C#, 1
+	C_ 1
+	C# 1
 	notetype 6, 10, 0
-	note D_, 12
+	D_ 12
 	notetype 6, 11, 3
-	note D_, 1
-	note C_, 1
+	D_ 1
+	C_ 1
 	octave 2
-	note A#, 1
-	note G_, 1
-	note F_, 1
+	A# 1
+	G_ 1
+	F_ 1
 	rest 11
-	note F_, 1
-	note G#, 1
-	note A#, 1
-	note B_, 1
+	F_ 1
+	G# 1
+	A# 1
+	B_ 1
 	notetype 6, 10, 0
 	octave 3
-	note C_, 12
+	C_ 12
 	notetype 6, 11, 3
-	note C_, 1
+	C_ 1
 	octave 2
-	note B_, 1
-	note G#, 1
-	note F_, 1
-	note E_, 1
+	B_ 1
+	G# 1
+	F_ 1
+	E_ 1
 	rest 7
 	notetype 6, 8, 0
-	note B_, 16
+	B_ 16
 	notetype 6, 11, 0
 	octave 3
-	note E_, 8
+	E_ 8
 	tempo 124
 	notetype 6, 11, 3
 	octave 2
-	note B_, 2
+	B_ 2
 	rest 10
-	note B_, 2
+	B_ 2
 	rest 10
-	note B_, 2
+	B_ 2
 	rest 6
-	note B_, 2
+	B_ 2
 	rest 16
 	rest 6
-	note A_, 2
+	A_ 2
 	rest 6
-	note B_, 2
-	note A#, 2
-	note B_, 2
+	B_ 2
+	A# 2
+	B_ 2
 	octave 3
-	note C_, 2
+	C_ 2
 	octave 2
-	note B_, 2
-	note A#, 2
-	note B_, 2
-	note A#, 2
-	note B_, 2
+	B_ 2
+	A# 2
+	B_ 2
+	A# 2
+	B_ 2
 	octave 3
-	note C_, 2
+	C_ 2
 	octave 2
-	note B_, 2
-	note A#, 2
-	note B_, 2
-	note A#, 2
-	note B_, 2
+	B_ 2
+	A# 2
+	B_ 2
+	A# 2
+	B_ 2
 	octave 3
-	note C_, 2
+	C_ 2
 	octave 2
-	note B_, 2
-	note A#, 2
-	note B_, 2
+	B_ 2
+	A# 2
+	B_ 2
 	octave 3
-	note C_, 2
+	C_ 2
 	octave 2
-	note B_, 2
-	note A#, 2
-	note B_, 2
+	B_ 2
+	A# 2
+	B_ 2
 	octave 3
-	note C_, 2
+	C_ 2
 	octave 2
-	note B_, 2
-	note A#, 2
-	note B_, 2
-	note A#, 2
-	note A_, 2
-	note A#, 2
-	note B_, 2
-	note A#, 2
+	B_ 2
+	A# 2
+	B_ 2
+	A# 2
+	A_ 2
+	A# 2
+	B_ 2
+	A# 2
 	callchannel Music_SilphCo_branch_7f3f0
 	callchannel Music_SilphCo_branch_7f3f0
 	callchannel Music_SilphCo_branch_7f3f0
 	rest 4
-	note C_, 2
+	C_ 2
 	rest 6
-	note C_, 2
+	C_ 2
 	rest 6
-	note C_, 2
+	C_ 2
 	rest 6
 	octave 2
-	note B_, 2
+	B_ 2
 	rest 6
-	note B_, 2
+	B_ 2
 	rest 6
-	note B_, 2
+	B_ 2
 	rest 6
-	note B_, 2
+	B_ 2
 	rest 6
-	note A#, 2
+	A# 2
 	rest 6
-	note A_, 2
+	A_ 2
 	rest 6
-	note A_, 2
+	A_ 2
 	rest 6
-	note A_, 2
+	A_ 2
 	rest 6
-	note A_, 2
+	A_ 2
 	rest 6
-	note A_, 2
+	A_ 2
 	rest 6
-	note A_, 2
+	A_ 2
 	rest 6
-	note A#, 2
+	A# 2
 	rest 6
-	note A#, 2
+	A# 2
 	rest 6
-	note B_, 2
+	B_ 2
 	rest 6
-	note B_, 2
+	B_ 2
 	rest 6
-	note B_, 2
+	B_ 2
 	rest 6
-	note B_, 2
+	B_ 2
 	rest 6
-	note B_, 2
+	B_ 2
 	rest 6
-	note B_, 2
+	B_ 2
 	rest 6
 	octave 3
-	note C_, 2
+	C_ 2
 	rest 6
-	note C_, 2
+	C_ 2
 	rest 6
 	octave 2
-	note B_, 2
+	B_ 2
 	rest 6
-	note B_, 2
+	B_ 2
 	rest 6
-	note B_, 2
+	B_ 2
 	rest 6
-	note B_, 2
+	B_ 2
 	rest 6
 	octave 3
-	note B_, 2
+	B_ 2
 	rest 6
-	note B_, 2
+	B_ 2
 	rest 6
 	octave 4
-	note C_, 2
+	C_ 2
 	rest 6
-	note C_, 2
+	C_ 2
 	rest 6
 	octave 2
-	note B_, 2
+	B_ 2
 	rest 6
-	note B_, 2
+	B_ 2
 	rest 6
-	note B_, 2
+	B_ 2
 	rest 6
-	note B_, 2
+	B_ 2
 	rest 6
 	octave 4
-	note E_, 2
+	E_ 2
 	rest 6
-	note E_, 2
+	E_ 2
 	rest 6
-	note D#, 2
+	D# 2
 	rest 6
-	note D#, 2
+	D# 2
 	rest 2
 	octave 2
-	note B_, 1
-	note A#, 1
-	note G#, 1
-	note F#, 1
-	note E_, 1
+	B_ 1
+	A# 1
+	G# 1
+	F# 1
+	E_ 1
 	notetype 6, 6, 0
-	note E_, 16
-	note E_, 11
+	E_ 16
+	E_ 11
 	notetype 6, 11, 3
-	note E_, 1
-	note F#, 1
-	note G#, 1
-	note A#, 1
+	E_ 1
+	F# 1
+	G# 1
+	A# 1
 	octave 3
-	note C_, 1
+	C_ 1
 	notetype 6, 3, 15
-	note C_, 16
+	C_ 16
 	notetype 6, 10, 0
-	note C_, 11
+	C_ 11
 	notetype 6, 9, 3
 	octave 2
-	note B_, 1
-	note A#, 1
-	note G#, 1
-	note F#, 1
-	note E_, 1
+	B_ 1
+	A# 1
+	G# 1
+	F# 1
+	E_ 1
 	notetype 6, 3, 15
-	note E_, 16
+	E_ 16
 	notetype 6, 9, 0
-	note E_, 11
+	E_ 11
 	notetype 6, 11, 3
-	note F_, 1
-	note G_, 1
-	note A#, 1
+	F_ 1
+	G_ 1
+	A# 1
 	octave 3
-	note C_, 1
-	note D_, 1
+	C_ 1
+	D_ 1
 	notetype 6, 3, 15
-	note D_, 16
+	D_ 16
 	notetype 6, 10, 7
-	note D_, 11
+	D_ 11
 	rest 4
 	rest 4
 	tempo 128
@@ -346,52 +346,52 @@
 	rest 4
 	notetype 6, 4, 3
 	octave 2
-	note B_, 2
+	B_ 2
 	rest 6
 	notetype 6, 6, 3
-	note B_, 2
+	B_ 2
 	rest 6
 	notetype 6, 8, 3
-	note B_, 2
+	B_ 2
 	rest 6
 	notetype 6, 5, 0
-	note B_, 8
+	B_ 8
 	notetype 6, 11, 3
-	note B_, 2
+	B_ 2
 	rest 6
-	note B_, 2
+	B_ 2
 	rest 6
-	note B_, 2
+	B_ 2
 	rest 6
-	note B_, 2
+	B_ 2
 	rest 2
 	loopchannel 0, Music_SilphCo_branch_7f26d
 
 Music_SilphCo_branch_7f3f0::
 	octave 2
-	note B_, 2
-	note A#, 2
-	note B_, 2
+	B_ 2
+	A# 2
+	B_ 2
 	octave 3
-	note C_, 2
+	C_ 2
 	octave 2
-	note B_, 2
-	note A#, 2
-	note B_, 2
+	B_ 2
+	A# 2
+	B_ 2
 	octave 3
-	note C_, 2
+	C_ 2
 	octave 2
-	note B_, 2
-	note A#, 2
-	note B_, 2
+	B_ 2
+	A# 2
+	B_ 2
 	octave 3
-	note C_, 2
+	C_ 2
 	octave 2
-	note B_, 2
-	note A#, 2
-	note B_, 2
+	B_ 2
+	A# 2
+	B_ 2
 	octave 3
-	note C_, 2
+	C_ 2
 	endchannel
 
 
@@ -400,382 +400,382 @@
 	duty 3
 	notetype 6, 12, 3
 	octave 3
-	note E_, 1
-	note F#, 1
-	note G#, 1
-	note A#, 1
+	E_ 1
+	F# 1
+	G# 1
+	A# 1
 	octave 4
-	note C_, 1
+	C_ 1
 	notetype 6, 11, 0
-	note C_, 12
+	C_ 12
 	notetype 6, 12, 3
-	note C_, 2
+	C_ 2
 	octave 3
-	note B_, 1
-	note A#, 1
-	note G#, 1
-	note F#, 1
-	note E_, 1
-	note E_, 2
+	B_ 1
+	A# 1
+	G# 1
+	F# 1
+	E_ 1
+	E_ 2
 	rest 2
 	octave 2
-	note G_, 2
+	G_ 2
 	rest 6
-	note F#, 2
+	F# 2
 	rest 6
-	note G_, 2
+	G_ 2
 	rest 6
-	note G#, 2
+	G# 2
 	rest 2
 
 Music_SilphCo_branch_7f42e::
-	note E_, 2
+	E_ 2
 	rest 2
-	note G_, 2
+	G_ 2
 	rest 6
-	note G_, 2
+	G_ 2
 	rest 6
-	note G_, 2
+	G_ 2
 	rest 6
-	note F#, 2
+	F# 2
 	rest 6
-	note G_, 2
+	G_ 2
 	rest 6
-	note G#, 2
+	G# 2
 	rest 2
-	note E_, 2
+	E_ 2
 	rest 2
-	note G#, 2
+	G# 2
 	rest 6
-	note G#, 2
+	G# 2
 	rest 6
-	note G#, 2
+	G# 2
 	rest 6
-	note G#, 2
+	G# 2
 	rest 6
-	note G#, 2
+	G# 2
 	rest 6
-	note G#, 2
+	G# 2
 	rest 2
 	notetype 6, 11, 7
 	duty 2
 	octave 4
-	note E_, 8
-	note D#, 8
-	note E_, 8
-	note F_, 8
-	note E_, 8
-	note D#, 8
-	note D_, 8
-	note D#, 8
-	note E_, 8
-	note F_, 8
-	note F#, 8
-	note G_, 8
-	note G#, 8
-	note D#, 8
-	note D_, 8
-	note D#, 8
+	E_ 8
+	D# 8
+	E_ 8
+	F_ 8
+	E_ 8
+	D# 8
+	D_ 8
+	D# 8
+	E_ 8
+	F_ 8
+	F# 8
+	G_ 8
+	G# 8
+	D# 8
+	D_ 8
+	D# 8
 	duty 3
 	notetype 6, 6, 15
-	note E_, 16
+	E_ 16
 	notetype 6, 12, 0
-	note B_, 16
+	B_ 16
 	notetype 6, 12, 4
 	octave 3
-	note E_, 4
-	note D#, 4
-	note E_, 4
-	note F_, 4
-	note E_, 4
-	note D#, 4
-	note D_, 4
-	note D#, 4
-	note E_, 4
-	note F_, 4
-	note F#, 4
-	note G_, 4
-	note G#, 4
-	note D#, 4
-	note D_, 4
-	note D#, 4
+	E_ 4
+	D# 4
+	E_ 4
+	F_ 4
+	E_ 4
+	D# 4
+	D_ 4
+	D# 4
+	E_ 4
+	F_ 4
+	F# 4
+	G_ 4
+	G# 4
+	D# 4
+	D_ 4
+	D# 4
 	notetype 6, 12, 2
 	duty 1
 	octave 4
-	note E_, 4
-	note D#, 4
-	note E_, 4
-	note F_, 4
-	note E_, 4
-	note D#, 4
-	note D_, 4
-	note D#, 4
-	note E_, 4
+	E_ 4
+	D# 4
+	E_ 4
+	F_ 4
+	E_ 4
+	D# 4
+	D_ 4
+	D# 4
+	E_ 4
 	notetype 6, 12, 4
 	duty 3
 	octave 3
-	note F_, 4
-	note F#, 4
-	note G_, 4
-	note G#, 4
-	note D#, 4
-	note D_, 4
-	note D#, 4
-	note E_, 4
-	note D#, 4
-	note E_, 4
+	F_ 4
+	F# 4
+	G_ 4
+	G# 4
+	D# 4
+	D_ 4
+	D# 4
+	E_ 4
+	D# 4
+	E_ 4
 	notetype 6, 12, 0
-	note F_, 8
+	F_ 8
 	notetype 6, 11, 7
-	note F_, 8
+	F_ 8
 	notetype 6, 8, 10
-	note F_, 4
+	F_ 4
 	notetype 6, 12, 4
 	duty 3
-	note F_, 4
-	note E_, 4
-	note F_, 4
+	F_ 4
+	E_ 4
+	F_ 4
 	notetype 6, 10, 0
-	note F#, 8
+	F# 8
 	notetype 6, 11, 0
-	note F#, 8
+	F# 8
 	notetype 6, 9, 9
-	note F#, 4
+	F# 4
 	notetype 6, 12, 4
-	note F#, 4
-	note F_, 4
-	note F#, 4
+	F# 4
+	F_ 4
+	F# 4
 	notetype 6, 9, 0
-	note G_, 12
+	G_ 12
 	notetype 6, 5, 9
-	note G_, 8
+	G_ 8
 	notetype 6, 12, 4
-	note G_, 4
-	note F#, 4
-	note G_, 4
-	note F#, 4
-	note F_, 4
-	note F#, 4
-	note F_, 4
-	note E_, 4
-	note F_, 4
-	note E_, 4
-	note D#, 4
-	note D_, 4
-	note C#, 4
-	note D_, 4
-	note D#, 4
-	note D_, 4
+	G_ 4
+	F# 4
+	G_ 4
+	F# 4
+	F_ 4
+	F# 4
+	F_ 4
+	E_ 4
+	F_ 4
+	E_ 4
+	D# 4
+	D_ 4
+	C# 4
+	D_ 4
+	D# 4
+	D_ 4
 	notetype 6, 12, 2
 	duty 1
-	note F_, 4
-	note F#, 4
-	note G_, 4
-	note G#, 4
-	note A_, 4
+	F_ 4
+	F# 4
+	G_ 4
+	G# 4
+	A_ 4
 	notetype 6, 11, 4
 	duty 3
-	note D#, 4
-	note D_, 4
-	note D#, 4
+	D# 4
+	D_ 4
+	D# 4
 	notetype 6, 12, 2
 	duty 1
-	note F_, 4
-	note F#, 4
-	note G_, 4
-	note G#, 4
-	note A#, 4
+	F_ 4
+	F# 4
+	G_ 4
+	G# 4
+	A# 4
 	notetype 6, 11, 4
 	duty 3
-	note D#, 4
-	note D_, 4
-	note D#, 4
+	D# 4
+	D_ 4
+	D# 4
 	notetype 6, 12, 2
 	duty 1
-	note F_, 4
-	note F#, 4
-	note G_, 4
-	note G#, 4
-	note B_, 4
+	F_ 4
+	F# 4
+	G_ 4
+	G# 4
+	B_ 4
 	notetype 6, 11, 4
 	duty 3
-	note D#, 4
-	note D_, 4
-	note D#, 4
+	D# 4
+	D_ 4
+	D# 4
 	notetype 6, 12, 2
 	duty 1
-	note F_, 4
-	note F#, 4
-	note G_, 4
-	note G#, 4
+	F_ 4
+	F# 4
+	G_ 4
+	G# 4
 	octave 4
-	note C_, 4
+	C_ 4
 	notetype 6, 11, 4
 	duty 3
 	octave 3
-	note D#, 4
-	note D_, 4
-	note D#, 4
+	D# 4
+	D_ 4
+	D# 4
 	rest 4
-	note G_, 2
+	G_ 2
 	rest 6
-	note G_, 2
+	G_ 2
 	rest 6
-	note G_, 2
+	G_ 2
 	rest 6
-	note G_, 2
+	G_ 2
 	rest 2
 	duty 0
 	octave 4
-	note E_, 2
+	E_ 2
 	rest 2
-	note G#, 2
+	G# 2
 	rest 6
-	note G#, 2
+	G# 2
 	rest 6
-	note G#, 2
+	G# 2
 	rest 6
-	note G#, 2
+	G# 2
 	rest 6
 	duty 3
 	octave 3
-	note G_, 2
+	G_ 2
 	rest 6
-	note G_, 2
+	G_ 2
 	rest 6
-	note G_, 2
+	G_ 2
 	rest 6
-	note G_, 2
+	G_ 2
 	rest 2
 	duty 0
 	octave 4
-	note E_, 2
+	E_ 2
 	rest 2
-	note B_, 2
+	B_ 2
 	rest 6
-	note B_, 2
+	B_ 2
 	rest 6
-	note B_, 2
+	B_ 2
 	rest 6
-	note B_, 2
+	B_ 2
 	rest 2
 	duty 3
 	octave 3
-	note G_, 2
+	G_ 2
 	rest 2
-	note G_, 2
+	G_ 2
 	rest 2
-	note B_, 2
+	B_ 2
 	rest 2
-	note G_, 2
+	G_ 2
 	rest 2
-	note B_, 2
+	B_ 2
 	rest 2
-	note G_, 2
+	G_ 2
 	rest 2
-	note B_, 2
+	B_ 2
 	rest 2
-	note G_, 2
+	G_ 2
 	rest 2
 	octave 4
-	note C_, 2
+	C_ 2
 	rest 2
 	octave 3
-	note G_, 2
+	G_ 2
 	rest 2
 	octave 4
-	note C_, 2
+	C_ 2
 	rest 2
 	octave 3
-	note G_, 2
+	G_ 2
 	rest 2
 	octave 4
-	note C_, 2
+	C_ 2
 	rest 2
 	octave 3
-	note G_, 2
+	G_ 2
 	rest 2
 	octave 4
-	note C_, 2
+	C_ 2
 	rest 2
 	octave 3
-	note G_, 2
+	G_ 2
 	rest 2
-	note B_, 2
+	B_ 2
 	rest 2
-	note G_, 2
+	G_ 2
 	rest 2
-	note B_, 2
+	B_ 2
 	rest 2
-	note G_, 2
+	G_ 2
 	rest 2
-	note B_, 2
+	B_ 2
 	rest 2
-	note G_, 2
+	G_ 2
 	rest 2
-	note E_, 2
+	E_ 2
 	rest 2
-	note G_, 2
+	G_ 2
 	rest 2
 	octave 4
-	note C_, 2
+	C_ 2
 	rest 2
 	octave 3
-	note G_, 2
+	G_ 2
 	rest 2
-	note E_, 2
+	E_ 2
 	rest 2
-	note G_, 2
+	G_ 2
 	rest 2
-	note B_, 2
+	B_ 2
 	rest 2
-	note G_, 2
+	G_ 2
 	rest 2
 	octave 4
-	note C_, 2
+	C_ 2
 	rest 2
 	octave 3
-	note G_, 2
+	G_ 2
 	rest 2
 	notetype 6, 8, 7
 	octave 5
-	note E_, 4
-	note D#, 4
-	note E_, 4
-	note F_, 4
-	note E_, 4
-	note D#, 4
-	note D_, 4
-	note D#, 4
-	note E_, 4
-	note F_, 4
-	note F#, 4
-	note G_, 4
-	note G#, 4
-	note D#, 4
-	note D_, 4
-	note D#, 4
+	E_ 4
+	D# 4
+	E_ 4
+	F_ 4
+	E_ 4
+	D# 4
+	D_ 4
+	D# 4
+	E_ 4
+	F_ 4
+	F# 4
+	G_ 4
+	G# 4
+	D# 4
+	D_ 4
+	D# 4
 	rest 4
 	notetype 6, 4, 3
 	octave 2
-	note G_, 2
+	G_ 2
 	rest 6
 	notetype 6, 6, 3
-	note F#, 2
+	F# 2
 	rest 6
 	notetype 6, 8, 3
-	note G_, 2
+	G_ 2
 	rest 6
 	notetype 6, 4, 15
-	note G#, 8
+	G# 8
 	notetype 6, 11, 4
-	note G_, 2
+	G_ 2
 	rest 6
-	note F#, 2
+	F# 2
 	rest 6
-	note G_, 2
+	G_ 2
 	rest 6
-	note G#, 2
+	G# 2
 	rest 2
 	loopchannel 0, Music_SilphCo_branch_7f42e
 
@@ -785,191 +785,191 @@
 	notetype 12, 1, 1
 	rest 12
 	octave 5
-	note E_, 4
-	note D#, 4
-	note E_, 4
-	note F_, 4
+	E_ 4
+	D# 4
+	E_ 4
+	F_ 4
 
 Music_SilphCo_branch_7f5c9::
-	note E_, 4
-	note D#, 4
-	note D_, 4
-	note D#, 4
-	note E_, 4
-	note F_, 4
-	note F#, 4
-	note G_, 4
-	note G#, 4
-	note D#, 4
-	note D_, 4
-	note D#, 4
-	note E_, 1
+	E_ 4
+	D# 4
+	D_ 4
+	D# 4
+	E_ 4
+	F_ 4
+	F# 4
+	G_ 4
+	G# 4
+	D# 4
+	D_ 4
+	D# 4
+	E_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 3
-	note F#, 1
+	F# 1
 	rest 3
-	note G_, 1
+	G_ 1
 	rest 3
-	note G#, 1
+	G# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 3
-	note G#, 1
+	G# 1
 	rest 3
-	note G_, 1
+	G_ 1
 	rest 3
-	note F#, 1
+	F# 1
 	rest 3
-	note G_, 1
+	G_ 1
 	rest 3
-	note G#, 1
+	G# 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 3
-	note G#, 1
+	G# 1
 	rest 3
-	note G_, 1
+	G_ 1
 	rest 3
-	note G#, 1
+	G# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 3
-	note G_, 1
+	G_ 1
 	rest 3
-	note G_, 1
+	G_ 1
 	rest 3
-	note G_, 1
+	G_ 1
 	rest 3
-	note G_, 1
+	G_ 1
 	rest 3
-	note G_, 1
+	G_ 1
 	rest 1
 	octave 4
-	note E_, 1
+	E_ 1
 	rest 5
-	note F_, 1
+	F_ 1
 	rest 5
-	note F_, 1
+	F_ 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 11
-	note D#, 1
+	D# 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 5
-	note F_, 1
+	F_ 1
 	rest 5
-	note F_, 1
+	F_ 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 11
-	note D#, 1
+	D# 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 3
-	note F_, 1
+	F_ 1
 	rest 3
-	note F_, 1
+	F_ 1
 	rest 3
-	note F_, 1
+	F_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 3
-	note F#, 1
+	F# 1
 	rest 3
-	note F#, 1
+	F# 1
 	rest 3
-	note F#, 1
+	F# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 3
-	note G_, 1
+	G_ 1
 	rest 3
-	note G_, 1
+	G_ 1
 	rest 3
-	note G_, 1
+	G_ 1
 	rest 3
-	note G_, 1
+	G_ 1
 	rest 3
-	note F#, 1
+	F# 1
 	rest 3
-	note F_, 1
+	F_ 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 3
-	note F_, 1
+	F_ 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 3
-	note D#, 1
+	D# 1
 	rest 3
-	note D_, 1
+	D_ 1
 	rest 1
-	note D_, 8
-	note F_, 8
-	note D_, 8
-	note F#, 8
-	note D_, 8
-	note G_, 8
-	note D_, 8
-	note A_, 8
-	note E_, 4
-	note D#, 4
-	note E_, 4
-	note F_, 4
+	D_ 8
+	F_ 8
+	D_ 8
+	F# 8
+	D_ 8
+	G_ 8
+	D_ 8
+	A_ 8
+	E_ 4
+	D# 4
+	E_ 4
+	F_ 4
 	octave 5
-	note E_, 2
-	note D#, 2
-	note E_, 2
-	note F_, 2
-	note E_, 2
-	note D#, 2
-	note D_, 2
-	note D#, 2
+	E_ 2
+	D# 2
+	E_ 2
+	F_ 2
+	E_ 2
+	D# 2
+	D_ 2
+	D# 2
 	octave 4
-	note E_, 4
-	note D#, 4
-	note E_, 4
-	note F_, 4
+	E_ 4
+	D# 4
+	E_ 4
+	F_ 4
 	octave 5
-	note E_, 2
-	note F_, 2
-	note F#, 2
-	note G_, 2
-	note G#, 2
-	note D#, 2
-	note D_, 2
-	note D#, 2
+	E_ 2
+	F_ 2
+	F# 2
+	G_ 2
+	G# 2
+	D# 2
+	D_ 2
+	D# 2
 	octave 6
-	note E_, 4
-	note D#, 4
-	note E_, 4
-	note F_, 4
-	note E_, 4
-	note D#, 4
-	note D_, 4
-	note D#, 4
-	note E_, 4
-	note F_, 4
-	note F#, 4
-	note G_, 4
-	note G#, 4
-	note D#, 4
-	note D_, 4
-	note D#, 4
+	E_ 4
+	D# 4
+	E_ 4
+	F_ 4
+	E_ 4
+	D# 4
+	D_ 4
+	D# 4
+	E_ 4
+	F_ 4
+	F# 4
+	G_ 4
+	G# 4
+	D# 4
+	D_ 4
+	D# 4
 	notetype 6, 1, 1
 	rest 4
 	rest 4
@@ -993,9 +993,9 @@
 	rest 4
 	rest 4
 	octave 5
-	note E_, 4
-	note D#, 4
-	note E_, 4
-	note F_, 4
+	E_ 4
+	D# 4
+	E_ 4
+	F_ 4
 	loopchannel 0, Music_SilphCo_branch_7f5c9
-; 0x7f69d
\ No newline at end of file
+; 0x7f69d
--- a/audio/music/ssanne.asm
+++ b/audio/music/ssanne.asm
@@ -9,101 +9,101 @@
 	notetype 12, 10, 4
 	rest 12
 	octave 3
-	note E_, 2
-	note F#, 2
-	note E_, 4
-	note D_, 4
-	note C#, 2
-	note D_, 2
-	note E_, 2
+	E_ 2
+	F# 2
+	E_ 4
+	D_ 4
+	C# 2
+	D_ 2
+	E_ 2
 	rest 2
-	note E_, 4
-	note F#, 2
-	note D_, 2
-	note E_, 4
-	note F#, 4
-	note G#, 4
+	E_ 4
+	F# 2
+	D_ 2
+	E_ 4
+	F# 4
+	G# 4
 	rest 4
-	note E_, 4
-	note G#, 4
+	E_ 4
+	G# 4
 	rest 4
-	note C#, 2
-	note E_, 2
-	note F#, 4
-	note D_, 4
-	note E_, 4
-	note D_, 4
-	note C#, 2
-	note D_, 2
-	note E_, 2
+	C# 2
+	E_ 2
+	F# 4
+	D_ 4
+	E_ 4
+	D_ 4
+	C# 2
+	D_ 2
+	E_ 2
 	rest 2
-	note E_, 4
-	note F#, 2
-	note D_, 2
-	note E_, 4
-	note F#, 4
-	note G#, 4
-	note F#, 4
-	note E_, 4
-	note F#, 4
+	E_ 4
+	F# 2
+	D_ 2
+	E_ 4
+	F# 4
+	G# 4
+	F# 4
+	E_ 4
+	F# 4
 	rest 4
-	note C#, 2
-	note E_, 2
-	note F#, 4
-	note D_, 4
-	note E_, 4
-	note D_, 4
-	note C#, 2
-	note D_, 2
-	note E_, 2
+	C# 2
+	E_ 2
+	F# 4
+	D_ 4
+	E_ 4
+	D_ 4
+	C# 2
+	D_ 2
+	E_ 2
 	rest 2
-	note E_, 4
-	note F#, 2
-	note D_, 2
-	note E_, 4
-	note F#, 4
-	note G#, 4
-	note F#, 8
-	note G#, 4
-	note E_, 4
+	E_ 4
+	F# 2
+	D_ 2
+	E_ 4
+	F# 4
+	G# 4
+	F# 8
+	G# 4
+	E_ 4
 	rest 4
-	note E_, 4
-	note F#, 2
-	note E_, 2
-	note D_, 4
+	E_ 4
+	F# 2
+	E_ 2
+	D_ 4
 	rest 4
-	note D_, 4
-	note E_, 4
-	note C#, 4
+	D_ 4
+	E_ 4
+	C# 4
 	rest 4
-	note C#, 4
-	note D_, 2
-	note C#, 2
+	C# 4
+	D_ 2
+	C# 2
 	octave 2
-	note B_, 4
-	note E_, 4
-	note B_, 4
+	B_ 4
+	E_ 4
+	B_ 4
 	octave 3
-	note D_, 2
+	D_ 2
 	octave 2
-	note B_, 2
-	note A_, 4
+	B_ 2
+	A_ 4
 	rest 4
-	note A_, 4
-	note B_, 2
-	note A_, 2
-	note G#, 4
+	A_ 4
+	B_ 2
+	A_ 2
+	G# 4
 	rest 4
-	note C#, 4
-	note G#, 4
-	note A_, 4
+	C# 4
+	G# 4
+	A_ 4
 	rest 4
-	note A_, 4
-	note B_, 4
-	note B_, 4
+	A_ 4
+	B_ 4
+	B_ 4
 	rest 4
 	octave 3
-	note D_, 8
+	D_ 8
 	loopchannel 0, Music_SSAnne_branch_b3b2
 
 
@@ -114,171 +114,171 @@
 Music_SSAnne_branch_b41e::
 	notetype 12, 12, 5
 	octave 3
-	note A_, 2
-	note E_, 2
-	note A_, 4
-	note B_, 4
+	A_ 2
+	E_ 2
+	A_ 4
+	B_ 4
 	octave 4
-	note D_, 4
+	D_ 4
 	notetype 8, 12, 5
-	note C#, 2
-	note D_, 2
-	note C#, 2
+	C# 2
+	D_ 2
+	C# 2
 	octave 3
-	note B_, 3
-	note A_, 3
-	note B_, 6
-	note G#, 6
-	note A_, 3
-	note B_, 3
+	B_ 3
+	A_ 3
+	B_ 6
+	G# 6
+	A_ 3
+	B_ 3
 	octave 4
-	note C#, 6
-	note D_, 6
-	note C#, 3
+	C# 6
+	D_ 6
+	C# 3
 	octave 3
-	note B_, 3
+	B_ 3
 	octave 4
-	note E_, 6
-	note D_, 3
-	note C#, 3
+	E_ 6
+	D_ 3
+	C# 3
 	octave 3
-	note B_, 6
+	B_ 6
 	octave 4
-	note C#, 3
+	C# 3
 	octave 3
-	note B_, 3
-	note A_, 3
-	note E_, 3
-	note A_, 6
-	note B_, 6
+	B_ 3
+	A_ 3
+	E_ 3
+	A_ 6
+	B_ 6
 	octave 4
-	note D_, 6
-	note C#, 2
-	note D_, 2
-	note C#, 2
+	D_ 6
+	C# 2
+	D_ 2
+	C# 2
 	octave 3
-	note B_, 3
-	note A_, 3
-	note B_, 6
-	note G#, 6
-	note A_, 3
-	note B_, 3
+	B_ 3
+	A_ 3
+	B_ 6
+	G# 6
+	A_ 3
+	B_ 3
 	octave 4
-	note C#, 6
-	note D_, 6
-	note C#, 3
+	C# 6
+	D_ 6
+	C# 3
 	octave 3
-	note B_, 3
+	B_ 3
 	octave 4
-	note E_, 6
-	note D_, 3
-	note C#, 3
+	E_ 6
+	D_ 3
+	C# 3
 	octave 3
-	note B_, 12
-	note A_, 3
-	note E_, 3
-	note A_, 6
-	note B_, 6
+	B_ 12
+	A_ 3
+	E_ 3
+	A_ 6
+	B_ 6
 	octave 4
-	note D_, 6
-	note C#, 2
-	note D_, 2
-	note C#, 2
+	D_ 6
+	C# 2
+	D_ 2
+	C# 2
 	octave 3
-	note B_, 3
-	note A_, 3
-	note B_, 6
-	note G#, 6
-	note A_, 3
-	note B_, 3
+	B_ 3
+	A_ 3
+	B_ 6
+	G# 6
+	A_ 3
+	B_ 3
 	octave 4
-	note C#, 6
-	note D_, 6
-	note C#, 3
+	C# 6
+	D_ 6
+	C# 3
 	octave 3
-	note B_, 3
+	B_ 3
 	octave 4
-	note E_, 6
-	note D_, 3
-	note C#, 3
+	E_ 6
+	D_ 3
+	C# 3
 	octave 3
-	note B_, 12
+	B_ 12
 	rest 3
 	octave 4
-	note C#, 3
+	C# 3
 	octave 3
-	note B_, 3
+	B_ 3
 	octave 4
-	note C#, 3
-	note C#, 3
-	note D_, 3
-	note C#, 3
-	note D_, 3
-	note E_, 3
+	C# 3
+	C# 3
+	D_ 3
+	C# 3
+	D_ 3
+	E_ 3
 	octave 3
-	note B_, 3
-	note G#, 3
-	note F#, 3
-	note E_, 3
-	note F#, 3
-	note G#, 3
-	note B_, 3
+	B_ 3
+	G# 3
+	F# 3
+	E_ 3
+	F# 3
+	G# 3
+	B_ 3
 	rest 3
-	note A_, 3
-	note G#, 3
-	note A_, 3
-	note A_, 3
-	note B_, 3
-	note A_, 3
-	note B_, 3
+	A_ 3
+	G# 3
+	A_ 3
+	A_ 3
+	B_ 3
+	A_ 3
+	B_ 3
 	octave 4
-	note C#, 3
+	C# 3
 	octave 3
-	note G#, 3
-	note F#, 3
-	note E_, 3
-	note E_, 3
-	note F#, 3
-	note G#, 3
-	note B_, 3
+	G# 3
+	F# 3
+	E_ 3
+	E_ 3
+	F# 3
+	G# 3
+	B_ 3
 	rest 3
-	note F#, 3
-	note E_, 3
-	note F#, 3
-	note F#, 3
-	note G#, 3
-	note F#, 3
-	note G#, 3
-	note A_, 3
-	note E_, 3
-	note C#, 3
+	F# 3
+	E_ 3
+	F# 3
+	F# 3
+	G# 3
+	F# 3
+	G# 3
+	A_ 3
+	E_ 3
+	C# 3
 	octave 2
-	note B_, 3
-	note A_, 3
-	note B_, 3
+	B_ 3
+	A_ 3
+	B_ 3
 	octave 3
-	note C#, 3
-	note E_, 3
+	C# 3
+	E_ 3
 	rest 3
-	note F#, 3
-	note E_, 3
-	note F#, 3
-	note F#, 3
-	note G#, 3
-	note A_, 3
-	note B_, 3
+	F# 3
+	E_ 3
+	F# 3
+	F# 3
+	G# 3
+	A_ 3
+	B_ 3
 	octave 4
-	note C#, 3
-	note D_, 3
-	note C#, 3
+	C# 3
+	D_ 3
+	C# 3
 	octave 3
-	note B_, 3
+	B_ 3
 	octave 4
-	note E_, 3
-	note D_, 3
-	note C#, 3
+	E_ 3
+	D_ 3
+	C# 3
 	octave 3
-	note B_, 3
+	B_ 3
 	loopchannel 0, Music_SSAnne_branch_b41e
 
 
@@ -287,53 +287,53 @@
 	rest 16
 	rest 12
 	octave 4
-	note B_, 2
-	note G#, 2
-	note A_, 8
-	note F#, 8
-	note G#, 4
+	B_ 2
+	G# 2
+	A_ 8
+	F# 8
+	G# 4
 	rest 4
-	note B_, 8
-	note A_, 8
-	note B_, 8
-	note A_, 8
-	note G#, 8
-	note A_, 8
-	note F#, 8
-	note G#, 8
-	note B_, 8
-	note A_, 4
-	note E_, 4
-	note B_, 4
-	note E_, 4
-	note A_, 4
-	note E_, 4
-	note G#, 4
-	note E_, 4
-	note A_, 4
-	note E_, 4
-	note F#, 4
-	note G_, 4
-	note G#, 4
-	note A_, 4
+	B_ 8
+	A_ 8
+	B_ 8
+	A_ 8
+	G# 8
+	A_ 8
+	F# 8
+	G# 8
+	B_ 8
+	A_ 4
+	E_ 4
+	B_ 4
+	E_ 4
+	A_ 4
+	E_ 4
+	G# 4
+	E_ 4
+	A_ 4
+	E_ 4
+	F# 4
+	G_ 4
+	G# 4
+	A_ 4
 	octave 5
-	note D_, 8
-	note C#, 8
-	note C#, 8
+	D_ 8
+	C# 8
+	C# 8
 	octave 4
-	note B_, 8
-	note B_, 8
-	note A_, 8
-	note A_, 8
-	note G#, 8
-	note G#, 8
-	note F#, 8
-	note F#, 8
-	note E_, 8
-	note E_, 8
-	note F#, 8
-	note F#, 8
-	note G#, 8
-	note B_, 8
+	B_ 8
+	B_ 8
+	A_ 8
+	A_ 8
+	G# 8
+	G# 8
+	F# 8
+	F# 8
+	E_ 8
+	E_ 8
+	F# 8
+	F# 8
+	G# 8
+	B_ 8
 	loopchannel 0, Music_SSAnne_Ch3
-; 0xb504
\ No newline at end of file
+; 0xb504
--- a/audio/music/surfing.asm
+++ b/audio/music/surfing.asm
@@ -7,112 +7,112 @@
 	notetype 12, 11, 5
 	rest 6
 	octave 2
-	note A_, 2
-	note G#, 3
-	note F#, 1
-	note E_, 6
+	A_ 2
+	G# 3
+	F# 1
+	E_ 6
 	octave 3
-	note G#, 2
-	note F#, 2
-	note G#, 4
+	G# 2
+	F# 2
+	G# 4
 
 Music_Surfing_branch_7fa30::
 	notetype 12, 11, 2
-	note E_, 2
-	note E_, 4
-	note E_, 2
-	note E_, 4
-	note D_, 2
-	note D_, 4
-	note D_, 2
-	note D_, 4
-	note D_, 2
-	note D_, 4
+	E_ 2
+	E_ 4
+	E_ 2
+	E_ 4
+	D_ 2
+	D_ 4
+	D_ 2
+	D_ 4
+	D_ 2
+	D_ 4
 	notetype 12, 11, 1
-	note F#, 3
+	F# 3
 	notetype 12, 11, 2
-	note D_, 3
-	note E_, 2
-	note E_, 4
-	note E_, 2
-	note E_, 4
-	note A_, 2
-	note A_, 4
-	note G#, 2
-	note G#, 4
-	note F#, 2
-	note F#, 4
-	note E_, 2
-	note E_, 4
-	note G#, 2
-	note G#, 4
+	D_ 3
+	E_ 2
+	E_ 4
+	E_ 2
+	E_ 4
+	A_ 2
+	A_ 4
+	G# 2
+	G# 4
+	F# 2
+	F# 4
+	E_ 2
+	E_ 4
+	G# 2
+	G# 4
 	notetype 12, 11, 1
-	note F#, 3
+	F# 3
 	notetype 12, 11, 2
-	note G#, 1
+	G# 1
 	notetype 12, 11, 4
-	note A_, 2
-	note B_, 2
+	A_ 2
+	B_ 2
 	octave 4
-	note C_, 2
+	C_ 2
 	notetype 12, 11, 7
-	note C#, 6
+	C# 6
 	notetype 12, 11, 3
-	note D_, 2
-	note C#, 2
+	D_ 2
+	C# 2
 	octave 3
-	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 G#, 2
-	note F#, 2
-	note G#, 2
-	note F#, 2
-	note E_, 2
-	note G#, 2
-	note F#, 2
-	note G#, 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note G#, 2
-	note A_, 2
-	note B_, 2
+	B_ 2
+	A_ 2
+	G# 2
+	F# 2
+	E_ 2
+	F# 2
+	G# 2
+	A_ 2
+	G# 2
+	F# 2
+	G# 2
+	F# 2
+	E_ 2
+	G# 2
+	F# 2
+	G# 2
+	A_ 2
+	G# 2
+	F# 2
+	G# 2
+	A_ 2
+	B_ 2
 	octave 4
-	note D_, 2
-	note C#, 2
+	D_ 2
+	C# 2
 	octave 3
-	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 G#, 2
-	note A_, 2
-	note E_, 2
-	note G#, 2
-	note B_, 2
+	B_ 2
+	A_ 2
+	G# 2
+	F# 2
+	E_ 2
+	F# 2
+	G# 2
+	A_ 2
+	G# 2
+	A_ 2
+	E_ 2
+	G# 2
+	B_ 2
 	octave 4
-	note D_, 2
-	note C#, 2
+	D_ 2
+	C# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note C#, 2
+	C# 2
 	octave 3
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note E_, 4
+	B_ 2
+	A_ 2
+	G# 2
+	F# 2
+	E_ 4
 	loopchannel 0, Music_Surfing_branch_7fa30
 
 
@@ -121,85 +121,85 @@
 	vibrato 16, 2, 5
 	notetype 12, 12, 6
 	octave 3
-	note A_, 2
-	note G#, 3
-	note F#, 1
-	note E_, 6
-	note G#, 6
+	A_ 2
+	G# 3
+	F# 1
+	E_ 6
+	G# 6
 	octave 4
-	note E_, 2
-	note D_, 2
+	E_ 2
+	D_ 2
 	octave 3
-	note B_, 2
+	B_ 2
 
 Music_Surfing_branch_7faae::
 	notetype 12, 12, 6
 	octave 4
-	note E_, 6
-	note C#, 5
-	note E_, 1
-	note D_, 6
+	E_ 6
+	C# 5
+	E_ 1
+	D_ 6
 	octave 3
-	note B_, 6
+	B_ 6
 	octave 4
-	note D_, 6
+	D_ 6
 	octave 3
-	note B_, 2
+	B_ 2
 	notetype 12, 12, 1
 	octave 4
-	note F#, 3
+	F# 3
 	notetype 12, 12, 6
-	note D_, 1
-	note E_, 6
-	note C#, 6
-	note E_, 6
-	note C#, 5
-	note E_, 1
-	note F#, 6
-	note D_, 6
-	note F#, 6
-	note E_, 2
+	D_ 1
+	E_ 6
+	C# 6
+	E_ 6
+	C# 5
+	E_ 1
+	F# 6
+	D_ 6
+	F# 6
+	E_ 2
 	notetype 12, 12, 1
-	note F#, 3
+	F# 3
 	notetype 12, 12, 6
-	note E_, 1
-	note A_, 6
-	note A_, 6
-	note B_, 2
-	note A_, 3
-	note D_, 1
-	note F#, 6
-	note E_, 2
-	note F#, 3
-	note E_, 1
-	note C#, 6
-	note D_, 2
-	note C#, 3
+	E_ 1
+	A_ 6
+	A_ 6
+	B_ 2
+	A_ 3
+	D_ 1
+	F# 6
+	E_ 2
+	F# 3
+	E_ 1
+	C# 6
+	D_ 2
+	C# 3
 	octave 3
-	note B_, 1
+	B_ 1
 	octave 4
-	note F#, 6
-	note E_, 2
-	note D#, 3
-	note E_, 1
-	note A_, 6
-	note B_, 2
-	note A_, 3
-	note D_, 1
-	note F#, 6
-	note E_, 2
-	note F#, 3
-	note G#, 1
-	note A_, 6
-	note G#, 2
-	note F#, 3
-	note E_, 1
-	note G#, 6
-	note A_, 2
-	note G#, 3
-	note A_, 1
+	F# 6
+	E_ 2
+	D# 3
+	E_ 1
+	A_ 6
+	B_ 2
+	A_ 3
+	D_ 1
+	F# 6
+	E_ 2
+	F# 3
+	G# 1
+	A_ 6
+	G# 2
+	F# 3
+	E_ 1
+	G# 6
+	A_ 2
+	G# 3
+	A_ 1
 	octave 5
-	note C#, 6
+	C# 6
 	loopchannel 0, Music_Surfing_branch_7faae
 
 
@@ -207,130 +207,130 @@
 	notetype 12, 1, 0
 	rest 12
 	octave 5
-	note E_, 6
+	E_ 6
 	octave 4
-	note E_, 2
-	note F#, 2
-	note G#, 2
+	E_ 2
+	F# 2
+	G# 2
 
 Music_Surfing_branch_7fb03::
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note A_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note A_, 2
+	A_ 2
+	A_ 2
+	E_ 2
+	A_ 2
+	A_ 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note G#, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
-	note G#, 2
+	G# 2
+	G# 2
+	E_ 2
+	G# 2
+	G# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note G#, 2
-	note G#, 2
-	note E_, 2
-	note G#, 1
+	G# 2
+	G# 2
+	E_ 2
+	G# 1
 	rest 2
-	note E_, 1
-	note C#, 2
-	note A_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note A_, 2
-	note C#, 2
-	note A_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note A_, 2
+	E_ 1
+	C# 2
+	A_ 2
+	A_ 2
+	E_ 2
+	A_ 2
+	A_ 2
+	C# 2
+	A_ 2
+	A_ 2
+	E_ 2
+	A_ 2
+	A_ 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note G#, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
-	note G#, 2
+	G# 2
+	G# 2
+	E_ 2
+	G# 2
+	G# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note G#, 2
-	note G#, 2
-	note E_, 2
-	note G#, 1
+	G# 2
+	G# 2
+	E_ 2
+	G# 1
 	rest 2
-	note E_, 1
-	note C#, 2
-	note A_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note A_, 2
-	note D_, 2
-	note F#, 2
-	note F#, 2
+	E_ 1
+	C# 2
+	A_ 2
+	A_ 2
+	E_ 2
+	A_ 2
+	A_ 2
+	D_ 2
+	F# 2
+	F# 2
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note F#, 2
-	note F#, 2
-	note E_, 2
-	note A_, 2
-	note A_, 2
-	note C#, 2
-	note A_, 2
-	note A_, 2
-	note E_, 2
-	note G#, 2
-	note G#, 2
+	F# 2
+	F# 2
+	E_ 2
+	A_ 2
+	A_ 2
+	C# 2
+	A_ 2
+	A_ 2
+	E_ 2
+	G# 2
+	G# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note G#, 2
-	note G#, 2
-	note E_, 2
-	note A_, 2
-	note A_, 2
+	G# 2
+	G# 2
+	E_ 2
+	A_ 2
+	A_ 2
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note A_, 2
-	note A_, 2
-	note D_, 2
-	note F#, 2
-	note F#, 2
+	A_ 2
+	A_ 2
+	D_ 2
+	F# 2
+	F# 2
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note F#, 2
-	note F#, 2
-	note E_, 2
-	note A_, 2
-	note A_, 2
-	note C#, 2
-	note A_, 2
-	note A_, 2
-	note E_, 2
-	note G#, 2
-	note G#, 2
+	F# 2
+	F# 2
+	E_ 2
+	A_ 2
+	A_ 2
+	C# 2
+	A_ 2
+	A_ 2
+	E_ 2
+	G# 2
+	G# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note G#, 2
-	note G#, 2
-	note E_, 2
-	note A_, 2
-	note A_, 2
-	note C#, 2
-	note D_, 2
-	note E_, 2
+	G# 2
+	G# 2
+	E_ 2
+	A_ 2
+	A_ 2
+	C# 2
+	D_ 2
+	E_ 2
 	loopchannel 0, Music_Surfing_branch_7fb03
-; 0x7fb7d
\ No newline at end of file
+; 0x7fb7d
--- a/audio/music/titlescreen.asm
+++ b/audio/music/titlescreen.asm
@@ -5,26 +5,26 @@
 	duty 3
 	notetype 12, 12, 1
 	octave 2
-	note E_, 1
-	note G_, 1
-	note B_, 1
+	E_ 1
+	G_ 1
+	B_ 1
 	octave 3
-	note D_, 1
+	D_ 1
 	octave 2
-	note G_, 4
-	note G_, 6
-	note G_, 1
-	note G_, 1
-	note G_, 4
-	note G_, 4
-	note G_, 4
+	G_ 4
+	G_ 6
+	G_ 1
+	G_ 1
+	G_ 4
+	G_ 4
+	G_ 4
 	notetype 8, 12, 1
-	note A_, 2
-	note A_, 2
-	note A_, 2
-	note A_, 2
-	note A_, 2
-	note F#, 2
+	A_ 2
+	A_ 2
+	A_ 2
+	A_ 2
+	A_ 2
+	F# 2
 
 Music_TitleScreen_branch_7e4e2::
 	callchannel Music_TitleScreen_branch_7e541
@@ -31,126 +31,126 @@
 	callchannel Music_TitleScreen_branch_7e54a
 	callchannel Music_TitleScreen_branch_7e541
 	octave 3
-	note C_, 8
+	C_ 8
 	notetype 8, 12, 6
-	note E_, 4
-	note E_, 4
-	note C_, 4
+	E_ 4
+	E_ 4
+	C_ 4
 	notetype 12, 12, 6
 	octave 2
-	note B_, 8
+	B_ 8
 	notetype 8, 14, 7
 	octave 3
-	note F_, 4
-	note E_, 4
-	note C_, 4
+	F_ 4
+	E_ 4
+	C_ 4
 	notetype 12, 14, 7
-	note D_, 10
+	D_ 10
 	notetype 12, 12, 6
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note C_, 2
-	note D_, 2
+	C_ 2
+	D_ 2
 	callchannel Music_TitleScreen_branch_7e541
 	callchannel Music_TitleScreen_branch_7e54a
 	callchannel 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
+	C_ 6
+	C_ 6
+	E_ 4
+	D_ 6
+	F_ 2
+	G_ 2
+	D_ 4
+	G_ 2
+	G_ 6
+	A_ 4
+	F_ 2
+	A_ 2
 	octave 4
-	note C_, 2
+	C_ 2
 	octave 3
-	note D_, 12
-	note E_, 4
-	note F_, 8
-	note G_, 4
-	note F_, 4
-	note E_, 12
-	note F_, 4
-	note G_, 8
+	D_ 12
+	E_ 4
+	F_ 8
+	G_ 4
+	F_ 4
+	E_ 12
+	F_ 4
+	G_ 8
 	notetype 12, 11, 6
 	octave 4
-	note C_, 4
-	note C#, 4
+	C_ 4
+	C# 4
 	callchannel Music_TitleScreen_branch_7e55c
 	notetype 8, 11, 4
 	octave 4
-	note C_, 4
-	note C_, 4
-	note C#, 4
+	C_ 4
+	C_ 4
+	C# 4
 	callchannel Music_TitleScreen_branch_7e55c
 	notetype 8, 11, 2
 	octave 3
-	note E_, 4
-	note E_, 4
-	note C#, 4
+	E_ 4
+	E_ 4
+	C# 4
 	loopchannel 0, Music_TitleScreen_branch_7e4e2
 
 Music_TitleScreen_branch_7e541::
 	notetype 12, 12, 6
 	octave 3
-	note D_, 6
+	D_ 6
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note D_, 8
+	D_ 8
 	endchannel
 
 Music_TitleScreen_branch_7e54a::
-	note C_, 6
-	note F_, 6
-	note C_, 4
-	note D_, 8
+	C_ 6
+	F_ 6
+	C_ 4
+	D_ 8
 	notetype 12, 14, 7
-	note F_, 6
-	note E_, 1
-	note D#, 1
-	note D_, 8
+	F_ 6
+	E_ 1
+	D# 1
+	D_ 8
 	notetype 8, 12, 6
-	note C_, 4
+	C_ 4
 	octave 2
-	note B_, 4
+	B_ 4
 	octave 3
-	note C_, 4
+	C_ 4
 	endchannel
 
 Music_TitleScreen_branch_7e55c::
 	notetype 12, 12, 1
-	note D_, 1
+	D_ 1
 	rest 1
 	octave 2
-	note D_, 1
-	note D_, 1
-	note D_, 1
+	D_ 1
+	D_ 1
+	D_ 1
 	rest 1
-	note D_, 1
-	note D_, 1
-	note D_, 1
+	D_ 1
+	D_ 1
+	D_ 1
 	rest 1
-	note D_, 1
-	note D_, 1
-	note D_, 1
+	D_ 1
+	D_ 1
+	D_ 1
 	rest 1
-	note D_, 1
-	note D_, 1
-	note D_, 1
+	D_ 1
+	D_ 1
+	D_ 1
 	rest 1
-	note D_, 1
-	note D_, 1
-	note D_, 1
+	D_ 1
+	D_ 1
+	D_ 1
 	rest 1
-	note D_, 1
-	note D_, 1
+	D_ 1
+	D_ 1
 	endchannel
 
 
@@ -159,140 +159,140 @@
 	duty 1
 	notetype 12, 14, 1
 	octave 2
-	note G_, 1
-	note B_, 1
+	G_ 1
+	B_ 1
 	octave 3
-	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
+	D_ 1
+	F# 1
+	G_ 4
+	G_ 6
+	G_ 1
+	G_ 1
+	G_ 4
+	G_ 4
+	G_ 4
 	notetype 8, 14, 1
-	note F_, 2
-	note F_, 2
-	note F_, 2
-	note F_, 2
-	note F_, 2
-	note F#, 2
+	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
-	note A_, 4
-	note F_, 4
+	A_ 4
+	F_ 4
 	callchannel Music_TitleScreen_branch_7e62c
 	octave 2
-	note A_, 8
-	note B_, 16
+	A_ 8
+	B_ 16
 	callchannel Music_TitleScreen_branch_7e622
 	octave 2
-	note A_, 6
-	note F_, 2
+	A_ 6
+	F_ 2
 	notetype 8, 14, 7
 	octave 4
-	note C_, 4
+	C_ 4
 	octave 3
-	note B_, 4
+	B_ 4
 	octave 4
-	note C_, 4
+	C_ 4
 	notetype 12, 14, 7
-	note D_, 8
+	D_ 8
 	notetype 12, 9, 5
 	octave 2
-	note D_, 6
-	note D_, 1
-	note F#, 1
-	note G_, 16
+	D_ 6
+	D_ 1
+	F# 1
+	G_ 16
 	callchannel Music_TitleScreen_branch_7e622
 	octave 2
-	note A_, 2
-	note F_, 6
+	A_ 2
+	F_ 6
 	callchannel Music_TitleScreen_branch_7e62c
 	octave 3
-	note C_, 2
+	C_ 2
 	octave 2
-	note A_, 6
-	note B_, 6
-	note G_, 2
-	note F_, 8
+	A_ 6
+	B_ 6
+	G_ 2
+	F_ 8
 	callchannel Music_TitleScreen_branch_7e622
 	notetype 8, 9, 5
 	octave 2
-	note G_, 4
-	note F_, 5
-	note A_, 3
+	G_ 4
+	F_ 5
+	A_ 3
 	notetype 8, 14, 6
 	octave 4
-	note F_, 4
-	note E_, 4
-	note F_, 4
+	F_ 4
+	E_ 4
+	F_ 4
 	notetype 12, 14, 7
-	note G_, 6
-	note A#, 2
-	note G_, 8
+	G_ 6
+	A# 2
+	G_ 8
 	vibrato 16, 2, 6
 	duty 3
 	notetype 12, 0, 11
-	note G_, 8
+	G_ 8
 	notetype 12, 14, 7
-	note A_, 8
+	A_ 8
 	duty 1
 	notetype 12, 14, 7
-	note A#, 6
-	note F_, 2
-	note F_, 8
+	A# 6
+	F_ 2
+	F_ 8
 	octave 3
-	note D_, 8
+	D_ 8
 	octave 4
-	note A#, 4
-	note B_, 4
+	A# 4
+	B_ 4
 	octave 5
-	note C_, 6
+	C_ 6
 	octave 4
-	note G_, 2
-	note G_, 8
+	G_ 2
+	G_ 8
 	octave 3
-	note E_, 8
+	E_ 8
 	notetype 12, 13, 7
 	octave 5
-	note C_, 4
-	note C#, 4
+	C_ 4
+	C# 4
 	callchannel Music_TitleScreen_branch_7e636
 	rest 3
-	note D_, 1
+	D_ 1
 	rest 3
-	note D_, 1
+	D_ 1
 	notetype 8, 14, 5
 	octave 5
-	note C_, 4
-	note C_, 4
-	note C#, 4
+	C_ 4
+	C_ 4
+	C# 4
 	callchannel Music_TitleScreen_branch_7e636
-	note D_, 1
+	D_ 1
 	rest 2
-	note D_, 1
+	D_ 1
 	rest 3
-	note D_, 1
+	D_ 1
 	notetype 8, 14, 3
 	octave 5
-	note C_, 4
-	note C_, 4
+	C_ 4
+	C_ 4
 	octave 4
-	note B_, 4
+	B_ 4
 	loopchannel 0, Music_TitleScreen_branch_7e594
 
 Music_TitleScreen_branch_7e622::
 	notetype 12, 14, 7
 	octave 3
-	note G_, 6
-	note B_, 2
+	G_ 6
+	B_ 2
 	octave 4
-	note D_, 8
+	D_ 8
 	notetype 12, 9, 5
 	endchannel
 
@@ -299,25 +299,25 @@
 Music_TitleScreen_branch_7e62c::
 	notetype 12, 14, 7
 	octave 4
-	note F_, 6
-	note E_, 1
-	note D#, 1
-	note D_, 8
+	F_ 6
+	E_ 1
+	D# 1
+	D_ 8
 	notetype 12, 9, 5
 	endchannel
 
 Music_TitleScreen_branch_7e636::
 	notetype 12, 14, 1
-	note D_, 1
+	D_ 1
 	rest 2
 	octave 4
-	note D_, 1
+	D_ 1
 	rest 3
-	note D_, 1
+	D_ 1
 	rest 3
-	note D_, 1
+	D_ 1
 	rest 3
-	note D_, 1
+	D_ 1
 	endchannel
 
 
@@ -324,29 +324,29 @@
 Music_TitleScreen_Ch3:: ; 7e643 (1f:6643)
 	notetype 12, 1, 0
 	octave 3
-	note G_, 1
+	G_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 3
-	note G_, 1
+	G_ 1
 	rest 5
-	note G_, 1
-	note G_, 1
-	note G_, 1
+	G_ 1
+	G_ 1
+	G_ 1
 	rest 3
-	note G_, 1
+	G_ 1
 	rest 3
-	note G_, 1
+	G_ 1
 	rest 3
 	notetype 8, 1, 0
-	note F_, 2
-	note F_, 2
-	note F_, 2
-	note F_, 2
-	note F_, 2
-	note A_, 2
+	F_ 2
+	F_ 2
+	F_ 2
+	F_ 2
+	F_ 2
+	A_ 2
 
 Music_TitleScreen_branch_7e65e::
 	callchannel Music_TitleScreen_branch_7e6c9
@@ -359,102 +359,102 @@
 	callchannel Music_TitleScreen_branch_7e6d0
 	loopchannel 3, Music_TitleScreen_branch_7e664
 	callchannel Music_TitleScreen_branch_7e6c9
-	note G_, 6
-	note D_, 3
-	note A_, 6
-	note F_, 3
-	note A_, 3
-	note F_, 3
+	G_ 6
+	D_ 3
+	A_ 6
+	F_ 3
+	A_ 3
+	F_ 3
 	callchannel Music_TitleScreen_branch_7e6d7
-	note A#, 3
-	note F_, 3
+	A# 3
+	F_ 3
 	callchannel Music_TitleScreen_branch_7e6d7
-	note B_, 3
-	note G_, 3
+	B_ 3
+	G_ 3
 	callchannel Music_TitleScreen_branch_7e6dc
 	octave 4
-	note C_, 3
+	C_ 3
 	octave 3
-	note G_, 3
+	G_ 3
 	callchannel Music_TitleScreen_branch_7e6dc
 	octave 4
-	note C#, 3
+	C# 3
 	octave 3
-	note A_, 3
+	A_ 3
 	callchannel Music_TitleScreen_branch_7e6e5
 	octave 5
 	pitchbend 0, 66
-	note D_, 4
+	D_ 4
 	rest 4
 	octave 6
 	pitchbend 0, 50
-	note D_, 4
+	D_ 4
 	octave 5
 	pitchbend 0, 66
-	note D_, 4
+	D_ 4
 	rest 2
 	notetype 8, 1, 0
 	octave 4
-	note C_, 4
-	note C_, 4
-	note C#, 4
+	C_ 4
+	C_ 4
+	C# 4
 	callchannel Music_TitleScreen_branch_7e6e5
 	octave 6
 	pitchbend 0, 50
-	note D_, 4
+	D_ 4
 	rest 4
 	octave 5
 	pitchbend 0, 66
-	note D_, 4
+	D_ 4
 	rest 6
 	notetype 8, 1, 0
 	octave 4
-	note C_, 4
-	note C_, 4
+	C_ 4
+	C_ 4
 	octave 3
-	note B_, 4
+	B_ 4
 	loopchannel 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
+	G_ 6
+	D_ 3
+	G_ 6
+	D_ 3
+	G_ 3
+	D_ 3
 	endchannel
 
 Music_TitleScreen_branch_7e6d0::
-	note F_, 6
-	note C_, 3
-	note F_, 6
-	note C_, 3
-	note F_, 3
-	note C_, 3
+	F_ 6
+	C_ 3
+	F_ 6
+	C_ 3
+	F_ 3
+	C_ 3
 	endchannel
 
 Music_TitleScreen_branch_7e6d7::
-	note A#, 6
-	note F_, 3
-	note A#, 6
-	note F_, 3
+	A# 6
+	F_ 3
+	A# 6
+	F_ 3
 	endchannel
 
 Music_TitleScreen_branch_7e6dc::
 	octave 4
-	note C_, 6
+	C_ 6
 	octave 3
-	note G_, 3
+	G_ 3
 	octave 4
-	note C_, 6
+	C_ 6
 	octave 3
-	note G_, 3
+	G_ 3
 	endchannel
 
 Music_TitleScreen_branch_7e6e5::
 	notetype 12, 1, 0
 	octave 4
-	note D_, 1
+	D_ 1
 	rest 5
 	endchannel
 
@@ -462,217 +462,217 @@
 Music_TitleScreen_Ch4:: ; 7e6eb (1f:66eb)
 	dspeed 6
 	rest 4
-	dnote 1, snare3
-	dnote 1, snare3
-	dnote 1, snare4
-	dnote 1, snare4
+	snare3 1
+	snare3 1
+	snare4 1
+	snare4 1
 	dspeed 12
-	dnote 1, snare2
+	snare2 1
 	rest 3
-	dnote 1, snare2
+	snare2 1
 	rest 5
-	dnote 1, snare2
-	dnote 1, snare2
-	dnote 1, snare2
+	snare2 1
+	snare2 1
+	snare2 1
 	rest 3
-	dnote 1, snare2
+	snare2 1
 	rest 3
-	dnote 1, snare2
+	snare2 1
 	rest 3
 	dspeed 8
-	dnote 2, snare3
-	dnote 2, snare4
-	dnote 2, snare2
-	dnote 2, snare3
-	dnote 2, snare2
-	dnote 2, snare1
+	snare3 2
+	snare4 2
+	snare2 2
+	snare3 2
+	snare2 2
+	snare1 2
 
 Music_TitleScreen_branch_7e716::
 	dspeed 12
-	dnote 1, snare2
+	snare2 1
 	rest 3
-	dnote 1, snare2
+	snare2 1
 	rest 5
-	dnote 1, snare2
-	dnote 1, snare2
-	dnote 1, snare3
+	snare2 1
+	snare2 1
+	snare3 1
 	rest 3
 	callchannel Music_TitleScreen_branch_7e834
 	callchannel Music_TitleScreen_branch_7e834
-	dnote 1, snare2
+	snare2 1
 	rest 3
-	dnote 1, snare2
+	snare2 1
 	rest 5
-	dnote 1, snare2
-	dnote 1, snare2
-	dnote 1, snare3
+	snare2 1
+	snare2 1
+	snare3 1
 	rest 1
-	dnote 1, snare3
-	dnote 1, snare2
+	snare3 1
+	snare2 1
 	callchannel Music_TitleScreen_branch_7e842
-	dnote 1, snare2
+	snare2 1
 	rest 3
-	dnote 1, snare2
+	snare2 1
 	rest 5
-	dnote 1, snare2
-	dnote 1, snare3
-	dnote 1, snare2
+	snare2 1
+	snare3 1
+	snare2 1
 	rest 1
-	dnote 1, snare2
+	snare2 1
 	rest 1
 	callchannel Music_TitleScreen_branch_7e842
-	dnote 1, snare2
+	snare2 1
 	rest 3
-	dnote 1, snare2
+	snare2 1
 	rest 5
-	dnote 1, snare2
-	dnote 1, snare3
-	dnote 1, snare2
+	snare2 1
+	snare3 1
+	snare2 1
 	rest 1
 	dspeed 6
-	dnote 1, snare3
-	dnote 1, snare3
-	dnote 1, snare4
-	dnote 1, snare4
+	snare3 1
+	snare3 1
+	snare4 1
+	snare4 1
 	dspeed 12
 	callchannel Music_TitleScreen_branch_7e834
 	callchannel Music_TitleScreen_branch_7e842
-	dnote 1, snare2
+	snare2 1
 	rest 3
-	dnote 1, snare2
+	snare2 1
 	rest 5
-	dnote 1, snare2
-	dnote 1, snare3
-	dnote 1, snare2
+	snare2 1
+	snare3 1
+	snare2 1
 	rest 3
-	dnote 1, snare2
+	snare2 1
 	rest 3
-	dnote 1, snare2
+	snare2 1
 	rest 5
-	dnote 1, snare3
-	dnote 1, snare2
-	dnote 1, snare2
+	snare3 1
+	snare2 1
+	snare2 1
 	rest 1
-	dnote 1, snare3
-	dnote 1, snare2
+	snare3 1
+	snare2 1
 	callchannel Music_TitleScreen_branch_7e834
 	callchannel Music_TitleScreen_branch_7e842
-	dnote 1, snare2
+	snare2 1
 	rest 3
-	dnote 1, snare2
+	snare2 1
 	rest 5
-	dnote 1, snare3
-	dnote 1, snare2
-	dnote 1, snare2
+	snare3 1
+	snare2 1
+	snare2 1
 	rest 1
-	dnote 1, snare4
-	dnote 1, snare3
-	dnote 1, snare2
+	snare4 1
+	snare3 1
+	snare2 1
 	rest 3
-	dnote 1, snare3
+	snare3 1
 	rest 5
-	dnote 1, snare2
-	dnote 1, snare4
-	dnote 1, snare2
+	snare2 1
+	snare4 1
+	snare2 1
 	rest 1
 	dspeed 6
-	dnote 1, snare3
-	dnote 1, snare3
-	dnote 1, snare4
-	dnote 1, snare4
+	snare3 1
+	snare3 1
+	snare4 1
+	snare4 1
 	dspeed 12
-	dnote 1, snare1
+	snare1 1
 	rest 3
-	dnote 1, snare2
+	snare2 1
 	rest 5
-	dnote 1, snare3
-	dnote 1, snare2
-	dnote 1, snare1
+	snare3 1
+	snare2 1
+	snare1 1
 	rest 3
-	dnote 1, snare2
+	snare2 1
 	rest 3
-	dnote 1, snare3
+	snare3 1
 	rest 5
-	dnote 1, snare3
-	dnote 1, snare2
-	dnote 1, snare3
+	snare3 1
+	snare2 1
+	snare3 1
 	rest 3
-	dnote 1, snare2
+	snare2 1
 	rest 3
-	dnote 1, snare3
+	snare3 1
 	rest 5
-	dnote 1, snare2
-	dnote 1, snare3
-	dnote 1, snare4
+	snare2 1
+	snare3 1
+	snare4 1
 	rest 1
-	dnote 1, snare3
-	dnote 1, snare2
-	dnote 1, snare2
+	snare3 1
+	snare2 1
+	snare2 1
 	rest 3
-	dnote 1, snare3
+	snare3 1
 	rest 5
-	dnote 1, snare2
-	dnote 1, snare3
-	dnote 1, snare2
+	snare2 1
+	snare3 1
+	snare2 1
 	rest 3
-	dnote 1, snare5
+	snare5 1
 	rest 5
-	dnote 1, snare2
+	snare2 1
 	rest 3
-	dnote 1, snare3
-	dnote 1, snare2
-	dnote 1, snare1
+	snare3 1
+	snare2 1
+	snare1 1
 	rest 5
-	dnote 1, snare2
-	dnote 1, snare3
-	dnote 1, snare2
+	snare2 1
+	snare3 1
+	snare2 1
 	rest 1
-	dnote 1, snare1
+	snare1 1
 	rest 1
 	dspeed 8
-	dnote 4, snare2
-	dnote 4, snare3
-	dnote 4, snare1
+	snare2 4
+	snare3 4
+	snare1 4
 	dspeed 12
-	dnote 1, snare5
+	snare5 1
 	rest 5
-	dnote 1, snare2
+	snare2 1
 	rest 3
-	dnote 1, snare3
-	dnote 1, snare2
-	dnote 1, snare3
+	snare3 1
+	snare2 1
+	snare3 1
 	rest 5
-	dnote 1, snare2
-	dnote 1, snare3
-	dnote 1, snare1
+	snare2 1
+	snare3 1
+	snare1 1
 	rest 1
-	dnote 1, snare3
-	dnote 1, snare2
+	snare3 1
+	snare2 1
 	dspeed 8
-	dnote 4, snare2
-	dnote 4, snare3
-	dnote 4, snare2
+	snare2 4
+	snare3 4
+	snare2 4
 	loopchannel 0, Music_TitleScreen_branch_7e716
 
 Music_TitleScreen_branch_7e834::
-	dnote 1, snare2
+	snare2 1
 	rest 3
-	dnote 1, snare2
+	snare2 1
 	rest 5
-	dnote 1, snare2
-	dnote 1, snare3
-	dnote 1, snare2
+	snare2 1
+	snare3 1
+	snare2 1
 	rest 3
 	endchannel
 
 Music_TitleScreen_branch_7e842::
-	dnote 1, snare2
+	snare2 1
 	rest 3
-	dnote 1, snare2
+	snare2 1
 	rest 5
-	dnote 1, snare3
-	dnote 1, snare2
-	dnote 1, snare2
+	snare3 1
+	snare2 1
+	snare2 1
 	rest 3
 	endchannel
-; 0x7e850
\ No newline at end of file
+; 0x7e850
--- a/audio/music/trainerbattle.asm
+++ b/audio/music/trainerbattle.asm
@@ -7,645 +7,645 @@
 	notetype 12, 11, 2
 	rest 8
 	octave 3
-	note F_, 1
-	note E_, 1
-	note F_, 1
-	note E_, 1
-	note D#, 1
-	note E_, 1
-	note D#, 1
-	note D_, 1
-	note D#, 1
-	note D_, 1
-	note C#, 1
-	note D_, 1
-	note C#, 1
-	note C_, 1
-	note C#, 1
-	note C_, 1
+	F_ 1
+	E_ 1
+	F_ 1
+	E_ 1
+	D# 1
+	E_ 1
+	D# 1
+	D_ 1
+	D# 1
+	D_ 1
+	C# 1
+	D_ 1
+	C# 1
+	C_ 1
+	C# 1
+	C_ 1
 	octave 2
-	note B_, 1
+	B_ 1
 	octave 3
-	note C_, 1
+	C_ 1
 	octave 2
-	note B_, 1
-	note A#, 1
-	note B_, 1
-	note A#, 1
-	note A_, 1
-	note A#, 1
+	B_ 1
+	A# 1
+	B_ 1
+	A# 1
+	A_ 1
+	A# 1
 	octave 3
-	note D_, 6
-	note E_, 6
-	note F_, 4
-	note D_, 2
-	note E_, 4
-	note F_, 6
-	note C_, 4
-	note D_, 6
-	note E_, 6
-	note F_, 4
-	note D_, 2
-	note E_, 4
-	note F_, 6
-	note C_, 2
-	note C#, 2
-	note D_, 6
-	note E_, 6
-	note F_, 4
-	note D_, 2
-	note E_, 4
-	note F_, 6
-	note C_, 4
-	note D_, 6
-	note E_, 6
-	note F_, 4
-	note D_, 2
-	note E_, 4
-	note F_, 6
-	note C_, 2
-	note C#, 2
+	D_ 6
+	E_ 6
+	F_ 4
+	D_ 2
+	E_ 4
+	F_ 6
+	C_ 4
+	D_ 6
+	E_ 6
+	F_ 4
+	D_ 2
+	E_ 4
+	F_ 6
+	C_ 2
+	C# 2
+	D_ 6
+	E_ 6
+	F_ 4
+	D_ 2
+	E_ 4
+	F_ 6
+	C_ 4
+	D_ 6
+	E_ 6
+	F_ 4
+	D_ 2
+	E_ 4
+	F_ 6
+	C_ 2
+	C# 2
 
 Music_TrainerBattle_branch_22962::
 	notetype 12, 11, 5
-	note D_, 2
-	note E_, 4
-	note C#, 2
-	note D_, 4
+	D_ 2
+	E_ 4
+	C# 2
+	D_ 4
 	octave 2
-	note B_, 4
-	note F#, 4
+	B_ 4
+	F# 4
 	octave 3
-	note E_, 2
-	note D_, 4
-	note C#, 2
-	note D_, 2
-	note E_, 2
-	note F_, 8
+	E_ 2
+	D_ 4
+	C# 2
+	D_ 2
+	E_ 2
+	F_ 8
 	notetype 12, 11, 2
-	note C_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note D#, 1
-	note D_, 1
-	note C_, 1
-	note C_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note F_, 1
-	note F#, 1
-	note G_, 1
-	note G#, 1
-	note G_, 1
-	note F#, 1
-	note F_, 1
-	note E_, 1
-	note D#, 1
-	note D_, 1
-	note C_, 1
+	C_ 1
+	C# 1
+	D_ 1
+	D# 1
+	E_ 1
+	D# 1
+	D_ 1
+	C_ 1
+	C_ 1
+	C# 1
+	D_ 1
+	D# 1
+	E_ 1
+	F_ 1
+	F# 1
+	G_ 1
+	G# 1
+	G_ 1
+	F# 1
+	F_ 1
+	E_ 1
+	D# 1
+	D_ 1
+	C_ 1
 	notetype 12, 11, 5
-	note D_, 2
-	note E_, 4
-	note C#, 2
-	note D_, 4
+	D_ 2
+	E_ 4
+	C# 2
+	D_ 4
 	octave 2
-	note B_, 4
-	note F#, 4
+	B_ 4
+	F# 4
 	octave 3
-	note E_, 2
-	note D_, 4
-	note C#, 2
+	E_ 2
+	D_ 4
+	C# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note C#, 2
+	C# 2
 	notetype 12, 10, 7
-	note D_, 8
-	note C#, 8
+	D_ 8
+	C# 8
 	octave 2
-	note B_, 8
+	B_ 8
 	octave 3
-	note C#, 8
+	C# 8
 	notetype 12, 11, 5
-	note D_, 2
-	note C#, 2
+	D_ 2
+	C# 2
 	octave 2
-	note B_, 2
-	note A_, 2
-	note G_, 2
+	B_ 2
+	A_ 2
+	G_ 2
 	rest 2
 	octave 3
-	note D_, 2
-	note C#, 2
+	D_ 2
+	C# 2
 	octave 2
-	note B_, 2
-	note A_, 2
-	note G_, 2
+	B_ 2
+	A_ 2
+	G_ 2
 	rest 2
 	octave 3
-	note D_, 2
-	note C#, 2
+	D_ 2
+	C# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note C#, 2
-	note E_, 4
+	C# 2
+	E_ 4
 	octave 2
-	note G_, 1
-	note A_, 1
-	note B_, 1
+	G_ 1
+	A_ 1
+	B_ 1
 	octave 3
-	note C#, 1
-	note D_, 4
+	C# 1
+	D_ 4
 	octave 2
-	note F#, 1
-	note G_, 1
-	note A_, 1
-	note B_, 1
+	F# 1
+	G_ 1
+	A_ 1
+	B_ 1
 	octave 3
-	note C#, 4
+	C# 4
 	octave 2
-	note G_, 1
-	note A_, 1
-	note B_, 1
+	G_ 1
+	A_ 1
+	B_ 1
 	octave 3
-	note C#, 1
-	note D_, 4
+	C# 1
+	D_ 4
 	octave 2
-	note F#, 1
-	note G_, 1
-	note A_, 1
-	note B_, 1
+	F# 1
+	G_ 1
+	A_ 1
+	B_ 1
 	octave 3
-	note D_, 2
-	note C#, 2
+	D_ 2
+	C# 2
 	octave 2
-	note B_, 2
-	note A_, 2
-	note G_, 2
+	B_ 2
+	A_ 2
+	G_ 2
 	rest 2
 	octave 3
-	note D_, 2
-	note C#, 2
+	D_ 2
+	C# 2
 	octave 2
-	note B_, 2
-	note A_, 2
-	note B_, 2
-	note G_, 2
+	B_ 2
+	A_ 2
+	B_ 2
+	G_ 2
 	octave 3
-	note D_, 2
-	note E_, 2
-	note F#, 2
-	note G_, 2
-	note A_, 2
-	note B_, 2
-	note A_, 2
-	note G_, 2
-	note A_, 2
+	D_ 2
+	E_ 2
+	F# 2
+	G_ 2
+	A_ 2
+	B_ 2
+	A_ 2
+	G_ 2
+	A_ 2
 	rest 2
-	note A_, 2
-	note B_, 2
-	note A_, 2
-	note G_, 2
-	note F#, 2
-	note G_, 2
-	note A_, 2
-	note E_, 2
-	note G_, 2
-	note F#, 2
+	A_ 2
+	B_ 2
+	A_ 2
+	G_ 2
+	F# 2
+	G_ 2
+	A_ 2
+	E_ 2
+	G_ 2
+	F# 2
 	octave 2
-	note B_, 1
+	B_ 1
 	octave 3
-	note C_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note F_, 1
-	note F#, 1
-	note G_, 1
-	note G#, 1
-	note A_, 1
-	note A#, 1
-	note B_, 1
+	C_ 1
+	C# 1
+	D_ 1
+	D# 1
+	E_ 1
+	F_ 1
+	F# 1
+	G_ 1
+	G# 1
+	A_ 1
+	A# 1
+	B_ 1
 	octave 4
-	note C_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note D_, 1
-	note C#, 1
-	note C_, 1
+	C_ 1
+	C# 1
+	D_ 1
+	D# 1
+	D_ 1
+	C# 1
+	C_ 1
 	octave 3
-	note B_, 1
-	note A#, 1
-	note A_, 1
-	note G#, 1
-	note G_, 1
-	note F#, 1
-	note F_, 1
-	note E_, 1
-	note D#, 1
-	note D_, 1
-	note C#, 1
-	note C_, 1
-	note C_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note F_, 1
-	note F#, 1
-	note G_, 1
-	note G#, 1
-	note A_, 1
-	note A#, 1
-	note B_, 1
+	B_ 1
+	A# 1
+	A_ 1
+	G# 1
+	G_ 1
+	F# 1
+	F_ 1
+	E_ 1
+	D# 1
+	D_ 1
+	C# 1
+	C_ 1
+	C_ 1
+	C# 1
+	D_ 1
+	D# 1
+	E_ 1
+	F_ 1
+	F# 1
+	G_ 1
+	G# 1
+	A_ 1
+	A# 1
+	B_ 1
 	octave 4
-	note C_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note D#, 1
-	note D_, 1
-	note C#, 1
-	note C_, 1
+	C_ 1
+	C# 1
+	D_ 1
+	D# 1
+	E_ 1
+	D# 1
+	D_ 1
+	C# 1
+	C_ 1
 	octave 3
-	note B_, 1
-	note A#, 1
-	note A_, 1
-	note G#, 1
-	note G_, 1
-	note F#, 1
-	note F_, 1
-	note E_, 1
-	note D#, 1
-	note D_, 1
-	note C#, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note F_, 1
-	note F#, 1
-	note G_, 1
-	note G#, 1
-	note A_, 1
-	note A#, 1
-	note B_, 1
+	B_ 1
+	A# 1
+	A_ 1
+	G# 1
+	G_ 1
+	F# 1
+	F_ 1
+	E_ 1
+	D# 1
+	D_ 1
+	C# 1
+	C# 1
+	D_ 1
+	D# 1
+	E_ 1
+	F_ 1
+	F# 1
+	G_ 1
+	G# 1
+	A_ 1
+	A# 1
+	B_ 1
 	octave 4
-	note C_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note F_, 1
-	note E_, 1
-	note D#, 1
-	note D_, 1
-	note C#, 1
-	note C_, 1
+	C_ 1
+	C# 1
+	D_ 1
+	D# 1
+	E_ 1
+	F_ 1
+	E_ 1
+	D# 1
+	D_ 1
+	C# 1
+	C_ 1
 	octave 3
-	note B_, 1
-	note A#, 1
-	note A_, 1
-	note G#, 1
-	note G_, 1
-	note F#, 1
-	note F_, 1
-	note E_, 1
-	note D#, 1
-	note D_, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note F_, 1
-	note F#, 1
-	note G_, 1
-	note G#, 1
-	note A_, 1
-	note A#, 1
-	note B_, 1
+	B_ 1
+	A# 1
+	A_ 1
+	G# 1
+	G_ 1
+	F# 1
+	F_ 1
+	E_ 1
+	D# 1
+	D_ 1
+	D_ 1
+	D# 1
+	E_ 1
+	F_ 1
+	F# 1
+	G_ 1
+	G# 1
+	A_ 1
+	A# 1
+	B_ 1
 	octave 4
-	note C_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note F_, 1
-	note F#, 1
-	note F_, 1
-	note E_, 1
-	note D#, 1
-	note D_, 1
-	note C#, 1
-	note C_, 1
+	C_ 1
+	C# 1
+	D_ 1
+	D# 1
+	E_ 1
+	F_ 1
+	F# 1
+	F_ 1
+	E_ 1
+	D# 1
+	D_ 1
+	C# 1
+	C_ 1
 	octave 3
-	note B_, 1
-	note A#, 1
-	note B_, 1
+	B_ 1
+	A# 1
+	B_ 1
 	octave 4
-	note C_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note F_, 1
+	C_ 1
+	C# 1
+	D_ 1
+	D# 1
+	E_ 1
+	F_ 1
 	octave 3
-	note A_, 4
+	A_ 4
 	octave 4
-	note D_, 4
+	D_ 4
 	octave 3
-	note A_, 2
-	note D_, 1
-	note E_, 1
-	note F#, 1
-	note G_, 1
-	note G#, 1
-	note A#, 1
-	note B_, 2
+	A_ 2
+	D_ 1
+	E_ 1
+	F# 1
+	G_ 1
+	G# 1
+	A# 1
+	B_ 2
 	octave 4
-	note C_, 2
+	C_ 2
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note C_, 2
+	C_ 2
 	octave 3
-	note G_, 2
-	note B_, 2
-	note F_, 2
-	note G_, 2
-	note A_, 2
+	G_ 2
+	B_ 2
+	F_ 2
+	G_ 2
+	A_ 2
 	octave 4
-	note C_, 2
-	note D_, 2
+	C_ 2
+	D_ 2
 	rest 2
 	octave 3
-	note A_, 4
+	A_ 4
 	octave 4
-	note C_, 4
-	note D_, 2
+	C_ 4
+	D_ 2
 	octave 3
-	note F_, 1
-	note G_, 1
-	note A_, 1
-	note B_, 1
+	F_ 1
+	G_ 1
+	A_ 1
+	B_ 1
 	octave 4
-	note C_, 1
-	note D_, 1
-	note E_, 2
-	note F_, 2
-	note D_, 2
-	note F_, 2
-	note D_, 2
-	note F_, 2
-	note D_, 2
-	note F_, 2
-	note D_, 2
-	note F_, 2
-	note D_, 2
-	note F_, 2
-	note E_, 2
-	note F_, 2
-	note E_, 2
-	note F_, 2
-	note E_, 2
-	note F_, 2
-	note E_, 2
-	note F_, 2
-	note E_, 2
-	note F_, 2
-	note E_, 2
-	note F_, 2
-	note E_, 2
-	note F_, 2
-	note E_, 2
+	C_ 1
+	D_ 1
+	E_ 2
+	F_ 2
+	D_ 2
+	F_ 2
+	D_ 2
+	F_ 2
+	D_ 2
+	F_ 2
+	D_ 2
+	F_ 2
+	D_ 2
+	F_ 2
+	E_ 2
+	F_ 2
+	E_ 2
+	F_ 2
+	E_ 2
+	F_ 2
+	E_ 2
+	F_ 2
+	E_ 2
+	F_ 2
+	E_ 2
+	F_ 2
+	E_ 2
+	F_ 2
+	E_ 2
 	octave 3
-	note B_, 2
-	note C_, 2
+	B_ 2
+	C_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
-	note C_, 2
+	E_ 2
+	C_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
-	note C_, 2
+	E_ 2
+	C_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
-	note C_, 2
+	E_ 2
+	C_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
-	note C_, 2
+	E_ 2
+	C_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note C_, 2
-	note E_, 2
-	note D_, 2
+	C_ 2
+	E_ 2
+	D_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
-	note D_, 2
+	F_ 2
+	D_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
-	note D_, 2
+	F_ 2
+	D_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
-	note D_, 2
+	F_ 2
+	D_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
-	note D_, 2
+	F_ 2
+	D_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note D_, 2
-	note F_, 2
-	note C_, 2
+	D_ 2
+	F_ 2
+	C_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
-	note C_, 2
+	E_ 2
+	C_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
-	note C_, 2
+	E_ 2
+	C_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
-	note C_, 2
+	E_ 2
+	C_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
-	note C_, 2
+	E_ 2
+	C_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note C_, 2
-	note E_, 2
-	note D_, 2
+	C_ 2
+	E_ 2
+	D_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
-	note D_, 2
+	F_ 2
+	D_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
-	note D_, 2
+	F_ 2
+	D_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
-	note D_, 2
+	F_ 2
+	D_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
-	note D_, 2
+	F_ 2
+	D_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note D_, 2
-	note F_, 2
-	note D_, 16
-	note C_, 16
+	D_ 2
+	F_ 2
+	D_ 16
+	C_ 16
 	octave 2
-	note A#, 16
-	note G_, 12
+	A# 16
+	G_ 12
 	octave 3
-	note D_, 1
-	note E_, 1
-	note G_, 1
+	D_ 1
+	E_ 1
+	G_ 1
 	octave 4
-	note C_, 1
-	note D_, 8
-	note F_, 8
+	C_ 1
+	D_ 8
+	F_ 8
 	octave 3
-	note A#, 8
+	A# 8
 	octave 4
-	note C_, 8
-	note D_, 8
-	note E_, 8
-	note F_, 8
-	note G_, 8
-	note E_, 2
+	C_ 8
+	D_ 8
+	E_ 8
+	F_ 8
+	G_ 8
+	E_ 2
 	rest 4
-	note E_, 2
+	E_ 2
 	rest 4
-	note E_, 2
+	E_ 2
 	rest 2
-	note E_, 2
+	E_ 2
 	rest 4
-	note E_, 2
+	E_ 2
 	rest 4
-	note E_, 2
+	E_ 2
 	rest 2
-	note E_, 2
+	E_ 2
 	rest 4
-	note E_, 2
+	E_ 2
 	rest 4
-	note E_, 2
+	E_ 2
 	rest 2
-	note E_, 2
+	E_ 2
 	rest 4
-	note E_, 2
+	E_ 2
 	rest 4
-	note E_, 2
+	E_ 2
 	rest 2
 	octave 3
-	note C_, 2
-	note D_, 4
+	C_ 2
+	D_ 4
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note C#, 4
+	C# 4
 	rest 2
-	note C#, 1
-	note D_, 1
-	note E_, 1
+	C# 1
+	D_ 1
+	E_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
 	octave 2
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 3
-	note C#, 1
+	C# 1
 	rest 9
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note F_, 1
-	note F_, 1
-	note E_, 1
-	note D#, 1
-	note D_, 1
-	note C#, 1
+	D_ 1
+	D# 1
+	E_ 1
+	F_ 1
+	F_ 1
+	E_ 1
+	D# 1
+	D_ 1
+	C# 1
 	rest 5
-	note C#, 1
-	note D_, 1
-	note E_, 1
+	C# 1
+	D_ 1
+	E_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note D_, 2
-	note E_, 2
-	note F_, 2
-	note G_, 2
-	note D#, 1
-	note E_, 1
-	note F_, 1
-	note F#, 1
-	note F#, 1
-	note F_, 1
-	note E_, 1
-	note D#, 1
-	note D_, 1
+	D_ 2
+	E_ 2
+	F_ 2
+	G_ 2
+	D# 1
+	E_ 1
+	F_ 1
+	F# 1
+	F# 1
+	F_ 1
+	E_ 1
+	D# 1
+	D_ 1
 	rest 9
-	note F#, 2
-	note E_, 4
-	note D#, 2
-	note E_, 2
-	note F#, 2
-	note G#, 2
-	note E_, 8
-	note F#, 8
-	note G_, 8
+	F# 2
+	E_ 4
+	D# 2
+	E_ 2
+	F# 2
+	G# 2
+	E_ 8
+	F# 8
+	G_ 8
 	octave 4
-	note C_, 4
+	C_ 4
 	octave 3
-	note G_, 1
-	note G#, 1
-	note A_, 1
-	note A#, 1
+	G_ 1
+	G# 1
+	A_ 1
+	A# 1
 	loopchannel 0, Music_TrainerBattle_branch_22962
 
 
@@ -654,302 +654,302 @@
 	vibrato 10, 2, 5
 	notetype 12, 12, 2
 	octave 4
-	note A_, 1
-	note G#, 1
-	note G_, 1
-	note F#, 1
-	note A_, 1
-	note F_, 1
-	note F#, 1
-	note F_, 1
-	note A_, 1
-	note E_, 1
-	note F_, 1
-	note E_, 1
-	note A_, 1
-	note D#, 1
-	note E_, 1
-	note D#, 1
-	note A_, 1
-	note D_, 1
-	note D#, 1
-	note D_, 1
-	note A_, 1
-	note C#, 1
-	note D_, 1
-	note C#, 1
-	note A_, 1
-	note C_, 1
-	note C#, 1
-	note C_, 1
-	note A_, 1
+	A_ 1
+	G# 1
+	G_ 1
+	F# 1
+	A_ 1
+	F_ 1
+	F# 1
+	F_ 1
+	A_ 1
+	E_ 1
+	F_ 1
+	E_ 1
+	A_ 1
+	D# 1
+	E_ 1
+	D# 1
+	A_ 1
+	D_ 1
+	D# 1
+	D_ 1
+	A_ 1
+	C# 1
+	D_ 1
+	C# 1
+	A_ 1
+	C_ 1
+	C# 1
+	C_ 1
+	A_ 1
 	octave 3
-	note B_, 1
+	B_ 1
 	octave 4
-	note C_, 1
+	C_ 1
 	octave 3
-	note B_, 1
+	B_ 1
 	notetype 12, 14, 1
 	octave 4
-	note B_, 16
+	B_ 16
 	rest 16
 	notetype 12, 13, 1
-	note B_, 16
+	B_ 16
 	rest 12
-	note A_, 4
+	A_ 4
 	notetype 12, 12, 2
 	octave 3
-	note B_, 6
+	B_ 6
 	octave 4
-	note C#, 6
-	note D_, 4
+	C# 6
+	D_ 4
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note C#, 4
-	note D_, 6
-	note A_, 2
-	note A#, 2
-	note B_, 6
+	C# 4
+	D_ 6
+	A_ 2
+	A# 2
+	B_ 6
 	octave 5
-	note C#, 6
-	note D_, 4
+	C# 6
+	D_ 4
 	octave 4
-	note B_, 2
+	B_ 2
 	octave 5
-	note C#, 4
-	note D_, 6
+	C# 4
+	D_ 6
 	octave 4
-	note A_, 4
+	A_ 4
 
 Music_TrainerBattle_branch_22bfc::
 	notetype 12, 12, 7
 	octave 3
-	note B_, 6
-	note F#, 14
-	note B_, 4
-	note F#, 4
-	note B_, 4
+	B_ 6
+	F# 14
+	B_ 4
+	F# 4
+	B_ 4
 	notetype 12, 5, 0
 	octave 4
-	note C_, 8
+	C_ 8
 	notetype 12, 3, 0
-	note C_, 8
+	C_ 8
 	notetype 12, 4, 14
-	note C_, 8
+	C_ 8
 	notetype 12, 12, 7
-	note C_, 8
+	C_ 8
 	octave 3
-	note B_, 6
-	note F#, 14
-	note B_, 4
-	note F#, 4
-	note B_, 4
+	B_ 6
+	F# 14
+	B_ 4
+	F# 4
+	B_ 4
 	notetype 12, 9, 0
-	note A_, 8
+	A_ 8
 	notetype 12, 5, 0
-	note A_, 8
+	A_ 8
 	notetype 12, 4, 0
-	note A_, 8
+	A_ 8
 	notetype 12, 3, 0
-	note A_, 8
+	A_ 8
 	notetype 12, 12, 7
-	note G_, 16
+	G_ 16
 	octave 4
-	note D_, 8
+	D_ 8
 	octave 3
-	note G_, 8
+	G_ 8
 	notetype 12, 8, 0
-	note A_, 8
+	A_ 8
 	notetype 12, 5, 0
-	note A_, 8
+	A_ 8
 	notetype 12, 4, 0
-	note A_, 8
+	A_ 8
 	notetype 12, 6, 0
-	note A_, 8
+	A_ 8
 	notetype 12, 12, 7
-	note G_, 16
+	G_ 16
 	octave 4
-	note E_, 8
-	note F#, 8
-	note E_, 16
+	E_ 8
+	F# 8
+	E_ 16
 	notetype 12, 12, 5
-	note G_, 4
-	note A_, 2
-	note G_, 2
-	note F#, 2
-	note E_, 2
-	note D_, 2
-	note E_, 2
+	G_ 4
+	A_ 2
+	G_ 2
+	F# 2
+	E_ 2
+	D_ 2
+	E_ 2
 	notetype 12, 11, 7
-	note F#, 8
+	F# 8
 	notetype 12, 5, 0
-	note F#, 8
+	F# 8
 	notetype 12, 6, 0
-	note F#, 8
+	F# 8
 	notetype 12, 7, 0
-	note F#, 8
+	F# 8
 	notetype 12, 10, 0
-	note G_, 8
+	G_ 8
 	notetype 12, 10, 7
-	note G_, 8
+	G_ 8
 	notetype 12, 11, 7
-	note G_, 4
+	G_ 4
 	notetype 12, 12, 5
-	note A_, 2
-	note G_, 2
-	note G_, 2
-	note F#, 2
-	note E_, 2
-	note F#, 2
+	A_ 2
+	G_ 2
+	G_ 2
+	F# 2
+	E_ 2
+	F# 2
 	notetype 12, 10, 0
-	note G#, 8
+	G# 8
 	notetype 12, 7, 0
-	note G#, 8
+	G# 8
 	notetype 12, 8, 0
-	note G#, 8
+	G# 8
 	notetype 12, 6, 0
-	note G#, 8
+	G# 8
 	notetype 12, 10, 0
-	note A_, 16
+	A_ 16
 	notetype 12, 11, 0
 	octave 5
-	note C#, 8
-	note E_, 8
+	C# 8
+	E_ 8
 	notetype 12, 12, 0
-	note D_, 4
+	D_ 4
 	octave 4
-	note A_, 4
+	A_ 4
 	octave 5
-	note C_, 2
+	C_ 2
 	notetype 12, 12, 7
 	octave 4
-	note B_, 8
+	B_ 8
 	notetype 12, 6, 0
-	note B_, 8
+	B_ 8
 	notetype 12, 6, 9
-	note B_, 6
+	B_ 6
 	notetype 12, 9, 6
-	note B_, 6
+	B_ 6
 	rest 2
 	notetype 12, 12, 0
 	octave 5
-	note D_, 4
+	D_ 4
 	octave 4
-	note A_, 4
-	note A#, 2
+	A_ 4
+	A# 2
 	notetype 12, 11, 0
 	octave 5
-	note F_, 14
+	F_ 14
 	notetype 12, 6, 0
-	note G_, 16
+	G_ 16
 	notetype 12, 5, 0
-	note E_, 16
+	E_ 16
 	notetype 12, 4, 0
-	note E_, 16
+	E_ 16
 	notetype 12, 12, 7
 	octave 4
-	note C_, 6
+	C_ 6
 	octave 3
-	note A_, 14
+	A_ 14
 	octave 4
-	note C_, 4
+	C_ 4
 	octave 3
-	note A_, 4
+	A_ 4
 	octave 4
-	note C_, 4
+	C_ 4
 	octave 3
-	note A#, 6
+	A# 6
 	octave 4
-	note F_, 14
+	F_ 14
 	octave 3
-	note A#, 4
+	A# 4
 	octave 4
-	note F_, 4
-	note D_, 4
-	note C_, 6
+	F_ 4
+	D_ 4
+	C_ 6
 	octave 3
-	note A_, 14
+	A_ 14
 	octave 4
-	note C_, 4
-	note E_, 2
-	note D_, 2
-	note C_, 2
-	note E_, 2
-	note D_, 2
+	C_ 4
+	E_ 2
+	D_ 2
+	C_ 2
+	E_ 2
+	D_ 2
 	octave 3
-	note A#, 4
+	A# 4
 	octave 4
-	note F_, 10
-	note G_, 6
-	note F_, 6
-	note D_, 4
+	F_ 10
+	G_ 6
+	F_ 6
+	D_ 4
 	notetype 12, 11, 0
-	note F_, 16
-	note E_, 16
-	note D_, 16
-	note E_, 16
+	F_ 16
+	E_ 16
+	D_ 16
+	E_ 16
 	notetype 12, 10, 0
 	octave 5
-	note F_, 16
-	note E_, 16
-	note G_, 16
-	note F_, 16
+	F_ 16
+	E_ 16
+	G_ 16
+	F_ 16
 	notetype 12, 13, 1
 	octave 3
-	note A#, 6
-	note A#, 6
-	note A#, 4
-	note A_, 6
-	note A_, 6
-	note A_, 4
+	A# 6
+	A# 6
+	A# 4
+	A_ 6
+	A_ 6
+	A_ 4
 	octave 4
-	note C_, 6
-	note C_, 6
-	note C_, 4
+	C_ 6
+	C_ 6
+	C_ 4
 	octave 3
-	note A#, 6
-	note A#, 6
-	note A_, 4
+	A# 6
+	A# 6
+	A_ 4
 	notetype 12, 12, 7
-	note A_, 4
-	note B_, 4
-	note G_, 2
-	note A_, 10
-	note B_, 2
+	A_ 4
+	B_ 4
+	G_ 2
+	A_ 10
+	B_ 2
 	octave 4
-	note C#, 2
-	note E_, 2
-	note D_, 2
-	note C#, 2
+	C# 2
+	E_ 2
+	D_ 2
+	C# 2
 	octave 3
-	note B_, 2
-	note A#, 16
+	B_ 2
+	A# 16
 	rest 2
-	note A#, 2
+	A# 2
 	octave 4
-	note C_, 2
-	note F_, 2
-	note E_, 2
-	note D_, 2
-	note C_, 2
+	C_ 2
+	F_ 2
+	E_ 2
+	D_ 2
+	C_ 2
 	octave 3
-	note A#, 2
-	note B_, 16
+	A# 2
+	B_ 16
 	rest 2
-	note B_, 2
+	B_ 2
 	octave 4
-	note C#, 2
-	note G_, 2
-	note F#, 2
-	note E_, 2
-	note D_, 2
+	C# 2
+	G_ 2
+	F# 2
+	E_ 2
+	D_ 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note C_, 16
-	note E_, 8
-	note G_, 8
+	C_ 16
+	E_ 8
+	G_ 8
 	loopchannel 0, Music_TrainerBattle_branch_22bfc
 
 
@@ -957,902 +957,902 @@
 	vibrato 0, 2, 0
 	notetype 12, 1, 4
 	octave 3
-	note B_, 1
-	note A#, 1
-	note A_, 1
-	note G#, 1
-	note A_, 1
-	note G#, 1
-	note G_, 1
-	note F#, 1
-	note G_, 1
-	note F#, 1
-	note F_, 1
-	note E_, 1
-	note F_, 1
-	note E_, 1
-	note D#, 1
-	note D_, 1
-	note D#, 1
-	note D_, 1
-	note C#, 1
-	note C_, 1
-	note C#, 1
-	note C_, 1
+	B_ 1
+	A# 1
+	A_ 1
+	G# 1
+	A_ 1
+	G# 1
+	G_ 1
+	F# 1
+	G_ 1
+	F# 1
+	F_ 1
+	E_ 1
+	F_ 1
+	E_ 1
+	D# 1
+	D_ 1
+	D# 1
+	D_ 1
+	C# 1
+	C_ 1
+	C# 1
+	C_ 1
 	octave 2
-	note B_, 1
-	note A#, 1
-	note B_, 1
-	note A#, 1
-	note A_, 1
-	note G#, 1
-	note A_, 2
-	note A#, 2
-	note B_, 2
-	note B_, 2
+	B_ 1
+	A# 1
+	B_ 1
+	A# 1
+	A_ 1
+	G# 1
+	A_ 2
+	A# 2
+	B_ 2
+	B_ 2
 	octave 3
-	note D_, 2
-	note E_, 2
+	D_ 2
+	E_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note F_, 2
-	note E_, 2
-	note D_, 2
+	F_ 2
+	E_ 2
+	D_ 2
 	octave 2
-	note B_, 2
-	note B_, 2
+	B_ 2
+	B_ 2
 	octave 3
-	note D_, 2
-	note E_, 2
+	D_ 2
+	E_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note D_, 2
+	D_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note C_, 2
+	C_ 2
 	octave 2
-	note B_, 2
-	note B_, 2
+	B_ 2
+	B_ 2
 	octave 3
-	note D_, 2
-	note E_, 2
+	D_ 2
+	E_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note F_, 2
-	note E_, 2
-	note D_, 2
+	F_ 2
+	E_ 2
+	D_ 2
 	octave 2
-	note B_, 2
-	note B_, 2
+	B_ 2
+	B_ 2
 	octave 3
-	note D_, 2
-	note E_, 2
+	D_ 2
+	E_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note D_, 2
+	D_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note C_, 2
+	C_ 2
 	octave 2
-	note B_, 2
-	note B_, 2
+	B_ 2
+	B_ 2
 	octave 3
-	note D_, 2
-	note E_, 2
+	D_ 2
+	E_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note F_, 2
-	note E_, 2
-	note D_, 2
+	F_ 2
+	E_ 2
+	D_ 2
 	octave 2
-	note B_, 2
-	note B_, 2
+	B_ 2
+	B_ 2
 	octave 3
-	note D_, 2
-	note E_, 2
+	D_ 2
+	E_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note D_, 2
+	D_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note C_, 2
+	C_ 2
 	octave 2
-	note B_, 2
-	note B_, 2
+	B_ 2
+	B_ 2
 	octave 3
-	note D_, 2
-	note E_, 2
+	D_ 2
+	E_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note F_, 2
-	note E_, 2
-	note D_, 2
+	F_ 2
+	E_ 2
+	D_ 2
 	octave 2
-	note B_, 2
-	note B_, 2
+	B_ 2
+	B_ 2
 	octave 3
-	note D_, 2
-	note E_, 2
+	D_ 2
+	E_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note D_, 2
+	D_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note C_, 2
+	C_ 2
 
 Music_TrainerBattle_branch_22d9c::
 	octave 2
-	note A#, 1
-	note B_, 1
+	A# 1
+	B_ 1
 	octave 3
-	note F#, 2
+	F# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note F#, 2
+	F# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note F#, 2
+	F# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note F#, 2
+	F# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note F#, 2
+	F# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note F#, 2
+	F# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note F#, 2
+	F# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note F#, 2
+	F# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note A_, 2
-	note G_, 2
-	note F#, 2
-	note E_, 2
-	note D_, 2
-	note C_, 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	A_ 2
+	G_ 2
+	F# 2
+	E_ 2
+	D_ 2
+	C_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note F#, 2
+	F# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note F#, 2
+	F# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note F#, 2
+	F# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note F#, 2
+	F# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note F#, 2
+	F# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note F#, 2
+	F# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note F#, 2
+	F# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note F_, 2
+	F_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
-	note D_, 2
-	note C#, 2
-	note D_, 2
-	note C#, 2
+	E_ 2
+	D_ 2
+	C# 2
+	D_ 2
+	C# 2
 	octave 2
-	note A_, 2
-	note G#, 2
-	note G_, 2
+	A_ 2
+	G# 2
+	G_ 2
 	octave 3
-	note D_, 2
+	D_ 2
 	octave 2
-	note G_, 2
+	G_ 2
 	octave 3
-	note D_, 2
+	D_ 2
 	octave 2
-	note G_, 2
+	G_ 2
 	octave 3
-	note D_, 2
+	D_ 2
 	octave 2
-	note G_, 2
+	G_ 2
 	octave 3
-	note D_, 2
+	D_ 2
 	octave 2
-	note G_, 2
+	G_ 2
 	octave 3
-	note D_, 2
+	D_ 2
 	octave 2
-	note G_, 2
+	G_ 2
 	octave 3
-	note D_, 2
+	D_ 2
 	octave 2
-	note G_, 2
+	G_ 2
 	octave 3
-	note D_, 2
+	D_ 2
 	octave 2
-	note G_, 2
-	note G#, 2
-	note A_, 2
+	G_ 2
+	G# 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note G_, 2
+	G_ 2
 	octave 3
-	note D_, 2
+	D_ 2
 	octave 2
-	note G_, 2
+	G_ 2
 	octave 3
-	note D_, 2
+	D_ 2
 	octave 2
-	note G_, 2
+	G_ 2
 	octave 3
-	note D_, 2
+	D_ 2
 	octave 2
-	note G_, 2
+	G_ 2
 	octave 3
-	note D_, 2
+	D_ 2
 	octave 2
-	note G_, 2
+	G_ 2
 	octave 3
-	note D_, 2
+	D_ 2
 	octave 2
-	note G_, 2
+	G_ 2
 	octave 3
-	note D_, 2
+	D_ 2
 	octave 2
-	note G_, 2
+	G_ 2
 	octave 3
-	note D_, 2
+	D_ 2
 	octave 2
-	note G_, 2
-	note G#, 2
-	note A_, 2
+	G_ 2
+	G# 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
-	note D_, 2
-	note C#, 2
+	E_ 2
+	D_ 2
+	C# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note F#, 2
+	F# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note F#, 2
+	F# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note F#, 2
+	F# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note F#, 2
+	F# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note F#, 2
-	note D_, 2
-	note E_, 2
-	note F#, 2
-	note E_, 2
-	note D_, 2
-	note F#, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note D#, 2
-	note F_, 2
-	note G_, 2
-	note F_, 2
-	note D#, 2
-	note G_, 2
-	note C#, 2
-	note G#, 2
-	note C#, 2
-	note G#, 2
-	note C#, 2
-	note G#, 2
-	note C#, 2
-	note G#, 2
-	note C#, 2
-	note G#, 2
-	note E_, 2
-	note F#, 2
-	note G#, 2
-	note F#, 2
-	note E_, 2
-	note G#, 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 F_, 2
-	note G_, 2
-	note A_, 2
-	note G_, 2
-	note F_, 2
-	note E_, 2
-	note D_, 4
+	F# 2
+	D_ 2
+	E_ 2
+	F# 2
+	E_ 2
+	D_ 2
+	F# 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	D# 2
+	F_ 2
+	G_ 2
+	F_ 2
+	D# 2
+	G_ 2
+	C# 2
+	G# 2
+	C# 2
+	G# 2
+	C# 2
+	G# 2
+	C# 2
+	G# 2
+	C# 2
+	G# 2
+	E_ 2
+	F# 2
+	G# 2
+	F# 2
+	E_ 2
+	G# 2
+	D_ 2
+	A_ 2
+	D_ 2
+	A_ 2
+	D_ 2
+	A_ 2
+	D_ 2
+	A_ 2
+	D_ 2
+	A_ 2
+	F_ 2
+	G_ 2
+	A_ 2
+	G_ 2
+	F_ 2
+	E_ 2
+	D_ 4
 	octave 2
-	note A_, 4
+	A_ 4
 	octave 3
-	note C_, 2
-	note G_, 2
+	C_ 2
+	G_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note G_, 2
+	G_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note G_, 2
+	G_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note G_, 2
+	G_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note G_, 2
+	G_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note G_, 2
+	G_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note G_, 2
+	G_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note G_, 2
-	note D_, 4
+	G_ 2
+	D_ 4
 	octave 2
-	note A_, 4
-	note A#, 2
+	A_ 4
+	A# 2
 	octave 3
-	note F_, 2
+	F_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
+	F_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
+	F_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
+	F_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
+	F_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
+	F_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
+	F_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
+	F_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
+	F_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
+	F_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
+	F_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
+	F_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
+	F_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
+	F_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
+	F_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
+	F_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
+	F_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
+	F_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
+	F_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
+	F_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
+	F_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
+	F_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
+	F_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
+	F_ 2
 	octave 2
-	note A#, 4
+	A# 4
 	octave 3
-	note F_, 4
+	F_ 4
 	octave 2
-	note A#, 4
+	A# 4
 	octave 3
-	note F_, 4
+	F_ 4
 	octave 2
-	note A#, 4
+	A# 4
 	octave 3
-	note E_, 4
+	E_ 4
 	octave 2
-	note A#, 4
+	A# 4
 	octave 3
-	note E_, 4
+	E_ 4
 	octave 2
-	note A#, 4
+	A# 4
 	octave 3
-	note D_, 4
+	D_ 4
 	octave 2
-	note A#, 4
+	A# 4
 	octave 3
-	note D_, 4
+	D_ 4
 	octave 2
-	note A#, 4
+	A# 4
 	octave 3
-	note E_, 4
+	E_ 4
 	octave 2
-	note A#, 4
+	A# 4
 	octave 3
-	note E_, 4
+	E_ 4
 	octave 2
-	note A#, 4
+	A# 4
 	octave 3
-	note F_, 4
+	F_ 4
 	octave 2
-	note A#, 4
+	A# 4
 	octave 3
-	note F_, 4
+	F_ 4
 	octave 2
-	note A#, 4
+	A# 4
 	octave 3
-	note E_, 4
+	E_ 4
 	octave 2
-	note A#, 4
+	A# 4
 	octave 3
-	note E_, 4
+	E_ 4
 	octave 2
-	note A#, 4
+	A# 4
 	octave 3
-	note D_, 4
+	D_ 4
 	octave 2
-	note A#, 4
+	A# 4
 	octave 3
-	note D_, 4
+	D_ 4
 	octave 2
-	note A#, 4
+	A# 4
 	octave 3
-	note E_, 4
+	E_ 4
 	octave 2
-	note A#, 4
+	A# 4
 	octave 3
-	note E_, 4
+	E_ 4
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
-	note E_, 2
+	E_ 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
-	note E_, 2
+	E_ 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
-	note E_, 2
+	E_ 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
-	note E_, 2
+	E_ 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
-	note E_, 2
+	E_ 2
+	E_ 2
 	octave 2
-	note B_, 2
-	note A_, 2
+	B_ 2
+	A_ 2
 	octave 3
-	note E_, 2
-	note E_, 2
+	E_ 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
-	note E_, 2
+	E_ 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
-	note E_, 2
+	E_ 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
-	note E_, 2
+	E_ 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
-	note E_, 2
+	E_ 2
+	E_ 2
 	octave 2
-	note B_, 2
-	note A_, 2
+	B_ 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
+	F_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
+	F_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
+	F_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
+	F_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
+	F_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
+	F_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
+	F_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
+	F_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note F#, 2
+	F# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note F#, 2
+	F# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note F#, 2
+	F# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note F#, 2
+	F# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note F#, 2
+	F# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note F#, 2
+	F# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note F#, 2
+	F# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note F#, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note F#, 2
-	note E_, 2
-	note F#, 2
-	note E_, 2
-	note D_, 2
-	note C_, 2
+	F# 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	F# 2
+	E_ 2
+	F# 2
+	E_ 2
+	D_ 2
+	C_ 2
 	loopchannel 0, Music_TrainerBattle_branch_22d9c
-; 0x23099
\ No newline at end of file
+; 0x23099
--- a/audio/music/unusedsong.asm
+++ b/audio/music/unusedsong.asm
@@ -6,177 +6,177 @@
 Music_UnusedSong_branch_a91b::
 	notetype 12, 1, 0
 	octave 6
-	note E_, 1
+	E_ 1
 	rest 1
 	octave 5
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 6
-	note C#, 1
+	C# 1
 	rest 1
 	octave 5
-	note B_, 1
+	B_ 1
 	octave 6
-	note E_, 1
+	E_ 1
 	rest 4
-	note E_, 2
+	E_ 2
 	rest 2
-	note D#, 1
+	D# 1
 	rest 1
 	octave 5
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 6
-	note C#, 1
+	C# 1
 	rest 1
 	octave 5
-	note B_, 1
+	B_ 1
 	octave 6
-	note D#, 1
+	D# 1
 	rest 8
-	note C#, 1
+	C# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note C#, 1
+	C# 1
 	octave 5
-	note B_, 1
+	B_ 1
 	rest 2
 	octave 6
-	note C#, 1
+	C# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note C#, 1
+	C# 1
 	octave 5
-	note B_, 1
+	B_ 1
 	rest 2
 	octave 6
-	note D#, 4
-	note C#, 4
-	note D#, 1
-	note E_, 1
+	D# 4
+	C# 4
+	D# 1
+	E_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
 	octave 5
-	note B_, 2
+	B_ 2
 	rest 1
 	octave 6
-	note E_, 1
+	E_ 1
 	rest 1
 	octave 5
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 6
-	note C#, 1
+	C# 1
 	rest 1
 	octave 5
-	note B_, 1
+	B_ 1
 	octave 6
-	note E_, 1
+	E_ 1
 	rest 8
-	note D#, 1
+	D# 1
 	rest 1
 	octave 5
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 6
-	note C#, 1
+	C# 1
 	rest 1
 	octave 5
-	note B_, 1
+	B_ 1
 	octave 6
-	note D#, 1
+	D# 1
 	rest 4
 	octave 5
-	note B_, 2
+	B_ 2
 	rest 2
 	octave 6
-	note C#, 1
+	C# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note C#, 1
+	C# 1
 	octave 5
-	note B_, 1
+	B_ 1
 	rest 2
 	octave 6
-	note C#, 1
+	C# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note E_, 1
-	note F#, 1
+	E_ 1
+	F# 1
 	rest 2
-	note F#, 4
-	note E_, 4
-	note F#, 1
-	note G#, 1
+	F# 4
+	E_ 4
+	F# 1
+	G# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note D#, 2
+	D# 2
 	rest 3
 	octave 5
-	note A_, 2
+	A_ 2
 	rest 2
-	note B_, 2
+	B_ 2
 	rest 2
 	octave 6
-	note C#, 2
+	C# 2
 	rest 2
-	note E_, 2
-	note F#, 8
+	E_ 2
+	F# 8
 	rest 2
-	note E_, 2
-	note D#, 2
-	note C#, 2
+	E_ 2
+	D# 2
+	C# 2
 	rest 2
 	octave 5
-	note G#, 2
+	G# 2
 	rest 2
-	note A_, 2
+	A_ 2
 	rest 2
-	note B_, 2
+	B_ 2
 	rest 2
 	octave 6
-	note D#, 2
-	note E_, 8
+	D# 2
+	E_ 8
 	rest 2
-	note D#, 2
-	note C#, 2
-	note D#, 2
+	D# 2
+	C# 2
+	D# 2
 	octave 5
-	note A_, 2
-	note G#, 2
-	note A_, 2
-	note A#, 1
-	note B_, 1
+	A_ 2
+	G# 2
+	A_ 2
+	A# 1
+	B_ 1
 	rest 4
-	note F#, 2
+	F# 2
 	rest 2
-	note B_, 2
-	note A#, 2
-	note B_, 2
+	B_ 2
+	A# 2
+	B_ 2
 	octave 6
-	note C_, 1
-	note C#, 1
+	C_ 1
+	C# 1
 	rest 8
 	octave 5
-	note F#, 2
-	note F_, 2
-	note F#, 2
-	note G#, 2
-	note A_, 2
+	F# 2
+	F_ 2
+	F# 2
+	G# 2
+	A_ 2
 	octave 6
-	note E_, 2
-	note D#, 2
-	note C#, 2
+	E_ 2
+	D# 2
+	C# 2
 	octave 5
-	note B_, 2
+	B_ 2
 	rest 6
-	note B_, 2
+	B_ 2
 	rest 6
 	loopchannel 0, Music_UnusedSong_branch_a91b
 	endchannel
@@ -191,149 +191,149 @@
 Music_UnusedSong_branch_a9d8::
 	notetype 12, 1, 0
 	octave 6
-	note E_, 1
+	E_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note A_, 1
-	note G#, 1
+	A_ 1
+	G# 1
 	rest 8
-	note D#, 1
+	D# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note G#, 1
-	note F#, 1
+	G# 1
+	F# 1
 	rest 4
 	octave 5
-	note B_, 2
+	B_ 2
 	rest 2
 	octave 6
-	note C#, 1
+	C# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note E_, 1
-	note F#, 1
+	E_ 1
+	F# 1
 	rest 2
-	note C#, 1
+	C# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note E_, 1
-	note F#, 1
+	E_ 1
+	F# 1
 	rest 2
-	note F#, 4
-	note E_, 4
-	note F#, 1
-	note G#, 1
+	F# 4
+	E_ 4
+	F# 1
+	G# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note D#, 2
+	D# 2
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note A_, 1
-	note G#, 1
+	A_ 1
+	G# 1
 	rest 4
-	note E_, 2
+	E_ 2
 	rest 2
-	note D#, 1
+	D# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note G#, 1
-	note F#, 1
+	G# 1
+	F# 1
 	rest 8
-	note C#, 1
+	C# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note E_, 1
-	note F#, 1
+	E_ 1
+	F# 1
 	rest 2
-	note C#, 1
+	C# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note E_, 1
-	note F#, 1
+	E_ 1
+	F# 1
 	rest 2
-	note F#, 4
-	note E_, 4
-	note F#, 1
-	note G#, 1
+	F# 4
+	E_ 4
+	F# 1
+	G# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note F#, 2
+	F# 2
 	rest 1
-	note C#, 2
+	C# 2
 	rest 2
-	note D#, 2
+	D# 2
 	rest 2
-	note E_, 2
+	E_ 2
 	rest 2
-	note G#, 2
+	G# 2
 	rest 2
-	note D#, 8
+	D# 8
 	rest 2
-	note E_, 2
-	note D#, 2
-	note C#, 2
+	E_ 2
+	D# 2
+	C# 2
 	octave 5
-	note B_, 2
+	B_ 2
 	rest 2
 	octave 6
-	note C#, 2
+	C# 2
 	rest 2
-	note D#, 2
+	D# 2
 	rest 2
-	note F#, 2
+	F# 2
 	rest 2
-	note C#, 8
+	C# 8
 	rest 2
-	note D#, 2
-	note C#, 2
+	D# 2
+	C# 2
 	octave 5
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note A_, 2
-	note G#, 1
-	note F#, 1
+	B_ 2
+	A_ 2
+	G# 2
+	A_ 2
+	G# 1
+	F# 1
 	rest 8
-	note B_, 2
-	note A#, 2
-	note B_, 2
-	note A_, 1
-	note G#, 1
+	B_ 2
+	A# 2
+	B_ 2
+	A_ 1
+	G# 1
 	rest 4
-	note G#, 2
+	G# 2
 	rest 2
-	note F#, 2
-	note F_, 2
-	note F#, 2
-	note G#, 2
-	note A_, 2
-	note E_, 2
-	note C#, 2
-	note E_, 2
-	note F#, 2
+	F# 2
+	F_ 2
+	F# 2
+	G# 2
+	A_ 2
+	E_ 2
+	C# 2
+	E_ 2
+	F# 2
 	rest 6
-	note D#, 2
+	D# 2
 	rest 6
 	loopchannel 0, Music_UnusedSong_branch_a9d8
 	endchannel
-; 0xaa6f
\ No newline at end of file
+; 0xaa6f
--- a/audio/music/vermilion.asm
+++ b/audio/music/vermilion.asm
@@ -8,106 +8,106 @@
 Music_Vermilion_branch_b9f6::
 	notetype 12, 11, 5
 	octave 3
-	note E_, 4
-	note C#, 1
-	note D_, 1
-	note E_, 2
-	note A_, 4
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note E_, 2
-	note F#, 2
-	note A_, 4
-	note F#, 1
-	note G#, 1
-	note A_, 2
-	note E_, 4
-	note C#, 2
-	note E_, 2
-	note A_, 2
-	note G#, 2
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note E_, 2
-	note F#, 2
-	note G#, 2
-	note C#, 2
-	note D_, 2
-	note E_, 2
-	note F#, 2
-	note E_, 4
-	note C#, 1
-	note D_, 1
-	note E_, 2
-	note A_, 4
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note E_, 2
-	note F#, 2
-	note A_, 4
-	note F#, 1
-	note G#, 1
-	note A_, 2
-	note E_, 4
-	note C#, 1
-	note D_, 1
-	note E_, 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note A_, 2
-	note G#, 2
-	note E_, 2
-	note F#, 2
-	note G#, 2
-	note F#, 4
-	note E_, 4
-	note F#, 2
-	note G#, 2
-	note F#, 2
-	note A_, 2
-	note G#, 2
-	note B_, 2
-	note A_, 2
+	E_ 4
+	C# 1
+	D_ 1
+	E_ 2
+	A_ 4
+	B_ 2
+	A_ 2
+	G# 2
+	F# 2
+	E_ 2
+	F# 2
+	A_ 4
+	F# 1
+	G# 1
+	A_ 2
+	E_ 4
+	C# 2
+	E_ 2
+	A_ 2
+	G# 2
+	B_ 2
+	A_ 2
+	G# 2
+	E_ 2
+	F# 2
+	G# 2
+	C# 2
+	D_ 2
+	E_ 2
+	F# 2
+	E_ 4
+	C# 1
+	D_ 1
+	E_ 2
+	A_ 4
+	B_ 2
+	A_ 2
+	G# 2
+	F# 2
+	E_ 2
+	F# 2
+	A_ 4
+	F# 1
+	G# 1
+	A_ 2
+	E_ 4
+	C# 1
+	D_ 1
+	E_ 2
+	A_ 2
+	G# 2
+	F# 2
+	A_ 2
+	G# 2
+	E_ 2
+	F# 2
+	G# 2
+	F# 4
+	E_ 4
+	F# 2
+	G# 2
+	F# 2
+	A_ 2
+	G# 2
+	B_ 2
+	A_ 2
 	octave 4
-	note C#, 2
-	note D_, 2
-	note C#, 2
+	C# 2
+	D_ 2
+	C# 2
 	octave 3
-	note B_, 2
-	note A_, 2
-	note G#, 1
-	note A_, 1
-	note B_, 2
+	B_ 2
+	A_ 2
+	G# 1
+	A_ 1
+	B_ 2
 	octave 4
-	note C#, 2
-	note E_, 2
+	C# 2
+	E_ 2
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note D_, 2
+	D_ 2
 	octave 3
-	note G#, 2
+	G# 2
 	octave 4
-	note C#, 2
+	C# 2
 	octave 3
-	note F#, 2
-	note B_, 2
-	note G#, 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 B_, 2
+	F# 2
+	B_ 2
+	G# 2
+	A_ 2
+	B_ 2
+	A_ 2
+	G# 2
+	F# 2
+	E_ 2
+	F# 2
+	G# 2
+	B_ 2
 	loopchannel 0, Music_Vermilion_branch_b9f6
 
 
@@ -118,63 +118,63 @@
 Music_Vermilion_branch_ba66::
 	notetype 12, 12, 7
 	octave 3
-	note A_, 8
+	A_ 8
 	octave 4
-	note D_, 4
-	note C#, 4
+	D_ 4
+	C# 4
 	octave 3
-	note B_, 6
-	note A_, 1
-	note B_, 1
+	B_ 6
+	A_ 1
+	B_ 1
 	octave 4
-	note C#, 8
+	C# 8
 	octave 3
-	note A_, 8
+	A_ 8
 	octave 4
-	note D_, 4
-	note C#, 4
+	D_ 4
+	C# 4
 	octave 3
-	note B_, 6
+	B_ 6
 	octave 4
-	note C#, 1
+	C# 1
 	octave 3
-	note B_, 1
-	note A_, 8
-	note A_, 8
+	B_ 1
+	A_ 8
+	A_ 8
 	octave 4
-	note D_, 4
-	note C#, 4
+	D_ 4
+	C# 4
 	octave 3
-	note B_, 6
-	note A_, 1
-	note B_, 1
+	B_ 6
+	A_ 1
+	B_ 1
 	octave 4
-	note C#, 8
+	C# 8
 	octave 3
-	note A_, 8
+	A_ 8
 	octave 4
-	note D_, 4
-	note C#, 4
+	D_ 4
+	C# 4
 	octave 3
-	note B_, 6
+	B_ 6
 	octave 4
-	note C#, 1
+	C# 1
 	octave 3
-	note B_, 1
-	note A_, 8
-	note B_, 4
+	B_ 1
+	A_ 8
+	B_ 4
 	octave 4
-	note C#, 4
-	note D_, 4
-	note E_, 4
-	note F#, 8
-	note B_, 8
-	note A_, 4
-	note G#, 4
-	note F#, 4
-	note E_, 4
-	note F#, 8
-	note E_, 8
+	C# 4
+	D_ 4
+	E_ 4
+	F# 8
+	B_ 8
+	A_ 4
+	G# 4
+	F# 4
+	E_ 4
+	F# 8
+	E_ 8
 	loopchannel 0, Music_Vermilion_branch_ba66
 
 
@@ -183,102 +183,102 @@
 
 Music_Vermilion_branch_baa8::
 	octave 4
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note G#, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note F#, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note F#, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
+	A_ 2
+	E_ 2
+	A_ 2
+	E_ 2
+	A_ 2
+	E_ 2
+	A_ 2
+	E_ 2
+	G# 2
+	E_ 2
+	G# 2
+	E_ 2
+	A_ 2
+	G# 2
+	F# 2
+	E_ 2
+	A_ 2
+	E_ 2
+	A_ 2
+	E_ 2
+	A_ 2
+	E_ 2
+	A_ 2
+	E_ 2
+	G# 2
+	E_ 2
+	G# 2
+	E_ 2
+	A_ 2
+	G# 2
+	F# 2
+	G# 2
+	A_ 2
+	E_ 2
+	A_ 2
+	E_ 2
+	A_ 2
+	E_ 2
+	A_ 2
+	E_ 2
+	G# 2
+	E_ 2
+	G# 2
+	E_ 2
+	A_ 2
+	E_ 2
+	A_ 2
+	E_ 2
+	A_ 2
+	E_ 2
+	A_ 2
+	E_ 2
+	A_ 2
+	E_ 2
+	A_ 2
+	E_ 2
+	G# 2
+	E_ 2
+	G# 2
+	E_ 2
+	A_ 2
+	E_ 2
+	A_ 2
+	E_ 2
+	B_ 2
+	E_ 2
+	A_ 2
+	E_ 2
+	G# 2
+	E_ 2
+	F# 2
+	E_ 2
+	G# 2
+	E_ 2
+	G# 2
+	E_ 2
+	B_ 2
+	A_ 2
+	G# 2
+	F# 2
+	F# 2
+	E_ 2
+	G# 2
+	E_ 2
+	A_ 2
+	E_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	E_ 2
+	A_ 2
+	E_ 2
+	G# 2
+	E_ 2
 	loopchannel 0, Music_Vermilion_branch_baa8
 
 
@@ -287,19 +287,19 @@
 
 Music_Vermilion_branch_bb0e::
 	callchannel Music_Vermilion_branch_bb3f
-	dnote 2, triangle1
-	dnote 1, triangle1
-	dnote 1, triangle1
-	dnote 2, triangle1
-	dnote 1, triangle1
-	dnote 1, triangle1
-	dnote 2, triangle1
-	dnote 1, triangle1
-	dnote 1, triangle1
-	dnote 1, triangle1
-	dnote 1, triangle1
-	dnote 1, triangle1
-	dnote 1, triangle1
+	triangle1 2
+	triangle1 1
+	triangle1 1
+	triangle1 2
+	triangle1 1
+	triangle1 1
+	triangle1 2
+	triangle1 1
+	triangle1 1
+	triangle1 1
+	triangle1 1
+	triangle1 1
+	triangle1 1
 	loopchannel 4, Music_Vermilion_branch_bb0e
 	callchannel Music_Vermilion_branch_bb3f
 	callchannel Music_Vermilion_branch_bb3f
@@ -308,17 +308,17 @@
 	loopchannel 0, Music_Vermilion_branch_bb0e
 
 Music_Vermilion_branch_bb3f::
-	dnote 2, triangle1
-	dnote 1, triangle1
-	dnote 1, triangle1
-	dnote 2, triangle1
-	dnote 1, triangle1
-	dnote 1, triangle1
-	dnote 2, triangle1
-	dnote 1, triangle1
-	dnote 1, triangle1
-	dnote 2, triangle1
-	dnote 1, triangle1
-	dnote 1, triangle1
+	triangle1 2
+	triangle1 1
+	triangle1 1
+	triangle1 2
+	triangle1 1
+	triangle1 1
+	triangle1 2
+	triangle1 1
+	triangle1 1
+	triangle1 2
+	triangle1 1
+	triangle1 1
 	endchannel
-; 0xbb58
\ No newline at end of file
+; 0xbb58
--- a/audio/music/wildbattle.asm
+++ b/audio/music/wildbattle.asm
@@ -6,297 +6,297 @@
 	toggleperfectpitch
 	notetype 12, 11, 3
 	octave 4
-	note C_, 1
+	C_ 1
 	octave 3
-	note B_, 1
-	note A#, 1
-	note A_, 1
-	note A#, 1
-	note A_, 1
-	note G#, 1
-	note G_, 1
-	note G#, 1
-	note G_, 1
-	note F#, 1
-	note F_, 1
-	note F#, 1
-	note F_, 1
-	note E_, 1
-	note D#, 1
-	note E_, 1
-	note D#, 1
-	note D_, 1
-	note C#, 1
-	note D_, 1
-	note C#, 1
-	note C_, 1
+	B_ 1
+	A# 1
+	A_ 1
+	A# 1
+	A_ 1
+	G# 1
+	G_ 1
+	G# 1
+	G_ 1
+	F# 1
+	F_ 1
+	F# 1
+	F_ 1
+	E_ 1
+	D# 1
+	E_ 1
+	D# 1
+	D_ 1
+	C# 1
+	D_ 1
+	C# 1
+	C_ 1
 	octave 2
-	note B_, 1
+	B_ 1
 	octave 3
-	note C_, 1
+	C_ 1
 	octave 2
-	note B_, 1
-	note A#, 1
-	note A_, 1
-	note A#, 1
-	note B_, 1
+	B_ 1
+	A# 1
+	A_ 1
+	A# 1
+	B_ 1
 	octave 3
-	note C_, 1
-	note C#, 1
+	C_ 1
+	C# 1
 	notetype 12, 11, 1
-	note G_, 6
-	note E_, 6
-	note D#, 12
-	note C#, 14
-	note E_, 6
-	note D#, 10
+	G_ 6
+	E_ 6
+	D# 12
+	C# 14
+	E_ 6
+	D# 10
 	notetype 12, 4, 15
-	note C#, 10
+	C# 10
 	notetype 12, 11, 1
-	note G_, 6
-	note E_, 6
-	note D#, 12
-	note C#, 14
-	note E_, 6
-	note D#, 10
-	note C#, 10
+	G_ 6
+	E_ 6
+	D# 12
+	C# 14
+	E_ 6
+	D# 10
+	C# 10
 
 Music_WildBattle_branch_230e0::
 	notetype 12, 11, 3
-	note C#, 1
-	note D_, 1
-	note C#, 1
-	note C_, 1
-	note C#, 1
-	note D_, 1
-	note C#, 1
-	note C_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note D_, 1
-	note C#, 1
-	note C_, 1
+	C# 1
+	D_ 1
+	C# 1
+	C_ 1
+	C# 1
+	D_ 1
+	C# 1
+	C_ 1
+	C# 1
+	D_ 1
+	D# 1
+	D_ 1
+	C# 1
+	C_ 1
 	octave 2
-	note B_, 1
+	B_ 1
 	octave 3
-	note C_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note D_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note D_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note F_, 1
-	note E_, 1
-	note D#, 1
-	note D_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note F_, 1
-	note F#, 1
-	note G_, 1
-	note G#, 1
-	note A_, 1
-	note G#, 1
-	note G_, 1
-	note F#, 1
-	note F_, 1
-	note E_, 1
-	note D#, 1
-	note D_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note F_, 1
-	note F#, 1
-	note G_, 1
-	note F#, 1
-	note F_, 1
-	note E_, 1
-	note D#, 1
-	note E_, 1
-	note F_, 1
-	note F#, 1
-	note G_, 1
-	note G#, 1
-	note A_, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note D#, 1
-	note D_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note D#, 1
-	note D_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note D#, 1
-	note D_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note D#, 1
-	note D_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note F_, 1
-	note F#, 1
-	note F_, 1
-	note E_, 1
-	note D#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note D#, 1
-	note D_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note D#, 1
-	note D_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note D#, 1
-	note D_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note D#, 1
-	note D_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note F_, 1
-	note F#, 1
-	note F_, 1
-	note E_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note F_, 1
-	note F#, 1
-	note G_, 1
-	note G#, 1
-	note A_, 1
-	note G#, 1
-	note G_, 1
-	note F#, 1
-	note F_, 1
-	note E_, 1
-	note D#, 1
-	note D_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note F_, 1
-	note F#, 1
-	note G_, 1
-	note G#, 1
-	note A_, 1
-	note G#, 1
-	note G_, 1
-	note F#, 1
-	note F_, 1
-	note E_, 1
-	note D#, 1
-	note D_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note F_, 1
-	note F#, 1
-	note G_, 1
-	note G#, 1
-	note A_, 1
-	note G#, 1
-	note G_, 1
-	note F#, 1
-	note F_, 1
-	note E_, 1
-	note D#, 1
-	note D_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note F_, 1
-	note F#, 1
-	note G_, 1
-	note F#, 1
-	note F_, 1
-	note E_, 1
-	note D#, 1
-	note E_, 1
-	note F_, 1
-	note F#, 1
-	note G_, 1
-	note G#, 1
+	C_ 1
+	C# 1
+	D_ 1
+	D# 1
+	D_ 1
+	C# 1
+	D_ 1
+	D# 1
+	D_ 1
+	C# 1
+	D_ 1
+	D# 1
+	E_ 1
+	F_ 1
+	E_ 1
+	D# 1
+	D_ 1
+	C# 1
+	D_ 1
+	D# 1
+	E_ 1
+	F_ 1
+	F# 1
+	G_ 1
+	G# 1
+	A_ 1
+	G# 1
+	G_ 1
+	F# 1
+	F_ 1
+	E_ 1
+	D# 1
+	D_ 1
+	C# 1
+	D_ 1
+	D# 1
+	E_ 1
+	F_ 1
+	F# 1
+	G_ 1
+	F# 1
+	F_ 1
+	E_ 1
+	D# 1
+	E_ 1
+	F_ 1
+	F# 1
+	G_ 1
+	G# 1
+	A_ 1
+	D_ 1
+	D# 1
+	E_ 1
+	D# 1
+	D_ 1
+	C# 1
+	D_ 1
+	D# 1
+	E_ 1
+	D# 1
+	D_ 1
+	C# 1
+	D_ 1
+	D# 1
+	E_ 1
+	D# 1
+	D_ 1
+	C# 1
+	D_ 1
+	D# 1
+	E_ 1
+	D# 1
+	D_ 1
+	C# 1
+	D_ 1
+	D# 1
+	E_ 1
+	F_ 1
+	F# 1
+	F_ 1
+	E_ 1
+	D# 1
+	D_ 1
+	D# 1
+	E_ 1
+	D# 1
+	D_ 1
+	C# 1
+	D_ 1
+	D# 1
+	E_ 1
+	D# 1
+	D_ 1
+	C# 1
+	D_ 1
+	D# 1
+	E_ 1
+	D# 1
+	D_ 1
+	C# 1
+	D_ 1
+	D# 1
+	E_ 1
+	D# 1
+	D_ 1
+	C# 1
+	D_ 1
+	D# 1
+	E_ 1
+	F_ 1
+	F# 1
+	F_ 1
+	E_ 1
+	C# 1
+	D_ 1
+	D# 1
+	E_ 1
+	F_ 1
+	F# 1
+	G_ 1
+	G# 1
+	A_ 1
+	G# 1
+	G_ 1
+	F# 1
+	F_ 1
+	E_ 1
+	D# 1
+	D_ 1
+	C# 1
+	D_ 1
+	D# 1
+	E_ 1
+	F_ 1
+	F# 1
+	G_ 1
+	G# 1
+	A_ 1
+	G# 1
+	G_ 1
+	F# 1
+	F_ 1
+	E_ 1
+	D# 1
+	D_ 1
+	C# 1
+	D_ 1
+	D# 1
+	E_ 1
+	F_ 1
+	F# 1
+	G_ 1
+	G# 1
+	A_ 1
+	G# 1
+	G_ 1
+	F# 1
+	F_ 1
+	E_ 1
+	D# 1
+	D_ 1
+	C# 1
+	D_ 1
+	D# 1
+	E_ 1
+	F_ 1
+	F# 1
+	G_ 1
+	F# 1
+	F_ 1
+	E_ 1
+	D# 1
+	E_ 1
+	F_ 1
+	F# 1
+	G_ 1
+	G# 1
 	notetype 12, 11, 5
-	note D_, 4
-	note C_, 4
-	note D_, 4
-	note F_, 4
-	note E_, 6
-	note D_, 6
-	note F_, 4
+	D_ 4
+	C_ 4
+	D_ 4
+	F_ 4
+	E_ 6
+	D_ 6
+	F_ 4
 	notetype 12, 11, 7
-	note A_, 16
-	note G_, 16
+	A_ 16
+	G_ 16
 	notetype 12, 11, 5
-	note D_, 4
-	note C_, 4
-	note D_, 4
-	note F_, 4
-	note G_, 6
-	note A_, 6
-	note B_, 4
+	D_ 4
+	C_ 4
+	D_ 4
+	F_ 4
+	G_ 6
+	A_ 6
+	B_ 4
 	notetype 12, 11, 7
 	octave 4
-	note C_, 16
+	C_ 16
 	notetype 12, 3, 15
-	note G_, 16
+	G_ 16
 	notetype 12, 11, 5
 	octave 3
-	note C_, 12
-	note C_, 2
+	C_ 12
+	C_ 2
 	rest 2
-	note D_, 2
-	note C_, 2
+	D_ 2
+	C_ 2
 	rest 12
-	note C#, 12
-	note C#, 2
+	C# 12
+	C# 2
 	rest 2
-	note F_, 2
+	F_ 2
 	notetype 12, 10, 3
-	note D#, 6
+	D# 6
 	notetype 12, 10, 7
-	note C#, 8
+	C# 8
 	loopchannel 0, Music_WildBattle_branch_230e0
 
 
@@ -305,160 +305,160 @@
 	vibrato 8, 2, 5
 	notetype 12, 12, 3
 	octave 4
-	note G_, 1
-	note F#, 1
-	note F_, 1
+	G_ 1
+	F# 1
+	F_ 1
 	octave 5
-	note G_, 1
+	G_ 1
 	octave 4
-	note G_, 1
-	note F#, 1
-	note F_, 1
+	G_ 1
+	F# 1
+	F_ 1
 	octave 5
-	note G_, 1
+	G_ 1
 	octave 4
-	note G_, 1
-	note F#, 1
-	note F_, 1
+	G_ 1
+	F# 1
+	F_ 1
 	octave 5
-	note G_, 1
+	G_ 1
 	octave 4
-	note G_, 1
-	note F#, 1
-	note F_, 1
+	G_ 1
+	F# 1
+	F_ 1
 	octave 5
-	note G_, 1
+	G_ 1
 	octave 4
-	note G_, 1
-	note F#, 1
-	note F_, 1
+	G_ 1
+	F# 1
+	F_ 1
 	octave 5
-	note G_, 1
+	G_ 1
 	octave 4
-	note G_, 1
-	note F#, 1
-	note F_, 1
+	G_ 1
+	F# 1
+	F_ 1
 	octave 5
-	note G_, 1
+	G_ 1
 	octave 4
-	note G_, 1
-	note F#, 1
-	note F_, 1
+	G_ 1
+	F# 1
+	F_ 1
 	octave 5
-	note G_, 1
+	G_ 1
 	octave 4
-	note G_, 1
-	note F#, 1
-	note F_, 1
+	G_ 1
+	F# 1
+	F_ 1
 	octave 5
-	note G_, 1
+	G_ 1
 	notetype 12, 12, 2
 	octave 4
-	note G_, 6
+	G_ 6
 	octave 3
-	note G_, 6
-	note G_, 12
-	note G_, 14
-	note G_, 6
-	note G_, 10
+	G_ 6
+	G_ 12
+	G_ 14
+	G_ 6
+	G_ 10
 	notetype 12, 9, 0
-	note F#, 10
+	F# 10
 	notetype 12, 12, 2
-	note G_, 6
-	note G_, 6
-	note G_, 12
-	note G_, 14
-	note G_, 6
-	note G_, 10
-	note G_, 10
+	G_ 6
+	G_ 6
+	G_ 12
+	G_ 14
+	G_ 6
+	G_ 10
+	G_ 10
 
 Music_WildBattle_branch_23225::
 	notetype 12, 12, 5
-	note G_, 6
-	note F#, 6
-	note E_, 4
-	note G_, 6
-	note A_, 6
-	note G_, 4
+	G_ 6
+	F# 6
+	E_ 4
+	G_ 6
+	A_ 6
+	G_ 4
 	octave 4
-	note G#, 12
-	note G_, 2
+	G# 12
+	G_ 2
 	rest 2
-	note G#, 2
-	note G_, 2
+	G# 2
+	G_ 2
 	rest 4
 	notetype 12, 11, 7
 	octave 5
-	note C#, 8
+	C# 8
 	notetype 12, 12, 5
 	octave 4
-	note C_, 6
+	C_ 6
 	octave 3
-	note A#, 6
-	note G#, 4
+	A# 6
+	G# 4
 	octave 4
-	note C#, 6
-	note C_, 6
+	C# 6
+	C_ 6
 	octave 3
-	note A#, 4
+	A# 4
 	octave 4
-	note F_, 6
-	note E_, 6
-	note D_, 4
+	F_ 6
+	E_ 6
+	D_ 4
 	notetype 12, 12, 7
 	octave 3
-	note A#, 4
+	A# 4
 	octave 4
-	note C_, 4
-	note D_, 4
-	note F_, 4
+	C_ 4
+	D_ 4
+	F_ 4
 	notetype 12, 12, 0
-	note G#, 16
+	G# 16
 	notetype 12, 11, 0
-	note G#, 16
+	G# 16
 	notetype 12, 4, 14
-	note G_, 16
+	G_ 16
 	notetype 12, 12, 7
-	note G_, 16
+	G_ 16
 	octave 3
-	note F_, 8
-	note A#, 8
+	F_ 8
+	A# 8
 	octave 4
-	note D_, 8
-	note F_, 8
+	D_ 8
+	F_ 8
 	notetype 12, 12, 0
-	note E_, 16
+	E_ 16
 	notetype 12, 12, 7
-	note E_, 16
+	E_ 16
 	octave 3
-	note F_, 8
-	note A#, 8
+	F_ 8
+	A# 8
 	octave 4
-	note D_, 8
-	note F_, 8
+	D_ 8
+	F_ 8
 	notetype 12, 12, 0
-	note G_, 16
+	G_ 16
 	notetype 12, 3, 15
 	octave 5
-	note C_, 16
+	C_ 16
 	notetype 12, 12, 5
 	octave 4
-	note E_, 12
-	note E_, 2
+	E_ 12
+	E_ 2
 	rest 2
-	note F_, 2
+	F_ 2
 	notetype 12, 12, 1
-	note E_, 4
+	E_ 4
 	notetype 12, 12, 5
 	rest 10
-	note F_, 12
-	note F_, 2
+	F_ 12
+	F_ 2
 	rest 2
-	note G#, 2
+	G# 2
 	notetype 12, 10, 3
-	note G_, 6
+	G_ 6
 	notetype 12, 12, 7
-	note F_, 8
+	F_ 8
 	loopchannel 0, Music_WildBattle_branch_23225
 
 
@@ -466,274 +466,274 @@
 	vibrato 0, 2, 0
 	notetype 12, 1, 1
 	octave 4
-	note C#, 1
+	C# 1
 	rest 1
-	note C#, 1
-	note C_, 1
-	note D_, 1
+	C# 1
+	C_ 1
+	D_ 1
 	rest 1
-	note D_, 1
-	note C_, 1
-	note D#, 1
+	D_ 1
+	C_ 1
+	D# 1
 	rest 1
-	note D#, 1
-	note C_, 1
-	note E_, 1
+	D# 1
+	C_ 1
+	E_ 1
 	rest 1
-	note E_, 1
-	note C_, 1
-	note F_, 1
+	E_ 1
+	C_ 1
+	F_ 1
 	rest 1
-	note F_, 1
-	note C_, 1
-	note F#, 1
+	F_ 1
+	C_ 1
+	F# 1
 	rest 1
-	note F#, 1
-	note C_, 1
-	note G_, 1
+	F# 1
+	C_ 1
+	G_ 1
 	rest 1
-	note G_, 1
-	note C_, 1
+	G_ 1
+	C_ 1
 	octave 3
-	note A#, 2
-	note B_, 2
+	A# 2
+	B_ 2
 
 Music_WildBattle_branch_232b5::
 	octave 4
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C#, 2
-	note G#, 2
-	note C#, 4
-	note G#, 2
-	note A#, 2
-	note G#, 2
-	note G_, 2
-	note C#, 2
-	note G#, 2
-	note C#, 4
-	note G#, 2
-	note A#, 2
-	note G#, 2
-	note F_, 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C# 2
+	G# 2
+	C# 4
+	G# 2
+	A# 2
+	G# 2
+	G_ 2
+	C# 2
+	G# 2
+	C# 4
+	G# 2
+	A# 2
+	G# 2
+	F_ 2
 	loopchannel 2, Music_WildBattle_branch_232b5
 
 Music_WildBattle_branch_232d8::
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note G#, 12
-	note G_, 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	G# 12
+	G_ 2
 	rest 2
-	note G#, 2
-	note G_, 2
+	G# 2
+	G_ 2
 	rest 4
-	note F_, 2
-	note E_, 2
-	note D_, 2
-	note C#, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C#, 2
-	note G#, 2
-	note C#, 2
-	note G#, 2
-	note C#, 2
-	note G#, 2
-	note C#, 2
-	note G#, 2
-	note C#, 2
-	note G#, 2
-	note C#, 2
-	note G#, 2
-	note C#, 2
-	note G#, 2
-	note C#, 2
-	note G#, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
+	F_ 2
+	E_ 2
+	D_ 2
+	C# 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C# 2
+	G# 2
+	C# 2
+	G# 2
+	C# 2
+	G# 2
+	C# 2
+	G# 2
+	C# 2
+	G# 2
+	C# 2
+	G# 2
+	C# 2
+	G# 2
+	C# 2
+	G# 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
 	octave 3
-	note A#, 2
+	A# 2
 	octave 4
-	note F_, 2
+	F_ 2
 	octave 3
-	note A#, 2
+	A# 2
 	octave 4
-	note F_, 2
+	F_ 2
 	octave 3
-	note A#, 2
+	A# 2
 	octave 4
-	note F_, 2
+	F_ 2
 	octave 3
-	note A#, 2
+	A# 2
 	octave 4
-	note F_, 2
+	F_ 2
 	octave 3
-	note A#, 2
+	A# 2
 	octave 4
-	note F_, 2
+	F_ 2
 	octave 3
-	note A#, 2
+	A# 2
 	octave 4
-	note F_, 2
+	F_ 2
 	octave 3
-	note A#, 2
+	A# 2
 	octave 4
-	note F_, 2
+	F_ 2
 	octave 3
-	note A#, 2
+	A# 2
 	octave 4
-	note F_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note F_, 2
-	note C_, 2
-	note F_, 2
-	note C_, 2
-	note F_, 2
-	note C_, 2
-	note F_, 2
-	note C_, 2
-	note F_, 2
-	note C_, 2
-	note F_, 2
-	note C_, 2
-	note F_, 2
-	note C_, 2
-	note F_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C#, 2
-	note G#, 2
-	note C#, 2
-	note G#, 2
-	note C#, 2
-	note G#, 2
-	note C#, 2
-	note G#, 2
-	note C#, 2
-	note G#, 2
-	note C#, 2
-	note G#, 2
-	note C#, 2
-	note G#, 2
-	note C#, 2
-	note G#, 2
+	F_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	F_ 2
+	C_ 2
+	F_ 2
+	C_ 2
+	F_ 2
+	C_ 2
+	F_ 2
+	C_ 2
+	F_ 2
+	C_ 2
+	F_ 2
+	C_ 2
+	F_ 2
+	C_ 2
+	F_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C# 2
+	G# 2
+	C# 2
+	G# 2
+	C# 2
+	G# 2
+	C# 2
+	G# 2
+	C# 2
+	G# 2
+	C# 2
+	G# 2
+	C# 2
+	G# 2
+	C# 2
+	G# 2
 	loopchannel 0, Music_WildBattle_branch_232d8
-; 0x233a6
\ No newline at end of file
+; 0x233a6
--- a/audio/music/yellow/meetjessiejames.asm
+++ b/audio/music/yellow/meetjessiejames.asm
@@ -1,4 +1,4 @@
-Music_MeetJessieJames_Ch1: ; 8316d (20:716d)
+Music_MeetJessieJames_Ch1:: ; 8316d (20:716d)
 	tempo 144
 	volume 7, 7
 	duty 3
@@ -5,306 +5,306 @@
 	vibrato 8, 1, 4
 	notetype 12, 11, 2
 	octave 3
-	note G#, 1
-	note G_, 1
-	note F#, 2
-	note F_, 2
-	note E_, 2
-	note D#, 2
-	note D_, 2
-	note C#, 2
-	note C_, 2
+	G# 1
+	G_ 1
+	F# 2
+	F_ 2
+	E_ 2
+	D# 2
+	D_ 2
+	C# 2
+	C_ 2
 	notetype 12, 11, 6
-	note D#, 12
-	note C_, 4
+	D# 12
+	C_ 4
 
-Music_MeetJessieJames_branch_83187:
+Music_MeetJessieJames_branch_83187::
 	notetype 12, 11, 2
 	octave 4
-	note D_, 16
+	D_ 16
 	rest 12
 	notetype 12, 11, 4
 	octave 3
-	note A#, 4
+	A# 4
 	rest 16
 	rest 8
 	notetype 12, 11, 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note A#, 2
-	note A_, 4
-	note D_, 1
-	note D#, 1
-	note D#, 2
-	note D#, 2
-	note D_, 2
-	note D#, 2
-	note D_, 2
-	note D#, 2
-	note F_, 2
-	note D_, 1
-	note D#, 1
-	note D#, 2
-	note D#, 2
-	note D_, 2
+	A# 2
+	A_ 4
+	D_ 1
+	D# 1
+	D# 2
+	D# 2
+	D_ 2
+	D# 2
+	D_ 2
+	D# 2
+	F_ 2
+	D_ 1
+	D# 1
+	D# 2
+	D# 2
+	D_ 2
 	octave 2
-	note A#, 4
+	A# 4
 	notetype 12, 11, 4
 	octave 3
-	note B_, 4
+	B_ 4
 	notetype 12, 11, 2
-	note D_, 1
-	note D#, 1
-	note D#, 2
-	note D#, 2
-	note D_, 2
-	note D#, 2
-	note D_, 2
-	note D#, 2
-	note F_, 2
-	note D_, 1
-	note D#, 1
-	note D#, 2
-	note D#, 2
-	note D_, 2
+	D_ 1
+	D# 1
+	D# 2
+	D# 2
+	D_ 2
+	D# 2
+	D_ 2
+	D# 2
+	F_ 2
+	D_ 1
+	D# 1
+	D# 2
+	D# 2
+	D_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	notetype 12, 11, 4
-	note A#, 4
+	A# 4
 	loopchannel 0, Music_MeetJessieJames_branch_83187
 
 
-Music_MeetJessieJames_Ch2: ; 831c8 (20:71c8)
+Music_MeetJessieJames_Ch2:: ; 831c8 (20:71c8)
 	duty 3
 	vibrato 6, 1, 5
 	notetype 12, 12, 2
 	octave 4
-	note D_, 1
-	note C#, 1
-	note C_, 2
+	D_ 1
+	C# 1
+	C_ 2
 	octave 3
-	note B_, 2
-	note A#, 2
-	note A_, 2
-	note G#, 2
-	note G_, 2
-	note F#, 2
+	B_ 2
+	A# 2
+	A_ 2
+	G# 2
+	G_ 2
+	F# 2
 	notetype 12, 12, 7
-	note A_, 12
+	A_ 12
 	octave 4
-	note C#, 4
+	C# 4
 
-Music_MeetJessieJames_branch_831df:
+Music_MeetJessieJames_branch_831df::
 	notetype 12, 12, 2
 	octave 3
-	note C#, 1
-	note D_, 1
-	note D_, 2
-	note D_, 2
-	note C#, 2
-	note D_, 2
-	note C#, 2
-	note D_, 2
-	note E_, 2
-	note C#, 1
-	note D_, 1
-	note D_, 2
-	note D_, 2
-	note C#, 2
+	C# 1
+	D_ 1
+	D_ 2
+	D_ 2
+	C# 2
+	D_ 2
+	C# 2
+	D_ 2
+	E_ 2
+	C# 1
+	D_ 1
+	D_ 2
+	D_ 2
+	C# 2
 	octave 2
-	note A_, 4
+	A_ 4
 	notetype 12, 12, 5
 	octave 4
-	note C#, 4
+	C# 4
 	notetype 12, 12, 2
-	note D_, 1
+	D_ 1
 	octave 3
-	note D_, 1
-	note D_, 2
-	note D_, 2
-	note C#, 2
-	note D_, 2
-	note C#, 2
-	note D_, 2
-	note E_, 2
-	note C#, 1
-	note D_, 1
-	note D_, 2
-	note D_, 2
-	note C#, 2
+	D_ 1
+	D_ 2
+	D_ 2
+	C# 2
+	D_ 2
+	C# 2
+	D_ 2
+	E_ 2
+	C# 1
+	D_ 1
+	D_ 2
+	D_ 2
+	C# 2
 	notetype 12, 12, 6
 	octave 4
-	note D_, 8
+	D_ 8
 	notetype 12, 12, 2
-	note D#, 6
-	note F_, 4
-	note D#, 4
+	D# 6
+	F_ 4
+	D# 4
 	octave 3
-	note A#, 2
+	A# 2
 	octave 4
-	note D#, 6
-	note F_, 4
-	note D#, 2
+	D# 6
+	F_ 4
+	D# 2
 	notetype 12, 12, 5
-	note D_, 4
+	D_ 4
 	notetype 12, 12, 2
-	note D#, 6
-	note F_, 4
-	note D#, 4
+	D# 6
+	F_ 4
+	D# 4
 	octave 3
-	note A#, 2
+	A# 2
 	octave 4
-	note D#, 4
-	note F_, 4
+	D# 4
+	F_ 4
 	notetype 12, 12, 5
-	note D#, 8
+	D# 8
 	loopchannel 0, Music_MeetJessieJames_branch_831df
 
 
-Music_MeetJessieJames_Ch3: ; 8322a (20:722a)
+Music_MeetJessieJames_Ch3:: ; 8322a (20:722a)
 	notetype 12, 1, 0
 	rest 16
 	rest 8
 	octave 4
-	note D_, 2
+	D_ 2
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note C_, 2
-	note D#, 2
+	C_ 2
+	D# 2
 
-Music_MeetJessieJames_branch_83235:
-	note D_, 1
+Music_MeetJessieJames_branch_83235::
+	D_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note A#, 2
-	note A_, 2
-	note D#, 2
-	note D_, 1
+	A# 2
+	A_ 2
+	D# 2
+	D_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note C_, 2
-	note D_, 2
-	note D#, 1
+	C_ 2
+	D_ 2
+	D# 1
 	rest 1
-	note A#, 1
+	A# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note A#, 1
+	A# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note A#, 1
+	A# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note A#, 1
+	A# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note A#, 1
+	A# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note A#, 1
+	A# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
 	octave 3
-	note A#, 1
+	A# 1
 	rest 1
 	octave 4
-	note C#, 1
+	C# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note A#, 1
+	A# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note A#, 1
+	A# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note A#, 1
+	A# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note A#, 1
+	A# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note A#, 1
+	A# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note A#, 1
+	A# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
 	octave 3
-	note A#, 1
+	A# 1
 	rest 1
 	octave 4
-	note C#, 1
+	C# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
 	loopchannel 0, Music_MeetJessieJames_branch_83235
 	endchannel
-; 0x832ba
\ No newline at end of file
+; 0x832ba
--- a/audio/music/yellow/surfingpikachu.asm
+++ b/audio/music/yellow/surfingpikachu.asm
@@ -1,4 +1,4 @@
-Music_SurfingPikachu_Ch1: ; 82ce8 (20:6ce8)
+Music_SurfingPikachu_Ch1:: ; 82ce8 (20:6ce8)
 	tempo 117
 	volume 7, 7
 	duty 3
@@ -5,687 +5,687 @@
 	vibrato 8, 1, 4
 	notetype 12, 11, 3
 	octave 3
-	note E_, 6
+	E_ 6
 	notetype 12, 11, 2
-	note F#, 2
+	F# 2
 	notetype 12, 11, 3
-	note E_, 6
+	E_ 6
 	notetype 12, 11, 2
-	note F#, 16
+	F# 16
 	rest 2
 	notetype 12, 11, 3
-	note E_, 6
+	E_ 6
 	notetype 12, 11, 2
-	note A_, 2
+	A_ 2
 	notetype 12, 11, 3
-	note E_, 6
+	E_ 6
 	notetype 12, 11, 2
-	note A_, 14
+	A_ 14
 	notetype 12, 11, 2
-	note D#, 2
-	note C#, 1
-	note D#, 1
+	D# 2
+	C# 1
+	D# 1
 	octave 2
-	note B_, 6
+	B_ 6
 	octave 3
-	note E_, 4
-	note E_, 4
-	note E_, 8
-	note G#, 4
-	note G#, 4
-	note G#, 2
+	E_ 4
+	E_ 4
+	E_ 8
+	G# 4
+	G# 4
+	G# 2
 
-Music_SurfingPikachu_branch_82d1a:
+Music_SurfingPikachu_branch_82d1a::
 	notetype 12, 11, 3
 	octave 3
-	note G#, 4
-	note E_, 4
-	note F#, 4
-	note E_, 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note G#, 2
-	note F#, 2
-	note E_, 2
-	note D#, 2
-	note E_, 2
-	note D#, 2
-	note C#, 6
-	note F#, 2
-	note A_, 8
+	G# 4
+	E_ 4
+	F# 4
+	E_ 2
+	A_ 2
+	G# 2
+	F# 2
+	G# 2
+	F# 2
+	E_ 2
+	D# 2
+	E_ 2
+	D# 2
+	C# 6
+	F# 2
+	A_ 8
 	octave 2
-	note B_, 6
+	B_ 6
 	octave 3
-	note E_, 2
-	note G#, 8
-	note G#, 4
-	note E_, 4
-	note F#, 4
-	note E_, 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note G#, 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note E_, 2
-	note G#, 2
-	note F#, 6
-	note E_, 2
-	note F#, 1
+	E_ 2
+	G# 8
+	G# 4
+	E_ 4
+	F# 4
+	E_ 2
+	A_ 2
+	G# 2
+	F# 2
+	G# 2
+	A_ 2
+	G# 2
+	F# 2
+	E_ 2
+	G# 2
+	F# 6
+	E_ 2
+	F# 1
 	rest 3
-	note A_, 4
+	A_ 4
 	duty 0
 	notetype 12, 11, 2
-	note G#, 1
-	note F#, 1
-	note G#, 2
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note E_, 2
-	note D#, 2
-	note F#, 2
-	note F#, 2
-	note D#, 2
-	note F#, 2
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note B_, 1
-	note A#, 1
-	note B_, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
-	note G_, 2
-	note G#, 2
-	note A_, 2
+	G# 1
+	F# 1
+	G# 2
+	B_ 2
+	A_ 2
+	G# 2
+	F# 2
+	E_ 2
+	D# 2
+	F# 2
+	F# 2
+	D# 2
+	F# 2
+	B_ 2
+	A_ 2
+	G# 2
+	F# 2
+	B_ 1
+	A# 1
+	B_ 2
+	G# 2
+	E_ 2
+	G# 2
+	G_ 2
+	G# 2
+	A_ 2
 	octave 4
-	note C#, 2
-	note C_, 2
-	note C#, 3
+	C# 2
+	C_ 2
+	C# 3
 	octave 3
-	note F#, 1
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note A_, 2
-	note E_, 3
-	note E_, 1
-	note B_, 2
-	note A_, 2
-	note G#, 6
-	note E_, 1
-	note F_, 1
-	note F#, 2
-	note F#, 2
-	note D#, 2
-	note F#, 2
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note B_, 1
-	note A#, 1
-	note B_, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
-	note G_, 2
-	note G#, 2
-	note A_, 2
+	F# 1
+	A_ 2
+	G# 2
+	F# 2
+	A_ 2
+	E_ 3
+	E_ 1
+	B_ 2
+	A_ 2
+	G# 6
+	E_ 1
+	F_ 1
+	F# 2
+	F# 2
+	D# 2
+	F# 2
+	B_ 2
+	A_ 2
+	G# 2
+	F# 2
+	B_ 1
+	A# 1
+	B_ 2
+	G# 2
+	E_ 2
+	G# 2
+	G_ 2
+	G# 2
+	A_ 2
 	octave 4
-	note C#, 2
-	note C_, 2
-	note C#, 3
+	C# 2
+	C_ 2
+	C# 3
 	octave 3
-	note F#, 1
-	note A_, 2
-	note G#, 2
-	note A_, 2
+	F# 1
+	A_ 2
+	G# 2
+	A_ 2
 	octave 4
-	note D#, 2
-	note E_, 2
-	note E_, 1
-	note D#, 1
-	note E_, 1
-	note D#, 1
-	note E_, 1
-	note D#, 1
-	note E_, 8
+	D# 2
+	E_ 2
+	E_ 1
+	D# 1
+	E_ 1
+	D# 1
+	E_ 1
+	D# 1
+	E_ 8
 	duty 3
 	loopchannel 0, Music_SurfingPikachu_branch_82d1a
 
 
-Music_SurfingPikachu_Ch2: ; 82d9d (20:6d9d)
+Music_SurfingPikachu_Ch2:: ; 82d9d (20:6d9d)
 	duty 3
 	vibrato 6, 1, 5
 	notetype 12, 12, 4
 	octave 3
-	note B_, 6
+	B_ 6
 	notetype 12, 12, 2
 	octave 4
-	note E_, 2
+	E_ 2
 	notetype 12, 12, 4
 	octave 3
-	note B_, 6
+	B_ 6
 	notetype 12, 12, 2
 	octave 4
-	note E_, 2
+	E_ 2
 	notetype 12, 11, 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note C#, 2
-	note D#, 2
-	note C#, 2
+	C# 2
+	D# 2
+	C# 2
 	octave 3
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
+	B_ 2
+	A_ 2
+	G# 2
+	F# 2
 	notetype 12, 12, 4
 	octave 4
-	note C#, 6
+	C# 6
 	notetype 12, 12, 2
-	note F#, 2
+	F# 2
 	notetype 12, 12, 4
-	note C#, 6
+	C# 6
 	notetype 12, 12, 2
-	note F#, 2
+	F# 2
 	notetype 12, 11, 2
-	note C#, 2
-	note D#, 2
-	note E_, 2
-	note D#, 2
-	note C#, 2
+	C# 2
+	D# 2
+	E_ 2
+	D# 2
+	C# 2
 	octave 3
-	note B_, 2
-	note A_, 2
-	note G#, 2
+	B_ 2
+	A_ 2
+	G# 2
 	notetype 12, 12, 2
-	note E_, 6
-	note B_, 4
-	note B_, 4
-	note B_, 8
-	note B_, 4
-	note B_, 4
-	note B_, 2
+	E_ 6
+	B_ 4
+	B_ 4
+	B_ 8
+	B_ 4
+	B_ 4
+	B_ 2
 
-Music_SurfingPikachu_branch_82de0:
+Music_SurfingPikachu_branch_82de0::
 	notetype 12, 12, 6
 	octave 4
-	note E_, 4
+	E_ 4
 	octave 3
-	note B_, 4
-	note A_, 4
+	B_ 4
+	A_ 4
 	octave 4
-	note C#, 4
+	C# 4
 	octave 3
-	note B_, 6
-	note A_, 2
-	note G#, 8
-	note F#, 6
-	note A_, 2
+	B_ 6
+	A_ 2
+	G# 8
+	F# 6
+	A_ 2
 	octave 4
-	note C#, 8
+	C# 8
 	octave 3
-	note E_, 6
-	note G#, 2
-	note B_, 8
+	E_ 6
+	G# 2
+	B_ 8
 	octave 4
-	note E_, 4
+	E_ 4
 	octave 3
-	note B_, 4
-	note A_, 4
+	B_ 4
+	A_ 4
 	octave 4
-	note C#, 4
+	C# 4
 	octave 3
-	note B_, 6
+	B_ 6
 	octave 4
-	note D#, 2
-	note E_, 8
-	note D#, 6
-	note C#, 2
-	note D#, 1
+	D# 2
+	E_ 8
+	D# 6
+	C# 2
+	D# 1
 	rest 3
-	note F#, 4
-	note E_, 10
+	F# 4
+	E_ 10
 	notetype 12, 12, 6
 	duty 2
-	note E_, 2
-	note D#, 2
-	note C#, 2
+	E_ 2
+	D# 2
+	C# 2
 	octave 3
-	note B_, 6
+	B_ 6
 	octave 4
-	note C#, 2
-	note D#, 4
+	C# 2
+	D# 4
 	octave 3
-	note B_, 4
+	B_ 4
 	octave 4
-	note E_, 6
-	note F#, 2
-	note G#, 8
-	note A_, 6
-	note G#, 2
-	note A_, 4
-	note F#, 4
-	note G#, 10
-	note E_, 2
-	note D#, 2
-	note C#, 2
+	E_ 6
+	F# 2
+	G# 8
+	A_ 6
+	G# 2
+	A_ 4
+	F# 4
+	G# 10
+	E_ 2
+	D# 2
+	C# 2
 	octave 3
-	note B_, 6
+	B_ 6
 	octave 4
-	note C#, 2
-	note D#, 4
+	C# 2
+	D# 4
 	octave 3
-	note B_, 4
+	B_ 4
 	octave 4
-	note E_, 6
-	note F#, 2
-	note G#, 8
-	note A_, 4
-	note F#, 4
-	note D#, 4
+	E_ 6
+	F# 2
+	G# 8
+	A_ 4
+	F# 4
+	D# 4
 	octave 5
-	note C#, 4
+	C# 4
 	octave 4
-	note B_, 8
+	B_ 8
 	notetype 12, 12, 2
 	octave 5
-	note E_, 4
+	E_ 4
 	notetype 12, 12, 6
 	duty 3
 	octave 3
-	note B_, 1
-	note A#, 1
-	note B_, 1
+	B_ 1
+	A# 1
+	B_ 1
 	octave 4
-	note C#, 1
+	C# 1
 	loopchannel 0, Music_SurfingPikachu_branch_82de0
 
 
-Music_SurfingPikachu_Ch3: ; 82e45 (20:6e45)
+Music_SurfingPikachu_Ch3:: ; 82e45 (20:6e45)
 	notetype 12, 1, 0
 	octave 4
-	note B_, 6
+	B_ 6
 	octave 5
-	note C#, 1
+	C# 1
 	rest 1
 	octave 4
-	note B_, 6
+	B_ 6
 	octave 5
-	note C#, 1
+	C# 1
 	rest 1
 	octave 4
-	note B_, 1
+	B_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 5
-	note C#, 1
+	C# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note C#, 1
+	C# 1
 	rest 1
 	octave 4
-	note A_, 6
+	A_ 6
 	octave 5
-	note C#, 1
+	C# 1
 	rest 1
 	octave 4
-	note A_, 6
+	A_ 6
 	octave 5
-	note C#, 1
+	C# 1
 	rest 1
 	octave 4
-	note A_, 1
+	A_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note C#, 1
+	C# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
 
-Music_SurfingPikachu_branch_82ea0:
-	note E_, 1
+Music_SurfingPikachu_branch_82ea0::
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
 	octave 5
-	note C#, 1
-	note C_, 1
-	note C#, 1
+	C# 1
+	C_ 1
+	C# 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
 	octave 5
-	note E_, 1
-	note D#, 1
-	note E_, 1
+	E_ 1
+	D# 1
+	E_ 1
 	rest 1
 	octave 4
-	note D#, 1
+	D# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note C#, 1
+	C# 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note G#, 1
+	G# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note G#, 1
+	G# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note C#, 1
+	C# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note C#, 1
+	C# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note B_, 1
-	note A#, 1
-	note B_, 1
+	B_ 1
+	A# 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note C#, 1
+	C# 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note G#, 1
+	G# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note G#, 1
+	G# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note C#, 1
+	C# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note C#, 1
+	C# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
 	loopchannel 0, Music_SurfingPikachu_branch_82ea0
-; 0x82fbe
\ No newline at end of file
+; 0x82fbe
--- a/audio/music/yellow/yellowintro.asm
+++ b/audio/music/yellow/yellowintro.asm
@@ -1,4 +1,4 @@
-Music_YellowIntro_Ch1: ; 7f65c (1f:765c)
+Music_YellowIntro_Ch1:: ; 7f65c (1f:765c)
 	tempo 116
 	volume 7, 7
 	duty 3
@@ -5,481 +5,481 @@
 	vibrato 8, 1, 4
 	notetype 12, 11, 2
 	octave 3
-	note G#, 2
-	note B_, 4
-	note B_, 4
-	note B_, 4
-	note B_, 4
-	note B_, 4
-	note B_, 3
-	note A#, 1
-	note B_, 2
-	note B_, 10
+	G# 2
+	B_ 4
+	B_ 4
+	B_ 4
+	B_ 4
+	B_ 4
+	B_ 3
+	A# 1
+	B_ 2
+	B_ 10
 	notetype 12, 11, 6
 	octave 4
-	note C#, 1
-	note C_, 1
-	note C#, 10
+	C# 1
+	C_ 1
+	C# 10
 	octave 3
-	note G#, 1
-	note G_, 1
-	note G#, 4
-	note B_, 4
+	G# 1
+	G_ 1
+	G# 4
+	B_ 4
 	octave 4
-	note E_, 4
-	note F#, 8
-	note E_, 8
+	E_ 4
+	F# 8
+	E_ 8
 	octave 3
-	note A_, 4
-	note B_, 4
+	A_ 4
+	B_ 4
 	octave 4
-	note C#, 4
+	C# 4
 	octave 3
-	note B_, 4
-	note G#, 6
+	B_ 4
+	G# 6
 	notetype 12, 11, 2
-	note B_, 2
+	B_ 2
 	notetype 12, 11, 6
-	note G#, 6
+	G# 6
 	notetype 12, 11, 2
-	note B_, 2
+	B_ 2
 	notetype 12, 11, 6
 	octave 4
-	note E_, 6
+	E_ 6
 	notetype 12, 11, 2
-	note G#, 2
+	G# 2
 	notetype 12, 11, 6
-	note E_, 6
+	E_ 6
 	notetype 12, 11, 2
-	note G#, 2
+	G# 2
 	notetype 12, 11, 6
 	octave 3
-	note A_, 4
-	note F#, 4
-	note A_, 4
-	note B_, 4
-	note F#, 4
-	note G#, 4
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note D#, 2
+	A_ 4
+	F# 4
+	A_ 4
+	B_ 4
+	F# 4
+	G# 4
+	A_ 2
+	G# 2
+	F# 2
+	D# 2
 	notetype 12, 11, 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note E_, 4
-	note E_, 4
-	note E_, 4
-	note E_, 2
-	note C#, 2
-	note F#, 4
-	note F#, 3
-	note D#, 1
-	note F#, 2
-	note F#, 8
+	E_ 4
+	E_ 4
+	E_ 4
+	E_ 2
+	C# 2
+	F# 4
+	F# 3
+	D# 1
+	F# 2
+	F# 8
 	notetype 12, 11, 6
-	note F#, 1
-	note F_, 1
-	note F#, 8
+	F# 1
+	F_ 1
+	F# 8
 	octave 3
-	note B_, 1
-	note A#, 1
-	note B_, 8
+	B_ 1
+	A# 1
+	B_ 8
 	octave 4
-	note F#, 1
-	note F_, 1
-	note F#, 2
+	F# 1
+	F_ 1
+	F# 2
 	notetype 12, 11, 3
-	note F#, 1
-	note E_, 1
-	note D#, 1
-	note C#, 1
+	F# 1
+	E_ 1
+	D# 1
+	C# 1
 	notetype 12, 11, 2
 	octave 3
-	note B_, 16
+	B_ 16
 	endchannel
 
 
-Music_YellowIntro_Ch2: ; 7f6d3 (1f:76d3)
+Music_YellowIntro_Ch2:: ; 7f6d3 (1f:76d3)
 	duty 2
 	vibrato 6, 1, 5
 	notetype 12, 12, 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note E_, 4
-	note E_, 4
-	note E_, 4
-	note E_, 4
-	note E_, 4
-	note E_, 3
-	note D#, 1
-	note E_, 2
-	note E_, 4
+	E_ 4
+	E_ 4
+	E_ 4
+	E_ 4
+	E_ 4
+	E_ 3
+	D# 1
+	E_ 2
+	E_ 4
 	notetype 12, 12, 5
-	note G#, 1
-	note G_, 1
-	note G#, 10
+	G# 1
+	G_ 1
+	G# 10
 	octave 3
-	note B_, 1
-	note A#, 1
-	note B_, 6
+	B_ 1
+	A# 1
+	B_ 6
 	notetype 12, 12, 7
 	octave 4
-	note E_, 4
-	note G#, 4
-	note B_, 4
+	E_ 4
+	G# 4
+	B_ 4
 	octave 5
-	note C#, 16
+	C# 16
 	octave 4
-	note A_, 4
-	note G#, 4
-	note F#, 4
-	note E_, 4
+	A_ 4
+	G# 4
+	F# 4
+	E_ 4
 	octave 3
-	note B_, 6
+	B_ 6
 	notetype 12, 12, 2
 	octave 4
-	note E_, 2
+	E_ 2
 	notetype 12, 12, 7
 	octave 3
-	note B_, 6
+	B_ 6
 	notetype 12, 12, 2
 	octave 4
-	note E_, 2
+	E_ 2
 	notetype 12, 12, 7
-	note G#, 6
+	G# 6
 	notetype 12, 12, 2
-	note B_, 2
+	B_ 2
 	notetype 12, 12, 7
-	note G#, 6
+	G# 6
 	notetype 12, 12, 2
-	note B_, 2
+	B_ 2
 	notetype 12, 12, 7
-	note C#, 4
+	C# 4
 	octave 3
-	note A_, 4
+	A_ 4
 	octave 4
-	note C#, 4
-	note D#, 4
-	note E_, 2
-	note D#, 2
-	note C#, 2
-	note D#, 4
-	note D#, 2
-	note C#, 2
+	C# 4
+	D# 4
+	E_ 2
+	D# 2
+	C# 2
+	D# 4
+	D# 2
+	C# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	notetype 12, 12, 3
 	octave 4
-	note E_, 2
-	note G#, 4
-	note G#, 4
-	note G#, 4
-	note G#, 2
-	note F#, 2
-	note A_, 4
-	note A_, 3
-	note F#, 1
-	note A_, 2
-	note A_, 4
+	E_ 2
+	G# 4
+	G# 4
+	G# 4
+	G# 2
+	F# 2
+	A_ 4
+	A_ 3
+	F# 1
+	A_ 2
+	A_ 4
 	notetype 12, 12, 7
-	note B_, 1
-	note A#, 1
-	note B_, 8
-	note B_, 1
-	note A#, 1
-	note B_, 8
-	note B_, 1
-	note A#, 1
-	note B_, 6
+	B_ 1
+	A# 1
+	B_ 8
+	B_ 1
+	A# 1
+	B_ 8
+	B_ 1
+	A# 1
+	B_ 6
 	notetype 12, 12, 3
-	note B_, 1
-	note A_, 1
-	note G#, 1
-	note F#, 1
+	B_ 1
+	A_ 1
+	G# 1
+	F# 1
 	notetype 12, 12, 2
-	note E_, 16
+	E_ 16
 	endchannel
 
 
-Music_YellowIntro_Ch3: ; 7f749 (1f:7749)
+Music_YellowIntro_Ch3:: ; 7f749 (1f:7749)
 	notetype 12, 1, 0
 	octave 4
-	note E_, 1
+	E_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note G#, 1
+	G# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note G#, 1
+	G# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note G#, 1
+	G# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note C#, 1
+	C# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note C#, 1
+	C# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note C#, 1
+	C# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 5
-	note C#, 1
+	C# 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 5
-	note C#, 1
+	C# 1
 	rest 1
 	octave 4
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 5
-	note C#, 1
+	C# 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 5
-	note C#, 1
+	C# 1
 	rest 1
 	octave 4
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 5
-	note E_, 1
+	E_ 1
 	rest 1
 	octave 4
-	note G#, 1
+	G# 1
 	rest 1
 	octave 5
-	note E_, 1
+	E_ 1
 	rest 1
 	octave 4
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 5
-	note E_, 1
+	E_ 1
 	rest 1
 	octave 4
-	note G#, 1
+	G# 1
 	rest 1
 	octave 5
-	note E_, 1
+	E_ 1
 	rest 1
 	octave 4
-	note G#, 1
+	G# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 5
-	note C#, 1
+	C# 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 5
-	note C#, 1
+	C# 1
 	rest 1
 	octave 4
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 5
-	note C#, 1
+	C# 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 5
-	note C#, 1
+	C# 1
 	rest 1
 	octave 4
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 5
-	note C#, 1
+	C# 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 5
-	note C#, 1
+	C# 1
 	rest 1
 	octave 4
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 5
-	note C#, 1
+	C# 1
 	rest 1
 	octave 4
-	note B_, 1
+	B_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 5
-	note E_, 1
+	E_ 1
 	rest 1
 	octave 4
-	note E_, 1
+	E_ 1
 	rest 1
 	octave 5
-	note E_, 1
+	E_ 1
 	rest 1
 	octave 4
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 5
-	note E_, 1
+	E_ 1
 	rest 1
 	octave 4
-	note E_, 1
+	E_ 1
 	rest 1
 	octave 5
-	note E_, 1
+	E_ 1
 	rest 1
 	octave 4
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 5
-	note F#, 1
+	F# 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 5
-	note C#, 1
+	C# 1
 	rest 3
-	note F#, 1
+	F# 1
 	rest 1
 	octave 4
-	note F#, 1
-	note G#, 1
-	note A_, 1
+	F# 1
+	G# 1
+	A_ 1
 	octave 5
-	note C#, 1
-	note E_, 1
+	C# 1
+	E_ 1
 	rest 15
 	endchannel
-; 0x7f860
\ No newline at end of file
+; 0x7f860
--- a/audio/music/yellow/yellowunusedsong.asm
+++ b/audio/music/yellow/yellowunusedsong.asm
@@ -1,4 +1,4 @@
-Music_YellowUnusedSong_Ch1: ; 82fbe (20:6fbe)
+Music_YellowUnusedSong_Ch1:: ; 82fbe (20:6fbe)
 	tempo 140
 	volume 7, 7
 	duty 3
@@ -5,47 +5,47 @@
 	vibrato 8, 1, 4
 	notetype 8, 11, 2
 	octave 3
-	note A_, 6
-	note A_, 2
-	note A_, 2
-	note A_, 2
-	note A#, 6
-	note A#, 6
-	note G_, 6
-	note G_, 6
-	note A_, 6
-	note E_, 6
-	note A_, 6
-	note A_, 2
-	note A_, 2
-	note A_, 2
-	note A#, 6
-	note A#, 6
-	note A_, 6
-	note G_, 6
-	note A_, 12
+	A_ 6
+	A_ 2
+	A_ 2
+	A_ 2
+	A# 6
+	A# 6
+	G_ 6
+	G_ 6
+	A_ 6
+	E_ 6
+	A_ 6
+	A_ 2
+	A_ 2
+	A_ 2
+	A# 6
+	A# 6
+	A_ 6
+	G_ 6
+	A_ 12
 
-Music_YellowUnusedSong_branch_82fde:
-	note A_, 6
-	note A_, 2
-	note A_, 2
-	note A_, 2
-	note A#, 6
-	note A#, 6
-	note G_, 6
-	note G_, 6
-	note A_, 6
-	note E_, 6
-	note A_, 6
-	note A_, 2
-	note A_, 2
-	note A_, 2
-	note A#, 6
-	note A#, 6
-	note G_, 6
+Music_YellowUnusedSong_branch_82fde::
+	A_ 6
+	A_ 2
+	A_ 2
+	A_ 2
+	A# 6
+	A# 6
+	G_ 6
+	G_ 6
+	A_ 6
+	E_ 6
+	A_ 6
+	A_ 2
+	A_ 2
+	A_ 2
+	A# 6
+	A# 6
+	G_ 6
 	octave 4
-	note D#, 6
-	note D_, 12
+	D# 6
+	D_ 12
 	rest 16
 	rest 16
 	rest 16
@@ -53,275 +53,275 @@
 	rest 16
 	rest 16
 	octave 3
-	note A_, 6
-	note A_, 2
-	note A_, 2
-	note A_, 2
-	note A#, 6
-	note A#, 6
-	note G_, 6
-	note G_, 6
-	note A_, 6
-	note E_, 6
-	note A_, 6
-	note A_, 2
-	note A_, 2
-	note A_, 2
-	note A#, 6
-	note A#, 6
-	note A_, 6
-	note G_, 6
-	note A_, 12
+	A_ 6
+	A_ 2
+	A_ 2
+	A_ 2
+	A# 6
+	A# 6
+	G_ 6
+	G_ 6
+	A_ 6
+	E_ 6
+	A_ 6
+	A_ 2
+	A_ 2
+	A_ 2
+	A# 6
+	A# 6
+	A_ 6
+	G_ 6
+	A_ 12
 	loopchannel 0, Music_YellowUnusedSong_branch_82fde
 
 
-Music_YellowUnusedSong_Ch2: ; 83010 (20:7010)
+Music_YellowUnusedSong_Ch2:: ; 83010 (20:7010)
 	duty 2
 	notetype 8, 12, 2
 	octave 4
-	note D_, 6
-	note D_, 2
-	note D_, 2
-	note D_, 2
-	note D#, 6
-	note D#, 6
-	note C_, 6
-	note C_, 6
-	note D_, 6
+	D_ 6
+	D_ 2
+	D_ 2
+	D_ 2
+	D# 6
+	D# 6
+	C_ 6
+	C_ 6
+	D_ 6
 	octave 3
-	note A_, 6
+	A_ 6
 	octave 4
-	note D_, 6
-	note D_, 2
-	note D_, 2
-	note D_, 2
-	note D#, 6
-	note D#, 6
-	note D_, 6
-	note A#, 6
-	note A_, 12
+	D_ 6
+	D_ 2
+	D_ 2
+	D_ 2
+	D# 6
+	D# 6
+	D_ 6
+	A# 6
+	A_ 12
 
-Music_YellowUnusedSong_branch_8302a:
-	note D_, 6
-	note D_, 2
-	note D_, 2
-	note D_, 2
-	note D#, 6
-	note D#, 6
-	note C_, 6
-	note C_, 6
-	note D_, 6
+Music_YellowUnusedSong_branch_8302a::
+	D_ 6
+	D_ 2
+	D_ 2
+	D_ 2
+	D# 6
+	D# 6
+	C_ 6
+	C_ 6
+	D_ 6
 	octave 3
-	note A_, 6
+	A_ 6
 	octave 4
-	note D_, 6
-	note D_, 2
-	note D_, 2
-	note D_, 2
-	note D#, 6
-	note D#, 6
-	note C_, 6
-	note G#, 6
-	note G_, 12
+	D_ 6
+	D_ 2
+	D_ 2
+	D_ 2
+	D# 6
+	D# 6
+	C_ 6
+	G# 6
+	G_ 12
 	notetype 8, 9, 0
 	octave 3
-	note D#, 16
-	note D#, 8
-	note D#, 16
-	note D#, 8
+	D# 16
+	D# 8
+	D# 16
+	D# 8
 	octave 2
-	note A#, 16
-	note A#, 8
+	A# 16
+	A# 8
 	octave 3
-	note D#, 12
-	note F_, 12
+	D# 12
+	F_ 12
 	notetype 8, 12, 2
 	octave 4
-	note D_, 6
-	note D_, 2
-	note D_, 2
-	note D_, 2
-	note D#, 6
-	note D#, 6
-	note C_, 6
-	note C_, 6
-	note D_, 6
+	D_ 6
+	D_ 2
+	D_ 2
+	D_ 2
+	D# 6
+	D# 6
+	C_ 6
+	C_ 6
+	D_ 6
 	octave 3
-	note A_, 6
+	A_ 6
 	octave 4
-	note D_, 6
-	note D_, 2
-	note D_, 2
-	note D_, 2
-	note D#, 6
-	note D#, 6
-	note D_, 6
-	note A#, 6
-	note A_, 12
+	D_ 6
+	D_ 2
+	D_ 2
+	D_ 2
+	D# 6
+	D# 6
+	D_ 6
+	A# 6
+	A_ 12
 	loopchannel 0, Music_YellowUnusedSong_branch_8302a
 
 
-Music_YellowUnusedSong_Ch3: ; 83068 (20:7068)
+Music_YellowUnusedSong_Ch3:: ; 83068 (20:7068)
 	notetype 12, 1, 0
 	vibrato 2, 1, 5
 	rest 16
 	rest 12
 	octave 4
-	note C_, 4
-	note D_, 8
-	note D#, 8
-	note G_, 8
-	note A#, 8
+	C_ 4
+	D_ 8
+	D# 8
+	G_ 8
+	A# 8
 
-Music_YellowUnusedSong_branch_83075:
-	note A_, 8
-	note A#, 8
-	note G_, 8
-	note A_, 4
-	note D_, 4
-	note A_, 8
-	note A#, 8
+Music_YellowUnusedSong_branch_83075::
+	A_ 8
+	A# 8
+	G_ 8
+	A_ 4
+	D_ 4
+	A_ 8
+	A# 8
 	octave 5
-	note C#, 8
-	note D_, 8
-	note D#, 16
-	note D#, 16
+	C# 8
+	D_ 8
+	D# 16
+	D# 16
 	octave 4
-	note A#, 16
+	A# 16
 	octave 5
-	note D#, 8
-	note F_, 8
+	D# 8
+	F_ 8
 	octave 4
-	note D_, 16
-	note D_, 16
+	D_ 16
+	D_ 16
 	octave 4
-	note D_, 8
-	note D#, 8
-	note G_, 8
-	note A#, 8
+	D_ 8
+	D# 8
+	G_ 8
+	A# 8
 	loopchannel 0, Music_YellowUnusedSong_branch_83075
 
 
-Music_YellowUnusedSong_Ch4: ; 83092 (20:7092)
+Music_YellowUnusedSong_Ch4:: ; 83092 (20:7092)
 	dspeed 12
-	dnote 4, snare3
+	snare3 4
 	dspeed 8
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
+	snare3 2
+	snare3 2
+	snare3 2
 	dspeed 12
-	dnote 4, snare3
-	dnote 4, snare3
-	dnote 4, snare3
-	dnote 4, snare3
-	dnote 4, snare3
-	dnote 4, snare3
-	dnote 4, snare3
+	snare3 4
+	snare3 4
+	snare3 4
+	snare3 4
+	snare3 4
+	snare3 4
+	snare3 4
 	dspeed 8
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
+	snare3 2
+	snare3 2
+	snare3 2
 	dspeed 12
-	dnote 4, snare3
-	dnote 4, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 4, snare3
-	dnote 4, snare3
+	snare3 4
+	snare3 4
+	snare3 2
+	snare3 2
+	snare3 2
+	snare3 2
+	snare3 4
+	snare3 4
 
-Music_YellowUnusedSong_branch_830c3:
-	dnote 4, snare3
+Music_YellowUnusedSong_branch_830c3::
+	snare3 4
 	dspeed 8
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
+	snare3 2
+	snare3 2
+	snare3 2
 	dspeed 12
-	dnote 4, snare3
-	dnote 4, snare3
-	dnote 4, snare3
-	dnote 4, snare3
-	dnote 4, snare3
-	dnote 4, snare3
-	dnote 4, snare3
+	snare3 4
+	snare3 4
+	snare3 4
+	snare3 4
+	snare3 4
+	snare3 4
+	snare3 4
 	dspeed 8
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
+	snare3 2
+	snare3 2
+	snare3 2
 	dspeed 12
-	dnote 4, snare3
-	dnote 4, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 4, snare3
-	dnote 4, snare3
-	dnote 4, snare3
+	snare3 4
+	snare3 4
+	snare3 2
+	snare3 2
+	snare3 2
+	snare3 2
+	snare3 4
+	snare3 4
+	snare3 4
 	dspeed 8
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
+	snare3 2
+	snare3 2
+	snare3 2
 	dspeed 12
-	dnote 4, snare3
+	snare3 4
 	dspeed 8
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
+	snare3 2
+	snare3 2
+	snare3 2
 	dspeed 12
-	dnote 4, snare3
+	snare3 4
 	dspeed 8
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
+	snare3 2
+	snare3 2
+	snare3 2
+	snare3 2
+	snare3 2
+	snare3 2
+	snare3 2
+	snare3 2
+	snare3 2
 	dspeed 12
-	dnote 4, snare3
+	snare3 4
 	dspeed 8
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
+	snare3 2
+	snare3 2
+	snare3 2
 	dspeed 12
-	dnote 4, snare3
-	dnote 4, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 4, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 4, snare3
+	snare3 4
+	snare3 4
+	snare3 2
+	snare3 2
+	snare3 2
+	snare3 2
+	snare3 4
+	snare3 2
+	snare3 2
+	snare3 4
 	dspeed 8
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
+	snare3 2
+	snare3 2
+	snare3 2
 	dspeed 12
-	dnote 4, snare3
-	dnote 4, snare3
-	dnote 4, snare3
-	dnote 4, snare3
-	dnote 4, snare3
-	dnote 4, snare3
-	dnote 4, snare3
+	snare3 4
+	snare3 4
+	snare3 4
+	snare3 4
+	snare3 4
+	snare3 4
+	snare3 4
 	dspeed 8
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
+	snare3 2
+	snare3 2
+	snare3 2
 	dspeed 12
-	dnote 4, snare3
-	dnote 4, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 4, snare3
-	dnote 4, snare3
+	snare3 4
+	snare3 4
+	snare3 2
+	snare3 2
+	snare3 2
+	snare3 2
+	snare3 4
+	snare3 4
 	loopchannel 0, Music_YellowUnusedSong_branch_830c3
-; 0x8316d
\ No newline at end of file
+; 0x8316d
--- a/audio/sfx/sfx_02_3a.asm
+++ b/audio/sfx/sfx_02_3a.asm
@@ -7,12 +7,12 @@
 	toggleperfectpitch
 	notetype 4, 11, 1
 	octave 3
-	note G#, 2
-	note G#, 2
-	note G#, 2
+	G# 2
+	G# 2
+	G# 2
 	notetype 12, 11, 3
 	octave 4
-	note E_, 4
+	E_ 4
 	endchannel
 
 
@@ -22,11 +22,11 @@
 	duty 2
 	notetype 4, 12, 1
 	octave 4
-	note E_, 2
-	note E_, 2
-	note E_, 2
+	E_ 2
+	E_ 2
+	E_ 2
 	notetype 12, 12, 3
-	note B_, 4
+	B_ 4
 	endchannel
 
 
@@ -34,15 +34,15 @@
 	executemusic
 	notetype 4, 1, 0
 	octave 4
-	note B_, 1
+	B_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
 	notetype 12, 1, 0
 	octave 4
-	note B_, 2
+	B_ 2
 	rest 2
 	endchannel
 ; 0xadae
\ No newline at end of file
--- a/audio/sfx/sfx_02_3b.asm
+++ b/audio/sfx/sfx_02_3b.asm
@@ -6,22 +6,22 @@
 	toggleperfectpitch
 	notetype 5, 11, 4
 	octave 4
-	note D_, 4
-	note C_, 4
+	D_ 4
+	C_ 4
 	octave 3
-	note A_, 8
+	A_ 8
 	notetype 5, 11, 2
 	octave 4
-	note D#, 2
-	note D#, 2
-	note D_, 2
-	note C_, 2
-	note C_, 2
+	D# 2
+	D# 2
+	D_ 2
+	C_ 2
+	C_ 2
 	octave 3
-	note A#, 2
+	A# 2
 	notetype 5, 11, 4
 	octave 4
-	note C_, 8
+	C_ 8
 	endchannel
 
 
@@ -31,18 +31,18 @@
 	duty 2
 	notetype 5, 12, 5
 	octave 4
-	note A_, 4
-	note F_, 4
-	note C_, 8
+	A_ 4
+	F_ 4
+	C_ 8
 	notetype 5, 12, 2
-	note A#, 2
-	note A#, 2
-	note A#, 2
-	note G_, 2
-	note G_, 2
-	note A#, 2
+	A# 2
+	A# 2
+	A# 2
+	G_ 2
+	G_ 2
+	A# 2
 	notetype 5, 12, 4
-	note A_, 8
+	A_ 8
 	endchannel
 
 
@@ -50,21 +50,21 @@
 	executemusic
 	notetype 5, 1, 0
 	octave 5
-	note F_, 4
-	note D#, 4
-	note C_, 8
-	note D#, 1
+	F_ 4
+	D# 4
+	C_ 8
+	D# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note A_, 8
+	A_ 8
 	endchannel
 ; 0xb362
\ No newline at end of file
--- a/audio/sfx/sfx_02_41.asm
+++ b/audio/sfx/sfx_02_41.asm
@@ -5,19 +5,19 @@
 	duty 2
 	notetype 5, 11, 1
 	octave 3
-	note A_, 2
-	note A_, 2
-	note G_, 2
-	note G_, 2
-	note F_, 2
-	note E_, 2
-	note F_, 2
-	note A_, 2
+	A_ 2
+	A_ 2
+	G_ 2
+	G_ 2
+	F_ 2
+	E_ 2
+	F_ 2
+	A_ 2
 	octave 4
-	note C_, 4
-	note E_, 4
+	C_ 4
+	E_ 4
 	octave 3
-	note F_, 4
+	F_ 4
 	endchannel
 
 
@@ -26,21 +26,21 @@
 	duty 2
 	notetype 5, 12, 2
 	octave 5
-	note F_, 2
-	note E_, 1
+	F_ 2
+	E_ 1
 	rest 1
-	note D_, 2
-	note C_, 1
+	D_ 2
+	C_ 1
 	rest 1
 	octave 4
-	note A#, 2
+	A# 2
 	octave 5
-	note C_, 2
-	note D_, 2
-	note E_, 2
-	note F_, 4
-	note G_, 4
-	note F_, 4
+	C_ 2
+	D_ 2
+	E_ 2
+	F_ 4
+	G_ 4
+	F_ 4
 	endchannel
 
 
@@ -48,31 +48,31 @@
 	executemusic
 	notetype 5, 1, 0
 	octave 5
-	note C_, 1
+	C_ 1
 	rest 1
 	octave 4
-	note F_, 2
+	F_ 2
 	octave 5
-	note C_, 1
+	C_ 1
 	rest 1
 	octave 4
-	note A#, 1
+	A# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
 	octave 5
-	note F_, 1
+	F_ 1
 	rest 3
-	note C_, 1
+	C_ 1
 	rest 3
 	octave 4
-	note F_, 2
+	F_ 2
 	rest 2
 	endchannel
 ; 0xb316
\ No newline at end of file
--- a/audio/sfx/sfx_02_42.asm
+++ b/audio/sfx/sfx_02_42.asm
@@ -6,20 +6,20 @@
 	toggleperfectpitch
 	notetype 5, 10, 4
 	octave 3
-	note A#, 4
+	A# 4
 	notetype 5, 11, 1
 	octave 4
-	note C_, 2
-	note C_, 1
-	note C_, 1
+	C_ 2
+	C_ 1
+	C_ 1
 	notetype 5, 10, 4
-	note D#, 4
+	D# 4
 	notetype 5, 11, 1
-	note F_, 2
-	note F_, 1
-	note F_, 1
+	F_ 2
+	F_ 1
+	F_ 1
 	notetype 5, 11, 4
-	note A#, 8
+	A# 8
 	endchannel
 
 
@@ -29,21 +29,21 @@
 	duty 2
 	notetype 5, 13, 1
 	octave 4
-	note G_, 2
-	note G_, 1
-	note G_, 1
+	G_ 2
+	G_ 1
+	G_ 1
 	notetype 5, 12, 4
-	note D#, 4
+	D# 4
 	notetype 5, 13, 1
-	note G#, 2
-	note G#, 1
-	note G#, 1
-	note A#, 2
-	note A#, 1
-	note A#, 1
+	G# 2
+	G# 1
+	G# 1
+	A# 2
+	A# 1
+	A# 1
 	notetype 5, 12, 4
 	octave 5
-	note D#, 8
+	D# 8
 	endchannel
 
 
@@ -51,10 +51,10 @@
 	executemusic
 	notetype 5, 1, 0
 	octave 4
-	note D#, 4
-	note G#, 4
-	note G_, 4
-	note F_, 4
-	note D#, 8
+	D# 4
+	G# 4
+	G_ 4
+	F_ 4
+	D# 8
 	endchannel
 ; 0xb3a7
\ No newline at end of file
--- a/audio/sfx/sfx_02_5e.asm
+++ b/audio/sfx/sfx_02_5e.asm
@@ -2,21 +2,21 @@
 	vibrato 16, 1, 4
 	notetype 12, 1, 0
 	octave 5
-	note E_, 2
-	note F_, 2
-	note G_, 4
-	note A_, 2
-	note G_, 2
+	E_ 2
+	F_ 2
+	G_ 4
+	A_ 2
+	G_ 2
 	octave 6
-	note C_, 4
-	note C_, 2
-	note D_, 2
-	note C_, 2
+	C_ 4
+	C_ 2
+	D_ 2
+	C_ 2
 	octave 5
-	note G_, 2
-	note A_, 2
-	note F_, 2
-	note G_, 8
+	G_ 2
+	A_ 2
+	F_ 2
+	G_ 8
 	rest 12
 	endchannel
 ; 0x83e1
\ No newline at end of file
--- a/audio/sfx/sfx_08_3a.asm
+++ b/audio/sfx/sfx_08_3a.asm
@@ -6,17 +6,17 @@
 	toggleperfectpitch
 	notetype 6, 11, 4
 	octave 4
-	note F_, 4
+	F_ 4
 	notetype 4, 11, 2
-	note C_, 2
-	note F_, 2
-	note C_, 2
+	C_ 2
+	F_ 2
+	C_ 2
 	notetype 6, 11, 3
-	note D#, 2
-	note D#, 2
-	note E_, 2
+	D# 2
+	D# 2
+	E_ 2
 	notetype 6, 11, 4
-	note F_, 8
+	F_ 8
 	endchannel
 
 
@@ -26,17 +26,17 @@
 	duty 2
 	notetype 6, 12, 4
 	octave 4
-	note A_, 4
+	A_ 4
 	notetype 4, 12, 2
-	note A_, 2
-	note A_, 2
-	note A_, 2
+	A_ 2
+	A_ 2
+	A_ 2
 	notetype 6, 12, 4
-	note A#, 2
-	note A#, 2
-	note A#, 2
+	A# 2
+	A# 2
+	A# 2
 	notetype 6, 12, 4
-	note A_, 8
+	A_ 8
 	endchannel
 
 
@@ -44,21 +44,21 @@
 	executemusic
 	notetype 6, 1, 0
 	octave 5
-	note A_, 4
+	A_ 4
 	notetype 4, 1, 0
-	note F_, 1
+	F_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
 	notetype 6, 1, 0
-	note G_, 1
+	G_ 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note A_, 8
+	A_ 8
 	endchannel
 ; 0x239c7
\ No newline at end of file
--- a/audio/sfx/sfx_08_3b.asm
+++ b/audio/sfx/sfx_08_3b.asm
@@ -6,22 +6,22 @@
 	toggleperfectpitch
 	notetype 5, 11, 4
 	octave 4
-	note D_, 4
-	note C_, 4
+	D_ 4
+	C_ 4
 	octave 3
-	note A_, 8
+	A_ 8
 	notetype 5, 11, 2
 	octave 4
-	note D#, 2
-	note D#, 2
-	note D_, 2
-	note C_, 2
-	note C_, 2
+	D# 2
+	D# 2
+	D_ 2
+	C_ 2
+	C_ 2
 	octave 3
-	note A#, 2
+	A# 2
 	notetype 5, 11, 4
 	octave 4
-	note C_, 8
+	C_ 8
 	endchannel
 
 
@@ -31,18 +31,18 @@
 	duty 2
 	notetype 5, 12, 5
 	octave 4
-	note A_, 4
-	note F_, 4
-	note C_, 8
+	A_ 4
+	F_ 4
+	C_ 8
 	notetype 5, 12, 2
-	note A#, 2
-	note A#, 2
-	note A#, 2
-	note G_, 2
-	note G_, 2
-	note A#, 2
+	A# 2
+	A# 2
+	A# 2
+	G_ 2
+	G_ 2
+	A# 2
 	notetype 5, 12, 4
-	note A_, 8
+	A_ 8
 	endchannel
 
 
@@ -50,21 +50,21 @@
 	executemusic
 	notetype 5, 1, 0
 	octave 5
-	note F_, 4
-	note D#, 4
-	note C_, 8
-	note D#, 1
+	F_ 4
+	D# 4
+	C_ 8
+	D# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note A_, 8
+	A_ 8
 	endchannel
 ; 0x23a13
\ No newline at end of file
--- a/audio/sfx/sfx_08_46.asm
+++ b/audio/sfx/sfx_08_46.asm
@@ -6,19 +6,19 @@
 	toggleperfectpitch
 	notetype 6, 11, 2
 	octave 3
-	note E_, 2
-	note F#, 2
-	note G#, 2
-	note G#, 1
-	note G#, 1
-	note B_, 2
+	E_ 2
+	F# 2
+	G# 2
+	G# 1
+	G# 1
+	B_ 2
 	octave 4
-	note C#, 2
-	note D#, 2
-	note D#, 1
-	note D#, 1
+	C# 2
+	D# 2
+	D# 1
+	D# 1
 	notetype 6, 11, 5
-	note E_, 8
+	E_ 8
 	endchannel
 
 
@@ -27,20 +27,20 @@
 	duty 2
 	notetype 6, 12, 2
 	octave 4
-	note G#, 2
-	note G#, 1
-	note G#, 1
-	note E_, 2
-	note E_, 1
-	note E_, 1
-	note B_, 2
-	note B_, 1
-	note B_, 1
-	note A_, 2
-	note A_, 1
-	note A_, 1
+	G# 2
+	G# 1
+	G# 1
+	E_ 2
+	E_ 1
+	E_ 1
+	B_ 2
+	B_ 1
+	B_ 1
+	A_ 2
+	A_ 1
+	A_ 1
 	notetype 6, 12, 5
-	note G#, 8
+	G# 8
 	endchannel
 
 
@@ -48,15 +48,15 @@
 	executemusic
 	notetype 6, 1, 0
 	octave 4
-	note B_, 2
+	B_ 2
 	rest 2
 	octave 5
-	note C#, 2
+	C# 2
 	rest 2
-	note D#, 2
+	D# 2
 	rest 2
-	note F#, 2
-	note G_, 2
-	note G#, 4
+	F# 2
+	G_ 2
+	G# 4
 	endchannel
 ; 0x23a53
\ No newline at end of file
--- a/audio/sfx/sfx_08_75.asm
+++ b/audio/sfx/sfx_08_75.asm
@@ -4,12 +4,12 @@
 	duty 2
 	notetype 10, 8, 7
 	octave 5
-	note G#, 8
+	G# 8
 	octave 6
-	note F#, 4
-	note E_, 4
+	F# 4
+	E_ 4
 	octave 5
-	note G#, 8
+	G# 8
 	endchannel
 
 
@@ -19,12 +19,12 @@
 	duty 2
 	notetype 11, 6, 7
 	octave 5
-	note G#, 8
+	G# 8
 	notetype 10, 6, 7
 	octave 6
-	note F#, 4
-	note E_, 4
+	F# 4
+	E_ 4
 	octave 5
-	note G#, 8
+	G# 8
 	endchannel
 ; 0x20902
\ No newline at end of file
--- a/audio/sfx/sfx_08_pokeflute_ch3.asm
+++ b/audio/sfx/sfx_08_pokeflute_ch3.asm
@@ -3,12 +3,12 @@
 	vibrato 16, 1, 4
 	notetype 8, 1, 0
 	octave 5
-	note E_, 3
-	note F_, 3
-	note G_, 7
-	note A_, 3
-	note G_, 3
+	E_ 3
+	F_ 3
+	G_ 7
+	A_ 3
+	G_ 3
 	octave 6
-	note C_, 13
+	C_ 13
 	endchannel
 ; 0x204aa
\ No newline at end of file
--- a/audio/sfx/sfx_08_unused2.asm
+++ b/audio/sfx/sfx_08_unused2.asm
@@ -7,13 +7,13 @@
 	toggleperfectpitch
 	notetype 6, 11, 1
 	octave 3
-	note G#, 2
-	note G#, 2
+	G# 2
+	G# 2
 	notetype 6, 11, 3
-	note G#, 2
-	note B_, 2
+	G# 2
+	B_ 2
 	octave 4
-	note E_, 8
+	E_ 8
 	endchannel
 
 
@@ -23,13 +23,13 @@
 	duty 2
 	notetype 6, 12, 1
 	octave 4
-	note E_, 2
-	note E_, 1
-	note E_, 1
+	E_ 2
+	E_ 1
+	E_ 1
 	notetype 6, 12, 3
-	note E_, 2
-	note G#, 2
-	note B_, 8
+	E_ 2
+	G# 2
+	B_ 8
 	endchannel
 
 
@@ -37,21 +37,21 @@
 	executemusic
 	notetype 6, 1, 0
 	octave 4
-	note B_, 1
+	B_ 1
 	rest 1
 	notetype 3, 1, 0
-	note B_, 1
+	B_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
 	notetype 6, 1, 0
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 5
-	note E_, 1
+	E_ 1
 	rest 1
 	octave 4
-	note B_, 4
+	B_ 4
 	rest 4
 	endchannel
 ; 0x22370
\ No newline at end of file
--- a/audio/sfx/sfx_1f_3a.asm
+++ b/audio/sfx/sfx_1f_3a.asm
@@ -7,12 +7,12 @@
 	toggleperfectpitch
 	notetype 4, 11, 1
 	octave 3
-	note G#, 2
-	note G#, 2
-	note G#, 2
+	G# 2
+	G# 2
+	G# 2
 	notetype 12, 11, 3
 	octave 4
-	note E_, 4
+	E_ 4
 	endchannel
 
 
@@ -22,11 +22,11 @@
 	duty 2
 	notetype 4, 12, 1
 	octave 4
-	note E_, 2
-	note E_, 2
-	note E_, 2
+	E_ 2
+	E_ 2
+	E_ 2
 	notetype 12, 12, 3
-	note B_, 4
+	B_ 4
 	endchannel
 
 
@@ -34,15 +34,15 @@
 	executemusic
 	notetype 4, 1, 0
 	octave 4
-	note B_, 1
+	B_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
 	notetype 12, 1, 0
 	octave 4
-	note B_, 2
+	B_ 2
 	rest 2
 	endchannel
 ; 0x7e887
\ No newline at end of file
--- a/audio/sfx/sfx_1f_3b.asm
+++ b/audio/sfx/sfx_1f_3b.asm
@@ -6,22 +6,22 @@
 	toggleperfectpitch
 	notetype 5, 11, 4
 	octave 4
-	note D_, 4
-	note C_, 4
+	D_ 4
+	C_ 4
 	octave 3
-	note A_, 8
+	A_ 8
 	notetype 5, 11, 2
 	octave 4
-	note D#, 2
-	note D#, 2
-	note D_, 2
-	note C_, 2
-	note C_, 2
+	D# 2
+	D# 2
+	D_ 2
+	C_ 2
+	C_ 2
 	octave 3
-	note A#, 2
+	A# 2
 	notetype 5, 11, 4
 	octave 4
-	note C_, 8
+	C_ 8
 	endchannel
 
 
@@ -31,18 +31,18 @@
 	duty 2
 	notetype 5, 12, 5
 	octave 4
-	note A_, 4
-	note F_, 4
-	note C_, 8
+	A_ 4
+	F_ 4
+	C_ 8
 	notetype 5, 12, 2
-	note A#, 2
-	note A#, 2
-	note A#, 2
-	note G_, 2
-	note G_, 2
-	note A#, 2
+	A# 2
+	A# 2
+	A# 2
+	G_ 2
+	G_ 2
+	A# 2
 	notetype 5, 12, 4
-	note A_, 8
+	A_ 8
 	endchannel
 
 
@@ -50,21 +50,21 @@
 	executemusic
 	notetype 5, 1, 0
 	octave 5
-	note F_, 4
-	note D#, 4
-	note C_, 8
-	note D#, 1
+	F_ 4
+	D# 4
+	C_ 8
+	D# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note A_, 8
+	A_ 8
 	endchannel
 ; 0x7ee74
\ No newline at end of file
--- a/audio/sfx/sfx_1f_41.asm
+++ b/audio/sfx/sfx_1f_41.asm
@@ -5,19 +5,19 @@
 	duty 2
 	notetype 5, 11, 1
 	octave 3
-	note A_, 2
-	note A_, 2
-	note G_, 2
-	note G_, 2
-	note F_, 2
-	note E_, 2
-	note F_, 2
-	note A_, 2
+	A_ 2
+	A_ 2
+	G_ 2
+	G_ 2
+	F_ 2
+	E_ 2
+	F_ 2
+	A_ 2
 	octave 4
-	note C_, 4
-	note E_, 4
+	C_ 4
+	E_ 4
 	octave 3
-	note F_, 4
+	F_ 4
 	endchannel
 
 
@@ -26,21 +26,21 @@
 	duty 2
 	notetype 5, 12, 2
 	octave 5
-	note F_, 2
-	note E_, 1
+	F_ 2
+	E_ 1
 	rest 1
-	note D_, 2
-	note C_, 1
+	D_ 2
+	C_ 1
 	rest 1
 	octave 4
-	note A#, 2
+	A# 2
 	octave 5
-	note C_, 2
-	note D_, 2
-	note E_, 2
-	note F_, 4
-	note G_, 4
-	note F_, 4
+	C_ 2
+	D_ 2
+	E_ 2
+	F_ 4
+	G_ 4
+	F_ 4
 	endchannel
 
 
@@ -48,31 +48,31 @@
 	executemusic
 	notetype 5, 1, 0
 	octave 5
-	note C_, 1
+	C_ 1
 	rest 1
 	octave 4
-	note F_, 2
+	F_ 2
 	octave 5
-	note C_, 1
+	C_ 1
 	rest 1
 	octave 4
-	note A#, 1
+	A# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
 	octave 5
-	note F_, 1
+	F_ 1
 	rest 3
-	note C_, 1
+	C_ 1
 	rest 3
 	octave 4
-	note F_, 2
+	F_ 2
 	rest 2
 	endchannel
 ; 0x7ee28
\ No newline at end of file
--- a/audio/sfx/sfx_1f_42.asm
+++ b/audio/sfx/sfx_1f_42.asm
@@ -6,20 +6,20 @@
 	toggleperfectpitch
 	notetype 5, 10, 4
 	octave 3
-	note A#, 4
+	A# 4
 	notetype 5, 11, 1
 	octave 4
-	note C_, 2
-	note C_, 1
-	note C_, 1
+	C_ 2
+	C_ 1
+	C_ 1
 	notetype 5, 10, 4
-	note D#, 4
+	D# 4
 	notetype 5, 11, 1
-	note F_, 2
-	note F_, 1
-	note F_, 1
+	F_ 2
+	F_ 1
+	F_ 1
 	notetype 5, 11, 4
-	note A#, 8
+	A# 8
 	endchannel
 
 
@@ -29,21 +29,21 @@
 	duty 2
 	notetype 5, 13, 1
 	octave 4
-	note G_, 2
-	note G_, 1
-	note G_, 1
+	G_ 2
+	G_ 1
+	G_ 1
 	notetype 5, 12, 4
-	note D#, 4
+	D# 4
 	notetype 5, 13, 1
-	note G#, 2
-	note G#, 1
-	note G#, 1
-	note A#, 2
-	note A#, 1
-	note A#, 1
+	G# 2
+	G# 1
+	G# 1
+	A# 2
+	A# 1
+	A# 1
 	notetype 5, 12, 4
 	octave 5
-	note D#, 8
+	D# 8
 	endchannel
 
 
@@ -51,10 +51,10 @@
 	executemusic
 	notetype 5, 1, 0
 	octave 4
-	note D#, 4
-	note G#, 4
-	note G_, 4
-	note F_, 4
-	note D#, 8
+	D# 4
+	G# 4
+	G_ 4
+	F_ 4
+	D# 8
 	endchannel
 ; 0x7eeb9
\ No newline at end of file
--- a/macros.asm
+++ b/macros.asm
@@ -164,41 +164,6 @@
 CH6		EQU 6
 CH7		EQU 7
 
-;Note Pitch
-C_		EQU $0
-C#		EQU $1
-D_		EQU $2
-D#		EQU $3
-E_		EQU $4
-F_		EQU $5
-F#		EQU $6
-G_		EQU $7
-G#		EQU $8
-A_		EQU $9
-A#		EQU $A
-B_		EQU $B
-
-;drum instruments
-snare1		EQU $01
-snare2		EQU $02
-snare3		EQU $03
-snare4		EQU $04
-snare5		EQU $05
-triangle1	EQU $06
-triangle2	EQU $07
-snare6		EQU $08
-snare7		EQU $09
-snare8		EQU $0a
-snare9		EQU $0b
-cymbal1		EQU $0c
-cymbal2		EQU $0d
-cymbal3		EQU $0e
-mutedsnare1	EQU $0f
-triangle3	EQU $10
-mutedsnare2	EQU $11
-mutedsnare3	EQU $12
-mutedsnare4	EQU $13
-
 unknownsfx0x10: MACRO
 	db $10
 	db \1
@@ -217,15 +182,149 @@
 	db \3
 ENDM
 
-;format: note pitch, length (in 16ths)
-note: MACRO
-	db (\1 << 4) | (\2 - 1)
+;format: pitch length (in 16ths)
+C_: MACRO
+	db $00 | (\1 - 1)
 ENDM
 
-;format: dnote length (in 16ths), instrument
-dnote: MACRO
+C#: MACRO
+	db $10 | (\1 - 1)
+ENDM
+
+D_: MACRO
+	db $20 | (\1 - 1)
+ENDM
+
+D#: MACRO
+	db $30 | (\1 - 1)
+ENDM
+
+E_: MACRO
+	db $40 | (\1 - 1)
+ENDM
+
+F_: MACRO
+	db $50 | (\1 - 1)
+ENDM
+
+F#: MACRO
+	db $60 | (\1 - 1)
+ENDM
+
+G_: MACRO
+	db $70 | (\1 - 1)
+ENDM
+
+G#: MACRO
+	db $80 | (\1 - 1)
+ENDM
+
+A_: MACRO
+	db $90 | (\1 - 1)
+ENDM
+
+A#: MACRO
+	db $A0 | (\1 - 1)
+ENDM
+
+B_: MACRO
 	db $B0 | (\1 - 1)
-	db \2
+ENDM
+
+;format: instrument length (in 16ths)
+snare1: MACRO
+	db $B0 | (\1 - 1)
+	db $01
+ENDM
+
+snare2: MACRO
+	db $B0 | (\1 - 1)
+	db $02
+ENDM
+
+snare3: MACRO
+	db $B0 | (\1 - 1)
+	db $03
+ENDM
+
+snare4: MACRO
+	db $B0 | (\1 - 1)
+	db $04
+ENDM
+
+snare5: MACRO
+	db $B0 | (\1 - 1)
+	db $05
+ENDM
+
+triangle1: MACRO
+	db $B0 | (\1 - 1)
+	db $06
+ENDM
+
+triangle2: MACRO
+	db $B0 | (\1 - 1)
+	db $07
+ENDM
+
+snare6: MACRO
+	db $B0 | (\1 - 1)
+	db $08
+ENDM
+
+snare7: MACRO
+	db $B0 | (\1 - 1)
+	db $09
+ENDM
+
+snare8: MACRO
+	db $B0 | (\1 - 1)
+	db $0A
+ENDM
+
+snare9: MACRO
+	db $B0 | (\1 - 1)
+	db $0B
+ENDM
+
+cymbal1: MACRO
+	db $B0 | (\1 - 1)
+	db $0C
+ENDM
+
+cymbal2: MACRO
+	db $B0 | (\1 - 1)
+	db $0D
+ENDM
+
+cymbal3: MACRO
+	db $B0 | (\1 - 1)
+	db $0E
+ENDM
+
+mutedsnare1: MACRO
+	db $B0 | (\1 - 1)
+	db $0F
+ENDM
+
+triangle3: MACRO
+	db $B0 | (\1 - 1)
+	db $10
+ENDM
+
+mutedsnare2: MACRO
+	db $B0 | (\1 - 1)
+	db $11
+ENDM
+
+mutedsnare3: MACRO
+	db $B0 | (\1 - 1)
+	db $12
+ENDM
+
+mutedsnare4: MACRO
+	db $B0 | (\1 - 1)
+	db $13
 ENDM
 
 ;format: rest length (in 16ths)