Make each note/instrument its own macro

27 files changed, 7526 insertions, 7479 deletions

diff --git a/audio/music/boosterpack.asm b/audio/music/boosterpack.asm
index e6e0e1c..c5287d0 100644
--- a/audio/music/boosterpack.asm
+++ b/audio/music/boosterpack.asm
@@ -7,39 +7,39 @@ Music_BoosterPack_Ch1: ; f7d60 (3d:7d60)
 	duty 1
 	speed 1
 	volume 160
-	note D#, 5
+	D# 5
 	volume 55
-	note D#, 1
+	D# 1
 	volume 160
-	note G_, 5
+	G_ 5
 	volume 55
-	note G_, 1
+	G_ 1
 	volume 160
-	note A#, 5
+	A# 5
 	volume 55
-	note A#, 2
+	A# 2
 	volume 160
-	note F_, 5
+	F_ 5
 	volume 55
-	note F_, 1
+	F_ 1
 	volume 160
-	note A_, 5
+	A_ 5
 	volume 55
-	note A_, 1
+	A_ 1
 	inc_octave
 	volume 160
-	note C_, 5
+	C_ 5
 	volume 55
-	note C_, 2
+	C_ 2
 	dec_octave
 	volume 160
-	note B_, 16
+	B_ 16
 	tie
-	note B_, 16
+	B_ 16
 	tie
-	note B_, 6
+	B_ 6
 	volume 55
-	note B_, 9
+	B_ 9
 	music_end
 
 
@@ -52,38 +52,38 @@ Music_BoosterPack_Ch2: ; f7d9e (3d:7d9e)
 	duty 1
 	speed 1
 	volume 144
-	note A#, 5
+	A# 5
 	volume 39
-	note A#, 1
+	A# 1
 	inc_octave
 	volume 144
-	note D#, 5
+	D# 5
 	volume 39
-	note D#, 1
+	D# 1
 	volume 144
-	note G_, 5
+	G_ 5
 	volume 39
-	note G_, 2
+	G_ 2
 	volume 144
-	note C_, 5
+	C_ 5
 	volume 39
-	note C_, 1
+	C_ 1
 	volume 144
-	note F_, 5
+	F_ 5
 	volume 39
-	note F_, 1
+	F_ 1
 	volume 144
-	note A_, 5
+	A_ 5
 	volume 39
-	note A_, 2
+	A_ 2
 	volume 144
-	note G_, 16
+	G_ 16
 	tie
-	note G_, 16
+	G_ 16
 	tie
-	note G_, 6
+	G_ 6
 	volume 39
-	note G_, 9
+	G_ 9
 	music_end
 
 
@@ -95,20 +95,20 @@ Music_BoosterPack_Ch3: ; f7ddb (3d:7ddb)
 	musice9 0
 	octave 1
 	speed 1
-	note D#, 6
-	note A#, 6
+	D# 6
+	A# 6
 	inc_octave
-	note D#, 7
+	D# 7
 	dec_octave
-	note F_, 6
+	F_ 6
 	inc_octave
-	note C_, 6
-	note F_, 7
+	C_ 6
+	F_ 7
 	dec_octave
-	note G_, 16
+	G_ 16
 	tie
-	note G_, 16
+	G_ 16
 	tie
-	note G_, 6
+	G_ 6
 	music_end
 ; 0xf7df8
diff --git a/audio/music/cardpop.asm b/audio/music/cardpop.asm
index bce5ef8..e536dca 100644
--- a/audio/music/cardpop.asm
+++ b/audio/music/cardpop.asm
@@ -12,104 +12,104 @@ Music_CardPop_Ch1: ; f703a (3d:703a)
 	Loop 2
 	octave 5
 	musice8 8
-	note F#, 1
-	note G_, 1
+	F# 1
+	G_ 1
 	musice8 6
-	note F#, 1
+	F# 1
 	volume 55
-	note F#, 1
+	F# 1
 	volume 144
-	note D_, 1
+	D_ 1
 	volume 55
-	note F#, 1
+	F# 1
 	dec_octave
 	volume 144
-	note A_, 1
+	A_ 1
 	inc_octave
 	volume 55
-	note D_, 1
+	D_ 1
 	dec_octave
 	volume 144
-	note G_, 1
+	G_ 1
 	volume 55
-	note A_, 1
+	A_ 1
 	volume 144
-	note F#, 1
+	F# 1
 	volume 55
-	note G_, 1
+	G_ 1
 	volume 144
-	note D_, 1
+	D_ 1
 	volume 55
-	note G_, 1
+	G_ 1
 	dec_octave
 	volume 144
-	note A_, 1
+	A_ 1
 	volume 55
 	inc_octave
-	note D_, 1
+	D_ 1
 	dec_octave
 	volume 144
-	note G_, 1
+	G_ 1
 	volume 55
-	note A_, 1
+	A_ 1
 	volume 144
-	note F#, 1
+	F# 1
 	volume 55
-	note G_, 1
+	G_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 12
 	rest 16
 	rest 14
 	octave 5
 	volume 144
 	musice8 8
-	note E_, 1
-	note F_, 1
+	E_ 1
+	F_ 1
 	musice8 6
-	note E_, 1
+	E_ 1
 	volume 55
-	note E_, 1
+	E_ 1
 	volume 144
-	note C_, 1
+	C_ 1
 	volume 55
-	note E_, 1
+	E_ 1
 	dec_octave
 	volume 144
-	note G_, 1
+	G_ 1
 	inc_octave
 	volume 55
-	note C_, 1
+	C_ 1
 	dec_octave
 	volume 144
-	note F_, 1
+	F_ 1
 	volume 55
-	note G_, 1
+	G_ 1
 	volume 144
-	note E_, 1
+	E_ 1
 	volume 55
-	note F_, 1
+	F_ 1
 	volume 144
-	note C_, 1
+	C_ 1
 	volume 55
-	note E_, 1
+	E_ 1
 	dec_octave
 	volume 144
-	note G_, 1
+	G_ 1
 	volume 55
 	inc_octave
-	note C_, 1
+	C_ 1
 	dec_octave
 	volume 144
-	note F_, 1
+	F_ 1
 	volume 55
-	note G_, 1
+	G_ 1
 	volume 144
-	note E_, 1
+	E_ 1
 	volume 55
-	note F_, 1
+	F_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 12
 	rest 16
 	volume 144
@@ -128,79 +128,79 @@ Music_CardPop_Ch2: ; f70df (3d:70df)
 	musice8 3
 	Loop 2
 	octave 2
-	note A_, 2
+	A_ 2
 	inc_octave
-	note A_, 2
+	A_ 2
 	inc_octave
-	note A_, 2
+	A_ 2
 	dec_octave
-	note A_, 2
+	A_ 2
 	inc_octave
 	inc_octave
-	note A_, 2
+	A_ 2
 	dec_octave
-	note A_, 2
+	A_ 2
 	dec_octave
-	note A_, 2
+	A_ 2
 	inc_octave
 	inc_octave
-	note A_, 2
+	A_ 2
 	dec_octave
 	dec_octave
-	note A_, 2
+	A_ 2
 	dec_octave
-	note A_, 2
+	A_ 2
 	inc_octave
-	note A_, 2
+	A_ 2
 	inc_octave
-	note A_, 2
+	A_ 2
 	inc_octave
-	note A_, 2
+	A_ 2
 	dec_octave
-	note A_, 2
+	A_ 2
 	dec_octave
-	note A_, 2
+	A_ 2
 	inc_octave
 	inc_octave
-	note A_, 2
+	A_ 2
 	EndLoop
 	Loop 2
 	octave 2
-	note G_, 2
+	G_ 2
 	inc_octave
-	note G_, 2
+	G_ 2
 	inc_octave
-	note G_, 2
+	G_ 2
 	dec_octave
-	note G_, 2
+	G_ 2
 	inc_octave
 	inc_octave
-	note G_, 2
+	G_ 2
 	dec_octave
-	note G_, 2
+	G_ 2
 	dec_octave
-	note G_, 2
+	G_ 2
 	inc_octave
 	inc_octave
-	note G_, 2
+	G_ 2
 	dec_octave
 	dec_octave
-	note G_, 2
+	G_ 2
 	dec_octave
-	note G_, 2
+	G_ 2
 	inc_octave
-	note G_, 2
+	G_ 2
 	inc_octave
-	note G_, 2
+	G_ 2
 	inc_octave
-	note G_, 2
+	G_ 2
 	dec_octave
-	note G_, 2
+	G_ 2
 	dec_octave
-	note G_, 2
+	G_ 2
 	inc_octave
 	inc_octave
-	note G_, 2
+	G_ 2
 	EndLoop
 	EndMainLoop
 
@@ -213,55 +213,55 @@ Music_CardPop_Ch3: ; f713a (3d:713a)
 	musice9 0
 	musice8 8
 	music_call Branch_f715b
-	note C_, 2
-	note C#, 2
+	C_ 2
+	C# 2
 	music_call Branch_f715b
-	note D_, 2
-	note C#, 2
+	D_ 2
+	C# 2
 	music_call Branch_f716c
-	note D_, 2
-	note C#, 2
+	D_ 2
+	C# 2
 	music_call Branch_f716c
-	note C_, 2
-	note C#, 2
+	C_ 2
+	C# 2
 	EndMainLoop
 
 Branch_f715b:
 	octave 1
-	note D_, 2
+	D_ 2
 	rest 2
-	note D_, 4
+	D_ 4
 	inc_octave
-	note D_, 2
+	D_ 2
 	dec_octave
-	note D_, 2
+	D_ 2
 	rest 2
-	note F#, 2
+	F# 2
 	rest 2
-	note G_, 2
+	G_ 2
 	rest 2
-	note G#, 2
+	G# 2
 	rest 2
-	note A_, 2
+	A_ 2
 	music_ret
 
 Branch_f716c:
 	octave 1
-	note C_, 2
+	C_ 2
 	rest 2
-	note C_, 4
+	C_ 4
 	inc_octave
-	note C_, 2
+	C_ 2
 	dec_octave
-	note C_, 2
+	C_ 2
 	rest 2
-	note E_, 2
+	E_ 2
 	rest 2
-	note F_, 2
+	F_ 2
 	rest 2
-	note F#, 2
+	F# 2
 	rest 2
-	note G_, 2
+	G_ 2
 	music_ret
 
 
@@ -270,30 +270,30 @@ Music_CardPop_Ch4: ; f717d (3d:717d)
 	octave 1
 	Loop 11
 	music_call Branch_f7196
-	note snare4, 4
-	note snare1, 2
-	note snare3, 2
-	note snare4, 2
-	note snare1, 2
+	snare4 4
+	snare1 2
+	snare3 2
+	snare4 2
+	snare1 2
 	EndLoop
 	music_call Branch_f7196
-	note snare4, 2
-	note snare2, 1
-	note snare2, 1
+	snare4 2
+	snare2 1
+	snare2 1
 	Loop 4
-	note snare1, 2
+	snare1 2
 	EndLoop
 	EndMainLoop
 
 Branch_f7196:
-	note bass, 2
-	note snare3, 2
-	note snare4, 4
-	note snare1, 2
-	note snare3, 2
-	note snare4, 2
-	note snare1, 2
-	note bass, 2
-	note snare1, 2
+	bass 2
+	snare3 2
+	snare4 4
+	snare1 2
+	snare3 2
+	snare4 2
+	snare1 2
+	bass 2
+	snare1 2
 	music_ret
 ; 0xf71a0
diff --git a/audio/music/challengehall.asm b/audio/music/challengehall.asm
index 109a12f..0bd1876 100644
--- a/audio/music/challengehall.asm
+++ b/audio/music/challengehall.asm
@@ -8,394 +8,394 @@ Music_ChallengeHall_Ch1: ; f9646 (3e:5646)
 	volume 128
 	musice8 8
 	speed 1
-	note A_, 7
-	note G#, 4
+	A_ 7
+	G# 4
 	volume 23
-	note G#, 4
+	G# 4
 	volume 128
-	note A_, 4
+	A_ 4
 	volume 23
-	note A_, 3
+	A_ 3
 	volume 128
-	note B_, 4
+	B_ 4
 	volume 23
-	note B_, 4
+	B_ 4
 	inc_octave
 	volume 128
-	note C#, 7
-	note C_, 4
+	C# 7
+	C_ 4
 	volume 23
-	note C_, 4
+	C_ 4
 	volume 128
-	note C#, 4
+	C# 4
 	volume 23
-	note C#, 3
+	C# 3
 	volume 128
-	note D_, 4
+	D_ 4
 	volume 23
-	note D_, 4
+	D_ 4
 	volume 128
-	note E_, 7
-	note D#, 4
+	E_ 7
+	D# 4
 	volume 23
-	note D#, 4
+	D# 4
 	volume 128
-	note E_, 4
+	E_ 4
 	volume 23
-	note E_, 3
+	E_ 3
 	volume 128
-	note F#, 4
+	F# 4
 	volume 23
-	note F#, 4
+	F# 4
 	volume 128
-	note G#, 4
+	G# 4
 	volume 23
-	note G#, 3
+	G# 3
 	volume 128
-	note A_, 8
-	note B_, 7
+	A_ 8
+	B_ 7
 	inc_octave
-	note C#, 4
-	note D_, 4
+	C# 4
+	D_ 4
 	MainLoop
 	volume 112
 	speed 1
 	octave 5
 	Loop 8
-	note E_, 4
-	note F#, 3
-	note E_, 4
-	note F#, 4
+	E_ 4
+	F# 3
+	E_ 4
+	F# 4
 	EndLoop
 	duty 1
 	volume 128
 	dec_octave
 	dec_octave
 	dec_octave
-	note B_, 7
+	B_ 7
 	volume 39
-	note B_, 8
+	B_ 8
 	dec_octave
 	volume 128
-	note B_, 7
-	note B_, 8
-	note B_, 7
+	B_ 7
+	B_ 8
+	B_ 7
 	volume 39
-	note B_, 8
+	B_ 8
 	volume 128
-	note B_, 7
+	B_ 7
 	volume 39
-	note B_, 8
+	B_ 8
 	volume 128
-	note B_, 7
+	B_ 7
 	volume 39
-	note B_, 8
+	B_ 8
 	volume 128
-	note B_, 15
+	B_ 15
 	inc_octave
-	note D_, 15
-	note E_, 15
+	D_ 15
+	E_ 15
 	inc_octave
 	duty 0
 	volume 160
 	music_call Branch_f9848
 	volume 160
-	note D_, 8
+	D_ 8
 	speed 10
-	note C#, 6
+	C# 6
 	tie
-	note C#, 6
+	C# 6
 	volume 55
 	speed 1
-	note C#, 15
+	C# 15
 	duty 1
 	volume 128
-	note C#, 7
+	C# 7
 	volume 39
-	note C#, 8
+	C# 8
 	rest 15
 	volume 128
-	note C#, 7
+	C# 7
 	volume 39
-	note C#, 8
+	C# 8
 	rest 15
 	volume 128
-	note D_, 7
+	D_ 7
 	volume 39
-	note D_, 8
+	D_ 8
 	rest 15
 	volume 128
-	note D_, 7
+	D_ 7
 	volume 39
-	note D_, 8
+	D_ 8
 	duty 0
 	volume 160
 	music_call Branch_f9848
 	volume 160
-	note C#, 8
+	C# 8
 	dec_octave
 	speed 10
-	note A_, 6
+	A_ 6
 	tie
-	note A_, 6
+	A_ 6
 	volume 55
 	speed 1
-	note A_, 15
+	A_ 15
 	duty 1
 	volume 128
 	inc_octave
-	note C#, 7
+	C# 7
 	volume 39
-	note C#, 8
+	C# 8
 	rest 15
 	volume 128
-	note C#, 7
+	C# 7
 	volume 39
-	note C#, 8
+	C# 8
 	rest 15
 	volume 128
-	note C#, 15
-	note D_, 15
-	note E_, 15
+	C# 15
+	D_ 15
+	E_ 15
 	volume 39
-	note E_, 15
+	E_ 15
 	duty 0
 	volume 160
-	note F#, 7
-	note F_, 7
+	F# 7
+	F_ 7
 	volume 55
-	note F_, 1
+	F_ 1
 	volume 160
-	note F#, 7
-	note F_, 8
-	note F#, 7
-	note G#, 7
+	F# 7
+	F_ 8
+	F# 7
+	G# 7
 	volume 55
-	note G#, 1
+	G# 1
 	volume 160
 	speed 10
-	note A_, 3
+	A_ 3
 	tie
 	speed 1
-	note A_, 15
+	A_ 15
 	dec_octave
 	duty 1
 	volume 128
-	note A_, 7
+	A_ 7
 	volume 39
-	note A_, 8
+	A_ 8
 	duty 0
 	volume 160
 	rest 15
 	inc_octave
-	note E_, 7
-	note D#, 7
+	E_ 7
+	D# 7
 	volume 55
-	note D#, 1
+	D# 1
 	volume 160
-	note E_, 7
-	note D#, 8
-	note E_, 7
-	note G#, 7
+	E_ 7
+	D# 8
+	E_ 7
+	G# 7
 	volume 55
-	note G#, 1
+	G# 1
 	volume 160
 	speed 9
-	note A_, 5
+	A_ 5
 	speed 1
 	dec_octave
 	duty 1
 	volume 128
-	note A_, 7
+	A_ 7
 	volume 39
-	note A_, 8
+	A_ 8
 	duty 0
 	volume 160
 	rest 15
 	inc_octave
-	note D_, 7
-	note C#, 8
-	note D_, 7
+	D_ 7
+	C# 8
+	D_ 7
 	volume 55
-	note D_, 8
+	D_ 8
 	volume 160
-	note A_, 7
+	A_ 7
 	volume 55
-	note A_, 8
+	A_ 8
 	volume 160
-	note G#, 15
+	G# 15
 	tie
-	note G#, 7
+	G# 7
 	volume 55
-	note G#, 8
+	G# 8
 	volume 160
-	note F#, 15
+	F# 15
 	volume 55
-	note F#, 7
+	F# 7
 	volume 160
-	note G#, 8
+	G# 8
 	speed 10
-	note E_, 6
+	E_ 6
 	speed 1
 	volume 55
-	note E_, 15
+	E_ 15
 	volume 160
-	note C#, 15
-	note D_, 15
-	note E_, 15
+	C# 15
+	D_ 15
+	E_ 15
 	volume 55
-	note E_, 15
+	E_ 15
 	volume 160
-	note F#, 7
-	note F_, 7
+	F# 7
+	F_ 7
 	volume 55
-	note F_, 1
+	F_ 1
 	volume 160
-	note F#, 7
-	note F_, 8
-	note F#, 6
+	F# 7
+	F_ 8
+	F# 6
 	volume 55
-	note F#, 1
+	F# 1
 	volume 160
-	note G#, 6
+	G# 6
 	volume 55
-	note G#, 2
+	G# 2
 	volume 160
 	speed 10
-	note A_, 3
+	A_ 3
 	speed 1
-	note G#, 15
+	G# 15
 	dec_octave
 	duty 1
 	volume 128
-	note B_, 7
+	B_ 7
 	inc_octave
 	duty 0
 	volume 160
-	note F#, 6
+	F# 6
 	volume 55
-	note F#, 2
+	F# 2
 	volume 160
-	note E_, 15
+	E_ 15
 	volume 55
-	note E_, 15
+	E_ 15
 	volume 160
-	note B_, 15
+	B_ 15
 	duty 1
 	volume 128
 	dec_octave
-	note B_, 7
+	B_ 7
 	inc_octave
 	duty 0
 	volume 160
-	note G#, 6
+	G# 6
 	volume 55
-	note G#, 2
+	G# 2
 	volume 160
 	speed 10
-	note A_, 3
+	A_ 3
 	speed 1
 	volume 55
-	note A_, 15
+	A_ 15
 	volume 160
-	note B_, 6
+	B_ 6
 	volume 55
-	note B_, 1
+	B_ 1
 	inc_octave
 	volume 160
-	note C#, 6
+	C# 6
 	volume 55
-	note C#, 2
+	C# 2
 	volume 160
 	speed 10
-	note D_, 3
+	D_ 3
 	speed 1
 	volume 55
-	note D_, 15
+	D_ 15
 	dec_octave
 	volume 160
-	note F#, 6
+	F# 6
 	volume 55
-	note F#, 1
+	F# 1
 	volume 160
-	note B_, 6
+	B_ 6
 	volume 55
-	note B_, 2
+	B_ 2
 	volume 160
-	note A_, 15
+	A_ 15
 	volume 55
-	note A_, 15
+	A_ 15
 	volume 160
-	note G#, 11
+	G# 11
 	volume 55
-	note G#, 4
+	G# 4
 	rest 7
 	volume 160
-	note A_, 7
+	A_ 7
 	volume 55
-	note A_, 1
+	A_ 1
 	volume 160
 	speed 10
-	note A_, 6
+	A_ 6
 	duty 2
 	volume 112
 	speed 1
 	inc_octave
-	note C#, 7
-	note C_, 8
-	note C#, 7
-	note D_, 8
-	note E_, 5
-	note F#, 5
-	note G#, 5
-	note A_, 4
-	note B_, 4
-	inc_octave
-	note C#, 4
-	note D_, 3
+	C# 7
+	C_ 8
+	C# 7
+	D_ 8
+	E_ 5
+	F# 5
+	G# 5
+	A_ 4
+	B_ 4
+	inc_octave
+	C# 4
+	D_ 3
 	EndMainLoop
 
 Branch_f9848:
-	note C#, 15
+	C# 15
 	volume 55
-	note C#, 15
+	C# 15
 	volume 160
-	note E_, 15
+	E_ 15
 	volume 55
-	note E_, 7
+	E_ 7
 	volume 160
-	note C#, 8
-	note D_, 15
+	C# 8
+	D_ 15
 	volume 55
-	note D_, 15
+	D_ 15
 	volume 160
-	note F#, 15
+	F# 15
 	volume 55
-	note F#, 7
+	F# 7
 	volume 160
-	note D_, 8
-	note E_, 7
+	D_ 8
+	E_ 7
 	volume 55
-	note E_, 8
+	E_ 8
 	volume 160
-	note A_, 15
-	note G#, 7
+	A_ 15
+	G# 7
 	volume 55
-	note G#, 8
+	G# 8
 	volume 160
-	note F#, 7
+	F# 7
 	volume 55
-	note F#, 8
+	F# 8
 	volume 160
-	note E_, 15
-	note D_, 7
+	E_ 15
+	D_ 7
 	volume 55
-	note D_, 8
+	D_ 8
 	dec_octave
 	volume 160
-	note B_, 15
+	B_ 15
 	volume 55
-	note B_, 7
+	B_ 7
 	inc_octave
 	music_ret
 
@@ -415,284 +415,284 @@ Music_ChallengeHall_Ch2: ; f9883 (3e:5883)
 	volume 144
 	musice8 8
 	speed 10
-	note E_, 6
+	E_ 6
 	tie
-	note E_, 6
+	E_ 6
 	speed 1
-	note E_, 7
+	E_ 7
 	volume 39
-	note E_, 8
+	E_ 8
 	dec_octave
 	volume 128
-	note E_, 7
-	note E_, 8
-	note E_, 7
+	E_ 7
+	E_ 8
+	E_ 7
 	volume 39
-	note E_, 8
+	E_ 8
 	volume 128
-	note E_, 7
+	E_ 7
 	volume 39
-	note E_, 8
+	E_ 8
 	volume 128
-	note E_, 7
+	E_ 7
 	volume 39
-	note E_, 8
+	E_ 8
 	volume 128
-	note E_, 15
-	note F#, 15
-	note G#, 15
+	E_ 15
+	F# 15
+	G# 15
 	music_call Branch_f9a28
-	note B_, 8
+	B_ 8
 	speed 10
-	note A_, 6
+	A_ 6
 	tie
-	note A_, 6
+	A_ 6
 	speed 1
 	rest 15
 	duty 1
 	volume 128
-	note A_, 7
+	A_ 7
 	volume 39
-	note A_, 8
+	A_ 8
 	rest 15
 	volume 128
-	note A_, 7
+	A_ 7
 	volume 39
-	note A_, 8
+	A_ 8
 	rest 15
 	volume 128
-	note B_, 7
+	B_ 7
 	volume 39
-	note B_, 8
+	B_ 8
 	rest 15
 	volume 128
-	note B_, 7
+	B_ 7
 	volume 39
-	note B_, 8
+	B_ 8
 	music_call Branch_f9a28
-	note G#, 8
+	G# 8
 	speed 10
-	note E_, 6
+	E_ 6
 	tie
-	note E_, 6
+	E_ 6
 	speed 1
 	rest 15
 	duty 1
 	volume 128
-	note A_, 7
+	A_ 7
 	volume 39
-	note A_, 8
+	A_ 8
 	rest 15
 	volume 128
-	note A_, 7
+	A_ 7
 	volume 39
-	note A_, 8
+	A_ 8
 	rest 15
 	volume 128
-	note A_, 15
-	note B_, 15
+	A_ 15
+	B_ 15
 	inc_octave
-	note C#, 15
+	C# 15
 	volume 39
-	note C#, 15
+	C# 15
 	volume 128
-	note D_, 7
+	D_ 7
 	volume 39
-	note D_, 8
+	D_ 8
 	rest 15
 	dec_octave
 	volume 128
-	note A_, 7
+	A_ 7
 	volume 39
-	note A_, 8
+	A_ 8
 	rest 15
 	inc_octave
 	volume 128
-	note D_, 7
+	D_ 7
 	duty 2
 	volume 96
 	inc_octave
-	note D_, 8
-	note A_, 7
+	D_ 8
+	A_ 7
 	volume 39
-	note A_, 8
+	A_ 8
 	inc_octave
 	volume 96
-	note D_, 7
+	D_ 7
 	volume 39
-	note D_, 8
+	D_ 8
 	volume 96
 	Loop 4
-	note E_, 4
-	note F#, 3
-	note E_, 4
-	note F#, 4
+	E_ 4
+	F# 3
+	E_ 4
+	F# 4
 	EndLoop
 	volume 39
-	note F#, 5
+	F# 5
 	rest 10
 	dec_octave
 	dec_octave
 	duty 1
 	volume 128
-	note C#, 7
+	C# 7
 	inc_octave
 	duty 2
 	volume 96
-	note E_, 8
-	note A_, 7
+	E_ 8
+	A_ 7
 	volume 39
-	note A_, 8
+	A_ 8
 	inc_octave
 	volume 96
-	note C#, 7
+	C# 7
 	volume 39
-	note C#, 8
+	C# 8
 	volume 80
 	Loop 4
-	note D_, 4
-	note E_, 3
-	note D_, 4
-	note E_, 4
+	D_ 4
+	E_ 3
+	D_ 4
+	E_ 4
 	EndLoop
 	dec_octave
-	note B_, 15
+	B_ 15
 	inc_octave
-	note D_, 7
+	D_ 7
 	volume 39
-	note D_, 8
+	D_ 8
 	volume 80
-	note C#, 15
+	C# 15
 	duty 1
 	volume 128
 	octave 2
-	note B_, 7
+	B_ 7
 	inc_octave
 	inc_octave
 	vibrato_type 1
 	duty 2
 	volume 80
-	note B_, 8
+	B_ 8
 	inc_octave
 	speed 10
-	note C#, 6
+	C# 6
 	volume 39
 	speed 1
-	note C#, 15
+	C# 15
 	vibrato_type 8
 	duty 0
 	volume 112
 	octave 2
-	note E_, 15
-	note F#, 15
-	note A#, 15
+	E_ 15
+	F# 15
+	A# 15
 	rest 15
 	duty 1
 	volume 128
 	inc_octave
-	note D_, 7
+	D_ 7
 	volume 39
-	note D_, 8
+	D_ 8
 	rest 15
 	dec_octave
 	volume 128
-	note B_, 7
+	B_ 7
 	volume 39
-	note B_, 8
+	B_ 8
 	rest 15
 	inc_octave
 	volume 128
-	note D_, 7
+	D_ 7
 	inc_octave
 	duty 2
 	volume 96
-	note D_, 8
-	note A_, 7
+	D_ 8
+	A_ 7
 	volume 39
-	note A_, 8
+	A_ 8
 	inc_octave
 	volume 96
-	note D_, 7
+	D_ 7
 	volume 39
-	note D_, 8
+	D_ 8
 	volume 96
 	Loop 2
-	note E_, 4
-	note F#, 3
-	note E_, 4
-	note F#, 4
+	E_ 4
+	F# 3
+	E_ 4
+	F# 4
 	EndLoop
 	duty 0
 	volume 112
 	dec_octave
 	dec_octave
-	note F_, 15
+	F_ 15
 	rest 7
-	note F_, 6
+	F_ 6
 	rest 2
 	speed 10
-	note F#, 3
+	F# 3
 	speed 1
 	rest 15
 	duty 1
 	volume 128
-	note C#, 7
+	C# 7
 	duty 0
 	volume 112
-	note E_, 6
+	E_ 6
 	rest 2
 	speed 10
-	note F#, 3
+	F# 3
 	speed 1
 	rest 15
 	dec_octave
 	duty 1
 	volume 128
-	note B_, 7
+	B_ 7
 	inc_octave
 	duty 0
 	volume 112
-	note D_, 6
+	D_ 6
 	rest 2
-	note E_, 15
+	E_ 15
 	duty 1
 	volume 128
-	note E_, 7
+	E_ 7
 	volume 39
-	note E_, 8
+	E_ 8
 	duty 0
 	volume 112
-	note D_, 11
+	D_ 11
 	rest 4
 	duty 1
 	volume 128
 	dec_octave
-	note B_, 7
+	B_ 7
 	inc_octave
 	duty 0
 	volume 112
-	note D_, 6
+	D_ 6
 	rest 2
-	note C#, 15
+	C# 15
 	duty 1
 	volume 128
 	musice8 7
-	note C#, 5
-	note C#, 5
-	note C#, 5
+	C# 5
+	C# 5
+	C# 5
 	musice8 8
-	note C#, 7
+	C# 7
 	volume 39
-	note C#, 8
+	C# 8
 	volume 128
-	note C#, 7
+	C# 7
 	volume 39
-	note C#, 8
+	C# 8
 	duty 0
 	volume 160
-	note A_, 7
+	A_ 7
 	volume 55
-	note A_, 8
+	A_ 8
 	rest 15
 	speed 10
 	rest 3
@@ -701,70 +701,70 @@ Music_ChallengeHall_Ch2: ; f9883 (3e:5883)
 Branch_f9a28:
 	duty 0
 	volume 112
-	note A_, 15
+	A_ 15
 	duty 1
 	volume 128
-	note A_, 7
+	A_ 7
 	volume 39
-	note A_, 8
+	A_ 8
 	duty 0
 	volume 112
 	inc_octave
-	note C#, 15
+	C# 15
 	dec_octave
 	duty 1
 	volume 128
-	note A_, 7
+	A_ 7
 	duty 0
 	volume 112
-	note A_, 8
-	note B_, 15
+	A_ 8
+	B_ 15
 	duty 1
 	volume 128
-	note B_, 7
+	B_ 7
 	volume 39
-	note B_, 8
+	B_ 8
 	duty 0
 	volume 112
 	inc_octave
-	note D_, 15
+	D_ 15
 	dec_octave
 	duty 1
 	volume 128
-	note B_, 7
+	B_ 7
 	duty 0
 	volume 112
-	note B_, 8
+	B_ 8
 	inc_octave
-	note C#, 7
+	C# 7
 	volume 55
-	note C#, 8
+	C# 8
 	duty 1
 	volume 128
-	note C#, 7
+	C# 7
 	volume 39
-	note C#, 8
+	C# 8
 	duty 0
 	volume 112
-	note E_, 7
+	E_ 7
 	rest 8
-	note E_, 7
+	E_ 7
 	rest 8
 	volume 112
-	note D_, 15
+	D_ 15
 	duty 1
 	volume 128
-	note D_, 7
+	D_ 7
 	volume 39
-	note D_, 8
+	D_ 8
 	dec_octave
 	duty 0
 	volume 112
-	note G#, 15
+	G# 15
 	inc_octave
 	duty 1
 	volume 128
-	note D_, 7
+	D_ 7
 	dec_octave
 	duty 0
 	volume 112
@@ -785,27 +785,27 @@ Music_ChallengeHall_Ch3: ; f9a92 (3e:5a92)
 	MainLoop
 	octave 1
 	musice8 8
-	note E_, 6
+	E_ 6
 	tie
-	note E_, 6
+	E_ 6
 	speed 1
 	inc_octave
-	note E_, 7
+	E_ 7
 	rest 8
 	dec_octave
 	musice8 7
-	note E_, 7
-	note E_, 8
+	E_ 7
+	E_ 8
 	musice8 8
-	note E_, 7
+	E_ 7
 	rest 8
-	note E_, 7
+	E_ 7
 	rest 8
-	note E_, 7
+	E_ 7
 	rest 8
-	note E_, 15
-	note F#, 15
-	note G#, 15
+	E_ 15
+	F# 15
+	G# 15
 	music_call Branch_f9b7d
 	music_call Branch_f9b92
 	Loop 3
@@ -813,168 +813,168 @@ Music_ChallengeHall_Ch3: ; f9a92 (3e:5a92)
 	EndLoop
 	music_call Branch_f9b92
 	music_call Branch_f9b7d
-	note A_, 15
+	A_ 15
 	inc_octave
-	note E_, 7
+	E_ 7
 	rest 8
 	dec_octave
-	note E_, 15
+	E_ 15
 	inc_octave
-	note E_, 7
+	E_ 7
 	rest 8
 	dec_octave
-	note A_, 7
+	A_ 7
 	rest 8
-	note A_, 15
-	note B_, 15
+	A_ 15
+	B_ 15
 	inc_octave
-	note C#, 15
+	C# 15
 	dec_octave
 	Loop 2
-	note D_, 15
+	D_ 15
 	inc_octave
-	note A_, 7
+	A_ 7
 	rest 8
 	dec_octave
-	note A_, 15
+	A_ 15
 	inc_octave
-	note F#, 7
+	F# 7
 	rest 8
 	dec_octave
 	EndLoop
-	note C#, 15
+	C# 15
 	inc_octave
-	note A_, 7
+	A_ 7
 	rest 8
 	dec_octave
-	note A_, 15
+	A_ 15
 	inc_octave
-	note A_, 7
+	A_ 7
 	rest 8
 	dec_octave
-	note C#, 15
+	C# 15
 	inc_octave
-	note A_, 7
+	A_ 7
 	rest 8
 	dec_octave
-	note A_, 15
+	A_ 15
 	inc_octave
-	note E_, 7
+	E_ 7
 	rest 8
 	dec_octave
-	note B_, 15
+	B_ 15
 	inc_octave
-	note B_, 7
+	B_ 7
 	rest 8
 	dec_octave
-	note F#, 15
+	F# 15
 	inc_octave
-	note B_, 7
+	B_ 7
 	rest 8
 	dec_octave
-	note E_, 15
+	E_ 15
 	inc_octave
-	note B_, 7
+	B_ 7
 	rest 8
 	dec_octave
-	note G#, 15
+	G# 15
 	inc_octave
-	note G#, 7
+	G# 7
 	rest 8
 	dec_octave
-	note A_, 15
+	A_ 15
 	inc_octave
 	inc_octave
-	note C#, 7
+	C# 7
 	rest 8
 	dec_octave
 	dec_octave
-	note G_, 15
+	G_ 15
 	inc_octave
 	inc_octave
-	note C#, 7
+	C# 7
 	rest 8
 	dec_octave
 	dec_octave
-	note F#, 7
+	F# 7
 	rest 8
-	note F#, 15
-	note G#, 15
-	note A#, 15
-	note B_, 15
+	F# 15
+	G# 15
+	A# 15
+	B_ 15
 	inc_octave
-	note B_, 7
+	B_ 7
 	rest 8
 	dec_octave
-	note C#, 15
+	C# 15
 	inc_octave
-	note F#, 7
+	F# 7
 	rest 8
 	dec_octave
-	note D_, 15
+	D_ 15
 	inc_octave
-	note B_, 7
+	B_ 7
 	rest 8
 	dec_octave
-	note D#, 15
+	D# 15
 	inc_octave
-	note F#, 7
+	F# 7
 	rest 8
 	dec_octave
-	note E_, 15
+	E_ 15
 	inc_octave
-	note E_, 7
+	E_ 7
 	rest 8
 	dec_octave
-	note F_, 15
+	F_ 15
 	inc_octave
-	note G#, 7
+	G# 7
 	rest 8
 	dec_octave
-	note F#, 15
+	F# 15
 	inc_octave
 	inc_octave
-	note C#, 7
+	C# 7
 	rest 8
 	dec_octave
 	dec_octave
-	note C#, 15
+	C# 15
 	inc_octave
-	note A_, 7
+	A_ 7
 	rest 8
 	dec_octave
-	note B_, 15
+	B_ 15
 	inc_octave
-	note B_, 7
+	B_ 7
 	rest 8
 	dec_octave
-	note F#, 15
+	F# 15
 	inc_octave
-	note F#, 7
+	F# 7
 	rest 8
 	dec_octave
-	note E_, 15
+	E_ 15
 	inc_octave
-	note B_, 7
+	B_ 7
 	rest 8
 	dec_octave
-	note G#, 15
+	G# 15
 	inc_octave
-	note G#, 7
+	G# 7
 	rest 8
 	dec_octave
-	note A_, 7
+	A_ 7
 	rest 8
 	musice8 7
-	note A_, 5
-	note A_, 5
-	note A_, 5
+	A_ 5
+	A_ 5
+	A_ 5
 	musice8 8
-	note A_, 7
+	A_ 7
 	rest 8
-	note A_, 7
+	A_ 7
 	rest 8
-	note A_, 7
+	A_ 7
 	rest 8
 	rest 15
 	speed 10
@@ -982,49 +982,49 @@ Music_ChallengeHall_Ch3: ; f9a92 (3e:5a92)
 	EndMainLoop
 
 Branch_f9b7d:
-	note A_, 15
+	A_ 15
 	inc_octave
-	note E_, 7
+	E_ 7
 	rest 8
 	dec_octave
-	note E_, 15
+	E_ 15
 	inc_octave
-	note E_, 7
+	E_ 7
 	rest 8
 	dec_octave
-	note A_, 15
+	A_ 15
 	inc_octave
-	note F#, 7
+	F# 7
 	rest 8
 	dec_octave
-	note E_, 15
+	E_ 15
 	inc_octave
-	note F#, 7
+	F# 7
 	rest 8
 	dec_octave
 	music_ret
 
 Branch_f9b92:
-	note A_, 15
+	A_ 15
 	inc_octave
-	note A_, 7
+	A_ 7
 	rest 8
 	dec_octave
-	note E_, 15
+	E_ 15
 	inc_octave
 	inc_octave
-	note C#, 7
+	C# 7
 	rest 8
 	dec_octave
 	dec_octave
-	note A_, 15
+	A_ 15
 	inc_octave
-	note B_, 7
+	B_ 7
 	rest 8
 	dec_octave
-	note E_, 15
+	E_ 15
 	inc_octave
-	note B_, 7
+	B_ 7
 	rest 8
 	dec_octave
 	music_ret
@@ -1038,50 +1038,50 @@ Music_ChallengeHall_Ch4: ; f9ba9 (3e:5ba9)
 	EndLoop
 	MainLoop
 	speed 1
-	note snare1, 4
-	note snare2, 3
-	note snare2, 4
-	note snare2, 4
+	snare1 4
+	snare2 3
+	snare2 4
+	snare2 4
 	Loop 7
-	note snare2, 4
-	note snare2, 3
-	note snare2, 4
-	note snare2, 4
+	snare2 4
+	snare2 3
+	snare2 4
+	snare2 4
 	EndLoop
-	note snare1, 15
-	note snare1, 7
-	note snare1, 8
-	note snare1, 15
-	note snare1, 15
-	note snare1, 15
-	note snare1, 4
-	note snare2, 3
-	note snare2, 4
-	note snare2, 4
-	note snare1, 15
-	note snare1, 15
+	snare1 15
+	snare1 7
+	snare1 8
+	snare1 15
+	snare1 15
+	snare1 15
+	snare1 4
+	snare2 3
+	snare2 4
+	snare2 4
+	snare1 15
+	snare1 15
 	Loop 15
-	note bass, 15
-	note snare1, 15
-	note bass, 15
-	note snare1, 15
-	note bass, 15
-	note snare1, 4
-	note snare2, 3
-	note snare2, 4
-	note snare2, 4
-	note bass, 15
-	note snare1, 15
+	bass 15
+	snare1 15
+	bass 15
+	snare1 15
+	bass 15
+	snare1 4
+	snare2 3
+	snare2 4
+	snare2 4
+	bass 15
+	snare1 15
 	EndLoop
-	note bass, 15
-	note snare1, 4
-	note snare2, 3
-	note snare2, 4
-	note snare2, 4
-	note snare1, 15
-	note snare1, 15
+	bass 15
+	snare1 4
+	snare2 3
+	snare2 4
+	snare2 4
+	snare1 15
+	snare1 15
 	speed 10
-	note snare1, 3
+	snare1 3
 	rest 3
 	EndMainLoop
 ; 0xf9be5
diff --git a/audio/music/club1.asm b/audio/music/club1.asm
index 6829706..785a126 100644
--- a/audio/music/club1.asm
+++ b/audio/music/club1.asm
@@ -8,284 +8,284 @@ Music_Club1_Ch1: ; f9be5 (3e:5be5)
 	duty 0
 	volume 146
 	musice8 8
-	note C#, 2
+	C# 2
 	dec_octave
-	note A_, 2
+	A_ 2
 	inc_octave
-	note C#, 2
-	note A_, 2
+	C# 2
+	A_ 2
 	duty 2
 	volume 112
 	inc_octave
 	speed 1
-	note C#, 8
+	C# 8
 	volume 39
-	note C#, 2
+	C# 2
 	volume 90
-	note A_, 4
+	A_ 4
 	volume 112
-	note A_, 4
+	A_ 4
 	volume 39
-	note A_, 2
+	A_ 2
 	dec_octave
 	duty 0
 	volume 146
 	speed 5
-	note C#, 2
+	C# 2
 	dec_octave
-	note A#, 2
+	A# 2
 	inc_octave
-	note C#, 2
-	note A#, 2
+	C# 2
+	A# 2
 	duty 2
 	volume 112
 	inc_octave
 	speed 1
-	note C#, 8
+	C# 8
 	volume 39
-	note C#, 2
+	C# 2
 	speed 5
 	volume 128
 	dec_octave
-	note B_, 1
+	B_ 1
 	inc_octave
-	note C_, 1
+	C_ 1
 	vibrato_type 1
 	vibrato_delay 10
-	note C#, 4
+	C# 4
 	dec_octave
 	vibrato_type 8
 	vibrato_delay 20
-	note A_, 2
+	A_ 2
 	inc_octave
-	note C#, 4
+	C# 4
 	dec_octave
-	note B_, 2
+	B_ 2
 	volume 39
-	note B_, 2
+	B_ 2
 	rest 2
 	duty 0
 	volume 148
 	musice8 8
-	note E_, 6
+	E_ 6
 	rest 2
 	MainLoop
 	duty 0
 	volume 160
 	octave 3
 	rest 6
-	note A_, 4
-	note E_, 2
-	note A_, 4
-	note B_, 2
+	A_ 4
+	E_ 2
+	A_ 4
+	B_ 2
 	inc_octave
-	note C_, 4
-	note C#, 8
+	C_ 4
+	C# 8
 	volume 71
-	note C#, 4
+	C# 4
 	volume 160
-	note C#, 2
-	note D_, 4
-	note E_, 2
+	C# 2
+	D_ 4
+	E_ 2
 	volume 71
-	note E_, 2
+	E_ 2
 	rest 2
 	volume 160
-	note D#, 1
-	note E_, 7
-	note D_, 6
+	D# 1
+	E_ 7
+	D_ 6
 	dec_octave
-	note A_, 4
-	note F#, 2
+	A_ 4
+	F# 2
 	volume 71
-	note F#, 2
+	F# 2
 	rest 2
 	inc_octave
 	volume 160
-	note C_, 1
-	note C#, 3
+	C_ 1
+	C# 3
 	volume 71
-	note C#, 2
+	C# 2
 	volume 160
-	note C#, 2
-	note C_, 4
+	C# 2
+	C_ 4
 	dec_octave
-	note B_, 6
+	B_ 6
 	volume 147
-	note D_, 4
+	D_ 4
 	rest 2
 	dec_octave
-	note A_, 2
+	A_ 2
 	vibrato_type 1
 	duty 2
 	volume 80
 	inc_octave
 	inc_octave
 	inc_octave
-	note C_, 1
-	note C#, 5
+	C_ 1
+	C# 5
 	dec_octave
 	dec_octave
 	vibrato_type 8
 	duty 0
 	volume 160
-	note A_, 4
-	note E_, 2
-	note A_, 4
-	note B_, 2
+	A_ 4
+	E_ 2
+	A_ 4
+	B_ 2
 	inc_octave
-	note C_, 4
-	note C#, 6
+	C_ 4
+	C# 6
 	dec_octave
 	dec_octave
 	volume 147
-	note A#, 1
+	A# 1
 	rest 5
 	inc_octave
 	inc_octave
 	volume 160
-	note C#, 2
-	note D_, 4
-	note E_, 2
+	C# 2
+	D_ 4
+	E_ 2
 	volume 71
-	note E_, 2
+	E_ 2
 	rest 2
 	volume 160
-	note D#, 1
-	note E_, 7
-	note D_, 6
+	D# 1
+	E_ 7
+	D_ 6
 	dec_octave
-	note A_, 4
-	note F#, 2
+	A_ 4
+	F# 2
 	volume 71
-	note F#, 2
+	F# 2
 	rest 2
 	volume 160
 	inc_octave
-	note C_, 1
-	note C#, 3
+	C_ 1
+	C# 3
 	volume 71
-	note C#, 2
+	C# 2
 	volume 160
-	note C#, 2
-	note C_, 4
+	C# 2
+	C_ 4
 	dec_octave
-	note B_, 8
+	B_ 8
 	volume 71
-	note B_, 4
+	B_ 4
 	volume 160
-	note E_, 2
-	note F_, 1
-	note F#, 5
-	note A_, 6
-	note B_, 4
-	note A_, 2
+	E_ 2
+	F_ 1
+	F# 5
+	A_ 6
+	B_ 4
+	A_ 2
 	volume 71
-	note A_, 2
+	A_ 2
 	rest 2
 	volume 160
-	note E_, 1
-	note F_, 7
-	note A_, 6
-	note B_, 4
-	note A_, 2
+	E_ 1
+	F_ 7
+	A_ 6
+	B_ 4
+	A_ 2
 	volume 71
-	note A_, 2
+	A_ 2
 	rest 2
 	inc_octave
 	volume 160
-	note C_, 1
-	note C#, 5
+	C_ 1
+	C# 5
 	volume 71
-	note C#, 2
+	C# 2
 	volume 160
-	note C#, 4
+	C# 4
 	volume 71
-	note C#, 2
+	C# 2
 	volume 160
-	note C#, 4
-	note C_, 2
-	note C#, 4
+	C# 4
+	C_ 2
+	C# 4
 	dec_octave
-	note F#, 2
+	F# 2
 	volume 71
-	note F#, 2
+	F# 2
 	rest 2
 	inc_octave
 	volume 160
-	note D#, 1
-	note E_, 5
-	note D_, 6
-	note C#, 4
+	D# 1
+	E_ 5
+	D_ 6
+	C# 4
 	volume 71
-	note C#, 2
+	C# 2
 	volume 160
-	note C_, 1
-	note C#, 7
+	C_ 1
+	C# 7
 	dec_octave
-	note A_, 4
-	note F#, 2
-	note A_, 4
-	note F#, 2
+	A_ 4
+	F# 2
+	A_ 4
+	F# 2
 	volume 71
-	note F#, 2
+	F# 2
 	rest 2
 	volume 160
 	inc_octave
-	note C_, 1
-	note C#, 5
-	note D_, 1
-	note C#, 1
+	C_ 1
+	C# 5
+	D_ 1
+	C# 1
 	dec_octave
-	note A_, 4
-	note F#, 2
-	note A_, 4
-	note F#, 2
+	A_ 4
+	F# 2
+	A_ 4
+	F# 2
 	volume 71
-	note F#, 2
+	F# 2
 	rest 2
 	inc_octave
 	volume 160
-	note C_, 1
-	note C#, 5
+	C_ 1
+	C# 5
 	volume 71
-	note C#, 2
+	C# 2
 	volume 160
-	note C#, 4
+	C# 4
 	volume 71
-	note C#, 2
+	C# 2
 	volume 160
-	note C#, 4
+	C# 4
 	dec_octave
-	note A_, 2
+	A_ 2
 	inc_octave
-	note C#, 4
+	C# 4
 	dec_octave
-	note B_, 14
+	B_ 14
 	duty 2
 	volume 96
-	note G#, 2
-	note B_, 1
+	G# 2
+	B_ 1
 	volume 55
-	note B_, 1
+	B_ 1
 	inc_octave
 	volume 96
-	note E_, 1
+	E_ 1
 	volume 55
-	note E_, 1
+	E_ 1
 	volume 96
-	note G#, 1
+	G# 1
 	volume 55
-	note G#, 1
+	G# 1
 	volume 96
-	note B_, 1
+	B_ 1
 	volume 55
-	note B_, 1
+	B_ 1
 	inc_octave
 	volume 96
-	note E_, 1
+	E_ 1
 	volume 55
-	note E_, 1
+	E_ 1
 	EndMainLoop
 
 
@@ -299,275 +299,275 @@ Music_Club1_Ch2: ; f9d5f (3e:5d5f)
 	duty 0
 	volume 146
 	musice8 8
-	note A_, 2
-	note E_, 2
-	note A_, 2
+	A_ 2
+	E_ 2
+	A_ 2
 	inc_octave
-	note C#, 2
+	C# 2
 	duty 2
 	volume 80
 	speed 1
-	note A_, 8
+	A_ 8
 	rest 2
 	inc_octave
-	note C#, 8
+	C# 8
 	rest 2
 	speed 5
 	duty 0
 	volume 146
 	dec_octave
 	dec_octave
-	note A#, 2
-	note E_, 2
-	note A#, 2
+	A# 2
+	E_ 2
+	A# 2
 	inc_octave
-	note C#, 2
+	C# 2
 	duty 2
 	volume 80
 	speed 1
-	note A#, 8
+	A# 8
 	rest 2
 	dec_octave
 	speed 5
 	duty 0
 	volume 146
-	note G_, 1
-	note G#, 1
-	note A_, 2
-	note D_, 2
-	note F#, 2
-	note A_, 2
-	note F#, 2
-	note G#, 3
+	G_ 1
+	G# 1
+	A_ 2
+	D_ 2
+	F# 2
+	A_ 2
+	F# 2
+	G# 3
 	rest 3
 	volume 148
-	note B_, 6
+	B_ 6
 	rest 2
 	MainLoop
 	octave 2
 	rest 4
 	inc_octave
 	volume 147
-	note C#, 5
+	C# 5
 	rest 7
-	note C#, 4
+	C# 4
 	rest 2
-	note C#, 2
+	C# 2
 	rest 4
 	dec_octave
-	note A#, 2
+	A# 2
 	duty 2
 	volume 80
 	octave 5
-	note C#, 1
-	note D_, 3
-	note C#, 2
+	C# 1
+	D_ 3
+	C# 2
 	dec_octave
-	note A#, 4
+	A# 4
 	dec_octave
 	duty 0
 	volume 147
-	note E_, 4
+	E_ 4
 	rest 2
 	vibrato_type 1
 	duty 2
 	volume 80
 	octave 5
-	note C_, 1
-	note C#, 5
+	C_ 1
+	C# 5
 	duty 0
 	volume 147
 	octave 3
-	note D_, 2
+	D_ 2
 	duty 2
 	volume 80
 	inc_octave
-	note A_, 4
-	note F#, 2
-	note E_, 4
-	note D_, 2
+	A_ 4
+	F# 2
+	E_ 4
+	D_ 2
 	rest 4
-	note E_, 4
+	E_ 4
 	rest 2
-	note E_, 2
+	E_ 2
 	rest 4
-	note E_, 2
-	note F#, 4
-	note A_, 2
-	note B_, 4
-	note A_, 2
+	E_ 2
+	F# 4
+	A_ 2
+	B_ 4
+	A_ 2
 	rest 2
 	duty 0
 	volume 147
 	rest 2
 	dec_octave
-	note C#, 2
+	C# 2
 	volume 96
-	note C#, 4
+	C# 4
 	volume 55
-	note C#, 4
+	C# 4
 	rest 2
 	volume 147
-	note C#, 2
+	C# 2
 	vibrato_type 8
 	volume 96
-	note D#, 4
-	note E_, 6
+	D# 4
+	E_ 6
 	volume 55
-	note E_, 2
+	E_ 2
 	inc_octave
 	inc_octave
 	vibrato_type 1
 	duty 2
 	volume 80
-	note C#, 1
-	note D_, 3
-	note C#, 2
+	C# 1
+	D_ 3
+	C# 2
 	dec_octave
-	note A#, 4
-	note F#, 2
+	A# 4
+	F# 2
 	rest 4
 	inc_octave
-	note C_, 1
-	note C#, 5
+	C_ 1
+	C# 5
 	dec_octave
 	dec_octave
 	duty 0
 	volume 147
-	note D_, 2
+	D_ 2
 	duty 2
 	volume 80
 	inc_octave
-	note A_, 4
-	note F#, 2
-	note E_, 4
-	note D_, 2
+	A_ 4
+	F# 2
+	E_ 4
+	D_ 2
 	rest 4
-	note D#, 1
-	note E_, 3
+	D# 1
+	E_ 3
 	rest 2
-	note E_, 2
-	note D#, 4
-	note D_, 6
+	E_ 2
+	D# 4
+	D_ 6
 	dec_octave
 	duty 0
 	volume 147
-	note D_, 4
+	D_ 4
 	rest 2
 	dec_octave
-	note A_, 2
+	A_ 2
 	rest 4
-	note A_, 2
+	A_ 2
 	duty 2
 	volume 80
 	inc_octave
 	inc_octave
-	note F_, 1
-	note F#, 3
-	note D_, 2
-	note C#, 4
+	F_ 1
+	F# 3
+	D_ 2
+	C# 4
 	dec_octave
 	duty 0
 	volume 147
-	note D_, 4
+	D_ 4
 	rest 2
 	dec_octave
-	note A_, 2
+	A_ 2
 	rest 4
-	note A_, 2
+	A_ 2
 	inc_octave
 	inc_octave
 	duty 2
 	volume 80
-	note E_, 1
-	note F_, 3
-	note D_, 2
-	note C#, 4
+	E_ 1
+	F_ 3
+	D_ 2
+	C# 4
 	dec_octave
 	duty 0
 	volume 147
-	note D_, 4
+	D_ 4
 	rest 2
 	dec_octave
-	note A_, 2
+	A_ 2
 	rest 4
-	note B_, 2
+	B_ 2
 	inc_octave
 	duty 2
 	volume 80
-	note E_, 4
-	note G#, 2
-	note B_, 4
+	E_ 4
+	G# 2
+	B_ 4
 	inc_octave
-	note E_, 2
+	E_ 2
 	rest 4
 	dec_octave
 	vibrato_type 8
 	duty 0
 	volume 96
-	note A#, 2
+	A# 2
 	volume 55
-	note A#, 2
+	A# 2
 	rest 2
 	inc_octave
 	volume 96
-	note C_, 1
-	note C#, 5
+	C_ 1
+	C# 5
 	dec_octave
-	note B_, 6
-	note A#, 4
+	B_ 6
+	A# 4
 	rest 2
-	note G#, 1
-	note A_, 5
+	G# 1
+	A_ 5
 	volume 147
-	note D_, 2
+	D_ 2
 	volume 96
-	note F#, 4
-	note D_, 2
-	note F#, 4
+	F# 4
+	D_ 2
+	F# 4
 	dec_octave
 	volume 147
-	note A_, 4
+	A_ 4
 	rest 2
 	volume 96
 	inc_octave
-	note G#, 1
-	note A_, 5
+	G# 1
+	A_ 5
 	volume 147
-	note D_, 2
+	D_ 2
 	volume 96
-	note F#, 4
-	note D_, 2
-	note F#, 4
+	F# 4
+	D_ 2
+	F# 4
 	dec_octave
 	volume 147
-	note A_, 4
+	A_ 4
 	rest 2
 	inc_octave
 	volume 96
-	note G#, 1
-	note A_, 5
+	G# 1
+	A_ 5
 	volume 147
-	note D_, 2
+	D_ 2
 	volume 96
-	note A_, 4
+	A_ 4
 	rest 2
-	note A_, 4
+	A_ 4
 	dec_octave
 	volume 147
-	note A_, 2
+	A_ 2
 	inc_octave
 	volume 96
-	note A_, 4
-	note G#, 12
+	A_ 4
+	G# 12
 	dec_octave
 	volume 147
-	note A_, 4
+	A_ 4
 	rest 2
-	note B_, 4
+	B_ 4
 	rest 2
 	inc_octave
-	note D_, 2
+	D_ 2
 	EndMainLoop
 
 
@@ -579,342 +579,342 @@ Music_Club1_Ch3: ; f9ec4 (3e:5ec4)
 	musice9 96
 	musice8 7
 	octave 1
-	note A_, 2
+	A_ 2
 	rest 2
-	note E_, 2
-	note A_, 2
+	E_ 2
+	A_ 2
 	rest 4
-	note A#, 2
+	A# 2
 	rest 2
-	note E_, 2
-	note A#, 2
+	E_ 2
+	A# 2
 	rest 4
-	note B_, 2
+	B_ 2
 	musice8 4
-	note B_, 2
+	B_ 2
 	musice8 7
-	note F#, 2
-	note F_, 2
+	F# 2
+	F_ 2
 	inc_octave
 	musice8 4
-	note D_, 2
+	D_ 2
 	dec_octave
 	musice8 7
-	note E_, 2
+	E_ 2
 	rest 4
 	inc_octave
-	note E_, 6
+	E_ 6
 	dec_octave
-	note E_, 2
+	E_ 2
 	MainLoop
 	octave 1
-	note A_, 4
+	A_ 4
 	inc_octave
 	musice8 4
-	note A_, 2
+	A_ 2
 	dec_octave
 	musice8 7
-	note C#, 6
-	note E_, 4
+	C# 6
+	E_ 4
 	inc_octave
 	musice8 4
-	note A_, 2
+	A_ 2
 	dec_octave
 	musice8 7
-	note F_, 4
+	F_ 4
 	inc_octave
 	musice8 4
-	note A#, 2
+	A# 2
 	dec_octave
 	musice8 7
-	note F#, 4
+	F# 4
 	inc_octave
 	musice8 4
-	note F#, 2
+	F# 2
 	musice8 7
-	note C#, 6
+	C# 6
 	dec_octave
-	note A#, 4
+	A# 4
 	inc_octave
 	inc_octave
 	musice8 4
-	note C#, 2
+	C# 2
 	dec_octave
 	dec_octave
 	musice8 7
-	note F#, 6
+	F# 6
 	music_call Branch_fa01a
 	octave 1
 	musice8 7
-	note A_, 4
+	A_ 4
 	inc_octave
 	musice8 4
-	note A_, 2
+	A_ 2
 	dec_octave
 	musice8 7
-	note C#, 6
-	note E_, 4
+	C# 6
+	E_ 4
 	inc_octave
 	musice8 4
-	note A_, 2
+	A_ 2
 	dec_octave
 	musice8 7
-	note F_, 4
+	F_ 4
 	inc_octave
 	inc_octave
 	musice8 4
-	note C#, 2
+	C# 2
 	dec_octave
 	dec_octave
 	musice8 7
-	note F#, 4
+	F# 4
 	inc_octave
 	musice8 4
-	note F#, 2
+	F# 2
 	musice8 7
-	note C#, 6
+	C# 6
 	dec_octave
-	note A#, 4
+	A# 4
 	inc_octave
 	inc_octave
 	musice8 4
-	note E_, 2
+	E_ 2
 	dec_octave
 	dec_octave
 	musice8 7
-	note F#, 6
+	F# 6
 	music_call Branch_fa01a
 	octave 1
 	musice8 7
-	note D_, 4
+	D_ 4
 	inc_octave
 	musice8 4
-	note F#, 2
+	F# 2
 	dec_octave
 	musice8 7
-	note D_, 4
+	D_ 4
 	rest 2
-	note D_, 4
+	D_ 4
 	inc_octave
 	musice8 4
-	note A_, 2
+	A_ 2
 	dec_octave
 	musice8 7
-	note D_, 4
+	D_ 4
 	inc_octave
 	musice8 4
-	note F#, 2
+	F# 2
 	dec_octave
 	musice8 7
-	note D_, 4
+	D_ 4
 	inc_octave
 	musice8 4
-	note F_, 2
+	F_ 2
 	dec_octave
 	musice8 7
-	note D_, 4
+	D_ 4
 	rest 2
-	note D_, 4
+	D_ 4
 	inc_octave
 	musice8 4
-	note A_, 2
+	A_ 2
 	dec_octave
 	musice8 7
-	note D_, 4
+	D_ 4
 	inc_octave
 	musice8 4
-	note F_, 2
+	F_ 2
 	dec_octave
 	musice8 7
-	note C#, 4
+	C# 4
 	inc_octave
 	musice8 4
-	note E_, 2
+	E_ 2
 	dec_octave
 	musice8 7
-	note C#, 6
-	note E_, 4
+	C# 6
+	E_ 4
 	inc_octave
 	inc_octave
 	musice8 4
-	note E_, 2
+	E_ 2
 	dec_octave
 	dec_octave
 	musice8 7
-	note F_, 6
-	note F#, 4
+	F_ 6
+	F# 4
 	inc_octave
 	musice8 4
-	note A#, 2
+	A# 2
 	musice8 7
-	note C#, 6
+	C# 6
 	dec_octave
-	note A#, 4
+	A# 4
 	inc_octave
 	musice8 4
-	note F#, 2
+	F# 2
 	dec_octave
 	musice8 7
-	note F#, 6
-	note B_, 4
+	F# 6
+	B_ 4
 	inc_octave
 	musice8 4
-	note A_, 2
+	A_ 2
 	dec_octave
 	musice8 7
-	note F#, 6
-	note A_, 4
+	F# 6
+	A_ 4
 	inc_octave
 	musice8 4
-	note F#, 2
+	F# 2
 	dec_octave
 	musice8 7
-	note A#, 4
+	A# 4
 	inc_octave
 	inc_octave
 	musice8 4
-	note D_, 2
+	D_ 2
 	dec_octave
 	dec_octave
 	musice8 7
-	note B_, 4
+	B_ 4
 	inc_octave
 	musice8 4
-	note A_, 2
+	A_ 2
 	dec_octave
 	musice8 7
-	note F#, 6
-	note D_, 4
+	F# 6
+	D_ 4
 	inc_octave
 	musice8 4
-	note F#, 2
+	F# 2
 	dec_octave
 	musice8 7
-	note F#, 6
-	note E_, 4
+	F# 6
+	E_ 4
 	inc_octave
 	musice8 4
-	note A_, 2
+	A_ 2
 	dec_octave
 	musice8 6
-	note E_, 6
+	E_ 6
 	musice8 7
-	note E_, 4
+	E_ 4
 	inc_octave
 	musice8 4
-	note F#, 2
+	F# 2
 	dec_octave
 	musice8 7
-	note E_, 4
+	E_ 4
 	inc_octave
 	musice8 4
-	note F#, 2
+	F# 2
 	musice8 7
-	note E_, 4
+	E_ 4
 	musice8 4
-	note G#, 2
+	G# 2
 	dec_octave
 	musice8 7
-	note E_, 4
+	E_ 4
 	inc_octave
 	musice8 4
-	note F#, 2
+	F# 2
 	dec_octave
 	musice8 7
-	note F#, 4
+	F# 4
 	inc_octave
 	musice8 4
-	note G#, 2
+	G# 2
 	dec_octave
 	musice8 7
-	note G#, 4
+	G# 4
 	inc_octave
 	musice8 4
-	note B_, 2
+	B_ 2
 	musice8 7
 	EndMainLoop
 
 Branch_fa01a:
 	octave 1
-	note B_, 4
+	B_ 4
 	inc_octave
 	musice8 4
-	note A_, 2
+	A_ 2
 	dec_octave
 	musice8 7
-	note C#, 6
-	note D_, 4
+	C# 6
+	D_ 4
 	inc_octave
 	musice8 4
-	note F#, 2
+	F# 2
 	dec_octave
 	musice8 7
-	note D#, 6
-	note E_, 4
+	D# 6
+	E_ 4
 	inc_octave
 	musice8 4
-	note B_, 2
+	B_ 2
 	dec_octave
 	musice8 7
-	note B_, 6
-	note G#, 4
+	B_ 6
+	G# 4
 	inc_octave
 	musice8 4
-	note B_, 2
+	B_ 2
 	dec_octave
 	musice8 7
-	note E_, 4
+	E_ 4
 	inc_octave
 	musice8 4
-	note E_, 2
+	E_ 2
 	music_ret
 
 
 Music_Club1_Ch4: ; fa044 (3e:6044)
 	speed 5
 	octave 1
-	note bass, 2
-	rest 2
-	note bass, 2
-	note snare1, 2
-	note snare3, 2
-	note snare4, 2
-	note bass, 2
-	rest 2
-	note bass, 2
-	note snare1, 2
-	note snare3, 2
-	note snare4, 2
-	note snare1, 4
-	note snare2, 1
-	note snare2, 1
-	note snare1, 4
-	note snare1, 2
+	bass 2
+	rest 2
+	bass 2
+	snare1 2
+	snare3 2
+	snare4 2
+	bass 2
+	rest 2
+	bass 2
+	snare1 2
+	snare3 2
+	snare4 2
+	snare1 4
+	snare2 1
+	snare2 1
+	snare1 4
+	snare1 2
 	rest 4
-	note snare2, 1
-	note snare2, 1
-	note snare1, 4
-	note snare1, 2
+	snare2 1
+	snare2 1
+	snare1 4
+	snare1 2
 	MainLoop
 	music_call Branch_fa06f
-	note bass, 4
+	bass 4
 	Loop 4
-	note snare1, 2
+	snare1 2
 	EndLoop
 	music_call Branch_fa06f
-	note bass, 4
-	note snare2, 1
-	note snare2, 1
-	note snare1, 4
-	note snare1, 2
+	bass 4
+	snare2 1
+	snare2 1
+	snare1 4
+	snare1 2
 	EndMainLoop
 
 Branch_fa06f:
 	Loop 15
-	note bass, 4
-	note snare3, 2
-	note snare1, 4
-	note snare3, 2
+	bass 4
+	snare3 2
+	snare1 4
+	snare3 2
 	EndLoop
 	music_ret
 ; 0xfa077
diff --git a/audio/music/club2.asm b/audio/music/club2.asm
index a8ae4c1..2b608d5 100644
--- a/audio/music/club2.asm
+++ b/audio/music/club2.asm
@@ -7,88 +7,88 @@ Music_Club2_Ch1: ; fa077 (3e:6077)
 	octave 4
 	Loop 8
 	volume 117
-	note G_, 4
-	note E_, 4
-	note C_, 4
+	G_ 4
+	E_ 4
+	C_ 4
 	volume 119
-	note F#, 4
+	F# 4
 	tie
-	note F#, 16
+	F# 16
 	volume 117
-	note G_, 4
-	note A_, 4
-	note B_, 4
+	G_ 4
+	A_ 4
+	B_ 4
 	volume 119
-	note F#, 4
+	F# 4
 	tie
-	note F#, 16
+	F# 16
 	EndLoop
 	volume 117
-	note G_, 4
-	note D_, 4
+	G_ 4
+	D_ 4
 	dec_octave
-	note B_, 4
+	B_ 4
 	inc_octave
 	volume 119
-	note B_, 4
+	B_ 4
 	tie
-	note B_, 16
+	B_ 16
 	volume 117
-	note G_, 4
-	note D_, 4
-	note C_, 4
+	G_ 4
+	D_ 4
+	C_ 4
 	volume 119
-	note B_, 4
+	B_ 4
 	tie
-	note B_, 16
+	B_ 16
 	dec_octave
 	volume 117
-	note F#, 4
+	F# 4
 	dec_octave
-	note D_, 4
-	note F#, 4
-	note A_, 4
+	D_ 4
+	F# 4
+	A_ 4
 	inc_octave
-	note D_, 4
-	note F#, 4
-	note A_, 4
+	D_ 4
+	F# 4
+	A_ 4
 	inc_octave
-	note D_, 4
+	D_ 4
 	dec_octave
-	note C_, 4
+	C_ 4
 	dec_octave
-	note C_, 4
-	note E_, 4
-	note G_, 4
+	C_ 4
+	E_ 4
+	G_ 4
 	inc_octave
-	note C_, 4
-	note E_, 4
-	note G_, 4
+	C_ 4
+	E_ 4
+	G_ 4
 	inc_octave
-	note C_, 4
+	C_ 4
 	dec_octave
-	note D_, 4
+	D_ 4
 	dec_octave
-	note D_, 4
-	note F#, 4
-	note A_, 4
+	D_ 4
+	F# 4
+	A_ 4
 	inc_octave
-	note D_, 4
-	note F#, 4
-	note A_, 4
-	note A_, 3
+	D_ 4
+	F# 4
+	A_ 4
+	A_ 3
 	tie
 	speed 1
-	note A_, 3
+	A_ 3
 	inc_octave
 	volume 119
 	rest 4
-	note D_, 5
+	D_ 5
 	tie
 	speed 6
-	note D_, 15
+	D_ 15
 	tie
-	note D_, 16
+	D_ 16
 	EndMainLoop
 
 
@@ -101,108 +101,108 @@ Music_Club2_Ch2: ; fa0e3 (3e:60e3)
 	octave 2
 	Loop 8
 	volume 117
-	note C_, 4
-	note G_, 4
+	C_ 4
+	G_ 4
 	inc_octave
-	note G_, 4
+	G_ 4
 	inc_octave
 	volume 119
-	note D_, 4
+	D_ 4
 	tie
-	note D_, 16
+	D_ 16
 	dec_octave
 	dec_octave
 	volume 117
-	note C_, 4
-	note G_, 4
+	C_ 4
+	G_ 4
 	inc_octave
 	inc_octave
-	note C_, 4
+	C_ 4
 	volume 119
-	note D_, 4
+	D_ 4
 	tie
-	note D_, 16
+	D_ 16
 	dec_octave
 	dec_octave
 	EndLoop
 	dec_octave
 	volume 117
-	note B_, 4
+	B_ 4
 	inc_octave
-	note G_, 4
+	G_ 4
 	inc_octave
-	note G_, 4
+	G_ 4
 	inc_octave
 	volume 119
-	note G_, 4
+	G_ 4
 	tie
-	note G_, 16
+	G_ 16
 	dec_octave
 	dec_octave
 	dec_octave
 	volume 117
-	note A_, 4
+	A_ 4
 	inc_octave
-	note A_, 4
+	A_ 4
 	inc_octave
-	note A_, 4
+	A_ 4
 	inc_octave
 	volume 119
-	note C_, 4
+	C_ 4
 	tie
-	note C_, 16
+	C_ 16
 	dec_octave
 	dec_octave
 	volume 117
-	note D_, 4
+	D_ 4
 	octave 2
-	note F#, 4
-	note A_, 4
+	F# 4
+	A_ 4
 	inc_octave
-	note D_, 4
-	note F#, 4
-	note A_, 4
+	D_ 4
+	F# 4
+	A_ 4
 	inc_octave
-	note D_, 4
-	note F#, 4
-	note G_, 4
+	D_ 4
+	F# 4
+	G_ 4
 	dec_octave
 	dec_octave
-	note E_, 4
-	note G_, 4
+	E_ 4
+	G_ 4
 	inc_octave
-	note C_, 4
-	note E_, 4
-	note G_, 4
+	C_ 4
+	E_ 4
+	G_ 4
 	inc_octave
-	note C_, 4
-	note E_, 4
-	note F#, 4
+	C_ 4
+	E_ 4
+	F# 4
 	dec_octave
 	dec_octave
-	note F#, 4
-	note A_, 4
+	F# 4
+	A_ 4
 	inc_octave
-	note D_, 4
-	note F#, 4
-	note A_, 4
+	D_ 4
+	F# 4
+	A_ 4
 	inc_octave
-	note D_, 4
-	note E_, 3
+	D_ 4
+	E_ 3
 	tie
 	speed 1
-	note E_, 3
+	E_ 3
 	dec_octave
 	volume 116
-	note A_, 8
+	A_ 8
 	inc_octave
 	volume 119
-	note F#, 7
+	F# 7
 	tie
 	speed 6
-	note F#, 14
+	F# 14
 	tie
-	note F#, 16
+	F# 16
 	EndMainLoop
 
 
@@ -220,16 +220,16 @@ Music_Club2_Ch3: ; fa164 (3e:6164)
 	musice8 8
 	rest 2
 	octave 4
-	note G_, 4
-	note E_, 4
-	note C_, 4
-	note F#, 2
+	G_ 4
+	E_ 4
+	C_ 4
+	F# 2
 	rest 2
 	rest 16
-	note G_, 4
-	note A_, 4
-	note B_, 4
-	note F#, 2
+	G_ 4
+	A_ 4
+	B_ 4
+	F# 2
 	rest 2
 	rest 14
 	volume 64
@@ -237,51 +237,51 @@ Music_Club2_Ch3: ; fa164 (3e:6164)
 	music_call Branch_fa1cf
 	octave 4
 	musice8 8
-	note G_, 8
+	G_ 8
 	music_call Branch_fa1cf
 	musice9 64
 	volume 32
 	octave 3
 	musice8 8
-	note G_, 8
+	G_ 8
 	music_call Branch_fa1f3
 	octave 3
-	note G_, 16
+	G_ 16
 	tie
-	note G_, 12
+	G_ 12
 	rest 16
 	rest 8
 	musice8 8
-	note E_, 8
+	E_ 8
 	music_call Branch_fa1f3
 	octave 3
-	note G_, 16
+	G_ 16
 	tie
-	note G_, 12
+	G_ 12
 	tie
-	note G_, 16
+	G_ 16
 	tie
-	note G_, 8
+	G_ 8
 	rest 4
 	musice8 8
-	note A_, 2
-	note G_, 2
+	A_ 2
+	G_ 2
 	musice8 6
-	note F#, 16
+	F# 16
 	tie
-	note F#, 12
+	F# 12
 	rest 4
-	note F#, 1
+	F# 1
 	tie
-	note G_, 15
+	G_ 15
 	tie
-	note G_, 12
+	G_ 12
 	rest 4
-	note G#, 1
+	G# 1
 	tie
-	note A_, 15
+	A_ 15
 	tie
-	note A_, 16
+	A_ 16
 	rest 16
 	rest 16
 	musice9 96
@@ -290,61 +290,61 @@ Music_Club2_Ch3: ; fa164 (3e:6164)
 Branch_fa1cf:
 	musice8 6
 	octave 5
-	note C#, 1
+	C# 1
 	tie
-	note D_, 15
+	D_ 15
 	tie
-	note D_, 12
+	D_ 12
 	musice8 8
-	note C_, 2
+	C_ 2
 	dec_octave
-	note B_, 2
+	B_ 2
 	musice8 6
-	note G_, 16
+	G_ 16
 	tie
-	note G_, 8
+	G_ 8
 	rest 4
 	musice8 8
-	note E_, 4
-	note B_, 4
+	E_ 4
+	B_ 4
 	inc_octave
-	note C_, 4
+	C_ 4
 	dec_octave
-	note B_, 4
+	B_ 4
 	musice8 6
-	note A_, 16
+	A_ 16
 	tie
-	note A_, 8
+	A_ 8
 	tie
-	note A_, 16
+	A_ 16
 	rest 4
 	music_ret
 
 Branch_fa1f3:
 	octave 4
-	note C#, 1
+	C# 1
 	tie
-	note D_, 15
+	D_ 15
 	tie
-	note D_, 4
-	note E_, 4
+	D_ 4
+	E_ 4
 	dec_octave
-	note B_, 4
+	B_ 4
 	inc_octave
-	note C_, 4
+	C_ 4
 	musice8 6
-	note D_, 16
+	D_ 16
 	tie
-	note D_, 8
+	D_ 8
 	rest 4
 	musice8 8
-	note C_, 2
+	C_ 2
 	dec_octave
-	note B_, 2
+	B_ 2
 	inc_octave
-	note C_, 2
+	C_ 2
 	dec_octave
-	note B_, 2
+	B_ 2
 	musice8 6
 	music_ret
 ; 0xfa210
diff --git a/audio/music/club3.asm b/audio/music/club3.asm
index 6014e81..1407cd5 100644
--- a/audio/music/club3.asm
+++ b/audio/music/club3.asm
@@ -10,391 +10,391 @@ Music_Club3_Ch1: ; fa210 (3e:6210)
 	octave 2
 	volume 144
 	rest 4
-	note G_, 2
+	G_ 2
 	volume 55
-	note G_, 1
+	G_ 1
 	inc_octave
 	volume 144
-	note C_, 1
+	C_ 1
 	volume 55
-	note C_, 2
+	C_ 2
 	dec_octave
 	volume 144
-	note A#, 6
+	A# 6
 	tie
-	note A#, 12
+	A# 12
 	volume 55
-	note A#, 4
+	A# 4
 	rest 4
 	volume 144
-	note G_, 2
+	G_ 2
 	volume 55
-	note G_, 1
+	G_ 1
 	inc_octave
 	volume 144
 	speed 1
-	note C_, 5
+	C_ 5
 	tie
-	note C#, 4
+	C# 4
 	tie
 	speed 9
-	note C_, 1
+	C_ 1
 	volume 55
-	note C_, 1
+	C_ 1
 	dec_octave
 	volume 144
-	note A#, 6
+	A# 6
 	tie
-	note A#, 12
+	A# 12
 	volume 55
-	note A#, 4
+	A# 4
 	EndLoop
 	duty 1
 	volume 147
 	musice8 7
 	music_call Branch_fa330
 	music_call Branch_fa403
-	note A#, 1
-	note F_, 1
-	note F#, 1
-	note G_, 1
+	A# 1
+	F_ 1
+	F# 1
+	G_ 1
 	inc_octave
-	note D_, 1
+	D_ 1
 	inc_octave
-	note D_, 1
+	D_ 1
 	dec_octave
-	note D_, 1
+	D_ 1
 	inc_octave
-	note F_, 1
+	F_ 1
 	dec_octave
-	note D_, 1
-	note D#, 1
+	D_ 1
+	D# 1
 	inc_octave
-	note G_, 1
+	G_ 1
 	octave 2
-	note G_, 1
+	G_ 1
 	octave 4
-	note C#, 1
-	note C_, 1
+	C# 1
+	C_ 1
 	octave 2
-	note G_, 1
+	G_ 1
 	inc_octave
 	musice8 8
 	speed 1
-	note G_, 5
+	G_ 5
 	volume 55
-	note G_, 4
+	G_ 4
 	speed 9
 	volume 128
-	note C#, 1
-	note C_, 1
+	C# 1
+	C_ 1
 	dec_octave
-	note A#, 1
+	A# 1
 	volume 147
 	musice8 7
 	music_call Branch_fa330
 	music_call Branch_fa403
 	inc_octave
-	note D_, 1
+	D_ 1
 	dec_octave
-	note F_, 1
-	note F#, 1
-	note G_, 1
+	F_ 1
+	F# 1
+	G_ 1
 	inc_octave
-	note D_, 1
+	D_ 1
 	inc_octave
-	note D_, 1
+	D_ 1
 	dec_octave
-	note D_, 1
+	D_ 1
 	inc_octave
-	note F_, 1
+	F_ 1
 	dec_octave
-	note C#, 1
-	note D_, 1
+	C# 1
+	D_ 1
 	inc_octave
-	note F#, 1
+	F# 1
 	octave 2
-	note G_, 1
+	G_ 1
 	octave 4
-	note C#, 1
-	note C_, 1
+	C# 1
+	C_ 1
 	octave 2
-	note G_, 1
+	G_ 1
 	octave 4
 	duty 2
 	volume 112
 	speed 1
 	musice8 8
-	note G_, 5
-	note C#, 4
-	note C_, 5
+	G_ 5
+	C# 4
+	C_ 5
 	dec_octave
-	note A#, 4
-	note G_, 5
-	note C#, 4
-	note C_, 5
+	A# 4
+	G_ 5
+	C# 4
+	C_ 5
 	dec_octave
-	note A#, 4
+	A# 4
 	duty 1
 	musice8 7
 	speed 9
 	music_call Branch_fa370
 	music_call Branch_fa403
-	note A#, 1
-	note F_, 1
-	note F#, 1
-	note G_, 1
+	A# 1
+	F_ 1
+	F# 1
+	G_ 1
 	inc_octave
-	note D_, 1
+	D_ 1
 	inc_octave
-	note D_, 1
+	D_ 1
 	dec_octave
-	note D_, 1
+	D_ 1
 	inc_octave
-	note F_, 1
+	F_ 1
 	dec_octave
-	note D_, 1
-	note D#, 1
+	D_ 1
+	D# 1
 	inc_octave
-	note G_, 1
+	G_ 1
 	octave 2
-	note G_, 1
+	G_ 1
 	octave 4
-	note C#, 1
-	note C_, 1
+	C# 1
+	C_ 1
 	octave 2
-	note G_, 1
+	G_ 1
 	inc_octave
 	musice8 8
 	speed 1
-	note G_, 5
+	G_ 5
 	volume 55
-	note G_, 4
+	G_ 4
 	speed 9
 	volume 128
-	note C#, 1
-	note C_, 1
+	C# 1
+	C_ 1
 	dec_octave
-	note A#, 1
+	A# 1
 	music_call Branch_fa370
 	music_call Branch_fa403
 	inc_octave
-	note D_, 1
+	D_ 1
 	dec_octave
-	note F_, 1
-	note F#, 1
-	note G_, 1
+	F_ 1
+	F# 1
+	G_ 1
 	inc_octave
-	note D_, 1
+	D_ 1
 	inc_octave
-	note D_, 1
+	D_ 1
 	dec_octave
-	note D_, 1
+	D_ 1
 	inc_octave
-	note F_, 1
+	F_ 1
 	dec_octave
-	note C_, 1
-	note C#, 1
+	C_ 1
+	C# 1
 	inc_octave
-	note F#, 1
+	F# 1
 	octave 2
-	note G_, 1
+	G_ 1
 	octave 4
-	note C#, 1
-	note C_, 1
+	C# 1
+	C_ 1
 	dec_octave
-	note A#, 1
+	A# 1
 	inc_octave
 	duty 2
 	speed 1
 	musice8 8
 	volume 112
-	note G_, 5
-	note C#, 4
-	note C_, 5
+	G_ 5
+	C# 4
+	C_ 5
 	dec_octave
-	note A#, 4
-	note G_, 5
-	note C#, 4
-	note C_, 5
+	A# 4
+	G_ 5
+	C# 4
+	C_ 5
 	dec_octave
-	note A#, 4
+	A# 4
 	speed 9
 	musice8 8
 	EndMainLoop
 
 Branch_fa330:
 	octave 2
-	note G_, 1
+	G_ 1
 	inc_octave
-	note D_, 1
+	D_ 1
 	inc_octave
-	note D_, 1
+	D_ 1
 	dec_octave
-	note D_, 1
+	D_ 1
 	inc_octave
-	note C#, 1
-	note C_, 1
+	C# 1
+	C_ 1
 	dec_octave
-	note D_, 1
-	note A#, 1
-	note D_, 1
+	D_ 1
+	A# 1
+	D_ 1
 	dec_octave
-	note G_, 1
+	G_ 1
 	inc_octave
-	note A#, 1
+	A# 1
 	dec_octave
 	speed 1
 	musice8 8
-	note F_, 5
-	note F#, 4
+	F_ 5
+	F# 4
 	speed 9
 	musice8 7
-	note G_, 1
+	G_ 1
 	inc_octave
-	note E_, 1
+	E_ 1
 	dec_octave
-	note F_, 1
-	note F#, 1
-	note G_, 1
+	F_ 1
+	F# 1
+	G_ 1
 	inc_octave
-	note D_, 1
+	D_ 1
 	inc_octave
-	note D_, 1
+	D_ 1
 	dec_octave
-	note D_, 1
+	D_ 1
 	inc_octave
-	note F_, 1
-	note E_, 1
+	F_ 1
+	E_ 1
 	dec_octave
-	note D_, 1
+	D_ 1
 	inc_octave
-	note G_, 1
+	G_ 1
 	octave 2
-	note G_, 1
+	G_ 1
 	octave 4
-	note C#, 1
-	note C_, 1
+	C# 1
+	C_ 1
 	octave 2
-	note G_, 1
-	note A#, 1
+	G_ 1
+	A# 1
 	inc_octave
-	note C_, 1
+	C_ 1
 	dec_octave
-	note F_, 1
-	note F#, 1
+	F_ 1
+	F# 1
 	music_ret
 
 Branch_fa370:
 	octave 2
 	volume 147
 	musice8 7
-	note G_, 1
+	G_ 1
 	inc_octave
-	note D_, 1
+	D_ 1
 	inc_octave
-	note D_, 1
+	D_ 1
 	dec_octave
-	note D_, 1
+	D_ 1
 	inc_octave
-	note C#, 1
-	note C_, 1
+	C# 1
+	C_ 1
 	dec_octave
-	note D_, 1
-	note A#, 1
-	note D_, 1
+	D_ 1
+	A# 1
+	D_ 1
 	dec_octave
-	note G_, 1
+	G_ 1
 	inc_octave
-	note A#, 1
+	A# 1
 	dec_octave
 	speed 1
 	musice8 8
-	note F_, 5
-	note F#, 4
+	F_ 5
+	F# 4
 	octave 4
 	duty 2
 	volume 112
-	note G_, 3
+	G_ 3
 	volume 23
-	note G_, 2
+	G_ 2
 	inc_octave
 	volume 112
-	note D_, 2
+	D_ 2
 	volume 23
 	dec_octave
-	note G_, 2
+	G_ 2
 	inc_octave
 	volume 112
-	note G_, 3
+	G_ 3
 	volume 23
-	note D_, 2
+	D_ 2
 	volume 112
-	note D_, 2
+	D_ 2
 	volume 23
-	note G_, 2
+	G_ 2
 	dec_octave
 	volume 112
-	note G_, 3
+	G_ 3
 	volume 23
 	inc_octave
-	note D_, 2
+	D_ 2
 	volume 112
-	note D_, 2
+	D_ 2
 	volume 23
 	dec_octave
-	note G_, 2
+	G_ 2
 	inc_octave
 	volume 112
-	note G_, 3
+	G_ 3
 	volume 23
-	note D_, 2
+	D_ 2
 	volume 112
-	note D_, 2
+	D_ 2
 	volume 23
-	note G_, 2
+	G_ 2
 	speed 9
 	duty 1
 	musice8 7
 	volume 147
 	octave 2
-	note G_, 1
+	G_ 1
 	inc_octave
-	note D_, 1
+	D_ 1
 	inc_octave
-	note D_, 1
+	D_ 1
 	dec_octave
-	note D_, 1
+	D_ 1
 	inc_octave
-	note F_, 1
-	note E_, 1
+	F_ 1
+	E_ 1
 	dec_octave
-	note D_, 1
+	D_ 1
 	inc_octave
-	note G_, 1
+	G_ 1
 	octave 2
-	note G_, 1
+	G_ 1
 	octave 4
-	note C#, 1
-	note C_, 1
+	C# 1
+	C_ 1
 	octave 2
-	note G_, 1
+	G_ 1
 	octave 5
 	duty 2
 	speed 1
 	musice8 8
 	volume 112
 	octave 5
-	note G_, 5
-	note C#, 4
-	note C_, 5
+	G_ 5
+	C# 4
+	C_ 5
 	dec_octave
-	note A#, 4
-	note G_, 5
-	note C#, 4
-	note C_, 5
+	A# 4
+	G_ 5
+	C# 4
+	C_ 5
 	dec_octave
-	note A#, 4
+	A# 4
 	speed 9
 	duty 1
 	musice8 7
@@ -403,32 +403,32 @@ Branch_fa370:
 
 Branch_fa403:
 	octave 2
-	note G_, 1
+	G_ 1
 	inc_octave
-	note D_, 1
+	D_ 1
 	inc_octave
-	note D_, 1
+	D_ 1
 	dec_octave
-	note D_, 1
+	D_ 1
 	inc_octave
-	note C#, 1
-	note C_, 1
+	C# 1
+	C_ 1
 	dec_octave
-	note D_, 1
-	note A#, 1
-	note D_, 1
+	D_ 1
+	A# 1
+	D_ 1
 	dec_octave
-	note G_, 1
+	G_ 1
 	inc_octave
-	note A#, 1
+	A# 1
 	dec_octave
 	speed 1
 	musice8 8
-	note F_, 5
-	note F#, 4
+	F_ 5
+	F# 4
 	speed 9
 	musice8 7
-	note G_, 1
+	G_ 1
 	music_ret
 
 
@@ -444,39 +444,39 @@ Music_Club3_Ch2: ; fa423 (3e:6423)
 	octave 2
 	volume 112
 	rest 4
-	note D_, 2
+	D_ 2
 	volume 55
-	note D_, 1
+	D_ 1
 	volume 112
-	note F_, 1
+	F_ 1
 	volume 55
-	note F_, 2
+	F_ 2
 	volume 112
-	note E_, 6
+	E_ 6
 	tie
-	note E_, 12
+	E_ 12
 	volume 55
-	note E_, 4
+	E_ 4
 	rest 4
 	volume 112
-	note D_, 2
+	D_ 2
 	volume 55
-	note D_, 1
+	D_ 1
 	volume 112
 	speed 1
-	note F_, 5
+	F_ 5
 	tie
-	note F#, 4
+	F# 4
 	speed 9
-	note F_, 1
+	F_ 1
 	volume 55
-	note F_, 1
+	F_ 1
 	volume 112
-	note E_, 6
+	E_ 6
 	tie
-	note E_, 12
+	E_ 12
 	volume 55
-	note E_, 4
+	E_ 4
 	EndLoop
 	duty 1
 	Loop 2
@@ -486,210 +486,210 @@ Music_Club3_Ch2: ; fa423 (3e:6423)
 	inc_octave
 	volume 128
 	speed 1
-	note D_, 5
+	D_ 5
 	volume 55
-	note D_, 4
+	D_ 4
 	speed 9
 	volume 147
 	musice8 7
-	note G_, 1
+	G_ 1
 	dec_octave
 	speed 1
 	musice8 8
 	volume 128
-	note F_, 5
-	note F#, 4
+	F_ 5
+	F# 4
 	inc_octave
 	speed 9
 	volume 147
 	musice8 7
-	note G_, 1
-	note G_, 1
+	G_ 1
+	G_ 1
 	volume 55
-	note G_, 1
+	G_ 1
 	volume 147
-	note F_, 1
+	F_ 1
 	volume 55
-	note F_, 2
+	F_ 2
 	dec_octave
 	volume 147
-	note D_, 1
+	D_ 1
 	inc_octave
 	inc_octave
 	volume 128
 	speed 1
-	note D_, 5
+	D_ 5
 	volume 55
-	note D_, 4
+	D_ 4
 	volume 147
 	speed 9
 	rest 1
 	dec_octave
 	speed 1
 	musice8 8
-	note G_, 5
-	note D_, 4
+	G_ 5
+	D_ 4
 	dec_octave
-	note A#, 5
+	A# 5
 	volume 55
-	note A#, 4
+	A# 4
 	inc_octave
 	inc_octave
 	volume 147
-	note D_, 5
+	D_ 5
 	volume 55
-	note D_, 4
+	D_ 4
 	speed 9
 	volume 128
 	rest 1
 	dec_octave
 	speed 1
-	note D_, 5
+	D_ 5
 	volume 55
-	note D_, 4
+	D_ 4
 	speed 9
 	volume 147
 	musice8 7
-	note G_, 1
+	G_ 1
 	dec_octave
 	speed 1
 	musice8 8
 	volume 128
-	note F_, 5
-	note F#, 4
+	F_ 5
+	F# 4
 	inc_octave
 	speed 9
 	volume 147
 	musice8 7
-	note A#, 1
+	A# 1
 	volume 55
-	note A#, 2
+	A# 2
 	inc_octave
 	volume 147
-	note C#, 1
+	C# 1
 	volume 55
-	note C#, 1
+	C# 1
 	dec_octave
 	volume 147
-	note G_, 1
+	G_ 1
 	volume 55
-	note G_, 1
+	G_ 1
 	dec_octave
 	speed 1
 	volume 128
-	note A#, 5
+	A# 5
 	volume 55
-	note C_, 4
+	C_ 4
 	speed 9
 	rest 1
 	dec_octave
 	volume 128
 	musice8 8
-	note A#, 1
-	note B_, 1
+	A# 1
+	B_ 1
 	inc_octave
-	note C_, 1
+	C_ 1
 	music_call Branch_fa5a6
 	speed 9
 	rest 1
 	inc_octave
 	speed 1
 	volume 128
-	note D_, 5
+	D_ 5
 	volume 55
-	note D_, 4
+	D_ 4
 	speed 9
 	volume 147
 	musice8 7
-	note G_, 1
+	G_ 1
 	dec_octave
 	speed 1
 	musice8 8
 	volume 128
-	note F_, 5
-	note F#, 4
+	F_ 5
+	F# 4
 	inc_octave
 	speed 9
 	volume 147
 	musice8 7
-	note G_, 1
-	note G_, 1
+	G_ 1
+	G_ 1
 	volume 55
-	note G_, 1
+	G_ 1
 	volume 147
-	note F_, 1
+	F_ 1
 	volume 55
-	note F_, 2
+	F_ 2
 	volume 147
-	note D_, 1
+	D_ 1
 	inc_octave
 	volume 128
 	speed 1
-	note G_, 5
+	G_ 5
 	volume 55
-	note G_, 4
+	G_ 4
 	speed 9
 	rest 1
 	dec_octave
 	dec_octave
 	speed 1
 	volume 128
-	note G_, 5
+	G_ 5
 	volume 55
-	note G_, 4
+	G_ 4
 	inc_octave
 	volume 128
-	note D_, 5
+	D_ 5
 	volume 55
-	note D_, 4
+	D_ 4
 	speed 9
 	rest 1
 	rest 1
 	speed 1
 	volume 128
-	note D_, 5
+	D_ 5
 	volume 55
-	note D_, 4
+	D_ 4
 	speed 9
 	volume 147
 	musice8 7
-	note G_, 1
+	G_ 1
 	dec_octave
 	speed 1
 	musice8 8
 	volume 128
-	note F_, 5
-	note F#, 4
+	F_ 5
+	F# 4
 	inc_octave
 	inc_octave
 	speed 9
 	volume 147
 	musice8 7
-	note C#, 1
+	C# 1
 	volume 55
-	note C#, 2
+	C# 2
 	volume 147
-	note C_, 1
+	C_ 1
 	volume 55
-	note C_, 1
+	C_ 1
 	dec_octave
 	volume 147
-	note G_, 1
+	G_ 1
 	volume 55
-	note G_, 1
+	G_ 1
 	volume 128
 	speed 1
-	note F_, 5
+	F_ 5
 	volume 55
-	note F_, 4
+	F_ 4
 	volume 128
 	speed 9
 	rest 1
 	dec_octave
 	musice8 8
-	note D_, 1
-	note D#, 1
-	note E_, 1
+	D_ 1
+	D# 1
+	E_ 1
 	EndLoop
 	EndMainLoop
 
@@ -698,103 +698,103 @@ Branch_fa5a6:
 	rest 1
 	volume 128
 	speed 1
-	note D_, 5
+	D_ 5
 	volume 55
-	note D_, 4
+	D_ 4
 	speed 9
 	volume 147
 	musice8 7
-	note G_, 1
+	G_ 1
 	dec_octave
 	speed 1
 	volume 128
 	musice8 8
-	note F_, 5
-	note F#, 4
+	F_ 5
+	F# 4
 	inc_octave
 	speed 9
 	musice8 7
 	volume 147
-	note G_, 1
-	note G_, 1
+	G_ 1
+	G_ 1
 	volume 55
-	note G_, 1
+	G_ 1
 	volume 147
-	note F_, 1
+	F_ 1
 	volume 55
-	note F_, 2
+	F_ 2
 	volume 147
-	note E_, 1
+	E_ 1
 	inc_octave
 	volume 128
 	musice8 8
 	speed 1
-	note D_, 5
+	D_ 5
 	volume 55
-	note D_, 4
+	D_ 4
 	volume 128
 	speed 9
 	rest 1
 	dec_octave
 	speed 1
 	musice8 8
-	note G_, 5
-	note D_, 4
+	G_ 5
+	D_ 4
 	dec_octave
-	note A#, 5
+	A# 5
 	volume 55
-	note A#, 4
+	A# 4
 	volume 128
 	inc_octave
 	inc_octave
-	note D_, 5
+	D_ 5
 	volume 55
-	note D_, 4
+	D_ 4
 	speed 9
 	rest 1
 	dec_octave
 	speed 1
 	volume 128
-	note D_, 5
+	D_ 5
 	volume 55
-	note D_, 4
+	D_ 4
 	speed 9
 	volume 147
 	musice8 7
-	note G_, 1
+	G_ 1
 	dec_octave
 	speed 1
 	volume 128
 	musice8 8
-	note F_, 5
-	note F#, 4
+	F_ 5
+	F# 4
 	speed 9
 	inc_octave
 	volume 147
 	musice8 7
-	note A#, 1
+	A# 1
 	volume 55
-	note A#, 2
+	A# 2
 	inc_octave
 	volume 147
-	note C#, 1
+	C# 1
 	volume 55
-	note C#, 1
+	C# 1
 	dec_octave
 	volume 147
-	note G_, 1
+	G_ 1
 	volume 55
-	note G_, 1
+	G_ 1
 	dec_octave
 	volume 147
-	note A#, 1
+	A# 1
 	volume 55
-	note A#, 1
+	A# 1
 	musice8 8
 	volume 128
-	note A#, 1
+	A# 1
 	volume 55
-	note A#, 2
+	A# 2
 	music_ret
 
 
@@ -807,257 +807,257 @@ Music_Club3_Ch3: ; fa63e (3e:663e)
 	musice8 8
 	Loop 4
 	octave 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note G_, 14
+	G_ 14
 	rest 1
 	inc_octave
-	note F_, 1
+	F_ 1
 	rest 2
-	note G_, 1
+	G_ 1
 	rest 2
 	dec_octave
-	note G_, 1
+	G_ 1
 	rest 1
-	note E_, 3
-	note F_, 1
+	E_ 3
+	F_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
 	EndLoop
 	Loop 2
 	octave 1
-	note G_, 1
+	G_ 1
 	octave 3
 	musice8 4
-	note G_, 1
+	G_ 1
 	rest 1
 	octave 1
 	musice8 8
-	note G_, 1
+	G_ 1
 	inc_octave
-	note F_, 1
-	note G_, 1
+	F_ 1
+	G_ 1
 	rest 1
 	dec_octave
-	note G_, 1
+	G_ 1
 	rest 1
 	inc_octave
-	note G_, 1
+	G_ 1
 	rest 1
 	octave 4
 	musice8 4
-	note G_, 1
+	G_ 1
 	rest 1
 	octave 1
 	musice8 8
-	note E_, 1
-	note F_, 1
+	E_ 1
+	F_ 1
 	octave 4
 	musice8 4
-	note G_, 1
+	G_ 1
 	octave 1
 	musice8 8
-	note G_, 1
+	G_ 1
 	octave 3
 	musice8 4
-	note G_, 1
+	G_ 1
 	rest 1
 	octave 1
 	musice8 8
-	note G_, 1
+	G_ 1
 	inc_octave
-	note F_, 1
-	note G_, 1
+	F_ 1
+	G_ 1
 	rest 1
 	dec_octave
-	note G_, 1
+	G_ 1
 	rest 1
 	inc_octave
-	note G_, 1
+	G_ 1
 	rest 1
 	inc_octave
 	musice8 4
-	note F_, 1
+	F_ 1
 	rest 1
 	musice8 8
-	note E_, 1
+	E_ 1
 	octave 1
-	note F_, 1
-	note F#, 1
-	note D#, 1
+	F_ 1
+	F# 1
+	D# 1
 	octave 3
 	musice8 4
-	note G_, 1
+	G_ 1
 	rest 1
 	octave 1
 	musice8 8
-	note D#, 1
+	D# 1
 	inc_octave
-	note D_, 1
-	note D#, 1
+	D_ 1
+	D# 1
 	rest 1
 	dec_octave
-	note D#, 1
+	D# 1
 	rest 1
 	inc_octave
-	note D#, 1
+	D# 1
 	rest 1
 	octave 4
 	musice8 4
-	note G_, 1
+	G_ 1
 	rest 1
 	octave 1
 	musice8 8
-	note C_, 1
-	note C#, 1
+	C_ 1
+	C# 1
 	octave 4
 	musice8 4
-	note G_, 1
+	G_ 1
 	octave 1
 	musice8 8
-	note D#, 1
+	D# 1
 	octave 3
 	musice8 4
-	note G_, 1
+	G_ 1
 	rest 1
 	octave 1
 	musice8 8
-	note D#, 1
+	D# 1
 	inc_octave
-	note D_, 1
-	note D#, 1
+	D_ 1
+	D# 1
 	rest 1
 	dec_octave
-	note D#, 1
+	D# 1
 	rest 1
 	inc_octave
-	note D#, 1
+	D# 1
 	rest 1
 	inc_octave
 	musice8 4
-	note F_, 1
+	F_ 1
 	rest 1
 	dec_octave
 	musice8 8
-	note D_, 1
-	note D#, 1
-	note E_, 1
+	D_ 1
+	D# 1
+	E_ 1
 	dec_octave
-	note C_, 1
+	C_ 1
 	octave 3
 	musice8 4
-	note G_, 1
+	G_ 1
 	rest 1
 	octave 1
 	musice8 8
-	note C_, 1
-	note A#, 1
+	C_ 1
+	A# 1
 	inc_octave
-	note C_, 1
+	C_ 1
 	rest 1
 	dec_octave
-	note C_, 1
+	C_ 1
 	rest 1
 	inc_octave
-	note C_, 1
+	C_ 1
 	rest 1
 	octave 4
 	musice8 4
-	note G_, 1
+	G_ 1
 	rest 1
 	octave 1
 	musice8 8
-	note A_, 1
-	note A#, 1
+	A_ 1
+	A# 1
 	octave 4
 	musice8 4
-	note G_, 1
+	G_ 1
 	octave 1
 	musice8 8
-	note C_, 1
+	C_ 1
 	octave 3
 	musice8 4
-	note G_, 1
+	G_ 1
 	rest 1
 	octave 1
 	musice8 8
-	note C_, 1
-	note A#, 1
+	C_ 1
+	A# 1
 	inc_octave
-	note C_, 1
+	C_ 1
 	rest 1
 	dec_octave
-	note C_, 1
+	C_ 1
 	rest 1
 	inc_octave
-	note C_, 1
+	C_ 1
 	rest 1
 	inc_octave
 	musice8 4
-	note F_, 1
+	F_ 1
 	rest 1
 	musice8 8
-	note E_, 1
+	E_ 1
 	octave 1
-	note A#, 1
-	note B_, 1
-	note D_, 1
+	A# 1
+	B_ 1
+	D_ 1
 	octave 3
 	musice8 4
-	note G_, 1
+	G_ 1
 	rest 1
 	octave 1
 	musice8 8
-	note D_, 1
+	D_ 1
 	inc_octave
-	note C_, 1
-	note D_, 1
+	C_ 1
+	D_ 1
 	rest 1
 	dec_octave
-	note D_, 1
+	D_ 1
 	rest 1
 	inc_octave
-	note D_, 1
+	D_ 1
 	rest 1
 	octave 4
 	musice8 4
-	note C_, 1
+	C_ 1
 	rest 1
 	octave 2
 	musice8 6
-	note A#, 1
+	A# 1
 	dec_octave
 	musice8 8
-	note C_, 1
-	note C#, 1
-	note D_, 1
+	C_ 1
+	C# 1
+	D_ 1
 	octave 3
 	musice8 4
-	note G_, 1
+	G_ 1
 	rest 1
 	octave 1
 	musice8 8
-	note D_, 1
+	D_ 1
 	inc_octave
-	note C_, 1
-	note D_, 1
+	C_ 1
+	D_ 1
 	rest 1
 	dec_octave
-	note D_, 1
+	D_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
 	inc_octave
 	musice8 4
-	note A#, 1
+	A# 1
 	rest 1
 	dec_octave
 	musice8 8
-	note A#, 1
-	note B_, 1
+	A# 1
+	B_ 1
 	inc_octave
-	note C_, 1
+	C_ 1
 	EndLoop
 	EndMainLoop
 
@@ -1068,35 +1068,35 @@ Music_Club3_Ch4: ; fa772 (3e:6772)
 	MainLoop
 	Loop 3
 	music_call Branch_fa796
-	note snare1, 2
-	note snare4, 2
+	snare1 2
+	snare4 2
 	music_call Branch_fa796
-	note snare1, 2
-	note snare3, 1
-	note snare1, 1
+	snare1 2
+	snare3 1
+	snare1 1
 	EndLoop
 	music_call Branch_fa796
-	note snare1, 2
-	note snare4, 2
+	snare1 2
+	snare4 2
 	music_call Branch_fa796
-	note snare1, 1
+	snare1 1
 	speed 1
-	note snare3, 5
-	note snare1, 4
+	snare3 5
+	snare1 4
 	speed 9
-	note snare1, 1
-	note snare1, 1
+	snare1 1
+	snare1 1
 	EndMainLoop
 
 Branch_fa796:
-	note bass, 2
-	note snare3, 2
-	note snare1, 2
-	note snare3, 1
-	note snare1, 1
-	note snare3, 1
-	note bass, 1
-	note snare4, 1
-	note bass, 1
+	bass 2
+	snare3 2
+	snare1 2
+	snare3 1
+	snare1 1
+	snare3 1
+	bass 1
+	snare4 1
+	bass 1
 	music_ret
 ; 0xfa7a0
diff --git a/audio/music/credits.asm b/audio/music/credits.asm
index 327afe3..6a8b050 100644
--- a/audio/music/credits.asm
+++ b/audio/music/credits.asm
@@ -7,687 +7,687 @@ Music_Credits_Ch1: ; fb1fe (3e:71fe)
 	octave 2
 	duty 1
 	volume 79
-	note F_, 1
+	F_ 1
 	volume 96
-	note F_, 2
+	F_ 2
 	tie
 	speed 1
-	note F_, 6
+	F_ 6
 	volume 55
-	note F_, 7
+	F_ 7
 	speed 13
 	volume 111
-	note G_, 1
+	G_ 1
 	volume 112
-	note G_, 2
+	G_ 2
 	tie
 	speed 1
-	note G_, 6
+	G_ 6
 	volume 71
-	note G_, 7
+	G_ 7
 	speed 13
 	volume 111
-	note A_, 1
+	A_ 1
 	volume 128
-	note A_, 2
+	A_ 2
 	tie
 	speed 1
-	note A_, 6
+	A_ 6
 	volume 71
-	note A_, 7
+	A_ 7
 	speed 13
 	volume 128
-	note B_, 3
+	B_ 3
 	volume 71
-	note B_, 1
+	B_ 1
 	inc_octave
 	volume 128
-	note C_, 1
+	C_ 1
 	volume 55
-	note C_, 1
+	C_ 1
 	music_call Branch_fb5bc
 	octave 2
-	note F_, 1
+	F_ 1
 	volume 55
-	note F_, 1
+	F_ 1
 	music_call Branch_fb36b
 	octave 4
 	volume 160
 	speed 1
-	note D#, 3
-	note E_, 10
+	D# 3
+	E_ 10
 	tie
 	speed 13
-	note E_, 4
+	E_ 4
 	volume 55
-	note E_, 1
+	E_ 1
 	volume 160
-	note F_, 1
+	F_ 1
 	speed 1
-	note G_, 5
+	G_ 5
 	volume 55
-	note G_, 8
+	G_ 8
 	speed 13
 	volume 160
-	note E_, 5
+	E_ 5
 	volume 55
-	note E_, 1
+	E_ 1
 	volume 160
-	note F_, 1
+	F_ 1
 	speed 1
-	note G_, 5
+	G_ 5
 	volume 55
-	note G_, 8
+	G_ 8
 	speed 13
 	volume 160
-	note C_, 5
+	C_ 5
 	volume 55
-	note C_, 1
+	C_ 1
 	dec_octave
 	speed 1
 	volume 160
-	note A_, 6
+	A_ 6
 	volume 55
-	note A_, 13
+	A_ 13
 	rest 7
 	inc_octave
 	volume 160
-	note C#, 3
-	note D_, 10
+	C# 3
+	D_ 10
 	tie
 	speed 13
-	note D_, 2
+	D_ 2
 	volume 55
-	note D_, 1
+	D_ 1
 	volume 160
-	note C_, 1
+	C_ 1
 	volume 55
-	note C_, 1
+	C_ 1
 	dec_octave
 	volume 160
-	note G#, 1
+	G# 1
 	volume 55
-	note G#, 1
+	G# 1
 	volume 160
 	speed 1
-	note F#, 3
-	note G_, 10
+	F# 3
+	G_ 10
 	tie
 	speed 13
-	note G_, 3
+	G_ 3
 	volume 55
-	note G_, 1
+	G_ 1
 	volume 160
-	note G_, 1
+	G_ 1
 	speed 1
-	note A_, 5
+	A_ 5
 	volume 55
-	note A_, 8
+	A_ 8
 	volume 160
-	note B_, 5
+	B_ 5
 	volume 55
-	note B_, 8
+	B_ 8
 	volume 160
-	note B_, 3
+	B_ 3
 	inc_octave
-	note C_, 10
+	C_ 10
 	tie
 	speed 13
-	note C_, 2
+	C_ 2
 	tie
 	speed 1
-	note C_, 6
+	C_ 6
 	volume 55
-	note C_, 13
+	C_ 13
 	rest 7
 	dec_octave
 	volume 160
-	note B_, 3
+	B_ 3
 	inc_octave
-	note C_, 10
-	note D_, 5
+	C_ 10
+	D_ 5
 	volume 55
-	note D_, 8
+	D_ 8
 	volume 160
-	note E_, 5
+	E_ 5
 	volume 55
-	note E_, 8
+	E_ 8
 	speed 13
 	volume 160
-	note F_, 3
-	note E_, 1
+	F_ 3
+	E_ 1
 	speed 1
-	note C_, 6
+	C_ 6
 	volume 55
-	note C_, 13
+	C_ 13
 	rest 7
 	dec_octave
 	volume 160
-	note A_, 6
+	A_ 6
 	volume 55
-	note A_, 13
+	A_ 13
 	rest 7
 	volume 160
-	note B_, 3
+	B_ 3
 	inc_octave
-	note C_, 10
+	C_ 10
 	tie
 	speed 13
-	note C_, 2
+	C_ 2
 	tie
 	speed 1
-	note C_, 6
+	C_ 6
 	volume 55
-	note C_, 13
+	C_ 13
 	rest 7
 	volume 160
-	note C#, 3
-	note D_, 10
+	C# 3
+	D_ 10
 	tie
 	speed 13
-	note D_, 2
+	D_ 2
 	volume 55
-	note D_, 1
+	D_ 1
 	volume 160
-	note C_, 8
+	C_ 8
 	tie
-	note C_, 8
+	C_ 8
 	tie
-	note C_, 8
+	C_ 8
 	volume 55
-	note C_, 1
+	C_ 1
 	music_call Branch_fb36b
 	octave 4
 	speed 1
 	volume 160
-	note D_, 3
-	note D#, 10
+	D_ 3
+	D# 10
 	tie
 	speed 13
-	note D#, 4
+	D# 4
 	volume 55
-	note D#, 1
+	D# 1
 	volume 160
-	note D_, 1
+	D_ 1
 	speed 1
-	note C_, 6
+	C_ 6
 	volume 55
-	note C_, 7
+	C_ 7
 	volume 160
-	note E_, 3
-	note F_, 10
+	E_ 3
+	F_ 10
 	tie
 	speed 13
-	note F_, 3
+	F_ 3
 	volume 55
-	note F_, 1
+	F_ 1
 	volume 160
-	note D#, 1
-	note F_, 1
+	D# 1
+	F_ 1
 	volume 55
-	note F_, 1
+	F_ 1
 	speed 1
 	volume 160
-	note F#, 3
-	note G_, 10
+	F# 3
+	G_ 10
 	tie
 	speed 13
-	note G_, 4
+	G_ 4
 	dec_octave
 	dec_octave
 	speed 1
 	volume 144
-	note E_, 6
-	note A_, 7
+	E_ 6
+	A_ 7
 	inc_octave
-	note C_, 6
+	C_ 6
 	dec_octave
-	note A_, 7
-	note G_, 6
+	A_ 7
+	G_ 6
 	inc_octave
-	note C_, 7
-	note F_, 6
-	note D_, 7
+	C_ 7
+	F_ 6
+	D_ 7
 	speed 13
-	note E_, 8
+	E_ 8
 	tie
-	note E_, 1
+	E_ 1
 	volume 55
-	note E_, 2
+	E_ 2
 	music_end
 
 Branch_fb36b:
 	speed 13
 	octave 2
 	volume 128
-	note A_, 1
+	A_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	volume 55
-	note G_, 1
+	G_ 1
 	volume 128
-	note A_, 1
-	note B_, 1
+	A_ 1
+	B_ 1
 	inc_octave
-	note C_, 1
+	C_ 1
 	volume 55
-	note C_, 1
+	C_ 1
 	rest 1
 	music_call Branch_fb5bc
 	octave 2
-	note A_, 2
-	note A_, 1
+	A_ 2
+	A_ 1
 	volume 55
-	note A_, 1
+	A_ 1
 	volume 128
-	note A_, 1
+	A_ 1
 	volume 55
-	note A_, 1
+	A_ 1
 	volume 128
-	note B_, 1
+	B_ 1
 	inc_octave
 	music_call Branch_fb5e4
 	octave 4
 	volume 160
-	note C_, 1
+	C_ 1
 	volume 55
-	note C_, 1
+	C_ 1
 	dec_octave
 	volume 160
-	note G_, 4
+	G_ 4
 	tie
-	note G_, 8
+	G_ 8
 	volume 55
-	note G_, 1
+	G_ 1
 	volume 160
-	note E_, 1
-	note F_, 1
+	E_ 1
+	F_ 1
 	speed 1
-	note G_, 6
+	G_ 6
 	volume 55
-	note G_, 7
+	G_ 7
 	volume 160
-	note F#, 3
-	note G_, 10
+	F# 3
+	G_ 10
 	tie
 	speed 13
-	note G_, 4
+	G_ 4
 	volume 55
-	note G_, 1
+	G_ 1
 	volume 160
-	note F_, 1
+	F_ 1
 	volume 55
-	note F_, 1
+	F_ 1
 	volume 160
 	speed 1
-	note E_, 3
-	note F_, 10
+	E_ 3
+	F_ 10
 	tie
 	speed 13
-	note F_, 2
-	note E_, 1
+	F_ 2
+	E_ 1
 	tie
 	speed 1
-	note E_, 6
-	note F_, 4
-	note E_, 3
-	note D_, 13
-	note C_, 13
+	E_ 6
+	F_ 4
+	E_ 3
+	D_ 13
+	C_ 13
 	volume 55
-	note C_, 13
+	C_ 13
 	volume 160
-	note C#, 3
-	note D_, 10
+	C# 3
+	D_ 10
 	tie
 	speed 13
-	note D_, 4
+	D_ 4
 	tie
-	note D_, 8
+	D_ 8
 	volume 55
-	note D_, 2
+	D_ 2
 	music_call Branch_fb5e4
 	octave 4
 	volume 160
-	note E_, 1
+	E_ 1
 	volume 55
-	note E_, 1
+	E_ 1
 	dec_octave
 	volume 160
-	note G_, 4
+	G_ 4
 	tie
-	note G_, 8
+	G_ 8
 	volume 55
-	note G_, 1
+	G_ 1
 	volume 160
-	note E_, 1
-	note F_, 1
+	E_ 1
+	F_ 1
 	speed 1
-	note G_, 6
+	G_ 6
 	volume 55
-	note G_, 7
+	G_ 7
 	volume 160
-	note G_, 3
-	note G#, 10
+	G_ 3
+	G# 10
 	tie
-	note G#, 13
+	G# 13
 	volume 55
-	note G#, 13
+	G# 13
 	inc_octave
 	volume 160
-	note C_, 13
+	C_ 13
 	volume 55
-	note C_, 13
+	C_ 13
 	volume 160
-	note C#, 3
-	note D_, 10
-	note C_, 13
+	C# 3
+	D_ 10
+	C_ 13
 	volume 55
-	note C_, 13
+	C_ 13
 	volume 160
-	note F#, 3
-	note G_, 10
+	F# 3
+	G_ 10
 	tie
 	speed 13
-	note G_, 2
-	note F_, 1
+	G_ 2
+	F_ 1
 	volume 55
-	note F_, 1
+	F_ 1
 	volume 160
-	note C_, 1
-	note D_, 1
+	C_ 1
+	D_ 1
 	volume 55
-	note D_, 1
+	D_ 1
 	volume 160
 	speed 1
-	note D#, 3
-	note E_, 10
+	D# 3
+	E_ 10
 	tie
 	speed 13
-	note E_, 8
+	E_ 8
 	music_call Branch_fb60c
 	speed 13
 	octave 4
-	note G_, 8
+	G_ 8
 	volume 55
-	note G_, 1
+	G_ 1
 	volume 160
 	speed 1
-	note F#, 3
-	note G_, 10
+	F# 3
+	G_ 10
 	volume 55
-	note G_, 13
+	G_ 13
 	volume 160
-	note F_, 13
+	F_ 13
 	volume 55
-	note F_, 13
+	F_ 13
 	volume 160
-	note E_, 13
+	E_ 13
 	volume 55
-	note E_, 13
+	E_ 13
 	volume 160
-	note E_, 6
-	note F_, 7
-	note E_, 13
+	E_ 6
+	F_ 7
+	E_ 13
 	dec_octave
-	note A_, 6
+	A_ 6
 	volume 55
-	note A_, 7
+	A_ 7
 	inc_octave
 	volume 160
-	note C_, 6
+	C_ 6
 	volume 55
-	note C_, 7
+	C_ 7
 	dec_octave
 	volume 160
-	note F_, 6
+	F_ 6
 	volume 55
-	note F_, 13
+	F_ 13
 	rest 7
 	volume 160
-	note A_, 13
+	A_ 13
 	inc_octave
-	note C_, 6
+	C_ 6
 	volume 55
-	note C_, 7
+	C_ 7
 	volume 160
-	note D#, 3
-	note E_, 10
+	D# 3
+	E_ 10
 	tie
-	note E_, 13
-	note F_, 6
+	E_ 13
+	F_ 6
 	volume 55
-	note F_, 7
+	F_ 7
 	volume 160
-	note E_, 6
+	E_ 6
 	volume 55
-	note E_, 7
+	E_ 7
 	volume 160
-	note C_, 6
+	C_ 6
 	volume 55
-	note C_, 13
+	C_ 13
 	rest 7
 	volume 160
-	note C#, 3
-	note D_, 10
+	C# 3
+	D_ 10
 	tie
-	note D_, 13
-	note C#, 6
-	note C_, 7
+	D_ 13
+	C# 6
+	C_ 7
 	dec_octave
-	note B_, 13
+	B_ 13
 	inc_octave
-	note C_, 6
+	C_ 6
 	volume 55
-	note C_, 7
+	C_ 7
 	volume 160
-	note G_, 6
+	G_ 6
 	volume 55
-	note G_, 7
+	G_ 7
 	volume 160
 	speed 13
-	note E_, 5
+	E_ 5
 	music_call Branch_fb60c
 	speed 13
 	octave 4
-	note G_, 3
+	G_ 3
 	volume 55
-	note G_, 1
+	G_ 1
 	volume 160
-	note G_, 1
+	G_ 1
 	speed 1
-	note A_, 6
+	A_ 6
 	volume 55
-	note A_, 7
+	A_ 7
 	volume 160
-	note B_, 6
+	B_ 6
 	volume 55
-	note B_, 7
+	B_ 7
 	volume 160
-	note B_, 3
+	B_ 3
 	inc_octave
-	note C_, 10
+	C_ 10
 	volume 55
-	note C_, 13
+	C_ 13
 	dec_octave
 	volume 160
-	note F#, 3
-	note G_, 10
+	F# 3
+	G_ 10
 	volume 55
-	note G_, 13
+	G_ 13
 	volume 160
-	note F_, 13
+	F_ 13
 	volume 55
-	note F_, 13
+	F_ 13
 	volume 160
-	note E_, 13
+	E_ 13
 	volume 55
-	note E_, 13
+	E_ 13
 	volume 160
-	note E_, 3
-	note F_, 10
+	E_ 3
+	F_ 10
 	tie
-	note F_, 13
-	note E_, 13
-	note C_, 6
+	F_ 13
+	E_ 13
+	C_ 6
 	volume 55
-	note C_, 7
+	C_ 7
 	dec_octave
 	volume 160
-	note A_, 6
+	A_ 6
 	volume 55
-	note A_, 7
+	A_ 7
 	rest 13
 	inc_octave
 	volume 160
-	note C_, 13
+	C_ 13
 	dec_octave
-	note A_, 6
+	A_ 6
 	volume 55
-	note A_, 7
+	A_ 7
 	inc_octave
 	volume 160
-	note E_, 3
-	note F_, 10
+	E_ 3
+	F_ 10
 	tie
-	note F_, 13
-	note E_, 13
-	note C_, 6
+	F_ 13
+	E_ 13
+	C_ 6
 	volume 55
-	note C_, 7
+	C_ 7
 	dec_octave
 	volume 160
-	note G#, 6
+	G# 6
 	volume 55
-	note G#, 7
+	G# 7
 	rest 13
 	inc_octave
 	volume 160
-	note C_, 6
+	C_ 6
 	volume 55
-	note C_, 7
+	C_ 7
 	rest 13
 	volume 160
-	note F#, 3
-	note G_, 10
+	F# 3
+	G_ 10
 	tie
 	speed 13
-	note G_, 8
+	G_ 8
 	volume 55
-	note G_, 1
+	G_ 1
 	dec_octave
 	dec_octave
 	volume 128
-	note G_, 1
+	G_ 1
 	volume 39
-	note G_, 1
+	G_ 1
 	volume 128
-	note A_, 1
+	A_ 1
 	volume 39
-	note A_, 1
+	A_ 1
 	volume 128
-	note B_, 1
+	B_ 1
 	speed 1
 	volume 160
-	note G_, 3
-	note A_, 3
-	note B_, 3
+	G_ 3
+	A_ 3
+	B_ 3
 	inc_octave
-	note C_, 4
-	note D_, 3
-	note E_, 3
-	note F_, 3
-	note G_, 4
+	C_ 4
+	D_ 3
+	E_ 3
+	F_ 3
+	G_ 4
 	music_call Branch_fb651
 	octave 3
 	volume 160
-	note G#, 3
-	note A_, 10
+	G# 3
+	A_ 10
 	tie
-	note A_, 13
+	A_ 13
 	volume 55
-	note A_, 13
+	A_ 13
 	volume 160
-	note C_, 13
+	C_ 13
 	volume 55
-	note C_, 13
+	C_ 13
 	volume 160
-	note C#, 3
-	note D_, 10
-	note C_, 13
+	C# 3
+	D_ 10
+	C_ 13
 	volume 55
-	note C_, 13
+	C_ 13
 	volume 160
-	note F#, 3
-	note G_, 10
+	F# 3
+	G_ 10
 	tie
-	note G_, 13
+	G_ 13
 	volume 55
-	note G_, 13
+	G_ 13
 	volume 160
-	note D#, 3
-	note E_, 10
+	D# 3
+	E_ 10
 	volume 55
-	note E_, 13
+	E_ 13
 	volume 160
-	note D_, 13
-	note C_, 13
+	D_ 13
+	C_ 13
 	volume 55
-	note C_, 13
+	C_ 13
 	volume 160
-	note C#, 3
-	note D_, 10
+	C# 3
+	D_ 10
 	tie
 	speed 13
-	note D_, 4
+	D_ 4
 	tie
-	note D_, 8
+	D_ 8
 	volume 55
-	note D_, 1
+	D_ 1
 	dec_octave
 	volume 128
-	note G_, 1
+	G_ 1
 	speed 1
-	note A_, 6
+	A_ 6
 	volume 39
-	note A_, 7
+	A_ 7
 	volume 128
-	note B_, 6
+	B_ 6
 	volume 39
-	note B_, 7
+	B_ 7
 	music_call Branch_fb651
 	octave 3
 	volume 160
-	note G_, 3
-	note G#, 10
+	G_ 3
+	G# 10
 	tie
-	note G#, 13
+	G# 13
 	volume 55
-	note G#, 13
+	G# 13
 	inc_octave
 	volume 160
-	note C_, 13
+	C_ 13
 	volume 55
-	note C_, 13
+	C_ 13
 	volume 160
-	note C#, 3
-	note D_, 10
-	note C_, 13
+	C# 3
+	D_ 10
+	C_ 13
 	volume 55
-	note C_, 13
+	C_ 13
 	volume 160
-	note F#, 3
-	note G_, 10
+	F# 3
+	G_ 10
 	tie
 	speed 13
-	note G_, 2
-	note F_, 1
+	G_ 2
+	F_ 1
 	volume 55
-	note F_, 1
+	F_ 1
 	volume 160
-	note C_, 1
-	note D_, 1
+	C_ 1
+	D_ 1
 	volume 55
-	note D_, 1
+	D_ 1
 	music_ret
 
 Branch_fb5bc:
@@ -695,32 +695,32 @@ Branch_fb5bc:
 	speed 13
 	rest 2
 	volume 128
-	note G_, 1
+	G_ 1
 	inc_octave
-	note C_, 1
+	C_ 1
 	rest 1
 	dec_octave
-	note A_, 1
+	A_ 1
 	volume 55
-	note A_, 1
+	A_ 1
 	rest 2
 	volume 128
-	note B_, 1
+	B_ 1
 	volume 55
-	note B_, 1
+	B_ 1
 	volume 128
-	note A_, 1
+	A_ 1
 	rest 1
 	inc_octave
-	note C_, 1
+	C_ 1
 	volume 55
-	note C_, 1
+	C_ 1
 	rest 3
 	dec_octave
 	volume 128
-	note G_, 1
+	G_ 1
 	inc_octave
-	note C_, 1
+	C_ 1
 	rest 1
 	music_ret
 
@@ -728,124 +728,124 @@ Branch_fb5e4:
 	octave 3
 	volume 160
 	speed 1
-	note F#, 3
-	note G_, 10
-	note F_, 6
+	F# 3
+	G_ 10
+	F_ 6
 	volume 55
-	note F_, 7
+	F_ 7
 	speed 13
 	volume 128
-	note E_, 4
+	E_ 4
 	volume 55
-	note E_, 1
+	E_ 1
 	volume 160
-	note G_, 1
+	G_ 1
 	volume 55
-	note G_, 1
+	G_ 1
 	inc_octave
 	volume 160
 	speed 1
-	note C#, 3
-	note D_, 10
+	C# 3
+	D_ 10
 	tie
 	speed 13
-	note D_, 4
+	D_ 4
 	volume 55
-	note D_, 1
+	D_ 1
 	music_ret
 
 Branch_fb60c:
 	octave 4
 	speed 13
 	volume 55
-	note E_, 1
+	E_ 1
 	volume 160
 	speed 1
-	note D#, 3
-	note E_, 10
+	D# 3
+	E_ 10
 	speed 13
 	volume 55
-	note E_, 1
+	E_ 1
 	volume 160
-	note F_, 1
+	F_ 1
 	volume 55
-	note F_, 1
+	F_ 1
 	volume 160
-	note G_, 1
+	G_ 1
 	volume 55
-	note G_, 1
+	G_ 1
 	volume 160
 	speed 1
-	note G#, 3
-	note A_, 10
+	G# 3
+	A_ 10
 	tie
 	speed 13
-	note A_, 8
+	A_ 8
 	volume 55
-	note A_, 1
+	A_ 1
 	volume 160
 	speed 1
-	note G#, 3
-	note A_, 10
+	G# 3
+	A_ 10
 	volume 55
-	note A_, 13
+	A_ 13
 	volume 160
-	note G_, 13
+	G_ 13
 	volume 55
-	note G_, 13
+	G_ 13
 	volume 160
-	note F_, 13
+	F_ 13
 	volume 55
-	note F_, 13
+	F_ 13
 	volume 160
-	note F#, 3
-	note G_, 10
+	F# 3
+	G_ 10
 	tie
 	music_ret
 
 Branch_fb651:
 	octave 3
 	volume 160
-	note D#, 3
-	note E_, 10
-	note F_, 6
+	D# 3
+	E_ 10
+	F_ 6
 	volume 55
-	note F_, 7
+	F_ 7
 	volume 160
-	note G_, 5
+	G_ 5
 	volume 55
-	note G_, 8
+	G_ 8
 	inc_octave
 	volume 160
-	note C#, 3
-	note D_, 10
+	C# 3
+	D_ 10
 	tie
-	note D_, 13
-	note C_, 6
+	D_ 13
+	C_ 6
 	volume 55
-	note C_, 13
+	C_ 13
 	rest 7
 	dec_octave
 	speed 13
 	volume 160
-	note G_, 6
+	G_ 6
 	tie
-	note G_, 6
+	G_ 6
 	tie
-	note G_, 8
+	G_ 8
 	volume 55
-	note G_, 1
+	G_ 1
 	volume 160
 	speed 1
-	note D#, 3
-	note E_, 10
-	note F_, 5
+	D# 3
+	E_ 10
+	F_ 5
 	volume 55
-	note F_, 8
+	F_ 8
 	volume 160
-	note G_, 5
+	G_ 5
 	volume 55
-	note G_, 8
+	G_ 8
 	music_ret
 
 
@@ -858,748 +858,748 @@ Music_Credits_Ch2: ; fb68a (3e:768a)
 	octave 2
 	speed 13
 	volume 63
-	note A_, 1
+	A_ 1
 	volume 112
-	note A_, 2
+	A_ 2
 	tie
 	speed 1
-	note A_, 6
+	A_ 6
 	volume 39
-	note A_, 7
+	A_ 7
 	speed 13
 	volume 127
-	note B_, 1
+	B_ 1
 	volume 128
-	note B_, 2
+	B_ 2
 	tie
 	speed 1
-	note B_, 6
+	B_ 6
 	volume 55
-	note B_, 7
+	B_ 7
 	inc_octave
 	speed 13
 	volume 95
-	note C_, 1
+	C_ 1
 	volume 144
-	note C_, 2
+	C_ 2
 	tie
 	speed 1
-	note C_, 6
+	C_ 6
 	volume 55
-	note C_, 7
+	C_ 7
 	speed 13
 	volume 144
-	note D_, 3
+	D_ 3
 	volume 55
-	note D_, 1
+	D_ 1
 	music_call Branch_fb79e
 	octave 4
 	speed 13
 	volume 128
-	note C_, 3
+	C_ 3
 	dec_octave
 	volume 146
-	note C_, 1
+	C_ 1
 	rest 2
 	inc_octave
 	volume 128
-	note D_, 1
+	D_ 1
 	musice8 4
-	note E_, 1
+	E_ 1
 	musice8 8
-	note C_, 3
+	C_ 3
 	dec_octave
 	volume 146
-	note D_, 1
+	D_ 1
 	rest 2
 	inc_octave
 	volume 128
-	note D_, 1
+	D_ 1
 	musice8 4
-	note E_, 1
+	E_ 1
 	dec_octave
 	musice8 8
-	note A_, 3
+	A_ 3
 	volume 146
-	note C_, 1
+	C_ 1
 	rest 2
 	musice8 4
 	volume 128
-	note F_, 1
+	F_ 1
 	musice8 8
 	volume 146
-	note C_, 1
+	C_ 1
 	volume 128
-	note G#, 3
+	G# 3
 	volume 146
-	note C_, 1
+	C_ 1
 	volume 128
-	note G#, 1
+	G# 1
 	rest 1
-	note F_, 1
+	F_ 1
 	volume 146
-	note C_, 1
+	C_ 1
 	volume 128
-	note E_, 3
+	E_ 3
 	volume 146
-	note D_, 1
+	D_ 1
 	rest 1
 	dec_octave
 	volume 128
-	note B_, 1
+	B_ 1
 	inc_octave
 	musice8 4
-	note C_, 1
+	C_ 1
 	volume 146
 	musice8 8
-	note D_, 1
+	D_ 1
 	volume 128
-	note E_, 3
+	E_ 3
 	volume 146
-	note C_, 1
+	C_ 1
 	rest 1
 	volume 128
-	note E_, 1
+	E_ 1
 	musice8 4
-	note F_, 1
+	F_ 1
 	musice8 8
 	volume 146
-	note C_, 1
+	C_ 1
 	volume 128
-	note A_, 3
+	A_ 3
 	volume 146
-	note C_, 1
+	C_ 1
 	musice8 4
-	note A_, 1
+	A_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	musice8 8
 	volume 146
-	note C_, 1
+	C_ 1
 	volume 128
-	note A_, 3
+	A_ 3
 	volume 146
-	note C_, 1
+	C_ 1
 	rest 1
 	volume 128
-	note G#, 3
+	G# 3
 	rest 1
 	music_call Branch_fb79e
 	octave 4
 	speed 13
 	volume 128
-	note C_, 1
+	C_ 1
 	tie
-	note C_, 2
+	C_ 2
 	dec_octave
 	dec_octave
 	volume 146
-	note G#, 1
+	G# 1
 	rest 2
 	inc_octave
 	volume 128
-	note A#, 1
+	A# 1
 	dec_octave
 	volume 146
-	note G#, 1
+	G# 1
 	inc_octave
 	inc_octave
 	volume 128
-	note C_, 1
+	C_ 1
 	tie
-	note C_, 2
+	C_ 2
 	dec_octave
 	volume 146
-	note C_, 1
+	C_ 1
 	rest 1
 	inc_octave
 	volume 128
-	note C_, 1
-	note C_, 1
+	C_ 1
+	C_ 1
 	dec_octave
 	volume 146
-	note C_, 1
+	C_ 1
 	inc_octave
 	volume 128
-	note E_, 1
+	E_ 1
 	tie
-	note E_, 4
+	E_ 4
 	dec_octave
 	dec_octave
 	speed 1
 	volume 128
-	note C_, 6
-	note F_, 7
-	note A_, 6
-	note F_, 7
-	note E_, 6
-	note G_, 7
+	C_ 6
+	F_ 7
+	A_ 6
+	F_ 7
+	E_ 6
+	G_ 7
 	inc_octave
-	note D_, 6
+	D_ 6
 	dec_octave
-	note B_, 7
+	B_ 7
 	inc_octave
 	speed 13
-	note C_, 8
+	C_ 8
 	tie
-	note C_, 1
+	C_ 1
 	volume 39
-	note C_, 2
+	C_ 2
 	music_end
 
 Branch_fb79e:
 	speed 13
 	octave 3
 	volume 144
-	note E_, 1
+	E_ 1
 	volume 55
-	note E_, 1
+	E_ 1
 	music_call Branch_fba68
 	octave 2
 	volume 144
-	note A_, 1
+	A_ 1
 	volume 55
-	note A_, 1
+	A_ 1
 	inc_octave
 	volume 144
-	note C_, 1
+	C_ 1
 	volume 146
-	note C_, 1
+	C_ 1
 	dec_octave
 	volume 144
-	note B_, 1
+	B_ 1
 	volume 55
-	note B_, 1
+	B_ 1
 	inc_octave
 	volume 144
-	note C_, 1
-	note D_, 1
-	note E_, 1
+	C_ 1
+	D_ 1
+	E_ 1
 	volume 55
-	note E_, 1
+	E_ 1
 	rest 1
 	music_call Branch_fba68
 	volume 144
 	octave 3
 	speed 1
-	note E_, 3
-	note F_, 10
+	E_ 3
+	F_ 10
 	tie
 	speed 13
-	note F_, 1
-	note E_, 1
+	F_ 1
+	E_ 1
 	volume 55
-	note E_, 1
+	E_ 1
 	volume 144
-	note C_, 1
+	C_ 1
 	volume 55
-	note C_, 1
+	C_ 1
 	volume 144
-	note D_, 3
+	D_ 3
 	volume 146
 	duty 1
 	Loop 2
 	rest 2
-	note C_, 1
+	C_ 1
 	rest 1
 	EndLoop
 	Loop 2
 	rest 2
-	note D_, 1
+	D_ 1
 	rest 1
 	EndLoop
 	rest 2
-	note C_, 1
+	C_ 1
 	rest 2
 	music_call Branch_fba9d
 	rest 2
 	duty 1
 	volume 146
 	octave 3
-	note C_, 1
+	C_ 1
 	rest 1
 	Loop 4
 	rest 2
-	note C_, 1
+	C_ 1
 	rest 1
 	EndLoop
 	rest 2
 	duty 2
 	volume 112
 	speed 1
-	note E_, 3
-	note F_, 10
-	note A_, 5
+	E_ 3
+	F_ 10
+	A_ 5
 	volume 39
-	note A_, 8
+	A_ 8
 	inc_octave
 	volume 112
-	note C_, 5
+	C_ 5
 	volume 39
-	note C_, 8
+	C_ 8
 	volume 112
-	note E_, 5
+	E_ 5
 	volume 39
-	note E_, 8
+	E_ 8
 	dec_octave
 	volume 146
 	duty 1
-	note C_, 13
+	C_ 13
 	inc_octave
 	duty 2
 	volume 112
-	note E_, 3
-	note F_, 10
+	E_ 3
+	F_ 10
 	tie
-	note F_, 13
-	note E_, 5
-	note F_, 4
-	note E_, 4
+	F_ 13
+	E_ 5
+	F_ 4
+	E_ 4
 	dec_octave
 	duty 1
 	volume 146
-	note C_, 13
+	C_ 13
 	duty 2
 	volume 112
-	note A_, 5
+	A_ 5
 	volume 39
-	note A_, 8
+	A_ 8
 	inc_octave
 	volume 112
-	note C_, 5
+	C_ 5
 	volume 39
-	note C_, 8
+	C_ 8
 	volume 112
-	note C#, 3
-	note D_, 10
+	C# 3
+	D_ 10
 	dec_octave
 	duty 1
 	volume 146
-	note C_, 13
+	C_ 13
 	rest 13
 	dec_octave
 	volume 128
-	note B_, 3
+	B_ 3
 	inc_octave
-	note C_, 10
+	C_ 10
 	tie
 	speed 13
-	note C_, 3
+	C_ 3
 	rest 1
-	note E_, 1
+	E_ 1
 	volume 146
-	note C_, 1
+	C_ 1
 	speed 1
 	volume 128
-	note A#, 3
-	note B_, 10
+	A# 3
+	B_ 10
 	tie
 	speed 13
-	note B_, 4
+	B_ 4
 	rest 1
 	inc_octave
-	note C_, 1
+	C_ 1
 	dec_octave
 	duty 1
 	volume 146
-	note D_, 1
+	D_ 1
 	volume 128
-	note E_, 5
+	E_ 5
 	rest 1
 	music_call Branch_fba9d
 	duty 1
 	octave 3
-	note C_, 1
-	note D_, 1
+	C_ 1
+	D_ 1
 	volume 146
-	note C_, 1
+	C_ 1
 	speed 1
 	volume 128
-	note E_, 3
-	note F_, 10
+	E_ 3
+	F_ 10
 	tie
 	speed 13
-	note F_, 1
+	F_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note G#, 1
-	note F_, 1
+	G# 1
+	F_ 1
 	volume 146
-	note C_, 1
+	C_ 1
 	inc_octave
 	volume 128
 	speed 1
-	note D_, 3
-	note D#, 10
+	D_ 3
+	D# 10
 	tie
 	speed 13
-	note D#, 2
+	D# 2
 	dec_octave
 	dec_octave
 	volume 146
-	note G#, 1
+	G# 1
 	rest 1
 	inc_octave
 	volume 128
-	note G#, 1
-	note A#, 1
+	G# 1
+	A# 1
 	dec_octave
 	volume 147
-	note G#, 1
+	G# 1
 	inc_octave
 	inc_octave
 	volume 128
-	note C_, 3
+	C_ 3
 	dec_octave
 	volume 146
-	note C_, 1
+	C_ 1
 	rest 1
 	volume 128
 	speed 1
-	note F#, 3
-	note G_, 10
+	F# 3
+	G_ 10
 	inc_octave
 	speed 13
 	musice8 4
-	note C_, 1
+	C_ 1
 	dec_octave
-	note B_, 1
+	B_ 1
 	musice8 8
-	note A#, 1
+	A# 1
 	rest 1
 	music_call Branch_fbacb
 	octave 3
 	volume 146
 	musice8 8
-	note D_, 1
+	D_ 1
 	speed 1
 	volume 128
-	note B_, 3
+	B_ 3
 	inc_octave
-	note C_, 10
+	C_ 10
 	speed 13
 	rest 1
-	note C_, 1
+	C_ 1
 	dec_octave
 	volume 146
-	note C_, 1
+	C_ 1
 	inc_octave
 	volume 128
-	note C_, 1
+	C_ 1
 	rest 1
-	note C_, 1
+	C_ 1
 	dec_octave
 	volume 146
-	note C_, 1
+	C_ 1
 	inc_octave
 	volume 128
-	note C_, 1
-	note C_, 1
+	C_ 1
+	C_ 1
 	dec_octave
 	musice8 4
-	note F_, 1
+	F_ 1
 	musice8 8
 	volume 146
-	note C_, 1
+	C_ 1
 	volume 128
 	musice8 4
-	note D_, 1
+	D_ 1
 	rest 1
 	musice8 8
-	note F_, 1
+	F_ 1
 	volume 146
-	note C_, 1
+	C_ 1
 	inc_octave
 	volume 128
-	note C_, 2
+	C_ 2
 	musice8 4
-	note D_, 1
+	D_ 1
 	dec_octave
 	musice8 8
 	volume 146
-	note C_, 1
+	C_ 1
 	volume 128
 	musice8 4
-	note A_, 1
+	A_ 1
 	rest 1
 	musice8 8
-	note B_, 1
+	B_ 1
 	volume 146
-	note C_, 1
+	C_ 1
 	volume 128
 	musice8 4
-	note A_, 1
+	A_ 1
 	musice8 8
-	note G_, 1
+	G_ 1
 	musice8 4
-	note A_, 1
+	A_ 1
 	musice8 8
 	volume 146
-	note C_, 1
+	C_ 1
 	inc_octave
 	volume 128
-	note C_, 2
+	C_ 2
 	dec_octave
 	speed 1
-	note B_, 3
+	B_ 3
 	inc_octave
-	note C_, 10
+	C_ 10
 	dec_octave
 	speed 13
 	musice8 4
-	note B_, 1
+	B_ 1
 	musice8 6
-	note A#, 2
+	A# 2
 	music_call Branch_fbacb
 	octave 4
-	note G_, 1
+	G_ 1
 	musice8 8
-	note E_, 1
+	E_ 1
 	speed 13
 	rest 1
-	note C_, 1
+	C_ 1
 	dec_octave
 	volume 146
-	note C_, 1
+	C_ 1
 	inc_octave
 	volume 128
-	note C_, 1
+	C_ 1
 	rest 1
-	note C_, 1
+	C_ 1
 	dec_octave
 	volume 146
-	note C_, 1
+	C_ 1
 	inc_octave
 	volume 128
 	musice8 7
-	note C_, 2
+	C_ 2
 	musice8 8
-	note C_, 1
+	C_ 1
 	dec_octave
 	volume 146
-	note C_, 1
+	C_ 1
 	volume 128
 	musice8 4
-	note F_, 1
+	F_ 1
 	rest 1
 	musice8 8
-	note A_, 1
+	A_ 1
 	volume 146
-	note C_, 1
+	C_ 1
 	inc_octave
 	volume 128
 	musice8 7
-	note C_, 2
+	C_ 2
 	musice8 8
-	note C_, 1
+	C_ 1
 	dec_octave
 	volume 146
-	note C_, 1
+	C_ 1
 	volume 128
 	musice8 4
-	note F_, 1
+	F_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	musice8 8
 	volume 146
-	note C_, 1
+	C_ 1
 	speed 1
 	volume 128
-	note B_, 3
+	B_ 3
 	inc_octave
-	note C_, 10
+	C_ 10
 	tie
 	speed 13
-	note C_, 3
+	C_ 3
 	rest 1
 	dec_octave
-	note A_, 1
+	A_ 1
 	inc_octave
 	musice8 4
-	note C_, 1
+	C_ 1
 	dec_octave
 	musice8 8
 	volume 146
-	note C_, 1
+	C_ 1
 	speed 1
 	volume 128
-	note A#, 3
-	note B_, 10
+	A# 3
+	B_ 10
 	rest 13
 	dec_octave
 	volume 144
-	note A#, 3
-	note B_, 10
+	A# 3
+	B_ 10
 	volume 39
-	note B_, 13
+	B_ 13
 	inc_octave
 	volume 144
-	note C_, 13
+	C_ 13
 	volume 39
-	note C_, 13
+	C_ 13
 	volume 144
 	speed 13
-	note D_, 2
+	D_ 2
 	volume 39
-	note D_, 1
+	D_ 1
 	music_call Branch_fbb10
 	rest 1
 	octave 2
-	note A_, 1
+	A_ 1
 	rest 1
-	note B_, 1
-	note A_, 1
+	B_ 1
+	A_ 1
 	inc_octave
 	volume 146
-	note C_, 1
+	C_ 1
 	volume 128
-	note E_, 2
+	E_ 2
 	rest 1
-	note C_, 1
+	C_ 1
 	rest 1
 	dec_octave
 	musice8 7
-	note G_, 1
+	G_ 1
 	musice8 8
-	note G_, 1
+	G_ 1
 	inc_octave
 	volume 146
-	note C_, 1
+	C_ 1
 	dec_octave
 	speed 1
 	volume 128
-	note E_, 3
-	note F_, 10
+	E_ 3
+	F_ 10
 	tie
 	speed 13
-	note F_, 1
+	F_ 1
 	rest 1
 	inc_octave
 	duty 2
 	volume 112
 	speed 1
-	note F_, 13
-	note A_, 6
+	F_ 13
+	A_ 6
 	volume 39
-	note A_, 7
+	A_ 7
 	inc_octave
 	volume 112
-	note C_, 6
+	C_ 6
 	volume 39
-	note C_, 7
+	C_ 7
 	volume 112
-	note E_, 6
+	E_ 6
 	volume 39
-	note E_, 7
+	E_ 7
 	dec_octave
 	duty 1
 	volume 146
-	note C_, 13
+	C_ 13
 	inc_octave
 	duty 2
 	volume 112
-	note D#, 3
-	note E_, 10
+	D# 3
+	E_ 10
 	tie
 	speed 13
-	note E_, 1
-	note F_, 1
+	E_ 1
+	F_ 1
 	speed 1
-	note E_, 5
+	E_ 5
 	volume 39
-	note E_, 8
+	E_ 8
 	volume 112
-	note D_, 5
+	D_ 5
 	volume 39
-	note D_, 8
+	D_ 8
 	speed 13
 	rest 1
 	dec_octave
 	dec_octave
 	volume 144
 	duty 1
-	note B_, 1
+	B_ 1
 	inc_octave
 	speed 1
-	note C_, 6
+	C_ 6
 	volume 39
-	note C_, 7
+	C_ 7
 	volume 144
-	note D_, 6
+	D_ 6
 	volume 39
-	note D_, 7
+	D_ 7
 	music_call Branch_fbb10
 	octave 3
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note G#, 1
-	note F_, 1
+	G# 1
+	F_ 1
 	volume 146
-	note C_, 1
+	C_ 1
 	inc_octave
 	speed 1
 	volume 128
-	note D_, 3
-	note D#, 10
+	D_ 3
+	D# 10
 	tie
 	speed 13
-	note D#, 2
+	D# 2
 	dec_octave
 	dec_octave
 	volume 146
-	note G#, 1
+	G# 1
 	rest 1
 	speed 1
 	rest 6
 	volume 144
-	note G#, 7
+	G# 7
 	inc_octave
-	note C_, 6
-	note D#, 7
-	note G_, 6
-	note A#, 7
+	C_ 6
+	D# 7
+	G_ 6
+	A# 7
 	music_ret
 
 Branch_fba68:
 	octave 3
 	volume 146
-	note C_, 1
+	C_ 1
 	rest 1
 	volume 144
-	note C_, 1
-	note E_, 1
+	C_ 1
+	E_ 1
 	volume 146
-	note C_, 1
+	C_ 1
 	volume 144
-	note F_, 1
+	F_ 1
 	volume 55
-	note F_, 1
+	F_ 1
 	rest 1
 	volume 146
-	note C_, 1
+	C_ 1
 	volume 144
-	note G_, 1
+	G_ 1
 	volume 55
-	note G_, 1
+	G_ 1
 	volume 144
-	note F_, 1
+	F_ 1
 	volume 146
-	note C_, 1
+	C_ 1
 	volume 144
-	note E_, 1
+	E_ 1
 	volume 55
-	note E_, 1
+	E_ 1
 	rest 1
 	volume 146
-	note C_, 1
+	C_ 1
 	rest 1
 	volume 144
-	note C_, 1
-	note E_, 1
+	C_ 1
+	E_ 1
 	volume 146
-	note C_, 1
+	C_ 1
 	music_ret
 
 Branch_fba9d:
@@ -1607,186 +1607,186 @@ Branch_fba9d:
 	duty 2
 	volume 112
 	speed 1
-	note F#, 3
-	note G_, 10
+	F# 3
+	G_ 10
 	dec_octave
 	duty 1
 	volume 146
-	note C_, 13
+	C_ 13
 	inc_octave
 	duty 2
 	volume 112
-	note E_, 5
+	E_ 5
 	volume 39
-	note E_, 8
+	E_ 8
 	volume 112
-	note E_, 3
-	note F_, 10
-	note E_, 5
+	E_ 3
+	F_ 10
+	E_ 5
 	volume 39
-	note E_, 8
+	E_ 8
 	dec_octave
 	speed 13
 	duty 1
 	volume 146
-	note C_, 1
+	C_ 1
 	duty 2
 	volume 112
-	note G_, 1
+	G_ 1
 	music_ret
 
 Branch_fbacb:
 	octave 3
 	musice8 8
 	Loop 3
-	note A#, 1
+	A# 1
 	rest 1
 	EndLoop
 	inc_octave
-	note C_, 3
+	C_ 3
 	dec_octave
 	volume 146
-	note C_, 1
+	C_ 1
 	rest 1
 	volume 128
-	note A_, 1
+	A_ 1
 	inc_octave
 	musice8 4
-	note C_, 1
+	C_ 1
 	dec_octave
 	musice8 8
 	volume 146
-	note C_, 1
+	C_ 1
 	speed 1
 	volume 128
-	note A#, 3
-	note B_, 16
+	A# 3
+	B_ 16
 	rest 7
-	note A#, 3
-	note B_, 10
+	A# 3
+	B_ 10
 	dec_octave
 	speed 13
 	volume 146
-	note B_, 1
+	B_ 1
 	inc_octave
 	volume 128
-	note B_, 1
+	B_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	dec_octave
 	volume 146
-	note B_, 1
+	B_ 1
 	inc_octave
 	volume 128
-	note B_, 3
+	B_ 3
 	volume 146
-	note D_, 1
+	D_ 1
 	rest 1
 	volume 128
-	note B_, 1
+	B_ 1
 	inc_octave
 	musice8 4
-	note D_, 1
+	D_ 1
 	music_ret
 
 Branch_fbb10:
 	octave 3
 	speed 13
 	volume 128
-	note C_, 1
+	C_ 1
 	musice8 3
-	note D_, 1
+	D_ 1
 	volume 146
 	musice8 8
-	note C_, 1
+	C_ 1
 	volume 128
-	note B_, 2
+	B_ 2
 	musice8 3
-	note A_, 1
+	A_ 1
 	volume 147
 	musice8 8
-	note C_, 1
+	C_ 1
 	speed 1
 	volume 128
-	note D#, 3
-	note E_, 10
+	D# 3
+	E_ 10
 	tie
 	speed 13
-	note E_, 2
+	E_ 2
 	volume 146
-	note D_, 1
+	D_ 1
 	inc_octave
 	duty 2
 	volume 112
 	speed 1
-	note G_, 5
+	G_ 5
 	volume 39
-	note G_, 8
+	G_ 8
 	volume 112
-	note F_, 5
-	note G_, 4
-	note F_, 4
-	note E_, 5
+	F_ 5
+	G_ 4
+	F_ 4
+	E_ 5
 	volume 39
-	note E_, 8
+	E_ 8
 	dec_octave
 	duty 1
 	volume 146
-	note D_, 13
+	D_ 13
 	inc_octave
 	duty 2
 	volume 112
-	note C_, 5
+	C_ 5
 	volume 39
-	note C_, 8
+	C_ 8
 	volume 112
-	note D_, 13
-	note E_, 5
+	D_ 13
+	E_ 5
 	volume 39
-	note E_, 8
+	E_ 8
 	volume 112
-	note C_, 5
+	C_ 5
 	volume 39
-	note C_, 8
+	C_ 8
 	dec_octave
 	speed 13
 	volume 112
-	note E_, 4
+	E_ 4
 	inc_octave
 	inc_octave
 	speed 1
-	note C_, 5
+	C_ 5
 	volume 39
-	note C_, 8
+	C_ 8
 	dec_octave
 	volume 112
-	note B_, 13
+	B_ 13
 	inc_octave
-	note C_, 5
+	C_ 5
 	volume 39
-	note C_, 8
+	C_ 8
 	dec_octave
 	volume 112
-	note B_, 5
+	B_ 5
 	volume 39
-	note B_, 8
+	B_ 8
 	volume 112
-	note G_, 5
+	G_ 5
 	volume 39
-	note G_, 8
+	G_ 8
 	dec_octave
 	dec_octave
 	duty 1
 	volume 128
-	note B_, 3
+	B_ 3
 	inc_octave
-	note C_, 10
+	C_ 10
 	speed 13
 	musice8 3
-	note D_, 1
-	note E_, 1
+	D_ 1
+	E_ 1
 	musice8 8
-	note F_, 2
+	F_ 2
 	music_ret
 
 
@@ -1799,58 +1799,58 @@ Music_Credits_Ch3: ; fbb9d (3e:7b9d)
 	musice8 8
 	octave 1
 	Loop 12
-	note G_, 6
+	G_ 6
 	rest 7
 	EndLoop
-	note G_, 6
-	note A_, 7
-	note B_, 6
-	inc_octave
-	note C_, 7
-	note D_, 6
-	note E_, 7
-	note F_, 6
-	note G_, 7
+	G_ 6
+	A_ 7
+	B_ 6
+	inc_octave
+	C_ 7
+	D_ 6
+	E_ 7
+	F_ 6
+	G_ 7
 	music_call Branch_fbc46
 	music_call Branch_fbd47
 	octave 1
 	Loop 2
 	Loop 2
-	note B_, 6
+	B_ 6
 	rest 7
 	EndLoop
 	inc_octave
 	musice8 4
-	note G_, 13
+	G_ 13
 	dec_octave
 	musice8 8
-	note B_, 6
+	B_ 6
 	rest 7
 	EndLoop
 	Loop 2
 	Loop 2
-	note A_, 6
+	A_ 6
 	rest 7
 	EndLoop
 	inc_octave
 	musice8 4
-	note F_, 13
+	F_ 13
 	dec_octave
 	musice8 8
-	note A_, 6
+	A_ 6
 	rest 7
 	EndLoop
 	Loop 2
 	Loop 2
-	note G#, 6
+	G# 6
 	rest 7
 	EndLoop
 	inc_octave
 	musice8 4
-	note F_, 13
+	F_ 13
 	dec_octave
 	musice8 8
-	note G#, 6
+	G# 6
 	rest 7
 	EndLoop
 	music_call Branch_fbe10
@@ -1858,63 +1858,63 @@ Music_Credits_Ch3: ; fbb9d (3e:7b9d)
 	music_call Branch_fbdb7
 	music_call Branch_fbe3d
 	octave 1
-	note B_, 13
+	B_ 13
 	music_call Branch_fbc46
 	speed 1
 	octave 1
 	Loop 2
-	note G#, 6
+	G# 6
 	rest 7
-	note G#, 6
+	G# 6
 	rest 7
 	inc_octave
 	inc_octave
 	musice8 4
-	note D#, 13
+	D# 13
 	dec_octave
 	dec_octave
 	musice8 8
-	note G#, 6
+	G# 6
 	rest 7
 	EndLoop
 	inc_octave
 	Loop 2
-	note C#, 6
+	C# 6
 	rest 7
-	note C#, 6
+	C# 6
 	rest 7
 	inc_octave
 	musice8 4
-	note F_, 13
+	F_ 13
 	dec_octave
 	musice8 8
-	note C#, 6
+	C# 6
 	rest 7
 	EndLoop
-	note C_, 6
+	C_ 6
 	rest 7
-	note C_, 6
+	C_ 6
 	rest 7
 	inc_octave
 	musice8 4
-	note C_, 13
+	C_ 13
 	dec_octave
 	musice8 8
-	note C_, 6
+	C_ 6
 	rest 7
-	note C_, 6
+	C_ 6
 	rest 7
-	note C_, 6
+	C_ 6
 	rest 7
 	dec_octave
-	note G_, 6
+	G_ 6
 	rest 7
-	note G_, 6
+	G_ 6
 	rest 7
 	speed 13
-	note C_, 8
+	C_ 8
 	tie
-	note C_, 1
+	C_ 1
 	rest 2
 	music_end
 
@@ -1925,49 +1925,49 @@ Branch_fbc46:
 	music_call Branch_fbe23
 	music_call Branch_fbd47
 	Loop 2
-	note C_, 6
+	C_ 6
 	rest 7
 	EndLoop
 	musice8 4
-	note A_, 13
+	A_ 13
 	musice8 8
-	note C_, 6
+	C_ 6
 	rest 7
 	Loop 2
-	note C_, 6
+	C_ 6
 	rest 7
 	EndLoop
 	inc_octave
 	musice8 4
-	note C_, 13
+	C_ 13
 	dec_octave
 	musice8 8
-	note C_, 6
+	C_ 6
 	rest 7
 	music_call Branch_fbd47
 	music_call Branch_fbe23
 	octave 2
 	Loop 2
-	note C_, 6
+	C_ 6
 	rest 7
 	EndLoop
 	musice8 4
-	note G_, 13
+	G_ 13
 	musice8 8
-	note C_, 6
+	C_ 6
 	rest 7
 	Loop 2
-	note C_, 6
+	C_ 6
 	rest 7
 	EndLoop
 	musice8 4
-	note G_, 13
+	G_ 13
 	dec_octave
 	musice8 8
-	note G_, 13
+	G_ 13
 	tie
 	speed 13
-	note G_, 7
+	G_ 7
 	rest 1
 	speed 1
 	music_call Branch_fbd47
@@ -2002,20 +2002,20 @@ Branch_fbc46:
 	music_call Branch_fbdf0
 	music_call Branch_fbdca
 	octave 1
-	note G_, 6
+	G_ 6
 	rest 7
-	note G_, 13
+	G_ 13
 	inc_octave
-	note G_, 6
+	G_ 6
 	rest 7
 	dec_octave
-	note A_, 6
+	A_ 6
 	rest 7
-	note A_, 6
+	A_ 6
 	rest 7
 	speed 13
-	note B_, 2
-	note G_, 1
+	B_ 2
+	G_ 1
 	speed 1
 	music_call Branch_fbd47
 	music_call Branch_fbd58
@@ -2026,7 +2026,7 @@ Branch_fbc46:
 	music_call Branch_fbdb7
 	music_call Branch_fbe3d
 	octave 1
-	note B_, 6
+	B_ 6
 	rest 7
 	music_call Branch_fbd47
 	music_call Branch_fbd58
@@ -2035,27 +2035,27 @@ Branch_fbc46:
 	music_call Branch_fbddd
 	octave 1
 	Loop 2
-	note A#, 6
+	A# 6
 	rest 7
 	EndLoop
 	inc_octave
 	musice8 4
-	note F_, 13
+	F_ 13
 	dec_octave
 	musice8 8
-	note A#, 6
+	A# 6
 	rest 7
-	note A#, 6
+	A# 6
 	inc_octave
-	note F_, 7
-	note G#, 6
+	F_ 7
+	G# 6
 	inc_octave
-	note C_, 7
-	note D#, 6
-	note G_, 7
+	C_ 7
+	D# 6
+	G_ 7
 	dec_octave
 	dec_octave
-	note A#, 6
+	A# 6
 	rest 7
 	music_ret
 
@@ -2063,13 +2063,13 @@ Branch_fbd47:
 	octave 2
 	Loop 2
 	Loop 2
-	note C_, 6
+	C_ 6
 	rest 7
 	EndLoop
 	musice8 4
-	note G_, 13
+	G_ 13
 	musice8 8
-	note C_, 6
+	C_ 6
 	rest 7
 	EndLoop
 	music_ret
@@ -2078,15 +2078,15 @@ Branch_fbd58:
 	octave 1
 	Loop 2
 	Loop 2
-	note B_, 6
+	B_ 6
 	rest 7
 	EndLoop
 	inc_octave
 	musice8 4
-	note G_, 13
+	G_ 13
 	dec_octave
 	musice8 8
-	note B_, 6
+	B_ 6
 	rest 7
 	EndLoop
 	music_ret
@@ -2095,15 +2095,15 @@ Branch_fbd6b:
 	octave 1
 	Loop 2
 	Loop 2
-	note A_, 6
+	A_ 6
 	rest 7
 	EndLoop
 	inc_octave
 	musice8 4
-	note G_, 13
+	G_ 13
 	dec_octave
 	musice8 8
-	note A_, 6
+	A_ 6
 	rest 7
 	EndLoop
 	music_ret
@@ -2112,15 +2112,15 @@ Branch_fbd7e:
 	octave 1
 	Loop 2
 	Loop 2
-	note G_, 6
+	G_ 6
 	rest 7
 	EndLoop
 	inc_octave
 	musice8 4
-	note G_, 13
+	G_ 13
 	dec_octave
 	musice8 8
-	note G_, 6
+	G_ 6
 	rest 7
 	EndLoop
 	music_ret
@@ -2129,15 +2129,15 @@ Branch_fbd91:
 	octave 1
 	Loop 2
 	Loop 2
-	note F_, 6
+	F_ 6
 	rest 7
 	EndLoop
 	inc_octave
 	musice8 4
-	note F_, 13
+	F_ 13
 	dec_octave
 	musice8 8
-	note F_, 6
+	F_ 6
 	rest 7
 	EndLoop
 	music_ret
@@ -2146,15 +2146,15 @@ Branch_fbda4:
 	octave 1
 	Loop 2
 	Loop 2
-	note E_, 6
+	E_ 6
 	rest 7
 	EndLoop
 	inc_octave
 	musice8 4
-	note E_, 13
+	E_ 13
 	dec_octave
 	musice8 8
-	note E_, 6
+	E_ 6
 	rest 7
 	EndLoop
 	music_ret
@@ -2163,15 +2163,15 @@ Branch_fbdb7:
 	octave 1
 	Loop 2
 	Loop 2
-	note D_, 6
+	D_ 6
 	rest 7
 	EndLoop
 	inc_octave
 	musice8 4
-	note F_, 13
+	F_ 13
 	dec_octave
 	musice8 8
-	note D_, 6
+	D_ 6
 	rest 7
 	EndLoop
 	music_ret
@@ -2180,15 +2180,15 @@ Branch_fbdca:
 	octave 1
 	Loop 2
 	Loop 2
-	note G_, 6
+	G_ 6
 	rest 7
 	EndLoop
 	inc_octave
 	musice8 4
-	note F_, 13
+	F_ 13
 	dec_octave
 	musice8 8
-	note G_, 6
+	G_ 6
 	rest 7
 	EndLoop
 	music_ret
@@ -2197,15 +2197,15 @@ Branch_fbddd:
 	octave 1
 	Loop 2
 	Loop 2
-	note F_, 6
+	F_ 6
 	rest 7
 	EndLoop
 	inc_octave
 	musice8 4
-	note G#, 13
+	G# 13
 	dec_octave
 	musice8 8
-	note F_, 6
+	F_ 6
 	rest 7
 	EndLoop
 	music_ret
@@ -2214,31 +2214,31 @@ Branch_fbdf0:
 	octave 1
 	Loop 2
 	Loop 2
-	note A#, 6
+	A# 6
 	rest 7
 	EndLoop
 	inc_octave
 	musice8 4
-	note F_, 13
+	F_ 13
 	dec_octave
 	musice8 8
-	note A#, 6
+	A# 6
 	rest 7
 	EndLoop
 	music_ret
 
 Branch_fbe03:
 	octave 2
-	note C_, 6
+	C_ 6
 	rest 7
 	dec_octave
-	note C_, 13
+	C_ 13
 	rest 13
-	note D_, 13
+	D_ 13
 	rest 13
-	note E_, 13
+	E_ 13
 	rest 13
-	note C_, 6
+	C_ 6
 	rest 7
 	music_ret
 
@@ -2246,15 +2246,15 @@ Branch_fbe10:
 	octave 1
 	Loop 2
 	Loop 2
-	note E_, 6
+	E_ 6
 	rest 7
 	EndLoop
 	inc_octave
 	musice8 4
-	note G_, 13
+	G_ 13
 	dec_octave
 	musice8 8
-	note E_, 6
+	E_ 6
 	rest 7
 	EndLoop
 	music_ret
@@ -2262,42 +2262,42 @@ Branch_fbe10:
 Branch_fbe23:
 	octave 2
 	Loop 2
-	note C_, 6
+	C_ 6
 	rest 7
 	EndLoop
 	musice8 4
-	note A_, 13
+	A_ 13
 	musice8 8
-	note C_, 6
+	C_ 6
 	rest 7
 	Loop 2
-	note C_, 6
+	C_ 6
 	rest 7
 	EndLoop
 	musice8 4
-	note F_, 13
+	F_ 13
 	musice8 8
-	note C_, 6
+	C_ 6
 	rest 7
 	music_ret
 
 Branch_fbe3d:
 	octave 1
 	Loop 2
-	note G_, 6
+	G_ 6
 	rest 7
 	EndLoop
 	inc_octave
 	musice8 4
-	note F_, 13
+	F_ 13
 	dec_octave
 	musice8 8
-	note G_, 6
+	G_ 6
 	rest 7
-	note G_, 6
+	G_ 6
 	rest 7
-	note G_, 13
-	note A_, 13
+	G_ 13
+	A_ 13
 	music_ret
 
 
@@ -2305,28 +2305,28 @@ Music_Credits_Ch4: ; fbe51 (3e:7e51)
 	speed 1
 	octave 1
 	Loop 8
-	note snare2, 13
+	snare2 13
 	EndLoop
 	Loop 4
-	note snare1, 13
+	snare1 13
 	EndLoop
 	Loop 4
-	note snare1, 6
-	note snare1, 7
+	snare1 6
+	snare1 7
 	EndLoop
 	music_call Branch_fbe86
 	Loop 7
 	music_call Branch_fbed1
 	EndLoop
-	note bass, 13
-	note snare3, 13
-	note snare1, 13
-	note snare3, 6
-	note snare2, 4
-	note snare2, 3
+	bass 13
+	snare3 13
+	snare1 13
+	snare3 6
+	snare2 4
+	snare2 3
 	Loop 4
-	note snare1, 6
-	note snare1, 7
+	snare1 6
+	snare1 7
 	EndLoop
 	music_call Branch_fbe86
 	Loop 2
@@ -2334,7 +2334,7 @@ Music_Credits_Ch4: ; fbe51 (3e:7e51)
 	EndLoop
 	music_call Branch_fbeea
 	speed 13
-	note snare5, 8
+	snare5 8
 	rest 3
 	music_end
 
@@ -2342,17 +2342,17 @@ Branch_fbe86:
 	Loop 6
 	music_call Branch_fbed1
 	EndLoop
-	note bass, 13
-	note snare3, 13
-	note snare1, 13
-	note snare3, 6
-	note snare3, 7
-	note bass, 13
-	note snare3, 13
-	note snare1, 13
-	speed 13
-	note snare5, 7
-	note snare1, 2
+	bass 13
+	snare3 13
+	snare1 13
+	snare3 6
+	snare3 7
+	bass 13
+	snare3 13
+	snare1 13
+	speed 13
+	snare5 7
+	snare1 2
 	speed 1
 	Loop 15
 	music_call Branch_fbed1
@@ -2369,18 +2369,18 @@ Branch_fbe86:
 	Loop 7
 	music_call Branch_fbed1
 	EndLoop
-	note bass, 13
-	note snare3, 13
-	note snare1, 13
-	note snare3, 6
-	note snare3, 7
-	note bass, 13
-	note snare3, 6
-	note snare2, 4
-	note snare2, 3
-	note snare1, 6
-	note snare1, 7
-	note snare1, 13
+	bass 13
+	snare3 13
+	snare1 13
+	snare3 6
+	snare3 7
+	bass 13
+	snare3 6
+	snare2 4
+	snare2 3
+	snare1 6
+	snare1 7
+	snare1 13
 	Loop 5
 	music_call Branch_fbed1
 	EndLoop
@@ -2388,44 +2388,44 @@ Branch_fbe86:
 	music_ret
 
 Branch_fbed1:
-	note bass, 13
-	note snare3, 13
-	note snare1, 13
-	note snare3, 6
-	note snare3, 7
-	note bass, 13
-	note snare3, 13
-	note snare1, 13
-	note snare4, 13
+	bass 13
+	snare3 13
+	snare1 13
+	snare3 6
+	snare3 7
+	bass 13
+	snare3 13
+	snare1 13
+	snare4 13
 	music_ret
 
 Branch_fbedb:
-	note bass, 13
-	note snare3, 6
-	note snare2, 7
-	note snare1, 6
-	note snare1, 7
+	bass 13
+	snare3 6
+	snare2 7
+	snare1 6
+	snare1 7
 	Loop 2
-	note snare1, 6
-	note snare2, 4
-	note snare2, 3
-	note snare1, 6
-	note snare1, 7
+	snare1 6
+	snare2 4
+	snare2 3
+	snare1 6
+	snare1 7
 	EndLoop
-	note snare1, 13
+	snare1 13
 	music_ret
 
 Branch_fbeea:
-	note bass, 13
-	note snare3, 13
-	note snare1, 13
-	note snare3, 6
-	note snare2, 4
-	note snare2, 3
+	bass 13
+	snare3 13
+	snare1 13
+	snare3 6
+	snare2 4
+	snare2 3
 	Loop 3
-	note snare1, 6
-	note snare1, 7
+	snare1 6
+	snare1 7
 	EndLoop
-	note snare1, 13
+	snare1 13
 	music_ret
 ; 0xfbef7
diff --git a/audio/music/darkdiddly.asm b/audio/music/darkdiddly.asm
index d949503..a82dd00 100644
--- a/audio/music/darkdiddly.asm
+++ b/audio/music/darkdiddly.asm
@@ -5,43 +5,43 @@ Music_DarkDiddly_Ch1: ; f7cdf (3d:7cdf)
 	octave 4
 	duty 1
 	volume 176
-	note C_, 4
+	C_ 4
 	dec_octave
-	note B_, 2
-	note A#, 2
-	note A_, 2
-	note G#, 2
-	note G_, 2
-	note F#, 2
-	note F_, 4
-	note E_, 2
-	note D#, 2
-	note D_, 2
-	note C#, 2
-	note C_, 2
+	B_ 2
+	A# 2
+	A_ 2
+	G# 2
+	G_ 2
+	F# 2
+	F_ 4
+	E_ 2
+	D# 2
+	D_ 2
+	C# 2
+	C_ 2
 	dec_octave
-	note B_, 2
-	note A#, 4
-	note B_, 2
+	B_ 2
+	A# 4
+	B_ 2
 	volume 39
-	note B_, 2
+	B_ 2
 	volume 176
-	note F#, 4
-	note G_, 2
+	F# 4
+	G_ 2
 	volume 39
-	note G_, 2
+	G_ 2
 	volume 176
-	note C_, 2
+	C_ 2
 	volume 39
-	note C_, 4
+	C_ 4
 	inc_octave
 	volume 176
-	note E_, 1
-	note G_, 1
+	E_ 1
+	G_ 1
 	inc_octave
-	note C_, 2
+	C_ 2
 	volume 39
-	note C_, 2
+	C_ 2
 	music_end
 
 
@@ -53,34 +53,34 @@ Music_DarkDiddly_Ch2: ; f7d17 (3d:7d17)
 	duty 1
 	volume 176
 	rest 16
-	note C_, 4
+	C_ 4
 	dec_octave
-	note B_, 2
-	note A#, 2
-	note A_, 2
-	note G#, 2
-	note G_, 2
-	note F#, 2
-	note F_, 4
-	note F#, 2
+	B_ 2
+	A# 2
+	A_ 2
+	G# 2
+	G_ 2
+	F# 2
+	F_ 4
+	F# 2
 	volume 39
-	note F#, 2
+	F# 2
 	volume 176
-	note C#, 4
-	note D_, 2
+	C# 4
+	D_ 2
 	volume 39
-	note D_, 2
+	D_ 2
 	dec_octave
 	volume 176
-	note G_, 2
+	G_ 2
 	volume 39
-	note G_, 6
+	G_ 6
 	inc_octave
 	inc_octave
 	volume 176
-	note E_, 2
+	E_ 2
 	volume 39
-	note E_, 2
+	E_ 2
 	music_end
 
 
@@ -93,15 +93,15 @@ Music_DarkDiddly_Ch3: ; f7d47 (3d:7d47)
 	musice9 0
 	octave 1
 	rest 16
-	note G_, 2
-	note F#, 1
+	G_ 2
+	F# 1
 	rest 1
-	note D#, 2
-	note C#, 1
+	D# 2
+	C# 1
 	rest 1
-	note C_, 1
+	C_ 1
 	rest 3
 	inc_octave
-	note C_, 1
+	C_ 1
 	music_end
 ; 0xf7d60
diff --git a/audio/music/deckmachine.asm b/audio/music/deckmachine.asm
index c18c38f..f947df9 100644
--- a/audio/music/deckmachine.asm
+++ b/audio/music/deckmachine.asm
@@ -8,46 +8,46 @@ Music_DeckMachine_Ch1: ; f6ef1 (3d:6ef1)
 	Loop 9
 	musice8 6
 	volume 145
-	note C_, 7
+	C_ 7
 	volume 49
-	note C_, 8
+	C_ 8
 	volume 65
-	note C_, 8
+	C_ 8
 	volume 145
-	note G_, 7
+	G_ 7
 	volume 49
-	note G_, 8
+	G_ 8
 	volume 65
-	note C_, 7
+	C_ 7
 	volume 145
-	note E_, 7
+	E_ 7
 	volume 49
-	note E_, 8
+	E_ 8
 	volume 65
-	note E_, 8
+	E_ 8
 	volume 145
-	note C_, 7
+	C_ 7
 	volume 49
-	note C_, 8
+	C_ 8
 	volume 65
-	note C_, 7
+	C_ 7
 	volume 145
-	note G_, 7
+	G_ 7
 	volume 49
-	note G_, 8
+	G_ 8
 	volume 145
 	musice8 4
-	note F_, 7
+	F_ 7
 	musice8 5
 	volume 65
-	note G_, 8
+	G_ 8
 	EndLoop
 	volume 145
-	note C_, 7
+	C_ 7
 	volume 49
-	note C_, 8
+	C_ 8
 	volume 65
-	note C_, 15
+	C_ 15
 	speed 10
 	rest 9
 	EndMainLoop
@@ -65,32 +65,32 @@ Music_DeckMachine_Ch2: ; f6f41 (3d:6f41)
 	rest 15
 	volume 178
 	rest 7
-	note C_, 8
+	C_ 8
 	volume 39
-	note C_, 8
+	C_ 8
 	rest 7
 	volume 178
-	note C_, 7
+	C_ 7
 	volume 39
-	note C_, 8
+	C_ 8
 	rest 7
 	volume 178
 	dec_octave
-	note A_, 8
+	A_ 8
 	volume 39
-	note A_, 8
+	A_ 8
 	rest 7
 	inc_octave
 	volume 178
-	note C_, 7
+	C_ 7
 	volume 39
-	note C_, 8
+	C_ 8
 	rest 15
 	EndLoop
 	volume 178
-	note E_, 7
+	E_ 7
 	volume 39
-	note E_, 8
+	E_ 8
 	rest 15
 	speed 10
 	rest 9
@@ -107,119 +107,119 @@ Music_DeckMachine_Ch3: ; f6f7b (3d:6f7b)
 	octave 2
 	speed 1
 	Loop 4
-	note C_, 7
+	C_ 7
 	rest 8
-	note G_, 7
+	G_ 7
 	inc_octave
 	musice8 5
-	note G_, 8
+	G_ 8
 	musice8 8
 	rest 7
 	dec_octave
-	note C_, 8
+	C_ 8
 	inc_octave
 	musice8 5
-	note E_, 7
+	E_ 7
 	dec_octave
 	musice8 8
-	note C_, 8
-	note D_, 7
+	C_ 8
+	D_ 7
 	inc_octave
 	musice8 5
-	note C_, 8
+	C_ 8
 	dec_octave
 	rest 7
 	musice8 8
-	note A_, 8
+	A_ 8
 	inc_octave
 	musice8 5
-	note G_, 7
+	G_ 7
 	dec_octave
 	dec_octave
 	musice8 8
-	note A_, 8
+	A_ 8
 	inc_octave
-	note D_, 7
+	D_ 7
 	rest 8
-	note E_, 7
+	E_ 7
 	rest 8
-	note G_, 7
+	G_ 7
 	inc_octave
 	musice8 5
-	note G_, 8
+	G_ 8
 	rest 7
 	dec_octave
 	musice8 8
-	note E_, 8
+	E_ 8
 	inc_octave
 	musice8 5
-	note E_, 7
+	E_ 7
 	dec_octave
 	musice8 8
-	note C_, 8
-	note F_, 7
+	C_ 8
+	F_ 7
 	inc_octave
 	musice8 5
-	note C_, 8
+	C_ 8
 	rest 7
 	dec_octave
 	musice8 8
-	note F_, 8
+	F_ 8
 	inc_octave
 	musice8 5
-	note G_, 7
+	G_ 7
 	dec_octave
 	musice8 8
-	note E_, 8
-	note D_, 7
+	E_ 8
+	D_ 7
 	rest 8
 	EndLoop
-	note C_, 7
+	C_ 7
 	rest 8
-	note G_, 7
+	G_ 7
 	inc_octave
 	musice8 5
-	note G_, 8
+	G_ 8
 	rest 7
 	dec_octave
 	musice8 8
-	note C_, 8
+	C_ 8
 	inc_octave
 	musice8 5
-	note E_, 7
+	E_ 7
 	dec_octave
 	dec_octave
 	musice8 8
-	note G_, 8
+	G_ 8
 	inc_octave
-	note C_, 7
+	C_ 7
 	inc_octave
 	musice8 5
-	note C_, 8
+	C_ 8
 	rest 7
 	dec_octave
 	musice8 8
-	note F_, 8
+	F_ 8
 	inc_octave
 	musice8 5
-	note G_, 7
+	G_ 7
 	dec_octave
 	musice8 8
-	note E_, 8
-	note D_, 7
+	E_ 8
+	D_ 7
 	rest 8
-	note C_, 15
+	C_ 15
 	rest 15
 	speed 10
 	rest 3
 	speed 1
 	rest 7
 	dec_octave
-	note G_, 15
+	G_ 15
 	rest 8
-	note A_, 7
+	A_ 7
 	rest 8
-	note B_, 7
+	B_ 7
 	rest 8
 	EndMainLoop
 
@@ -230,29 +230,29 @@ Music_DeckMachine_Ch4: ; f7018 (3d:7018)
 	MainLoop
 	Loop 9
 	music_call Branch_f7031
-	note snare4, 15
-	note snare1, 7
-	note snare3, 8
-	note snare4, 15
+	snare4 15
+	snare1 7
+	snare3 8
+	snare4 15
 	EndLoop
 	music_call Branch_f7031
-	note snare4, 7
-	note snare2, 4
-	note snare2, 4
-	note snare1, 7
-	note snare1, 8
-	note snare1, 7
-	note snare1, 8
+	snare4 7
+	snare2 4
+	snare2 4
+	snare1 7
+	snare1 8
+	snare1 7
+	snare1 8
 	EndMainLoop
 
 Branch_f7031:
-	note bass, 7
-	note snare3, 8
-	note snare4, 15
-	note snare1, 7
-	note snare3, 8
-	note snare4, 15
-	note bass, 7
-	note snare3, 8
+	bass 7
+	snare3 8
+	snare4 15
+	snare1 7
+	snare3 8
+	snare4 15
+	bass 7
+	snare3 8
 	music_ret
 ; 0xf703a
diff --git a/audio/music/dueltheme1.asm b/audio/music/dueltheme1.asm
index 0df7093..4487bc1 100644
--- a/audio/music/dueltheme1.asm
+++ b/audio/music/dueltheme1.asm
@@ -16,162 +16,162 @@ Music_DuelTheme1_Ch1: ; f532a (3d:532a)
 	music_call Branch_f54f9
 	volume 160
 	speed 1
-	note F_, 4
-	note F#, 3
+	F_ 4
+	F# 3
 	tie
 	speed 7
-	note F#, 1
+	F# 1
 	volume 55
-	note F#, 1
+	F# 1
 	dec_octave
 	volume 160
-	note A_, 1
+	A_ 1
 	rest 2
 	inc_octave
 	volume 160
-	note D_, 10
+	D_ 10
 	volume 55
-	note D_, 12
+	D_ 12
 	music_call Branch_f54f9
 	volume 160
-	note F#, 2
+	F# 2
 	volume 55
-	note F#, 1
+	F# 1
 	volume 160
-	note A_, 13
+	A_ 13
 	volume 55
-	note A_, 10
+	A_ 10
 	volume 160
-	note F#, 1
+	F# 1
 	volume 55
-	note F#, 1
+	F# 1
 	volume 160
-	note F#, 1
-	note G_, 1
-	note A_, 1
+	F# 1
+	G_ 1
+	A_ 1
 	volume 55
-	note A_, 1
+	A_ 1
 	volume 160
 	speed 1
-	note A#, 4
-	note B_, 3
+	A# 4
+	B_ 3
 	tie
 	speed 7
-	note B_, 15
+	B_ 15
 	volume 55
-	note B_, 4
+	B_ 4
 	volume 160
 	speed 1
-	note A#, 4
-	note B_, 3
+	A# 4
+	B_ 3
 	tie
 	speed 7
-	note B_, 3
-	note A_, 3
+	B_ 3
+	A_ 3
 	volume 55
-	note A_, 1
+	A_ 1
 	volume 160
-	note G_, 2
+	G_ 2
 	volume 55
-	note G_, 2
+	G_ 2
 	volume 160
 	speed 1
-	note G#, 4
-	note A_, 3
+	G# 4
+	A_ 3
 	tie
 	speed 7
-	note A_, 15
+	A_ 15
 	volume 55
-	note A_, 4
+	A_ 4
 	volume 160
 	speed 1
-	note G#, 4
-	note A_, 3
+	G# 4
+	A_ 3
 	tie
 	speed 7
-	note A_, 3
-	note G_, 4
-	note F#, 2
+	A_ 3
+	G_ 4
+	F# 2
 	volume 55
-	note F#, 2
+	F# 2
 	volume 160
 	speed 1
-	note F#, 4
-	note G_, 3
+	F# 4
+	G_ 3
 	tie
 	speed 7
-	note G_, 15
+	G_ 15
 	volume 55
-	note G_, 4
+	G_ 4
 	volume 160
 	speed 1
-	note F#, 4
-	note G_, 3
+	F# 4
+	G_ 3
 	tie
 	speed 7
-	note G_, 3
-	note F#, 4
-	note E_, 3
+	G_ 3
+	F# 4
+	E_ 3
 	volume 55
-	note E_, 1
+	E_ 1
 	volume 160
 	speed 1
-	note D#, 4
-	note E_, 3
+	D# 4
+	E_ 3
 	tie
 	speed 7
-	note E_, 1
+	E_ 1
 	volume 55
-	note E_, 1
+	E_ 1
 	volume 160
-	note D_, 13
+	D_ 13
 	volume 55
-	note D_, 9
+	D_ 9
 	dec_octave
 	EndLoop
 	inc_octave
 	duty 1
 	volume 160
 	speed 1
-	note C#, 4
-	note D_, 3
+	C# 4
+	D_ 3
 	tie
 	speed 7
-	note D_, 1
+	D_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note C#, 1
+	C# 1
 	rest 1
 	music_call Branch_f5538
 	speed 1
-	note G#, 4
-	note A_, 3
+	G# 4
+	A_ 3
 	tie
 	speed 7
-	note A_, 1
+	A_ 1
 	volume 55
-	note A_, 1
+	A_ 1
 	volume 160
-	note F#, 5
+	F# 5
 	volume 55
-	note F#, 1
+	F# 1
 	dec_octave
 	volume 160
-	note A_, 1
+	A_ 1
 	inc_octave
 	speed 1
-	note D_, 4
+	D_ 4
 	volume 55
-	note D_, 3
+	D_ 3
 	volume 160
-	note F#, 4
+	F# 4
 	volume 55
-	note F#, 3
+	F# 3
 	volume 160
-	note A_, 4
+	A_ 4
 	volume 55
-	note A_, 3
+	A_ 3
 	speed 7
 	rest 3
 	dec_octave
@@ -179,231 +179,231 @@ Music_DuelTheme1_Ch1: ; f532a (3d:532a)
 	volume 160
 	musice8 8
 	Loop 3
-	note A_, 1
+	A_ 1
 	rest 2
 	EndLoop
 	inc_octave
 	speed 1
-	note C#, 4
-	note D_, 3
+	C# 4
+	D_ 3
 	tie
 	speed 7
-	note D_, 1
+	D_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note C#, 1
+	C# 1
 	rest 1
 	music_call Branch_f5538
 	speed 1
-	note G#, 4
-	note A_, 3
+	G# 4
+	A_ 3
 	tie
 	speed 7
-	note A_, 5
+	A_ 5
 	tie
-	note A_, 10
+	A_ 10
 	tie
-	note A_, 6
+	A_ 6
 	volume 55
-	note A_, 2
+	A_ 2
 	inc_octave
 	volume 160
 	speed 1
-	note C#, 4
-	note D_, 3
+	C# 4
+	D_ 3
 	tie
 	speed 7
-	note D_, 2
-	note C#, 1
+	D_ 2
+	C# 1
 	volume 55
-	note C#, 2
+	C# 2
 	dec_octave
 	volume 160
-	note B_, 1
+	B_ 1
 	volume 55
-	note B_, 1
+	B_ 1
 	volume 160
 	speed 1
-	note A#, 4
-	note B_, 3
+	A# 4
+	B_ 3
 	tie
 	speed 7
-	note B_, 1
+	B_ 1
 	volume 55
-	note B_, 1
+	B_ 1
 	volume 160
-	note A_, 13
+	A_ 13
 	tie
-	note A_, 6
+	A_ 6
 	volume 55
-	note A_, 2
+	A_ 2
 	dec_octave
 	volume 121
 	speed 1
-	note A_, 5
+	A_ 5
 	inc_octave
-	note C#, 5
-	note E_, 4
-	note A_, 5
+	C# 5
+	E_ 4
+	A_ 5
 	inc_octave
-	note C#, 5
-	note E_, 4
+	C# 5
+	E_ 4
 	dec_octave
-	note C#, 5
-	note E_, 5
-	note A_, 4
+	C# 5
+	E_ 5
+	A_ 4
 	inc_octave
-	note C#, 5
-	note E_, 5
-	note A_, 4
+	C# 5
+	E_ 5
+	A_ 4
 	dec_octave
 	music_call Branch_f5580
 	volume 160
-	note A_, 2
+	A_ 2
 	tie
-	note A_, 8
+	A_ 8
 	tie
-	note A_, 8
+	A_ 8
 	tie
-	note A_, 6
+	A_ 6
 	duty 1
 	volume 160
 	speed 1
 	dec_octave
-	note B_, 4
+	B_ 4
 	inc_octave
-	note C_, 3
+	C_ 3
 	speed 7
-	note C#, 1
+	C# 1
 	rest 1
-	note C#, 1
-	note D_, 2
-	note E_, 2
-	note G_, 2
+	C# 1
+	D_ 2
+	E_ 2
+	G_ 2
 	duty 2
 	music_call Branch_f5580
 	volume 160
 	speed 1
-	note G#, 4
-	note A_, 3
+	G# 4
+	A_ 3
 	tie
 	speed 7
-	note A_, 5
-	note G_, 2
-	note F#, 2
+	A_ 5
+	G_ 2
+	F# 2
 	volume 55
-	note F#, 2
+	F# 2
 	volume 160
-	note E_, 2
+	E_ 2
 	volume 55
-	note E_, 2
+	E_ 2
 	volume 160
 	speed 1
-	note F#, 4
-	note G_, 3
+	F# 4
+	G_ 3
 	tie
 	speed 7
-	note G_, 5
-	note F#, 2
-	note E_, 2
+	G_ 5
+	F# 2
+	E_ 2
 	volume 55
-	note E_, 2
+	E_ 2
 	volume 160
-	note D_, 2
+	D_ 2
 	volume 55
-	note D_, 2
+	D_ 2
 	volume 160
-	note D_, 8
+	D_ 8
 	tie
-	note D_, 8
-	note D_, 8
+	D_ 8
+	D_ 8
 	tie
-	note D_, 8
+	D_ 8
 	volume 55
-	note D_, 2
+	D_ 2
 	volume 160
-	note D_, 12
+	D_ 12
 	volume 55
-	note D_, 2
+	D_ 2
 	volume 160
-	note D_, 6
+	D_ 6
 	tie
-	note D_, 8
+	D_ 8
 	rest 4
 	EndMainLoop
 
 Branch_f54f9:
 	octave 2
 	volume 160
-	note A_, 1
-	note B_, 1
+	A_ 1
+	B_ 1
 	inc_octave
-	note D_, 1
+	D_ 1
 	volume 55
-	note D_, 1
+	D_ 1
 	volume 160
 	speed 1
-	note F_, 4
-	note F#, 3
+	F_ 4
+	F# 3
 	tie
 	speed 7
-	note F#, 10
+	F# 10
 	volume 55
-	note F#, 1
+	F# 1
 	volume 160
-	note D_, 3
+	D_ 3
 	volume 55
-	note D_, 1
+	D_ 1
 	volume 160
 	speed 1
-	note D#, 4
-	note E_, 3
+	D# 4
+	E_ 3
 	tie
 	speed 7
-	note E_, 5
+	E_ 5
 	volume 55
-	note E_, 2
+	E_ 2
 	volume 160
 	speed 1
-	note F#, 4
-	note G_, 3
+	F# 4
+	G_ 3
 	tie
 	speed 7
-	note G_, 2
-	note F#, 1
+	G_ 2
+	F# 1
 	volume 55
-	note F#, 2
+	F# 2
 	volume 160
-	note E_, 1
+	E_ 1
 	volume 55
-	note E_, 1
+	E_ 1
 	music_ret
 
 Branch_f5538:
-	note C_, 1
+	C_ 1
 	rest 2
 	dec_octave
-	note G_, 1
+	G_ 1
 	rest 2
-	note G_, 1
+	G_ 1
 	rest 2
 	duty 2
 	volume 160
-	note G_, 1
+	G_ 1
 	inc_octave
 	speed 1
-	note C_, 4
+	C_ 4
 	volume 55
-	note C_, 3
+	C_ 3
 	volume 160
-	note E_, 4
+	E_ 4
 	volume 55
-	note E_, 3
+	E_ 3
 	volume 160
-	note G_, 4
+	G_ 4
 	volume 55
-	note G_, 3
+	G_ 3
 	speed 7
 	rest 3
 	duty 1
@@ -411,101 +411,101 @@ Branch_f5538:
 	musice8 8
 	dec_octave
 	Loop 3
-	note G_, 1
+	G_ 1
 	rest 2
 	EndLoop
 	inc_octave
 	duty 2
 	volume 160
 	speed 1
-	note A#, 4
-	note B_, 3
+	A# 4
+	B_ 3
 	tie
 	speed 7
-	note B_, 2
-	note A_, 1
+	B_ 2
+	A_ 1
 	volume 55
-	note A_, 1
+	A_ 1
 	volume 160
-	note G_, 1
+	G_ 1
 	volume 55
-	note G_, 1
+	G_ 1
 	volume 160
 	music_ret
 
 Branch_f5580:
 	speed 1
 	volume 160
-	note F_, 4
-	note F#, 3
+	F_ 4
+	F# 3
 	tie
 	speed 7
-	note F#, 9
+	F# 9
 	volume 55
-	note F#, 2
+	F# 2
 	volume 160
-	note G_, 1
+	G_ 1
 	volume 55
-	note G_, 1
+	G_ 1
 	volume 160
-	note A_, 1
+	A_ 1
 	volume 55
-	note A_, 1
+	A_ 1
 	volume 160
-	note B_, 2
+	B_ 2
 	volume 55
-	note B_, 2
+	B_ 2
 	inc_octave
 	volume 160
 	speed 1
-	note F_, 4
-	note F#, 3
+	F_ 4
+	F# 3
 	tie
 	speed 7
-	note F#, 7
-	note E_, 1
+	F# 7
+	E_ 1
 	volume 55
-	note E_, 1
+	E_ 1
 	volume 160
-	note D_, 1
+	D_ 1
 	volume 55
-	note D_, 1
+	D_ 1
 	volume 160
-	note C#, 2
+	C# 2
 	volume 55
-	note C#, 1
+	C# 1
 	dec_octave
 	volume 160
-	note A_, 9
-	note F#, 1
+	A_ 9
+	F# 1
 	volume 55
-	note F#, 1
+	F# 1
 	volume 160
 	speed 1
-	note A#, 4
-	note B_, 3
+	A# 4
+	B_ 3
 	tie
 	speed 7
-	note B_, 8
+	B_ 8
 	volume 55
-	note B_, 1
+	B_ 1
 	volume 160
-	note A_, 4
-	note G_, 4
-	note F#, 10
-	note G_, 1
+	A_ 4
+	G_ 4
+	F# 10
+	G_ 1
 	volume 55
-	note G_, 1
+	G_ 1
 	volume 160
-	note A_, 1
+	A_ 1
 	volume 55
-	note A_, 1
+	A_ 1
 	volume 160
-	note D_, 10
-	note E_, 2
-	note F#, 2
+	D_ 10
+	E_ 2
+	F# 2
 	volume 55
-	note F#, 2
+	F# 2
 	music_ret
 
 
@@ -521,512 +521,512 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7)
 	octave 2
 	Loop 4
 	Loop 3
-	note D_, 1
+	D_ 1
 	rest 2
 	EndLoop
 	rest 1
 	dec_octave
-	note A_, 1
+	A_ 1
 	rest 1
-	note A_, 1
-	note B_, 1
+	A_ 1
+	B_ 1
 	rest 2
 	inc_octave
 	EndLoop
 	Loop 4
 	octave 2
-	note D_, 1
+	D_ 1
 	rest 2
-	note D_, 1
+	D_ 1
 	duty 2
 	volume 162
 	musice8 6
-	note A_, 2
+	A_ 2
 	music_call Branch_f59f9
 	EndLoop
 	octave 2
-	note D_, 1
+	D_ 1
 	rest 2
-	note D_, 1
+	D_ 1
 	duty 2
 	inc_octave
 	volume 162
 	musice8 6
-	note D_, 2
+	D_ 2
 	music_call Branch_f59f9
 	octave 2
-	note D_, 1
+	D_ 1
 	rest 2
-	note D_, 1
+	D_ 1
 	duty 2
 	inc_octave
 	volume 162
 	musice8 6
-	note C_, 2
+	C_ 2
 	dec_octave
 	duty 1
 	volume 144
 	musice8 8
-	note D_, 1
+	D_ 1
 	rest 3
 	dec_octave
-	note A_, 1
+	A_ 1
 	rest 1
 	inc_octave
 	duty 2
 	volume 162
 	musice8 6
-	note G_, 1
+	G_ 1
 	dec_octave
 	duty 1
 	volume 144
 	musice8 8
-	note B_, 1
+	B_ 1
 	rest 2
 	inc_octave
 	Loop 3
 	octave 2
-	note D_, 1
+	D_ 1
 	rest 2
-	note D_, 1
+	D_ 1
 	duty 2
 	inc_octave
 	volume 162
 	musice8 6
-	note D_, 2
+	D_ 2
 	music_call Branch_f59f9
 	EndLoop
 	octave 2
-	note D_, 1
+	D_ 1
 	rest 2
-	note D_, 1
+	D_ 1
 	duty 2
 	inc_octave
 	volume 162
 	musice8 6
-	note C_, 2
+	C_ 2
 	dec_octave
 	duty 1
 	volume 144
 	musice8 8
-	note D_, 1
+	D_ 1
 	rest 3
 	dec_octave
-	note A_, 1
+	A_ 1
 	rest 1
 	inc_octave
 	duty 2
 	volume 162
 	musice8 6
-	note G_, 1
+	G_ 1
 	dec_octave
 	duty 1
 	volume 144
 	musice8 8
-	note B_, 1
+	B_ 1
 	rest 2
 	inc_octave
-	note D_, 1
+	D_ 1
 	rest 2
-	note D_, 1
+	D_ 1
 	duty 2
 	inc_octave
 	volume 162
 	musice8 6
-	note D_, 2
+	D_ 2
 	music_call Branch_f59f9
 	octave 2
-	note D_, 1
+	D_ 1
 	rest 2
-	note D_, 1
+	D_ 1
 	duty 2
 	inc_octave
 	volume 162
 	musice8 6
-	note D_, 2
+	D_ 2
 	dec_octave
 	duty 1
 	volume 144
 	musice8 8
-	note D_, 1
+	D_ 1
 	rest 3
-	note D_, 1
+	D_ 1
 	rest 1
 	duty 2
 	volume 162
 	musice8 6
-	note A_, 2
+	A_ 2
 	duty 1
 	volume 144
 	musice8 8
-	note F#, 1
+	F# 1
 	rest 1
 	Loop 2
-	note G_, 1
+	G_ 1
 	rest 2
-	note G_, 1
+	G_ 1
 	duty 2
 	volume 162
 	musice8 6
-	note G_, 2
+	G_ 2
 	duty 1
 	volume 144
 	musice8 8
-	note G_, 1
+	G_ 1
 	rest 3
-	note D_, 1
+	D_ 1
 	rest 1
 	duty 2
 	volume 162
 	musice8 6
-	note G_, 1
+	G_ 1
 	duty 1
 	volume 144
 	musice8 8
-	note E_, 1
+	E_ 1
 	rest 2
 	EndLoop
-	note F#, 1
+	F# 1
 	rest 2
-	note F#, 1
+	F# 1
 	duty 2
 	volume 162
 	musice8 6
 	inc_octave
-	note C#, 2
+	C# 2
 	music_call Branch_f5a17
 	octave 2
-	note F#, 1
+	F# 1
 	rest 2
-	note F#, 1
+	F# 1
 	inc_octave
 	duty 2
 	volume 162
 	musice8 6
-	note E_, 2
+	E_ 2
 	music_call Branch_f5a17
-	note E_, 1
+	E_ 1
 	rest 2
-	note E_, 1
+	E_ 1
 	duty 2
 	volume 162
 	musice8 6
-	note G_, 2
+	G_ 2
 	duty 1
 	volume 144
 	musice8 8
-	note E_, 1
+	E_ 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 1
 	duty 2
 	volume 162
 	musice8 6
-	note B_, 1
+	B_ 1
 	duty 1
 	volume 144
 	musice8 8
-	note G_, 1
+	G_ 1
 	rest 2
-	note A_, 1
+	A_ 1
 	rest 2
-	note A_, 1
+	A_ 1
 	duty 2
 	volume 162
 	musice8 6
-	note G_, 2
+	G_ 2
 	duty 1
 	volume 144
 	musice8 8
-	note A_, 1
+	A_ 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 1
 	duty 2
 	volume 162
 	musice8 6
-	note A_, 1
+	A_ 1
 	duty 1
 	volume 144
 	musice8 8
-	note A_, 1
+	A_ 1
 	rest 2
-	note D_, 1
+	D_ 1
 	rest 2
-	note D_, 1
+	D_ 1
 	duty 2
 	volume 162
 	musice8 6
-	note A_, 2
+	A_ 2
 	duty 1
 	volume 144
 	musice8 8
-	note D_, 1
+	D_ 1
 	rest 3
 	dec_octave
-	note A_, 1
+	A_ 1
 	rest 1
 	inc_octave
 	duty 2
 	volume 162
 	musice8 6
-	note A_, 1
+	A_ 1
 	dec_octave
 	duty 1
 	volume 144
 	musice8 8
-	note B_, 1
+	B_ 1
 	rest 2
 	inc_octave
-	note D_, 1
+	D_ 1
 	rest 2
-	note D_, 1
+	D_ 1
 	duty 2
 	volume 162
 	musice8 6
-	note A_, 2
+	A_ 2
 	duty 1
 	volume 144
 	musice8 8
-	note D_, 1
+	D_ 1
 	rest 3
 	dec_octave
-	note A_, 1
+	A_ 1
 	rest 1
 	inc_octave
 	duty 2
 	volume 112
 	musice4 0
-	note E_, 1
-	note F#, 1
-	note A_, 1
+	E_ 1
+	F# 1
+	A_ 1
 	rest 1
 	volume 112
 	music_call Branch_f594d
 	volume 112
 	octave 3
 	speed 1
-	note C#, 4
-	note D_, 3
+	C# 4
+	D_ 3
 	tie
 	speed 7
-	note D_, 1
+	D_ 1
 	rest 1
 	dec_octave
-	note F#, 1
+	F# 1
 	volume 162
 	musice8 6
-	note F#, 2
+	F# 2
 	volume 112
 	musice8 8
-	note A_, 10
+	A_ 10
 	duty 1
 	volume 144
 	musice8 8
-	note D_, 1
+	D_ 1
 	rest 2
-	note D_, 1
+	D_ 1
 	duty 2
 	volume 162
 	musice8 6
 	inc_octave
-	note D_, 2
+	D_ 2
 	dec_octave
 	duty 1
 	volume 144
 	musice8 8
-	note D_, 1
+	D_ 1
 	rest 3
 	dec_octave
-	note A_, 1
+	A_ 1
 	rest 1
 	inc_octave
 	duty 2
 	volume 112
-	note E_, 1
-	note F#, 1
-	note A_, 1
+	E_ 1
+	F# 1
+	A_ 1
 	rest 1
 	music_call Branch_f594d
 	volume 112
 	octave 3
-	note D_, 2
+	D_ 2
 	rest 1
-	note F#, 13
+	F# 13
 	dec_octave
 	duty 1
 	volume 144
 	musice8 8
-	note D_, 1
+	D_ 1
 	rest 2
-	note D_, 1
+	D_ 1
 	duty 2
 	inc_octave
 	volume 162
 	musice8 6
-	note D_, 2
+	D_ 2
 	dec_octave
 	duty 1
 	volume 144
 	musice8 8
-	note D_, 1
+	D_ 1
 	rest 3
 	inc_octave
 	duty 2
 	volume 112
-	note D_, 1
+	D_ 1
 	rest 1
-	note D_, 1
-	note E_, 1
-	note F#, 1
+	D_ 1
+	E_ 1
+	F# 1
 	rest 1
 	speed 1
-	note F#, 4
-	note G_, 3
+	F# 4
+	G_ 3
 	tie
 	speed 7
-	note G_, 15
+	G_ 15
 	dec_octave
 	duty 1
 	volume 144
 	musice8 8
-	note G_, 1
+	G_ 1
 	rest 2
-	note G_, 1
+	G_ 1
 	inc_octave
 	duty 2
 	volume 112
 	speed 1
-	note F#, 4
-	note G_, 3
+	F# 4
+	G_ 3
 	tie
 	speed 7
-	note G_, 2
+	G_ 2
 	rest 1
-	note F#, 3
+	F# 3
 	rest 1
 	dec_octave
 	volume 162
 	musice8 6
-	note G_, 1
+	G_ 1
 	duty 1
 	volume 144
 	musice8 8
-	note E_, 1
+	E_ 1
 	rest 2
 	inc_octave
 	duty 2
 	volume 112
 	speed 1
-	note E_, 4
-	note F#, 3
+	E_ 4
+	F# 3
 	tie
 	speed 7
-	note F#, 15
+	F# 15
 	dec_octave
 	duty 1
 	volume 144
 	musice8 8
-	note F#, 1
+	F# 1
 	rest 2
-	note F#, 1
+	F# 1
 	inc_octave
 	duty 2
 	volume 112
 	speed 1
-	note E_, 4
-	note F#, 3
+	E_ 4
+	F# 3
 	tie
 	speed 7
-	note F#, 2
+	F# 2
 	rest 1
-	note E_, 3
+	E_ 3
 	rest 1
 	dec_octave
 	volume 162
 	musice8 6
-	note A_, 1
+	A_ 1
 	duty 1
 	volume 144
 	musice8 8
-	note E_, 1
+	E_ 1
 	rest 2
 	inc_octave
 	duty 2
 	volume 112
 	speed 1
-	note D#, 4
-	note E_, 3
+	D# 4
+	E_ 3
 	tie
 	speed 7
-	note E_, 15
+	E_ 15
 	dec_octave
 	duty 1
 	volume 144
 	musice8 8
-	note A_, 1
+	A_ 1
 	rest 2
-	note A_, 1
+	A_ 1
 	duty 2
 	volume 112
 	speed 1
-	note A#, 4
-	note B_, 3
+	A# 4
+	B_ 3
 	tie
 	speed 7
-	note B_, 2
+	B_ 2
 	rest 1
-	note A_, 3
+	A_ 3
 	rest 1
-	note G_, 3
+	G_ 3
 	rest 1
 	speed 1
-	note F#, 4
-	note G_, 3
+	F# 4
+	G_ 3
 	tie
 	speed 7
-	note G_, 1
+	G_ 1
 	rest 1
-	note F#, 13
+	F# 13
 	duty 1
 	volume 144
 	musice8 8
-	note D_, 1
+	D_ 1
 	rest 2
-	note D_, 1
+	D_ 1
 	inc_octave
 	duty 2
 	volume 162
 	musice8 6
-	note D_, 2
+	D_ 2
 	dec_octave
 	musice4 0
 	duty 1
 	volume 144
 	musice8 8
-	note D_, 1
+	D_ 1
 	rest 2
 	music_call Branch_f59b4
 	octave 3
 	speed 1
 	volume 112
-	note F_, 4
-	note F#, 3
+	F_ 4
+	F# 3
 	tie
 	speed 7
-	note F#, 1
+	F# 1
 	rest 1
-	note D_, 5
+	D_ 5
 	rest 1
 	dec_octave
-	note F#, 1
+	F# 1
 	speed 1
-	note A_, 4
+	A_ 4
 	rest 3
 	inc_octave
-	note D_, 4
+	D_ 4
 	rest 3
-	note F#, 4
+	F# 4
 	rest 3
 	speed 7
 	rest 3
@@ -1035,187 +1035,187 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7)
 	volume 144
 	musice8 8
 	Loop 3
-	note D_, 1
+	D_ 1
 	rest 2
 	EndLoop
 	music_call Branch_f59b4
 	volume 128
 	octave 3
-	note D_, 16
+	D_ 16
 	tie
-	note D_, 6
+	D_ 6
 	rest 2
 	speed 1
-	note G#, 4
-	note A_, 3
+	G# 4
+	A_ 3
 	tie
 	speed 7
-	note A_, 2
-	note A_, 1
+	A_ 2
+	A_ 1
 	rest 2
-	note A_, 1
+	A_ 1
 	rest 1
-	note D_, 2
+	D_ 2
 	rest 1
-	note D_, 13
-	note C#, 6
+	D_ 13
+	C# 6
 	rest 2
 	dec_octave
 	volume 121
 	speed 1
-	note E_, 5
-	note A_, 5
+	E_ 5
+	A_ 5
 	inc_octave
-	note C#, 4
-	note E_, 5
-	note A_, 5
+	C# 4
+	E_ 5
+	A_ 5
 	inc_octave
-	note C#, 4
+	C# 4
 	dec_octave
 	dec_octave
-	note A_, 5
+	A_ 5
 	inc_octave
-	note C#, 5
-	note E_, 4
-	note A_, 5
+	C# 5
+	E_ 4
+	A_ 5
 	inc_octave
-	note C#, 5
-	note E_, 4
+	C# 5
+	E_ 4
 	dec_octave
 	speed 7
 	music_call Branch_f598c
-	note D_, 8
+	D_ 8
 	tie
-	note D_, 8
-	note C#, 6
+	D_ 8
+	C# 6
 	dec_octave
 	duty 1
 	volume 112
 	speed 1
-	note G_, 4
-	note G#, 3
+	G_ 4
+	G# 3
 	speed 7
-	note A_, 1
+	A_ 1
 	rest 1
-	note A_, 1
-	note B_, 2
+	A_ 1
+	B_ 2
 	inc_octave
-	note C#, 2
-	note E_, 2
+	C# 2
+	E_ 2
 	duty 2
 	music_call Branch_f598c
-	note D_, 4
-	note E_, 2
-	note D_, 2
+	D_ 4
+	E_ 2
+	D_ 2
 	rest 2
-	note C#, 2
+	C# 2
 	rest 2
-	note E_, 6
-	note D_, 2
-	note C#, 2
+	E_ 6
+	D_ 2
+	C# 2
 	rest 2
 	dec_octave
-	note A_, 2
+	A_ 2
 	rest 2
-	note G_, 8
+	G_ 8
 	tie
-	note G_, 8
-	note F#, 8
+	G_ 8
+	F# 8
 	tie
-	note F#, 8
+	F# 8
 	rest 2
-	note G_, 12
+	G_ 12
 	rest 2
-	note G_, 14
+	G_ 14
 	rest 4
 	EndMainLoop
 
 Branch_f594d:
 	octave 3
 	speed 1
-	note C#, 4
-	note D_, 3
+	C# 4
+	D_ 3
 	tie
 	speed 7
-	note D_, 9
+	D_ 9
 	dec_octave
 	duty 1
 	volume 144
 	dec_octave
-	note A_, 1
+	A_ 1
 	rest 1
 	inc_octave
 	duty 2
 	volume 112
-	note A_, 3
+	A_ 3
 	rest 1
 	inc_octave
-	note C_, 6
+	C_ 6
 	dec_octave
 	duty 1
 	volume 144
 	musice8 8
-	note D_, 1
+	D_ 1
 	rest 1
 	inc_octave
 	duty 2
 	volume 112
 	speed 1
-	note D#, 4
-	note E_, 3
+	D# 4
+	E_ 3
 	tie
 	speed 7
-	note E_, 2
-	note D_, 1
+	E_ 2
+	D_ 1
 	dec_octave
 	volume 162
 	musice8 6
-	note G_, 2
+	G_ 2
 	inc_octave
 	volume 112
 	musice8 8
-	note C_, 1
+	C_ 1
 	rest 1
 	music_ret
 
 Branch_f598c:
 	volume 128
-	note D_, 10
+	D_ 10
 	rest 2
-	note E_, 1
+	E_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note G_, 2
+	G_ 2
 	rest 2
 	inc_octave
-	note D_, 8
-	note C#, 1
+	D_ 8
+	C# 1
 	rest 1
 	dec_octave
-	note B_, 1
+	B_ 1
 	rest 1
-	note A_, 2
+	A_ 2
 	rest 1
-	note F#, 9
-	note D_, 1
+	F# 9
+	D_ 1
 	rest 1
-	note G_, 9
+	G_ 9
 	rest 1
-	note F#, 4
-	note E_, 4
-	note D_, 10
-	note E_, 1
+	F# 4
+	E_ 4
+	D_ 10
+	E_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
 	dec_octave
-	note B_, 10
+	B_ 10
 	inc_octave
-	note C#, 2
-	note D_, 2
+	C# 2
+	D_ 2
 	rest 2
-	note D_, 2
+	D_ 2
 	tie
 	music_ret
 
@@ -1223,32 +1223,32 @@ Branch_f59b4:
 	octave 2
 	volume 128
 	speed 1
-	note G#, 4
-	note A_, 3
+	G# 4
+	A_ 3
 	tie
 	speed 7
-	note A_, 1
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 2
-	note C_, 1
+	C_ 1
 	rest 2
-	note C_, 1
+	C_ 1
 	rest 2
 	duty 2
 	volume 112
-	note E_, 1
+	E_ 1
 	speed 1
-	note G_, 4
+	G_ 4
 	rest 3
 	inc_octave
-	note C_, 4
+	C_ 4
 	rest 3
-	note E_, 4
+	E_ 4
 	rest 3
 	speed 7
 	rest 3
@@ -1257,21 +1257,21 @@ Branch_f59b4:
 	duty 1
 	volume 128
 	Loop 3
-	note C_, 1
+	C_ 1
 	rest 2
 	EndLoop
 	inc_octave
 	duty 2
 	volume 112
 	speed 1
-	note F#, 4
-	note G_, 3
+	F# 4
+	G_ 3
 	tie
 	speed 7
-	note G_, 2
-	note F#, 1
+	G_ 2
+	F# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
 	music_ret
 
@@ -1280,21 +1280,21 @@ Branch_f59f9:
 	duty 1
 	volume 144
 	musice8 8
-	note D_, 1
+	D_ 1
 	rest 3
 	dec_octave
-	note A_, 1
+	A_ 1
 	rest 1
 	inc_octave
 	duty 2
 	volume 162
 	musice8 6
-	note A_, 1
+	A_ 1
 	dec_octave
 	duty 1
 	volume 144
 	musice8 8
-	note B_, 1
+	B_ 1
 	rest 2
 	music_ret
 
@@ -1303,18 +1303,18 @@ Branch_f5a17:
 	duty 1
 	volume 144
 	musice8 8
-	note F#, 1
+	F# 1
 	rest 3
-	note C#, 1
+	C# 1
 	rest 1
 	duty 2
 	volume 162
 	musice8 6
-	note A_, 1
+	A_ 1
 	duty 1
 	volume 144
 	musice8 8
-	note E_, 1
+	E_ 1
 	rest 2
 	music_ret
 
@@ -1330,503 +1330,503 @@ Music_DuelTheme1_Ch3: ; f5a32 (3d:5a32)
 	MainLoop
 	Loop 4
 	Loop 3
-	note D_, 1
+	D_ 1
 	rest 2
 	EndLoop
 	rest 1
 	music_call Branch_f5c47
 	EndLoop
 	Loop 4
-	note D_, 1
+	D_ 1
 	rest 2
-	note D_, 1
+	D_ 1
 	inc_octave
 	inc_octave
 	musice8 3
-	note D_, 2
+	D_ 2
 	dec_octave
 	dec_octave
 	musice8 8
-	note D_, 1
+	D_ 1
 	rest 3
 	music_call Branch_f5c47
 	EndLoop
 	music_call Branch_f5b8d
-	note D_, 1
+	D_ 1
 	rest 2
-	note D_, 1
+	D_ 1
 	inc_octave
 	musice8 3
-	note F#, 2
+	F# 2
 	dec_octave
 	musice8 8
-	note D_, 1
+	D_ 1
 	rest 3
 	music_call Branch_f5c47
-	note D_, 1
+	D_ 1
 	rest 2
-	note D_, 1
+	D_ 1
 	inc_octave
 	inc_octave
 	musice8 3
-	note D_, 2
+	D_ 2
 	dec_octave
 	dec_octave
 	musice8 8
-	note D_, 1
+	D_ 1
 	rest 3
 	music_call Branch_f5c47
 	music_call Branch_f5b8d
-	note D_, 1
+	D_ 1
 	rest 2
-	note D_, 1
+	D_ 1
 	inc_octave
 	musice8 3
-	note A_, 2
+	A_ 2
 	dec_octave
 	musice8 8
-	note D_, 1
+	D_ 1
 	rest 3
 	music_call Branch_f5c47
-	note D_, 1
+	D_ 1
 	rest 2
-	note D_, 1
+	D_ 1
 	inc_octave
 	musice8 3
-	note A_, 2
+	A_ 2
 	dec_octave
 	musice8 8
-	note D_, 1
+	D_ 1
 	rest 2
-	note D_, 2
+	D_ 2
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note C#, 1
+	C# 1
 	rest 1
 	music_call Branch_f5c7e
 	octave 2
-	note C_, 3
+	C_ 3
 	dec_octave
-	note G_, 1
+	G_ 1
 	rest 1
 	inc_octave
-	note C_, 1
+	C_ 1
 	rest 1
 	dec_octave
 	Loop 3
-	note D_, 1
+	D_ 1
 	rest 2
 	EndLoop
 	inc_octave
-	note D_, 1
+	D_ 1
 	speed 1
-	note F#, 4
+	F# 4
 	rest 3
-	note A_, 4
+	A_ 4
 	rest 3
 	inc_octave
-	note D_, 4
+	D_ 4
 	rest 3
 	speed 7
 	rest 3
 	dec_octave
 	dec_octave
 	Loop 3
-	note D_, 1
+	D_ 1
 	rest 2
 	EndLoop
-	note D_, 2
+	D_ 2
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note C#, 1
+	C# 1
 	rest 1
 	music_call Branch_f5c7e
 	octave 1
-	note C_, 3
-	note D_, 1
+	C_ 3
+	D_ 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
 	music_call Branch_f5c60
 	octave 1
 	musice8 8
-	note E_, 1
+	E_ 1
 	rest 1
-	note E_, 2
+	E_ 2
 	musice8 6
-	note B_, 2
+	B_ 2
 	music_call Branch_f5c60
 	octave 1
 	musice8 8
-	note F#, 2
-	note G_, 2
+	F# 2
+	G_ 2
 	musice8 6
-	note G#, 2
+	G# 2
 	music_call Branch_f5c6f
 	octave 1
 	musice8 8
-	note A_, 1
+	A_ 1
 	rest 1
-	note A_, 2
+	A_ 2
 	musice8 6
-	note E_, 2
+	E_ 2
 	music_call Branch_f5c6f
 	octave 1
 	musice8 8
-	note B_, 2
+	B_ 2
 	inc_octave
-	note C_, 2
-	note C#, 2
+	C_ 2
+	C# 2
 	dec_octave
 	Loop 2
 	music_call Branch_f5c4d
-	note E_, 1
+	E_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note E_, 2
+	E_ 2
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
 	musice8 7
-	note E_, 1
+	E_ 1
 	musice8 8
-	note E_, 1
+	E_ 1
 	rest 1
-	note E_, 2
-	note F#, 1
+	E_ 2
+	F# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note F#, 2
+	F# 2
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
 	musice8 7
-	note F#, 1
+	F# 1
 	musice8 8
-	note F#, 1
+	F# 1
 	rest 1
-	note F#, 2
-	note G_, 1
+	F# 2
+	G_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note G_, 2
+	G_ 2
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
 	musice8 7
-	note G_, 1
+	G_ 1
 	musice8 8
-	note F#, 1
+	F# 1
 	rest 1
-	note E_, 2
+	E_ 2
 	music_call Branch_f5c4d
-	note B_, 1
+	B_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note B_, 2
+	B_ 2
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
 	musice8 7
-	note B_, 1
+	B_ 1
 	musice8 8
-	note F#, 1
+	F# 1
 	rest 1
-	note F_, 2
-	note E_, 1
+	F_ 2
+	E_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note E_, 2
+	E_ 2
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note E_, 1
-	note F#, 2
-	note G_, 2
-	note G#, 2
-	note A_, 1
+	E_ 1
+	F# 2
+	G_ 2
+	G# 2
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note A_, 2
+	A_ 2
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note B_, 1
-	note A_, 2
-	note E_, 2
-	note C#, 2
+	B_ 1
+	A_ 2
+	E_ 2
+	C# 2
 	EndLoop
 	Loop 2
 	music_call Branch_f5c4d
 	EndLoop
-	note D_, 1
+	D_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note D_, 2
+	D_ 2
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
 	musice8 7
-	note D_, 1
+	D_ 1
 	musice8 8
-	note D_, 1
+	D_ 1
 	rest 1
-	note A_, 14
+	A_ 14
 	rest 4
 	EndMainLoop
 
 Branch_f5b8d:
-	note D_, 1
+	D_ 1
 	rest 2
-	note D_, 1
+	D_ 1
 	inc_octave
 	musice8 3
-	note A_, 2
+	A_ 2
 	dec_octave
 	musice8 8
-	note D_, 1
+	D_ 1
 	rest 3
 	music_call Branch_f5c47
-	note D_, 1
+	D_ 1
 	rest 2
-	note D_, 1
+	D_ 1
 	inc_octave
 	musice8 3
-	note G_, 2
+	G_ 2
 	dec_octave
 	musice8 8
-	note D_, 1
+	D_ 1
 	rest 3
 	music_call Branch_f5c47
 	Loop 3
-	note D_, 1
+	D_ 1
 	rest 2
-	note D_, 1
+	D_ 1
 	inc_octave
 	musice8 3
-	note A_, 2
+	A_ 2
 	dec_octave
 	musice8 8
-	note D_, 1
+	D_ 1
 	rest 3
 	music_call Branch_f5c47
 	EndLoop
-	note D_, 1
+	D_ 1
 	rest 2
-	note D_, 1
+	D_ 1
 	inc_octave
 	musice8 3
-	note G_, 2
+	G_ 2
 	dec_octave
 	musice8 8
-	note D_, 1
+	D_ 1
 	rest 3
 	music_call Branch_f5c47
-	note D_, 1
+	D_ 1
 	rest 2
-	note D_, 1
+	D_ 1
 	inc_octave
 	musice8 3
-	note A_, 2
+	A_ 2
 	dec_octave
 	musice8 8
-	note D_, 1
+	D_ 1
 	rest 3
 	music_call Branch_f5c47
-	note D_, 1
+	D_ 1
 	rest 2
-	note D_, 1
+	D_ 1
 	inc_octave
 	musice8 3
-	note A_, 2
+	A_ 2
 	dec_octave
 	musice8 8
-	note D_, 1
+	D_ 1
 	rest 3
-	note D_, 1
+	D_ 1
 	rest 1
-	note E_, 2
-	note F#, 1
+	E_ 2
+	F# 1
 	rest 1
 	Loop 2
-	note G_, 1
+	G_ 1
 	rest 2
-	note G_, 1
+	G_ 1
 	inc_octave
 	musice8 3
-	note B_, 2
+	B_ 2
 	dec_octave
 	musice8 8
-	note G_, 1
+	G_ 1
 	rest 3
-	note D_, 1
+	D_ 1
 	rest 1
-	note D_, 1
-	note E_, 1
+	D_ 1
+	E_ 1
 	rest 2
 	EndLoop
-	note F#, 1
+	F# 1
 	rest 2
-	note F#, 1
+	F# 1
 	inc_octave
 	musice8 3
-	note A_, 2
+	A_ 2
 	dec_octave
 	musice8 8
-	note F#, 1
+	F# 1
 	rest 3
-	note C#, 1
+	C# 1
 	rest 1
-	note C#, 1
-	note E_, 1
+	C# 1
+	E_ 1
 	rest 2
-	note F#, 1
+	F# 1
 	rest 2
-	note F#, 1
+	F# 1
 	inc_octave
 	inc_octave
 	musice8 3
-	note C#, 2
+	C# 2
 	dec_octave
 	dec_octave
 	musice8 8
-	note F#, 1
+	F# 1
 	rest 3
-	note C#, 1
+	C# 1
 	rest 1
-	note C#, 1
-	note E_, 1
+	C# 1
+	E_ 1
 	rest 2
-	note E_, 1
+	E_ 1
 	rest 2
-	note E_, 1
+	E_ 1
 	inc_octave
 	musice8 3
-	note B_, 2
+	B_ 2
 	dec_octave
 	musice8 8
-	note E_, 1
+	E_ 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 1
-	note F#, 1
-	note G_, 1
+	F# 1
+	G_ 1
 	rest 2
-	note A_, 1
+	A_ 1
 	rest 2
-	note A_, 1
+	A_ 1
 	inc_octave
 	musice8 3
-	note B_, 2
+	B_ 2
 	dec_octave
 	musice8 8
-	note A_, 1
+	A_ 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 1
-	note F#, 1
-	note A_, 1
+	F# 1
+	A_ 1
 	rest 2
 	music_ret
 
 Branch_f5c47:
-	note A_, 1
+	A_ 1
 	rest 1
-	note A_, 1
-	note B_, 1
+	A_ 1
+	B_ 1
 	rest 2
 	music_ret
 
 Branch_f5c4d:
-	note D_, 1
+	D_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note D_, 2
+	D_ 2
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
 	musice8 7
-	note D_, 1
+	D_ 1
 	musice8 8
-	note D_, 1
+	D_ 1
 	rest 1
-	note D_, 2
+	D_ 2
 	music_ret
 
 Branch_f5c60:
 	octave 1
 	musice8 8
-	note E_, 1
+	E_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note E_, 2
+	E_ 2
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
 	musice8 6
-	note E_, 1
+	E_ 1
 	music_ret
 
 Branch_f5c6f:
 	octave 1
 	musice8 8
-	note A_, 1
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note A_, 2
+	A_ 2
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	musice8 6
-	note A_, 1
+	A_ 1
 	music_ret
 
 Branch_f5c7e:
 	octave 1
 	Loop 3
-	note C_, 1
+	C_ 1
 	rest 2
 	EndLoop
 	inc_octave
-	note C_, 1
+	C_ 1
 	speed 1
-	note E_, 4
+	E_ 4
 	rest 3
-	note G_, 4
+	G_ 4
 	rest 3
 	inc_octave
-	note C_, 4
+	C_ 4
 	rest 3
 	speed 7
 	rest 3
 	dec_octave
 	dec_octave
 	Loop 3
-	note C_, 1
+	C_ 1
 	rest 2
 	EndLoop
 	music_ret
@@ -1837,36 +1837,36 @@ Music_DuelTheme1_Ch4: ; f5c9a (3d:5c9a)
 	octave 1
 	MainLoop
 	Loop 3
-	note bass, 2
-	note snare3, 1
-	note snare4, 1
-	note snare3, 1
-	note bass, 1
-	note snare2, 2
-	note snare3, 1
-	note bass, 1
-	note snare4, 2
-	note snare1, 1
-	note snare4, 1
-	rest 1
-	note snare3, 1
+	bass 2
+	snare3 1
+	snare4 1
+	snare3 1
+	bass 1
+	snare2 2
+	snare3 1
+	bass 1
+	snare4 2
+	snare1 1
+	snare4 1
+	rest 1
+	snare3 1
 	EndLoop
-	note bass, 2
-	note snare3, 1
-	note snare4, 1
-	note snare3, 1
-	note bass, 1
-	note snare2, 2
-	note snare3, 1
-	note snare1, 1
-	note snare4, 1
+	bass 2
+	snare3 1
+	snare4 1
+	snare3 1
+	bass 1
+	snare2 2
+	snare3 1
+	snare1 1
+	snare4 1
 	speed 1
-	note snare2, 4
-	note snare2, 3
+	snare2 4
+	snare2 3
 	speed 7
-	note snare1, 1
-	note snare1, 1
-	note snare1, 2
+	snare1 1
+	snare1 1
+	snare1 2
 	Loop 3
 	music_call Branch_f5d39
 	EndLoop
@@ -1878,50 +1878,50 @@ Music_DuelTheme1_Ch4: ; f5c9a (3d:5c9a)
 	Loop 15
 	music_call Branch_f5d39
 	EndLoop
-	note bass, 2
-	note snare3, 1
-	note snare4, 1
-	note snare1, 2
-	note snare4, 2
-	note snare3, 1
-	note snare1, 1
-	note snare4, 1
+	bass 2
+	snare3 1
+	snare4 1
+	snare1 2
+	snare4 2
+	snare3 1
+	snare1 1
+	snare4 1
 	speed 1
-	note snare2, 4
-	note snare2, 3
+	snare2 4
+	snare2 3
 	speed 7
 	Loop 4
-	note snare1, 1
+	snare1 1
 	EndLoop
 	Loop 5
-	note bass, 1
-	note snare3, 1
-	note snare4, 1
-	note snare1, 1
-	note snare3, 1
-	note bass, 1
-	note snare4, 2
-	note snare3, 1
-	note bass, 1
-	note snare3, 2
-	note snare1, 2
-	note snare4, 2
+	bass 1
+	snare3 1
+	snare4 1
+	snare1 1
+	snare3 1
+	bass 1
+	snare4 2
+	snare3 1
+	bass 1
+	snare3 2
+	snare1 2
+	snare4 2
 	EndLoop
-	note bass, 2
-	note snare3, 1
-	note snare1, 1
-	note snare3, 1
-	note bass, 1
-	note snare4, 2
-	note snare3, 1
-	note bass, 1
-	note snare4, 1
+	bass 2
+	snare3 1
+	snare1 1
+	snare3 1
+	bass 1
+	snare4 2
+	snare3 1
+	bass 1
+	snare4 1
 	speed 1
-	note snare2, 4
-	note snare2, 3
+	snare2 4
+	snare2 3
 	speed 7
 	Loop 4
-	note snare1, 1
+	snare1 1
 	EndLoop
 	Loop 3
 	music_call Branch_f5d39
@@ -1938,64 +1938,64 @@ Music_DuelTheme1_Ch4: ; f5c9a (3d:5c9a)
 	Loop 2
 	music_call Branch_f5d39
 	EndLoop
-	note bass, 2
-	note snare3, 1
-	note snare4, 1
-	note snare1, 2
-	note snare4, 2
-	note bass, 1
-	note snare3, 1
-	note snare4, 2
-	note snare1, 2
-	note snare5, 14
-	note snare1, 4
+	bass 2
+	snare3 1
+	snare4 1
+	snare1 2
+	snare4 2
+	bass 1
+	snare3 1
+	snare4 2
+	snare1 2
+	snare5 14
+	snare1 4
 	EndMainLoop
 
 Branch_f5d39:
-	note bass, 2
-	note snare3, 1
-	note snare4, 1
-	note snare1, 2
-	note snare4, 2
-	note bass, 1
-	note snare3, 1
-	note snare4, 2
-	note snare1, 1
-	note snare4, 1
-	rest 1
-	note snare3, 1
+	bass 2
+	snare3 1
+	snare4 1
+	snare1 2
+	snare4 2
+	bass 1
+	snare3 1
+	snare4 2
+	snare1 1
+	snare4 1
+	rest 1
+	snare3 1
 	music_ret
 
 Branch_f5d46:
-	note bass, 2
-	note snare3, 1
-	note snare4, 1
-	note snare1, 2
-	note snare4, 2
-	note snare3, 1
-	note snare1, 1
-	note snare4, 1
+	bass 2
+	snare3 1
+	snare4 1
+	snare1 2
+	snare4 2
+	snare3 1
+	snare1 1
+	snare4 1
 	speed 1
-	note snare2, 4
-	note snare2, 3
+	snare2 4
+	snare2 3
 	speed 7
-	note snare1, 1
-	note snare1, 1
-	note snare1, 2
+	snare1 1
+	snare1 1
+	snare1 2
 	music_ret
 
 Branch_f5d58:
-	note bass, 2
-	note snare3, 1
-	note snare4, 1
-	note snare1, 2
-	note snare4, 1
+	bass 2
+	snare3 1
+	snare4 1
+	snare1 2
+	snare4 1
 	speed 1
-	note snare2, 4
-	note snare2, 3
+	snare2 4
+	snare2 3
 	speed 7
 	Loop 8
-	note snare1, 1
+	snare1 1
 	EndLoop
 	music_ret
 ; 0xf5d68
diff --git a/audio/music/dueltheme2.asm b/audio/music/dueltheme2.asm
index e2ee7ce..2dc8816 100644
--- a/audio/music/dueltheme2.asm
+++ b/audio/music/dueltheme2.asm
@@ -8,423 +8,423 @@ Music_DuelTheme2_Ch1: ; f5d68 (3d:5d68)
 	duty 1
 	volume 148
 	Loop 8
-	note D_, 2
-	note D_, 1
+	D_ 2
+	D_ 1
 	EndLoop
 	MainLoop
 	octave 1
 	Loop 23
-	note D_, 2
-	note D_, 1
+	D_ 2
+	D_ 1
 	EndLoop
 	duty 1
 	volume 160
 	inc_octave
 	inc_octave
 	speed 1
-	note C_, 3
-	note D_, 4
-	note E_, 3
-	note F_, 4
-	note G_, 3
-	note A_, 4
-	note B_, 3
-	inc_octave
-	note C_, 3
+	C_ 3
+	D_ 4
+	E_ 3
+	F_ 4
+	G_ 3
+	A_ 4
+	B_ 3
+	inc_octave
+	C_ 3
 	speed 9
 	music_call Branch_f5f3d
-	note C_, 6
+	C_ 6
 	tie
 	speed 1
-	note C_, 12
+	C_ 12
 	volume 55
-	note C_, 6
+	C_ 6
 	volume 160
 	dec_octave
-	note B_, 12
+	B_ 12
 	volume 55
-	note B_, 6
+	B_ 6
 	volume 160
-	note G_, 12
+	G_ 12
 	volume 55
-	note G_, 6
+	G_ 6
 	speed 9
 	volume 160
 	musice8 8
-	note A_, 1
+	A_ 1
 	volume 55
-	note A_, 1
+	A_ 1
 	volume 160
 	musice8 6
-	note D_, 1
+	D_ 1
 	musice8 8
-	note D_, 9
+	D_ 9
 	tie
-	note D_, 9
+	D_ 9
 	volume 71
-	note D_, 3
+	D_ 3
 	duty 2
 	musice8 8
 	volume 47
-	note E_, 4
+	E_ 4
 	volume 96
-	note E_, 7
+	E_ 7
 	volume 39
-	note E_, 1
+	E_ 1
 	volume 95
-	note G_, 4
+	G_ 4
 	volume 128
 	speed 1
-	note G_, 12
+	G_ 12
 	volume 39
-	note G_, 6
+	G_ 6
 	inc_octave
 	speed 9
 	volume 127
 	musice8 8
-	note C_, 3
+	C_ 3
 	duty 1
 	volume 160
 	dec_octave
 	speed 1
-	note C_, 3
-	note D_, 4
-	note E_, 3
-	note F_, 4
-	note G_, 3
-	note A_, 4
-	note B_, 3
-	inc_octave
-	note C_, 3
+	C_ 3
+	D_ 4
+	E_ 3
+	F_ 4
+	G_ 3
+	A_ 4
+	B_ 3
+	inc_octave
+	C_ 3
 	speed 9
 	music_call Branch_f5f3d
 	musice8 8
-	note C_, 4
+	C_ 4
 	tie
 	speed 1
-	note C_, 4
-	note E_, 5
-	note F_, 4
-	note F#, 5
-	note G_, 12
+	C_ 4
+	E_ 5
+	F_ 4
+	F# 5
+	G_ 12
 	volume 55
-	note G_, 6
+	G_ 6
 	volume 160
-	note E_, 12
+	E_ 12
 	volume 55
-	note E_, 6
+	E_ 6
 	speed 9
 	volume 160
 	musice8 8
-	note C_, 1
+	C_ 1
 	volume 55
-	note C_, 1
+	C_ 1
 	volume 160
-	note D_, 1
+	D_ 1
 	volume 55
-	note D_, 1
+	D_ 1
 	dec_octave
 	volume 160
 	musice8 6
-	note A_, 1
+	A_ 1
 	inc_octave
 	musice8 8
-	note D_, 9
+	D_ 9
 	tie
-	note D_, 10
+	D_ 10
 	volume 55
-	note D_, 1
+	D_ 1
 	volume 160
 	speed 1
 	musice8 8
-	note D_, 4
-	note D#, 5
+	D_ 4
+	D# 5
 	speed 9
-	note E_, 11
+	E_ 11
 	volume 55
-	note E_, 1
+	E_ 1
 	volume 160
-	note G_, 5
+	G_ 5
 	volume 55
-	note G_, 1
+	G_ 1
 	volume 160
 	inc_octave
 	musice8 8
-	note C_, 3
+	C_ 3
 	dec_octave
 	speed 1
-	note C_, 3
-	note D_, 4
-	note E_, 3
-	note F_, 4
-	note G_, 3
-	note A_, 4
-	note B_, 3
-	inc_octave
-	note C_, 3
+	C_ 3
+	D_ 4
+	E_ 3
+	F_ 4
+	G_ 3
+	A_ 4
+	B_ 3
+	inc_octave
+	C_ 3
 	music_call Branch_f5f90
-	note D_, 1
+	D_ 1
 	volume 55
-	note D_, 1
+	D_ 1
 	duty 1
 	volume 148
 	octave 1
-	note D_, 1
+	D_ 1
 	Loop 3
-	note D_, 2
-	note D_, 1
+	D_ 2
+	D_ 1
 	EndLoop
 	duty 2
 	volume 107
 	inc_octave
 	inc_octave
-	note G_, 1
+	G_ 1
 	dec_octave
-	note B_, 1
+	B_ 1
 	inc_octave
-	note G_, 1
-	note A_, 1
-	note D_, 1
-	note A_, 1
-	note B_, 1
-	note D_, 1
-	note B_, 1
+	G_ 1
+	A_ 1
+	D_ 1
+	A_ 1
+	B_ 1
+	D_ 1
+	B_ 1
 	duty 1
 	volume 160
 	music_call Branch_f5f62
 	octave 4
 	volume 71
-	note F#, 12
+	F# 12
 	volume 160
-	note C#, 9
+	C# 9
 	volume 71
-	note C#, 1
+	C# 1
 	volume 160
-	note C#, 1
-	note D_, 1
-	note E_, 3
-	note D_, 3
-	note C#, 3
+	C# 1
+	D_ 1
+	E_ 3
+	D_ 3
+	C# 3
 	dec_octave
 	musice8 6
-	note B_, 3
+	B_ 3
 	musice8 8
-	note B_, 4
+	B_ 4
 	volume 71
-	note B_, 1
+	B_ 1
 	inc_octave
 	volume 160
 	speed 1
-	note C#, 4
+	C# 4
 	dec_octave
-	note B_, 5
+	B_ 5
 	speed 9
-	note A_, 6
+	A_ 6
 	volume 71
-	note A_, 1
+	A_ 1
 	duty 1
 	volume 147
 	musice8 8
-	note D_, 2
-	note D_, 2
+	D_ 2
+	D_ 2
 	rest 2
-	note C#, 2
+	C# 2
 	duty 1
 	volume 160
 	musice8 8
 	music_call Branch_f5f62
 	octave 4
 	volume 71
-	note F#, 6
+	F# 6
 	dec_octave
 	volume 160
-	note B_, 2
+	B_ 2
 	inc_octave
-	note C#, 2
-	note D_, 1
+	C# 2
+	D_ 1
 	volume 71
-	note D_, 1
+	D_ 1
 	volume 160
-	note D_, 9
+	D_ 9
 	volume 71
-	note D_, 1
+	D_ 1
 	volume 160
 	musice8 7
-	note C#, 1
-	note D_, 1
+	C# 1
+	D_ 1
 	musice8 8
-	note E_, 3
-	note D_, 3
-	note C#, 3
+	E_ 3
+	D_ 3
+	C# 3
 	dec_octave
 	musice8 6
-	note A_, 3
+	A_ 3
 	inc_octave
 	musice8 8
-	note F_, 10
+	F_ 10
 	musice8 7
-	note E_, 1
-	note F_, 1
+	E_ 1
+	F_ 1
 	musice8 8
-	note G_, 3
-	note F_, 3
-	note E_, 3
+	G_ 3
+	F_ 3
+	E_ 3
 	speed 1
-	note C_, 2
+	C_ 2
 	tie
-	note C_, 16
+	C_ 16
 	volume 71
-	note C_, 9
+	C_ 9
 	speed 9
 	volume 160
 	musice8 8
-	note A_, 10
+	A_ 10
 	musice8 7
-	note G_, 1
-	note F_, 1
+	G_ 1
+	F_ 1
 	musice8 8
-	note G_, 6
+	G_ 6
 	inc_octave
-	note C_, 3
+	C_ 3
 	dec_octave
 	speed 1
-	note C_, 3
-	note D_, 4
-	note E_, 3
-	note F_, 4
-	note G_, 3
-	note A_, 4
-	note B_, 3
-	inc_octave
-	note C_, 3
+	C_ 3
+	D_ 4
+	E_ 3
+	F_ 4
+	G_ 3
+	A_ 4
+	B_ 3
+	inc_octave
+	C_ 3
 	music_call Branch_f5f90
-	note D_, 1
+	D_ 1
 	volume 55
-	note D_, 1
+	D_ 1
 	duty 1
 	volume 148
 	octave 1
-	note D_, 1
+	D_ 1
 	Loop 3
-	note D_, 2
-	note D_, 1
+	D_ 2
+	D_ 1
 	EndLoop
 	duty 1
 	volume 160
 	musice8 8
 	octave 5
-	note D_, 1
-	note C_, 1
-	dec_octave
-	note A_, 1
-	inc_octave
-	note C_, 1
-	dec_octave
-	note A_, 1
-	note G_, 1
-	note A_, 1
-	note G_, 1
-	note F_, 1
-	note G_, 1
-	note F_, 1
-	note C_, 1
-	note D_, 12
+	D_ 1
+	C_ 1
+	dec_octave
+	A_ 1
+	inc_octave
+	C_ 1
+	dec_octave
+	A_ 1
+	G_ 1
+	A_ 1
+	G_ 1
+	F_ 1
+	G_ 1
+	F_ 1
+	C_ 1
+	D_ 12
 	tie
-	note D_, 12
+	D_ 12
 	duty 1
 	volume 148
 	EndMainLoop
 
 Branch_f5f3d:
 	musice8 8
-	note D_, 12
+	D_ 12
 	tie
-	note D_, 4
+	D_ 4
 	tie
 	speed 1
-	note D_, 7
+	D_ 7
 	volume 71
-	note D_, 2
+	D_ 2
 	tie
 	speed 9
-	note D_, 1
+	D_ 1
 	dec_octave
 	volume 160
-	note A_, 4
+	A_ 4
 	tie
 	speed 1
-	note A_, 7
+	A_ 7
 	volume 71
-	note A_, 2
+	A_ 2
 	tie
 	speed 9
-	note A_, 1
+	A_ 1
 	inc_octave
 	volume 160
-	note C_, 12
+	C_ 12
 	tie
 	music_ret
 
 Branch_f5f62:
 	octave 3
 	speed 1
-	note C#, 3
-	note D_, 4
-	note E_, 3
-	note F#, 4
-	note G_, 3
-	note A_, 4
-	note B_, 3
-	inc_octave
-	note C#, 3
+	C# 3
+	D_ 4
+	E_ 3
+	F# 4
+	G_ 3
+	A_ 4
+	B_ 3
+	inc_octave
+	C# 3
 	speed 9
-	note D_, 2
-	note C#, 2
+	D_ 2
+	C# 2
 	dec_octave
-	note A_, 2
-	note F#, 5
+	A_ 2
+	F# 5
 	volume 71
-	note F#, 1
+	F# 1
 	inc_octave
 	volume 160
-	note D_, 2
-	note C#, 2
-	dec_octave
-	note A_, 2
-	note F#, 2
-	note G_, 2
-	note A_, 2
-	note B_, 1
+	D_ 2
+	C# 2
+	dec_octave
+	A_ 2
+	F# 2
+	G_ 2
+	A_ 2
+	B_ 1
 	volume 71
-	note B_, 1
+	B_ 1
 	volume 160
 	inc_octave
 	musice8 6
-	note F#, 1
+	F# 1
 	musice8 8
-	note F#, 9
+	F# 9
 	music_ret
 
 Branch_f5f90:
 	octave 5
 	speed 9
 	Loop 3
-	note D_, 1
+	D_ 1
 	volume 55
-	note D_, 1
+	D_ 1
 	duty 1
 	volume 148
 	octave 1
-	note D_, 1
+	D_ 1
 	Loop 5
-	note D_, 2
-	note D_, 1
+	D_ 2
+	D_ 1
 	EndLoop
-	note D_, 2
+	D_ 2
 	duty 1
 	volume 160
 	octave 5
-	note C_, 4
+	C_ 4
 	EndLoop
 	music_ret
 
@@ -440,209 +440,209 @@ Music_DuelTheme2_Ch2: ; f5fad (3d:5fad)
 	volume 116
 	musice4 5
 	Loop 8
-	note D_, 2
-	note D_, 1
+	D_ 2
+	D_ 1
 	EndLoop
 	MainLoop
 	Loop 24
-	note D_, 2
-	note D_, 1
+	D_ 2
+	D_ 1
 	EndLoop
 	duty 2
 	volume 107
 	musice4 0
 	Loop 12
 	inc_octave
-	note D_, 1
+	D_ 1
 	dec_octave
-	note A_, 1
+	A_ 1
 	EndLoop
 	Loop 10
 	inc_octave
-	note C_, 1
+	C_ 1
 	dec_octave
-	note G_, 1
+	G_ 1
 	EndLoop
 	inc_octave
-	note C_, 1
-	note G_, 1
+	C_ 1
+	G_ 1
 	inc_octave
-	note C_, 1
-	note G_, 1
+	C_ 1
+	G_ 1
 	duty 1
 	volume 112
 	dec_octave
-	note D_, 1
+	D_ 1
 	rest 1
 	dec_octave
 	musice8 6
-	note A_, 1
+	A_ 1
 	musice8 8
-	note A_, 9
+	A_ 9
 	duty 2
 	volume 107
 	Loop 4
-	note A_, 1
-	note D_, 1
-	note A_, 1
+	A_ 1
+	D_ 1
+	A_ 1
 	EndLoop
 	duty 2
 	inc_octave
 	musice8 8
 	volume 47
-	note C_, 4
+	C_ 4
 	volume 96
-	note C_, 7
+	C_ 7
 	rest 1
 	volume 95
-	note E_, 4
+	E_ 4
 	speed 1
 	volume 128
-	note E_, 12
+	E_ 12
 	rest 6
 	speed 9
 	volume 127
-	note G_, 3
+	G_ 3
 	dec_octave
 	duty 1
 	volume 112
 	speed 1
-	note G_, 3
-	note A_, 4
-	note B_, 3
-	inc_octave
-	note C_, 4
-	note D_, 3
-	note E_, 4
-	note F_, 3
-	note G_, 3
+	G_ 3
+	A_ 4
+	B_ 3
+	inc_octave
+	C_ 4
+	D_ 3
+	E_ 4
+	F_ 3
+	G_ 3
 	speed 9
 	duty 2
 	volume 107
 	Loop 9
-	note A_, 1
-	note D_, 1
+	A_ 1
+	D_ 1
 	EndLoop
 	Loop 3
-	note D_, 1
+	D_ 1
 	dec_octave
-	note A_, 1
+	A_ 1
 	inc_octave
 	EndLoop
 	Loop 8
-	note G_, 1
-	note C_, 1
+	G_ 1
+	C_ 1
 	EndLoop
 	speed 1
-	note G_, 4
+	G_ 4
 	duty 1
 	volume 112
 	inc_octave
-	note C_, 5
-	note D_, 4
-	note D#, 5
+	C_ 5
+	D_ 4
+	D# 5
 	speed 1
-	note E_, 12
+	E_ 12
 	rest 6
-	note C_, 12
+	C_ 12
 	rest 6
 	speed 9
 	dec_octave
-	note G_, 1
+	G_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	musice8 6
-	note D_, 1
+	D_ 1
 	musice8 8
-	note A_, 9
+	A_ 9
 	duty 2
 	volume 107
 	Loop 5
-	note A_, 1
-	note D_, 1
+	A_ 1
+	D_ 1
 	EndLoop
-	note A_, 1
+	A_ 1
 	duty 1
 	volume 112
 	speed 1
-	note A#, 4
-	note B_, 5
+	A# 4
+	B_ 5
 	speed 9
 	inc_octave
-	note C_, 11
+	C_ 11
 	rest 1
-	note E_, 5
+	E_ 5
 	rest 1
-	note G_, 3
+	G_ 3
 	dec_octave
 	speed 1
-	note G_, 3
-	note A_, 4
-	note B_, 3
-	inc_octave
-	note C_, 4
-	note D_, 3
-	note E_, 4
-	note F_, 3
-	note G_, 3
+	G_ 3
+	A_ 4
+	B_ 3
+	inc_octave
+	C_ 4
+	D_ 3
+	E_ 4
+	F_ 3
+	G_ 3
 	music_call Branch_f618f
-	note A_, 1
+	A_ 1
 	rest 1
 	duty 1
 	volume 116
 	musice4 5
 	dec_octave
 	dec_octave
-	note D_, 1
+	D_ 1
 	Loop 3
-	note D_, 2
-	note D_, 1
+	D_ 2
+	D_ 1
 	EndLoop
 	duty 2
 	volume 107
 	musice4 0
 	inc_octave
-	note E_, 1
+	E_ 1
 	rest 1
-	note E_, 1
-	note F#, 1
+	E_ 1
+	F# 1
 	rest 1
-	note F#, 1
-	note G_, 1
+	F# 1
+	G_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	inc_octave
-	note C#, 1
+	C# 1
 	dec_octave
-	note E_, 1
+	E_ 1
 	inc_octave
-	note C#, 1
+	C# 1
 	duty 2
 	volume 107
 	music_call Branch_f6173
 	octave 4
 	Loop 4
-	note D_, 1
+	D_ 1
 	dec_octave
-	note G_, 1
-	note B_, 1
-	note D_, 1
-	note G_, 1
+	G_ 1
+	B_ 1
+	D_ 1
+	G_ 1
 	dec_octave
-	note B_, 1
+	B_ 1
 	inc_octave
 	inc_octave
 	EndLoop
 	Loop 2
-	note C#, 1
+	C# 1
 	dec_octave
-	note F#, 1
-	note A_, 1
-	note D_, 1
-	note F#, 1
+	F# 1
+	A_ 1
+	D_ 1
+	F# 1
 	dec_octave
-	note A_, 1
+	A_ 1
 	inc_octave
 	inc_octave
 	EndLoop
@@ -651,137 +651,137 @@ Music_DuelTheme2_Ch2: ; f5fad (3d:5fad)
 	octave 2
 	rest 1
 	musice8 8
-	note B_, 2
-	note B_, 2
+	B_ 2
+	B_ 2
 	rest 2
-	note A_, 2
+	A_ 2
 	inc_octave
 	musice8 8
-	note C#, 1
-	note D_, 1
-	note E_, 1
+	C# 1
+	D_ 1
+	E_ 1
 	duty 2
 	volume 107
 	music_call Branch_f6173
 	octave 3
 	Loop 2
-	note B_, 1
-	note D_, 1
-	note G_, 1
+	B_ 1
+	D_ 1
+	G_ 1
 	dec_octave
-	note B_, 1
+	B_ 1
 	inc_octave
-	note D_, 1
+	D_ 1
 	dec_octave
-	note G_, 1
+	G_ 1
 	inc_octave
 	EndLoop
 	Loop 2
 	inc_octave
-	note C#, 1
+	C# 1
 	dec_octave
-	note E_, 1
-	note A_, 1
-	note C#, 1
-	note E_, 1
+	E_ 1
+	A_ 1
+	C# 1
+	E_ 1
 	dec_octave
-	note A_, 1
+	A_ 1
 	inc_octave
 	EndLoop
 	Loop 2
 	inc_octave
-	note D_, 1
+	D_ 1
 	dec_octave
-	note F_, 1
-	note A_, 1
-	note D_, 1
-	note F_, 1
+	F_ 1
+	A_ 1
+	D_ 1
+	F_ 1
 	dec_octave
-	note A_, 1
+	A_ 1
 	inc_octave
 	EndLoop
 	Loop 2
 	inc_octave
-	note E_, 1
+	E_ 1
 	dec_octave
-	note G_, 1
+	G_ 1
 	inc_octave
-	note C_, 1
+	C_ 1
 	dec_octave
-	note E_, 1
-	note G_, 1
-	note C_, 1
+	E_ 1
+	G_ 1
+	C_ 1
 	EndLoop
 	inc_octave
-	note D_, 1
+	D_ 1
 	dec_octave
-	note F_, 1
-	note A_, 1
-	note D_, 1
-	note F_, 1
+	F_ 1
+	A_ 1
+	D_ 1
+	F_ 1
 	dec_octave
-	note A_, 1
+	A_ 1
 	inc_octave
 	inc_octave
-	note C_, 1
+	C_ 1
 	dec_octave
-	note F_, 1
-	note A_, 1
-	note D_, 1
-	note F_, 1
+	F_ 1
+	A_ 1
+	D_ 1
+	F_ 1
 	dec_octave
-	note A_, 1
+	A_ 1
 	inc_octave
 	inc_octave
-	note E_, 1
+	E_ 1
 	dec_octave
-	note G_, 1
+	G_ 1
 	inc_octave
-	note C_, 1
+	C_ 1
 	dec_octave
-	note E_, 1
-	note G_, 1
-	note C_, 1
+	E_ 1
+	G_ 1
+	C_ 1
 	inc_octave
-	note E_, 1
+	E_ 1
 	dec_octave
-	note G_, 1
+	G_ 1
 	inc_octave
-	note C_, 1
+	C_ 1
 	duty 1
 	volume 112
 	dec_octave
 	speed 1
-	note G_, 3
-	note A_, 4
-	note B_, 3
-	inc_octave
-	note C_, 4
-	note D_, 3
-	note E_, 4
-	note F_, 3
-	note G_, 3
+	G_ 3
+	A_ 4
+	B_ 3
+	inc_octave
+	C_ 4
+	D_ 3
+	E_ 4
+	F_ 3
+	G_ 3
 	music_call Branch_f618f
-	note A_, 1
+	A_ 1
 	rest 1
 	duty 1
 	volume 116
 	musice4 5
 	dec_octave
 	dec_octave
-	note D_, 1
+	D_ 1
 	Loop 3
-	note D_, 2
-	note D_, 1
+	D_ 2
+	D_ 1
 	EndLoop
 	rest 12
 	duty 1
 	volume 112
 	musice4 0
 	inc_octave
-	note A_, 12
+	A_ 12
 	tie
-	note A_, 12
+	A_ 12
 	dec_octave
 	duty 1
 	volume 116
@@ -791,26 +791,26 @@ Music_DuelTheme2_Ch2: ; f5fad (3d:5fad)
 Branch_f6173:
 	octave 4
 	Loop 4
-	note C#, 1
+	C# 1
 	dec_octave
-	note F#, 1
-	note A_, 1
-	note D_, 1
-	note F#, 1
+	F# 1
+	A_ 1
+	D_ 1
+	F# 1
 	dec_octave
-	note A_, 1
+	A_ 1
 	inc_octave
 	inc_octave
 	EndLoop
 	Loop 4
-	note D_, 1
+	D_ 1
 	dec_octave
-	note G_, 1
-	note B_, 1
-	note D_, 1
-	note G_, 1
+	G_ 1
+	B_ 1
+	D_ 1
+	G_ 1
 	dec_octave
-	note B_, 1
+	B_ 1
 	inc_octave
 	inc_octave
 	EndLoop
@@ -820,23 +820,23 @@ Branch_f618f:
 	octave 4
 	speed 9
 	Loop 3
-	note A_, 1
+	A_ 1
 	rest 1
 	volume 116
 	musice4 5
 	dec_octave
 	dec_octave
-	note D_, 1
+	D_ 1
 	Loop 5
-	note D_, 2
-	note D_, 1
+	D_ 2
+	D_ 1
 	EndLoop
-	note D_, 2
+	D_ 2
 	volume 112
 	musice4 0
 	inc_octave
 	inc_octave
-	note G_, 4
+	G_ 4
 	EndLoop
 	music_ret
 
@@ -862,64 +862,64 @@ Music_DuelTheme2_Ch3: ; f61ac (3d:61ac)
 	EndLoop
 	octave 1
 	musice8 4
-	note D_, 2
+	D_ 2
 	musice8 7
-	note C_, 3
-	note E_, 1
+	C_ 3
+	E_ 1
 	EndLoop
 	Loop 2
 	music_call Branch_f62e5
 	EndLoop
 	octave 1
 	musice8 8
-	note E_, 1
+	E_ 1
 	inc_octave
-	note E_, 1
+	E_ 1
 	dec_octave
-	note E_, 1
-	note F#, 1
+	E_ 1
+	F# 1
 	inc_octave
-	note F#, 1
+	F# 1
 	dec_octave
-	note F#, 1
-	note G_, 1
+	F# 1
+	G_ 1
 	inc_octave
-	note G_, 1
+	G_ 1
 	dec_octave
-	note G_, 1
-	note A_, 1
+	G_ 1
+	A_ 1
 	inc_octave
-	note A_, 1
+	A_ 1
 	dec_octave
-	note A_, 1
+	A_ 1
 	Loop 4
 	music_call Branch_f62e5
 	EndLoop
 	octave 1
 	Loop 4
 	musice8 4
-	note E_, 2
+	E_ 2
 	musice8 7
-	note E_, 1
+	E_ 1
 	inc_octave
-	note E_, 1
+	E_ 1
 	dec_octave
-	note E_, 1
+	E_ 1
 	inc_octave
-	note E_, 1
+	E_ 1
 	dec_octave
 	EndLoop
 	Loop 4
 	musice8 4
-	note A_, 2
+	A_ 2
 	musice8 7
-	note A_, 1
+	A_ 1
 	inc_octave
-	note A_, 1
+	A_ 1
 	dec_octave
-	note A_, 1
+	A_ 1
 	inc_octave
-	note A_, 1
+	A_ 1
 	dec_octave
 	EndLoop
 	Loop 2
@@ -927,125 +927,125 @@ Music_DuelTheme2_Ch3: ; f61ac (3d:61ac)
 	EndLoop
 	octave 1
 	musice8 8
-	note E_, 1
+	E_ 1
 	inc_octave
-	note E_, 1
+	E_ 1
 	dec_octave
-	note E_, 1
+	E_ 1
 	inc_octave
-	note E_, 1
+	E_ 1
 	dec_octave
-	note E_, 1
+	E_ 1
 	inc_octave
-	note E_, 1
+	E_ 1
 	dec_octave
-	note A_, 1
+	A_ 1
 	inc_octave
-	note E_, 1
+	E_ 1
 	dec_octave
-	note A_, 1
+	A_ 1
 	inc_octave
-	note A_, 1
+	A_ 1
 	dec_octave
-	note A_, 1
+	A_ 1
 	inc_octave
-	note A_, 1
+	A_ 1
 	Loop 4
 	music_call Branch_f62e5
 	EndLoop
 	octave 1
 	Loop 4
 	musice8 4
-	note E_, 2
+	E_ 2
 	musice8 7
-	note E_, 1
+	E_ 1
 	inc_octave
-	note E_, 1
+	E_ 1
 	dec_octave
-	note E_, 1
+	E_ 1
 	inc_octave
-	note E_, 1
+	E_ 1
 	dec_octave
 	EndLoop
 	Loop 2
 	musice8 4
-	note G_, 2
+	G_ 2
 	musice8 7
-	note G_, 1
+	G_ 1
 	inc_octave
-	note G_, 1
+	G_ 1
 	dec_octave
-	note G_, 1
+	G_ 1
 	inc_octave
-	note G_, 1
+	G_ 1
 	dec_octave
 	EndLoop
 	Loop 2
 	musice8 4
-	note A_, 2
+	A_ 2
 	musice8 7
-	note A_, 1
+	A_ 1
 	inc_octave
-	note A_, 1
+	A_ 1
 	dec_octave
-	note A_, 1
+	A_ 1
 	inc_octave
-	note A_, 1
+	A_ 1
 	dec_octave
 	EndLoop
 	Loop 2
 	musice8 4
-	note A#, 2
+	A# 2
 	musice8 7
-	note A#, 1
+	A# 1
 	inc_octave
-	note A#, 1
+	A# 1
 	dec_octave
-	note A#, 1
+	A# 1
 	inc_octave
-	note A#, 1
+	A# 1
 	dec_octave
 	EndLoop
 	inc_octave
 	Loop 2
 	musice8 4
-	note C_, 2
+	C_ 2
 	musice8 7
-	note C_, 1
+	C_ 1
 	inc_octave
-	note C_, 1
+	C_ 1
 	dec_octave
-	note C_, 1
+	C_ 1
 	inc_octave
-	note C_, 1
+	C_ 1
 	dec_octave
 	EndLoop
 	dec_octave
 	Loop 2
 	musice8 4
-	note A#, 2
+	A# 2
 	musice8 7
-	note A#, 1
+	A# 1
 	inc_octave
-	note A#, 1
+	A# 1
 	dec_octave
-	note A#, 1
+	A# 1
 	inc_octave
-	note A#, 1
+	A# 1
 	dec_octave
 	EndLoop
 	inc_octave
 	Loop 2
 	musice8 4
-	note C_, 2
+	C_ 2
 	musice8 7
-	note C_, 1
+	C_ 1
 	inc_octave
-	note C_, 1
+	C_ 1
 	dec_octave
-	note C_, 1
+	C_ 1
 	inc_octave
-	note C_, 1
+	C_ 1
 	dec_octave
 	EndLoop
 	Loop 3
@@ -1054,31 +1054,31 @@ Music_DuelTheme2_Ch3: ; f61ac (3d:61ac)
 	EndLoop
 	octave 1
 	musice8 4
-	note D_, 2
+	D_ 2
 	musice8 7
-	note C_, 3
-	note E_, 1
+	C_ 3
+	E_ 1
 	EndLoop
 	Loop 2
 	music_call Branch_f62e5
 	EndLoop
 	octave 2
 	musice8 8
-	note D_, 1
-	note C_, 1
+	D_ 1
+	C_ 1
 	dec_octave
-	note A_, 1
+	A_ 1
 	inc_octave
-	note C_, 1
+	C_ 1
 	dec_octave
-	note A_, 1
-	note G_, 1
-	note A_, 1
-	note G_, 1
-	note F_, 1
-	note G_, 1
-	note F_, 1
-	note C_, 1
+	A_ 1
+	G_ 1
+	A_ 1
+	G_ 1
+	F_ 1
+	G_ 1
+	F_ 1
+	C_ 1
 	Loop 4
 	music_call Branch_f62e5
 	EndLoop
@@ -1087,15 +1087,15 @@ Music_DuelTheme2_Ch3: ; f61ac (3d:61ac)
 Branch_f62e5:
 	octave 1
 	musice8 4
-	note D_, 2
+	D_ 2
 	musice8 7
-	note D_, 1
+	D_ 1
 	inc_octave
-	note D_, 1
+	D_ 1
 	dec_octave
-	note D_, 1
+	D_ 1
 	inc_octave
-	note D_, 1
+	D_ 1
 	music_ret
 
 
@@ -1108,19 +1108,19 @@ Music_DuelTheme2_Ch4: ; f62f3 (3d:62f3)
 	rest 12
 	rest 6
 	Loop 6
-	note snare1, 1
+	snare1 1
 	EndLoop
 	Loop 3
 	music_call Branch_f637c
 	EndLoop
-	note bass, 1
-	note snare3, 1
-	note snare3, 1
-	note snare1, 1
-	note snare3, 1
-	note snare4, 1
+	bass 1
+	snare3 1
+	snare3 1
+	snare1 1
+	snare3 1
+	snare4 1
 	Loop 6
-	note snare1, 1
+	snare1 1
 	EndLoop
 	Loop 15
 	music_call Branch_f637c
@@ -1129,48 +1129,48 @@ Music_DuelTheme2_Ch4: ; f62f3 (3d:62f3)
 	Loop 3
 	music_call Branch_f637c
 	Loop 6
-	note snare1, 1
+	snare1 1
 	EndLoop
-	note snare1, 2
-	note snare5, 3
-	note snare1, 1
+	snare1 2
+	snare5 3
+	snare1 1
 	EndLoop
-	note bass, 1
-	note snare3, 1
-	note snare3, 1
-	note snare1, 1
-	note snare3, 1
-	note snare3, 1
-	note bass, 1
-	note snare3, 1
+	bass 1
+	snare3 1
+	snare3 1
+	snare1 1
+	snare3 1
+	snare3 1
+	bass 1
+	snare3 1
 	speed 1
-	note snare3, 4
-	note snare2, 5
+	snare3 4
+	snare2 5
 	speed 9
-	note snare1, 3
+	snare1 3
 	Loop 12
-	note snare1, 1
+	snare1 1
 	EndLoop
 	Loop 3
 	music_call Branch_f637c
 	music_call Branch_f6389
 	EndLoop
 	music_call Branch_f637c
-	note bass, 1
-	note snare1, 1
-	note bass, 1
-	note snare1, 1
-	note snare1, 1
-	note bass, 1
-	note bass, 1
-	note snare1, 1
+	bass 1
+	snare1 1
+	bass 1
+	snare1 1
+	snare1 1
+	bass 1
+	bass 1
+	snare1 1
 	speed 1
-	note snare2, 4
-	note snare2, 5
+	snare2 4
+	snare2 5
 	speed 9
-	note snare1, 1
-	note snare1, 1
-	note snare1, 1
+	snare1 1
+	snare1 1
+	snare1 1
 	Loop 4
 	music_call Branch_f637c
 	music_call Branch_f6389
@@ -1180,59 +1180,59 @@ Music_DuelTheme2_Ch4: ; f62f3 (3d:62f3)
 	Loop 3
 	music_call Branch_f637c
 	Loop 6
-	note snare1, 1
+	snare1 1
 	EndLoop
-	note snare1, 2
-	note snare5, 3
-	note snare1, 1
+	snare1 2
+	snare5 3
+	snare1 1
 	EndLoop
 	music_call Branch_f637c
 	Loop 12
-	note snare1, 1
+	snare1 1
 	EndLoop
-	note snare5, 12
+	snare5 12
 	rest 12
 	EndMainLoop
 
 Branch_f637c:
-	note bass, 1
-	note snare3, 1
-	note snare3, 1
-	note snare1, 1
-	note snare3, 1
-	note snare3, 1
-	note bass, 1
-	note snare3, 1
-	note snare3, 1
-	note snare1, 1
-	note snare3, 1
-	note snare4, 1
+	bass 1
+	snare3 1
+	snare3 1
+	snare1 1
+	snare3 1
+	snare3 1
+	bass 1
+	snare3 1
+	snare3 1
+	snare1 1
+	snare3 1
+	snare4 1
 	music_ret
 
 Branch_f6389:
-	note bass, 1
-	note snare3, 1
-	note snare3, 1
-	note snare1, 1
-	note snare3, 1
-	note snare3, 1
-	note bass, 1
-	note snare3, 1
-	note snare3, 1
-	note snare1, 1
-	note snare3, 1
-	note snare1, 1
+	bass 1
+	snare3 1
+	snare3 1
+	snare1 1
+	snare3 1
+	snare3 1
+	bass 1
+	snare3 1
+	snare3 1
+	snare1 1
+	snare3 1
+	snare1 1
 	music_ret
 
 Branch_f6396:
-	note bass, 1
-	note snare3, 1
-	note snare3, 1
-	note snare1, 1
-	note snare3, 1
-	note snare3, 1
+	bass 1
+	snare3 1
+	snare3 1
+	snare1 1
+	snare3 1
+	snare3 1
 	Loop 6
-	note snare1, 1
+	snare1 1
 	EndLoop
 	music_ret
 ; 0xf63a1
diff --git a/audio/music/dueltheme3.asm b/audio/music/dueltheme3.asm
index 8be1c37..55ed4e1 100644
--- a/audio/music/dueltheme3.asm
+++ b/audio/music/dueltheme3.asm
@@ -10,13 +10,13 @@ Music_DuelTheme3_Ch1: ; f63a1 (3d:63a1)
 	Loop 4
 	Loop 4
 	volume 146
-	note F#, 2
+	F# 2
 	rest 1
 	EndLoop
 	volume 144
-	note E_, 2
+	E_ 2
 	volume 149
-	note F_, 2
+	F_ 2
 	EndLoop
 	Loop 4
 	music_call Branch_f67b2
@@ -25,20 +25,20 @@ Music_DuelTheme3_Ch1: ; f63a1 (3d:63a1)
 	volume 160
 	Loop 2
 	octave 3
-	note C#, 1
-	note F#, 1
+	C# 1
+	F# 1
 	speed 1
-	note G#, 5
+	G# 5
 	volume 55
-	note G#, 6
+	G# 6
 	music_call Branch_f65a7
 	octave 3
-	note D_, 1
-	note F#, 1
+	D_ 1
+	F# 1
 	speed 1
-	note B_, 5
+	B_ 5
 	volume 55
-	note B_, 6
+	B_ 6
 	music_call Branch_f65a7
 	EndLoop
 	duty 0
@@ -46,42 +46,42 @@ Music_DuelTheme3_Ch1: ; f63a1 (3d:63a1)
 	dec_octave
 	rest 2
 	speed 1
-	note E_, 5
+	E_ 5
 	volume 39
-	note E_, 6
+	E_ 6
 	music_call Branch_f65cf
-	note F#, 5
+	F# 5
 	volume 39
-	note F#, 6
+	F# 6
 	speed 11
 	rest 1
 	dec_octave
 	duty 0
 	volume 163
 	speed 1
-	note E_, 5
+	E_ 5
 	volume 39
-	note E_, 6
+	E_ 6
 	music_call Branch_f65cf
 	speed 11
 	duty 1
 	volume 160
 	Loop 2
 	octave 3
-	note C#, 1
-	note F#, 1
+	C# 1
+	F# 1
 	speed 1
-	note G#, 5
+	G# 5
 	volume 55
-	note G#, 6
+	G# 6
 	music_call Branch_f65a7
 	octave 3
-	note D_, 1
-	note F#, 1
+	D_ 1
+	F# 1
 	speed 1
-	note B_, 5
+	B_ 5
 	volume 55
-	note B_, 6
+	B_ 6
 	volume 160
 	music_call Branch_f65a7
 	EndLoop
@@ -91,21 +91,21 @@ Music_DuelTheme3_Ch1: ; f63a1 (3d:63a1)
 	octave 2
 	rest 4
 	volume 144
-	note F#, 2
+	F# 2
 	volume 39
-	note F#, 2
+	F# 2
 	rest 2
 	volume 144
-	note E_, 2
+	E_ 2
 	volume 39
-	note E_, 4
+	E_ 4
 	volume 144
-	note D#, 2
+	D# 2
 	volume 39
-	note D#, 4
+	D# 4
 	volume 144
-	note D_, 2
-	note C#, 2
+	D_ 2
+	C# 2
 	EndLoop
 	vibrato_delay 20
 	duty 2
@@ -115,235 +115,235 @@ Music_DuelTheme3_Ch1: ; f63a1 (3d:63a1)
 	EndLoop
 	octave 4
 	volume 112
-	note C#, 5
+	C# 5
 	volume 39
-	note C#, 6
+	C# 6
 	volume 112
-	note F#, 5
+	F# 5
 	volume 39
-	note F#, 6
+	F# 6
 	Loop 3
 	music_call Branch_f661d
 	EndLoop
 	octave 4
 	volume 112
-	note C#, 5
+	C# 5
 	volume 39
-	note C#, 6
+	C# 6
 	volume 112
-	note F#, 5
+	F# 5
 	volume 39
-	note F#, 6
+	F# 6
 	inc_octave
 	volume 112
-	note C#, 5
+	C# 5
 	volume 39
-	note C#, 6
+	C# 6
 	dec_octave
 	volume 112
-	note F#, 5
+	F# 5
 	volume 39
-	note F#, 6
+	F# 6
 	dec_octave
 	speed 11
 	duty 1
 	volume 144
 	musice8 8
-	note D_, 2
-	note C#, 2
+	D_ 2
+	C# 2
 	dec_octave
-	note F#, 3
+	F# 3
 	inc_octave
 	speed 1
-	note D_, 3
-	note D#, 2
-	note E_, 3
-	note F_, 3
+	D_ 3
+	D# 2
+	E_ 3
+	F_ 3
 	speed 11
-	note F#, 4
+	F# 4
 	dec_octave
-	note G#, 3
+	G# 3
 	inc_octave
 	speed 1
-	note E_, 3
-	note F_, 2
-	note F#, 3
-	note G_, 3
+	E_ 3
+	F_ 2
+	F# 3
+	G_ 3
 	speed 11
-	note G#, 4
+	G# 4
 	duty 0
 	octave 2
 	Loop 2
 	Loop 4
 	volume 144
-	note F#, 1
+	F# 1
 	volume 55
-	note F#, 1
+	F# 1
 	rest 1
 	EndLoop
 	volume 144
-	note F#, 1
+	F# 1
 	volume 55
-	note F#, 1
+	F# 1
 	volume 144
-	note F#, 1
+	F# 1
 	volume 55
-	note F#, 1
+	F# 1
 	Loop 4
 	volume 144
-	note G_, 1
+	G_ 1
 	volume 55
-	note G_, 1
+	G_ 1
 	rest 1
 	EndLoop
 	volume 144
-	note A_, 1
+	A_ 1
 	volume 55
-	note A_, 1
+	A_ 1
 	volume 144
-	note G_, 1
+	G_ 1
 	volume 55
-	note G_, 1
+	G_ 1
 	EndLoop
 	duty 1
 	volume 160
 	octave 3
-	note C#, 1
-	note F#, 1
+	C# 1
+	F# 1
 	speed 1
-	note G#, 5
+	G# 5
 	volume 55
-	note G#, 6
+	G# 6
 	music_call Branch_f65a7
 	octave 3
-	note C#, 1
-	note F#, 1
+	C# 1
+	F# 1
 	speed 1
-	note G#, 5
+	G# 5
 	volume 55
-	note G#, 6
+	G# 6
 	inc_octave
 	volume 160
 	speed 11
-	note C#, 9
+	C# 9
 	volume 55
-	note C#, 2
+	C# 2
 	dec_octave
 	volume 160
-	note B_, 1
+	B_ 1
 	inc_octave
-	note C#, 1
-	note F#, 1
-	note C#, 1
+	C# 1
+	F# 1
+	C# 1
 	dec_octave
 	speed 1
-	note B_, 5
+	B_ 5
 	volume 55
-	note B_, 6
+	B_ 6
 	speed 11
 	volume 160
-	note F#, 9
+	F# 9
 	volume 55
-	note F#, 4
+	F# 4
 	volume 160
-	note G#, 1
-	note A_, 1
+	G# 1
+	A_ 1
 	speed 1
-	note G#, 5
+	G# 5
 	volume 55
-	note G#, 6
+	G# 6
 	volume 160
 	speed 11
-	note B_, 8
+	B_ 8
 	volume 55
-	note B_, 1
+	B_ 1
 	volume 160
-	note A_, 2
-	note B_, 1
+	A_ 2
+	B_ 1
 	tie
 	speed 1
-	note B_, 5
+	B_ 5
 	volume 55
-	note B_, 6
+	B_ 6
 	speed 11
 	inc_octave
 	volume 160
-	note C#, 1
-	note D_, 1
+	C# 1
+	D_ 1
 	speed 1
-	note C#, 5
+	C# 5
 	volume 55
-	note C#, 6
+	C# 6
 	volume 160
 	speed 11
-	note E_, 10
+	E_ 10
 	volume 55
-	note E_, 1
+	E_ 1
 	volume 160
-	note D_, 1
+	D_ 1
 	speed 1
-	note C#, 8
+	C# 8
 	volume 55
-	note C#, 3
+	C# 3
 	dec_octave
 	volume 160
 	speed 11
-	note B_, 1
+	B_ 1
 	inc_octave
-	note C#, 1
+	C# 1
 	dec_octave
 	speed 1
-	note B_, 5
+	B_ 5
 	volume 55
-	note B_, 6
+	B_ 6
 	speed 11
 	volume 160
-	note E_, 10
+	E_ 10
 	volume 55
-	note E_, 3
+	E_ 3
 	volume 31
-	note A_, 3
+	A_ 3
 	volume 96
-	note A_, 5
+	A_ 5
 	inc_octave
 	volume 63
-	note E_, 3
+	E_ 3
 	volume 127
-	note E_, 3
+	E_ 3
 	volume 160
-	note E_, 2
+	E_ 2
 	duty 1
 	Loop 4
 	Loop 4
 	volume 144
-	note G#, 1
+	G# 1
 	volume 55
-	note G#, 1
+	G# 1
 	rest 1
 	EndLoop
 	volume 144
-	note G#, 1
+	G# 1
 	volume 55
-	note G#, 1
+	G# 1
 	volume 144
-	note G#, 1
+	G# 1
 	volume 55
-	note G#, 1
+	G# 1
 	Loop 4
 	volume 144
-	note A_, 1
+	A_ 1
 	volume 55
-	note A_, 1
+	A_ 1
 	rest 1
 	EndLoop
 	volume 144
-	note A_, 1
+	A_ 1
 	volume 55
-	note A_, 1
+	A_ 1
 	volume 144
-	note A_, 1
+	A_ 1
 	volume 55
-	note A_, 1
+	A_ 1
 	EndLoop
 	EndMainLoop
 
@@ -351,31 +351,31 @@ Branch_f65a7:
 	speed 11
 	octave 4
 	volume 160
-	note C#, 5
+	C# 5
 	tie
-	note C#, 4
+	C# 4
 	volume 55
-	note C#, 2
+	C# 2
 	dec_octave
 	volume 160
-	note B_, 1
+	B_ 1
 	inc_octave
-	note C#, 1
-	note F#, 1
-	note C#, 1
+	C# 1
+	F# 1
+	C# 1
 	dec_octave
 	speed 1
-	note B_, 5
+	B_ 5
 	volume 55
-	note B_, 6
+	B_ 6
 	speed 11
 	volume 160
 	inc_octave
-	note C#, 5
+	C# 5
 	tie
-	note C#, 4
+	C# 4
 	volume 55
-	note C#, 4
+	C# 4
 	volume 160
 	music_ret
 
@@ -386,90 +386,90 @@ Branch_f65cf:
 	rest 2
 	speed 1
 	volume 163
-	note E_, 5
+	E_ 5
 	volume 39
-	note E_, 6
+	E_ 6
 	EndLoop
 	duty 2
 	volume 128
-	note D_, 5
-	note G_, 6
-	note B_, 5
+	D_ 5
+	G_ 6
+	B_ 5
 	inc_octave
-	note D_, 6
+	D_ 6
 	dec_octave
-	note G_, 5
-	note B_, 6
+	G_ 5
+	B_ 6
 	inc_octave
-	note D_, 5
-	note G_, 6
-	note F#, 5
+	D_ 5
+	G_ 6
+	F# 5
 	volume 39
-	note F#, 6
+	F# 6
 	duty 0
 	volume 163
 	speed 11
 	rest 1
 	dec_octave
 	speed 1
-	note E_, 5
+	E_ 5
 	volume 39
-	note E_, 6
+	E_ 6
 	Loop 3
 	speed 11
 	rest 2
 	speed 1
 	volume 163
-	note E_, 5
+	E_ 5
 	volume 39
-	note E_, 6
+	E_ 6
 	EndLoop
 	dec_octave
 	duty 2
 	volume 128
-	note B_, 5
+	B_ 5
 	inc_octave
-	note E_, 6
-	note G_, 5
-	note B_, 6
-	note E_, 5
-	note G_, 6
-	note B_, 5
+	E_ 6
+	G_ 5
+	B_ 6
+	E_ 5
+	G_ 6
+	B_ 5
 	inc_octave
-	note E_, 6
+	E_ 6
 	music_ret
 
 Branch_f661d:
 	octave 4
 	speed 1
 	volume 112
-	note C#, 5
+	C# 5
 	volume 39
-	note C#, 6
+	C# 6
 	volume 112
-	note F#, 5
+	F# 5
 	volume 39
-	note F#, 6
+	F# 6
 	inc_octave
 	volume 112
-	note C#, 5
+	C# 5
 	volume 39
-	note C#, 6
+	C# 6
 	dec_octave
 	volume 112
-	note F#, 5
+	F# 5
 	volume 39
-	note F#, 6
+	F# 6
 	inc_octave
 	volume 112
-	note C#, 5
+	C# 5
 	volume 39
-	note C#, 6
+	C# 6
 	dec_octave
 	volume 112
-	note F#, 5
+	F# 5
 	volume 39
-	note F#, 6
+	F# 6
 	music_ret
 
 
@@ -486,22 +486,22 @@ Music_DuelTheme3_Ch2: ; f6649 (3d:6649)
 	Loop 4
 	Loop 4
 	volume 130
-	note F#, 2
+	F# 2
 	rest 1
 	EndLoop
 	volume 128
-	note E_, 2
+	E_ 2
 	volume 133
-	note F_, 2
+	F_ 2
 	EndLoop
 	musice4 0
 	octave 3
 	Loop 4
 	rest 6
 	volume 163
-	note E_, 1
+	E_ 1
 	volume 39
-	note E_, 1
+	E_ 1
 	rest 8
 	EndLoop
 	Loop 2
@@ -517,29 +517,29 @@ Music_DuelTheme3_Ch2: ; f6649 (3d:6649)
 	speed 11
 	rest 1
 	speed 1
-	note C#, 5
+	C# 5
 	volume 39
-	note C#, 6
+	C# 6
 	volume 163
-	note A_, 5
+	A_ 5
 	volume 39
-	note A_, 6
+	A_ 6
 	music_call Branch_f6866
 	octave 4
-	note C#, 5
+	C# 5
 	volume 39
-	note C#, 6
+	C# 6
 	dec_octave
 	dec_octave
 	duty 0
 	volume 163
-	note C#, 5
+	C# 5
 	volume 39
-	note C#, 6
+	C# 6
 	volume 163
-	note A_, 5
+	A_ 5
 	volume 39
-	note A_, 6
+	A_ 6
 	music_call Branch_f6866
 	duty 0
 	volume 144
@@ -555,158 +555,158 @@ Music_DuelTheme3_Ch2: ; f6649 (3d:6649)
 	Loop 4
 	volume 163
 	musice8 6
-	note F#, 1
-	note F#, 1
+	F# 1
+	F# 1
 	musice8 8
 	speed 1
-	note F#, 5
+	F# 5
 	volume 39
-	note F#, 6
+	F# 6
 	volume 163
 	musice8 6
 	speed 11
-	note F#, 1
+	F# 1
 	inc_octave
 	volume 144
 	musice8 8
-	note C#, 2
+	C# 2
 	dec_octave
 	volume 163
 	musice8 6
-	note F#, 1
-	note F#, 1
+	F# 1
+	F# 1
 	speed 1
 	musice8 8
-	note F#, 5
+	F# 5
 	volume 39
-	note F#, 6
+	F# 6
 	volume 163
 	musice8 6
 	speed 11
-	note F#, 1
+	F# 1
 	volume 144
 	musice8 8
-	note B_, 2
+	B_ 2
 	volume 163
 	musice8 6
-	note F#, 1
-	note F#, 1
+	F# 1
+	F# 1
 	musice8 8
 	speed 1
-	note F#, 5
+	F# 5
 	volume 39
-	note F#, 6
+	F# 6
 	volume 163
 	musice8 6
 	speed 11
-	note F#, 1
+	F# 1
 	volume 144
 	musice8 8
-	note B_, 2
+	B_ 2
 	volume 163
 	musice8 6
-	note F#, 1
-	note F#, 1
+	F# 1
+	F# 1
 	speed 1
 	musice8 8
-	note F#, 5
+	F# 5
 	volume 39
-	note F#, 6
+	F# 6
 	volume 163
 	musice8 6
 	speed 11
-	note F#, 1
+	F# 1
 	musice8 8
 	volume 144
-	note A_, 2
-	note G#, 2
+	A_ 2
+	G# 2
 	EndLoop
 	vibrato_delay 20
-	note D_, 3
+	D_ 3
 	speed 1
-	note A#, 3
-	note B_, 2
+	A# 3
+	B_ 2
 	inc_octave
-	note C_, 3
-	note C#, 3
+	C_ 3
+	C# 3
 	speed 11
-	note D_, 4
+	D_ 4
 	dec_octave
-	note E_, 3
+	E_ 3
 	inc_octave
 	speed 1
-	note C_, 3
-	note C#, 2
-	note D_, 3
-	note D#, 3
+	C_ 3
+	C# 2
+	D_ 3
+	D# 3
 	speed 11
-	note E_, 4
+	E_ 4
 	octave 3
 	Loop 6
 	Loop 4
 	volume 144
-	note C#, 1
+	C# 1
 	volume 55
-	note C#, 1
+	C# 1
 	rest 1
 	EndLoop
 	volume 144
-	note C#, 1
+	C# 1
 	volume 55
-	note C#, 1
+	C# 1
 	volume 144
-	note C#, 1
+	C# 1
 	volume 55
-	note C#, 1
+	C# 1
 	Loop 4
 	volume 144
-	note D_, 1
+	D_ 1
 	volume 55
-	note D_, 1
+	D_ 1
 	rest 1
 	EndLoop
 	volume 144
-	note E_, 1
+	E_ 1
 	volume 55
-	note E_, 1
+	E_ 1
 	volume 144
-	note D_, 1
+	D_ 1
 	volume 55
-	note D_, 1
+	D_ 1
 	EndLoop
 	duty 1
 	inc_octave
 	Loop 4
 	Loop 4
 	volume 128
-	note E_, 1
+	E_ 1
 	volume 55
-	note E_, 1
+	E_ 1
 	rest 1
 	EndLoop
 	volume 128
-	note E_, 1
+	E_ 1
 	volume 55
-	note E_, 1
+	E_ 1
 	volume 128
-	note E_, 1
+	E_ 1
 	volume 55
-	note E_, 1
+	E_ 1
 	Loop 4
 	volume 128
-	note D_, 1
+	D_ 1
 	volume 55
-	note D_, 1
+	D_ 1
 	rest 1
 	EndLoop
 	volume 128
-	note D_, 1
+	D_ 1
 	volume 55
-	note D_, 1
+	D_ 1
 	volume 128
-	note D_, 1
+	D_ 1
 	volume 55
-	note D_, 1
+	D_ 1
 	EndLoop
 	EndMainLoop
 
@@ -716,59 +716,59 @@ Branch_f67b2:
 	speed 11
 	rest 1
 	speed 1
-	note F#, 5
+	F# 5
 	volume 39
-	note F#, 6
+	F# 6
 	volume 163
-	note A_, 5
+	A_ 5
 	volume 39
-	note A_, 6
+	A_ 6
 	volume 163
-	note F#, 5
+	F# 5
 	volume 39
-	note F#, 6
+	F# 6
 	volume 163
 	speed 11
 	rest 1
 	speed 1
-	note F#, 5
+	F# 5
 	volume 55
-	note F#, 6
+	F# 6
 	inc_octave
 	volume 163
 	speed 11
-	note C_, 1
+	C_ 1
 	dec_octave
 	speed 1
-	note B_, 5
+	B_ 5
 	volume 39
-	note B_, 6
+	B_ 6
 	speed 11
 	rest 1
 	speed 1
 	volume 163
-	note A_, 5
+	A_ 5
 	volume 39
-	note A_, 6
+	A_ 6
 	speed 11
 	rest 1
 	speed 1
 	volume 163
-	note B_, 5
+	B_ 5
 	volume 39
-	note B_, 6
+	B_ 6
 	volume 163
-	note A_, 4
-	note B_, 4
-	note A_, 3
-	note F#, 5
+	A_ 4
+	B_ 4
+	A_ 3
+	F# 5
 	volume 39
-	note F#, 6
+	F# 6
 	speed 11
 	volume 144
-	note E_, 1
+	E_ 1
 	volume 163
-	note F_, 1
+	F_ 1
 	music_ret
 
 Branch_f680a:
@@ -777,63 +777,63 @@ Branch_f680a:
 	speed 11
 	rest 1
 	speed 1
-	note G_, 5
+	G_ 5
 	volume 39
-	note G_, 6
+	G_ 6
 	volume 163
-	note B_, 5
+	B_ 5
 	volume 39
-	note B_, 6
+	B_ 6
 	volume 163
-	note G_, 5
+	G_ 5
 	volume 39
-	note G_, 6
+	G_ 6
 	speed 11
 	rest 1
 	speed 1
 	volume 163
-	note G_, 5
+	G_ 5
 	volume 39
-	note G_, 6
+	G_ 6
 	inc_octave
 	volume 163
 	speed 11
-	note C#, 1
+	C# 1
 	speed 1
-	note C_, 5
+	C_ 5
 	volume 39
-	note C_, 6
+	C_ 6
 	volume 163
 	speed 11
 	rest 1
 	dec_octave
 	speed 1
-	note B_, 5
+	B_ 5
 	volume 39
-	note B_, 6
+	B_ 6
 	speed 11
 	rest 1
 	inc_octave
 	speed 1
 	volume 163
-	note C#, 5
+	C# 5
 	volume 39
-	note C#, 6
+	C# 6
 	dec_octave
 	volume 163
-	note B_, 4
+	B_ 4
 	inc_octave
-	note C#, 4
+	C# 4
 	dec_octave
-	note B_, 3
-	note G_, 5
+	B_ 3
+	G_ 5
 	volume 39
-	note G_, 6
+	G_ 6
 	speed 11
 	volume 144
-	note B_, 1
+	B_ 1
 	volume 163
-	note G_, 1
+	G_ 1
 	music_ret
 
 Branch_f6866:
@@ -843,66 +843,66 @@ Branch_f6866:
 	rest 1
 	speed 1
 	volume 163
-	note C#, 5
+	C# 5
 	volume 39
-	note C#, 6
+	C# 6
 	volume 163
-	note A_, 5
+	A_ 5
 	volume 39
-	note A_, 6
+	A_ 6
 	EndLoop
 	duty 2
 	volume 112
-	note B_, 5
+	B_ 5
 	inc_octave
-	note D_, 6
-	note G_, 5
-	note B_, 6
-	note D_, 5
-	note G_, 6
-	note B_, 5
+	D_ 6
+	G_ 5
+	B_ 6
+	D_ 5
+	G_ 6
+	B_ 5
 	inc_octave
-	note D_, 6
-	note C#, 5
+	D_ 6
+	C# 5
 	volume 39
-	note C#, 6
+	C# 6
 	dec_octave
 	dec_octave
 	duty 0
 	volume 163
-	note C#, 5
+	C# 5
 	volume 39
-	note C#, 6
+	C# 6
 	volume 163
-	note A_, 5
+	A_ 5
 	volume 39
-	note A_, 6
+	A_ 6
 	Loop 3
 	speed 11
 	rest 1
 	speed 1
 	volume 163
-	note C#, 5
+	C# 5
 	volume 39
-	note C#, 6
+	C# 6
 	volume 163
-	note A_, 5
+	A_ 5
 	volume 39
-	note A_, 6
+	A_ 6
 	EndLoop
 	duty 2
 	volume 112
-	note G_, 5
-	note B_, 6
+	G_ 5
+	B_ 6
 	inc_octave
-	note E_, 5
-	note G_, 6
+	E_ 5
+	G_ 6
 	dec_octave
-	note B_, 5
+	B_ 5
 	inc_octave
-	note E_, 6
-	note G_, 5
-	note B_, 6
+	E_ 6
+	G_ 5
+	B_ 6
 	inc_octave
 	music_ret
 
@@ -921,12 +921,12 @@ Music_DuelTheme3_Ch3: ; f68c2 (3d:68c2)
 	Loop 4
 	Loop 4
 	musice8 4
-	note F#, 2
+	F# 2
 	rest 1
 	EndLoop
 	musice8 8
-	note E_, 2
-	note F_, 2
+	E_ 2
+	F_ 2
 	EndLoop
 	Loop 4
 	music_call Branch_f6973
@@ -937,17 +937,17 @@ Music_DuelTheme3_Ch3: ; f68c2 (3d:68c2)
 	octave 1
 	Loop 2
 	Loop 4
-	note F#, 1
+	F# 1
 	rest 2
 	EndLoop
-	note G_, 2
-	note G_, 2
+	G_ 2
+	G_ 2
 	Loop 4
-	note F#, 1
+	F# 1
 	rest 2
 	EndLoop
-	note E_, 2
-	note F_, 2
+	E_ 2
+	F_ 2
 	EndLoop
 	Loop 2
 	music_call Branch_f6992
@@ -959,262 +959,262 @@ Music_DuelTheme3_Ch3: ; f68c2 (3d:68c2)
 	speed 11
 	octave 3
 	musice8 8
-	note D_, 2
-	note C#, 2
+	D_ 2
+	C# 2
 	dec_octave
 	dec_octave
 	EndLoop
 	music_call Branch_f69f0
 	octave 1
 	musice8 8
-	note F#, 2
-	note E_, 2
+	F# 2
+	E_ 2
 	vibrato_delay 0
-	note D_, 3
+	D_ 3
 	speed 1
-	note A#, 3
-	note B_, 2
+	A# 3
+	B_ 2
 	inc_octave
-	note C_, 3
-	note C#, 3
+	C_ 3
+	C# 3
 	speed 11
-	note D_, 4
+	D_ 4
 	dec_octave
-	note E_, 3
+	E_ 3
 	inc_octave
 	speed 1
-	note C_, 3
-	note C#, 2
-	note D_, 3
-	note D#, 3
+	C_ 3
+	C# 2
+	D_ 3
+	D# 3
 	speed 11
-	note E_, 4
+	E_ 4
 	dec_octave
 	Loop 6
 	Loop 4
-	note F#, 1
+	F# 1
 	rest 2
 	EndLoop
-	note F#, 2
-	note F_, 2
+	F# 2
+	F_ 2
 	Loop 4
-	note E_, 1
+	E_ 1
 	rest 2
 	EndLoop
-	note E_, 2
-	note F_, 2
+	E_ 2
+	F_ 2
 	EndLoop
 	musice8 7
 	Loop 4
 	inc_octave
 	Loop 4
-	note F#, 1
+	F# 1
 	dec_octave
-	note F#, 1
-	note F#, 1
+	F# 1
+	F# 1
 	inc_octave
 	EndLoop
-	note F#, 1
+	F# 1
 	dec_octave
-	note F#, 1
+	F# 1
 	inc_octave
-	note F#, 1
+	F# 1
 	dec_octave
-	note F#, 1
+	F# 1
 	inc_octave
 	Loop 4
-	note E_, 1
+	E_ 1
 	dec_octave
-	note E_, 1
-	note E_, 1
+	E_ 1
+	E_ 1
 	inc_octave
 	EndLoop
-	note E_, 1
+	E_ 1
 	dec_octave
-	note E_, 1
+	E_ 1
 	inc_octave
-	note E_, 1
+	E_ 1
 	dec_octave
-	note E_, 1
+	E_ 1
 	EndLoop
 	musice8 8
 	EndMainLoop
 
 Branch_f6973:
 	octave 1
-	note F#, 1
+	F# 1
 	rest 1
 	inc_octave
 	inc_octave
 	musice8 4
-	note E_, 1
+	E_ 1
 	dec_octave
 	dec_octave
 	musice8 8
-	note F#, 1
+	F# 1
 	rest 2
-	note F#, 1
+	F# 1
 	rest 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
 	inc_octave
 	inc_octave
 	musice8 4
-	note E_, 1
+	E_ 1
 	dec_octave
 	dec_octave
 	musice8 8
-	note E_, 2
-	note F_, 2
+	E_ 2
+	F_ 2
 	music_ret
 
 Branch_f6992:
 	octave 1
 	music_call Branch_f6973
-	note F#, 1
+	F# 1
 	rest 1
 	inc_octave
 	inc_octave
 	musice8 4
-	note E_, 1
+	E_ 1
 	dec_octave
 	dec_octave
 	musice8 8
-	note F#, 1
+	F# 1
 	rest 2
-	note F#, 1
+	F# 1
 	rest 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
 	inc_octave
 	inc_octave
 	musice8 4
-	note E_, 1
+	E_ 1
 	dec_octave
 	dec_octave
 	musice8 8
-	note F#, 1
+	F# 1
 	rest 1
-	note F#, 2
-	note G_, 1
+	F# 2
+	G_ 1
 	rest 1
 	inc_octave
 	inc_octave
 	musice8 4
-	note F#, 1
+	F# 1
 	dec_octave
 	dec_octave
 	musice8 8
-	note G_, 1
+	G_ 1
 	rest 2
-	note G_, 1
+	G_ 1
 	rest 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
 	inc_octave
 	inc_octave
 	musice8 4
-	note F#, 1
+	F# 1
 	dec_octave
 	dec_octave
 	musice8 8
-	note F_, 2
-	note F#, 2
-	note G_, 1
+	F_ 2
+	F# 2
+	G_ 1
 	rest 1
 	inc_octave
 	inc_octave
 	musice8 4
-	note F#, 1
+	F# 1
 	dec_octave
 	dec_octave
 	musice8 8
-	note G_, 1
+	G_ 1
 	rest 2
-	note G_, 1
+	G_ 1
 	rest 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
 	inc_octave
 	inc_octave
 	musice8 4
-	note F#, 1
+	F# 1
 	dec_octave
 	dec_octave
 	musice8 8
-	note G_, 1
+	G_ 1
 	rest 1
-	note F_, 2
+	F_ 2
 	music_ret
 
 Branch_f69f0:
 	octave 1
 	musice8 6
-	note F#, 1
+	F# 1
 	inc_octave
-	note C#, 1
+	C# 1
 	inc_octave
 	musice8 4
-	note C#, 1
+	C# 1
 	dec_octave
 	dec_octave
 	musice8 6
-	note F#, 1
+	F# 1
 	inc_octave
 	inc_octave
 	musice8 8
-	note F#, 2
+	F# 2
 	dec_octave
 	dec_octave
 	musice8 6
-	note F#, 1
+	F# 1
 	inc_octave
-	note C#, 1
+	C# 1
 	inc_octave
 	musice8 4
-	note C#, 1
+	C# 1
 	dec_octave
 	dec_octave
 	musice8 6
-	note F#, 1
+	F# 1
 	inc_octave
 	inc_octave
 	musice8 8
-	note E_, 2
+	E_ 2
 	dec_octave
 	dec_octave
 	musice8 6
-	note F#, 1
+	F# 1
 	inc_octave
-	note C#, 1
+	C# 1
 	inc_octave
 	musice8 4
-	note C#, 1
+	C# 1
 	dec_octave
 	dec_octave
 	musice8 6
-	note F#, 1
+	F# 1
 	inc_octave
 	inc_octave
 	musice8 8
-	note D#, 2
+	D# 2
 	dec_octave
 	dec_octave
 	musice8 6
-	note F#, 1
+	F# 1
 	inc_octave
-	note C#, 1
+	C# 1
 	inc_octave
 	musice8 4
-	note C#, 1
+	C# 1
 	dec_octave
 	dec_octave
 	musice8 6
-	note F#, 1
+	F# 1
 	music_ret
 
 
@@ -1223,306 +1223,306 @@ Music_DuelTheme3_Ch4: ; f6a3f (3d:6a3f)
 	MainLoop
 	Loop 2
 	Loop 4
-	note snare4, 1
-	note snare3, 1
-	note snare3, 1
+	snare4 1
+	snare3 1
+	snare3 1
 	EndLoop
-	note snare4, 1
-	note snare3, 1
-	note snare4, 1
-	note snare3, 1
+	snare4 1
+	snare3 1
+	snare4 1
+	snare3 1
 	EndLoop
 	Loop 4
-	note snare1, 1
-	note bass, 1
-	note bass, 1
+	snare1 1
+	bass 1
+	bass 1
 	EndLoop
-	note snare1, 1
-	note bass, 1
-	note snare1, 1
-	note bass, 1
+	snare1 1
+	bass 1
+	snare1 1
+	bass 1
 	Loop 4
-	note snare1, 1
-	note bass, 1
-	note bass, 1
+	snare1 1
+	bass 1
+	bass 1
 	EndLoop
-	note snare1, 1
+	snare1 1
 	speed 1
-	note snare3, 5
-	note snare2, 6
+	snare3 5
+	snare2 6
 	speed 11
-	note snare1, 1
-	note snare1, 1
+	snare1 1
+	snare1 1
 	Loop 3
 	music_call Branch_f6b40
 	EndLoop
-	note bass, 2
-	note snare3, 1
-	note bass, 1
-	note snare1, 2
-	note snare3, 1
-	note bass, 1
-	note snare3, 1
-	note bass, 1
-	note snare4, 2
-	note snare1, 1
+	bass 2
+	snare3 1
+	bass 1
+	snare1 2
+	snare3 1
+	bass 1
+	snare3 1
+	bass 1
+	snare4 2
+	snare1 1
 	speed 1
-	note snare3, 5
-	note snare2, 6
+	snare3 5
+	snare2 6
 	speed 11
-	note snare1, 1
-	note snare1, 1
+	snare1 1
+	snare1 1
 	Loop 7
 	music_call Branch_f6b40
 	EndLoop
-	note bass, 2
-	note snare3, 1
-	note bass, 1
-	note snare1, 2
-	note snare3, 1
-	note bass, 1
-	note snare3, 1
-	note bass, 1
-	note snare4, 2
-	note snare1, 1
+	bass 2
+	snare3 1
+	bass 1
+	snare1 2
+	snare3 1
+	bass 1
+	snare3 1
+	bass 1
+	snare4 2
+	snare1 1
 	speed 1
-	note snare3, 5
-	note snare2, 6
+	snare3 5
+	snare2 6
 	speed 11
-	note snare1, 1
-	note snare1, 1
+	snare1 1
+	snare1 1
 	music_call Branch_f6b7e
 	speed 1
-	note snare3, 5
-	note snare2, 6
+	snare3 5
+	snare2 6
 	speed 11
-	note snare1, 1
-	note bass, 1
+	snare1 1
+	bass 1
 	music_call Branch_f6b7e
 	speed 1
-	note snare3, 5
-	note snare2, 6
+	snare3 5
+	snare2 6
 	speed 11
-	note snare1, 2
+	snare1 2
 	Loop 7
 	music_call Branch_f6b40
 	EndLoop
-	note bass, 2
-	note snare3, 1
-	note bass, 1
-	note snare1, 2
-	note snare3, 1
-	note bass, 1
-	note snare3, 1
-	note bass, 1
-	note snare4, 2
-	note snare1, 1
+	bass 2
+	snare3 1
+	bass 1
+	snare1 2
+	snare3 1
+	bass 1
+	snare3 1
+	bass 1
+	snare4 2
+	snare1 1
 	speed 1
-	note snare3, 5
-	note snare2, 6
-	note snare1, 5
-	note snare1, 6
-	note snare1, 5
-	note snare1, 6
+	snare3 5
+	snare2 6
+	snare1 5
+	snare1 6
+	snare1 5
+	snare1 6
 	speed 11
 	music_call Branch_f6b4d
-	note snare3, 1
-	note snare1, 1
-	note bass, 1
+	snare3 1
+	snare1 1
+	bass 1
 	music_call Branch_f6b4d
 	speed 1
-	note snare3, 5
-	note snare2, 6
+	snare3 5
+	snare2 6
 	speed 11
-	note snare1, 1
-	note bass, 1
+	snare1 1
+	bass 1
 	music_call Branch_f6b4d
-	note snare3, 1
-	note snare1, 1
-	note bass, 1
+	snare3 1
+	snare1 1
+	bass 1
 	music_call Branch_f6b4d
 	speed 1
-	note snare3, 5
-	note snare2, 6
+	snare3 5
+	snare2 6
 	speed 11
-	note snare1, 2
-	note snare5, 8
+	snare1 2
+	snare5 8
 	rest 4
 	speed 1
-	note snare2, 3
-	note snare2, 2
-	note snare1, 6
-	note snare1, 5
-	note snare1, 6
-	note snare1, 5
-	note snare1, 6
+	snare2 3
+	snare2 2
+	snare1 6
+	snare1 5
+	snare1 6
+	snare1 5
+	snare1 6
 	speed 11
-	note snare1, 1
+	snare1 1
 	Loop 7
 	music_call Branch_f6b65
 	speed 1
-	note bass, 6
+	bass 6
 	EndLoop
 	music_call Branch_f6b65
 	speed 1
-	note snare1, 6
+	snare1 6
 	Loop 15
 	music_call Branch_f6b65
 	speed 1
-	note bass, 6
+	bass 6
 	EndLoop
 	speed 11
-	note bass, 1
+	bass 1
 	speed 1
-	note snare3, 5
-	note bass, 6
+	snare3 5
+	bass 6
 	speed 11
-	note snare1, 1
+	snare1 1
 	speed 1
-	note snare3, 5
-	note snare4, 6
-	note snare3, 5
-	note snare2, 6
-	note snare3, 5
-	note bass, 6
-	note snare1, 5
-	note snare1, 6
-	note snare1, 5
-	note snare1, 6
+	snare3 5
+	snare4 6
+	snare3 5
+	snare2 6
+	snare3 5
+	bass 6
+	snare1 5
+	snare1 6
+	snare1 5
+	snare1 6
 	music_call Branch_f6b9a
-	note bass, 1
+	bass 1
 	speed 1
-	note snare3, 5
-	note snare2, 6
-	note snare1, 5
-	note snare1, 6
-	note snare1, 5
-	note snare1, 6
+	snare3 5
+	snare2 6
+	snare1 5
+	snare1 6
+	snare1 5
+	snare1 6
 	music_call Branch_f6b9a
 	speed 1
-	note bass, 5
-	note snare2, 6
-	note snare1, 5
-	note snare1, 6
-	note snare1, 5
-	note snare1, 6
-	note snare1, 5
-	note snare1, 6
+	bass 5
+	snare2 6
+	snare1 5
+	snare1 6
+	snare1 5
+	snare1 6
+	snare1 5
+	snare1 6
 	speed 11
 	EndMainLoop
 
 Branch_f6b40:
-	note bass, 2
-	note snare3, 1
-	note bass, 1
-	note snare1, 2
-	note snare3, 1
-	note bass, 1
-	note snare3, 1
-	note bass, 1
-	note snare4, 2
-	note snare1, 2
-	note snare3, 1
-	note snare1, 1
+	bass 2
+	snare3 1
+	bass 1
+	snare1 2
+	snare3 1
+	bass 1
+	snare3 1
+	bass 1
+	snare4 2
+	snare1 2
+	snare3 1
+	snare1 1
 	music_ret
 
 Branch_f6b4d:
-	note bass, 1
-	note snare1, 1
-	note snare3, 1
-	note bass, 1
-	note snare1, 1
-	note snare4, 1
-	note bass, 1
-	note snare1, 1
-	note snare3, 1
-	note bass, 1
-	note snare1, 1
-	note snare4, 1
-	note bass, 1
-	note snare1, 1
-	note snare3, 1
-	note bass, 1
-	note snare1, 1
-	note snare4, 1
-	note bass, 1
-	note snare1, 1
-	note snare3, 1
-	note bass, 1
-	note snare1, 1
+	bass 1
+	snare1 1
+	snare3 1
+	bass 1
+	snare1 1
+	snare4 1
+	bass 1
+	snare1 1
+	snare3 1
+	bass 1
+	snare1 1
+	snare4 1
+	bass 1
+	snare1 1
+	snare3 1
+	bass 1
+	snare1 1
+	snare4 1
+	bass 1
+	snare1 1
+	snare3 1
+	bass 1
+	snare1 1
 	music_ret
 
 Branch_f6b65:
 	speed 11
-	note bass, 1
+	bass 1
 	speed 1
-	note snare3, 5
-	note bass, 6
+	snare3 5
+	bass 6
 	speed 11
-	note snare1, 1
+	snare1 1
 	speed 1
-	note snare3, 5
-	note snare4, 6
-	note snare3, 5
-	note snare2, 6
-	note snare3, 5
-	note bass, 6
+	snare3 5
+	snare4 6
+	snare3 5
+	snare2 6
+	snare3 5
+	bass 6
 	speed 11
-	note snare1, 1
+	snare1 1
 	speed 1
-	note snare3, 5
+	snare3 5
 	music_ret
 
 Branch_f6b7e:
-	note bass, 2
-	note snare3, 1
-	note snare1, 1
-	note snare3, 1
-	note snare4, 1
-	note snare1, 1
-	note bass, 1
-	note snare1, 1
-	note snare4, 1
-	note bass, 1
-	note snare1, 1
-	note snare1, 1
-	note bass, 1
-	note snare1, 1
-	note bass, 1
-	note bass, 2
-	note snare3, 1
-	note snare1, 1
-	note snare3, 1
-	note snare4, 1
-	note snare1, 1
-	note bass, 1
-	note snare1, 1
-	note snare4, 1
-	note bass, 1
-	note snare1, 1
-	note snare1, 1
+	bass 2
+	snare3 1
+	snare1 1
+	snare3 1
+	snare4 1
+	snare1 1
+	bass 1
+	snare1 1
+	snare4 1
+	bass 1
+	snare1 1
+	snare1 1
+	bass 1
+	snare1 1
+	bass 1
+	bass 2
+	snare3 1
+	snare1 1
+	snare3 1
+	snare4 1
+	snare1 1
+	bass 1
+	snare1 1
+	snare4 1
+	bass 1
+	snare1 1
+	snare1 1
 	music_ret
 
 Branch_f6b9a:
 	speed 11
 	Loop 3
 	Loop 5
-	note bass, 1
+	bass 1
 	speed 1
-	note snare3, 5
-	note snare2, 6
+	snare3 5
+	snare2 6
 	speed 11
-	note snare1, 1
+	snare1 1
 	EndLoop
-	note bass, 1
+	bass 1
 	EndLoop
 	Loop 4
-	note bass, 1
+	bass 1
 	speed 1
-	note snare3, 5
-	note snare2, 6
+	snare3 5
+	snare2 6
 	speed 11
-	note snare1, 1
+	snare1 1
 	EndLoop
 	music_ret
 ; 0xf6bb7
diff --git a/audio/music/hallofhonor.asm b/audio/music/hallofhonor.asm
index 8e2606e..3117df7 100644
--- a/audio/music/hallofhonor.asm
+++ b/audio/music/hallofhonor.asm
@@ -12,15 +12,15 @@ Music_HallOfHonor_Ch1: ; fafea (3e:6fea)
 	EndLoop
 	octave 4
 	volume 85
-	note C_, 1
+	C_ 1
 	volume 39
-	note C_, 1
+	C_ 1
 	music_call Branch_fb044
 	Loop 23
 	volume 85
-	note C_, 1
+	C_ 1
 	volume 39
-	note G_, 1
+	G_ 1
 	music_call Branch_fb044
 	EndLoop
 	EndMainLoop
@@ -28,67 +28,67 @@ Music_HallOfHonor_Ch1: ; fafea (3e:6fea)
 Branch_fb016:
 	octave 4
 	volume 101
-	note C_, 1
+	C_ 1
 	volume 39
-	note C_, 1
+	C_ 1
 	volume 101
-	note F_, 1
+	F_ 1
 	volume 39
-	note F_, 1
+	F_ 1
 	volume 101
-	note G_, 1
+	G_ 1
 	volume 39
-	note G_, 1
+	G_ 1
 	volume 101
-	note F_, 1
+	F_ 1
 	volume 39
-	note F_, 1
+	F_ 1
 	inc_octave
 	volume 101
-	note C_, 1
+	C_ 1
 	volume 39
-	note C_, 1
+	C_ 1
 	dec_octave
 	volume 101
-	note F_, 1
+	F_ 1
 	volume 39
-	note F_, 1
+	F_ 1
 	volume 101
-	note G_, 1
+	G_ 1
 	volume 39
-	note G_, 1
+	G_ 1
 	music_ret
 
 Branch_fb044:
 	octave 4
 	volume 85
-	note F_, 1
+	F_ 1
 	volume 39
-	note C_, 1
+	C_ 1
 	volume 85
-	note G_, 1
+	G_ 1
 	volume 39
-	note F_, 1
+	F_ 1
 	volume 85
-	note F_, 1
+	F_ 1
 	volume 39
-	note G_, 1
+	G_ 1
 	inc_octave
 	volume 85
-	note C_, 1
+	C_ 1
 	dec_octave
 	volume 39
-	note F_, 1
+	F_ 1
 	volume 85
-	note F_, 1
+	F_ 1
 	inc_octave
 	volume 39
-	note C_, 1
+	C_ 1
 	dec_octave
 	volume 85
-	note G_, 1
+	G_ 1
 	volume 39
-	note F_, 1
+	F_ 1
 	music_ret
 
 
@@ -107,19 +107,19 @@ Music_HallOfHonor_Ch2: ; fb06e (3e:706e)
 	music_call Branch_fb1ec
 	EndLoop
 	octave 4
-	note C_, 1
+	C_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
 	inc_octave
-	note C_, 1
+	C_ 1
 	rest 1
 	dec_octave
-	note F_, 1
+	F_ 1
 	speed 1
 	rest 3
 	speed 7
@@ -131,42 +131,42 @@ Music_HallOfHonor_Ch2: ; fb06e (3e:706e)
 	music_call Branch_fb0bb
 	octave 1
 	volume 109
-	note E_, 5
+	E_ 5
 	volume 208
-	note E_, 11
+	E_ 11
 	tie
-	note E_, 12
+	E_ 12
 	EndLoop
 	music_call Branch_fb0bb
 	octave 1
 	volume 109
-	note G_, 5
+	G_ 5
 	volume 208
-	note G_, 11
+	G_ 11
 	tie
-	note G_, 12
+	G_ 12
 	EndMainLoop
 
 Branch_fb0bb:
 	octave 1
 	volume 109
-	note F_, 5
+	F_ 5
 	volume 208
-	note F_, 11
+	F_ 11
 	tie
-	note F_, 12
+	F_ 12
 	volume 109
-	note E_, 5
+	E_ 5
 	volume 208
-	note E_, 11
+	E_ 11
 	tie
-	note E_, 12
+	E_ 12
 	volume 109
-	note D_, 5
+	D_ 5
 	volume 208
-	note D_, 11
+	D_ 11
 	tie
-	note D_, 12
+	D_ 12
 	music_ret
 
 
@@ -191,185 +191,185 @@ Music_HallOfHonor_Ch3: ; fb0d5 (3e:70d5)
 	Loop 7
 	music_call Branch_fb1ec
 	EndLoop
-	note C_, 1
+	C_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
 	inc_octave
-	note C_, 1
+	C_ 1
 	rest 1
 	dec_octave
-	note F_, 1
+	F_ 1
 	volume 32
 	musice4 0
 	octave 4
 	speed 1
 	musice8 6
-	note B_, 3
+	B_ 3
 	inc_octave
-	note C_, 4
+	C_ 4
 	tie
 	speed 7
-	note C_, 15
+	C_ 15
 	tie
-	note C_, 8
+	C_ 8
 	dec_octave
 	musice8 8
-	note B_, 2
+	B_ 2
 	musice8 4
-	note A_, 2
+	A_ 2
 	musice8 6
-	note G_, 6
-	note C_, 10
+	G_ 6
+	C_ 10
 	tie
-	note C_, 12
+	C_ 12
 	speed 1
 	musice8 8
-	note B_, 3
+	B_ 3
 	inc_octave
 	musice8 6
-	note C_, 4
+	C_ 4
 	tie
 	speed 7
-	note C_, 15
+	C_ 15
 	tie
-	note C_, 6
+	C_ 6
 	dec_octave
 	musice8 8
-	note B_, 2
+	B_ 2
 	inc_octave
-	note C_, 2
+	C_ 2
 	musice8 4
-	note D_, 2
+	D_ 2
 	dec_octave
 	speed 1
 	musice8 8
-	note F#, 3
+	F# 3
 	musice8 6
-	note G_, 4
+	G_ 4
 	tie
 	speed 7
-	note G_, 15
+	G_ 15
 	tie
-	note G_, 6
+	G_ 6
 	musice8 8
-	note G_, 2
-	note A_, 2
+	G_ 2
+	A_ 2
 	musice8 4
-	note B_, 2
+	B_ 2
 	speed 1
 	musice8 8
-	note B_, 3
+	B_ 3
 	inc_octave
-	note C_, 4
+	C_ 4
 	tie
 	speed 7
-	note C_, 15
+	C_ 15
 	tie
-	note C_, 8
+	C_ 8
 	dec_octave
-	note B_, 2
+	B_ 2
 	musice8 4
-	note A_, 2
+	A_ 2
 	musice8 6
-	note G_, 6
+	G_ 6
 	musice8 8
 	speed 1
-	note B_, 3
+	B_ 3
 	inc_octave
 	musice8 6
-	note C_, 4
+	C_ 4
 	tie
 	speed 7
-	note C_, 9
+	C_ 9
 	tie
-	note C_, 6
+	C_ 6
 	dec_octave
 	musice8 8
-	note G_, 2
+	G_ 2
 	inc_octave
-	note C_, 2
+	C_ 2
 	musice8 4
-	note E_, 2
+	E_ 2
 	speed 1
 	musice8 8
-	note E_, 3
-	note F_, 4
+	E_ 3
+	F_ 4
 	tie
 	speed 7
-	note F_, 1
-	note E_, 2
+	F_ 1
+	E_ 2
 	musice8 4
-	note C_, 2
+	C_ 2
 	musice8 7
-	note C_, 10
+	C_ 10
 	tie
-	note C_, 10
+	C_ 10
 	musice8 4
-	note E_, 2
+	E_ 2
 	speed 1
 	musice8 8
-	note E_, 3
-	note F_, 4
+	E_ 3
+	F_ 4
 	tie
 	speed 7
-	note F_, 1
-	note E_, 2
+	F_ 1
+	E_ 2
 	musice8 4
-	note C_, 2
+	C_ 2
 	musice8 6
-	note C_, 10
+	C_ 10
 	tie
-	note C_, 12
+	C_ 12
 	speed 1
 	musice8 8
-	note F#, 3
+	F# 3
 	musice8 7
-	note G_, 4
+	G_ 4
 	tie
 	speed 7
-	note G_, 15
+	G_ 15
 	tie
-	note G_, 8
+	G_ 8
 	musice8 8
-	note F_, 2
+	F_ 2
 	musice8 4
-	note E_, 2
+	E_ 2
 	musice8 8
-	note F_, 2
+	F_ 2
 	musice8 4
-	note E_, 2
-	note C_, 2
+	E_ 2
+	C_ 2
 	dec_octave
 	musice8 7
-	note G_, 10
+	G_ 10
 	tie
-	note G_, 10
+	G_ 10
 	musice8 8
-	note E_, 2
-	note F_, 2
+	E_ 2
+	F_ 2
 	inc_octave
 	musice8 4
-	note C_, 2
+	C_ 2
 	musice8 7
-	note C_, 12
+	C_ 12
 	tie
-	note C_, 10
+	C_ 10
 	dec_octave
 	musice8 8
-	note E_, 2
-	note F_, 2
+	E_ 2
+	F_ 2
 	inc_octave
 	musice8 4
-	note C_, 2
+	C_ 2
 	musice8 6
-	note C_, 12
+	C_ 12
 	tie
-	note C_, 12
+	C_ 12
 	rest 3
 	volume 96
 	musice4 255
@@ -378,21 +378,21 @@ Music_HallOfHonor_Ch3: ; fb0d5 (3e:70d5)
 
 Branch_fb1ec:
 	octave 4
-	note C_, 1
+	C_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
 	inc_octave
-	note C_, 1
+	C_ 1
 	rest 1
 	dec_octave
-	note F_, 1
+	F_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
 	music_ret
 ; 0xfb1fe
diff --git a/audio/music/imakuni.asm b/audio/music/imakuni.asm
index 0403be3..74cf2d7 100644
--- a/audio/music/imakuni.asm
+++ b/audio/music/imakuni.asm
@@ -12,17 +12,17 @@ Music_Imakuni_Ch1: ; fad55 (3e:6d55)
 	EndLoop
 	music_call Branch_fadf9
 	octave 4
-	note D_, 15
+	D_ 15
 	dec_octave
-	note B_, 7
+	B_ 7
 	rest 8
-	note G_, 7
+	G_ 7
 	rest 8
 	speed 9
-	note F_, 10
+	F_ 10
 	tie
 	speed 1
-	note F_, 7
+	F_ 7
 	rest 8
 	speed 9
 	rest 10
@@ -30,15 +30,15 @@ Music_Imakuni_Ch1: ; fad55 (3e:6d55)
 	music_call Branch_fae1d
 	speed 1
 	octave 4
-	note E_, 7
+	E_ 7
 	rest 15
-	note E_, 3
-	note C_, 2
-	note E_, 3
-	note C_, 15
+	E_ 3
+	C_ 2
+	E_ 3
+	C_ 15
 	dec_octave
-	note G#, 15
-	note A_, 7
+	G# 15
+	A_ 7
 	rest 8
 	speed 3
 	rest 15
@@ -46,139 +46,139 @@ Music_Imakuni_Ch1: ; fad55 (3e:6d55)
 	rest 15
 	rest 15
 	inc_octave
-	note E_, 7
+	E_ 7
 	rest 8
-	note F#, 7
+	F# 7
 	rest 8
-	note G_, 15
+	G_ 15
 	tie
-	note G_, 7
-	note F#, 3
-	note G_, 2
-	note F#, 3
-	note E_, 7
+	G_ 7
+	F# 3
+	G_ 2
+	F# 3
+	E_ 7
 	rest 8
-	note D#, 7
+	D# 7
 	rest 8
-	note E_, 15
-	note C_, 7
+	E_ 15
+	C_ 7
 	rest 8
 	dec_octave
-	note G#, 7
+	G# 7
 	rest 8
 	speed 7
-	note F#, 15
+	F# 15
 	speed 9
 	rest 10
 	music_call Branch_fadf9
 	music_call Branch_fae1d
 	dec_octave
 	speed 1
-	note F_, 7
+	F_ 7
 	rest 8
-	note B_, 7
+	B_ 7
 	inc_octave
-	note C_, 8
+	C_ 8
 	dec_octave
-	note G#, 7
-	note A_, 8
-	note F_, 7
+	G# 7
+	A_ 8
+	F_ 7
 	rest 8
-	note B_, 7
+	B_ 7
 	inc_octave
-	note C_, 8
+	C_ 8
 	dec_octave
-	note G#, 7
-	note A_, 8
+	G# 7
+	A_ 8
 	speed 3
-	note F_, 10
+	F_ 10
 	speed 1
-	note D#, 7
-	rest 8
-	note A_, 7
-	note A#, 8
-	note F#, 7
-	note G_, 8
-	note D#, 7
-	rest 8
-	note A_, 7
-	note A#, 8
-	note F#, 7
-	note G_, 8
+	D# 7
+	rest 8
+	A_ 7
+	A# 8
+	F# 7
+	G_ 8
+	D# 7
+	rest 8
+	A_ 7
+	A# 8
+	F# 7
+	G_ 8
 	speed 3
-	note D#, 10
+	D# 10
 	speed 1
 	Loop 4
-	note D_, 7
+	D_ 7
 	dec_octave
-	note A_, 8
-	note D_, 7
-	note A_, 8
-	note D_, 7
-	note A_, 8
+	A_ 8
+	D_ 7
+	A_ 8
+	D_ 7
+	A_ 8
 	inc_octave
 	EndLoop
-	note D_, 7
+	D_ 7
 	dec_octave
-	note A_, 8
-	note D_, 7
-	note A_, 8
+	A_ 8
+	D_ 7
+	A_ 8
 	vibrato_delay 5
 	speed 3
-	note D_, 10
+	D_ 10
 	vibrato_delay 20
 	EndMainLoop
 
 Branch_fadf9:
 	speed 1
 	octave 4
-	note C#, 7
+	C# 7
 	rest 15
-	note C#, 3
-	note D_, 2
-	note C#, 3
+	C# 3
+	D_ 2
+	C# 3
 	dec_octave
-	note A#, 15
-	note B_, 15
+	A# 15
+	B_ 15
 	inc_octave
-	note D_, 7
+	D_ 7
 	rest 8
 	speed 5
 	rest 9
 	speed 1
 	rest 15
 	rest 15
-	note D_, 7
+	D_ 7
 	rest 8
-	note E_, 7
+	E_ 7
 	rest 8
-	note F_, 15
+	F_ 15
 	tie
-	note F_, 7
-	note E_, 3
-	note F_, 2
-	note E_, 3
-	note D_, 7
+	F_ 7
+	E_ 3
+	F_ 2
+	E_ 3
+	D_ 7
 	rest 8
-	note C#, 7
+	C# 7
 	rest 8
 	music_ret
 
 Branch_fae1d:
 	octave 4
-	note D_, 7
+	D_ 7
 	rest 8
 	dec_octave
-	note G_, 7
+	G_ 7
 	rest 8
 	inc_octave
-	note G_, 7
+	G_ 7
 	rest 8
 	speed 9
-	note F_, 10
+	F_ 10
 	tie
 	speed 1
-	note F_, 7
+	F_ 7
 	rest 8
 	speed 9
 	rest 10
@@ -200,22 +200,22 @@ Music_Imakuni_Ch2: ; fae32 (3e:6e32)
 	speed 3
 	rest 10
 	speed 1
-	note C_, 7
+	C_ 7
 	rest 8
 	EndLoop
 	rest 15
-	note C_, 7
+	C_ 7
 	rest 8
 	speed 3
 	rest 10
 	speed 1
-	note C_, 7
+	C_ 7
 	rest 8
 	rest 15
 	speed 3
 	rest 10
 	vibrato_delay 8
-	note C_, 10
+	C_ 10
 	vibrato_delay 0
 	EndLoop
 	Loop 2
@@ -223,51 +223,51 @@ Music_Imakuni_Ch2: ; fae32 (3e:6e32)
 	EndLoop
 	speed 1
 	octave 2
-	note F_, 15
+	F_ 15
 	tie
-	note F_, 7
+	F_ 7
 	inc_octave
-	note F_, 8
-	note D#, 7
+	F_ 8
+	D# 7
 	rest 8
 	rest 15
-	note G#, 7
-	note A_, 8
-	note F_, 7
-	note D#, 8
+	G# 7
+	A_ 8
+	F_ 7
+	D# 8
 	speed 3
 	rest 10
 	speed 1
 	dec_octave
-	note D#, 15
+	D# 15
 	tie
-	note D#, 7
+	D# 7
 	inc_octave
-	note D#, 8
-	note C#, 7
+	D# 8
+	C# 7
 	rest 8
 	rest 15
-	note F#, 7
-	note G_, 8
-	note D#, 7
-	note C#, 8
+	F# 7
+	G_ 8
+	D# 7
+	C# 8
 	speed 3
 	rest 10
 	speed 1
 	Loop 4
-	note D_, 7
+	D_ 7
 	rest 8
 	Loop 2
 	rest 15
 	EndLoop
 	EndLoop
-	note D_, 7
+	D_ 7
 	rest 8
 	rest 15
 	vibrato_delay 5
-	note D_, 15
+	D_ 15
 	tie
-	note D_, 7
+	D_ 7
 	rest 8
 	vibrato_delay 0
 	EndMainLoop
@@ -279,14 +279,14 @@ Branch_faea5:
 	speed 1
 	Loop 2
 	rest 15
-	note C#, 7
+	C# 7
 	rest 8
 	EndLoop
 	vibrato_delay 8
 	speed 9
 	rest 10
 	speed 3
-	note C#, 10
+	C# 10
 	vibrato_delay 0
 	music_ret
 
@@ -303,170 +303,170 @@ Music_Imakuni_Ch3: ; faebc (3e:6ebc)
 	music_call Branch_faf7d
 	vibrato_delay 8
 	speed 1
-	note D_, 15
+	D_ 15
 	tie
-	note D_, 7
+	D_ 7
 	inc_octave
 	vibrato_delay 0
-	note G_, 3
+	G_ 3
 	dec_octave
-	note G_, 2
+	G_ 2
 	dec_octave
-	note G_, 3
+	G_ 3
 	music_call Branch_faf7d
 	vibrato_delay 8
-	note D_, 10
+	D_ 10
 	vibrato_delay 0
 	Loop 4
 	music_call Branch_faf7d
 	vibrato_delay 8
-	note D_, 10
+	D_ 10
 	vibrato_delay 0
 	EndLoop
 	Loop 2
 	octave 2
 	speed 3
-	note C_, 5
+	C_ 5
 	rest 5
 	inc_octave
 	speed 1
-	note E_, 7
+	E_ 7
 	rest 8
 	dec_octave
 	speed 3
-	note G#, 5
-	note A_, 5
+	G# 5
+	A_ 5
 	inc_octave
 	speed 1
-	note D#, 7
+	D# 7
 	rest 8
 	rest 15
-	note D#, 7
+	D# 7
 	rest 8
 	speed 3
 	rest 5
 	dec_octave
-	note C_, 5
+	C_ 5
 	inc_octave
 	speed 1
-	note E_, 7
+	E_ 7
 	rest 8
 	dec_octave
 	speed 3
-	note G#, 5
-	note A_, 5
+	G# 5
+	A_ 5
 	rest 5
 	inc_octave
 	vibrato_delay 8
-	note D#, 10
+	D# 10
 	vibrato_delay 0
 	EndLoop
 	Loop 2
 	music_call Branch_faf7d
 	vibrato_delay 8
-	note D_, 10
+	D_ 10
 	vibrato_delay 0
 	EndLoop
 	speed 1
 	octave 1
-	note F_, 15
+	F_ 15
 	tie
-	note F_, 7
+	F_ 7
 	inc_octave
-	note F_, 8
-	note D#, 7
+	F_ 8
+	D# 7
 	rest 8
-	note F_, 7
+	F_ 7
 	rest 8
-	note G#, 7
-	note A_, 8
-	note F_, 7
-	note D#, 8
+	G# 7
+	A_ 8
+	F_ 7
+	D# 8
 	vibrato_delay 5
 	speed 3
-	note F_, 10
+	F_ 10
 	vibrato_delay 0
 	speed 1
 	dec_octave
-	note D#, 15
+	D# 15
 	tie
-	note D#, 7
+	D# 7
 	inc_octave
-	note D#, 8
-	note C#, 7
+	D# 8
+	C# 7
 	rest 8
-	note D#, 7
+	D# 7
 	rest 8
-	note F#, 7
-	note G_, 8
-	note D#, 7
-	note C#, 8
+	F# 7
+	G_ 8
+	D# 7
+	C# 8
 	vibrato_delay 5
 	speed 3
-	note D#, 10
+	D# 10
 	vibrato_delay 0
 	speed 1
 	Loop 4
 	octave 3
-	note C_, 7
+	C_ 7
 	rest 8
 	octave 1
-	note D_, 7
+	D_ 7
 	rest 8
-	note D_, 7
+	D_ 7
 	rest 8
 	EndLoop
 	octave 3
-	note C_, 7
+	C_ 7
 	rest 8
 	octave 1
-	note D_, 7
+	D_ 7
 	rest 8
 	octave 3
 	vibrato_delay 5
-	note C_, 15
+	C_ 15
 	tie
-	note C_, 7
+	C_ 7
 	inc_octave
 	vibrato_delay 0
-	note G_, 3
+	G_ 3
 	dec_octave
-	note G_, 2
+	G_ 2
 	dec_octave
-	note G_, 3
+	G_ 3
 	speed 8
 	EndMainLoop
 
 Branch_faf7d:
 	speed 3
 	octave 1
-	note G_, 5
+	G_ 5
 	rest 5
 	inc_octave
 	speed 1
-	note G_, 7
+	G_ 7
 	rest 8
 	speed 3
-	note C#, 5
-	note D_, 5
+	C# 5
+	D_ 5
 	inc_octave
 	speed 1
-	note D_, 7
+	D_ 7
 	rest 8
 	rest 15
-	note D_, 7
+	D_ 7
 	rest 8
 	speed 3
 	rest 5
 	octave 1
-	note G_, 5
+	G_ 5
 	inc_octave
 	speed 1
-	note G_, 7
+	G_ 7
 	rest 8
 	speed 3
-	note C#, 5
-	note D_, 5
+	C# 5
+	D_ 5
 	rest 5
 	inc_octave
 	music_ret
@@ -476,64 +476,64 @@ Music_Imakuni_Ch4: ; fafa4 (3e:6fa4)
 	speed 1
 	octave 1
 	Loop 10
-	note bass, 15
-	note snare3, 7
-	note bass, 8
-	note snare1, 15
-	note bass, 15
-	note snare3, 7
-	note snare3, 8
-	note snare4, 15
-	note snare3, 7
-	note snare3, 8
-	note snare4, 15
-	note snare3, 15
-	note bass, 15
-	note snare1, 15
-	note snare4, 15
-	note bass, 7
-	note snare3, 8
-	note snare1, 15
-	note snare1, 15
-	note snare3, 7
-	note snare1, 8
+	bass 15
+	snare3 7
+	bass 8
+	snare1 15
+	bass 15
+	snare3 7
+	snare3 8
+	snare4 15
+	snare3 7
+	snare3 8
+	snare4 15
+	snare3 15
+	bass 15
+	snare1 15
+	snare4 15
+	bass 7
+	snare3 8
+	snare1 15
+	snare1 15
+	snare3 7
+	snare1 8
 	EndLoop
 	Loop 2
 	speed 11
-	note snare5, 2
+	snare5 2
 	speed 1
-	note snare1, 8
-	note snare1, 15
-	note snare1, 15
-	note snare1, 7
-	note snare1, 8
-	note snare1, 7
-	note snare1, 8
+	snare1 8
+	snare1 15
+	snare1 15
+	snare1 7
+	snare1 8
+	snare1 7
+	snare1 8
 	speed 3
-	note snare5, 10
+	snare5 10
 	EndLoop
 	speed 1
-	note snare1, 15
-	note snare3, 7
-	note snare1, 8
-	note snare4, 15
-	note snare1, 15
-	note snare3, 7
-	note snare1, 8
-	note snare4, 15
-	note snare1, 15
-	note snare3, 7
-	note snare1, 8
-	note snare4, 15
-	note snare1, 15
-	note snare3, 7
-	note snare1, 8
-	note snare4, 15
-	note snare1, 15
-	note snare3, 4
-	note snare3, 4
-	note snare1, 7
-	note snare1, 15
-	note snare1, 15
+	snare1 15
+	snare3 7
+	snare1 8
+	snare4 15
+	snare1 15
+	snare3 7
+	snare1 8
+	snare4 15
+	snare1 15
+	snare3 7
+	snare1 8
+	snare4 15
+	snare1 15
+	snare3 7
+	snare1 8
+	snare4 15
+	snare1 15
+	snare3 4
+	snare3 4
+	snare1 7
+	snare1 15
+	snare1 15
 	EndMainLoop
 ; 0xfafea
diff --git a/audio/music/matchloss.asm b/audio/music/matchloss.asm
index 402c96c..a80a9be 100644
--- a/audio/music/matchloss.asm
+++ b/audio/music/matchloss.asm
@@ -7,60 +7,60 @@ Music_MatchLoss_Ch1: ; f7c2e (3d:7c2e)
 	duty 2
 	volume 176
 	speed 1
-	note E_, 3
-	note F_, 2
+	E_ 3
+	F_ 2
 	tie
 	speed 5
-	note F_, 3
-	note C_, 1
+	F_ 3
+	C_ 1
 	volume 55
-	note C_, 3
+	C_ 3
 	dec_octave
 	volume 160
-	note A#, 1
+	A# 1
 	volume 55
-	note A#, 3
+	A# 3
 	inc_octave
 	speed 1
 	volume 160
-	note D_, 3
-	note D#, 2
+	D_ 3
+	D# 2
 	tie
-	note D#, 16
+	D# 16
 	dec_octave
-	note A#, 6
+	A# 6
 	volume 55
-	note A#, 16
+	A# 16
 	volume 160
-	note G#, 6
+	G# 6
 	volume 55
-	note G#, 16
+	G# 16
 	inc_octave
 	volume 160
-	note C_, 3
-	note C#, 8
+	C_ 3
+	C# 8
 	tie
-	note C#, 12
+	C# 12
 	dec_octave
 	speed 6
-	note G#, 1
+	G# 1
 	volume 55
-	note G#, 3
+	G# 3
 	volume 160
-	note F#, 1
+	F# 1
 	speed 7
 	volume 55
-	note F#, 3
+	F# 3
 	speed 1
 	volume 160
-	note B_, 5
+	B_ 5
 	inc_octave
-	note C_, 4
+	C_ 4
 	tie
 	speed 9
-	note C_, 11
+	C_ 11
 	volume 55
-	note C_, 2
+	C_ 2
 	music_end
 
 
@@ -80,11 +80,11 @@ Music_MatchLoss_Ch2: ; f7c87 (3d:7c87)
 	rest 8
 	speed 9
 	rest 6
-	note G_, 6
+	G_ 6
 	tie
-	note G_, 6
+	G_ 6
 	volume 55
-	note G_, 2
+	G_ 2
 	music_end
 
 
@@ -96,35 +96,35 @@ Music_MatchLoss_Ch3: ; f7ca7 (3d:7ca7)
 	musice9 64
 	octave 1
 	speed 5
-	note A#, 4
+	A# 4
 	inc_octave
 	musice8 4
-	note F_, 4
-	note A#, 4
+	F_ 4
+	A# 4
 	dec_octave
 	musice8 8
 	speed 7
-	note G#, 3
+	G# 3
 	inc_octave
 	musice8 4
 	speed 2
-	note D#, 11
-	note G#, 11
+	D# 11
+	G# 11
 	dec_octave
 	musice8 8
 	speed 1
-	note F#, 11
+	F# 11
 	tie
-	note F#, 12
+	F# 12
 	inc_octave
 	musice8 4
 	speed 12
-	note C#, 2
+	C# 2
 	speed 2
-	note F#, 13
+	F# 13
 	dec_octave
 	speed 9
 	musice8 8
-	note F_, 12
+	F_ 12
 	music_end
 ; 0xf7cdf
diff --git a/audio/music/matchstart1.asm b/audio/music/matchstart1.asm
index 0dfeafb..92557ab 100644
--- a/audio/music/matchstart1.asm
+++ b/audio/music/matchstart1.asm
@@ -6,49 +6,49 @@ Music_MatchStart1_Ch1: ; f7919 (3d:7919)
 	duty 2
 	volume 240
 	octave 3
-	note C_, 1
+	C_ 1
 	inc_octave
-	note C_, 1
+	C_ 1
 	dec_octave
-	note G_, 1
+	G_ 1
 	inc_octave
-	note G_, 1
+	G_ 1
 	octave 3
-	note D_, 1
+	D_ 1
 	inc_octave
-	note D_, 1
+	D_ 1
 	dec_octave
-	note A_, 1
+	A_ 1
 	inc_octave
-	note A_, 1
+	A_ 1
 	octave 4
 	duty 1
-	note C_, 1
+	C_ 1
 	inc_octave
-	note C_, 1
+	C_ 1
 	dec_octave
-	note G_, 1
+	G_ 1
 	inc_octave
-	note G_, 1
+	G_ 1
 	octave 4
-	note D_, 1
+	D_ 1
 	inc_octave
-	note D_, 1
+	D_ 1
 	dec_octave
-	note A_, 1
+	A_ 1
 	inc_octave
-	note A_, 1
+	A_ 1
 	EndLoop
 	octave 4
 	volume 96
-	note E_, 1
+	E_ 1
 	inc_octave
-	note E_, 1
+	E_ 1
 	octave 4
 	volume 32
 	dec_octave
-	note B_, 1
+	B_ 1
 	inc_octave
-	note B_, 1
+	B_ 1
 	music_end
 ; 0xf7956
diff --git a/audio/music/matchstart2.asm b/audio/music/matchstart2.asm
index c13b9c8..ef56499 100644
--- a/audio/music/matchstart2.asm
+++ b/audio/music/matchstart2.asm
@@ -5,86 +5,86 @@ Music_MatchStart2_Ch1: ; f7956 (3d:7956)
 	octave 2
 	volume 240
 	duty 0
-	note C_, 1
-	note E_, 1
-	note A_, 1
+	C_ 1
+	E_ 1
+	A_ 1
 	inc_octave
-	note C_, 1
-	note E_, 1
-	note A_, 1
+	C_ 1
+	E_ 1
+	A_ 1
 	dec_octave
-	note D_, 1
-	note F_, 1
-	note B_, 1
+	D_ 1
+	F_ 1
+	B_ 1
 	inc_octave
-	note D_, 1
-	note F_, 1
-	note B_, 1
+	D_ 1
+	F_ 1
+	B_ 1
 	dec_octave
-	note E_, 1
-	note G_, 1
-	note B_, 1
+	E_ 1
+	G_ 1
+	B_ 1
 	inc_octave
-	note C_, 1
-	note E_, 1
-	note B_, 1
+	C_ 1
+	E_ 1
+	B_ 1
 	inc_octave
-	note C_, 1
+	C_ 1
 	octave 3
-	note C_, 1
-	note E_, 1
-	note A_, 1
+	C_ 1
+	E_ 1
+	A_ 1
 	inc_octave
-	note C_, 1
-	note E_, 1
-	note A_, 1
+	C_ 1
+	E_ 1
+	A_ 1
 	dec_octave
-	note D_, 1
-	note F_, 1
-	note B_, 1
+	D_ 1
+	F_ 1
+	B_ 1
 	inc_octave
-	note D_, 1
-	note F_, 1
-	note B_, 1
+	D_ 1
+	F_ 1
+	B_ 1
 	dec_octave
-	note E_, 1
-	note G_, 1
-	note B_, 1
+	E_ 1
+	G_ 1
+	B_ 1
 	inc_octave
-	note C_, 1
-	note E_, 1
-	note B_, 1
+	C_ 1
+	E_ 1
+	B_ 1
 	inc_octave
-	note C_, 1
+	C_ 1
 	octave 4
-	note C_, 1
-	note E_, 1
-	note A_, 1
+	C_ 1
+	E_ 1
+	A_ 1
 	inc_octave
-	note C_, 1
-	note E_, 1
-	note A_, 1
+	C_ 1
+	E_ 1
+	A_ 1
 	dec_octave
-	note D_, 1
-	note F_, 1
-	note B_, 1
+	D_ 1
+	F_ 1
+	B_ 1
 	inc_octave
-	note D_, 1
-	note F_, 1
-	note B_, 1
+	D_ 1
+	F_ 1
+	B_ 1
 	dec_octave
 	volume 96
-	note E_, 1
-	note G_, 1
-	note B_, 1
+	E_ 1
+	G_ 1
+	B_ 1
 	inc_octave
-	note C_, 1
-	note E_, 1
+	C_ 1
+	E_ 1
 	volume 32
-	note G_, 1
-	note B_, 1
+	G_ 1
+	B_ 1
 	inc_octave
-	note C_, 1
+	C_ 1
 	music_end
 
 
@@ -97,80 +97,80 @@ Music_MatchStart2_Ch2: ; f79b4 (3d:79b4)
 	octave 2
 	volume 96
 	duty 0
-	note C_, 1
-	note E_, 1
-	note A_, 1
+	C_ 1
+	E_ 1
+	A_ 1
 	inc_octave
-	note C_, 1
-	note E_, 1
-	note A_, 1
+	C_ 1
+	E_ 1
+	A_ 1
 	dec_octave
-	note D_, 1
-	note F_, 1
-	note B_, 1
+	D_ 1
+	F_ 1
+	B_ 1
 	inc_octave
-	note D_, 1
-	note F_, 1
-	note B_, 1
+	D_ 1
+	F_ 1
+	B_ 1
 	dec_octave
-	note E_, 1
-	note G_, 1
-	note B_, 1
+	E_ 1
+	G_ 1
+	B_ 1
 	inc_octave
-	note C_, 1
-	note E_, 1
-	note B_, 1
+	C_ 1
+	E_ 1
+	B_ 1
 	inc_octave
-	note C_, 1
+	C_ 1
 	octave 3
-	note C_, 1
-	note E_, 1
-	note A_, 1
+	C_ 1
+	E_ 1
+	A_ 1
 	inc_octave
-	note C_, 1
-	note E_, 1
-	note A_, 1
+	C_ 1
+	E_ 1
+	A_ 1
 	dec_octave
-	note D_, 1
-	note F_, 1
-	note B_, 1
+	D_ 1
+	F_ 1
+	B_ 1
 	inc_octave
-	note D_, 1
-	note F_, 1
-	note B_, 1
+	D_ 1
+	F_ 1
+	B_ 1
 	dec_octave
-	note E_, 1
-	note G_, 1
-	note B_, 1
+	E_ 1
+	G_ 1
+	B_ 1
 	inc_octave
-	note C_, 1
-	note E_, 1
-	note B_, 1
+	C_ 1
+	E_ 1
+	B_ 1
 	inc_octave
-	note C_, 1
+	C_ 1
 	octave 4
-	note C_, 1
-	note E_, 1
-	note A_, 1
+	C_ 1
+	E_ 1
+	A_ 1
 	inc_octave
-	note C_, 1
-	note E_, 1
-	note A_, 1
+	C_ 1
+	E_ 1
+	A_ 1
 	dec_octave
-	note D_, 1
-	note F_, 1
-	note B_, 1
+	D_ 1
+	F_ 1
+	B_ 1
 	inc_octave
-	note D_, 1
-	note F_, 1
-	note B_, 1
+	D_ 1
+	F_ 1
+	B_ 1
 	dec_octave
 	volume 32
-	note E_, 1
-	note G_, 1
-	note B_, 1
+	E_ 1
+	G_ 1
+	B_ 1
 	inc_octave
-	note C_, 1
-	note E_, 1
+	C_ 1
+	E_ 1
 	music_end
 ; 0xf7a0f
diff --git a/audio/music/matchstart3.asm b/audio/music/matchstart3.asm
index b0e51f0..995d017 100644
--- a/audio/music/matchstart3.asm
+++ b/audio/music/matchstart3.asm
@@ -5,161 +5,161 @@ Music_MatchStart3_Ch1: ; f7a0f (3d:7a0f)
 	octave 2
 	volume 240
 	duty 1
-	note C_, 1
-	note E_, 1
-	note G_, 1
-	note B_, 1
-	note D_, 1
-	note F_, 1
-	note A_, 1
-	note E_, 1
-	note G_, 1
-	note B_, 1
+	C_ 1
+	E_ 1
+	G_ 1
+	B_ 1
+	D_ 1
+	F_ 1
+	A_ 1
+	E_ 1
+	G_ 1
+	B_ 1
 	octave 3
-	note C_, 1
-	note E_, 1
-	note G_, 1
-	note B_, 1
-	note D_, 1
-	note F_, 1
-	note A_, 1
-	note E_, 1
-	note G_, 1
-	note B_, 1
+	C_ 1
+	E_ 1
+	G_ 1
+	B_ 1
+	D_ 1
+	F_ 1
+	A_ 1
+	E_ 1
+	G_ 1
+	B_ 1
 	octave 4
-	note C_, 1
-	note E_, 1
-	note G_, 1
-	note B_, 1
-	note D_, 1
-	note F_, 1
-	note A_, 1
-	note E_, 1
-	note G_, 1
-	note B_, 1
+	C_ 1
+	E_ 1
+	G_ 1
+	B_ 1
+	D_ 1
+	F_ 1
+	A_ 1
+	E_ 1
+	G_ 1
+	B_ 1
 	octave 5
-	note C_, 1
-	note E_, 1
-	note G_, 1
-	note B_, 1
+	C_ 1
+	E_ 1
+	G_ 1
+	B_ 1
 	octave 2
 	duty 3
-	note D_, 1
-	note F_, 1
-	note A_, 1
+	D_ 1
+	F_ 1
+	A_ 1
 	inc_octave
-	note C_, 1
+	C_ 1
 	dec_octave
-	note E_, 1
-	note G_, 1
-	note B_, 1
-	note F_, 1
-	note A_, 1
+	E_ 1
+	G_ 1
+	B_ 1
+	F_ 1
+	A_ 1
 	inc_octave
-	note C_, 1
+	C_ 1
 	octave 3
-	note D_, 1
-	note F_, 1
-	note A_, 1
+	D_ 1
+	F_ 1
+	A_ 1
 	inc_octave
-	note C_, 1
+	C_ 1
 	dec_octave
-	note E_, 1
-	note G_, 1
-	note B_, 1
-	note F_, 1
-	note A_, 1
+	E_ 1
+	G_ 1
+	B_ 1
+	F_ 1
+	A_ 1
 	inc_octave
-	note C_, 1
+	C_ 1
 	octave 4
-	note D_, 1
-	note F_, 1
-	note A_, 1
+	D_ 1
+	F_ 1
+	A_ 1
 	inc_octave
-	note C_, 1
+	C_ 1
 	dec_octave
-	note E_, 1
-	note G_, 1
-	note B_, 1
-	note F_, 1
-	note A_, 1
+	E_ 1
+	G_ 1
+	B_ 1
+	F_ 1
+	A_ 1
 	inc_octave
-	note C_, 1
+	C_ 1
 	octave 5
-	note D_, 1
-	note F_, 1
-	note A_, 1
+	D_ 1
+	F_ 1
+	A_ 1
 	inc_octave
-	note C_, 1
+	C_ 1
 	octave 2
 	duty 1
-	note E_, 1
-	note G_, 1
-	note B_, 1
+	E_ 1
+	G_ 1
+	B_ 1
 	inc_octave
-	note D_, 1
+	D_ 1
 	dec_octave
-	note F_, 1
-	note A_, 1
+	F_ 1
+	A_ 1
 	inc_octave
-	note C_, 1
+	C_ 1
 	dec_octave
-	note G_, 1
-	note B_, 1
+	G_ 1
+	B_ 1
 	inc_octave
-	note D_, 1
+	D_ 1
 	octave 3
-	note E_, 1
-	note G_, 1
-	note B_, 1
+	E_ 1
+	G_ 1
+	B_ 1
 	inc_octave
-	note D_, 1
+	D_ 1
 	dec_octave
-	note F_, 1
-	note A_, 1
+	F_ 1
+	A_ 1
 	inc_octave
-	note C_, 1
+	C_ 1
 	dec_octave
-	note G_, 1
-	note B_, 1
+	G_ 1
+	B_ 1
 	inc_octave
-	note D_, 1
+	D_ 1
 	octave 4
-	note E_, 1
-	note G_, 1
-	note B_, 1
+	E_ 1
+	G_ 1
+	B_ 1
 	inc_octave
-	note D_, 1
+	D_ 1
 	dec_octave
-	note F_, 1
-	note A_, 1
+	F_ 1
+	A_ 1
 	inc_octave
-	note C_, 1
+	C_ 1
 	dec_octave
-	note G_, 1
-	note B_, 1
+	G_ 1
+	B_ 1
 	inc_octave
-	note D_, 1
+	D_ 1
 	octave 5
-	note E_, 1
-	note G_, 1
-	note B_, 1
+	E_ 1
+	G_ 1
+	B_ 1
 	inc_octave
-	note D_, 1
+	D_ 1
 	dec_octave
 	octave 4
 	volume 96
-	note F_, 1
-	note A_, 1
+	F_ 1
+	A_ 1
 	inc_octave
-	note C_, 1
+	C_ 1
 	dec_octave
 	octave 5
 	volume 32
-	note G_, 1
-	note B_, 1
+	G_ 1
+	B_ 1
 	inc_octave
-	note D_, 1
+	D_ 1
 	music_end
 
 
@@ -172,154 +172,154 @@ Music_MatchStart3_Ch2: ; f7aba (3d:7aba)
 	octave 2
 	volume 96
 	duty 1
-	note C_, 1
-	note E_, 1
-	note G_, 1
-	note B_, 1
-	note D_, 1
-	note F_, 1
-	note A_, 1
-	note E_, 1
-	note G_, 1
-	note B_, 1
+	C_ 1
+	E_ 1
+	G_ 1
+	B_ 1
+	D_ 1
+	F_ 1
+	A_ 1
+	E_ 1
+	G_ 1
+	B_ 1
 	octave 3
-	note C_, 1
-	note E_, 1
-	note G_, 1
-	note B_, 1
-	note D_, 1
-	note F_, 1
-	note A_, 1
-	note E_, 1
-	note G_, 1
-	note B_, 1
+	C_ 1
+	E_ 1
+	G_ 1
+	B_ 1
+	D_ 1
+	F_ 1
+	A_ 1
+	E_ 1
+	G_ 1
+	B_ 1
 	octave 4
-	note C_, 1
-	note E_, 1
-	note G_, 1
-	note B_, 1
-	note D_, 1
-	note F_, 1
-	note A_, 1
-	note E_, 1
-	note G_, 1
-	note B_, 1
+	C_ 1
+	E_ 1
+	G_ 1
+	B_ 1
+	D_ 1
+	F_ 1
+	A_ 1
+	E_ 1
+	G_ 1
+	B_ 1
 	octave 5
-	note C_, 1
-	note E_, 1
-	note G_, 1
-	note B_, 1
+	C_ 1
+	E_ 1
+	G_ 1
+	B_ 1
 	octave 2
 	duty 3
-	note D_, 1
-	note F_, 1
-	note A_, 1
+	D_ 1
+	F_ 1
+	A_ 1
 	inc_octave
-	note C_, 1
+	C_ 1
 	dec_octave
-	note E_, 1
-	note G_, 1
-	note B_, 1
-	note F_, 1
-	note A_, 1
+	E_ 1
+	G_ 1
+	B_ 1
+	F_ 1
+	A_ 1
 	inc_octave
-	note C_, 1
+	C_ 1
 	octave 3
-	note D_, 1
-	note F_, 1
-	note A_, 1
+	D_ 1
+	F_ 1
+	A_ 1
 	inc_octave
-	note C_, 1
+	C_ 1
 	dec_octave
-	note E_, 1
-	note G_, 1
-	note B_, 1
-	note F_, 1
-	note A_, 1
+	E_ 1
+	G_ 1
+	B_ 1
+	F_ 1
+	A_ 1
 	inc_octave
-	note C_, 1
+	C_ 1
 	octave 4
-	note D_, 1
-	note F_, 1
-	note A_, 1
+	D_ 1
+	F_ 1
+	A_ 1
 	inc_octave
-	note C_, 1
+	C_ 1
 	dec_octave
-	note E_, 1
-	note G_, 1
-	note B_, 1
-	note F_, 1
-	note A_, 1
+	E_ 1
+	G_ 1
+	B_ 1
+	F_ 1
+	A_ 1
 	inc_octave
-	note C_, 1
+	C_ 1
 	octave 5
-	note D_, 1
-	note F_, 1
-	note A_, 1
+	D_ 1
+	F_ 1
+	A_ 1
 	inc_octave
-	note C_, 1
+	C_ 1
 	octave 2
 	duty 1
-	note E_, 1
-	note G_, 1
-	note B_, 1
+	E_ 1
+	G_ 1
+	B_ 1
 	inc_octave
-	note D_, 1
+	D_ 1
 	dec_octave
-	note F_, 1
-	note A_, 1
+	F_ 1
+	A_ 1
 	inc_octave
-	note C_, 1
+	C_ 1
 	dec_octave
-	note G_, 1
-	note B_, 1
+	G_ 1
+	B_ 1
 	inc_octave
-	note D_, 1
+	D_ 1
 	octave 3
-	note E_, 1
-	note G_, 1
-	note B_, 1
+	E_ 1
+	G_ 1
+	B_ 1
 	inc_octave
-	note D_, 1
+	D_ 1
 	dec_octave
-	note F_, 1
-	note A_, 1
+	F_ 1
+	A_ 1
 	inc_octave
-	note C_, 1
+	C_ 1
 	dec_octave
-	note G_, 1
-	note B_, 1
+	G_ 1
+	B_ 1
 	inc_octave
-	note D_, 1
+	D_ 1
 	octave 4
-	note E_, 1
-	note G_, 1
-	note B_, 1
+	E_ 1
+	G_ 1
+	B_ 1
 	inc_octave
-	note D_, 1
+	D_ 1
 	dec_octave
-	note F_, 1
-	note A_, 1
+	F_ 1
+	A_ 1
 	inc_octave
-	note C_, 1
+	C_ 1
 	dec_octave
-	note G_, 1
-	note B_, 1
+	G_ 1
+	B_ 1
 	inc_octave
-	note D_, 1
+	D_ 1
 	octave 5
-	note E_, 1
-	note G_, 1
-	note B_, 1
+	E_ 1
+	G_ 1
+	B_ 1
 	inc_octave
-	note D_, 1
+	D_ 1
 	dec_octave
 	octave 4
 	volume 32
-	note F_, 1
-	note A_, 1
+	F_ 1
+	A_ 1
 	inc_octave
-	note C_, 1
+	C_ 1
 	dec_octave
 	music_end
 ; 0xf7b61
diff --git a/audio/music/matchvictory.asm b/audio/music/matchvictory.asm
index b9b1be1..44adeea 100644
--- a/audio/music/matchvictory.asm
+++ b/audio/music/matchvictory.asm
@@ -7,49 +7,49 @@ Music_MatchVictory_Ch1: ; f7b61 (3d:7b61)
 	duty 0
 	volume 176
 	speed 1
-	note A_, 15
+	A_ 15
 	tie
-	note A_, 9
+	A_ 9
 	volume 39
-	note A_, 5
+	A_ 5
 	volume 176
-	note A_, 7
+	A_ 7
 	volume 39
-	note A_, 3
+	A_ 3
 	volume 176
-	note F_, 7
+	F_ 7
 	volume 39
-	note F_, 3
+	F_ 3
 	volume 176
-	note A_, 7
+	A_ 7
 	volume 39
-	note A_, 2
+	A_ 2
 	volume 176
-	note B_, 11
+	B_ 11
 	volume 39
-	note B_, 10
+	B_ 10
 	inc_octave
 	volume 176
-	note C_, 10
+	C_ 10
 	volume 39
-	note C_, 11
+	C_ 11
 	volume 176
-	note D_, 10
+	D_ 10
 	volume 39
-	note D_, 10
+	D_ 10
 	volume 176
-	note C#, 8
+	C# 8
 	volume 39
-	note C#, 13
+	C# 13
 	volume 176
-	note D_, 5
+	D_ 5
 	volume 39
-	note D_, 6
+	D_ 6
 	volume 176
 	speed 8
-	note E_, 12
+	E_ 12
 	volume 39
-	note E_, 4
+	E_ 4
 	music_end
 
 
@@ -62,57 +62,57 @@ Music_MatchVictory_Ch2: ; f7bb0 (3d:7bb0)
 	duty 0
 	volume 176
 	speed 1
-	note F_, 5
+	F_ 5
 	volume 39
-	note F_, 5
+	F_ 5
 	dec_octave
 	volume 176
-	note A_, 5
+	A_ 5
 	inc_octave
-	note C_, 5
-	note F_, 5
+	C_ 5
+	F_ 5
 	volume 39
-	note F_, 4
+	F_ 4
 	volume 176
-	note C_, 7
+	C_ 7
 	volume 39
-	note C_, 3
+	C_ 3
 	dec_octave
 	volume 176
-	note A_, 7
+	A_ 7
 	volume 39
-	note A_, 3
+	A_ 3
 	inc_octave
 	volume 176
-	note C_, 7
+	C_ 7
 	volume 39
-	note C_, 2
+	C_ 2
 	volume 176
-	note G_, 11
+	G_ 11
 	volume 39
-	note G_, 10
+	G_ 10
 	volume 176
-	note A_, 10
+	A_ 10
 	volume 39
-	note A_, 11
+	A_ 11
 	volume 176
-	note B_, 10
+	B_ 10
 	volume 39
-	note B_, 10
+	B_ 10
 	volume 176
-	note A_, 8
+	A_ 8
 	volume 39
-	note A_, 13
+	A_ 13
 	volume 176
-	note B_, 5
+	B_ 5
 	volume 39
-	note B_, 6
+	B_ 6
 	inc_octave
 	volume 176
 	speed 8
-	note C#, 12
+	C# 12
 	volume 39
-	note C#, 4
+	C# 4
 	music_end
 
 
@@ -124,27 +124,27 @@ Music_MatchVictory_Ch3: ; f7c09 (3d:7c09)
 	musice9 0
 	octave 1
 	speed 1
-	note F_, 15
+	F_ 15
 	tie
-	note F_, 9
+	F_ 9
 	rest 5
-	note F_, 7
+	F_ 7
 	rest 3
-	note F_, 7
+	F_ 7
 	rest 3
-	note F_, 7
+	F_ 7
 	rest 2
-	note G_, 11
+	G_ 11
 	rest 10
-	note G_, 11
+	G_ 11
 	rest 10
-	note G_, 10
+	G_ 10
 	rest 10
-	note A_, 8
+	A_ 8
 	rest 13
-	note E_, 5
+	E_ 5
 	rest 6
 	speed 8
-	note A_, 12
+	A_ 12
 	music_end
 ; 0xf7c2e
diff --git a/audio/music/medal.asm b/audio/music/medal.asm
index bcbc5a4..638c365 100644
--- a/audio/music/medal.asm
+++ b/audio/music/medal.asm
@@ -7,58 +7,58 @@ Music_Medal_Ch1: ; f7df8 (3d:7df8)
 	duty 1
 	volume 160
 	speed 1
-	note E_, 5
-	note A_, 5
+	E_ 5
+	A_ 5
 	inc_octave
-	note C#, 5
-	note E_, 5
-	note A_, 5
+	C# 5
+	E_ 5
+	A_ 5
 	inc_octave
-	note C#, 5
+	C# 5
 	dec_octave
 	dec_octave
-	note A_, 5
+	A_ 5
 	inc_octave
-	note C#, 5
-	note E_, 5
-	note A_, 5
+	C# 5
+	E_ 5
+	A_ 5
 	inc_octave
-	note C#, 5
-	note E_, 5
+	C# 5
+	E_ 5
 	speed 15
-	note A_, 2
+	A_ 2
 	tie
 	speed 1
-	note A_, 10
+	A_ 10
 	volume 55
-	note A_, 5
+	A_ 5
 	volume 160
 	musice8 7
-	note A_, 5
-	note A_, 5
-	note A_, 5
+	A_ 5
+	A_ 5
+	A_ 5
 	musice8 8
-	note A_, 15
+	A_ 15
 	volume 55
-	note A_, 5
+	A_ 5
 	volume 160
-	note A_, 16
+	A_ 16
 	volume 55
-	note A_, 5
+	A_ 5
 	volume 160
-	note A_, 16
+	A_ 16
 	volume 55
-	note A_, 6
+	A_ 6
 	volume 160
 	speed 9
-	note A_, 5
+	A_ 5
 	tie
-	note A_, 8
+	A_ 8
 	tie
 	speed 1
-	note A_, 2
+	A_ 2
 	volume 55
-	note A_, 16
+	A_ 16
 	music_end
 
 
@@ -71,57 +71,57 @@ Music_Medal_Ch2: ; f7e4b (3d:7e4b)
 	duty 0
 	volume 144
 	speed 1
-	note A_, 5
+	A_ 5
 	inc_octave
-	note C#, 5
-	note E_, 5
-	note A_, 5
+	C# 5
+	E_ 5
+	A_ 5
 	inc_octave
-	note C#, 5
-	note E_, 5
+	C# 5
+	E_ 5
 	dec_octave
-	note C#, 5
-	note E_, 5
-	note A_, 5
+	C# 5
+	E_ 5
+	A_ 5
 	inc_octave
-	note C#, 5
-	note E_, 5
-	note A_, 5
+	C# 5
+	E_ 5
+	A_ 5
 	inc_octave
 	speed 15
-	note C_, 2
+	C_ 2
 	tie
 	speed 1
-	note C_, 10
+	C_ 10
 	volume 39
-	note C_, 5
+	C_ 5
 	volume 160
 	musice8 7
-	note C_, 5
-	note C_, 5
-	note C_, 5
+	C_ 5
+	C_ 5
+	C_ 5
 	musice8 8
-	note D_, 15
+	D_ 15
 	volume 55
-	note D_, 5
+	D_ 5
 	volume 144
-	note D_, 16
+	D_ 16
 	volume 39
-	note D_, 5
+	D_ 5
 	volume 144
-	note D_, 16
+	D_ 16
 	volume 55
-	note D_, 6
+	D_ 6
 	volume 144
 	speed 9
-	note C#, 5
+	C# 5
 	tie
-	note C#, 8
+	C# 8
 	tie
 	speed 1
-	note C#, 2
+	C# 2
 	volume 39
-	note C#, 16
+	C# 16
 	music_end
 
 
@@ -135,26 +135,26 @@ Music_Medal_Ch3: ; f7e9d (3d:7e9d)
 	speed 1
 	speed 15
 	rest 4
-	note F_, 2
+	F_ 2
 	tie
 	speed 1
-	note F_, 10
+	F_ 10
 	rest 5
 	musice8 7
-	note F_, 5
-	note F_, 5
-	note F_, 5
+	F_ 5
+	F_ 5
+	F_ 5
 	musice8 8
-	note A#, 15
+	A# 15
 	rest 5
-	note A#, 16
+	A# 16
 	rest 5
-	note A#, 16
+	A# 16
 	rest 6
 	speed 9
-	note A_, 13
+	A_ 13
 	tie
 	speed 1
-	note A_, 2
+	A_ 2
 	music_end
 ; 0xf7ec8
diff --git a/audio/music/overworld.asm b/audio/music/overworld.asm
index f4511b9..3497988 100644
--- a/audio/music/overworld.asm
+++ b/audio/music/overworld.asm
@@ -16,178 +16,178 @@ Music_Overworld_Ch1: ; f71a0 (3d:71a0)
 	musice8 8
 	octave 3
 	volume 160
-	note A_, 5
+	A_ 5
 	volume 55
-	note A_, 1
+	A_ 1
 	inc_octave
 	volume 160
-	note C_, 5
+	C_ 5
 	volume 55
-	note C_, 1
+	C_ 1
 	volume 160
-	note F_, 3
+	F_ 3
 	speed 1
-	note E_, 11
+	E_ 11
 	volume 55
-	note E_, 10
+	E_ 10
 	volume 160
 	speed 7
-	note G_, 3
+	G_ 3
 	speed 1
-	note F_, 11
+	F_ 11
 	volume 55
-	note F_, 10
+	F_ 10
 	speed 7
 	volume 160
-	note C_, 12
+	C_ 12
 	volume 55
-	note C_, 2
+	C_ 2
 	duty 0
 	volume 146
 	musice8 7
 	octave 3
-	note E_, 4
-	note E_, 3
-	note E_, 3
+	E_ 4
+	E_ 3
+	E_ 3
 	duty 1
 	volume 160
 	musice8 8
 	music_call Branch_f72fb
-	note C_, 6
+	C_ 6
 	volume 55
-	note C_, 6
+	C_ 6
 	volume 160
-	note C_, 3
-	note D_, 3
-	note E_, 3
-	note G_, 6
+	C_ 3
+	D_ 3
+	E_ 3
+	G_ 6
 	volume 55
-	note G_, 3
+	G_ 3
 	volume 160
-	note F_, 4
+	F_ 4
 	volume 55
-	note F_, 2
+	F_ 2
 	volume 160
-	note C_, 3
+	C_ 3
 	dec_octave
-	note A_, 6
-	note A#, 9
+	A_ 6
+	A# 9
 	volume 55
-	note A#, 6
+	A# 6
 	volume 160
-	note A#, 3
+	A# 3
 	inc_octave
-	note D_, 3
-	note F_, 3
-	note A_, 3
+	D_ 3
+	F_ 3
+	A_ 3
 	volume 55
-	note A_, 6
+	A_ 6
 	volume 160
-	note G_, 3
+	G_ 3
 	volume 55
-	note G_, 3
+	G_ 3
 	volume 160
-	note E_, 3
-	note D_, 3
+	E_ 3
+	D_ 3
 	volume 55
-	note D_, 3
+	D_ 3
 	volume 160
-	note E_, 2
+	E_ 2
 	volume 55
-	note E_, 1
+	E_ 1
 	volume 160
 	musice8 8
-	note C_, 9
+	C_ 9
 	volume 55
-	note C_, 3
+	C_ 3
 	volume 160
 	dec_octave
-	note A_, 3
+	A_ 3
 	inc_octave
 	speed 1
-	note C_, 11
+	C_ 11
 	volume 64
-	note C_, 10
+	C_ 10
 	speed 7
 	volume 160
-	note G_, 3
+	G_ 3
 	speed 1
-	note F_, 11
+	F_ 11
 	volume 64
-	note F_, 10
+	F_ 10
 	speed 7
 	volume 160
-	note C_, 12
+	C_ 12
 	volume 55
-	note C_, 6
+	C_ 6
 	duty 2
 	musice8 8
 	volume 95
 	octave 4
-	note G_, 1
+	G_ 1
 	tie
-	note E_, 1
+	E_ 1
 	tie
-	note C_, 1
+	C_ 1
 	tie
 	dec_octave
-	note G_, 1
+	G_ 1
 	tie
-	note E_, 1
+	E_ 1
 	tie
-	note C_, 1
+	C_ 1
 	duty 1
 	volume 160
 	musice8 8
 	music_call Branch_f72fb
-	note C_, 6
+	C_ 6
 	volume 55
-	note C_, 6
+	C_ 6
 	volume 160
-	note C_, 3
-	note D_, 3
-	note E_, 3
-	note F_, 9
+	C_ 3
+	D_ 3
+	E_ 3
+	F_ 9
 	volume 55
-	note F_, 12
+	F_ 12
 	volume 160
-	note F_, 2
-	note G_, 1
-	note A_, 1
+	F_ 2
+	G_ 1
+	A_ 1
 	volume 55
-	note A_, 2
+	A_ 2
 	volume 160
-	note A_, 12
+	A_ 12
 	volume 55
-	note A_, 3
+	A_ 3
 	volume 160
-	note D_, 3
-	note A_, 3
-	note A#, 9
+	D_ 3
+	A_ 3
+	A# 9
 	volume 55
-	note A#, 6
+	A# 6
 	volume 160
-	note A_, 5
+	A_ 5
 	volume 55
-	note A_, 1
+	A_ 1
 	volume 160
-	note G_, 5
+	G_ 5
 	volume 55
-	note G_, 1
+	G_ 1
 	volume 144
-	note F_, 8
+	F_ 8
 	tie
-	note F_, 8
+	F_ 8
 	tie
-	note F_, 8
+	F_ 8
 	tie
-	note F_, 8
+	F_ 8
 	tie
-	note F_, 8
+	F_ 8
 	tie
-	note F_, 8
+	F_ 8
 	volume 55
-	note F_, 3
+	F_ 3
 	duty 0
 	volume 162
 	musice8 7
@@ -195,91 +195,91 @@ Music_Overworld_Ch1: ; f71a0 (3d:71a0)
 
 Branch_f72ba:
 	octave 3
-	note F_, 3
-	note F_, 2
-	note A_, 1
+	F_ 3
+	F_ 2
+	A_ 1
 	inc_octave
 	volume 160
 	musice8 4
-	note C_, 1
+	C_ 1
 	rest 1
 	dec_octave
 	volume 146
 	musice8 7
-	note A#, 3
-	note A#, 1
+	A# 3
+	A# 1
 	inc_octave
 	volume 160
 	musice8 4
-	note D_, 1
+	D_ 1
 	rest 2
 	dec_octave
 	volume 146
 	musice8 7
-	note G_, 3
-	note A#, 3
+	G_ 3
+	A# 3
 	rest 3
-	note A_, 3
-	note A_, 2
+	A_ 3
+	A_ 2
 	inc_octave
-	note C_, 1
+	C_ 1
 	volume 160
 	musice8 4
-	note C_, 1
+	C_ 1
 	rest 1
 	dec_octave
 	volume 146
 	musice8 7
-	note A#, 3
-	note A#, 1
+	A# 3
+	A# 1
 	inc_octave
 	volume 160
 	musice8 4
-	note D_, 1
+	D_ 1
 	rest 2
 	volume 146
 	musice8 7
-	note C_, 3
+	C_ 3
 	dec_octave
-	note A#, 3
+	A# 3
 	music_ret
 
 Branch_f72fb:
 	octave 4
 	volume 160
-	note D_, 5
+	D_ 5
 	volume 55
-	note D_, 1
+	D_ 1
 	volume 160
-	note F_, 5
+	F_ 5
 	volume 55
-	note F_, 1
+	F_ 1
 	volume 160
-	note A_, 3
+	A_ 3
 	speed 1
-	note G_, 11
+	G_ 11
 	volume 55
-	note G_, 10
+	G_ 10
 	speed 7
 	inc_octave
 	volume 160
-	note C_, 3
+	C_ 3
 	dec_octave
 	speed 1
-	note A#, 11
+	A# 11
 	volume 55
-	note A#, 10
+	A# 10
 	speed 7
 	volume 160
-	note C#, 12
+	C# 12
 	volume 55
-	note C#, 6
+	C# 6
 	volume 160
-	note D#, 3
+	D# 3
 	speed 1
-	note C#, 11
+	C# 11
 	volume 55
-	note C#, 10
+	C# 10
 	volume 160
 	speed 7
 	music_ret
@@ -299,374 +299,374 @@ Music_Overworld_Ch2: ; f7334 (3d:7334)
 	volume 146
 	musice8 7
 	rest 3
-	note C_, 5
-	note C_, 3
+	C_ 5
+	C_ 3
 	volume 144
 	musice8 4
 	inc_octave
-	note F_, 1
+	F_ 1
 	rest 2
 	dec_octave
 	volume 146
 	musice8 7
-	note C_, 4
-	note C_, 3
-	note C_, 3
+	C_ 4
+	C_ 3
+	C_ 3
 	rest 3
-	note C_, 5
-	note C_, 3
+	C_ 5
+	C_ 3
 	volume 144
 	musice8 4
 	inc_octave
-	note G_, 1
+	G_ 1
 	rest 2
 	dec_octave
 	volume 146
 	musice8 7
-	note D_, 4
-	note D_, 3
-	note C_, 3
+	D_ 4
+	D_ 3
+	C_ 3
 	rest 3
 	dec_octave
-	note A#, 5
+	A# 5
 	inc_octave
-	note D_, 3
+	D_ 3
 	volume 144
 	musice8 4
 	inc_octave
-	note F_, 1
+	F_ 1
 	rest 2
 	dec_octave
 	volume 146
 	musice8 7
-	note C_, 4
-	note C_, 3
+	C_ 4
+	C_ 3
 	dec_octave
-	note A#, 3
+	A# 3
 	rest 3
-	note A#, 5
+	A# 5
 	inc_octave
-	note C#, 3
+	C# 3
 	volume 144
 	musice8 4
 	inc_octave
-	note F_, 1
+	F_ 1
 	rest 2
 	dec_octave
 	volume 146
 	musice8 7
-	note C#, 4
+	C# 4
 	dec_octave
-	note F_, 3
-	note A#, 3
+	F_ 3
+	A# 3
 	rest 3
 	inc_octave
-	note C_, 3
-	note E_, 2
-	note C_, 3
+	C_ 3
+	E_ 2
+	C_ 3
 	volume 144
 	musice8 4
 	inc_octave
-	note G_, 1
+	G_ 1
 	musice8 7
 	volume 96
 	musice8 8
 	octave 3
-	note E_, 3
-	note F_, 3
-	note G_, 3
+	E_ 3
+	F_ 3
+	G_ 3
 	musice8 7
-	note A#, 6
+	A# 6
 	volume 146
 	musice8 7
 	octave 3
-	note D_, 3
+	D_ 3
 	volume 96
 	musice8 8
 	octave 3
-	note A_, 3
+	A_ 3
 	volume 146
 	musice8 7
 	octave 2
-	note A_, 2
+	A_ 2
 	inc_octave
 	inc_octave
 	volume 144
 	musice8 4
-	note F_, 1
+	F_ 1
 	dec_octave
 	rest 2
 	volume 146
 	musice8 7
-	note D_, 4
-	note D_, 3
+	D_ 4
+	D_ 3
 	dec_octave
-	note A_, 3
+	A_ 3
 	rest 3
-	note A#, 3
+	A# 3
 	inc_octave
-	note D_, 2
+	D_ 2
 	dec_octave
-	note A#, 3
+	A# 3
 	volume 144
 	musice8 4
 	inc_octave
 	inc_octave
-	note F_, 1
+	F_ 1
 	rest 2
 	dec_octave
 	dec_octave
 	volume 146
 	musice8 7
-	note A#, 4
-	note A#, 3
-	note A#, 3
+	A# 4
+	A# 3
+	A# 3
 	rest 3
-	note A#, 3
+	A# 3
 	inc_octave
-	note D_, 2
+	D_ 2
 	dec_octave
-	note A#, 3
+	A# 3
 	volume 144
 	musice8 4
 	inc_octave
-	note A_, 1
+	A_ 1
 	rest 2
 	dec_octave
 	volume 146
 	musice8 7
-	note A#, 6
+	A# 6
 	inc_octave
-	note D_, 1
+	D_ 1
 	dec_octave
-	note A#, 3
+	A# 3
 	rest 3
 	inc_octave
-	note C_, 5
-	note C_, 3
+	C_ 5
+	C_ 3
 	volume 144
 	musice8 4
 	inc_octave
-	note F_, 1
+	F_ 1
 	rest 2
 	volume 146
 	musice8 7
 	dec_octave
-	note C_, 4
-	note C_, 3
-	note C_, 3
+	C_ 4
+	C_ 3
+	C_ 3
 	rest 3
-	note C_, 5
-	note C_, 3
+	C_ 5
+	C_ 3
 	volume 144
 	musice8 4
 	inc_octave
-	note G_, 1
+	G_ 1
 	rest 2
 	dec_octave
 	volume 146
 	musice8 7
-	note D_, 4
+	D_ 4
 	duty 2
 	volume 95
 	musice8 8
 	octave 4
-	note C_, 1
+	C_ 1
 	tie
 	dec_octave
-	note G_, 1
+	G_ 1
 	tie
-	note E_, 1
+	E_ 1
 	tie
-	note C_, 1
+	C_ 1
 	tie
 	dec_octave
-	note G_, 1
+	G_ 1
 	tie
-	note E_, 1
+	E_ 1
 	duty 0
 	volume 146
 	musice8 7
 	octave 2
 	rest 3
-	note A#, 5
+	A# 5
 	inc_octave
-	note D_, 3
+	D_ 3
 	volume 144
 	musice8 4
 	inc_octave
-	note F_, 1
+	F_ 1
 	rest 2
 	dec_octave
 	volume 146
 	musice8 7
-	note C_, 4
-	note C_, 3
+	C_ 4
+	C_ 3
 	dec_octave
-	note A#, 3
+	A# 3
 	rest 3
-	note A#, 5
+	A# 5
 	inc_octave
-	note C#, 3
+	C# 3
 	volume 144
 	musice8 4
 	inc_octave
-	note F_, 1
+	F_ 1
 	rest 2
 	dec_octave
 	volume 146
 	musice8 7
-	note C#, 4
-	note C#, 3
-	note C#, 3
+	C# 4
+	C# 3
+	C# 3
 	rest 3
-	note C_, 3
+	C_ 3
 	dec_octave
-	note A_, 2
+	A_ 2
 	inc_octave
-	note C_, 3
+	C_ 3
 	volume 144
 	musice8 4
 	inc_octave
-	note G_, 1
+	G_ 1
 	rest 2
 	dec_octave
 	volume 146
 	musice8 7
-	note C_, 4
-	note E_, 3
-	note C_, 3
+	C_ 4
+	E_ 3
+	C_ 3
 	rest 3
-	note D_, 6
+	D_ 6
 	dec_octave
-	note B_, 2
+	B_ 2
 	inc_octave
 	inc_octave
 	volume 144
 	musice8 4
-	note F_, 1
+	F_ 1
 	rest 2
 	dec_octave
 	volume 146
 	musice8 7
-	note D_, 4
+	D_ 4
 	volume 96
 	musice8 8
 	octave 4
-	note D_, 2
-	note E_, 1
-	note F_, 1
+	D_ 2
+	E_ 1
+	F_ 1
 	volume 39
-	note F_, 2
+	F_ 2
 	volume 96
-	note F_, 11
+	F_ 11
 	volume 146
 	musice8 7
 	octave 4
 	volume 144
 	musice8 4
-	note F_, 1
+	F_ 1
 	rest 2
 	dec_octave
 	dec_octave
 	volume 146
 	musice8 7
-	note A#, 1
+	A# 1
 	volume 96
 	musice8 8
 	octave 3
-	note A#, 3
+	A# 3
 	inc_octave
-	note F_, 3
-	note G_, 9
+	F_ 3
+	G_ 9
 	volume 146
 	musice8 7
 	octave 3
-	note D_, 2
+	D_ 2
 	dec_octave
-	note A#, 3
+	A# 3
 	inc_octave
 	inc_octave
 	volume 144
 	musice8 4
-	note F_, 1
+	F_ 1
 	musice8 8
 	volume 96
 	octave 4
-	note C_, 5
+	C_ 5
 	volume 39
-	note C_, 1
+	C_ 1
 	dec_octave
 	volume 144
-	note A#, 5
+	A# 5
 	volume 39
-	note A#, 1
+	A# 1
 	volume 146
 	musice8 7
 	octave 3
 	rest 3
-	note F_, 3
-	note C_, 2
-	note F_, 1
+	F_ 3
+	C_ 2
+	F_ 1
 	volume 144
 	musice8 4
 	inc_octave
-	note F_, 1
+	F_ 1
 	rest 1
 	dec_octave
 	volume 146
 	musice8 7
-	note G_, 3
-	note G_, 3
+	G_ 3
+	G_ 3
 	speed 1
 	volume 144
 	musice8 8
 	inc_octave
-	note F_, 4
-	note C_, 3
+	F_ 4
+	C_ 3
 	speed 7
 	dec_octave
 	volume 146
 	musice8 7
-	note E_, 3
-	note G_, 2
+	E_ 3
+	G_ 2
 	inc_octave
 	volume 144
 	musice8 4
-	note F_, 1
+	F_ 1
 	volume 146
 	musice8 7
 	dec_octave
 	rest 3
-	note A_, 3
-	note F_, 2
-	note A_, 1
+	A_ 3
+	F_ 2
+	A_ 1
 	inc_octave
 	volume 144
 	musice8 4
-	note F_, 1
+	F_ 1
 	rest 1
 	dec_octave
 	volume 146
 	musice8 7
-	note G_, 3
-	note G_, 3
+	G_ 3
+	G_ 3
 	speed 1
 	volume 144
 	musice8 8
 	inc_octave
-	note F_, 4
-	note C_, 3
+	F_ 4
+	C_ 3
 	dec_octave
 	speed 7
 	volume 146
 	musice8 7
-	note A_, 3
-	note G_, 2
+	A_ 3
+	G_ 2
 	inc_octave
 	volume 144
 	musice8 4
-	note F_, 1
+	F_ 1
 	EndMainLoop
 
 Branch_f7535:
@@ -674,78 +674,78 @@ Branch_f7535:
 	volume 146
 	musice8 7
 	rest 3
-	note C_, 3
-	note C_, 2
-	note F_, 1
+	C_ 3
+	C_ 2
+	F_ 1
 	volume 144
 	musice8 4
 	inc_octave
-	note F_, 1
+	F_ 1
 	rest 1
 	dec_octave
 	volume 146
 	musice8 7
-	note G_, 3
-	note G_, 1
+	G_ 3
+	G_ 1
 	volume 144
 	musice8 4
 	inc_octave
-	note F_, 1
+	F_ 1
 	rest 1
 	dec_octave
 	musice8 8
 	speed 1
 	inc_octave
-	note F_, 4
-	note C_, 3
+	F_ 4
+	C_ 3
 	speed 7
 	volume 146
 	musice8 7
 	dec_octave
-	note E_, 3
-	note G_, 2
+	E_ 3
+	G_ 2
 	volume 144
 	musice8 4
 	inc_octave
-	note F_, 1
+	F_ 1
 	dec_octave
 	rest 3
 	volume 146
 	musice8 8
-	note F_, 3
-	note F_, 2
-	note A_, 1
+	F_ 3
+	F_ 2
+	A_ 1
 	volume 144
 	musice8 4
 	inc_octave
-	note F_, 1
+	F_ 1
 	rest 1
 	dec_octave
 	volume 146
 	musice8 7
-	note G_, 3
-	note G_, 1
+	G_ 3
+	G_ 1
 	volume 144
 	musice8 4
 	inc_octave
-	note F_, 1
+	F_ 1
 	rest 1
 	dec_octave
 	musice8 8
 	speed 1
 	inc_octave
-	note F_, 4
-	note C_, 3
+	F_ 4
+	C_ 3
 	speed 7
 	volume 146
 	musice8 7
 	dec_octave
-	note A_, 3
-	note G_, 2
+	A_ 3
+	G_ 2
 	volume 144
 	musice8 4
 	inc_octave
-	note F_, 1
+	F_ 1
 	dec_octave
 	music_ret
 
@@ -759,630 +759,630 @@ Music_Overworld_Ch3: ; f75a1 (3d:75a1)
 	musice8 7
 	octave 1
 	music_call Branch_f77f8
-	note F_, 2
+	F_ 2
 	inc_octave
-	note C_, 1
+	C_ 1
 	MainLoop
 	music_call Branch_f77f8
-	note F_, 3
+	F_ 3
 	music_call Branch_f7826
 	octave 1
 	musice8 8
-	note F_, 1
-	note A#, 2
+	F_ 1
+	A# 2
 	rest 1
 	octave 3
 	musice8 3
-	note C#, 2
+	C# 2
 	dec_octave
 	musice8 8
-	note F_, 1
-	note A#, 1
+	F_ 1
+	A# 1
 	rest 1
 	inc_octave
 	musice8 3
-	note F_, 2
+	F_ 2
 	rest 1
 	inc_octave
-	note C#, 1
+	C# 1
 	octave 1
 	musice8 8
-	note A#, 1
+	A# 1
 	rest 1
 	octave 3
 	musice8 7
-	note G_, 1
+	G_ 1
 	octave 1
 	musice8 8
-	note A#, 1
+	A# 1
 	rest 1
-	note F_, 1
+	F_ 1
 	inc_octave
 	musice8 3
-	note A#, 2
+	A# 2
 	dec_octave
 	musice8 8
-	note A#, 1
+	A# 1
 	octave 3
 	musice8 3
-	note C#, 2
+	C# 2
 	octave 1
 	musice8 8
-	note F_, 1
-	note A_, 2
+	F_ 1
+	A_ 2
 	rest 1
 	octave 3
 	musice8 3
-	note E_, 2
+	E_ 2
 	octave 1
 	musice8 8
-	note A_, 1
+	A_ 1
 	octave 3
 	musice8 3
-	note G_, 2
+	G_ 2
 	musice8 7
-	note E_, 1
+	E_ 1
 	musice8 8
 	dec_octave
-	note E_, 1
+	E_ 1
 	rest 1
 	inc_octave
 	inc_octave
 	musice8 3
-	note E_, 1
+	E_ 1
 	octave 1
 	musice8 8
-	note A_, 1
+	A_ 1
 	rest 1
 	inc_octave
-	note A_, 1
+	A_ 1
 	rest 2
 	dec_octave
-	note A_, 1
+	A_ 1
 	inc_octave
-	note A_, 1
-	note E_, 1
-	note C_, 1
+	A_ 1
+	E_ 1
+	C_ 1
 	dec_octave
-	note A_, 1
+	A_ 1
 	rest 1
 	inc_octave
-	note A_, 1
+	A_ 1
 	dec_octave
-	note D_, 2
+	D_ 2
 	rest 1
 	octave 3
 	musice8 3
-	note F_, 2
+	F_ 2
 	octave 1
 	musice8 8
-	note A_, 1
+	A_ 1
 	inc_octave
-	note D_, 2
+	D_ 2
 	dec_octave
-	note A_, 1
+	A_ 1
 	octave 3
 	musice8 3
-	note D_, 2
+	D_ 2
 	inc_octave
-	note C_, 1
+	C_ 1
 	octave 1
 	musice8 8
-	note D_, 2
+	D_ 2
 	octave 3
 	musice8 3
-	note F_, 2
+	F_ 2
 	rest 1
 	octave 1
 	musice8 8
-	note A_, 1
+	A_ 1
 	octave 3
 	musice8 3
-	note F_, 2
+	F_ 2
 	octave 1
 	musice8 8
-	note D_, 1
+	D_ 1
 	octave 3
 	musice8 3
-	note D_, 2
+	D_ 2
 	musice8 8
 	octave 1
-	note A_, 1
-	note G_, 2
+	A_ 1
+	G_ 2
 	rest 1
 	octave 3
 	musice8 3
-	note D_, 2
+	D_ 2
 	octave 1
 	musice8 8
-	note G_, 1
+	G_ 1
 	octave 3
 	musice8 3
-	note F_, 2
+	F_ 2
 	musice8 7
-	note D_, 1
+	D_ 1
 	dec_octave
 	musice8 8
-	note D_, 1
+	D_ 1
 	rest 1
 	musice8 3
 	inc_octave
-	note A#, 1
+	A# 1
 	octave 1
 	musice8 8
-	note G_, 1
+	G_ 1
 	rest 1
 	octave 3
 	musice8 3
-	note D_, 2
+	D_ 2
 	rest 1
 	dec_octave
 	musice8 8
-	note D_, 1
+	D_ 1
 	inc_octave
 	musice8 3
-	note F_, 2
+	F_ 2
 	octave 1
 	musice8 8
-	note G_, 1
+	G_ 1
 	octave 3
 	musice8 3
-	note D_, 2
+	D_ 2
 	musice8 8
 	dec_octave
-	note D_, 1
-	note C_, 2
+	D_ 1
+	C_ 2
 	rest 1
 	inc_octave
 	musice8 3
-	note D_, 2
+	D_ 2
 	octave 1
 	musice8 8
-	note G_, 1
+	G_ 1
 	octave 3
 	musice8 3
-	note F_, 2
+	F_ 2
 	musice8 7
-	note D_, 1
+	D_ 1
 	octave 1
 	musice8 8
-	note C_, 1
+	C_ 1
 	rest 1
 	octave 3
 	musice8 3
-	note F_, 1
+	F_ 1
 	dec_octave
 	musice8 8
-	note C_, 1
+	C_ 1
 	rest 1
 	inc_octave
 	musice8 3
-	note D_, 2
+	D_ 2
 	rest 1
 	octave 1
 	musice8 8
-	note E_, 1
+	E_ 1
 	inc_octave
-	note C_, 1
+	C_ 1
 	rest 1
 	inc_octave
 	musice8 7
-	note F_, 1
+	F_ 1
 	musice8 3
-	note E_, 2
+	E_ 2
 	musice8 8
 	octave 1
-	note E_, 1
+	E_ 1
 	music_call Branch_f7826
 	musice8 8
 	octave 2
-	note C_, 1
-	note C#, 2
+	C_ 1
+	C# 2
 	rest 1
 	inc_octave
 	musice8 3
-	note C#, 2
+	C# 2
 	octave 1
 	musice8 8
-	note G#, 1
+	G# 1
 	inc_octave
-	note C#, 1
+	C# 1
 	rest 1
 	inc_octave
 	musice8 3
-	note F_, 2
+	F_ 2
 	rest 1
 	inc_octave
-	note C#, 1
+	C# 1
 	octave 2
 	musice8 8
-	note C#, 1
+	C# 1
 	rest 1
 	inc_octave
-	note G_, 1
+	G_ 1
 	dec_octave
 	musice8 8
-	note C#, 1
+	C# 1
 	rest 1
 	dec_octave
-	note G#, 1
+	G# 1
 	octave 3
 	musice8 3
-	note G_, 2
+	G_ 2
 	dec_octave
 	musice8 8
-	note C#, 1
+	C# 1
 	inc_octave
 	musice8 3
-	note F_, 2
+	F_ 2
 	octave 1
 	musice8 8
-	note G#, 1
+	G# 1
 	inc_octave
-	note C_, 2
+	C_ 2
 	rest 1
 	inc_octave
 	musice8 3
-	note E_, 2
+	E_ 2
 	dec_octave
 	musice8 8
-	note G_, 1
+	G_ 1
 	inc_octave
 	musice8 3
-	note C_, 2
+	C_ 2
 	musice8 7
-	note E_, 1
+	E_ 1
 	dec_octave
 	musice8 8
-	note E_, 1
+	E_ 1
 	rest 1
 	octave 4
 	musice8 3
-	note E_, 1
+	E_ 1
 	octave 2
 	musice8 8
-	note C_, 1
+	C_ 1
 	rest 1
 	inc_octave
 	musice8 3
-	note E_, 2
+	E_ 2
 	rest 1
 	octave 1
 	musice8 8
-	note G_, 1
+	G_ 1
 	octave 3
 	musice8 3
-	note G_, 2
+	G_ 2
 	dec_octave
 	musice8 8
-	note C_, 1
+	C_ 1
 	inc_octave
 	musice8 3
-	note E_, 2
+	E_ 2
 	octave 1
 	musice8 8
-	note G_, 1
-	note B_, 2
+	G_ 1
+	B_ 2
 	rest 1
 	octave 3
 	musice8 3
-	note F_, 2
+	F_ 2
 	dec_octave
 	musice8 8
-	note F_, 1
-	note B_, 2
-	note F_, 1
+	F_ 1
+	B_ 2
+	F_ 1
 	inc_octave
 	musice8 3
-	note D_, 2
+	D_ 2
 	inc_octave
-	note D_, 1
+	D_ 1
 	octave 1
 	musice8 8
-	note B_, 2
+	B_ 2
 	octave 3
 	musice8 3
-	note F_, 2
+	F_ 2
 	rest 1
 	dec_octave
 	musice8 8
-	note F_, 1
-	note B_, 2
-	note F_, 1
+	F_ 1
+	B_ 2
+	F_ 1
 	dec_octave
-	note B_, 2
+	B_ 2
 	rest 1
-	note A#, 2
+	A# 2
 	rest 1
 	octave 3
 	musice8 3
-	note D_, 2
+	D_ 2
 	dec_octave
 	musice8 8
-	note F_, 1
-	note A#, 2
-	note F_, 1
+	F_ 1
+	A# 2
+	F_ 1
 	inc_octave
 	musice8 3
-	note F_, 2
+	F_ 2
 	inc_octave
-	note D_, 1
+	D_ 1
 	octave 1
 	musice8 8
-	note A#, 1
+	A# 1
 	rest 1
 	octave 3
 	musice8 7
-	note D_, 1
+	D_ 1
 	octave 1
 	musice8 8
-	note A#, 1
+	A# 1
 	rest 2
-	note A#, 2
+	A# 2
 	inc_octave
-	note F_, 1
-	note A#, 1
+	F_ 1
+	A# 1
 	rest 2
-	note C_, 2
+	C_ 2
 	rest 1
 	inc_octave
 	musice8 3
-	note D_, 2
+	D_ 2
 	octave 1
 	musice8 8
-	note G_, 1
+	G_ 1
 	octave 3
 	musice8 3
-	note F_, 2
+	F_ 2
 	musice8 7
-	note D_, 1
+	D_ 1
 	octave 1
 	musice8 8
-	note C_, 1
+	C_ 1
 	rest 1
 	octave 4
 	musice8 3
-	note D_, 1
+	D_ 1
 	octave 2
 	musice8 8
-	note C_, 1
+	C_ 1
 	rest 1
 	inc_octave
 	musice8 3
-	note D_, 2
+	D_ 2
 	rest 1
 	octave 1
 	musice8 8
-	note E_, 1
+	E_ 1
 	inc_octave
-	note C_, 1
+	C_ 1
 	dec_octave
-	note G_, 1
-	note E_, 1
-	note C_, 1
+	G_ 1
+	E_ 1
+	C_ 1
 	rest 1
-	note E_, 1
-	note F_, 3
+	E_ 1
+	F_ 3
 	octave 3
 	musice8 3
-	note A_, 2
+	A_ 2
 	dec_octave
 	musice8 8
-	note C_, 1
+	C_ 1
 	inc_octave
 	musice8 5
-	note F_, 2
-	note A_, 1
+	F_ 2
+	A_ 1
 	inc_octave
-	note C_, 1
+	C_ 1
 	dec_octave
 	rest 1
-	note A#, 2
+	A# 2
 	rest 1
-	note A#, 1
+	A# 1
 	inc_octave
-	note D_, 1
+	D_ 1
 	dec_octave
 	rest 2
-	note G_, 2
+	G_ 2
 	dec_octave
 	musice8 8
-	note C_, 1
+	C_ 1
 	inc_octave
 	musice8 5
-	note A#, 2
+	A# 2
 	inc_octave
-	note C_, 1
+	C_ 1
 	octave 1
 	musice8 8
-	note F_, 3
+	F_ 3
 	octave 4
 	musice8 3
-	note C_, 2
+	C_ 2
 	octave 2
 	musice8 8
-	note C_, 1
+	C_ 1
 	inc_octave
 	musice8 5
-	note A_, 2
+	A_ 2
 	inc_octave
-	note C_, 1
-	note C_, 1
+	C_ 1
+	C_ 1
 	rest 1
 	dec_octave
-	note A#, 2
+	A# 2
 	rest 1
-	note A#, 1
+	A# 1
 	inc_octave
-	note D_, 1
+	D_ 1
 	rest 2
-	note C_, 2
+	C_ 2
 	octave 2
 	musice8 8
-	note C_, 1
+	C_ 1
 	inc_octave
 	musice8 5
-	note A#, 2
+	A# 2
 	dec_octave
 	musice8 8
-	note C_, 1
+	C_ 1
 	EndMainLoop
 
 Branch_f77f8:
 	octave 1
-	note F_, 3
+	F_ 3
 	octave 3
 	musice8 3
-	note A_, 2
+	A_ 2
 	dec_octave
 	musice8 8
-	note C_, 1
-	note F_, 2
-	note C_, 1
+	C_ 1
+	F_ 2
+	C_ 1
 	rest 2
-	note F_, 1
+	F_ 1
 	rest 2
-	note F_, 1
+	F_ 1
 	rest 2
-	note C_, 1
-	note F_, 2
-	note C_, 1
+	C_ 1
+	F_ 2
+	C_ 1
 	dec_octave
-	note F_, 2
+	F_ 2
 	inc_octave
-	note C_, 1
+	C_ 1
 	dec_octave
-	note F_, 3
+	F_ 3
 	octave 4
 	musice8 3
-	note C_, 2
+	C_ 2
 	octave 2
 	musice8 8
-	note C_, 1
-	note F_, 2
-	note C_, 1
+	C_ 1
+	F_ 2
+	C_ 1
 	rest 2
-	note F_, 1
+	F_ 1
 	rest 2
-	note F_, 1
+	F_ 1
 	rest 2
-	note C_, 1
-	note F_, 2
-	note C_, 1
+	C_ 1
+	F_ 2
+	C_ 1
 	dec_octave
 	music_ret
 
 Branch_f7826:
 	octave 1
-	note F_, 2
+	F_ 2
 	rest 1
 	octave 3
 	musice8 3
-	note F_, 2
+	F_ 2
 	dec_octave
 	musice8 8
-	note C_, 1
-	note F_, 1
+	C_ 1
+	F_ 1
 	rest 1
 	inc_octave
 	musice8 3
-	note F_, 2
+	F_ 2
 	rest 1
 	inc_octave
-	note C_, 1
+	C_ 1
 	octave 1
 	musice8 8
-	note F_, 1
+	F_ 1
 	rest 1
 	octave 3
 	musice8 7
-	note G_, 1
+	G_ 1
 	octave 1
 	musice8 8
-	note F_, 1
+	F_ 1
 	rest 1
-	note C_, 1
+	C_ 1
 	octave 3
 	musice8 3
-	note G_, 2
+	G_ 2
 	octave 1
 	musice8 8
-	note F_, 1
+	F_ 1
 	octave 3
 	musice8 7
-	note F_, 2
+	F_ 2
 	octave 1
 	musice8 8
-	note G_, 1
-	note A_, 2
+	G_ 1
+	A_ 2
 	rest 1
 	octave 3
 	musice8 3
-	note E_, 2
+	E_ 2
 	dec_octave
 	musice8 8
-	note E_, 1
-	note A_, 1
+	E_ 1
+	A_ 1
 	rest 1
 	inc_octave
 	musice8 3
-	note E_, 2
+	E_ 2
 	rest 1
 	inc_octave
-	note C_, 1
+	C_ 1
 	octave 1
 	musice8 8
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 3
 	musice8 7
-	note E_, 1
+	E_ 1
 	octave 1
 	musice8 8
 	Loop 2
-	note A_, 1
+	A_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	EndLoop
-	note A_, 2
+	A_ 2
 	rest 1
-	note A#, 2
+	A# 2
 	rest 1
 	octave 3
 	musice8 3
-	note D_, 2
+	D_ 2
 	dec_octave
 	musice8 8
-	note F_, 1
-	note A#, 1
+	F_ 1
+	A# 1
 	rest 1
 	inc_octave
 	musice8 3
-	note F_, 2
+	F_ 2
 	rest 1
 	inc_octave
-	note D_, 1
+	D_ 1
 	octave 1
 	musice8 8
-	note A#, 1
+	A# 1
 	rest 1
 	octave 3
 	musice8 7
-	note D_, 1
+	D_ 1
 	octave 1
 	musice8 8
-	note A#, 1
+	A# 1
 	rest 1
-	note F_, 1
+	F_ 1
 	octave 3
 	musice8 3
-	note D_, 2
+	D_ 2
 	octave 1
 	musice8 8
-	note A#, 1
+	A# 1
 	octave 3
 	musice8 3
-	note D_, 2
+	D_ 2
 	music_ret
 
 
@@ -1393,19 +1393,19 @@ Music_Overworld_Ch4: ; f78af (3d:78af)
 	music_call Branch_f78fb
 	MainLoop
 	music_call Branch_f78ee
-	note bass, 3
-	note snare3, 2
-	note bass, 1
-	note snare1, 3
-	note snare3, 2
-	note snare4, 1
-	note bass, 2
-	note snare3, 1
-	note snare3, 3
-	note snare1, 1
-	note snare3, 1
-	note snare3, 1
-	note snare1, 3
+	bass 3
+	snare3 2
+	bass 1
+	snare1 3
+	snare3 2
+	snare4 1
+	bass 2
+	snare3 1
+	snare3 3
+	snare1 1
+	snare3 1
+	snare3 1
+	snare1 3
 	Loop 3
 	music_call Branch_f78ee
 	music_call Branch_f78fb
@@ -1423,51 +1423,51 @@ Music_Overworld_Ch4: ; f78af (3d:78af)
 	EndMainLoop
 
 Branch_f78ee:
-	note bass, 3
-	note snare3, 2
-	note bass, 1
-	note snare1, 3
-	note snare3, 2
-	note snare4, 1
-	note bass, 2
-	note snare3, 1
-	note snare3, 3
-	note snare1, 3
-	note snare3, 2
-	note snare4, 1
+	bass 3
+	snare3 2
+	bass 1
+	snare1 3
+	snare3 2
+	snare4 1
+	bass 2
+	snare3 1
+	snare3 3
+	snare1 3
+	snare3 2
+	snare4 1
 	music_ret
 
 Branch_f78fb:
-	note bass, 3
-	note snare3, 2
-	note bass, 1
-	note snare1, 3
-	note snare3, 2
-	note snare4, 1
-	note bass, 2
-	note snare3, 1
-	note snare3, 3
-	note snare1, 1
-	note snare3, 1
-	note snare3, 1
-	note snare3, 2
-	note snare4, 1
+	bass 3
+	snare3 2
+	bass 1
+	snare1 3
+	snare3 2
+	snare4 1
+	bass 2
+	snare3 1
+	snare3 3
+	snare1 1
+	snare3 1
+	snare3 1
+	snare3 2
+	snare4 1
 	music_ret
 
 Branch_f790a:
-	note bass, 3
-	note snare3, 2
-	note bass, 1
-	note snare1, 3
-	note snare3, 2
-	note snare4, 1
-	note bass, 2
-	note snare3, 1
-	note snare3, 3
-	note snare1, 1
-	note snare3, 1
-	note snare3, 1
-	note snare1, 2
-	note snare1, 1
+	bass 3
+	snare3 2
+	bass 1
+	snare1 3
+	snare3 2
+	snare4 1
+	bass 2
+	snare3 1
+	snare3 3
+	snare1 1
+	snare3 1
+	snare3 1
+	snare1 2
+	snare1 1
 	music_ret
 ; 0xf7919
diff --git a/audio/music/pausemenu.asm b/audio/music/pausemenu.asm
index 9d6d967..7ac67d9 100644
--- a/audio/music/pausemenu.asm
+++ b/audio/music/pausemenu.asm
@@ -10,58 +10,58 @@ Music_PauseMenu_Ch2: ; f6bb7 (3d:6bb7)
 	EndLoop
 	speed 1
 	octave 6
-	note C_, 4
+	C_ 4
 	dec_octave
 	rest 3
-	note B_, 4
+	B_ 4
 	inc_octave
 	volume 55
-	note C_, 3
+	C_ 3
 	dec_octave
 	volume 112
-	note G_, 4
+	G_ 4
 	volume 55
-	note B_, 3
+	B_ 3
 	volume 112
-	note D_, 4
+	D_ 4
 	volume 55
-	note G_, 3
+	G_ 3
 	music_call Branch_f6c24
 	music_call Branch_f6c60
 	volume 112
 	octave 6
-	note C_, 4
+	C_ 4
 	dec_octave
 	volume 55
-	note E_, 3
+	E_ 3
 	volume 112
-	note B_, 4
+	B_ 4
 	inc_octave
 	volume 55
-	note C_, 3
+	C_ 3
 	dec_octave
 	volume 112
-	note G_, 4
+	G_ 4
 	volume 55
-	note B_, 3
+	B_ 3
 	volume 112
-	note D_, 4
+	D_ 4
 	volume 55
-	note G_, 3
+	G_ 3
 	music_call Branch_f6c24
 	music_call Branch_f6c60
 	octave 6
 	volume 96
-	note C_, 4
+	C_ 4
 	dec_octave
 	volume 55
-	note E_, 3
+	E_ 3
 	music_call Branch_f6ce9
 	music_call Branch_f6c80
 	Loop 3
 	octave 6
 	musice8 4
-	note C_, 1
+	C_ 1
 	music_call Branch_f6ce9
 	music_call Branch_f6c80
 	EndLoop
@@ -72,141 +72,141 @@ Branch_f6c24:
 	Loop 3
 	octave 6
 	volume 112
-	note C_, 4
+	C_ 4
 	dec_octave
 	volume 55
-	note D_, 3
+	D_ 3
 	volume 112
-	note B_, 4
+	B_ 4
 	inc_octave
 	volume 55
-	note C_, 3
+	C_ 3
 	dec_octave
 	volume 112
-	note G_, 4
+	G_ 4
 	volume 55
-	note B_, 3
+	B_ 3
 	volume 112
-	note D_, 4
+	D_ 4
 	volume 55
-	note G_, 3
+	G_ 3
 	EndLoop
 	inc_octave
 	volume 112
-	note C_, 4
+	C_ 4
 	dec_octave
 	volume 55
-	note D_, 3
+	D_ 3
 	volume 112
-	note B_, 4
+	B_ 4
 	inc_octave
 	volume 55
-	note C_, 3
+	C_ 3
 	dec_octave
 	volume 112
-	note G_, 4
+	G_ 4
 	volume 55
-	note B_, 3
+	B_ 3
 	volume 112
-	note E_, 4
+	E_ 4
 	volume 55
-	note G_, 3
+	G_ 3
 	music_ret
 
 Branch_f6c60:
 	Loop 3
 	octave 6
 	volume 112
-	note C_, 4
+	C_ 4
 	dec_octave
 	volume 55
-	note E_, 3
+	E_ 3
 	volume 112
-	note B_, 4
+	B_ 4
 	inc_octave
 	volume 55
-	note C_, 3
+	C_ 3
 	dec_octave
 	volume 112
-	note G_, 4
+	G_ 4
 	volume 55
-	note B_, 3
+	B_ 3
 	volume 112
-	note E_, 4
+	E_ 4
 	volume 55
-	note G_, 3
+	G_ 3
 	EndLoop
 	music_ret
 
 Branch_f6c80:
 	octave 6
 	musice8 4
-	note C_, 1
+	C_ 1
 	octave 3
 	volume 112
 	musice8 8
 	speed 1
-	note C_, 4
+	C_ 4
 	volume 39
-	note C_, 3
+	C_ 3
 	volume 96
 	speed 7
 	octave 5
 	musice8 4
-	note G_, 1
-	note E_, 1
+	G_ 1
+	E_ 1
 	octave 3
 	musice8 8
 	volume 112
 	speed 1
-	note E_, 4
+	E_ 4
 	volume 39
-	note E_, 3
+	E_ 3
 	speed 7
 	volume 96
 	octave 5
 	musice8 4
-	note B_, 1
-	note G_, 1
+	B_ 1
+	G_ 1
 	dec_octave
 	volume 112
 	musice8 8
 	speed 1
-	note C_, 4
+	C_ 4
 	volume 39
-	note C_, 3
+	C_ 3
 	volume 96
 	speed 7
 	octave 6
 	musice8 4
-	note C_, 1
+	C_ 1
 	octave 3
 	musice8 8
 	volume 112
 	speed 1
-	note C_, 4
+	C_ 4
 	volume 39
-	note C_, 3
+	C_ 3
 	speed 7
 	octave 5
 	volume 96
 	musice8 4
-	note G_, 1
-	note E_, 1
+	G_ 1
+	E_ 1
 	volume 112
 	octave 3
 	musice8 8
 	speed 1
-	note E_, 4
+	E_ 4
 	volume 39
-	note E_, 3
+	E_ 3
 	speed 7
 	volume 96
 	octave 5
 	musice8 4
-	note B_, 1
-	note G_, 1
-	note E_, 1
+	B_ 1
+	G_ 1
+	E_ 1
 	music_ret
 
 Branch_f6ce9:
@@ -214,67 +214,67 @@ Branch_f6ce9:
 	speed 1
 	musice8 8
 	volume 112
-	note B_, 4
+	B_ 4
 	volume 39
-	note B_, 3
+	B_ 3
 	speed 7
 	volume 96
 	octave 5
 	musice8 4
-	note G_, 1
-	note D_, 1
+	G_ 1
+	D_ 1
 	octave 3
 	volume 112
 	musice8 8
 	speed 1
-	note D_, 4
+	D_ 4
 	volume 39
-	note D_, 3
+	D_ 3
 	speed 7
 	volume 96
 	octave 5
 	musice8 4
-	note B_, 1
-	note G_, 1
+	B_ 1
+	G_ 1
 	volume 112
 	octave 3
 	musice8 8
 	speed 1
-	note B_, 4
+	B_ 4
 	volume 39
-	note B_, 3
+	B_ 3
 	volume 96
 	speed 7
 	octave 6
 	musice8 4
-	note C_, 1
+	C_ 1
 	volume 112
 	octave 2
 	musice8 8
 	speed 1
-	note B_, 4
+	B_ 4
 	volume 39
-	note B_, 3
+	B_ 3
 	speed 7
 	volume 96
 	octave 5
 	musice8 4
-	note G_, 1
-	note D_, 1
+	G_ 1
+	D_ 1
 	volume 112
 	octave 3
 	musice8 8
 	speed 1
-	note D_, 4
+	D_ 4
 	volume 39
-	note D_, 3
+	D_ 3
 	speed 7
 	volume 96
 	octave 5
 	musice8 4
-	note B_, 1
-	note G_, 1
-	note D_, 1
+	B_ 1
+	G_ 1
+	D_ 1
 	music_ret
 
 
@@ -292,142 +292,142 @@ Music_PauseMenu_Ch1: ; f6d4e (3d:6d4e)
 	rest 8
 	speed 1
 	Loop 4
-	note B_, 4
-	note G_, 3
-	note E_, 4
-	note C_, 3
+	B_ 4
+	G_ 3
+	E_ 4
+	C_ 3
 	dec_octave
 	EndLoop
 	speed 7
 	Loop 4
 	octave 1
 	volume 208
-	note G_, 1
+	G_ 1
 	octave 3
 	volume 112
 	speed 1
-	note D_, 4
+	D_ 4
 	volume 39
-	note D_, 3
+	D_ 3
 	volume 208
 	speed 7
 	octave 1
 	musice8 6
-	note G_, 1
+	G_ 1
 	musice8 4
-	note G_, 1
+	G_ 1
 	octave 3
 	musice8 8
 	volume 112
 	speed 1
-	note F#, 4
+	F# 4
 	volume 39
-	note F#, 3
+	F# 3
 	dec_octave
 	volume 208
 	speed 7
-	note D_, 1
-	note G_, 1
+	D_ 1
+	G_ 1
 	octave 4
 	volume 112
 	speed 1
-	note F#, 4
+	F# 4
 	volume 39
-	note F#, 3
+	F# 3
 	speed 7
 	octave 1
 	volume 208
 	musice8 8
-	note G_, 1
+	G_ 1
 	octave 3
 	volume 112
 	speed 1
-	note D_, 4
+	D_ 4
 	volume 39
-	note D_, 3
+	D_ 3
 	speed 7
 	volume 208
 	octave 1
 	musice8 6
-	note G_, 1
+	G_ 1
 	musice8 4
-	note G_, 1
+	G_ 1
 	octave 3
 	musice8 8
 	speed 1
-	note F#, 4
+	F# 4
 	volume 39
-	note F#, 3
+	F# 3
 	speed 7
 	octave 1
 	volume 208
-	note B_, 1
+	B_ 1
 	inc_octave
-	note C_, 1
-	note C#, 1
+	C_ 1
+	C# 1
 	dec_octave
-	note D_, 1
+	D_ 1
 	octave 3
 	volume 112
 	speed 1
-	note E_, 4
+	E_ 4
 	volume 39
-	note E_, 3
+	E_ 3
 	volume 208
 	speed 7
 	octave 1
 	musice8 6
-	note D_, 1
+	D_ 1
 	musice8 4
-	note D_, 1
+	D_ 1
 	octave 3
 	musice8 8
 	speed 1
-	note G_, 4
+	G_ 4
 	volume 39
-	note G_, 3
+	G_ 3
 	speed 7
 	dec_octave
 	volume 208
-	note C_, 1
-	note D_, 1
+	C_ 1
+	D_ 1
 	octave 4
 	volume 112
 	speed 1
-	note G_, 4
+	G_ 4
 	volume 39
-	note G_, 3
+	G_ 3
 	speed 7
 	octave 1
 	volume 208
 	musice8 8
-	note D_, 1
+	D_ 1
 	octave 3
 	volume 112
 	speed 1
-	note E_, 4
+	E_ 4
 	volume 39
-	note E_, 3
+	E_ 3
 	speed 7
 	volume 208
 	musice8 6
 	octave 1
-	note D_, 1
+	D_ 1
 	musice8 4
-	note D_, 1
+	D_ 1
 	octave 3
 	musice8 8
 	speed 1
-	note G_, 4
+	G_ 4
 	volume 39
-	note G_, 3
+	G_ 3
 	speed 7
 	octave 1
 	volume 208
-	note C_, 1
-	note C#, 1
+	C_ 1
+	C# 1
 	inc_octave
-	note D_, 1
+	D_ 1
 	EndLoop
 	EndMainLoop
 
@@ -440,107 +440,107 @@ Music_PauseMenu_Ch3: ; f6e2d (3d:6e2d)
 	musice9 96
 	musice8 4
 	octave 4
-	note G_, 7
+	G_ 7
 	musice8 8
-	note F#, 4
+	F# 4
 	volume 96
-	note G_, 3
+	G_ 3
 	volume 64
-	note D_, 4
+	D_ 4
 	volume 96
-	note F#, 3
+	F# 3
 	dec_octave
 	volume 64
-	note B_, 4
+	B_ 4
 	inc_octave
 	volume 96
-	note D_, 3
+	D_ 3
 	MainLoop
 	octave 4
 	Loop 3
 	volume 64
-	note G_, 4
+	G_ 4
 	dec_octave
 	volume 96
-	note B_, 3
+	B_ 3
 	inc_octave
 	volume 64
-	note F#, 4
+	F# 4
 	volume 96
-	note G_, 3
+	G_ 3
 	volume 64
-	note D_, 4
+	D_ 4
 	volume 96
-	note F#, 3
+	F# 3
 	dec_octave
 	volume 64
-	note B_, 4
+	B_ 4
 	inc_octave
 	volume 96
-	note D_, 3
+	D_ 3
 	EndLoop
 	volume 64
-	note G_, 4
+	G_ 4
 	dec_octave
 	volume 96
-	note B_, 3
+	B_ 3
 	inc_octave
 	volume 64
-	note E_, 4
+	E_ 4
 	volume 96
-	note G_, 3
+	G_ 3
 	volume 64
-	note C_, 4
+	C_ 4
 	volume 96
-	note E_, 3
+	E_ 3
 	dec_octave
 	volume 64
-	note A_, 4
+	A_ 4
 	inc_octave
 	volume 96
-	note C_, 3
+	C_ 3
 	Loop 3
 	volume 64
-	note G_, 4
+	G_ 4
 	dec_octave
 	volume 96
-	note A_, 3
+	A_ 3
 	inc_octave
 	volume 64
-	note E_, 4
+	E_ 4
 	volume 96
-	note G_, 3
+	G_ 3
 	volume 64
-	note C_, 4
+	C_ 4
 	volume 96
-	note E_, 3
+	E_ 3
 	dec_octave
 	volume 64
-	note A_, 4
+	A_ 4
 	inc_octave
 	volume 96
-	note C_, 3
+	C_ 3
 	EndLoop
 	volume 64
-	note G_, 4
+	G_ 4
 	dec_octave
 	volume 96
-	note A_, 3
+	A_ 3
 	inc_octave
 	volume 64
-	note F#, 4
+	F# 4
 	volume 96
-	note G_, 3
+	G_ 3
 	volume 64
-	note D_, 4
+	D_ 4
 	volume 96
-	note F#, 3
+	F# 3
 	dec_octave
 	volume 64
-	note B_, 4
+	B_ 4
 	inc_octave
 	volume 96
-	note D_, 3
+	D_ 3
 	EndMainLoop
 
 
@@ -550,33 +550,33 @@ Music_PauseMenu_Ch4: ; f6ec8 (3d:6ec8)
 	MainLoop
 	Loop 2
 	Loop 7
-	note bass, 1
-	note snare3, 1
-	note snare4, 2
-	note snare1, 1
-	note snare3, 1
-	note snare4, 1
-	note snare2, 1
-	note bass, 1
-	note snare3, 1
-	note snare4, 2
-	note snare1, 1
-	note snare3, 1
-	note snare4, 1
-	note snare1, 1
+	bass 1
+	snare3 1
+	snare4 2
+	snare1 1
+	snare3 1
+	snare4 1
+	snare2 1
+	bass 1
+	snare3 1
+	snare4 2
+	snare1 1
+	snare3 1
+	snare4 1
+	snare1 1
 	EndLoop
-	note bass, 1
-	note snare3, 1
-	note snare4, 2
-	note snare1, 1
-	note snare3, 1
-	note snare4, 1
+	bass 1
+	snare3 1
+	snare4 2
+	snare1 1
+	snare3 1
+	snare4 1
 	speed 1
-	note snare2, 4
-	note snare2, 3
+	snare2 4
+	snare2 3
 	speed 7
 	Loop 8
-	note snare1, 1
+	snare1 1
 	EndLoop
 	EndLoop
 	EndMainLoop
diff --git a/audio/music/pcmainmenu.asm b/audio/music/pcmainmenu.asm
index 0fc3c1f..bd9ae7f 100644
--- a/audio/music/pcmainmenu.asm
+++ b/audio/music/pcmainmenu.asm
@@ -11,65 +11,65 @@ Music_PCMainMenu_Ch1: ; f9052 (3e:5052)
 	duty 1
 	musice8 5
 	volume 97
-	note F_, 1
+	F_ 1
 	rest 1
 	duty 2
 	musice8 8
 	volume 180
-	note A_, 1
+	A_ 1
 	volume 55
-	note A_, 1
+	A_ 1
 	rest 2
 	inc_octave
 	volume 180
-	note C_, 1
+	C_ 1
 	volume 55
-	note C_, 1
+	C_ 1
 	dec_octave
 	duty 1
 	musice8 5
 	volume 97
-	note F_, 1
+	F_ 1
 	rest 1
 	duty 2
 	musice8 8
 	volume 180
-	note B_, 1
+	B_ 1
 	volume 55
-	note B_, 1
+	B_ 1
 	music_call Branch_f90c2
 	rest 4
 	dec_octave
 	duty 1
 	musice8 5
 	volume 97
-	note F_, 1
+	F_ 1
 	rest 1
 	inc_octave
 	duty 2
 	musice8 8
 	volume 180
-	note E_, 1
+	E_ 1
 	volume 55
-	note E_, 1
+	E_ 1
 	rest 2
 	volume 180
-	note C_, 1
+	C_ 1
 	volume 55
-	note C_, 1
+	C_ 1
 	duty 1
 	musice8 5
 	volume 97
 	dec_octave
-	note F_, 1
+	F_ 1
 	rest 1
 	inc_octave
 	duty 2
 	musice8 8
 	volume 180
-	note D_, 1
+	D_ 1
 	volume 55
-	note D_, 1
+	D_ 1
 	EndMainLoop
 
 Branch_f90c2:
@@ -78,29 +78,29 @@ Branch_f90c2:
 	duty 1
 	volume 97
 	musice8 5
-	note G_, 1
+	G_ 1
 	rest 3
 	musice8 8
 	duty 2
 	volume 180
-	note B_, 2
+	B_ 2
 	inc_octave
-	note D_, 1
+	D_ 1
 	volume 39
-	note D_, 1
+	D_ 1
 	dec_octave
 	duty 1
 	volume 97
 	musice8 5
-	note G_, 1
+	G_ 1
 	rest 1
 	inc_octave
 	duty 2
 	musice8 8
 	volume 180
-	note C_, 1
+	C_ 1
 	volume 55
-	note C_, 1
+	C_ 1
 	music_ret
 
 
@@ -117,66 +117,66 @@ Music_PCMainMenu_Ch2: ; f90ed (3e:50ed)
 	duty 1
 	musice8 5
 	volume 97
-	note C_, 1
+	C_ 1
 	rest 1
 	dec_octave
 	duty 2
 	musice8 8
 	volume 132
-	note F_, 1
+	F_ 1
 	volume 39
-	note F_, 1
+	F_ 1
 	rest 2
 	volume 132
-	note A_, 1
+	A_ 1
 	volume 39
-	note A_, 1
+	A_ 1
 	duty 1
 	musice8 5
 	volume 97
 	inc_octave
-	note C_, 1
+	C_ 1
 	rest 1
 	dec_octave
 	duty 2
 	musice8 8
 	volume 132
-	note G_, 1
+	G_ 1
 	volume 39
-	note G_, 1
+	G_ 1
 	music_call Branch_f915e
 	rest 4
 	inc_octave
 	duty 1
 	musice8 5
 	volume 97
-	note C_, 1
+	C_ 1
 	rest 1
 	duty 2
 	musice8 8
 	volume 132
-	note C_, 1
+	C_ 1
 	volume 39
-	note C_, 1
+	C_ 1
 	rest 2
 	dec_octave
 	volume 132
-	note A_, 1
+	A_ 1
 	volume 39
-	note A_, 1
+	A_ 1
 	duty 1
 	inc_octave
 	volume 97
 	musice8 5
-	note C_, 1
+	C_ 1
 	rest 1
 	dec_octave
 	duty 2
 	musice8 8
 	volume 132
-	note B_, 1
+	B_ 1
 	volume 39
-	note B_, 1
+	B_ 1
 	EndMainLoop
 
 Branch_f915e:
@@ -185,29 +185,29 @@ Branch_f915e:
 	duty 1
 	musice8 5
 	volume 97
-	note D_, 1
+	D_ 1
 	rest 3
 	duty 2
 	musice8 8
 	dec_octave
 	volume 132
-	note G_, 2
-	note B_, 1
+	G_ 2
+	B_ 1
 	volume 39
-	note B_, 1
+	B_ 1
 	inc_octave
 	duty 1
 	musice8 5
 	volume 97
-	note D_, 1
+	D_ 1
 	rest 1
 	dec_octave
 	duty 2
 	musice8 8
 	volume 132
-	note A_, 1
+	A_ 1
 	volume 39
-	note A_, 1
+	A_ 1
 	music_ret
 
 
@@ -221,122 +221,122 @@ Music_PCMainMenu_Ch3: ; f9189 (3e:5189)
 	MainLoop
 	octave 1
 	musice8 7
-	note G_, 1
+	G_ 1
 	rest 1
 	musice8 8
-	note G_, 1
+	G_ 1
 	rest 1
 	speed 1
-	note A#, 4
+	A# 4
 	tie
-	note B_, 3
+	B_ 3
 	tie
 	speed 7
-	note B_, 1
+	B_ 1
 	rest 1
 	musice8 4
 	inc_octave
-	note C_, 1
+	C_ 1
 	rest 1
-	note C_, 1
+	C_ 1
 	musice8 8
-	note C#, 2
-	note D_, 2
+	C# 2
+	D_ 2
 	dec_octave
-	note G_, 1
+	G_ 1
 	tie
-	note F#, 1
+	F# 1
 	musice8 7
-	note F_, 1
+	F_ 1
 	rest 1
 	musice8 8
-	note F_, 1
+	F_ 1
 	rest 1
 	speed 1
-	note G#, 4
+	G# 4
 	tie
-	note A_, 3
+	A_ 3
 	tie
 	speed 7
-	note A_, 1
+	A_ 1
 	rest 1
 	musice8 4
-	note A#, 1
+	A# 1
 	rest 1
-	note A#, 1
+	A# 1
 	musice8 8
-	note B_, 2
+	B_ 2
 	inc_octave
-	note C_, 2
+	C_ 2
 	dec_octave
-	note F_, 1
+	F_ 1
 	tie
-	note F#, 1
+	F# 1
 	musice8 7
-	note G_, 1
+	G_ 1
 	rest 1
 	musice8 8
-	note G_, 1
+	G_ 1
 	rest 1
 	speed 1
-	note A#, 4
+	A# 4
 	tie
-	note B_, 3
+	B_ 3
 	tie
 	speed 7
-	note B_, 1
+	B_ 1
 	rest 1
 	musice8 4
 	inc_octave
-	note C_, 1
+	C_ 1
 	rest 1
-	note C_, 1
+	C_ 1
 	musice8 8
-	note C#, 2
-	note D_, 2
+	C# 2
+	D_ 2
 	dec_octave
-	note G_, 1
+	G_ 1
 	tie
-	note F#, 1
+	F# 1
 	musice8 7
-	note F_, 1
+	F_ 1
 	rest 1
 	musice8 8
-	note F_, 1
+	F_ 1
 	rest 1
 	speed 1
-	note B_, 4
+	B_ 4
 	tie
 	inc_octave
-	note C_, 3
+	C_ 3
 	tie
 	speed 7
-	note C_, 1
+	C_ 1
 	rest 1
 	musice8 8
 	speed 1
-	note F#, 4
+	F# 4
 	tie
-	note G_, 3
+	G_ 3
 	tie
 	speed 7
-	note G_, 1
+	G_ 1
 	musice8 4
-	note F_, 1
+	F_ 1
 	musice8 8
-	note C_, 2
-	note F_, 2
+	C_ 2
+	F_ 2
 	speed 1
-	note C_, 3
+	C_ 3
 	tie
 	dec_octave
-	note B_, 3
+	B_ 3
 	tie
-	note A#, 3
+	A# 3
 	tie
-	note A_, 3
+	A_ 3
 	tie
-	note G#, 2
+	G# 2
 	speed 7
 	EndMainLoop
 
@@ -347,31 +347,31 @@ Music_PCMainMenu_Ch4: ; f922b (3e:522b)
 	MainLoop
 	Loop 7
 	music_call Branch_f9248
-	note snare3, 1
-	note bass, 1
-	note snare1, 2
-	note snare3, 1
-	note snare4, 1
+	snare3 1
+	bass 1
+	snare1 2
+	snare3 1
+	snare4 1
 	EndLoop
 	music_call Branch_f9248
-	note snare4, 1
+	snare4 1
 	speed 1
-	note snare2, 4
-	note snare2, 3
+	snare2 4
+	snare2 3
 	speed 7
-	note snare1, 2
-	note snare1, 1
-	note snare1, 1
+	snare1 2
+	snare1 1
+	snare1 1
 	EndMainLoop
 
 Branch_f9248:
-	note bass, 2
-	note snare3, 1
-	note snare3, 1
-	note snare1, 2
-	note snare3, 1
-	note snare4, 1
-	note bass, 1
-	note snare2, 1
+	bass 2
+	snare3 1
+	snare3 1
+	snare1 2
+	snare3 1
+	snare4 1
+	bass 1
+	snare2 1
 	music_ret
 ; 0xf9251
diff --git a/audio/music/pokemondome.asm b/audio/music/pokemondome.asm
index 8529a92..b7b5a84 100644
--- a/audio/music/pokemondome.asm
+++ b/audio/music/pokemondome.asm
@@ -8,304 +8,304 @@ Music_PokemonDome_Ch1: ; f9251 (3e:5251)
 	duty 0
 	volume 160
 	speed 1
-	note G_, 5
-	note A_, 5
-	note B_, 4
-	inc_octave
-	note C_, 5
-	note D_, 5
-	note E_, 4
-	note C_, 5
-	note D_, 5
-	note E_, 4
-	note F_, 5
-	note G_, 5
-	note A_, 4
-	note F_, 5
-	note G_, 5
-	note A_, 4
-	note B_, 5
-	inc_octave
-	note C_, 5
-	note D_, 4
+	G_ 5
+	A_ 5
+	B_ 4
+	inc_octave
+	C_ 5
+	D_ 5
+	E_ 4
+	C_ 5
+	D_ 5
+	E_ 4
+	F_ 5
+	G_ 5
+	A_ 4
+	F_ 5
+	G_ 5
+	A_ 4
+	B_ 5
+	inc_octave
+	C_ 5
+	D_ 4
 	dec_octave
-	note B_, 5
+	B_ 5
 	inc_octave
-	note C_, 5
-	note D_, 4
-	note E_, 5
-	note F_, 5
-	note G_, 4
+	C_ 5
+	D_ 4
+	E_ 5
+	F_ 5
+	G_ 4
 	duty 1
 	volume 128
 	dec_octave
 	speed 1
-	note C_, 11
+	C_ 11
 	volume 55
-	note C_, 3
+	C_ 3
 	volume 128
-	note C_, 11
+	C_ 11
 	volume 55
-	note C_, 10
+	C_ 10
 	rest 7
 	volume 128
-	note C_, 4
+	C_ 4
 	volume 55
-	note C_, 3
+	C_ 3
 	volume 128
-	note C_, 4
+	C_ 4
 	volume 55
-	note C_, 3
+	C_ 3
 	volume 128
-	note C_, 11
+	C_ 11
 	volume 55
-	note C_, 3
+	C_ 3
 	volume 128
-	note C_, 11
+	C_ 11
 	volume 55
-	note C_, 10
+	C_ 10
 	speed 7
 	rest 3
 	volume 128
 	speed 1
-	note D_, 11
+	D_ 11
 	volume 55
-	note D_, 3
+	D_ 3
 	volume 128
-	note D_, 11
+	D_ 11
 	volume 55
-	note D_, 10
+	D_ 10
 	rest 7
 	volume 128
-	note D_, 4
+	D_ 4
 	volume 55
-	note D_, 3
+	D_ 3
 	volume 128
-	note D_, 4
+	D_ 4
 	volume 55
-	note D_, 3
+	D_ 3
 	volume 128
-	note D_, 11
+	D_ 11
 	volume 55
-	note D_, 3
+	D_ 3
 	volume 128
-	note D_, 11
+	D_ 11
 	volume 55
-	note D_, 3
+	D_ 3
 	MainLoop
 	speed 7
 	duty 1
 	volume 164
 	octave 2
-	note G_, 4
+	G_ 4
 	inc_octave
 	duty 1
 	volume 128
 	speed 1
-	note E_, 11
+	E_ 11
 	volume 55
-	note E_, 3
+	E_ 3
 	volume 128
 	speed 1
-	note E_, 11
+	E_ 11
 	volume 55
-	note E_, 10
+	E_ 10
 	rest 7
 	volume 128
-	note E_, 4
+	E_ 4
 	volume 55
-	note E_, 3
+	E_ 3
 	volume 128
-	note E_, 4
+	E_ 4
 	volume 55
-	note E_, 3
+	E_ 3
 	volume 128
-	note E_, 11
+	E_ 11
 	volume 55
-	note E_, 3
+	E_ 3
 	volume 128
-	note E_, 11
+	E_ 11
 	volume 55
-	note E_, 10
+	E_ 10
 	speed 7
 	rest 3
 	volume 128
 	speed 1
-	note D_, 11
+	D_ 11
 	volume 55
-	note D_, 3
+	D_ 3
 	volume 128
-	note D_, 11
+	D_ 11
 	volume 55
-	note D_, 10
+	D_ 10
 	rest 7
 	speed 1
 	volume 128
-	note D_, 4
+	D_ 4
 	volume 55
-	note D_, 3
+	D_ 3
 	volume 128
-	note D_, 4
+	D_ 4
 	volume 55
-	note D_, 3
+	D_ 3
 	volume 128
-	note D_, 11
+	D_ 11
 	volume 55
-	note D_, 3
+	D_ 3
 	volume 128
-	note D_, 11
+	D_ 11
 	volume 55
-	note D_, 3
+	D_ 3
 	duty 0
 	volume 160
 	dec_octave
 	speed 1
-	note B_, 4
-	inc_octave
-	note C_, 3
-	note D_, 4
-	note E_, 3
-	note F_, 4
-	note G_, 3
-	note A_, 4
-	note B_, 3
+	B_ 4
+	inc_octave
+	C_ 3
+	D_ 4
+	E_ 3
+	F_ 4
+	G_ 3
+	A_ 4
+	B_ 3
 	speed 7
 	inc_octave
-	note C_, 12
+	C_ 12
 	dec_octave
-	note G_, 1
+	G_ 1
 	volume 55
-	note G_, 1
+	G_ 1
 	rest 1
 	inc_octave
 	volume 160
-	note C_, 1
-	note D_, 10
+	C_ 1
+	D_ 10
 	volume 55
-	note D_, 2
+	D_ 2
 	volume 160
-	note G_, 3
+	G_ 3
 	volume 55
-	note G_, 1
+	G_ 1
 	volume 160
-	note F_, 10
+	F_ 10
 	volume 55
-	note F_, 2
+	F_ 2
 	volume 160
-	note C_, 3
+	C_ 3
 	volume 55
-	note C_, 1
+	C_ 1
 	volume 160
-	note F_, 10
-	note E_, 1
+	F_ 10
+	E_ 1
 	volume 55
-	note E_, 1
+	E_ 1
 	volume 160
-	note D_, 3
+	D_ 3
 	volume 55
-	note D_, 1
+	D_ 1
 	volume 160
-	note E_, 12
+	E_ 12
 	dec_octave
-	note G_, 1
+	G_ 1
 	volume 55
-	note G_, 1
+	G_ 1
 	rest 1
 	inc_octave
 	volume 160
-	note C_, 1
-	note D_, 8
+	C_ 1
+	D_ 8
 	dec_octave
-	note A_, 4
+	A_ 4
 	inc_octave
-	note D_, 3
+	D_ 3
 	volume 55
-	note D_, 1
+	D_ 1
 	volume 160
-	note C_, 14
+	C_ 14
 	volume 55
-	note C_, 2
+	C_ 2
 	dec_octave
 	volume 160
-	note B_, 10
+	B_ 10
 	volume 55
-	note B_, 2
+	B_ 2
 	volume 160
-	note G_, 4
-	note A_, 12
-	note B_, 1
+	G_ 4
+	A_ 12
+	B_ 1
 	volume 55
-	note B_, 2
+	B_ 2
 	inc_octave
 	volume 160
-	note C_, 1
-	note D_, 8
-	note E_, 4
-	note F_, 4
-	note G_, 8
+	C_ 1
+	D_ 8
+	E_ 4
+	F_ 4
+	G_ 8
 	tie
-	note G_, 8
+	G_ 8
 	tie
-	note G_, 8
+	G_ 8
 	volume 55
-	note G_, 2
+	G_ 2
 	volume 160
-	note F_, 2
-	note E_, 2
+	F_ 2
+	E_ 2
 	volume 55
-	note E_, 1
+	E_ 1
 	volume 160
 	speed 1
-	note E_, 5
+	E_ 5
 	volume 55
-	note E_, 2
+	E_ 2
 	speed 7
 	volume 160
-	note E_, 1
+	E_ 1
 	volume 55
-	note E_, 1
+	E_ 1
 	rest 1
 	dec_octave
 	volume 160
-	note A_, 1
+	A_ 1
 	inc_octave
-	note C_, 8
-	note G_, 1
+	C_ 8
+	G_ 1
 	volume 55
-	note G_, 2
+	G_ 2
 	volume 160
-	note F_, 1
-	note E_, 1
+	F_ 1
+	E_ 1
 	volume 55
-	note E_, 1
+	E_ 1
 	rest 1
 	dec_octave
 	volume 160
-	note A_, 1
+	A_ 1
 	inc_octave
-	note C_, 8
-	note G_, 1
+	C_ 8
+	G_ 1
 	volume 55
-	note G_, 2
+	G_ 2
 	volume 160
-	note F_, 1
-	note E_, 1
+	F_ 1
+	E_ 1
 	volume 55
-	note E_, 1
+	E_ 1
 	rest 1
 	dec_octave
 	volume 160
-	note G#, 1
+	G# 1
 	inc_octave
-	note C_, 12
+	C_ 12
 	tie
-	note C_, 8
-	note D_, 8
-	note C_, 8
+	C_ 8
+	D_ 8
+	C_ 8
 	tie
-	note C_, 8
+	C_ 8
 	tie
-	note C_, 12
+	C_ 12
 	EndMainLoop
 
 
@@ -319,63 +319,63 @@ Music_PokemonDome_Ch2: ; f93f8 (3e:53f8)
 	duty 0
 	volume 128
 	speed 1
-	note B_, 5
-	inc_octave
-	note C_, 5
-	note D_, 4
-	note E_, 5
-	note F_, 5
-	note G_, 4
-	note E_, 5
-	note F_, 5
-	note G_, 4
-	note A_, 5
-	note B_, 5
-	inc_octave
-	note C_, 4
+	B_ 5
+	inc_octave
+	C_ 5
+	D_ 4
+	E_ 5
+	F_ 5
+	G_ 4
+	E_ 5
+	F_ 5
+	G_ 4
+	A_ 5
+	B_ 5
+	inc_octave
+	C_ 4
 	dec_octave
-	note A_, 5
-	note B_, 5
-	inc_octave
-	note C_, 4
-	note D_, 5
-	note E_, 5
-	note F_, 4
-	note D_, 5
-	note E_, 5
-	note F_, 4
-	note G_, 5
-	note A_, 5
-	note B_, 4
+	A_ 5
+	B_ 5
+	inc_octave
+	C_ 4
+	D_ 5
+	E_ 5
+	F_ 4
+	D_ 5
+	E_ 5
+	F_ 4
+	G_ 5
+	A_ 5
+	B_ 4
 	MainLoop
 	duty 1
 	volume 112
 	octave 3
 	speed 1
-	note E_, 11
+	E_ 11
 	volume 55
-	note E_, 3
+	E_ 3
 	volume 112
-	note E_, 11
+	E_ 11
 	volume 55
-	note E_, 10
+	E_ 10
 	rest 7
 	volume 112
-	note E_, 4
+	E_ 4
 	volume 55
-	note E_, 3
+	E_ 3
 	volume 112
-	note E_, 4
+	E_ 4
 	volume 55
-	note E_, 3
+	E_ 3
 	volume 112
-	note E_, 11
+	E_ 11
 	volume 55
-	note E_, 3
+	E_ 3
 	volume 112
-	note E_, 11
+	E_ 11
 	volume 55
-	note E_, 10
+	E_ 10
 	speed 7
 	rest 3
 	music_call Branch_f9554
@@ -383,30 +383,30 @@ Music_PokemonDome_Ch2: ; f93f8 (3e:53f8)
 	rest 4
 	volume 112
 	speed 1
-	note G_, 11
+	G_ 11
 	volume 55
-	note G_, 3
+	G_ 3
 	volume 112
-	note G_, 11
+	G_ 11
 	volume 55
-	note G_, 10
+	G_ 10
 	rest 7
 	volume 112
-	note G_, 4
+	G_ 4
 	volume 55
-	note G_, 3
+	G_ 3
 	volume 112
-	note G_, 4
+	G_ 4
 	volume 55
-	note G_, 3
+	G_ 3
 	volume 112
-	note G_, 11
+	G_ 11
 	volume 55
-	note G_, 3
+	G_ 3
 	volume 112
-	note G_, 11
+	G_ 11
 	volume 55
-	note G_, 10
+	G_ 10
 	speed 7
 	rest 3
 	music_call Branch_f9554
@@ -414,206 +414,206 @@ Music_PokemonDome_Ch2: ; f93f8 (3e:53f8)
 	volume 128
 	dec_octave
 	speed 1
-	note G_, 4
-	note A_, 3
-	note B_, 4
-	inc_octave
-	note C_, 3
-	note D_, 4
-	note E_, 3
-	note F_, 4
-	note F#, 3
+	G_ 4
+	A_ 3
+	B_ 4
+	inc_octave
+	C_ 3
+	D_ 4
+	E_ 3
+	F_ 4
+	F# 3
 	speed 7
-	note G_, 10
-	note F_, 1
+	G_ 10
+	F_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	volume 39
-	note E_, 1
+	E_ 1
 	rest 1
 	volume 112
-	note G_, 1
-	note G_, 10
-	note A_, 2
-	note B_, 2
-	note G_, 2
+	G_ 1
+	G_ 10
+	A_ 2
+	B_ 2
+	G_ 2
 	inc_octave
-	note C_, 10
+	C_ 10
 	rest 2
 	dec_octave
-	note A_, 3
+	A_ 3
 	rest 1
-	note G#, 10
-	note A#, 1
+	G# 10
+	A# 1
 	rest 1
-	note G#, 3
+	G# 3
 	rest 1
-	note G_, 8
+	G_ 8
 	inc_octave
-	note C_, 4
+	C_ 4
 	dec_octave
-	note E_, 4
-	note F#, 8
-	note F#, 4
+	E_ 4
+	F# 8
+	F# 4
 	musice8 6
-	note F#, 3
+	F# 3
 	musice8 8
 	speed 1
-	note F#, 5
+	F# 5
 	rest 2
 	speed 7
-	note F_, 14
+	F_ 14
 	rest 2
 	dec_octave
-	note G_, 1
-	note A_, 1
-	note B_, 1
+	G_ 1
+	A_ 1
+	B_ 1
 	inc_octave
-	note C_, 1
-	note D_, 1
+	C_ 1
+	D_ 1
 	dec_octave
-	note B_, 1
-	inc_octave
-	note C_, 1
-	note D_, 1
-	note E_, 1
-	note C_, 1
-	note D_, 1
-	note E_, 1
-	note F_, 1
-	note F_, 1
-	note A_, 1
-	note B_, 1
+	B_ 1
+	inc_octave
+	C_ 1
+	D_ 1
+	E_ 1
+	C_ 1
+	D_ 1
+	E_ 1
+	F_ 1
+	F_ 1
+	A_ 1
+	B_ 1
 	duty 1
 	volume 127
 	speed 1
 	Loop 4
-	note F_, 5
-	note C_, 5
+	F_ 5
+	C_ 5
 	dec_octave
-	note A_, 4
+	A_ 4
 	inc_octave
-	note C_, 5
+	C_ 5
 	dec_octave
-	note A_, 5
-	note F_, 4
+	A_ 5
+	F_ 4
 	inc_octave
 	EndLoop
 	Loop 4
-	note G#, 5
-	note F_, 5
-	note C_, 4
-	note F_, 5
-	note C_, 5
+	G# 5
+	F_ 5
+	C_ 4
+	F_ 5
+	C_ 5
 	dec_octave
-	note G#, 4
+	G# 4
 	inc_octave
 	EndLoop
 	Loop 4
 	inc_octave
-	note D_, 5
+	D_ 5
 	dec_octave
-	note B_, 5
-	note G_, 4
-	note B_, 5
-	note G_, 5
-	note D_, 4
+	B_ 5
+	G_ 4
+	B_ 5
+	G_ 5
+	D_ 4
 	EndLoop
 	Loop 3
 	inc_octave
-	note C#, 5
+	C# 5
 	dec_octave
-	note A#, 5
-	note G_, 4
-	note A#, 5
-	note G_, 5
-	note E_, 4
+	A# 5
+	G_ 4
+	A# 5
+	G_ 5
+	E_ 4
 	EndLoop
 	inc_octave
-	note C#, 5
+	C# 5
 	dec_octave
-	note C#, 5
-	note E_, 4
-	note G_, 5
-	note A#, 5
+	C# 5
+	E_ 4
+	G_ 5
+	A# 5
 	inc_octave
-	note C#, 4
+	C# 4
 	duty 0
 	volume 128
 	speed 7
 	Loop 2
-	note C_, 1
+	C_ 1
 	volume 39
-	note C_, 1
+	C_ 1
 	rest 1
 	volume 112
 	dec_octave
-	note F_, 1
-	note A_, 8
+	F_ 1
+	A_ 8
 	inc_octave
-	note E_, 1
+	E_ 1
 	volume 39
-	note E_, 1
+	E_ 1
 	rest 1
 	volume 112
-	note D_, 1
+	D_ 1
 	EndLoop
-	note C_, 1
+	C_ 1
 	volume 39
-	note C_, 1
+	C_ 1
 	rest 1
 	dec_octave
 	volume 112
-	note F_, 1
-	note G#, 12
-	note C_, 1
+	F_ 1
+	G# 12
+	C_ 1
 	dec_octave
-	note F_, 1
-	note G#, 1
+	F_ 1
+	G# 1
 	inc_octave
-	note C_, 1
-	note F_, 1
+	C_ 1
+	F_ 1
 	dec_octave
-	note G#, 1
+	G# 1
 	inc_octave
-	note C_, 1
-	note F_, 1
-	note G#, 1
-	note C_, 1
-	note F_, 1
-	note G#, 1
+	C_ 1
+	F_ 1
+	G# 1
+	C_ 1
+	F_ 1
+	G# 1
 	inc_octave
-	note C_, 1
+	C_ 1
 	dec_octave
-	note F_, 1
-	note G#, 1
-	note B_, 1
+	F_ 1
+	G# 1
+	B_ 1
 	EndMainLoop
 
 Branch_f9554:
 	speed 1
 	volume 112
-	note F_, 11
+	F_ 11
 	volume 55
-	note F_, 3
+	F_ 3
 	volume 112
-	note F_, 11
+	F_ 11
 	volume 55
-	note F_, 10
+	F_ 10
 	rest 7
 	volume 112
-	note F_, 4
+	F_ 4
 	volume 55
-	note F_, 3
+	F_ 3
 	volume 112
-	note F_, 4
+	F_ 4
 	volume 55
-	note F_, 3
+	F_ 3
 	Loop 2
 	volume 112
-	note F_, 11
+	F_ 11
 	volume 55
-	note F_, 3
+	F_ 3
 	EndLoop
 	music_ret
 
@@ -629,171 +629,171 @@ Music_PokemonDome_Ch3: ; f9579 (3e:5579)
 	musice8 4
 	speed 1
 	Loop 8
-	note G_, 5
-	note G_, 5
-	note G_, 4
+	G_ 5
+	G_ 5
+	G_ 4
 	EndLoop
 	musice8 6
 	speed 7
 	MainLoop
 	inc_octave
-	note C_, 2
-	note C_, 2
+	C_ 2
+	C_ 2
 	rest 2
-	note C_, 1
-	note C_, 1
+	C_ 1
+	C_ 1
 	music_call Branch_f9613
 	octave 1
 	musice8 4
-	note C_, 2
+	C_ 2
 	inc_octave
 	musice8 6
-	note C_, 2
+	C_ 2
 	rest 2
-	note C_, 1
-	note C_, 1
+	C_ 1
+	C_ 1
 	music_call Branch_f9613
 	octave 2
-	note C_, 2
-	note C_, 2
+	C_ 2
+	C_ 2
 	rest 2
-	note C_, 1
-	note C_, 1
-	note C_, 2
-	note C_, 2
+	C_ 1
+	C_ 1
+	C_ 2
+	C_ 2
 	rest 2
 	dec_octave
-	note G_, 2
-	note B_, 2
-	note B_, 2
+	G_ 2
+	B_ 2
+	B_ 2
 	rest 2
-	note B_, 1
-	note B_, 1
-	note B_, 2
-	note B_, 2
+	B_ 1
+	B_ 1
+	B_ 2
+	B_ 2
 	rest 2
-	note G_, 2
-	note A_, 2
-	note A_, 2
+	G_ 2
+	A_ 2
+	A_ 2
 	rest 2
-	note A_, 1
-	note A_, 1
-	note A_, 2
-	note A_, 2
+	A_ 1
+	A_ 1
+	A_ 2
+	A_ 2
 	rest 2
-	note F_, 2
-	note G#, 2
-	note G#, 2
+	F_ 2
+	G# 2
+	G# 2
 	rest 2
-	note G#, 1
-	note G#, 1
-	note G#, 2
-	note G#, 2
+	G# 1
+	G# 1
+	G# 2
+	G# 2
 	rest 2
-	note F_, 2
+	F_ 2
 	Loop 2
-	note G_, 2
-	note G_, 2
+	G_ 2
+	G_ 2
 	rest 2
-	note G_, 1
-	note G_, 1
+	G_ 1
+	G_ 1
 	EndLoop
 	Loop 2
-	note F#, 2
-	note F#, 2
+	F# 2
+	F# 2
 	rest 2
-	note F#, 1
-	note F#, 1
+	F# 1
+	F# 1
 	EndLoop
 	Loop 4
-	note G_, 2
-	note G_, 2
+	G_ 2
+	G_ 2
 	rest 2
-	note G_, 1
-	note G_, 1
+	G_ 1
+	G_ 1
 	EndLoop
 	Loop 4
-	note F_, 2
-	note F_, 2
+	F_ 2
+	F_ 2
 	rest 2
-	note F_, 1
-	note F_, 1
+	F_ 1
+	F_ 1
 	EndLoop
 	Loop 2
-	note E_, 2
-	note E_, 2
+	E_ 2
+	E_ 2
 	rest 2
-	note E_, 1
-	note E_, 1
+	E_ 1
+	E_ 1
 	EndLoop
 	Loop 2
-	note A_, 2
-	note A_, 2
+	A_ 2
+	A_ 2
 	rest 2
-	note A_, 1
-	note A_, 1
+	A_ 1
+	A_ 1
 	EndLoop
 	Loop 4
-	note D_, 2
-	note D_, 2
+	D_ 2
+	D_ 2
 	rest 2
-	note D_, 1
-	note D_, 1
+	D_ 1
+	D_ 1
 	EndLoop
 	Loop 4
-	note G_, 2
-	note G_, 2
+	G_ 2
+	G_ 2
 	rest 2
-	note G_, 1
-	note G_, 1
+	G_ 1
+	G_ 1
 	EndLoop
 	EndMainLoop
 
 Branch_f9613:
 	octave 2
-	note C_, 2
-	note C_, 2
+	C_ 2
+	C_ 2
 	rest 2
 	dec_octave
-	note G_, 2
+	G_ 2
 	inc_octave
-	note C_, 2
-	note C_, 2
+	C_ 2
+	C_ 2
 	rest 2
-	note C_, 1
-	note C_, 1
-	note C_, 2
-	note C_, 2
+	C_ 1
+	C_ 1
+	C_ 2
+	C_ 2
 	dec_octave
 	musice8 4
-	note G_, 2
+	G_ 2
 	musice8 6
-	note G_, 2
+	G_ 2
 	music_ret
 
 
 Music_PokemonDome_Ch4: ; f9629 (3e:5629)
 	speed 7
 	octave 1
-	note snare5, 8
+	snare5 8
 	speed 1
-	note snare1, 4
-	note snare2, 3
+	snare1 4
+	snare2 3
 	Loop 7
-	note snare2, 4
-	note snare2, 3
+	snare2 4
+	snare2 3
 	EndLoop
 	MainLoop
 	Loop 2
 	speed 7
-	note snare1, 2
-	note snare1, 2
+	snare1 2
+	snare1 2
 	rest 2
 	speed 1
-	note snare1, 4
-	note snare2, 3
-	note snare2, 4
-	note snare2, 3
+	snare1 4
+	snare2 3
+	snare2 4
+	snare2 3
 	EndLoop
 	EndMainLoop
 ; 0xf9646
diff --git a/audio/music/ronald.asm b/audio/music/ronald.asm
index 50ce748..54817ac 100644
--- a/audio/music/ronald.asm
+++ b/audio/music/ronald.asm
@@ -10,43 +10,43 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0)
 	Loop 2
 	volume 146
 	musice8 3
-	note D_, 1
-	note D_, 1
+	D_ 1
+	D_ 1
 	musice8 4
-	note F_, 1
+	F_ 1
 	rest 2
-	note D_, 1
+	D_ 1
 	rest 1
-	note C_, 1
+	C_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
 	volume 144
 	musice8 8
-	note E_, 2
+	E_ 2
 	rest 1
 	dec_octave
 	volume 146
 	musice8 3
-	note G_, 1
+	G_ 1
 	inc_octave
-	note D_, 1
+	D_ 1
 	musice8 4
-	note F_, 1
+	F_ 1
 	rest 2
-	note F_, 1
+	F_ 1
 	rest 1
-	note C_, 1
+	C_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	musice8 8
 	volume 144
-	note G_, 2
+	G_ 2
 	rest 1
 	EndLoop
 	Loop 2
@@ -54,11 +54,11 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0)
 	music_call Branch_fa9aa
 	speed 1
 	octave 4
-	note C#, 3
-	note D_, 10
+	C# 3
+	D_ 10
 	tie
 	speed 13
-	note D_, 2
+	D_ 2
 	vibrato_delay 12
 	music_call Branch_fa9ec
 	EndLoop
@@ -67,11 +67,11 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0)
 	music_call Branch_fa9cb
 	speed 1
 	octave 4
-	note C#, 3
-	note D_, 10
+	C# 3
+	D_ 10
 	tie
 	speed 13
-	note D_, 2
+	D_ 2
 	vibrato_delay 12
 	music_call Branch_fa9ec
 	EndLoop
@@ -79,339 +79,339 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0)
 	vibrato_delay 20
 	speed 1
 	octave 4
-	note C#, 3
-	note D_, 3
+	C# 3
+	D_ 3
 	rest 7
 	duty 2
 	volume 144
 	rest 6
 	dec_octave
 	musice8 4
-	note G_, 7
+	G_ 7
 	inc_octave
-	note F_, 6
+	F_ 6
 	dec_octave
-	note G_, 7
+	G_ 7
 	inc_octave
-	note E_, 6
+	E_ 6
 	dec_octave
-	note G_, 7
+	G_ 7
 	inc_octave
-	note D_, 6
+	D_ 6
 	dec_octave
-	note G_, 7
+	G_ 7
 	inc_octave
 	musice8 8
-	note C_, 4
-	note C#, 4
-	note C_, 5
+	C_ 4
+	C# 4
+	C_ 5
 	dec_octave
 	musice8 4
-	note A#, 6
+	A# 6
 	inc_octave
-	note C_, 7
+	C_ 7
 	dec_octave
-	note A#, 6
-	note G_, 7
-	note F_, 6
-	note F#, 7
+	A# 6
+	G_ 7
+	F_ 6
+	F# 7
 	musice8 8
-	note G_, 6
+	G_ 6
 	musice8 4
-	note C#, 7
-	note C_, 6
+	C# 7
+	C_ 6
 	dec_octave
-	note A#, 7
+	A# 7
 	inc_octave
 	musice8 8
-	note C_, 4
-	note C#, 4
-	note C_, 5
+	C_ 4
+	C# 4
+	C_ 5
 	dec_octave
-	note A#, 6
+	A# 6
 	inc_octave
 	musice8 4
-	note C_, 7
+	C_ 7
 	dec_octave
-	note A#, 6
-	note G_, 7
-	note F_, 6
-	note F#, 7
-	note G_, 6
+	A# 6
+	G_ 7
+	F_ 6
+	F# 7
+	G_ 6
 	musice8 8
-	note A#, 7
+	A# 7
 	inc_octave
-	note C_, 6
-	note D_, 7
+	C_ 6
+	D_ 7
 	speed 13
 	music_call Branch_fa9aa
 	speed 1
 	octave 4
-	note C#, 3
-	note D_, 3
+	C# 3
+	D_ 3
 	rest 7
 	duty 2
 	volume 144
 	rest 6
 	dec_octave
 	musice8 4
-	note G_, 7
+	G_ 7
 	inc_octave
-	note F_, 6
+	F_ 6
 	dec_octave
-	note G_, 7
+	G_ 7
 	inc_octave
-	note E_, 6
+	E_ 6
 	dec_octave
-	note G_, 7
+	G_ 7
 	inc_octave
-	note D_, 6
+	D_ 6
 	dec_octave
-	note G_, 7
+	G_ 7
 	inc_octave
 	musice8 8
-	note C_, 4
-	note C#, 4
-	note C_, 5
+	C_ 4
+	C# 4
+	C_ 5
 	dec_octave
 	musice8 4
-	note A#, 6
+	A# 6
 	inc_octave
-	note C_, 7
+	C_ 7
 	dec_octave
-	note A#, 6
-	note G_, 7
-	note F_, 6
-	note F#, 7
-	note G_, 6
+	A# 6
+	G_ 7
+	F_ 6
+	F# 7
+	G_ 6
 	musice8 8
-	note A#, 7
+	A# 7
 	inc_octave
 	musice8 4
-	note C_, 6
+	C_ 6
 	dec_octave
-	note A#, 7
+	A# 7
 	inc_octave
 	musice8 8
-	note C#, 4
-	note C_, 4
+	C# 4
+	C_ 4
 	dec_octave
-	note A#, 5
+	A# 5
 	musice8 4
-	note G_, 6
-	note F_, 7
-	note G_, 6
-	note C#, 7
-	note C_, 6
+	G_ 6
+	F_ 7
+	G_ 6
+	C# 7
+	C_ 6
 	dec_octave
-	note A#, 7
+	A# 7
 	inc_octave
 	musice8 8
-	note C_, 4
-	note C#, 4
-	note C_, 5
+	C_ 4
+	C# 4
+	C_ 5
 	dec_octave
 	musice8 4
-	note A#, 6
-	note G_, 7
+	A# 6
+	G_ 7
 	musice8 8
 	music_call Branch_fa9cb
 	speed 1
 	octave 4
-	note C#, 3
-	note D_, 3
+	C# 3
+	D_ 3
 	rest 7
 	duty 2
 	volume 144
 	rest 13
 	musice8 4
-	note F_, 6
+	F_ 6
 	rest 7
 	musice8 8
-	note E_, 4
-	note F_, 4
-	note E_, 5
+	E_ 4
+	F_ 4
+	E_ 5
 	musice8 4
-	note D_, 6
+	D_ 6
 	rest 7
 	musice8 8
-	note E_, 6
+	E_ 6
 	musice8 4
-	note C_, 7
+	C_ 7
 	dec_octave
-	note G_, 6
+	G_ 6
 	inc_octave
-	note C_, 7
-	note C#, 6
-	note D_, 7
+	C_ 7
+	C# 6
+	D_ 7
 	dec_octave
 	musice8 8
-	note A#, 6
+	A# 6
 	musice8 4
-	note G_, 7
+	G_ 7
 	rest 6
-	note F_, 7
+	F_ 7
 	musice8 8
-	note F#, 6
+	F# 6
 	musice8 4
-	note G_, 7
+	G_ 7
 	musice8 8
-	note A#, 6
+	A# 6
 	musice8 4
-	note G_, 7
-	note A#, 6
+	G_ 7
+	A# 6
 	inc_octave
-	note C_, 7
+	C_ 7
 	musice8 8
-	note C#, 6
+	C# 6
 	musice8 4
-	note D_, 7
-	note F_, 6
-	note D_, 7
+	D_ 7
+	F_ 6
+	D_ 7
 	musice8 8
-	note F_, 6
+	F_ 6
 	dec_octave
 	musice8 4
-	note G_, 7
+	G_ 7
 	dec_octave
-	note G_, 6
+	G_ 6
 	inc_octave
-	note D_, 7
+	D_ 7
 	duty 1
 	volume 160
 	musice8 8
 	music_call Branch_fa9cb
 	speed 1
 	octave 4
-	note C#, 3
-	note D_, 3
+	C# 3
+	D_ 3
 	rest 7
 	rest 13
 	dec_octave
-	note G_, 3
-	note G#, 10
-	note G_, 3
+	G_ 3
+	G# 10
+	G_ 3
 	rest 10
 	speed 13
-	note F_, 4
+	F_ 4
 	vibrato_delay 12
 	speed 1
 	volume 147
-	note C_, 6
+	C_ 6
 	rest 7
 	rest 13
-	note F_, 6
+	F_ 6
 	rest 7
 	rest 13
-	note A_, 6
+	A_ 6
 	rest 7
 	rest 13
 	speed 13
 	volume 144
-	note G_, 2
+	G_ 2
 	rest 1
 	vibrato_delay 20
 	speed 1
 	volume 160
-	note F#, 3
-	note G_, 10
-	note A#, 3
+	F# 3
+	G_ 10
+	A# 3
 	rest 10
-	note G_, 3
+	G_ 3
 	rest 10
 	inc_octave
-	note D_, 13
+	D_ 13
 	rest 13
 	dec_octave
-	note A#, 6
+	A# 6
 	rest 7
 	rest 13
-	note A#, 3
+	A# 3
 	inc_octave
-	note C_, 10
+	C_ 10
 	rest 13
 	dec_octave
-	note A#, 3
+	A# 3
 	rest 10
 	inc_octave
-	note C_, 13
+	C_ 13
 	dec_octave
-	note A#, 3
+	A# 3
 	rest 10
 	inc_octave
-	note C#, 4
-	note C_, 4
+	C# 4
+	C_ 4
 	dec_octave
-	note A#, 5
-	note G_, 3
+	A# 5
+	G_ 3
 	rest 10
-	note B_, 3
+	B_ 3
 	inc_octave
-	note C_, 10
+	C_ 10
 	dec_octave
-	note A#, 3
+	A# 3
 	rest 10
 	rest 13
 	inc_octave
-	note G_, 3
+	G_ 3
 	rest 10
-	note C_, 4
-	note C#, 4
-	note C_, 5
+	C_ 4
+	C# 4
+	C_ 5
 	dec_octave
-	note A#, 3
+	A# 3
 	rest 10
 	inc_octave
-	note C_, 13
+	C_ 13
 	dec_octave
-	note A#, 3
+	A# 3
 	rest 10
-	note G_, 3
+	G_ 3
 	rest 10
 	inc_octave
-	note E_, 3
-	note F_, 10
+	E_ 3
+	F_ 10
 	rest 13
-	note D#, 13
+	D# 13
 	rest 13
-	note D_, 6
+	D_ 6
 	rest 7
 	rest 13
-	note C_, 6
+	C_ 6
 	rest 7
 	rest 13
-	note C#, 3
+	C# 3
 	rest 10
-	note C#, 3
-	note D_, 10
+	C# 3
+	D_ 10
 	dec_octave
-	note A#, 3
+	A# 3
 	rest 10
-	note G_, 3
+	G_ 3
 	rest 10
 	speed 13
-	note A#, 3
+	A# 3
 	rest 4
 	speed 1
-	note B_, 3
+	B_ 3
 	inc_octave
-	note C_, 16
+	C_ 16
 	rest 7
-	note E_, 3
-	note F_, 10
+	E_ 3
+	F_ 10
 	rest 6
-	note D_, 7
+	D_ 7
 	rest 13
-	note C_, 6
+	C_ 6
 	rest 7
-	note C#, 3
-	note D_, 10
+	C# 3
+	D_ 10
 	tie
 	speed 13
-	note D_, 5
+	D_ 5
 	rest 1
 	dec_octave
-	note D_, 8
+	D_ 8
 	rest 1
 	duty 0
 	vibrato_delay 12
@@ -423,26 +423,26 @@ Branch_fa9aa:
 	volume 160
 	rest 2
 	speed 1
-	note G#, 3
-	note A_, 3
+	G# 3
+	A_ 3
 	rest 7
 	rest 13
-	note F_, 13
-	note D_, 3
+	F_ 13
+	D_ 3
 	rest 10
 	rest 13
-	note E_, 6
+	E_ 6
 	rest 7
 	speed 13
 	rest 1
-	note F_, 1
+	F_ 1
 	speed 1
-	note G_, 3
+	G_ 3
 	rest 10
-	note E_, 6
+	E_ 6
 	rest 7
 	rest 13
-	note C_, 6
+	C_ 6
 	rest 7
 	rest 13
 	music_ret
@@ -452,29 +452,29 @@ Branch_fa9cb:
 	duty 1
 	volume 160
 	speed 1
-	note D#, 3
-	note E_, 10
-	note F_, 3
+	D# 3
+	E_ 10
+	F_ 3
 	rest 10
-	note G_, 3
+	G_ 3
 	rest 10
-	note E_, 6
+	E_ 6
 	rest 7
 	rest 13
-	note C_, 6
+	C_ 6
 	rest 7
 	rest 13
-	note D_, 6
+	D_ 6
 	rest 7
 	rest 13
-	note D#, 3
-	note E_, 10
-	note F_, 3
+	D# 3
+	E_ 10
+	F_ 3
 	rest 10
-	note G_, 3
+	G_ 3
 	rest 10
-	note E_, 13
-	note C_, 6
+	E_ 13
+	C_ 6
 	rest 7
 	rest 13
 	music_ret
@@ -484,25 +484,25 @@ Branch_fa9ec:
 	duty 0
 	volume 146
 	speed 1
-	note F_, 6
+	F_ 6
 	rest 7
 	speed 13
 	rest 2
 	speed 1
-	note F_, 6
+	F_ 6
 	rest 7
 	speed 13
 	rest 3
 	speed 1
-	note F_, 6
+	F_ 6
 	rest 7
 	rest 13
-	note A_, 6
+	A_ 6
 	rest 7
 	rest 13
 	speed 13
 	volume 144
-	note G_, 2
+	G_ 2
 	rest 1
 	music_ret
 
@@ -518,86 +518,86 @@ Music_Ronald_Ch2: ; faa0e (3e:6a0e)
 	Loop 2
 	speed 1
 	volume 146
-	note G_, 3
+	G_ 3
 	rest 3
-	note G_, 3
+	G_ 3
 	rest 4
-	note A#, 3
+	A# 3
 	rest 10
 	inc_octave
-	note D_, 6
+	D_ 6
 	dec_octave
-	note G_, 3
+	G_ 3
 	rest 4
-	note A#, 3
+	A# 3
 	rest 3
 	rest 13
-	note G_, 3
-	note D_, 4
-	note A#, 6
+	G_ 3
+	D_ 4
+	A# 6
 	rest 7
-	note D_, 3
+	D_ 3
 	rest 3
-	note G_, 3
+	G_ 3
 	rest 4
-	note G_, 6
+	G_ 6
 	rest 7
 	rest 13
-	note A#, 6
+	A# 6
 	rest 13
-	note G_, 3
-	note A#, 4
+	G_ 3
+	A# 4
 	inc_octave
-	note D_, 6
+	D_ 6
 	rest 7
 	rest 13
 	speed 13
 	volume 144
-	note C_, 2
+	C_ 2
 	rest 1
 	dec_octave
 	speed 1
 	volume 146
-	note D_, 3
+	D_ 3
 	rest 3
-	note G_, 3
+	G_ 3
 	rest 4
-	note A#, 3
+	A# 3
 	rest 10
 	inc_octave
-	note D_, 6
+	D_ 6
 	dec_octave
-	note G_, 3
+	G_ 3
 	rest 4
-	note A#, 3
+	A# 3
 	rest 3
 	rest 13
-	note G_, 3
-	note A#, 4
+	G_ 3
+	A# 4
 	inc_octave
-	note D_, 6
+	D_ 6
 	rest 7
 	dec_octave
-	note D_, 3
+	D_ 3
 	rest 3
-	note G_, 3
+	G_ 3
 	rest 4
-	note G_, 6
+	G_ 6
 	rest 7
 	rest 13
 	inc_octave
-	note D_, 6
+	D_ 6
 	rest 13
 	dec_octave
-	note A#, 3
+	A# 3
 	inc_octave
-	note D_, 4
-	note F_, 6
+	D_ 4
+	F_ 6
 	rest 7
 	rest 13
 	speed 13
 	volume 144
-	note E_, 2
+	E_ 2
 	rest 1
 	dec_octave
 	EndLoop
@@ -605,12 +605,12 @@ Music_Ronald_Ch2: ; faa0e (3e:6a0e)
 	music_call Branch_fab76
 	musice8 8
 	volume 128
-	note C_, 2
+	C_ 2
 	rest 1
 	music_call Branch_fab76
 	musice8 8
 	volume 128
-	note E_, 2
+	E_ 2
 	rest 1
 	EndLoop
 	Loop 2
@@ -621,53 +621,53 @@ Music_Ronald_Ch2: ; faa0e (3e:6a0e)
 	octave 4
 	rest 2
 	musice8 4
-	note F_, 1
+	F_ 1
 	rest 1
 	musice8 8
-	note D_, 1
+	D_ 1
 	dec_octave
 	dec_octave
 	musice8 4
 	duty 0
 	volume 146
-	note A#, 1
+	A# 1
 	rest 1
 	inc_octave
 	inc_octave
 	duty 1
 	volume 128
-	note C_, 1
+	C_ 1
 	rest 1
 	musice8 8
-	note D_, 1
+	D_ 1
 	musice8 3
-	note E_, 1
+	E_ 1
 	musice8 4
-	note C_, 1
+	C_ 1
 	rest 1
 	dec_octave
-	note A_, 1
+	A_ 1
 	rest 1
-	note A#, 1
+	A# 1
 	rest 2
 	vibrato_delay 12
 	duty 0
 	volume 146
-	note F_, 1
+	F_ 1
 	rest 2
-	note F_, 1
+	F_ 1
 	rest 1
 	dec_octave
-	note G_, 1
+	G_ 1
 	rest 1
 	inc_octave
-	note F_, 1
+	F_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	musice8 8
 	volume 144
-	note G_, 2
+	G_ 2
 	rest 1
 	EndLoop
 	vibrato_delay 20
@@ -678,21 +678,21 @@ Music_Ronald_Ch2: ; faa0e (3e:6a0e)
 	duty 0
 	volume 146
 	musice8 4
-	note F_, 1
+	F_ 1
 	rest 2
-	note F_, 1
+	F_ 1
 	rest 1
 	dec_octave
-	note G_, 1
+	G_ 1
 	rest 1
 	inc_octave
-	note F_, 1
+	F_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	musice8 8
 	volume 144
-	note G_, 2
+	G_ 2
 	rest 1
 	vibrato_delay 20
 	music_call Branch_fab8a
@@ -700,84 +700,84 @@ Music_Ronald_Ch2: ; faa0e (3e:6a0e)
 	rest 1
 	speed 1
 	musice8 8
-	note E_, 3
-	note F_, 10
-	note E_, 3
+	E_ 3
+	F_ 10
+	E_ 3
 	rest 10
 	speed 13
-	note D_, 4
+	D_ 4
 	dec_octave
 	vibrato_delay 12
 	duty 0
 	volume 146
 	musice8 4
-	note G_, 1
+	G_ 1
 	rest 1
 	inc_octave
-	note D_, 1
+	D_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
 	musice8 8
 	volume 144
-	note E_, 2
+	E_ 2
 	rest 1
 	music_call Branch_fabb1
 	rest 1
 	musice8 4
 	octave 2
-	note A#, 1
+	A# 1
 	rest 1
-	note A#, 1
+	A# 1
 	rest 1
 	inc_octave
 	musice8 8
 	volume 144
-	note C_, 2
+	C_ 2
 	rest 1
 	volume 146
 	rest 2
 	musice8 4
-	note F_, 1
+	F_ 1
 	rest 2
-	note F_, 1
+	F_ 1
 	rest 1
-	note C_, 1
+	C_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	musice8 8
 	volume 144
-	note F_, 2
+	F_ 2
 	rest 1
 	music_call Branch_fabb1
 	rest 1
 	octave 2
 	musice8 4
-	note G_, 1
+	G_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
 	inc_octave
 	musice8 8
 	volume 144
-	note C_, 2
+	C_ 2
 	rest 1
 	rest 2
 	dec_octave
 	volume 146
 	musice8 4
-	note G_, 1
+	G_ 1
 	rest 2
-	note G_, 1
+	G_ 1
 	rest 1
 	vibrato_delay 20
 	musice8 8
 	duty 1
 	volume 112
-	note F#, 8
+	F# 8
 	rest 1
 	duty 0
 	vibrato_delay 12
@@ -789,16 +789,16 @@ Branch_fab76:
 	speed 13
 	rest 2
 	musice8 4
-	note A#, 1
+	A# 1
 	rest 2
-	note A#, 1
+	A# 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note A#, 1
+	A# 1
 	rest 1
 	inc_octave
-	note D_, 1
+	D_ 1
 	rest 1
 	music_ret
 
@@ -807,31 +807,31 @@ Branch_fab8a:
 	duty 1
 	volume 128
 	speed 13
-	note C_, 1
+	C_ 1
 	musice8 3
-	note D_, 1
-	note E_, 1
+	D_ 1
+	E_ 1
 	musice8 4
-	note C_, 1
+	C_ 1
 	rest 1
 	dec_octave
-	note A_, 1
+	A_ 1
 	rest 1
-	note A#, 1
+	A# 1
 	rest 1
 	inc_octave
 	musice8 8
-	note C_, 1
+	C_ 1
 	musice8 3
-	note D_, 1
-	note E_, 1
+	D_ 1
+	E_ 1
 	musice8 8
-	note C_, 1
+	C_ 1
 	dec_octave
 	musice8 4
-	note A_, 1
+	A_ 1
 	rest 1
-	note A#, 1
+	A# 1
 	music_ret
 
 Branch_fabb1:
@@ -840,12 +840,12 @@ Branch_fabb1:
 	speed 13
 	rest 2
 	musice8 4
-	note A#, 1
+	A# 1
 	rest 2
-	note A#, 1
+	A# 1
 	rest 1
 	inc_octave
-	note C_, 1
+	C_ 1
 	music_ret
 
 
@@ -859,267 +859,267 @@ Music_Ronald_Ch3: ; fabc0 (3e:6bc0)
 	MainLoop
 	octave 1
 	Loop 4
-	note G_, 13
-	note G_, 2
+	G_ 13
+	G_ 2
 	rest 4
-	note G_, 5
+	G_ 5
 	rest 2
 	inc_octave
-	note A#, 6
+	A# 6
 	dec_octave
-	note F_, 2
+	F_ 2
 	rest 5
-	note F_, 6
-	note F#, 3
+	F_ 6
+	F# 3
 	rest 4
-	note G_, 2
+	G_ 2
 	rest 4
-	note G_, 3
+	G_ 3
 	rest 10
-	note F_, 7
-	note G_, 6
+	F_ 7
+	G_ 6
 	rest 7
 	inc_octave
-	note C_, 13
+	C_ 13
 	rest 6
 	inc_octave
-	note C_, 2
+	C_ 2
 	rest 11
 	dec_octave
-	note C_, 2
+	C_ 2
 	rest 5
 	dec_octave
-	note E_, 13
+	E_ 13
 	rest 6
-	note F_, 7
+	F_ 7
 	rest 6
-	note F_, 7
-	note F#, 13
-	note G_, 13
+	F_ 7
+	F# 13
+	G_ 13
 	inc_octave
-	note C_, 6
+	C_ 6
 	rest 7
 	dec_octave
 	EndLoop
 	Loop 8
 	music_call Branch_fac94
 	octave 2
-	note A#, 6
+	A# 6
 	music_call Branch_facbb
 	music_call Branch_fac94
 	octave 3
-	note F_, 6
+	F_ 6
 	music_call Branch_facbb
 	EndLoop
 	music_call Branch_facc5
 	octave 1
-	note D_, 13
+	D_ 13
 	rest 6
 	inc_octave
-	note D_, 2
+	D_ 2
 	rest 5
 	inc_octave
-	note D_, 6
+	D_ 6
 	octave 1
-	note D_, 2
+	D_ 2
 	rest 5
-	note D_, 13
+	D_ 13
 	octave 3
-	note D_, 6
+	D_ 6
 	octave 1
-	note A_, 7
+	A_ 7
 	rest 6
 	inc_octave
-	note C_, 7
-	note C_, 13
-	note C#, 13
-	note D_, 6
+	C_ 7
+	C_ 13
+	C# 13
+	D_ 6
 	rest 7
 	dec_octave
-	note C_, 13
-	note C_, 2
+	C_ 13
+	C_ 2
 	rest 4
-	note C_, 5
+	C_ 5
 	rest 2
 	octave 3
-	note D_, 6
+	D_ 6
 	octave 1
-	note G_, 2
+	G_ 2
 	rest 5
-	note G_, 6
+	G_ 6
 	inc_octave
-	note C_, 3
+	C_ 3
 	rest 4
 	dec_octave
-	note C_, 2
+	C_ 2
 	rest 4
-	note C_, 3
+	C_ 3
 	rest 4
 	octave 3
-	note D_, 6
+	D_ 6
 	octave 1
-	note G_, 7
-	note C_, 6
+	G_ 7
+	C_ 6
 	rest 7
-	note D_, 13
+	D_ 13
 	rest 6
 	inc_octave
-	note D_, 2
+	D_ 2
 	rest 5
 	inc_octave
-	note D_, 6
+	D_ 6
 	octave 1
-	note D_, 2
+	D_ 2
 	rest 5
-	note D_, 13
+	D_ 13
 	octave 3
-	note F_, 6
+	F_ 6
 	octave 1
-	note A_, 7
+	A_ 7
 	rest 6
 	inc_octave
-	note D_, 7
-	note D_, 13
+	D_ 7
+	D_ 13
 	dec_octave
-	note A_, 13
-	note D_, 6
+	A_ 13
+	D_ 6
 	rest 7
 	music_call Branch_facc5
 	octave 1
-	note G#, 13
+	G# 13
 	rest 6
 	inc_octave
-	note G#, 2
+	G# 2
 	rest 5
 	inc_octave
-	note D_, 6
+	D_ 6
 	octave 1
-	note G#, 2
+	G# 2
 	rest 5
-	note G#, 13
+	G# 13
 	octave 3
-	note D_, 6
+	D_ 6
 	dec_octave
-	note D#, 7
+	D# 7
 	rest 6
-	note G#, 7
-	note G#, 13
+	G# 7
+	G# 13
 	dec_octave
-	note G#, 13
+	G# 13
 	inc_octave
-	note D#, 6
+	D# 6
 	rest 7
 	dec_octave
-	note A_, 13
-	note A_, 2
+	A_ 13
+	A_ 2
 	rest 4
-	note A_, 5
+	A_ 5
 	rest 2
 	octave 3
-	note D_, 6
+	D_ 6
 	dec_octave
-	note E_, 2
+	E_ 2
 	rest 5
-	note E_, 6
-	note E_, 3
+	E_ 6
+	E_ 3
 	rest 4
 	dec_octave
-	note A_, 2
+	A_ 2
 	rest 4
-	note A_, 3
+	A_ 3
 	rest 4
 	octave 3
-	note D_, 6
+	D_ 6
 	dec_octave
-	note E_, 7
+	E_ 7
 	dec_octave
-	note A_, 6
+	A_ 6
 	rest 7
 	speed 13
-	note G#, 8
+	G# 8
 	rest 1
 	speed 1
 	EndMainLoop
 
 Branch_fac94:
 	octave 1
-	note G_, 13
-	note G_, 2
+	G_ 13
+	G_ 2
 	rest 4
-	note G_, 5
+	G_ 5
 	rest 2
 	octave 3
-	note D_, 6
+	D_ 6
 	dec_octave
-	note D_, 2
+	D_ 2
 	rest 5
-	note D_, 6
-	note G_, 3
+	D_ 6
+	G_ 3
 	rest 4
 	dec_octave
-	note G_, 2
+	G_ 2
 	rest 4
-	note G_, 3
+	G_ 3
 	rest 4
 	octave 3
-	note D_, 6
+	D_ 6
 	octave 1
-	note F_, 7
-	note G_, 6
+	F_ 7
+	G_ 6
 	rest 7
 	inc_octave
-	note C_, 13
+	C_ 13
 	rest 6
 	inc_octave
-	note C_, 2
+	C_ 2
 	rest 5
-	note D_, 6
+	D_ 6
 	dec_octave
-	note C_, 2
+	C_ 2
 	rest 5
 	dec_octave
-	note E_, 13
+	E_ 13
 	inc_octave
 	music_ret
 
 Branch_facbb:
 	octave 1
-	note F_, 7
+	F_ 7
 	rest 6
-	note F_, 7
-	note F#, 13
-	note G_, 13
+	F_ 7
+	F# 13
+	G_ 13
 	inc_octave
-	note C_, 6
+	C_ 6
 	rest 7
 	music_ret
 
 Branch_facc5:
 	octave 1
-	note D#, 13
-	note D#, 2
+	D# 13
+	D# 2
 	rest 4
-	note D#, 5
+	D# 5
 	rest 2
 	octave 3
-	note D_, 6
+	D_ 6
 	octave 1
-	note A#, 2
+	A# 2
 	rest 5
-	note A#, 6
+	A# 6
 	inc_octave
-	note D#, 3
+	D# 3
 	rest 4
 	dec_octave
-	note D#, 2
+	D# 2
 	rest 4
-	note D#, 3
+	D# 3
 	rest 4
 	octave 3
-	note D_, 6
+	D_ 6
 	octave 1
-	note A#, 7
-	note D#, 6
+	A# 7
+	D# 6
 	rest 7
 	music_ret
 
@@ -1130,88 +1130,88 @@ Music_Ronald_Ch4: ; face0 (3e:6ce0)
 	MainLoop
 	Loop 3
 	music_call Branch_fad46
-	note snare3, 13
+	snare3 13
 	music_call Branch_fad4f
-	note snare2, 7
-	note bass, 6
-	note snare2, 7
-	note snare4, 6
-	note bass, 7
-	note snare1, 13
-	note snare3, 6
-	note snare2, 7
+	snare2 7
+	bass 6
+	snare2 7
+	snare4 6
+	bass 7
+	snare1 13
+	snare3 6
+	snare2 7
 	EndLoop
 	music_call Branch_fad46
-	note snare3, 13
+	snare3 13
 	music_call Branch_fad4f
-	note snare2, 7
-	note bass, 13
-	note snare4, 6
-	note snare2, 3
-	note snare2, 4
+	snare2 7
+	bass 13
+	snare4 6
+	snare2 3
+	snare2 4
 	Loop 2
-	note snare1, 6
-	note snare1, 7
+	snare1 6
+	snare1 7
 	EndLoop
 	Loop 2
 	Loop 7
 	music_call Branch_fad46
-	note snare3, 13
+	snare3 13
 	music_call Branch_fad4f
-	note snare2, 7
-	note bass, 6
-	note snare2, 7
-	note snare4, 6
-	note bass, 7
-	note snare1, 13
-	note snare3, 6
-	note snare2, 7
+	snare2 7
+	bass 6
+	snare2 7
+	snare4 6
+	bass 7
+	snare1 13
+	snare3 6
+	snare2 7
 	EndLoop
 	music_call Branch_fad46
-	note snare3, 13
+	snare3 13
 	music_call Branch_fad4f
-	note snare2, 3
-	note snare2, 4
+	snare2 3
+	snare2 4
 	Loop 4
-	note snare1, 6
-	note snare1, 7
+	snare1 6
+	snare1 7
 	EndLoop
 	EndLoop
 	Loop 6
 	music_call Branch_fad46
-	note snare3, 13
+	snare3 13
 	EndLoop
 	music_call Branch_fad46
 	speed 13
-	note snare5, 4
+	snare5 4
 	speed 1
 	rest 6
-	note snare2, 3
-	note snare2, 4
-	note snare1, 6
-	note snare1, 7
+	snare2 3
+	snare2 4
+	snare1 6
+	snare1 7
 	Loop 2
-	note snare2, 6
-	note snare1, 7
+	snare2 6
+	snare1 7
 	EndLoop
-	note snare1, 6
-	note snare2, 7
+	snare1 6
+	snare2 7
 	EndMainLoop
 
 Branch_fad46:
 	music_call Branch_fad4f
-	note snare2, 7
-	note bass, 13
-	note snare4, 6
-	note bass, 7
-	note snare1, 13
+	snare2 7
+	bass 13
+	snare4 6
+	bass 7
+	snare1 13
 	music_ret
 
 Branch_fad4f:
-	note bass, 13
-	note snare4, 6
-	note bass, 7
-	note snare1, 13
-	note bass, 6
+	bass 13
+	snare4 6
+	bass 7
+	snare1 13
+	bass 6
 	music_ret
 ; 0xfad55
diff --git a/audio/music/titlescreen.asm b/audio/music/titlescreen.asm
index 7125309..f95689c 100644
--- a/audio/music/titlescreen.asm
+++ b/audio/music/titlescreen.asm
@@ -7,216 +7,216 @@ Music_TitleScreen_Ch1: ; f5052 (3d:5052)
 	volume 160
 	musice8 8
 	octave 3
-	note G_, 1
+	G_ 1
 	volume 55
-	note G_, 1
+	G_ 1
 	rest 1
 	volume 160
 	musice8 6
-	note F_, 1
+	F_ 1
 	musice8 8
-	note E_, 3
+	E_ 3
 	volume 55
-	note E_, 1
+	E_ 1
 	volume 160
-	note G_, 3
+	G_ 3
 	volume 55
-	note G_, 1
+	G_ 1
 	inc_octave
 	volume 160
-	note D_, 5
+	D_ 5
 	volume 55
-	note D_, 1
+	D_ 1
 	volume 208
 	musice8 6
-	note C_, 2
+	C_ 2
 	dec_octave
 	musice8 8
-	note G_, 10
+	G_ 10
 	volume 55
-	note G_, 2
+	G_ 2
 	volume 208
-	note E_, 1
+	E_ 1
 	volume 55
-	note E_, 1
+	E_ 1
 	rest 1
 	volume 160
 	musice8 6
-	note G_, 1
+	G_ 1
 	musice8 8
-	note G_, 5
+	G_ 5
 	volume 55
-	note G_, 1
+	G_ 1
 	volume 160
 	musice8 6
-	note F_, 2
+	F_ 2
 	musice8 8
-	note F_, 2
+	F_ 2
 	speed 1
-	note E_, 5
+	E_ 5
 	tie
-	note F_, 4
+	F_ 4
 	tie
-	note E_, 5
+	E_ 5
 	speed 7
-	note D_, 1
+	D_ 1
 	volume 55
-	note D_, 1
+	D_ 1
 	volume 160
-	note C_, 1
+	C_ 1
 	volume 55
-	note C_, 1
+	C_ 1
 	volume 160
 	musice8 8
-	note D_, 11
+	D_ 11
 	volume 55
-	note D_, 1
+	D_ 1
 	volume 208
-	note G_, 1
+	G_ 1
 	volume 55
-	note G_, 1
+	G_ 1
 	rest 1
 	volume 160
 	musice8 6
-	note F_, 1
+	F_ 1
 	musice8 8
-	note E_, 3
+	E_ 3
 	volume 55
-	note E_, 1
+	E_ 1
 	volume 160
-	note G_, 3
+	G_ 3
 	volume 55
-	note G_, 1
+	G_ 1
 	inc_octave
 	volume 160
-	note D_, 5
+	D_ 5
 	volume 55
-	note D_, 1
+	D_ 1
 	volume 208
 	musice8 6
-	note E_, 2
+	E_ 2
 	dec_octave
 	musice8 8
-	note G_, 8
+	G_ 8
 	volume 55
-	note G_, 2
+	G_ 2
 	volume 208
-	note E_, 2
-	note F_, 2
-	note G_, 2
-	note G#, 3
+	E_ 2
+	F_ 2
+	G_ 2
+	G# 3
 	volume 55
-	note G#, 1
+	G# 1
 	volume 208
 	inc_octave
-	note C_, 3
+	C_ 3
 	volume 55
-	note C_, 1
+	C_ 1
 	volume 160
-	note D_, 5
+	D_ 5
 	volume 55
-	note D_, 1
+	D_ 1
 	volume 208
 	musice8 6
-	note C_, 2
+	C_ 2
 	musice8 8
-	note G_, 9
+	G_ 9
 	volume 55
-	note G_, 1
+	G_ 1
 	volume 208
-	note F_, 2
-	note C_, 2
-	note D_, 2
+	F_ 2
+	C_ 2
+	D_ 2
 	Loop 2
-	note E_, 10
+	E_ 10
 	volume 55
-	note E_, 2
+	E_ 2
 	volume 160
-	note E_, 1
+	E_ 1
 	volume 55
-	note E_, 1
+	E_ 1
 	rest 1
 	volume 160
 	musice8 6
-	note E_, 1
+	E_ 1
 	musice8 8
 	EndLoop
-	note E_, 12
+	E_ 12
 	volume 55
-	note E_, 2
+	E_ 2
 	volume 160
-	note D_, 1
-	note C_, 1
-	note D_, 1
+	D_ 1
+	C_ 1
+	D_ 1
 	volume 55
-	note D_, 1
+	D_ 1
 	rest 1
 	volume 160
 	musice8 6
-	note G_, 1
+	G_ 1
 	musice8 8
-	note G_, 8
+	G_ 8
 	volume 55
-	note G_, 2
+	G_ 2
 	volume 160
 	speed 1
 	musice8 7
-	note G_, 5
-	note G_, 4
-	note G_, 5
+	G_ 5
+	G_ 4
+	G_ 5
 	musice8 8
 	speed 7
-	note G_, 9
+	G_ 9
 	volume 55
-	note G_, 1
+	G_ 1
 	volume 160
-	note F_, 2
-	note C_, 2
-	note D_, 2
-	note E_, 10
+	F_ 2
+	C_ 2
+	D_ 2
+	E_ 10
 	volume 55
-	note E_, 2
+	E_ 2
 	volume 160
-	note C_, 1
+	C_ 1
 	volume 55
-	note C_, 1
+	C_ 1
 	rest 1
 	musice8 6
 	volume 160
-	note E_, 1
+	E_ 1
 	musice8 8
-	note E_, 6
+	E_ 6
 	volume 55
-	note E_, 2
+	E_ 2
 	volume 160
-	note D_, 3
+	D_ 3
 	volume 55
-	note D_, 1
+	D_ 1
 	volume 160
-	note C_, 3
+	C_ 3
 	volume 55
-	note C_, 1
+	C_ 1
 	volume 160
-	note C_, 6
+	C_ 6
 	volume 55
-	note C_, 2
+	C_ 2
 	dec_octave
 	volume 160
-	note B_, 5
+	B_ 5
 	volume 55
-	note B_, 2
+	B_ 2
 	volume 160
 	inc_octave
 	musice8 6
-	note C_, 1
+	C_ 1
 	musice8 8
-	note C_, 8
+	C_ 8
 	tie
-	note C_, 8
+	C_ 8
 	tie
-	note C_, 8
+	C_ 8
 	volume 55
-	note C_, 8
+	C_ 8
 	music_end
 
 
@@ -229,182 +229,182 @@ Music_TitleScreen_Ch2: ; f5193 (3d:5193)
 	volume 128
 	musice8 8
 	octave 2
-	note B_, 1
+	B_ 1
 	volume 39
-	note B_, 1
+	B_ 1
 	rest 1
 	inc_octave
 	volume 128
 	musice8 6
-	note D_, 1
+	D_ 1
 	musice8 8
-	note C_, 3
+	C_ 3
 	volume 39
-	note C_, 1
+	C_ 1
 	volume 128
-	note E_, 3
+	E_ 3
 	rest 1
-	note G_, 5
+	G_ 5
 	rest 1
 	musice8 6
-	note G_, 2
+	G_ 2
 	musice8 8
-	note E_, 10
+	E_ 10
 	rest 2
-	note C_, 1
+	C_ 1
 	rest 2
 	musice8 6
-	note E_, 1
+	E_ 1
 	musice8 8
-	note F_, 5
+	F_ 5
 	rest 1
 	musice8 6
-	note C_, 2
+	C_ 2
 	musice8 7
-	note C_, 2
+	C_ 2
 	musice8 8
-	note C_, 2
+	C_ 2
 	dec_octave
-	note G_, 1
+	G_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note F_, 4
-	note A_, 1
+	F_ 4
+	A_ 1
 	rest 2
 	inc_octave
 	musice8 6
-	note C_, 1
+	C_ 1
 	dec_octave
 	musice8 8
-	note B_, 3
+	B_ 3
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 2
 	inc_octave
 	musice8 6
-	note D_, 1
+	D_ 1
 	musice8 8
-	note C_, 3
+	C_ 3
 	volume 39
-	note C_, 1
+	C_ 1
 	volume 128
-	note E_, 3
+	E_ 3
 	rest 1
-	note G_, 5
+	G_ 5
 	rest 1
 	musice8 6
-	note G_, 2
+	G_ 2
 	musice8 8
-	note E_, 8
+	E_ 8
 	rest 2
-	note C_, 2
-	note D_, 2
-	note E_, 2
-	note F_, 3
+	C_ 2
+	D_ 2
+	E_ 2
+	F_ 3
 	rest 1
-	note G#, 3
+	G# 3
 	rest 1
-	note G#, 5
+	G# 5
 	rest 1
 	musice8 6
-	note F_, 2
+	F_ 2
 	musice8 8
-	note G#, 9
+	G# 9
 	rest 1
-	note G#, 2
-	note F_, 2
-	note G#, 2
+	G# 2
+	F_ 2
+	G# 2
 	inc_octave
-	note C_, 10
+	C_ 10
 	rest 2
 	dec_octave
-	note A_, 1
+	A_ 1
 	volume 39
-	note A_, 1
+	A_ 1
 	rest 1
 	volume 128
 	inc_octave
 	musice8 6
-	note C_, 1
+	C_ 1
 	musice8 8
 	dec_octave
-	note B_, 10
+	B_ 10
 	rest 2
-	note G_, 1
+	G_ 1
 	volume 39
-	note G_, 1
+	G_ 1
 	rest 1
 	volume 128
 	musice8 6
-	note B_, 1
+	B_ 1
 	musice8 8
-	note A_, 12
+	A_ 12
 	volume 39
-	note A_, 2
+	A_ 2
 	volume 128
-	note B_, 1
-	note A_, 1
-	note B_, 1
+	B_ 1
+	A_ 1
+	B_ 1
 	volume 39
-	note B_, 1
+	B_ 1
 	rest 1
 	volume 128
 	inc_octave
 	musice8 6
-	note D_, 1
+	D_ 1
 	musice8 8
-	note D_, 8
+	D_ 8
 	rest 2
 	speed 1
 	musice8 7
-	note D_, 5
-	note D_, 4
-	note D_, 5
+	D_ 5
+	D_ 4
+	D_ 5
 	speed 7
 	musice8 8
-	note C_, 9
+	C_ 9
 	rest 1
-	note C_, 2
+	C_ 2
 	dec_octave
 	musice8 7
-	note G#, 2
+	G# 2
 	musice8 8
-	note G#, 2
-	note G_, 10
+	G# 2
+	G_ 10
 	rest 2
-	note G_, 1
+	G_ 1
 	rest 2
 	musice8 6
-	note G_, 1
+	G_ 1
 	musice8 8
-	note A_, 6
+	A_ 6
 	rest 2
-	note F#, 3
+	F# 3
 	rest 1
-	note A_, 3
+	A_ 3
 	rest 1
-	note F_, 6
+	F_ 6
 	rest 2
-	note F_, 5
+	F_ 5
 	rest 2
 	musice8 6
-	note F_, 1
+	F_ 1
 	musice8 8
-	note F_, 7
+	F_ 7
 	rest 1
 	speed 1
 	musice8 8
-	note F_, 14
+	F_ 14
 	rest 5
-	note D_, 13
+	D_ 13
 	rest 5
-	note F_, 14
+	F_ 14
 	rest 5
 	speed 7
-	note E_, 8
+	E_ 8
 	volume 39
-	note E_, 8
+	E_ 8
 	music_end
 
 
@@ -418,91 +418,91 @@ Music_TitleScreen_Ch3: ; f5286 (3d:5286)
 	octave 2
 	rest 4
 	music_call Branch_f52f0
-	note F_, 4
-	note F_, 4
-	note E_, 4
-	note E_, 4
-	note D_, 4
-	note D_, 4
-	note G_, 4
-	note G_, 4
+	F_ 4
+	F_ 4
+	E_ 4
+	E_ 4
+	D_ 4
+	D_ 4
+	G_ 4
+	G_ 4
 	inc_octave
 	music_call Branch_f52f0
 	Loop 4
-	note F_, 4
+	F_ 4
 	EndLoop
 	Loop 4
-	note A#, 4
+	A# 4
 	EndLoop
 	Loop 2
-	note A_, 2
-	note A_, 2
+	A_ 2
+	A_ 2
 	rest 2
-	note A_, 1
-	note A_, 1
+	A_ 1
+	A_ 1
 	EndLoop
 	Loop 2
-	note G_, 2
-	note G_, 2
+	G_ 2
+	G_ 2
 	rest 2
-	note G_, 1
-	note G_, 1
+	G_ 1
+	G_ 1
 	EndLoop
 	Loop 2
-	note F_, 2
-	note F_, 2
+	F_ 2
+	F_ 2
 	rest 2
-	note F_, 1
-	note F_, 1
+	F_ 1
+	F_ 1
 	EndLoop
 	Loop 2
-	note E_, 2
-	note E_, 2
+	E_ 2
+	E_ 2
 	rest 2
-	note E_, 1
-	note E_, 1
+	E_ 1
+	E_ 1
 	EndLoop
 	Loop 4
-	note G#, 4
+	G# 4
 	EndLoop
 	Loop 4
-	note G_, 4
+	G_ 4
 	EndLoop
 	Loop 4
-	note F#, 4
+	F# 4
 	EndLoop
 	Loop 4
-	note G_, 4
+	G_ 4
 	EndLoop
 	inc_octave
-	note C_, 4
-	note C_, 4
+	C_ 4
+	C_ 4
 	speed 1
-	note C_, 9
+	C_ 9
 	tie
-	note C_, 10
+	C_ 10
 	dec_octave
-	note G_, 9
+	G_ 9
 	tie
-	note G_, 9
-	note G_, 9
+	G_ 9
+	G_ 9
 	tie
-	note G_, 10
+	G_ 10
 	speed 7
 	musice8 8
-	note C_, 8
+	C_ 8
 	music_end
 
 Branch_f52f0:
-	note C_, 4
-	note C_, 4
+	C_ 4
+	C_ 4
 	dec_octave
-	note B_, 4
-	note B_, 4
-	note A_, 4
-	note A_, 4
-	note G_, 4
-	note G_, 4
+	B_ 4
+	B_ 4
+	A_ 4
+	A_ 4
+	G_ 4
+	G_ 4
 	music_ret
 
 
@@ -519,30 +519,30 @@ Music_TitleScreen_Ch4: ; f52fa (3d:52fa)
 	Loop 10
 	music_call Branch_f5312
 	EndLoop
-	note snare1, 8
+	snare1 8
 	music_end
 
 Branch_f5312:
 	speed 7
-	note snare1, 2
-	note snare2, 2
-	note snare1, 2
+	snare1 2
+	snare2 2
+	snare1 2
 	speed 1
-	note snare2, 4
-	note snare2, 3
-	note snare2, 4
-	note snare2, 3
+	snare2 4
+	snare2 3
+	snare2 4
+	snare2 3
 	music_ret
 
 Branch_f531e:
 	speed 7
-	note snare1, 2
-	note snare1, 2
+	snare1 2
+	snare1 2
 	rest 2
 	speed 1
-	note snare1, 4
-	note snare2, 3
-	note snare2, 4
-	note snare2, 3
+	snare1 4
+	snare2 3
+	snare2 4
+	snare2 3
 	music_ret
 ; 0xf532a
diff --git a/macros.asm b/macros.asm
index 2a6e11e..757caed 100755
--- a/macros.asm
+++ b/macros.asm
@@ -32,30 +32,77 @@ text: MACRO
 	db ((\1 + ($4000 * (BANK(\1) - 1))) - (TextOffsets + ($4000 * (BANK(TextOffsets) - 1)))) >> 16
 ENDM
 
-; notes
-C_ EQU $1
-C# EQU $2
-D_ EQU $3
-D# EQU $4
-E_ EQU $5
-F_ EQU $6
-F# EQU $7
-G_ EQU $8
-G# EQU $9
-A_ EQU $A
-A# EQU $B
-B_ EQU $C
-
-; instruments
-bass   EQU $1
-snare1 EQU $3 ; medium length
-snare2 EQU $5 ; medium length
-snare3 EQU $7 ; short
-snare4 EQU $9 ; long
-snare5 EQU $C ; long
-
-note: MACRO
-	db (\1 << 4) | (\2 - 1)
+; notes/instruments
+C_: MACRO
+	db $10 | (\1 - 1)
+ENDM
+
+C#: MACRO
+	db $20 | (\1 - 1)
+ENDM
+
+D_: MACRO
+	db $30 | (\1 - 1)
+ENDM
+
+D#: MACRO
+	db $40 | (\1 - 1)
+ENDM
+
+E_: MACRO
+	db $50 | (\1 - 1)
+ENDM
+
+F_: MACRO
+	db $60 | (\1 - 1)
+ENDM
+
+F#: MACRO
+	db $70 | (\1 - 1)
+ENDM
+
+G_: MACRO
+	db $80 | (\1 - 1)
+ENDM
+
+G#: MACRO
+	db $90 | (\1 - 1)
+ENDM
+
+A_: MACRO
+	db $A0 | (\1 - 1)
+ENDM
+
+A#: MACRO
+	db $B0 | (\1 - 1)
+ENDM
+
+B_: MACRO
+	db $C0 | (\1 - 1)
+ENDM
+
+bass: MACRO
+	db $10 | (\1 - 1)
+ENDM
+
+snare1: MACRO ; medium length
+	db $30 | (\1 - 1)
+ENDM
+
+snare2: MACRO ; medium length
+	db $50 | (\1 - 1)
+ENDM
+
+snare3: MACRO ; short
+	db $70 | (\1 - 1)
+ENDM
+
+snare4: MACRO ; long
+	db $90 | (\1 - 1)
+ENDM
+
+snare5: MACRO ; long
+	db $C0 | (\1 - 1)
 ENDM
 
 rest: MACRO